diff --git a/yudao-ui-admin-vue3/src/api/system/post/types.ts b/yudao-ui-admin-vue3/src/api/system/post/types.ts index 5d6a70c85..9986c3d6b 100644 --- a/yudao-ui-admin-vue3/src/api/system/post/types.ts +++ b/yudao-ui-admin-vue3/src/api/system/post/types.ts @@ -5,7 +5,7 @@ export type PostVO = { sort: number status: number remark: string - createTime: string + createTime?: string } export type PostPageReqVO = { diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts index f590e9e44..57db7578f 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts @@ -3,6 +3,7 @@ import { getIntDictOptions } from '@/utils/dict' import { reactive } from 'vue' import { FormItemRenderOptions, + VxeColumnPropTypes, VxeFormItemProps, VxeGridPropTypes, VxeTableDefines @@ -10,10 +11,13 @@ import { import { eachTree } from 'xe-utils' import { useI18n } from '@/hooks/web/useI18n' import { VxeTableColumn } from '@/types/table' +import { FormSchema } from '@/types/form' +import { ComponentOptions } from '@/types/components' export type VxeCrudSchema = Omit & { field: string title?: string + formatter?: VxeColumnPropTypes.Formatter search?: CrudSearchParams table?: CrudTableParams form?: CrudFormParams @@ -35,7 +39,7 @@ type CrudTableParams = { type CrudFormParams = { // 是否显示表单项 show?: boolean -} & Omit +} & Omit type CrudDescriptionsParams = { // 是否显示表单项 @@ -47,10 +51,10 @@ type CrudPrintParams = { show?: boolean } & Omit -interface VxeAllSchemas { +export type VxeAllSchemas = { searchSchema: VxeFormItemProps[] tableSchema: VxeGridPropTypes.Columns - formSchema: VxeFormItemProps[] + formSchema: FormSchema[] detailSchema: DescriptionsSchema[] printSchema: VxeTableDefines.ColumnInfo[] } @@ -160,6 +164,9 @@ const filterTableSchema = (crudSchema: VxeCrudSchema[]): VxeGridPropTypes.Column field: schemaItem.field, title: schemaItem.table?.title || schemaItem.title } + if (schemaItem?.formatter) { + tableSchemaItem.formatter = schemaItem.formatter + } // 删除不必要的字段 delete tableSchemaItem.show @@ -171,32 +178,31 @@ const filterTableSchema = (crudSchema: VxeCrudSchema[]): VxeGridPropTypes.Column } // 过滤 form 结构 -const filterFormSchema = (crudSchema: VxeCrudSchema[]): VxeFormItemProps[] => { - const formSchema: VxeFormItemProps[] = [] - const { t } = useI18n() +const filterFormSchema = (crudSchema: VxeCrudSchema[]): FormSchema[] => { + const formSchema: FormSchema[] = [] + eachTree(crudSchema, (schemaItem: VxeCrudSchema) => { // 判断是否显示 if (schemaItem?.form?.show !== false) { - let itemRenderName = schemaItem?.form?.itemRender?.name || '$input' - let itemRender: FormItemRenderOptions = { - name: itemRenderName, - props: { placeholder: t('common.inputText') } - } + let component = schemaItem?.form?.component || 'Input' + const options: ComponentOptions[] = [] + let comonentProps = {} if (schemaItem.dictType) { - if (!(schemaItem.form && schemaItem.form.itemRender?.name)) itemRenderName = '$select' - itemRender = { - name: itemRenderName, - options: getIntDictOptions(schemaItem.dictType), - props: { placeholder: t('common.selectText') } + getIntDictOptions(schemaItem.dictType).forEach((dict) => { + options.push(dict) + }) + comonentProps = { + options: options } + if (!(schemaItem.form && schemaItem.form.component)) component = 'Select' } const formSchemaItem = { // 默认为 input - itemRender: itemRender, + component: component, + componentProps: comonentProps, ...schemaItem.form, - span: schemaItem.form?.span || 12, field: schemaItem.field, - title: schemaItem.form?.title || schemaItem.title + label: schemaItem.form?.label || schemaItem.title } // 删除不必要的字段 diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts index f2de019e0..04b0df0b8 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts @@ -1,6 +1,19 @@ import { computed, reactive } from 'vue' import { VxeGridProps } from 'vxe-table' import { useAppStore } from '@/store/modules/app' +import { VxeAllSchemas } from './useVxeCrudSchemas' +import { useI18n } from '@/hooks/web/useI18n' +import { useMessage } from '@/hooks/web/useMessage' + +const { t } = useI18n() +const message = useMessage() // 消息弹窗 + +interface UseVxeGridConfig { + allSchemas: VxeAllSchemas + getListApi: (option: any) => Promise + delListApi?: (option: any) => Promise + exportListApi?: (option: any) => Promise +} const appStore = useAppStore() @@ -14,36 +27,40 @@ const currentSize = computed(() => { } }) -export const useVxeGrid = (allSchemas, getPageApi) => { +export const useVxeGrid = (config?: UseVxeGridConfig) => { const gridOptions = reactive({ - loading: false, + loading: true, size: currentSize.value, height: 800, rowConfig: { - keyField: 'id', - isCurrent: true, - isHover: true + isCurrent: true, // 当鼠标点击行时,是否要高亮当前行 + isHover: true // 当鼠标移到行时,是否要高亮当前行 + }, + showOverflow: 'tooltip', // 当内容溢出时显示为省略号 + tooltipConfig: { + showAll: true // 开启全表工具提示 }, toolbarConfig: { custom: true, slots: { buttons: 'toolbar_buttons' } }, printConfig: { - columns: allSchemas.printSchema + columns: config?.allSchemas.printSchema }, formConfig: { titleWidth: 100, titleAlign: 'right', - items: allSchemas.searchSchema + items: config?.allSchemas.searchSchema }, - columns: allSchemas.tableSchema, + columns: config?.allSchemas.tableSchema, pagerConfig: { - border: false, - background: false, - perfect: true, - pageSize: 10, - pagerCount: 7, - pageSizes: [5, 10, 15, 20, 50, 100, 200, 500], + border: false, // 带边框 + background: true, // 带背景颜色 + perfect: true, // 配套的样式 + pageSize: 10, // 每页大小 + pagerCount: 7, // 显示页码按钮的数量 + autoHidden: true, // 当只有一页时自动隐藏 + pageSizes: [5, 10, 15, 20, 50, 100, 200, 500], // 每页大小选项列表 layouts: [ 'PrevJump', 'PrevPage', @@ -61,17 +78,25 @@ export const useVxeGrid = (allSchemas, getPageApi) => { props: { result: 'list', total: 'total' }, ajax: { query: ({ page, form }) => { - gridOptions.loading = true const queryParams = Object.assign({}, form) queryParams.pageSize = page.pageSize queryParams.pageNo = page.currentPage gridOptions.loading = false return new Promise(async (resolve) => { - resolve(await getPageApi(queryParams)) + resolve(await config?.getListApi(queryParams)) }) } } } }) - return gridOptions + const delList = (ids: string | number | string[] | number[]) => { + message.delConfirm().then(() => { + config?.delListApi && config?.delListApi(ids) + message.success(t('common.delSuccess')) + }) + } + return { + gridOptions, + delList + } } diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue index b84e06676..b92b6d8ae 100644 --- a/yudao-ui-admin-vue3/src/views/system/post/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue @@ -44,12 +44,11 @@ diff --git a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts index 6b19a98f1..6232e41a1 100644 --- a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts @@ -56,9 +56,17 @@ const crudSchemas = reactive([ show: true } }, + { + title: '备注', + field: 'remark', + table: { + show: false + } + }, { title: t('common.createTime'), field: 'createTime', + formatter: 'formatDate', form: { show: false } @@ -66,10 +74,8 @@ const crudSchemas = reactive([ { title: t('table.action'), field: 'action', - width: '240px', table: { width: '240px', - showOverflow: true, slots: { default: 'action_default' }