From 6dd3219d5aa404d76ee82cb175bb62ebe5eb7b86 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Thu, 13 Apr 2023 17:10:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/types/auto-components.d.ts | 6 --- src/types/auto-imports.d.ts | 1 + src/views/bpm/form/index.vue | 4 +- src/views/bpm/group/index.vue | 3 +- src/views/bpm/model/index.vue | 3 +- src/views/bpm/oa/leave/index.vue | 4 +- src/views/bpm/processInstance/index.vue | 3 +- src/views/bpm/taskAssignRule/index.vue | 4 +- src/views/infra/apiErrorLog/index.vue | 3 +- src/views/infra/codegen/index.vue | 4 +- src/views/infra/config/index.vue | 4 +- src/views/infra/dataSourceConfig/index.vue | 3 +- src/views/infra/fileConfig/index.vue | 4 +- src/views/infra/fileList/index.vue | 4 +- src/views/infra/job/JobLog.vue | 3 +- src/views/infra/job/index.vue | 4 +- src/views/pay/app/index.vue | 4 +- src/views/pay/merchant/index.vue | 4 +- src/views/pay/order/index.vue | 3 +- src/views/pay/refund/index.vue | 4 +- src/views/system/dept/index.vue | 8 ++-- src/views/system/dict/index.vue | 26 ++++++----- src/views/system/errorCode/index.vue | 3 +- src/views/system/loginlog/index.vue | 4 +- src/views/system/mail/account/index.vue | 4 +- src/views/system/mail/template/index.vue | 3 +- src/views/system/menu/index.vue | 3 +- src/views/system/notice/index.vue | 3 +- src/views/system/notify/my/index.vue | 4 +- src/views/system/notify/template/index.vue | 4 +- src/views/system/oauth2/client/index.vue | 3 +- src/views/system/oauth2/token/index.vue | 4 +- src/views/system/operatelog/index.vue | 4 +- src/views/system/post/index.vue | 4 +- src/views/system/role/index.vue | 13 +++--- src/views/system/sensitiveWord/index.vue | 3 +- src/views/system/sms/smsChannel/index.vue | 4 +- src/views/system/sms/smsLog/index.vue | 4 +- src/views/system/sms/smsTemplate/index.vue | 9 ++-- src/views/system/tenant/index.vue | 4 +- src/views/system/tenantPackage/index.vue | 4 +- src/views/system/user/index.vue | 51 ++++++++++------------ src/views/system/user/user.data.ts | 4 +- 44 files changed, 128 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index 683d09eb4..0ac7f19c1 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,8 @@ "vite-plugin-progress": "^0.0.6", "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", - "vite-plugin-vue-setup-extend": "^0.4.0", + "vite-plugin-top-level-await": "^1.3.0", + "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vite-plugin-windicss": "^1.8.10", "vue-tsc": "^1.2.0", "windicss": "^3.5.6" diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 80a5900fb..c39091075 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -23,7 +23,6 @@ declare module '@vue/runtime-core' { DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] - ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -34,7 +33,6 @@ declare module '@vue/runtime-core' { ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] @@ -53,7 +51,6 @@ declare module '@vue/runtime-core' { ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] @@ -71,12 +68,9 @@ declare module '@vue/runtime-core' { ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTableV2: typeof import('element-plus/es')['ElTableV2'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 75cf16d9a..9713e05a2 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -51,6 +51,7 @@ declare global { const toRefs: typeof import('vue')['toRefs'] const triggerRef: typeof import('vue')['triggerRef'] const unref: typeof import('vue')['unref'] + const useAdaptiveXTable: typeof import('@/hooks/web/useAdaptiveXTable')['useAdaptiveXTable'] const useAttrs: typeof import('vue')['useAttrs'] const useCrudSchemas: typeof import('@/hooks/web/useCrudSchemas')['useCrudSchemas'] const useCssModule: typeof import('vue')['useCssModule'] diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue index b4b208a98..22c6c572c 100644 --- a/src/views/bpm/form/index.vue +++ b/src/views/bpm/form/index.vue @@ -54,12 +54,12 @@ const { t } = useI18n() // 国际化 const { push } = useRouter() // 路由 // 列表相关的变量 -const [registerTable, { deleteData }] = useXTable({ +const [registerTable, { deleteData, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: FormApi.getFormPageApi, deleteApi: FormApi.deleteFormApi }) - +useAdaptiveXTable([setProps]) // 新增操作 const handleCreate = () => { push({ diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue index b0f085163..9a8ece3e5 100644 --- a/src/views/bpm/group/index.vue +++ b/src/views/bpm/group/index.vue @@ -95,11 +95,12 @@ import { FormExpose } from '@/components/Form' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData }] = useXTable({ +const [registerTable, { reload, deleteData, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: UserGroupApi.getUserGroupPageApi, deleteApi: UserGroupApi.deleteUserGroupApi }) +useAdaptiveXTable([setProps]) // 用户列表 const users = ref([]) diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index 25136e131..3e73a3d33 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -338,10 +338,11 @@ const bpmnControlForm = ref({ prefix: 'flowable' }) // ========== 列表相关 ========== -const [registerTable, { reload }] = useXTable({ +const [registerTable, { reload, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: ModelApi.getModelPageApi }) +useAdaptiveXTable([setProps]) const forms = ref() // 流程表单的下拉框的数据 // 设计流程 diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue index 91e7ccdaf..eb4a00ada 100644 --- a/src/views/bpm/oa/leave/index.vue +++ b/src/views/bpm/oa/leave/index.vue @@ -35,11 +35,11 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { push } = useRouter() // 路由 -const [registerTable, { reload }] = useXTable({ +const [registerTable, { reload, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: LeaveApi.getLeavePageApi }) - +useAdaptiveXTable([setProps]) // 发起请假 const handleCreate = () => { push({ diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index f43e53ef1..9bd87b6cd 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -55,10 +55,11 @@ const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 // ========== 列表相关 ========== -const [registerTable, { reload }] = useXTable({ +const [registerTable, { reload, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: ProcessInstanceApi.getMyProcessInstancePageApi }) +useAdaptiveXTable([setProps]) /** 发起流程操作 **/ const handleCreate = () => { diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue index 6a09b147e..52f9999b3 100644 --- a/src/views/bpm/taskAssignRule/index.vue +++ b/src/views/bpm/taskAssignRule/index.vue @@ -173,13 +173,13 @@ const queryParams = reactive({ modelId: modelId, processDefinitionId: processDefinitionId }) -const [registerTable, { reload }] = useXTable({ +const [registerTable, { reload, setProps }] = useXTable({ allSchemas: allSchemas, params: queryParams, getListApi: TaskAssignRuleApi.getTaskAssignRuleList, isList: true }) - +useAdaptiveXTable([setProps]) // 翻译规则范围 const getAssignRuleOptionName = (type, option) => { if (type === 10) { diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue index 4193351a3..f4d5acb87 100644 --- a/src/views/infra/apiErrorLog/index.vue +++ b/src/views/infra/apiErrorLog/index.vue @@ -60,11 +60,12 @@ const { t } = useI18n() // 国际化 const message = useMessage() // ========== 列表相关 ========== -const [registerTable, { reload, exportList }] = useXTable({ +const [registerTable, { reload, exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: ApiErrorLogApi.getApiErrorLogPageApi, exportListApi: ApiErrorLogApi.exportApiErrorLogApi }) +useAdaptiveXTable([setProps]) // ========== 详情相关 ========== const detailData = ref() // 详情 Ref const dialogVisible = ref(false) // 是否显示弹出层 diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue index 8337d2d45..17547b52b 100644 --- a/src/views/infra/codegen/index.vue +++ b/src/views/infra/codegen/index.vue @@ -67,12 +67,12 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { push } = useRouter() // 路由跳转 // 列表相关的变量 -const [registerTable, { reload, deleteData }] = useXTable({ +const [registerTable, { reload, deleteData, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: CodegenApi.getCodegenTablePageApi, deleteApi: CodegenApi.deleteCodegenTableApi }) - +useAdaptiveXTable([setProps]) // 导入操作 const importRef = ref() const openImportTable = () => { diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index ddf9eebae..3e343481c 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -91,13 +91,13 @@ import { rules, allSchemas } from './config.data' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData, exportList }] = useXTable({ +const [registerTable, { reload, deleteData, exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: ConfigApi.getConfigPage, deleteApi: ConfigApi.deleteConfig, exportListApi: ConfigApi.exportConfigApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue index 1e3db49d4..48a12f7ae 100644 --- a/src/views/infra/dataSourceConfig/index.vue +++ b/src/views/infra/dataSourceConfig/index.vue @@ -74,12 +74,13 @@ import { rules, allSchemas } from './dataSourceConfig.data' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData }] = useXTable({ +const [registerTable, { reload, deleteData, setProps }] = useXTable({ allSchemas: allSchemas, isList: true, getListApi: DataSourceConfiggApi.getDataSourceConfigListApi, deleteApi: DataSourceConfiggApi.deleteDataSourceConfigApi }) +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const loading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/infra/fileConfig/index.vue b/src/views/infra/fileConfig/index.vue index bd9a978ac..41d680111 100644 --- a/src/views/infra/fileConfig/index.vue +++ b/src/views/infra/fileConfig/index.vue @@ -167,12 +167,12 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData }] = useXTable({ +const [registerTable, { reload, deleteData, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: FileConfigApi.getFileConfigPageApi, deleteApi: FileConfigApi.deleteFileConfigApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/infra/fileList/index.vue b/src/views/infra/fileList/index.vue index 1d79cb9ee..7e77a9f61 100644 --- a/src/views/infra/fileList/index.vue +++ b/src/views/infra/fileList/index.vue @@ -90,12 +90,12 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData }] = useXTable({ +const [registerTable, { reload, deleteData, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: FileApi.getFilePageApi, deleteApi: FileApi.deleteFileApi }) - +useAdaptiveXTable([setProps]) const detailData = ref() // 详情 Ref const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref('') // 弹出层标题 diff --git a/src/views/infra/job/JobLog.vue b/src/views/infra/job/JobLog.vue index 1771bbd74..49a81b6f4 100644 --- a/src/views/infra/job/JobLog.vue +++ b/src/views/infra/job/JobLog.vue @@ -54,11 +54,12 @@ import { allSchemas } from './jobLog.data' const { t } = useI18n() // 国际化 // 列表相关的变量 -const [registerTable, { exportList }] = useXTable({ +const [registerTable, { exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: JobLogApi.getJobLogPageApi, exportListApi: JobLogApi.exportJobLogApi }) +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref('') // 弹出层标题 diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue index 613f84c43..059af39ae 100644 --- a/src/views/infra/job/index.vue +++ b/src/views/infra/job/index.vue @@ -139,13 +139,13 @@ const message = useMessage() // 消息弹窗 const { push } = useRouter() // 列表相关的变量 -const [registerTable, { reload, deleteData, exportList }] = useXTable({ +const [registerTable, { reload, deleteData, exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: JobApi.getJobPageApi, deleteApi: JobApi.deleteJobApi, exportListApi: JobApi.exportJobApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue index 8972a8bbc..2ce10181c 100644 --- a/src/views/pay/app/index.vue +++ b/src/views/pay/app/index.vue @@ -84,13 +84,13 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData, exportList }] = useXTable({ +const [registerTable, { reload, deleteData, exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: AppApi.getAppPageApi, deleteApi: AppApi.deleteAppApi, exportListApi: AppApi.exportAppApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue index 1ea460ec9..cb54e4765 100644 --- a/src/views/pay/merchant/index.vue +++ b/src/views/pay/merchant/index.vue @@ -82,13 +82,13 @@ import * as MerchantApi from '@/api/pay/merchant' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 // 列表相关的变量 -const [registerTable, { reload, deleteData, exportList }] = useXTable({ +const [registerTable, { reload, deleteData, exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: MerchantApi.getMerchantPageApi, deleteApi: MerchantApi.deleteMerchantApi, exportListApi: MerchantApi.exportMerchantApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue index 2edf5785d..f393c70ef 100644 --- a/src/views/pay/order/index.vue +++ b/src/views/pay/order/index.vue @@ -47,11 +47,12 @@ import * as OrderApi from '@/api/pay/order' const { t } = useI18n() // 国际化 // 列表相关的变量 -const [registerTable, { exportList }] = useXTable({ +const [registerTable, { exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: OrderApi.getOrderPageApi, exportListApi: OrderApi.exportOrderApi }) +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index 6b7b3d46a..1820b667e 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -40,12 +40,12 @@ import * as RefundApi from '@/api/pay/refund' const { t } = useI18n() // 国际化 // 列表相关的变量 -const [registerTable, { exportList }] = useXTable({ +const [registerTable, { exportList, setProps }] = useXTable({ allSchemas: allSchemas, getListApi: RefundApi.getRefundPageApi, exportListApi: RefundApi.exportRefundApi }) - +useAdaptiveXTable([setProps]) // ========== CRUD 相关 ========== const dialogVisible = ref(false) // 是否显示弹出层 const detailData = ref() // 详情 Ref diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 3b182e2af..14198f91a 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -75,7 +75,7 @@