This commit is contained in:
xingyu 2022-11-22 22:43:44 +08:00
parent c8eb95b95e
commit 0e6c187008
3 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,5 @@
import { DescriptionsSchema } from '@/types/descriptions'
import { getBoolDictOptions, getDictOptions, getIntDictOptions } from '@/utils/dict'
import { reactive } from 'vue' import { reactive } from 'vue'
import { import {
FormItemRenderOptions, FormItemRenderOptions,
VxeColumnPropTypes, VxeColumnPropTypes,
@ -9,10 +8,12 @@ import {
VxeTableDefines VxeTableDefines
} from 'vxe-table' } from 'vxe-table'
import { eachTree } from 'xe-utils' import { eachTree } from 'xe-utils'
import { getBoolDictOptions, getDictOptions, getIntDictOptions } from '@/utils/dict'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { VxeTableColumn } from '@/types/table'
import { FormSchema } from '@/types/form' import { FormSchema } from '@/types/form'
import { VxeTableColumn } from '@/types/table'
import { ComponentOptions } from '@/types/components' import { ComponentOptions } from '@/types/components'
import { DescriptionsSchema } from '@/types/descriptions'
export type VxeCrudSchema = { export type VxeCrudSchema = {
primaryKey?: string // 主键ID primaryKey?: string // 主键ID
@ -146,11 +147,11 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => {
} }
const searchSchemaItem = { const searchSchemaItem = {
// 默认为 input // 默认为 input
folding: searchSchema.length > 2, folding: searchSchema.length > 3,
itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender,
field: schemaItem.field, field: schemaItem.field,
title: schemaItem.search?.title || schemaItem.title, title: schemaItem.search?.title || schemaItem.title,
span: 8 span: 6
} }
searchSchema.push(searchSchemaItem) searchSchema.push(searchSchemaItem)

View File

@ -13,7 +13,7 @@ VXETable.renderer.add('XDataTimePicker', {
<ElDatePicker <ElDatePicker
v-model={data[field]} v-model={data[field]}
type={content ? (content as any) : 'datetimerange'} type={content ? (content as any) : 'datetimerange'}
style="maxWidth: 330px" 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')}

View File

@ -69,6 +69,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
title: '操作结果', title: '操作结果',
field: 'success', field: 'success',
isTable: false, isTable: false,
isDetail: false,
search: { search: {
show: true, show: true,
itemRender: { itemRender: {