Commit 227e11f9c783db746b0e97454be4bb00b8ac62ed
1 parent
26fd35e3
fix: todo
Showing
6 changed files
with
14 additions
and
10 deletions
yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
| @@ -12,8 +12,8 @@ VXETable.renderer.add('XDataTimePicker', { | @@ -12,8 +12,8 @@ VXETable.renderer.add('XDataTimePicker', { | ||
| 12 | return ( | 12 | return ( |
| 13 | <ElDatePicker | 13 | <ElDatePicker |
| 14 | v-model={data[field]} | 14 | v-model={data[field]} |
| 15 | + style="width: 100%" | ||
| 15 | type={content ? (content as any) : 'datetimerange'} | 16 | type={content ? (content as any) : 'datetimerange'} |
| 16 | - style="maxWidth: 300px" | ||
| 17 | value-format="YYYY-MM-DD HH:mm:ss" | 17 | value-format="YYYY-MM-DD HH:mm:ss" |
| 18 | range-separator="-" | 18 | range-separator="-" |
| 19 | start-placeholder={t('common.startTimeText')} | 19 | start-placeholder={t('common.startTimeText')} |
yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
| @@ -39,10 +39,12 @@ $vxe-table-row-striped-background-color: #1d1d1d; | @@ -39,10 +39,12 @@ $vxe-table-row-striped-background-color: #1d1d1d; | ||
| 39 | $vxe-table-row-hover-background-color: #1d1e1f; | 39 | $vxe-table-row-hover-background-color: #1d1e1f; |
| 40 | $vxe-table-row-hover-striped-background-color: #1e1e1e; | 40 | $vxe-table-row-hover-striped-background-color: #1e1e1e; |
| 41 | $vxe-table-footer-background-color: #1d1e1f; | 41 | $vxe-table-footer-background-color: #1d1e1f; |
| 42 | -$vxe-table-row-current-background-color: #9e8787; | ||
| 43 | -$vxe-table-column-current-background-color: #9e8787; | ||
| 44 | -$vxe-table-column-hover-background-color: #9e8787; | ||
| 45 | -$vxe-table-row-hover-current-background-color: #9e8787; | 42 | +$vxe-table-row-current-background-color: #302d2d; |
| 43 | +$vxe-table-column-current-background-color: #302d2d; | ||
| 44 | +$vxe-table-column-hover-background-color: #302d2d; | ||
| 45 | +$vxe-table-row-hover-current-background-color: #302d2d; | ||
| 46 | +$vxe-table-row-checkbox-checked-background-color: #3e3c37 !default; | ||
| 47 | +$vxe-table-row-hover-checkbox-checked-background-color: #615a4a !default; | ||
| 46 | $vxe-table-menu-background-color: #1d1e1f; | 48 | $vxe-table-menu-background-color: #1d1e1f; |
| 47 | $vxe-table-border-width: 1px !default; | 49 | $vxe-table-border-width: 1px !default; |
| 48 | $vxe-table-border-color: #4c4d4f !default; | 50 | $vxe-table-border-color: #4c4d4f !default; |
yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
| @@ -28,7 +28,6 @@ | @@ -28,7 +28,6 @@ | ||
| 28 | <XButton preIcon="ep:refresh-right" :title="t('common.reset')" @click="resetQuery()" /> | 28 | <XButton preIcon="ep:refresh-right" :title="t('common.reset')" @click="resetQuery()" /> |
| 29 | </el-form-item> | 29 | </el-form-item> |
| 30 | </el-form> | 30 | </el-form> |
| 31 | - <!-- TODO 星语：【暗黑模式】选中后，样式有点不太好看 --> | ||
| 32 | <vxe-table | 31 | <vxe-table |
| 33 | ref="xTable" | 32 | ref="xTable" |
| 34 | :data="dbTableList" | 33 | :data="dbTableList" |
yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
| @@ -91,5 +91,4 @@ const crudSchemas = reactive<VxeCrudSchema>({ | @@ -91,5 +91,4 @@ const crudSchemas = reactive<VxeCrudSchema>({ | ||
| 91 | } | 91 | } |
| 92 | ] | 92 | ] |
| 93 | }) | 93 | }) |
| 94 | -// TODO 星语：“创建时间”的筛选，超过 table 的边框 | ||
| 95 | export const { allSchemas } = useVxeCrudSchemas(crudSchemas) | 94 | export const { allSchemas } = useVxeCrudSchemas(crudSchemas) |
yudao-ui-admin-vue3/src/views/system/user/index.vue
| @@ -54,8 +54,7 @@ | @@ -54,8 +54,7 @@ | ||
| 54 | @click="exportList('用户数据.xls')" | 54 | @click="exportList('用户数据.xls')" |
| 55 | /> | 55 | /> |
| 56 | </template> | 56 | </template> |
| 57 | - <!-- TODO @星语：貌似没生效？ --> | ||
| 58 | - <template #status="{ row }"> | 57 | + <template #status_default="{ row }"> |
| 59 | <el-switch | 58 | <el-switch |
| 60 | v-model="row.status" | 59 | v-model="row.status" |
| 61 | :active-value="0" | 60 | :active-value="0" |
yudao-ui-admin-vue3/src/views/system/user/user.data.ts
| @@ -70,7 +70,12 @@ const crudSchemas = reactive<VxeCrudSchema>({ | @@ -70,7 +70,12 @@ const crudSchemas = reactive<VxeCrudSchema>({ | ||
| 70 | field: 'status', | 70 | field: 'status', |
| 71 | dictType: DICT_TYPE.COMMON_STATUS, | 71 | dictType: DICT_TYPE.COMMON_STATUS, |
| 72 | dictClass: 'number', | 72 | dictClass: 'number', |
| 73 | - isSearch: true | 73 | + isSearch: true, |
| 74 | + table: { | ||
| 75 | + slots: { | ||
| 76 | + default: 'status_default' | ||
| 77 | + } | ||
| 78 | + } | ||
| 74 | }, | 79 | }, |
| 75 | { | 80 | { |
| 76 | title: '最后登录时间', | 81 | title: '最后登录时间', |