Commit b1caa1a17b25f95d8f28c2aaabf5aafa2d25c759
1 parent
ac476382
perf: vxe
Showing
3 changed files
with
2 additions
and
21 deletions
yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
| @@ -104,8 +104,8 @@ export const useVxeCrudSchemas = ( | @@ -104,8 +104,8 @@ export const useVxeCrudSchemas = ( | ||
| 104 | 104 | ||
| 105 | // 过滤 Search 结构 | 105 | // 过滤 Search 结构 |
| 106 | const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | 106 | const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { |
| 107 | - const searchSchema: VxeFormItemProps[] = [] | ||
| 108 | const { t } = useI18n() | 107 | const { t } = useI18n() |
| 108 | + const searchSchema: VxeFormItemProps[] = [] | ||
| 109 | eachTree(crudSchema.columns, (schemaItem: VxeCrudColumns) => { | 109 | eachTree(crudSchema.columns, (schemaItem: VxeCrudColumns) => { |
| 110 | // 判断是否显示 | 110 | // 判断是否显示 |
| 111 | if (schemaItem?.search?.show) { | 111 | if (schemaItem?.search?.show) { |
| @@ -132,14 +132,11 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | @@ -132,14 +132,11 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | ||
| 132 | const searchSchemaItem = { | 132 | const searchSchemaItem = { |
| 133 | // 默认为 input | 133 | // 默认为 input |
| 134 | folding: searchSchema.length > 2, | 134 | folding: searchSchema.length > 2, |
| 135 | - itemRender: itemRender, | ||
| 136 | - ...schemaItem.search, | 135 | + itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, |
| 137 | field: schemaItem.field, | 136 | field: schemaItem.field, |
| 138 | title: schemaItem.search?.title || schemaItem.title, | 137 | title: schemaItem.search?.title || schemaItem.title, |
| 139 | span: 8 | 138 | span: 8 |
| 140 | } | 139 | } |
| 141 | - // 删除不必要的字段 | ||
| 142 | - delete searchSchemaItem.show | ||
| 143 | 140 | ||
| 144 | searchSchema.push(searchSchemaItem) | 141 | searchSchema.push(searchSchemaItem) |
| 145 | } | 142 | } |
yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
| @@ -10,18 +10,6 @@ | @@ -10,18 +10,6 @@ | ||
| 10 | @click="handleCreate()" | 10 | @click="handleCreate()" |
| 11 | /> | 11 | /> |
| 12 | </template> | 12 | </template> |
| 13 | - <template #createTime_item="{ data }"> | ||
| 14 | - <el-date-picker | ||
| 15 | - v-model="data.createTime" | ||
| 16 | - type="datetimerange" | ||
| 17 | - range-separator="-" | ||
| 18 | - :start-placeholder="t('common.startTimeText')" | ||
| 19 | - :end-placeholder="t('common.endTimeText')" | ||
| 20 | - /> | ||
| 21 | - </template> | ||
| 22 | - <template #type_default="{ row }"> | ||
| 23 | - <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" /> | ||
| 24 | - </template> | ||
| 25 | <template #actionbtns_default="{ row }"> | 13 | <template #actionbtns_default="{ row }"> |
| 26 | <XTextButton | 14 | <XTextButton |
| 27 | preIcon="ep:edit" | 15 | preIcon="ep:edit" |
| @@ -93,7 +81,6 @@ import { useMessage } from '@/hooks/web/useMessage' | @@ -93,7 +81,6 @@ import { useMessage } from '@/hooks/web/useMessage' | ||
| 93 | import { useVxeGrid } from '@/hooks/web/useVxeGrid' | 81 | import { useVxeGrid } from '@/hooks/web/useVxeGrid' |
| 94 | import { VxeGridInstance } from 'vxe-table' | 82 | import { VxeGridInstance } from 'vxe-table' |
| 95 | import { FormExpose } from '@/components/Form' | 83 | import { FormExpose } from '@/components/Form' |
| 96 | -import { ElDatePicker } from 'element-plus' | ||
| 97 | 84 | ||
| 98 | const { t } = useI18n() // 国际化 | 85 | const { t } = useI18n() // 国际化 |
| 99 | const message = useMessage() // 消息弹窗 | 86 | const message = useMessage() // 消息弹窗 |
yudao-ui-admin-vue3/src/views/system/post/index.vue
| @@ -10,9 +10,6 @@ | @@ -10,9 +10,6 @@ | ||
| 10 | @click="handleCreate()" | 10 | @click="handleCreate()" |
| 11 | /> | 11 | /> |
| 12 | </template> | 12 | </template> |
| 13 | - <template #status_default="{ row }"> | ||
| 14 | - <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" /> | ||
| 15 | - </template> | ||
| 16 | <template #actionbtns_default="{ row }"> | 13 | <template #actionbtns_default="{ row }"> |
| 17 | <XTextButton | 14 | <XTextButton |
| 18 | preIcon="ep:edit" | 15 | preIcon="ep:edit" |