From 8651fb4b423c91f49b04590b53ea90c8df3c3f34 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 27 Nov 2025 13:43:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat=EF=BC=9A=E3=80=90SocialClient=E3=80=91?= =?UTF-8?q?=20=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/social/client/index.ts | 1 + src/views/system/social/client/SocialClientForm.vue | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/api/system/social/client/index.ts b/src/api/system/social/client/index.ts index bf13ab49f..100b50629 100644 --- a/src/api/system/social/client/index.ts +++ b/src/api/system/social/client/index.ts @@ -7,6 +7,7 @@ export interface SocialClientVO { userType: number clientId: string clientSecret: string + publicKey: string agentId: string status: number } diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue index cbfe195b5..6edb5af3d 100644 --- a/src/views/system/social/client/SocialClientForm.vue +++ b/src/views/system/social/client/SocialClientForm.vue @@ -44,6 +44,9 @@ + + + { userType: undefined, clientId: undefined, clientSecret: undefined, + publicKey: undefined, agentId: undefined, status: 0 } -- Gitee From e3959469e553df55d73435f4e1113ecac5c73fb5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Nov 2025 10:06:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=EF=BC=9A=E3=80=90SocialClient=E3=80=91?= =?UTF-8?q?=20=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/social/client/index.ts | 2 +- src/views/system/social/client/SocialClientForm.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/system/social/client/index.ts b/src/api/system/social/client/index.ts index 100b50629..323982296 100644 --- a/src/api/system/social/client/index.ts +++ b/src/api/system/social/client/index.ts @@ -7,8 +7,8 @@ export interface SocialClientVO { userType: number clientId: string clientSecret: string - publicKey: string agentId: string + publicKey: string status: number } diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue index 6edb5af3d..647d63e38 100644 --- a/src/views/system/social/client/SocialClientForm.vue +++ b/src/views/system/social/client/SocialClientForm.vue @@ -45,7 +45,7 @@ - + -- Gitee From ed9c7868e2d658d2b3633863f7dc0a65c3d1e3d7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Nov 2025 15:55:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat=EF=BC=9A=E3=80=90infra=E3=80=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20region=20=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/fileConfig/index.ts | 1 + src/views/infra/fileConfig/FileConfigForm.vue | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/api/infra/fileConfig/index.ts b/src/api/infra/fileConfig/index.ts index e88f825f1..cd1dbe6ca 100644 --- a/src/api/infra/fileConfig/index.ts +++ b/src/api/infra/fileConfig/index.ts @@ -13,6 +13,7 @@ export interface FileClientConfig { accessSecret?: string enablePathStyleAccess?: boolean enablePublicAccess?: boolean + region?: string domain: string } diff --git a/src/views/infra/fileConfig/FileConfigForm.vue b/src/views/infra/fileConfig/FileConfigForm.vue index 1b774ca65..34691d924 100644 --- a/src/views/infra/fileConfig/FileConfigForm.vue +++ b/src/views/infra/fileConfig/FileConfigForm.vue @@ -103,6 +103,10 @@ 私有 + + + + -- Gitee From fb724fed25b3ce02fc06ad2f6ad5a2b624178514 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Nov 2025 16:05:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat=EF=BC=9A=E3=80=90system=E3=80=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/social/client/SocialClientForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue index 647d63e38..dd83bb418 100644 --- a/src/views/system/social/client/SocialClientForm.vue +++ b/src/views/system/social/client/SocialClientForm.vue @@ -45,7 +45,7 @@ - + -- Gitee From 583f2b58f7fa1809859e9fe8a48a2ca021bb4bbc Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Nov 2025 17:55:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix=EF=BC=9A=E3=80=90bpm=E3=80=91=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=20https://github.com/YunaiV/ruoyi-vue-pro/is?= =?UTF-8?q?sues/1027?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/processInstance/detail/PrintDialog.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/bpm/processInstance/detail/PrintDialog.vue b/src/views/bpm/processInstance/detail/PrintDialog.vue index ab17f8c0f..fb8cd8bcb 100644 --- a/src/views/bpm/processInstance/detail/PrintDialog.vue +++ b/src/views/bpm/processInstance/detail/PrintDialog.vue @@ -30,7 +30,11 @@ const open = async (id: string) => { defineExpose({ open }) const parseFormFields = () => { - const formFieldsObj = decodeFields(printData.value.processInstance.processDefinition.formFields) + if (!printData.value) return + + const formFieldsObj = decodeFields( + printData.value.processInstance.processDefinition?.formFields || [] + ) const processVariables = printData.value.processInstance.formVariables let res: any = [] for (const item of formFieldsObj) { -- Gitee From 17042432daa2650848a822b188bc93e97b2d3dcd Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Nov 2025 18:45:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20bpmn=E6=B5=81=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=9C=8D=E5=8A=A1=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=A7=E8=A1=8C=E7=B1=BB=E5=9E=8B=EF=BC=9A?= =?UTF-8?q?http=E4=BB=BB=E5=8A=A1#200=EF=BC=88=E4=BB=A3=E7=A0=81=E6=8E=92?= =?UTF-8?q?=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/designer/plugins/palette/CustomPalette.js | 1 - .../package/designer/plugins/palette/paletteProvider.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js index 126838717..788e4d163 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js @@ -89,7 +89,6 @@ F.prototype.getPaletteEntries = function () { create.start(event, elementFactory.createParticipantShape()) } - assign(actions, { 'hand-tool': { group: 'tools', diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js index 8a5858887..304875ced 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js @@ -96,7 +96,6 @@ PaletteProvider.prototype.getPaletteEntries = function () { create.start(event, elementFactory.createParticipantShape()) } - assign(actions, { 'hand-tool': { group: 'tools', -- Gitee