From 8f99c76e72dc8d7af57de83643f017e4f40776ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=89=E6=A2=A6=E7=9A=84=E4=BA=BA?= <992246872@qq.com> Date: Fri, 4 Jul 2025 12:29:01 +0800 Subject: [PATCH 01/42] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/menu/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 6137eaf5..99e1f9d7 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -28,7 +28,7 @@ 新增 - 级联删除 + 级联删除 -- Gitee From f6d69e2bea15efd238fd7a54dc9bfe6cdc54d78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 4 Jul 2025 14:51:38 +0800 Subject: [PATCH 02/42] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d12aeedd..82e594d4 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -154,7 +154,7 @@ - + - + - + { Object.assign(form.value, data.user); postOptions.value = data.posts; roleOptions.value = data.roles; + roleOptions.value.push(...data.user.roles) form.value.postIds = data.postIds; form.value.roleIds = data.roleIds; form.value.password = ''; @@ -626,7 +626,17 @@ const handleUpdate = async (row?: UserForm) => { const submitForm = () => { userFormRef.value?.validate(async (valid: boolean) => { if (valid) { - form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value); + if (form.value.userId) { + // 自己编辑自己的情况下 不允许编辑角色部门岗位 + if (form.value.userId == useUserStore().userId) { + form.value.roleIds = null; + form.value.deptId = null; + form.value.postIds = null; + } + await api.updateUser(form.value); + } else { + await api.addUser(form.value); + } proxy?.$modal.msgSuccess('操作成功'); dialog.visible = false; await getList(); -- Gitee From 35b016b3ba63607361fdb46af3c127db609de788 Mon Sep 17 00:00:00 2001 From: "Michelle.Chung" <1242874891@qq.com> Date: Sat, 5 Jul 2025 19:11:46 +0800 Subject: [PATCH 03/42] =?UTF-8?q?add:=20=E6=96=B0=E5=A2=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8Bspel=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflow/spel/index.ts | 63 ++++++ src/api/workflow/spel/types.ts | 111 ++++++++++ src/views/workflow/spel/index.vue | 345 ++++++++++++++++++++++++++++++ 3 files changed, 519 insertions(+) create mode 100644 src/api/workflow/spel/index.ts create mode 100644 src/api/workflow/spel/types.ts create mode 100644 src/views/workflow/spel/index.vue diff --git a/src/api/workflow/spel/index.ts b/src/api/workflow/spel/index.ts new file mode 100644 index 00000000..0cc87461 --- /dev/null +++ b/src/api/workflow/spel/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { SpelVO, SpelForm, SpelQuery } from '@/api/workflow/spel/types'; + +/** + * 查询流程spel表达式定义列表 + * @param query + * @returns {*} + */ + +export const listSpel = (query?: SpelQuery): AxiosPromise => { + return request({ + url: '/workflow/spel/list', + method: 'get', + params: query + }); +}; + +/** + * 查询流程spel表达式定义详细 + * @param id + */ +export const getSpel = (id: string | number): AxiosPromise => { + return request({ + url: '/workflow/spel/' + id, + method: 'get' + }); +}; + +/** + * 新增流程spel表达式定义 + * @param data + */ +export const addSpel = (data: SpelForm) => { + return request({ + url: '/workflow/spel', + method: 'post', + data: data + }); +}; + +/** + * 修改流程spel表达式定义 + * @param data + */ +export const updateSpel = (data: SpelForm) => { + return request({ + url: '/workflow/spel', + method: 'put', + data: data + }); +}; + +/** + * 删除流程spel表达式定义 + * @param id + */ +export const delSpel = (id: string | number | Array) => { + return request({ + url: '/workflow/spel/' + id, + method: 'delete' + }); +}; diff --git a/src/api/workflow/spel/types.ts b/src/api/workflow/spel/types.ts new file mode 100644 index 00000000..e0a694c3 --- /dev/null +++ b/src/api/workflow/spel/types.ts @@ -0,0 +1,111 @@ +export interface SpelVO { + /** + * 主键id + */ + id: string | number; + + /** + * 组件名称 + */ + componentName: string; + + /** + * 方法名 + */ + methodName: string; + + /** + * 参数 + */ + methodParams: string; + + /** + * 预览spel值 + */ + viewSpel: string; + + /** + * 状态(0正常 1停用) + */ + status: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface SpelForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 组件名称 + */ + componentName?: string; + + /** + * 方法名 + */ + methodName?: string; + + /** + * 参数 + */ + methodParams?: string; + + /** + * 预览spel值 + */ + viewSpel?: string; + + /** + * 状态(0正常 1停用) + */ + status?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface SpelQuery extends PageQuery { + + /** + * 组件名称 + */ + componentName?: string; + + /** + * 方法名 + */ + methodName?: string; + + /** + * 参数 + */ + methodParams?: string; + + /** + * 预览spel值 + */ + viewSpel?: string; + + /** + * 状态(0正常 1停用) + */ + status?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/views/workflow/spel/index.vue b/src/views/workflow/spel/index.vue new file mode 100644 index 00000000..94b70cf0 --- /dev/null +++ b/src/views/workflow/spel/index.vue @@ -0,0 +1,345 @@ + + + + -- Gitee From 093c05bda0d3da7be87a5072d174e2aa47196b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sun, 6 Jul 2025 11:33:18 +0800 Subject: [PATCH 04/42] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=A8=8B=E6=8A=A5=E9=94=99=20loading?= =?UTF-8?q?=E6=9C=AA=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Process/submitVerify.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index 2d99d548..a28fc43c 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -258,13 +258,16 @@ const openDialog = async (id?: string) => { buttonObj.value[e.code] = e.show; }); buttonDisabled.value = false; - const data = { - taskId: taskId.value, - variables: props.taskVariables - }; - const nextData = await getNextNodeList(data); - nestNodeList.value = nextData.data; - loading.value = false; + try { + const data = { + taskId: taskId.value, + variables: props.taskVariables + }; + const nextData = await getNextNodeList(data); + nestNodeList.value = nextData.data; + } finally { + loading.value = false; + } }; onMounted(() => {}); -- Gitee From 0ca453d54949a1838912f7120d0f862f0a944f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sun, 6 Jul 2025 11:47:34 +0800 Subject: [PATCH 05/42] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/spel/index.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/views/workflow/spel/index.vue b/src/views/workflow/spel/index.vue index 94b70cf0..d5a44986 100644 --- a/src/views/workflow/spel/index.vue +++ b/src/views/workflow/spel/index.vue @@ -49,7 +49,7 @@ - + - - - + + + + + + + + + - + + +