diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts index 01c57f98..a4bff7b9 100644 --- a/build/vite/optimize.ts +++ b/build/vite/optimize.ts @@ -16,10 +16,12 @@ const include = [ 'crypto-js', 'cropperjs', 'lodash-es', - 'vxe-table', 'nprogress', 'animate.css', + 'vxe-table', 'vxe-table/es/style', + 'vxe-table/lib/locale/lang/zh-CN', + 'vxe-table/lib/locale/lang/en-US', 'web-storage-cache', '@iconify/iconify', '@vueuse/core', @@ -61,7 +63,11 @@ const include = [ 'element-plus/es/components/menu/style/index', 'element-plus/es/components/sub-menu/style/index', 'element-plus/es/components/menu-item/style/index', - 'element-plus/es/components/option/style/index' + 'element-plus/es/components/option/style/index', + 'element-plus/es/components/dropdown/style/index', + 'element-plus/es/components/dropdown-menu/style/index', + 'element-plus/es/components/dropdown-item/style/index', + 'element-plus/es/components/skeleton/style/index' ] const exclude = ['@iconify/json'] diff --git a/package.json b/package.json index da3723af..5b55353a 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^2.2.1", "animate.css": "^4.1.1", - "axios": "^1.3.2", + "axios": "^1.3.3", "bpmn-js-token-simulation": "^0.10.0", "camunda-bpmn-moddle": "^7.0.1", "cropperjs": "^1.5.13", @@ -66,9 +66,9 @@ "xml-js": "^1.6.11" }, "devDependencies": { - "@commitlint/cli": "^17.4.2", - "@commitlint/config-conventional": "^17.4.2", - "@iconify/json": "^2.2.20", + "@commitlint/cli": "^17.4.3", + "@commitlint/config-conventional": "^17.4.3", + "@iconify/json": "^2.2.21", "@intlify/unplugin-vue-i18n": "^0.8.2", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", @@ -77,8 +77,8 @@ "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.0", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.51.0", - "@typescript-eslint/parser": "^5.51.0", + "@typescript-eslint/eslint-plugin": "^5.52.0", + "@typescript-eslint/parser": "^5.52.0", "@vitejs/plugin-legacy": "^4.0.1", "@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue-jsx": "^3.0.0", @@ -86,19 +86,19 @@ "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", "consola": "^2.15.3", - "eslint": "^8.33.0", + "eslint": "^8.34.0", "eslint-config-prettier": "^8.6.0", "eslint-define-config": "^1.15.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.9.0", - "lint-staged": "^13.1.1", + "lint-staged": "^13.1.2", "postcss": "^8.4.21", "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "prettier": "^2.8.4", "rimraf": "^4.1.2", "rollup": "^3.15.0", - "sass": "^1.58.0", + "sass": "^1.58.1", "stylelint": "^15.1.0", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.5", diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 378ff554..990f55cc 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -51,10 +51,14 @@ declare module '@vue/runtime-core' { ElIcon: typeof import('element-plus/es')['ElIcon'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElLink: typeof import('element-plus/es')['ElLink'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] @@ -62,11 +66,14 @@ 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'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] Error: typeof import('./../components/Error/src/Error.vue')['default'] FlowCondition: typeof import('./../components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue')['default'] diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue index 5dd05adc..7bd89deb 100644 --- a/src/views/bpm/processInstance/detail.vue +++ b/src/views/bpm/processInstance/detail.vue @@ -201,13 +201,13 @@ import * as ActivityApi from '@/api/bpm/activity' import { formatPast2 } from '@/utils/formatTime' import { setConfAndFields2 } from '@/utils/formCreate' // import { OptionAttrs } from '@form-create/element-ui/types/config' -import { ApiAttrs } from '@form-create/element-ui/types/config' +import type { ApiAttrs } from '@form-create/element-ui/types/config' import { useUserStore } from '@/store/modules/user' const { query } = useRoute() // 查询参数 const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 -const { proxy } = getCurrentInstance() +const { proxy } = getCurrentInstance() as any // ========== 审批信息 ========== const id = query.id as unknown as number @@ -404,9 +404,9 @@ const getDetail = () => { data.formVariables ) nextTick().then(() => { - fApi.value?.fapi.btn.show(false) - fApi.value?.fapi.resetBtn.show(false) - fApi.value?.fapi.disabled(true) + fApi.value?.btn.show(false) + fApi.value?.resetBtn.show(false) + fApi.value?.disabled(true) }) }