fix: todo

xingyu
1 parent 26fd35e3
Showing 6 changed files with 14 additions and 10 deletions
yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
yudao-ui-admin-vue3/src/views/system/user/index.vue
yudao-ui-admin-vue3/src/views/system/user/user.data.ts
@@ -12,8 +12,8 @@ VXETable.renderer.add(&#39;XDataTimePicker&#39;, {
     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')}
@@ -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;
@@ -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"
@@ -91,5 +91,4 @@ const crudSchemas = reactive&lt;VxeCrudSchema&gt;({
     }
   ]
 })
-// TODO 星语：“创建时间”的筛选，超过 table 的边框
 export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
@@ -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"
@@ -70,7 +70,12 @@ const crudSchemas = reactive&lt;VxeCrudSchema&gt;({
       field: 'status',
       dictType: DICT_TYPE.COMMON_STATUS,
       dictClass: 'number',
-      isSearch: true
+      isSearch: true,
+      table: {
+        slots: {
+          default: 'status_default'
+        }
+      }
     },
     {
       title: '最后登录时间',