From 937c5218f94db5f76aeb6f33e9af5c3fd23fbbef Mon Sep 17 00:00:00 2001 From: xingyuv Date: Sat, 11 Feb 2023 22:18:02 +0800 Subject: [PATCH 01/54] chore: update url --- README.md | 4 +++- package.json | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a5e1d395..382da13b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,9 @@ **芋道**，以开发者为中心，打造中国第一流的快速开发平台，全部开源，个人与企业可 100% 免费使用。 -基于 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) 实现，使用 Element Plus 免费开源的中后台模版，具备如下特性： +* 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) +* 改换saas，自动引入等功能 [vue-element-plus-admin](https://gitee.com/yudaocode/vue-element-plus-admin) +* 使用 Element Plus 免费开源的中后台模版，具备如下特性： ![首页](preview/home.png) diff --git a/package.json b/package.json index 3f040dd1..0865d73d 100644 --- a/package.json +++ b/package.json @@ -128,10 +128,10 @@ "license": "MIT", "repository": { "type": "git", - "url": "git+https://gitee.com/zhijiantianya/ruoyi-vue-pro" + "url": "git+https://gitee.com/yudaocode/yudao-ui-admin-vue3" }, "bugs": { - "url": "https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues" + "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues" }, - "homepage": "https://gitee.com/zhijiantianya/ruoyi-vue-pro" + "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3" } From ede4eb0aee99babdc32962e9153442d1d810a7f1 Mon Sep 17 00:00:00 2001 From: yan xiaonan <549250640@qq.com> Date: Sun, 12 Feb 2023 14:15:20 +0000 Subject: [PATCH 02/54] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5dictTypeValue=E5=88=B0form=20=E5=90=A6=E5=88=99?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E4=B8=8D?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yan xiaonan <549250640@qq.com> --- src/views/system/dict/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index d4cce484..9324f764 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -197,6 +197,11 @@ const setDialogTile = (type: string) => { dialogVisible.value = true } +// 同步dictTypeValue到form 否则导致表单验证不通过 +watch(dictTypeValue, (val) => { + unref(typeFormRef)?.setValues({ type: val }) +}) + // 提交按钮 const submitTypeForm = async () => { const elForm = unref(typeFormRef)?.getElFormRef() From 55167338262cfb9975c3592200a970ef7b8a821f Mon Sep 17 00:00:00 2001 From: xingyuv Date: Mon, 13 Feb 2023 09:09:48 +0800 Subject: [PATCH 03/54] chore: update deps --- README.md | 4 ++-- build/vite/optimize.ts | 1 + package.json | 20 ++++++++++---------- src/views/system/post/index.vue | 1 - 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 382da13b..96bdd51b 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,11 @@ |----------------------------------------------------------------------|------------------|--------| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 | | [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.1 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.29 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.30 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.30 | | [vueuse](https://vueuse.org/) | 常用工具集 | 9.12.0 | -| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.9 | +| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.10 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 | | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 | diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts index f9108a7f..01c57f98 100644 --- a/build/vite/optimize.ts +++ b/build/vite/optimize.ts @@ -35,6 +35,7 @@ const include = [ 'element-plus/es', 'element-plus/es/locale/lang/zh-cn', 'element-plus/es/locale/lang/en', + 'element-plus/es/components/backtop/style/index', 'element-plus/es/components/form/style/index', 'element-plus/es/components/radio-group/style/index', 'element-plus/es/components/radio/style/index', diff --git a/package.json b/package.json index 0865d73d..da3723af 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "diagram-js": "^11.6.0", "echarts": "^5.4.1", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.2.29", - "fast-xml-parser": "^4.0.13", + "element-plus": "2.2.30", + "fast-xml-parser": "^4.1.2", "highlight.js": "^11.7.0", "intro.js": "^6.0.0", "jsencrypt": "^3.3.1", @@ -60,7 +60,7 @@ "vue-router": "^4.1.6", "vue-types": "^5.0.2", "vuedraggable": "^4.1.0", - "vxe-table": "^4.3.9", + "vxe-table": "^4.3.10", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.7", "xml-js": "^1.6.11" @@ -68,7 +68,7 @@ "devDependencies": { "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", - "@iconify/json": "^2.2.19", + "@iconify/json": "^2.2.20", "@intlify/unplugin-vue-i18n": "^0.8.2", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", @@ -97,14 +97,14 @@ "postcss-scss": "^4.0.6", "prettier": "^2.8.4", "rimraf": "^4.1.2", - "rollup": "^3.14.0", + "rollup": "^3.15.0", "sass": "^1.58.0", - "stylelint": "^14.16.1", + "stylelint": "^15.1.0", "stylelint-config-html": "^1.1.0", - "stylelint-config-prettier": "^9.0.4", - "stylelint-config-recommended": "^9.0.0", - "stylelint-config-standard": "^29.0.0", - "stylelint-order": "^6.0.1", + "stylelint-config-prettier": "^9.0.5", + "stylelint-config-recommended": "^10.0.1", + "stylelint-config-standard": "^30.0.1", + "stylelint-order": "^6.0.2", "terser": "^5.16.3", "typescript": "4.9.5", "unplugin-auto-import": "^0.14.2", diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 4e9fa808..c5a13e1e 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -46,7 +46,6 @@ - From 2b605bd212055083216a8418f42ef5547652d54b Mon Sep 17 00:00:00 2001 From: xingyuv Date: Mon, 13 Feb 2023 10:03:12 +0800 Subject: [PATCH 04/54] chore: prettier --- .prettierignore | 2 ++ src/types/auto-components.d.ts | 8 -------- src/types/auto-imports.d.ts | 6 +++++- src/views/system/post/form.vue | 6 ++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.prettierignore b/.prettierignore index 21dcc7fb..f68ea869 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,5 +5,7 @@ /docs/* /vite.config.ts /src/types/env.d.ts +/src/types/auto-components.d.ts +/src/types/auto-imports.d.ts /docs/**/* CHANGELOG diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index d4adc459..378ff554 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -21,7 +21,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'] - ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -52,19 +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'] ElSkeleton: typeof import('element-plus/es')['ElSkeleton'] - ElSpace: typeof import('element-plus/es')['ElSpace'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] @@ -72,9 +66,7 @@ declare module '@vue/runtime-core' { 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/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 68e0f7a4..714d6be2 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -40,7 +40,6 @@ declare global { const ref: typeof import('vue')['ref'] const required: typeof import('@/utils/formRules')['required'] const resolveComponent: typeof import('vue')['resolveComponent'] - const resolveDirective: typeof import('vue')['resolveDirective'] const shallowReactive: typeof import('vue')['shallowReactive'] const shallowReadonly: typeof import('vue')['shallowReadonly'] const shallowRef: typeof import('vue')['shallowRef'] @@ -65,3 +64,8 @@ declare global { const watchPostEffect: typeof import('vue')['watchPostEffect'] const watchSyncEffect: typeof import('vue')['watchSyncEffect'] } +// for type re-export +declare global { + // @ts-ignore + export type { Component,ComponentPublicInstance,ComputedRef,InjectionKey,PropType,Ref,VNode } from 'vue' +} diff --git a/src/views/system/post/form.vue b/src/views/system/post/form.vue index 8c1c9144..065aecaf 100644 --- a/src/views/system/post/form.vue +++ b/src/views/system/post/form.vue @@ -61,7 +61,7 @@ const openModal = async (type: string, id?: number) => { } modelLoading.value = false } -defineExpose({ openModal: openModal }) // 提供 openModal 方法，用于打开弹窗 +defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗 // 提交新增/修改的表单 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 @@ -70,9 +70,7 @@ const submitForm = async () => { const elForm = unref(formRef)?.getElFormRef() if (!elForm) return const valid = await elForm.validate() - if (!valid) { - return - } + if (!valid) return // 提交请求 actionLoading.value = true try { From 2ec6978400bbe9263e4dd336d992a014eaf1f100 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 14 Feb 2023 14:27:46 +0800 Subject: [PATCH 05/54] chore: update optimize --- build/vite/optimize.ts | 10 ++++++++-- package.json | 18 +++++++++--------- src/types/auto-components.d.ts | 7 +++++++ src/views/bpm/processInstance/detail.vue | 10 +++++----- 4 files changed, 29 insertions(+), 16 deletions(-) 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) }) } From c9cebcde41fb0289a6ea945d0fac2f8850fb7ee1 Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 15:58:57 +0800 Subject: [PATCH 06/54] =?UTF-8?q?topActionSlots:=20false=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/task/done/index.vue | 1 + src/views/bpm/task/todo/index.vue | 1 + src/views/system/mail/log/index.vue | 1 + src/views/system/notify/message/index.vue | 1 + 4 files changed, 4 insertions(+) diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index 31df7bd9..da05549a 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -21,6 +21,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, getListApi: TaskApi.getDoneTaskPage }) diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index 86208602..ab286c0b 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -22,6 +22,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots:false, getListApi: TaskApi.getTodoTaskPage }) diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue index 7983e3c8..e147c52c 100644 --- a/src/views/system/mail/log/index.vue +++ b/src/views/system/mail/log/index.vue @@ -59,6 +59,7 @@ const queryParams = reactive({ }) const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, params: queryParams, getListApi: MailLogApi.getMailLogPageApi }) diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue index cb904d27..93a8ed68 100644 --- a/src/views/system/notify/message/index.vue +++ b/src/views/system/notify/message/index.vue @@ -37,6 +37,7 @@ const { t } = useI18n() // 国际化 // 列表相关的变量 const [registerTable] = useXTable({ allSchemas: allSchemas, + topActionSlots: false, getListApi: NotifyMessageApi.getNotifyMessagePageApi }) From 9c38c33012189c1ed8097944c52b8576e624f8d8 Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 16:52:07 +0800 Subject: [PATCH 07/54] =?UTF-8?q?1.=20=E5=AD=97=E5=85=B8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BA=A2=E8=89=B2=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=202.keepalive=E7=BC=93=E5=AD=98toCamelCase?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E5=8E=BB=E6=8E=89=E2=80=98-?= =?UTF-8?q?=E2=80=99=EF=BC=8C=E4=BF=9D=E7=95=99=E9=A9=BC=E5=B3=B0=E6=98=8E?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/routerHelper.ts | 8 +++++--- src/views/bpm/task/todo/index.vue | 2 +- src/views/system/dict/index.vue | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts index 0ae8e1e2..af6a9c3c 100644 --- a/src/utils/routerHelper.ts +++ b/src/utils/routerHelper.ts @@ -212,9 +212,11 @@ const addToChildren = ( } } const toCamelCase = (str: string, upperCaseFirst: boolean) => { - str = (str || '').toLowerCase().replace(/-(.)/g, function (group1: string) { - return group1.toUpperCase() - }) + str = (str || '') + .replace(/-(.)/g, function (group1: string) { + return group1.toUpperCase() + }) + .replaceAll('-', '') if (upperCaseFirst && str) { str = str.charAt(0).toUpperCase() + str.slice(1) diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index ab286c0b..bc21c597 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -22,7 +22,7 @@ const { push } = useRouter() // 路由 const [registerTable] = useXTable({ allSchemas: allSchemas, - topActionSlots:false, + topActionSlots: false, getListApi: TaskApi.getTodoTaskPage }) diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index d4cce484..d3b52519 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -179,6 +179,7 @@ const tableTypeSelect = ref(false) const cellClickEvent: VxeTableEvents.CellClick = async ({ row }) => { tableTypeSelect.value = true queryParams.dictType = row['type'] + await nextTick() await dataGetList() parentType.value = row['type'] } From 401794f1bff73a866150ae7bd45837b3304cd80a Mon Sep 17 00:00:00 2001 From: bimei <18812666091@163.com> Date: Fri, 17 Feb 2023 17:23:42 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E6=A0=B9=E6=8D=AEkeepalive=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/server/index.vue | 2 +- src/views/report/jmreport/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue index 8e748b26..cc7590d6 100644 --- a/src/views/infra/server/index.vue +++ b/src/views/infra/server/index.vue @@ -3,7 +3,7 @@