From 68b596bbbe5eccdfe5b22b9b846ebb6a25958abe Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 11 Aug 2022 09:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/View/Components/Form/Input.php          |  4 +++-
 public/build/beike/admin/css/app.css                |  8 ++++++++
 public/build/beike/shop/default/css/app.css         |  8 ++++++++
 resources/beike/admin/css/_global.scss              | 10 ++++++++++
 .../admin/views/components/form/input.blade.php     |  2 +-
 .../beike/admin/views/components/form/row.blade.php | 13 ++-----------
 resources/beike/admin/views/pages/setting.blade.php |  2 +-
 resources/beike/shop/default/css/global.scss        | 10 ++++++++++
 8 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/beike/Admin/View/Components/Form/Input.php b/beike/Admin/View/Components/Form/Input.php
index b95b3d76..bbda82c6 100644
--- a/beike/Admin/View/Components/Form/Input.php
+++ b/beike/Admin/View/Components/Form/Input.php
@@ -9,12 +9,14 @@ class Input extends Component
     public string $name;
     public string $title;
     public string $value;
+    public bool $required;
 
-    public function __construct(string $name, string $title, ?string $value)
+    public function __construct(string $name, string $title, ?string $value, bool $required = false)
     {
         $this->name = $name;
         $this->title = $title;
         $this->value = $value ?? '';
+        $this->required = $required ?? false;
     }
 
     public function render()
diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css
index 0403a801..2469473f 100644
--- a/public/build/beike/admin/css/app.css
+++ b/public/build/beike/admin/css/app.css
@@ -317,6 +317,14 @@
   width: 100px;
 }
 
+.col-form-label.required::before {
+  content: "*";
+  color: #f56c6c;
+  font-size: 12px;
+  font-weight: bold;
+  margin-right: 5px;
+}
+
 .help-text {
   color: #B2B2B2;
   margin-top: 4px;
diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css
index 6f0b511a..e5d1b1fb 100644
--- a/public/build/beike/shop/default/css/app.css
+++ b/public/build/beike/shop/default/css/app.css
@@ -338,6 +338,14 @@ body[class^=page-account-] {
   width: 100px;
 }
 
+.col-form-label.required::before {
+  content: "*";
+  color: #f56c6c;
+  font-size: 12px;
+  font-weight: bold;
+  margin-right: 5px;
+}
+
 .module-title {
   font-size: 1.5rem;
   text-align: center;
diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss
index e1193002..5140bf6c 100644
--- a/resources/beike/admin/css/_global.scss
+++ b/resources/beike/admin/css/_global.scss
@@ -67,6 +67,16 @@
   }
 }
 
+.col-form-label.required {
+  &::before {
+    content: "*";
+    color: #f56c6c;
+    font-size: 12px;
+    font-weight: bold;
+    margin-right: 5px;
+  }
+}
+
 .help-text {
   color: #B2B2B2;
   margin-top: 4px;
diff --git a/resources/beike/admin/views/components/form/input.blade.php b/resources/beike/admin/views/components/form/input.blade.php
index 063e6474..b468ba56 100644
--- a/resources/beike/admin/views/components/form/input.blade.php
+++ b/resources/beike/admin/views/components/form/input.blade.php
@@ -1,4 +1,4 @@
-<x-admin::form.row :title="$title">
+<x-admin::form.row :title="$title" :required="$required">
   <input type="text" name="{{ $name }}" class="form-control wp-400" value="{{ $value }}" placeholder="{{ $title }}">
   {{ $slot }}
 </x-admin::form.row>
diff --git a/resources/beike/admin/views/components/form/row.blade.php b/resources/beike/admin/views/components/form/row.blade.php
index 3dd1c84d..ac509b3a 100644
--- a/resources/beike/admin/views/components/form/row.blade.php
+++ b/resources/beike/admin/views/components/form/row.blade.php
@@ -1,15 +1,6 @@
 <div class="row g-3 mb-3">
-  <label for="" class="wp-200 col-form-label text-end">{{ $title ?? '' }}</label>
+  <label for="" class="wp-200 col-form-label text-end {{ isset($required) && $required ? 'required' : '' }}">{{ $title ?? '' }}</label>
   <div class="col-auto wp-200-">
     {{ $slot }}
   </div>
-</div>
-
-@if (0)
-<div class="el-form-item el-form-item--small">
-  <label for="" class="el-form-item__label" style="width: 200px">{{ $title ?? '' }}</label>
-  <div class="el-form-item__content" style="margin-left: 200px">
-    {{ $slot }}
-  </div>
-</div>
-@endif
+</div>
\ No newline at end of file
diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php
index 1644ce0a..f46d03a1 100644
--- a/resources/beike/admin/views/pages/setting.blade.php
+++ b/resources/beike/admin/views/pages/setting.blade.php
@@ -37,7 +37,7 @@
           <div class="help-text font-size-12 lh-base">默认货币设置</div>
         </x-admin-form-select>
 
-        <x-admin-form-input name="admin_name" title="后台目录" value="{{ old('admin_name', system_setting('base.admin_name', 'admin')) }}">
+        <x-admin-form-input name="admin_name" title="后台目录" required value="{{ old('admin_name', system_setting('base.admin_name', 'admin')) }}">
           <div class="help-text font-size-12 lh-base">管理后台目录,默认为admin</div>
         </x-admin-form-input>
 
diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss
index 44968079..e386771e 100644
--- a/resources/beike/shop/default/css/global.scss
+++ b/resources/beike/shop/default/css/global.scss
@@ -67,6 +67,16 @@ body[class^="page-account-"] {
   }
 }
 
+.col-form-label.required {
+  &::before {
+    content: "*";
+    color: #f56c6c;
+    font-size: 12px;
+    font-weight: bold;
+    margin-right: 5px;
+  }
+}
+
 .module-title {
   font-size: 1.5rem;
   text-align: center;