diff --git a/package.json b/package.json index 5edbf92bb03ae59953ad30bd9467fa79507298fb..b7649efc42836b6ada492605ef2b6881c75c51ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "ruoyi-vue-plus", - "version": "5.3.1-BETA_2.3.0-BETA", + "version": "5.3.1-BETA2_2.3.0-BETA2", "description": "RuoYi-Vue-Plus多租户管理系统", "author": "LionLi", "license": "MIT", diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 20ae76caff54c2d6787ecd5b3d8ef767fb92fcb2..fd91abcbb5cb2d76365c352f02db917c7dbe73a9 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -40,13 +40,8 @@ const getBreadcrumb = () => { levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false); }; const findPathNum = (str, char = '/') => { - let index = str.indexOf(char); - let num = 0; - while (index !== -1) { - num++; - index = str.indexOf(char, index + 1); - } - return num; + if (typeof str !== 'string' || str.length === 0) return 0; + return str.split(char).length - 1; }; const getMatched = (pathList, routeList, matched) => { let data = routeList.find((item) => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]); diff --git a/src/components/BuildCode/index.vue b/src/components/BuildCode/index.vue deleted file mode 100644 index 0b8e3f4db238fde1b8c0ee88b67897177ec8587a..0000000000000000000000000000000000000000 --- a/src/components/BuildCode/index.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/components/BuildCode/render.vue b/src/components/BuildCode/render.vue deleted file mode 100644 index aeb9312bdc766422b57876a2fb4b7dd61d3dff4b..0000000000000000000000000000000000000000 --- a/src/components/BuildCode/render.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - diff --git a/src/components/Process/processMeddle.vue b/src/components/Process/processMeddle.vue index 635e2fb7655bac70baa331a9cc54f63269fbfb5b..d024b6915cd5defd8f750152314ebb6f211cb4e9 100644 --- a/src/components/Process/processMeddle.vue +++ b/src/components/Process/processMeddle.vue @@ -85,9 +85,13 @@ const task = ref({ nodeName: undefined, flowCode: undefined, flowStatus: undefined, + formCustom: undefined, + formPath: undefined, nodeType: undefined, nodeRatio: undefined, - version: undefined + version: undefined, + applyNode: undefined, + buttonList: [] }); const open = (taskId: string) => { @@ -171,7 +175,7 @@ const deleteMultiInstanceUser = async (row) => { }; //获取办理人 const handleTaskUser = async () => { - let data = await currentTaskAllUser(task.value.id); + const data = await currentTaskAllUser(task.value.id); deleteUserList.value = data.data; if (deleteUserList.value && deleteUserList.value.length > 0) { deleteUserList.value.forEach((e) => { @@ -183,7 +187,7 @@ const handleTaskUser = async () => { //终止任务 const handleTerminationTask = async () => { - let params = { + const params = { taskId: task.value.id, comment: '' }; diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 057507239ee901298bc5f8957c80f5fddcdf19b9..eb43d653d4972de1f73c270a3499814acb84a5c8 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -7,21 +7,20 @@ export const useDict = (...args: string[]): { [key: string]: DictDataOption[] } const res = ref<{ [key: string]: DictDataOption[]; }>({}); - return (() => { - args.forEach(async (dictType) => { - res.value[dictType] = []; - const dicts = useDictStore().getDict(dictType); - if (dicts) { - res.value[dictType] = dicts; - } else { - await getDicts(dictType).then((resp) => { - res.value[dictType] = resp.data.map( - (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }) - ); - useDictStore().setDict(dictType, res.value[dictType]); - }); - } - }); - return res.value; - })(); + + args.forEach(async (dictType) => { + res.value[dictType] = []; + const dicts = useDictStore().getDict(dictType); + if (dicts) { + res.value[dictType] = dicts; + } else { + await getDicts(dictType).then((resp) => { + res.value[dictType] = resp.data.map( + (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }) + ); + useDictStore().setDict(dictType, res.value[dictType]); + }); + } + }); + return res.value; }; diff --git a/src/utils/ruoyi.ts b/src/utils/ruoyi.ts index 07a4a6b622014adb06986878306936cfaeeccc19..79f554739c7e781b7ccb138fac125b1980156bd4 100644 --- a/src/utils/ruoyi.ts +++ b/src/utils/ruoyi.ts @@ -171,6 +171,9 @@ export const handleTree = (data: any[], id?: string, parentId?: string, child for (const d of data) { const id = d[config.id]; childrenListMap[id] = d; + if (!d[config.childrenList]) { + d[config.childrenList] = []; + } } for (const d of data) { diff --git a/src/views/login.vue b/src/views/login.vue index 7b14f859367372b64ee07ba0c281d4d5fbbc7423..eebde18efb0f546fd9813dd98a4bb8b4e14b67c3 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -2,7 +2,7 @@