From c344bceb3fbc6c5a4b75d5a8ea31ae2bd2bb0bf9 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 21 Sep 2023 22:53:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.优化系统配置页面样式
2.修复部分错误及遗漏
---
 .../cnadmin/system/model/entity/OptionDO.java  |  6 +++++-
 .../system/config/components/basic-setting.vue | 18 +++++++++++-------
 .../src/views/system/config/index.vue          |  4 ++--
 .../src/views/system/config/locale/zh-CN.ts    |  2 +-
 .../controller/system/OptionController.java    |  2 ++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java
index d91b79c0..4c40ef14 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java
@@ -21,11 +21,13 @@ import java.time.LocalDateTime;
 
 import lombok.Data;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
- * 系统参数表
+ * 系统参数实体
  *
  * @author Bull-BCLS
  * @since 2023/8/26 19:20
@@ -65,10 +67,12 @@ public class OptionDO implements Serializable {
     /**
      * 修改人
      */
+    @TableField(fill = FieldFill.UPDATE)
     private Long updateUser;
 
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateTime;
 }
diff --git a/continew-admin-ui/src/views/system/config/components/basic-setting.vue b/continew-admin-ui/src/views/system/config/components/basic-setting.vue
index ea123bd7..df673935 100644
--- a/continew-admin-ui/src/views/system/config/components/basic-setting.vue
+++ b/continew-admin-ui/src/views/system/config/components/basic-setting.vue
@@ -9,7 +9,7 @@
     :disabled="!isEdit"
   >
     <a-list class="list-layout" :bordered="false">
-      <a-list-item class="list-item">
+      <a-list-item>
         <a-form-item class="image-item" hide-label field="favicon">
           {{ siteFavicon?.name }}
           <template #extra>
@@ -52,7 +52,7 @@
           </template>
         </a-form-item>
       </a-list-item>
-      <a-list-item class="list-item">
+      <a-list-item>
         <a-form-item class="image-item" hide-label field="site_logo">
           {{ siteLogo?.name }}
           <template #extra>
@@ -95,7 +95,7 @@
           </template>
         </a-form-item>
       </a-list-item>
-      <a-list-item class="list-item" style="border: none">
+      <a-list-item style="padding-top: 20px; border: none">
         <a-form-item
           class="input-item"
           :label="siteTitle?.name"
@@ -344,16 +344,20 @@
   }
 
   .arco-form .image-item {
-    margin-left: 2px;
     margin-bottom: 0;
   }
 
   .arco-form .input-item {
-    margin-left: -18px;
+    margin-left: -20px;
   }
 
-  .list-layout .list-item {
-    padding: 20px 0;
+  :deep(
+      .arco-list-medium
+        .arco-list-content-wrapper
+        .arco-list-content
+        > .arco-list-item
+    ) {
+    padding: 13px;
     border-bottom: 1px solid var(--color-fill-3);
   }
 </style>
diff --git a/continew-admin-ui/src/views/system/config/index.vue b/continew-admin-ui/src/views/system/config/index.vue
index 627cdf1c..a2d6aff1 100644
--- a/continew-admin-ui/src/views/system/config/index.vue
+++ b/continew-admin-ui/src/views/system/config/index.vue
@@ -3,10 +3,10 @@
     <Breadcrumb :items="['menu.system', 'menu.system.config']" />
     <a-card class="general-card" :title="$t('menu.system.config')">
       <a-tabs default-active-key="1" type="rounded">
-        <a-tab-pane key="1" title="基础配置（正在开发）">
+        <a-tab-pane key="1" title="基础配置">
           <BasicSetting />
         </a-tab-pane>
-        <a-tab-pane key="2" title="高级配置（暂未开放）" disabled></a-tab-pane>
+        <a-tab-pane key="2" title="高级配置" disabled></a-tab-pane>
       </a-tabs>
     </a-card>
   </div>
diff --git a/continew-admin-ui/src/views/system/config/locale/zh-CN.ts b/continew-admin-ui/src/views/system/config/locale/zh-CN.ts
index 4eae1c25..ff2db922 100644
--- a/continew-admin-ui/src/views/system/config/locale/zh-CN.ts
+++ b/continew-admin-ui/src/views/system/config/locale/zh-CN.ts
@@ -1,3 +1,3 @@
 export default {
-  'menu.system.config': '系统配置',
+  'menu.system.config': '系统配置（开发中）',
 };
diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/OptionController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/OptionController.java
index 7a26a8be..b2df6907 100644
--- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/OptionController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/OptionController.java
@@ -18,6 +18,7 @@ package top.charles7c.cnadmin.webapi.controller.system;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -48,6 +49,7 @@ public class OptionController {
     private final OptionService optionService;
 
     @Operation(summary = "查询系统参数列表", description = "查询系统参数列表")
+    @SaCheckPermission("system:config:list")
     @GetMapping
     public R<List<OptionVO>> list(@Validated OptionQuery query) {
         return R.ok(optionService.list(query));