From ae9a848bacd5f3f6ba625197b8f54654f4398996 Mon Sep 17 00:00:00 2001 From: SEN Date: Fri, 26 Jul 2024 13:34:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ts/core/work/rule/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ts/core/work/rule/index.ts b/src/ts/core/work/rule/index.ts index d63068078..029f63b3d 100644 --- a/src/ts/core/work/rule/index.ts +++ b/src/ts/core/work/rule/index.ts @@ -173,7 +173,7 @@ class WorkRules extends Emitter implements WorkRulesType { ...oldData, FormData: [fdata], }); - if (this.instanceData.data[id][0]?.after?.length > 0) { + if (this.instanceData.data?.[id]?.[0]?.after?.length > 0) { this.instanceData.data[id][0].after[0] = fdata; } this.command.emitter('over', 'result', { formId: id, data: fdata, type: 'rule' }); -- Gitee From daa543611104a9bac65204f023eb7dcf88e039e7 Mon Sep 17 00:00:00 2001 From: SEN Date: Fri, 26 Jul 2024 13:36:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ts/core/work/rule/index.ts | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/ts/core/work/rule/index.ts b/src/ts/core/work/rule/index.ts index 029f63b3d..34bd7fffd 100644 --- a/src/ts/core/work/rule/index.ts +++ b/src/ts/core/work/rule/index.ts @@ -176,7 +176,12 @@ class WorkRules extends Emitter implements WorkRulesType { if (this.instanceData.data?.[id]?.[0]?.after?.length > 0) { this.instanceData.data[id][0].after[0] = fdata; } - this.command.emitter('over', 'result', { formId: id, data: fdata, type: 'rule' }); + this.command && + this.command.emitter('over', 'result', { + formId: id, + data: fdata, + type: 'rule', + }); } else { let fdata: schema.XThing[] = oldData.FormData as any; const Form_data = this.AllForms.find((v) => v.id === id)!; @@ -212,7 +217,12 @@ class WorkRules extends Emitter implements WorkRulesType { FormData: fdata, }); - this.command.emitter('over', 'result', { formId: id, data: fdata, type: 'rule' }); + this.command && + this.command.emitter('over', 'result', { + formId: id, + data: fdata, + type: 'rule', + }); this.changCallback('formData', id, fdata); } this.runningFirstChange(ruleType); @@ -272,7 +282,12 @@ class WorkRules extends Emitter implements WorkRulesType { ...oldData, FormData: fdata, }); - this.command.emitter('over', 'result', { formId: id, data: fdata, type: 'rule' }); + this.command && + this.command.emitter('over', 'result', { + formId: id, + data: fdata, + type: 'rule', + }); this.changCallback('formData', id, fdata); } } @@ -412,7 +427,7 @@ class WorkRules extends Emitter implements WorkRulesType { /* 弹出数据 到具体业务 依次为 表单id，表单数据，表单变动数据， */ // this.changCallback('formData', id, _fdata, libData.FormData); - // this.command.emitter('over', 'result', { formId: id, data: _fdata }); + // this.command&&this.command.emitter('over', 'result', { formId: id, data: _fdata }); } break; default: @@ -742,11 +757,12 @@ class DealData { const newFiled = { ...aimField, ...rest, options: aimField.options }; aimField = Object.assign(aimField, newFiled); this.renderMap.set(key, aimField); - this.command.emitter('change', 'render', { - formId: element?.formId, - destId: key, - options: aimField.options, - }); + this.command && + this.command.emitter('change', 'render', { + formId: element?.formId, + destId: key, + options: aimField.options, + }); } } } -- Gitee From 61ae018871579da3707c74beeab95562eb9a7282 Mon Sep 17 00:00:00 2001 From: SEN Date: Fri, 26 Jul 2024 13:57:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=8D=89=E7=A8=BF=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/executor/tools/task/start/multitabTable/stagging.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/executor/tools/task/start/multitabTable/stagging.tsx b/src/executor/tools/task/start/multitabTable/stagging.tsx index 4c352023a..a2126d196 100644 --- a/src/executor/tools/task/start/multitabTable/stagging.tsx +++ b/src/executor/tools/task/start/multitabTable/stagging.tsx @@ -180,6 +180,7 @@ const WorkStagging: React.FC = ({ onShow, apply }) => { }, ], }} + isMenuHide={false} /> -- Gitee From 73dd2ca1a9d0ee1d719d290c802ede6b4ecedbf8 Mon Sep 17 00:00:00 2001 From: SEN Date: Fri, 26 Jul 2024 14:01:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/transferModal/modal/storeModal/widgets/dataTables.tsx | 1 + src/executor/tools/task/executor/acquire/index.tsx | 1 + .../Content/AxwWorkBench/RenderQueryWorks/stagging.tsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/executor/design/transferModal/modal/storeModal/widgets/dataTables.tsx b/src/executor/design/transferModal/modal/storeModal/widgets/dataTables.tsx index a0fba87a3..d2dec0491 100644 --- a/src/executor/design/transferModal/modal/storeModal/widgets/dataTables.tsx +++ b/src/executor/design/transferModal/modal/storeModal/widgets/dataTables.tsx @@ -45,6 +45,7 @@ const DataTables: React.FC = ({ transfer, current }) => { }) } remoteOperations={true} + isMenuHide={false} /> ), }; diff --git a/src/executor/tools/task/executor/acquire/index.tsx b/src/executor/tools/task/executor/acquire/index.tsx index 512cd11a0..8b64de9ab 100644 --- a/src/executor/tools/task/executor/acquire/index.tsx +++ b/src/executor/tools/task/executor/acquire/index.tsx @@ -244,6 +244,7 @@ export const Selection: React.FC = (props) => { }) } remoteOperations={true} + isMenuHide={false} /> ); } diff --git a/src/pages/Home/components/Content/AxwWorkBench/RenderQueryWorks/stagging.tsx b/src/pages/Home/components/Content/AxwWorkBench/RenderQueryWorks/stagging.tsx index 701d45bd1..64abbffee 100644 --- a/src/pages/Home/components/Content/AxwWorkBench/RenderQueryWorks/stagging.tsx +++ b/src/pages/Home/components/Content/AxwWorkBench/RenderQueryWorks/stagging.tsx @@ -132,6 +132,7 @@ const WorkStagging: React.FC = ({ curCompany }) => { }, ], }} + isMenuHide={false} /> ); -- Gitee