Commit 0e6c187008dd7637641f054ad893ae573baff36e
1 parent
c8eb95b9
style
Showing
3 changed files
with
8 additions
and
6 deletions
yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
| 1 | -import { DescriptionsSchema } from '@/types/descriptions' | ||
| 2 | -import { getBoolDictOptions, getDictOptions, getIntDictOptions } from '@/utils/dict' | ||
| 3 | import { reactive } from 'vue' | 1 | import { reactive } from 'vue' |
| 2 | + | ||
| 4 | import { | 3 | import { |
| 5 | FormItemRenderOptions, | 4 | FormItemRenderOptions, |
| 6 | VxeColumnPropTypes, | 5 | VxeColumnPropTypes, |
| @@ -9,10 +8,12 @@ import { | @@ -9,10 +8,12 @@ import { | ||
| 9 | VxeTableDefines | 8 | VxeTableDefines |
| 10 | } from 'vxe-table' | 9 | } from 'vxe-table' |
| 11 | import { eachTree } from 'xe-utils' | 10 | import { eachTree } from 'xe-utils' |
| 11 | +import { getBoolDictOptions, getDictOptions, getIntDictOptions } from '@/utils/dict' | ||
| 12 | import { useI18n } from '@/hooks/web/useI18n' | 12 | import { useI18n } from '@/hooks/web/useI18n' |
| 13 | -import { VxeTableColumn } from '@/types/table' | ||
| 14 | import { FormSchema } from '@/types/form' | 13 | import { FormSchema } from '@/types/form' |
| 14 | +import { VxeTableColumn } from '@/types/table' | ||
| 15 | import { ComponentOptions } from '@/types/components' | 15 | import { ComponentOptions } from '@/types/components' |
| 16 | +import { DescriptionsSchema } from '@/types/descriptions' | ||
| 16 | 17 | ||
| 17 | export type VxeCrudSchema = { | 18 | export type VxeCrudSchema = { |
| 18 | primaryKey?: string // 主键ID | 19 | primaryKey?: string // 主键ID |
| @@ -146,11 +147,11 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | @@ -146,11 +147,11 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | ||
| 146 | } | 147 | } |
| 147 | const searchSchemaItem = { | 148 | const searchSchemaItem = { |
| 148 | // 默认为 input | 149 | // 默认为 input |
| 149 | - folding: searchSchema.length > 2, | 150 | + folding: searchSchema.length > 3, |
| 150 | itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, | 151 | itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, |
| 151 | field: schemaItem.field, | 152 | field: schemaItem.field, |
| 152 | title: schemaItem.search?.title || schemaItem.title, | 153 | title: schemaItem.search?.title || schemaItem.title, |
| 153 | - span: 8 | 154 | + span: 6 |
| 154 | } | 155 | } |
| 155 | 156 | ||
| 156 | searchSchema.push(searchSchemaItem) | 157 | searchSchema.push(searchSchemaItem) |
yudao-ui-admin-vue3/src/plugins/vxeTable/renderer/dataTimePicker.tsx
| @@ -13,7 +13,7 @@ VXETable.renderer.add('XDataTimePicker', { | @@ -13,7 +13,7 @@ VXETable.renderer.add('XDataTimePicker', { | ||
| 13 | <ElDatePicker | 13 | <ElDatePicker |
| 14 | v-model={data[field]} | 14 | v-model={data[field]} |
| 15 | type={content ? (content as any) : 'datetimerange'} | 15 | type={content ? (content as any) : 'datetimerange'} |
| 16 | - style="maxWidth: 330px" | 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/views/system/operatelog/operatelog.data.ts
| @@ -69,6 +69,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ | @@ -69,6 +69,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ | ||
| 69 | title: '操作结果', | 69 | title: '操作结果', |
| 70 | field: 'success', | 70 | field: 'success', |
| 71 | isTable: false, | 71 | isTable: false, |
| 72 | + isDetail: false, | ||
| 72 | search: { | 73 | search: { |
| 73 | show: true, | 74 | show: true, |
| 74 | itemRender: { | 75 | itemRender: { |