java/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2025-10-31 18:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: todo

Browse Source
This commit is contained in:
xingyu
2022-11-28 22:38:24 +08:00
parent 26fd35e31d
commit 227e11f9c7
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
View File

@ -12,8 +12,8 @@ VXETable.renderer.add('XDataTimePicker', {
return ( return (
<ElDatePicker <ElDatePicker
v-model={data[field]} v-model={data[field]}
style="width: 100%"
type={content ? (content as any) : 'datetimerange'} type={content ? (content as any) : 'datetimerange'}
style="maxWidth: 300px"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
range-separator="-" range-separator="-"
start-placeholder={t('common.startTimeText')} start-placeholder={t('common.startTimeText')}

10
yudao-ui-admin-vue3/src/plugins/vxeTable/theme/dark.scss
View File

@ -39,10 +39,12 @@ $vxe-table-row-striped-background-color: #1d1d1d;
$vxe-table-row-hover-background-color: #1d1e1f; $vxe-table-row-hover-background-color: #1d1e1f;
$vxe-table-row-hover-striped-background-color: #1e1e1e; $vxe-table-row-hover-striped-background-color: #1e1e1e;
$vxe-table-footer-background-color: #1d1e1f; $vxe-table-footer-background-color: #1d1e1f;
$vxe-table-row-current-background-color: #9e8787; $vxe-table-row-current-background-color: #302d2d;
$vxe-table-column-current-background-color: #9e8787; $vxe-table-column-current-background-color: #302d2d;
$vxe-table-column-hover-background-color: #9e8787; $vxe-table-column-hover-background-color: #302d2d;
$vxe-table-row-hover-current-background-color: #9e8787; $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-menu-background-color: #1d1e1f;
$vxe-table-border-width: 1px !default; $vxe-table-border-width: 1px !default;
$vxe-table-border-color: #4c4d4f !default; $vxe-table-border-color: #4c4d4f !default;

1
yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
View File

@ -28,7 +28,6 @@
<XButton preIcon="ep:refresh-right" :title="t('common.reset')" @click="resetQuery()" /> <XButton preIcon="ep:refresh-right" :title="t('common.reset')" @click="resetQuery()" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- TODO 星语：【暗黑模式】选中后，样式有点不太好看 -->
<vxe-table <vxe-table
ref="xTable" ref="xTable"
:data="dbTableList" :data="dbTableList"

1
yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
View File

@ -91,5 +91,4 @@ const crudSchemas = reactive<VxeCrudSchema>({
} }
] ]
}) })
// TODO 星语：“创建时间”的筛选，超过 table 的边框
export const { allSchemas } = useVxeCrudSchemas(crudSchemas) export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

3
yudao-ui-admin-vue3/src/views/system/user/index.vue
View File

@ -54,8 +54,7 @@
@click="exportList('用户数据.xls')" @click="exportList('用户数据.xls')"
/> />
</template> </template>
<!-- TODO @星语：貌似没生效？ --> <template #status_default="{ row }">
<template #status="{ row }">
<el-switch <el-switch
v-model="row.status" v-model="row.status"
:active-value="0" :active-value="0"

7
yudao-ui-admin-vue3/src/views/system/user/user.data.ts
View File

@ -70,7 +70,12 @@ const crudSchemas = reactive<VxeCrudSchema>({
field: 'status', field: 'status',
dictType: DICT_TYPE.COMMON_STATUS, dictType: DICT_TYPE.COMMON_STATUS,
dictClass: 'number', dictClass: 'number',
isSearch: true isSearch: true,
table: {
slots: {
default: 'status_default'
}
}
}, },
{ {
title: '最后登录时间', title: '最后登录时间',