From 00c2f343962c15205e2987559f3fc793d51e3dcd Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 6 May 2022 03:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E6=8F=90=E4=BE=9B=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/ConfigController.java     |  2 ++
 kicc-ui/src/views/system/config/index.vue       | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java
index b02eb59b..035e59a8 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.system.api.entity.Config;
+import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.service.ConfigService;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
@@ -39,6 +40,7 @@ public class ConfigController {
                 .like(StrUtil.isNotBlank(config.getName()), Config::getName, config.getName())
                 .eq(StrUtil.isNotBlank(config.getKey()), Config::getKey, config.getKey())
                 .eq(StrUtil.isNotBlank(config.getIsSys()), Config::getIsSys, config.getIsSys())
+                .between(StrUtil.isNotBlank(config.getBeginTime()) && StrUtil.isNotBlank(config.getEndTime()), Config::getCreateTime, config.getBeginTime(), config.getEndTime())
                 .orderByDesc(Config::getId);
     }
 
diff --git a/kicc-ui/src/views/system/config/index.vue b/kicc-ui/src/views/system/config/index.vue
index 9e3fccbf..39132a53 100644
--- a/kicc-ui/src/views/system/config/index.vue
+++ b/kicc-ui/src/views/system/config/index.vue
@@ -8,10 +8,15 @@
            :wrapperCol="{ style: { width: '300px', 'margin-bottom': '5px' } }"
     >
       <AFormItem label="参数名称" name="name">
-        <a-input v-model:value="state.queryParams.name" placeholder="请输入参数名称"/>
+        <a-input v-model:value="state.queryParams.name"
+                 allowClear
+                 placeholder="请输入参数名称"
+        />
       </AFormItem>
       <AFormItem label="参数键" name="key">
-        <a-input v-model:value="state.queryParams.key" placeholder="请输入参数键"/>
+        <a-input v-model:value="state.queryParams.key"
+                 allowClear
+                 placeholder="请输入参数键"/>
       </AFormItem>
       <AFormItem label="系统内置" name="isSys">
         <ASelect v-model:value="state.queryParams.isSys"
@@ -41,6 +46,7 @@
       </AFormItem>
     </AForm>
     <ATable ref="tableElRef"
+            :loading="state.loading"
             :size="state.selectedKeys[0]"
             :dataSource="state.dataSource"
             :columns="columns"
@@ -148,6 +154,7 @@
 
   /** 类型规范统一声明定义区域 */
   interface TableState {
+    loading: boolean;
     ids: string[];
     single: boolean;
     multiple: boolean;
@@ -194,6 +201,8 @@
   const { toggle, isFullscreen } = useFullscreen(wrapRef);
   const [registerModal, { openModal }] = useModal();
   const state = reactive<TableState>({
+    // 遮罩层
+    loading: true,
     // 选中数组
     ids: [],
     // 非单个禁用
@@ -203,7 +212,7 @@
     // 总条数
     total: 0,
     // 手动设置表格高度
-    tableHeight: 630,
+    tableHeight: 588,
     // a-table表格实例
     tableInstance: null,
     // a-form表单实例
@@ -250,9 +259,11 @@
 
   /** 查询列表数据 */
   function getList() {
+    state.loading = true;
     listConfig(convertDateRange(state.queryParams, state.dateRange)).then(response => {
       state.dataSource = response.data;
       state.total = response.total;
+      state.loading = false;
     });
   }