From 227e11f9c783db746b0e97454be4bb00b8ac62ed Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 28 Nov 2022 22:38:24 +0800
Subject: [PATCH] fix: todo

---
 .../src/plugins/vxeTable/renderer/dataTimePicker.tsx   |  2 +-
 .../src/plugins/vxeTable/theme/dark.scss               | 10 ++++++----
 .../src/views/infra/codegen/components/ImportTable.vue |  1 -
 .../src/views/infra/config/config.data.ts              |  1 -
 yudao-ui-admin-vue3/src/views/system/user/index.vue    |  3 +--
 yudao-ui-admin-vue3/src/views/system/user/user.data.ts |  7 ++++++-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx b/yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
index 0b5166742..6f6b9aec2 100644
--- a/yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
+++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
@@ -12,8 +12,8 @@ VXETable.renderer.add('XDataTimePicker', {
     return (
       <ElDatePicker
         v-model={data[field]}
+        style="width: 100%"
         type={content ? (content as any) : 'datetimerange'}
-        style="maxWidth: 300px"
         value-format="YYYY-MM-DD HH:mm:ss"
         range-separator="-"
         start-placeholder={t('common.startTimeText')}
diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss b/yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
index da583e5ed..4e87c4b39 100644
--- a/yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
+++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
@@ -39,10 +39,12 @@ $vxe-table-row-striped-background-color: #1d1d1d;
 $vxe-table-row-hover-background-color: #1d1e1f;
 $vxe-table-row-hover-striped-background-color: #1e1e1e;
 $vxe-table-footer-background-color: #1d1e1f;
-$vxe-table-row-current-background-color: #9e8787;
-$vxe-table-column-current-background-color: #9e8787;
-$vxe-table-column-hover-background-color: #9e8787;
-$vxe-table-row-hover-current-background-color: #9e8787;
+$vxe-table-row-current-background-color: #302d2d;
+$vxe-table-column-current-background-color: #302d2d;
+$vxe-table-column-hover-background-color: #302d2d;
+$vxe-table-row-hover-current-background-color: #302d2d;
+$vxe-table-row-checkbox-checked-background-color: #3e3c37 !default;
+$vxe-table-row-hover-checkbox-checked-background-color: #615a4a !default;
 $vxe-table-menu-background-color: #1d1e1f;
 $vxe-table-border-width: 1px !default;
 $vxe-table-border-color: #4c4d4f !default;
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
index d060f8fad..e4dd8d743 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
@@ -28,7 +28,6 @@
         <XButton preIcon="ep:refresh-right" :title="t('common.reset')" @click="resetQuery()" />
       </el-form-item>
     </el-form>
-    <!-- TODO 星语：【暗黑模式】选中后，样式有点不太好看 -->
     <vxe-table
       ref="xTable"
       :data="dbTableList"
diff --git a/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts b/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
index eda638eb6..67dc1cc2e 100644
--- a/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
@@ -91,5 +91,4 @@ const crudSchemas = reactive<VxeCrudSchema>({
     }
   ]
 })
-// TODO 星语：“创建时间”的筛选，超过 table 的边框
 export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index a0c0e4ec9..a797b6bcb 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -54,8 +54,7 @@
             @click="exportList('用户数据.xls')"
           />
         </template>
-        <!-- TODO @星语：貌似没生效？ -->
-        <template #status="{ row }">
+        <template #status_default="{ row }">
           <el-switch
             v-model="row.status"
             :active-value="0"
diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
index 5ba7b7fde..95a11df88 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
@@ -70,7 +70,12 @@ const crudSchemas = reactive<VxeCrudSchema>({
       field: 'status',
       dictType: DICT_TYPE.COMMON_STATUS,
       dictClass: 'number',
-      isSearch: true
+      isSearch: true,
+      table: {
+        slots: {
+          default: 'status_default'
+        }
+      }
     },
     {
       title: '最后登录时间',