diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts index f7a10eb9..416ea02e 100644 --- a/build/vite/optimize.ts +++ b/build/vite/optimize.ts @@ -75,7 +75,8 @@ const include = [ 'element-plus/es/components/dropdown-item/style/css', 'element-plus/es/components/badge/style/css', 'element-plus/es/components/breadcrumb/style/css', - 'element-plus/es/components/breadcrumb-item/style/css' + 'element-plus/es/components/breadcrumb-item/style/css', + 'element-plus/es/components/image/style/css' ] const exclude = ['@iconify/json'] diff --git a/package.json b/package.json index 8293eeb7..1d020d6d 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "steady-xml": "^0.1.0", "url": "^0.11.0", "video.js": "^8.0.4", - "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vue": "3.2.47", "vue-i18n": "9.2.2", "vue-router": "^4.1.6", diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue index f5be8d3a..9b77fb2b 100644 --- a/src/components/Icon/src/IconSelect.vue +++ b/src/components/Icon/src/IconSelect.vue @@ -95,7 +95,7 @@ watch( return props.modelValue }, () => { - if (props.modelValue) { + if (props.modelValue && props.modelValue.indexOf(':') >= 0) { currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1) icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1) } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index d1d84242..03e17e75 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -21,7 +21,7 @@ export interface DictDataType { } export const getDictOptions = (dictType: string) => { - return dictStore.getDictByType(dictType) + return dictStore.getDictByType(dictType) || [] } export const getIntDictOptions = (dictType: string) => { @@ -117,6 +117,7 @@ export enum DICT_TYPE { INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status', INFRA_CONFIG_TYPE = 'infra_config_type', INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type', + INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type', INFRA_CODEGEN_SCENE = 'infra_codegen_scene', INFRA_FILE_STORAGE = 'infra_file_storage', diff --git a/src/views/infra/codegen/EditTable.vue b/src/views/infra/codegen/EditTable.vue index e8cae410..8d9f498e 100644 --- a/src/views/infra/codegen/EditTable.vue +++ b/src/views/infra/codegen/EditTable.vue @@ -30,7 +30,7 @@ const { query } = useRoute() // 查询参数 const { delView } = useTagsViewStore() // 视图操作 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 -const activeName = ref('basicInfo') // Tag 激活的窗口 +const activeName = ref('colum') // Tag 激活的窗口 const basicInfoRef = ref>() const columInfoRef = ref>() const generateInfoRef = ref>() diff --git a/src/views/infra/codegen/PreviewCode.vue b/src/views/infra/codegen/PreviewCode.vue index 6a81499d..5dd3907b 100644 --- a/src/views/infra/codegen/PreviewCode.vue +++ b/src/views/infra/codegen/PreviewCode.vue @@ -15,7 +15,7 @@ v-loading="loading" element-loading-text="生成文件目录中..." > - + + + + + + + + + @@ -25,6 +38,26 @@ + + + + + + @@ -115,27 +148,6 @@ - - - - - - - - + diff --git a/src/views/pay/order/orderForm.vue b/src/views/pay/order/orderForm.vue deleted file mode 100644 index f9625085..00000000 --- a/src/views/pay/order/orderForm.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue deleted file mode 100644 index cc9d8726..00000000 --- a/src/views/pay/refund/refundForm.vue +++ /dev/null @@ -1,154 +0,0 @@ - - - - diff --git a/src/views/system/dict/data/DictDataForm.vue b/src/views/system/dict/data/DictDataForm.vue index 3bef7893..dc2f6057 100644 --- a/src/views/system/dict/data/DictDataForm.vue +++ b/src/views/system/dict/data/DictDataForm.vue @@ -115,11 +115,12 @@ const colorTypeOptions = readonly([ ]) /** 打开弹窗 */ -const open = async (type: string, id?: number) => { +const open = async (type: string, id?: number, dictType?: string) => { dialogVisible.value = true dialogTitle.value = t('action.' + type) formType.value = type resetForm() + formData.value.dictType = dictType // 修改时,设置数据 if (id) { formLoading.value = true diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue index 77770dda..cb4c076e 100644 --- a/src/views/system/dict/data/index.vue +++ b/src/views/system/dict/data/index.vue @@ -167,7 +167,7 @@ const resetQuery = () => { /** 添加/修改操作 */ const formRef = ref() const openForm = (type: string, id?: number) => { - formRef.value.open(type, id) + formRef.value.open(type, id, queryParams.dictType) } /** 删除按钮操作 */ diff --git a/src/views/system/mail/account/account.data.ts b/src/views/system/mail/account/account.data.ts index eaa0673a..8b33edc5 100644 --- a/src/views/system/mail/account/account.data.ts +++ b/src/views/system/mail/account/account.data.ts @@ -19,7 +19,7 @@ export const rules = reactive({ sslEnable: [required] }) -// CrudSchema:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/hooks/useCrudSchemas.html +// CrudSchema:https://doc.iocoder.cn/vue3/crud-schema/ const crudSchemas = reactive([ { label: '邮箱', diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue index eeaf8bcf..f66bbf66 100644 --- a/src/views/system/mail/account/index.vue +++ b/src/views/system/mail/account/index.vue @@ -72,7 +72,7 @@ import MailAccountDetail from './MailAccountDetail.vue' // tableObject:表格的属性对象,可获得分页大小、条数等属性 // tableMethods:表格的操作对象,可进行获得分页、删除记录等操作 -// 详细可见:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/components/table.html#usetable +// 详细可见:https://doc.iocoder.cn/vue3/crud-schema/ const { tableObject, tableMethods } = useTable({ getListApi: MailAccountApi.getMailAccountPage, // 分页接口 delListApi: MailAccountApi.deleteMailAccount // 删除接口 diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue index f039e66e..c24ff009 100644 --- a/src/views/system/mail/log/index.vue +++ b/src/views/system/mail/log/index.vue @@ -41,7 +41,7 @@ import MailLogDetail from './MailLogDetail.vue' // tableObject:表格的属性对象,可获得分页大小、条数等属性 // tableMethods:表格的操作对象,可进行获得分页、删除记录等操作 -// 详细可见:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/components/table.html#usetable +// 详细可见:https://doc.iocoder.cn/vue3/crud-schema/ const { tableObject, tableMethods } = useTable({ getListApi: MailLogApi.getMailLogPage // 分页接口 }) diff --git a/src/views/system/mail/log/log.data.ts b/src/views/system/mail/log/log.data.ts index 0fa695e4..62cbf516 100644 --- a/src/views/system/mail/log/log.data.ts +++ b/src/views/system/mail/log/log.data.ts @@ -5,7 +5,7 @@ import * as MailAccountApi from '@/api/system/mail/account' // 邮箱账号的列表 const accountList = await MailAccountApi.getSimpleMailAccountList() -// CrudSchema:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/hooks/useCrudSchemas.html +// CrudSchema:https://doc.iocoder.cn/vue3/crud-schema/ const crudSchemas = reactive([ { label: '编号', diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue index 357b028f..a964a6fb 100644 --- a/src/views/system/mail/template/index.vue +++ b/src/views/system/mail/template/index.vue @@ -73,7 +73,7 @@ import MailTemplateSendForm from './MailTemplateSendForm.vue' // tableObject:表格的属性对象,可获得分页大小、条数等属性 // tableMethods:表格的操作对象,可进行获得分页、删除记录等操作 -// 详细可见:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/components/table.html#usetable +// 详细可见:https://doc.iocoder.cn/vue3/crud-schema/ const { tableObject, tableMethods } = useTable({ getListApi: MailTemplateApi.getMailTemplatePage, // 分页接口 delListApi: MailTemplateApi.deleteMailTemplate // 删除接口 diff --git a/src/views/system/mail/template/template.data.ts b/src/views/system/mail/template/template.data.ts index 99e6764a..e68f875a 100644 --- a/src/views/system/mail/template/template.data.ts +++ b/src/views/system/mail/template/template.data.ts @@ -17,7 +17,7 @@ export const rules = reactive({ status: [required] }) -// CrudSchema:https://kailong110120130.gitee.io/vue-element-plus-admin-doc/hooks/useCrudSchemas.html +// CrudSchema:https://doc.iocoder.cn/vue3/crud-schema/ const crudSchemas = reactive([ { label: '模板编码',