From 7ce40675f9a66ea92f80e1d9d54d5b71387f6dcb Mon Sep 17 00:00:00 2001 From: liuyuanjin <1107290929@qq.com> Date: Wed, 9 Jul 2025 11:57:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pref:=E5=8A=9E=E4=BA=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=AF=BC=E5=85=A5=E5=8F=98=E6=9B=B4=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96-=E6=94=AF=E6=8C=81=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=98=E6=98=AF=E5=8D=95=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/executor/tools/workForm/detail.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx index bb41549ad..ae3ca761b 100644 --- a/src/executor/tools/workForm/detail.tsx +++ b/src/executor/tools/workForm/detail.tsx @@ -1271,6 +1271,10 @@ const DetailTable: React.FC = (props) => { text: '导入匹配', icon: 'add', onClick: async () => { + let space: ITarget = props.service.belong; + if (props.info.selectBelong) { + space = props.service.target; + } const values = deepClone(fields); values.unshift({ id: 'id', @@ -1280,7 +1284,7 @@ const DetailTable: React.FC = (props) => { remark: '唯一标识', } as model.FieldModel); const excel = new el.Excel( - props.service.target, + space, el.getAnythingSheets( form, values.filter((i) => i.name === form.matchImport || ''), @@ -1306,7 +1310,7 @@ const DetailTable: React.FC = (props) => { return; } matching( - props.service.target, + space, form, excel.handlers[0].sheet.data, formData.current, @@ -1333,6 +1337,10 @@ const DetailTable: React.FC = (props) => { icon: 'add', onClick: async () => { const values = deepClone(fields); + let space: ITarget = props.service.belong; + if (props.info.selectBelong) { + space = props.service.target; + } values.unshift({ id: 'id', name: '唯一标识', @@ -1341,7 +1349,7 @@ const DetailTable: React.FC = (props) => { remark: '唯一标识', } as model.FieldModel); const excel = new el.Excel( - props.service.target, + space, el.getAnythingSheets(form, values, 'code'), ); const modal = Modal.info({ @@ -1364,7 +1372,7 @@ const DetailTable: React.FC = (props) => { return; } matching( - props.service.target, + space, form, excel.handlers[0].sheet.data, formData.current, -- Gitee From 3614e59213a3257006eda8413b12e334f590b806 Mon Sep 17 00:00:00 2001 From: liuyuanjin <1107290929@qq.com> Date: Wed, 9 Jul 2025 15:59:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?pref:=E5=8A=9E=E4=BA=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=AF=BC=E5=85=A5=E5=8F=98=E6=9B=B4=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96-=E6=94=AF=E6=8C=81=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=98=E6=98=AF=E5=8D=95=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/executor/tools/workForm/detail.tsx | 33 +++++++++++--------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx index ae3ca761b..d38f5f8f7 100644 --- a/src/executor/tools/workForm/detail.tsx +++ b/src/executor/tools/workForm/detail.tsx @@ -155,7 +155,7 @@ const DetailTable: React.FC = (props) => { break; case 'assignment': formData.current.after = args.data; - formData.current.before = args.before + formData.current.before = args.before; break; } break; @@ -1186,13 +1186,13 @@ const DetailTable: React.FC = (props) => { }; }); }; - const loadRawData = async (data:XThing[])=>{ - if(data.length == 0){ + const loadRawData = async (data: XThing[]) => { + if (data.length == 0) { message.warning('请选择数据'); return false; } let form = new Form(props.form, props.service.target.directory); - let loadOptions:any = {}; + let loadOptions: any = {}; loadOptions.userData = []; loadOptions.options = loadOptions.options || {}; loadOptions.options.match = { @@ -1209,10 +1209,14 @@ const DetailTable: React.FC = (props) => { form.thingColl.collName, loadOptions, ); - formData.current.localization = result?.data || [] - setLocalization(formData.current.localization) - return result + formData.current.localization = result?.data || []; + setLocalization(formData.current.localization); + return result; }; + + const getSpace = () => + props.info.selectBelong ? props.service.target : props.service.belong; + return ( <> = (props) => { text: '导入匹配', icon: 'add', onClick: async () => { - let space: ITarget = props.service.belong; - if (props.info.selectBelong) { - space = props.service.target; - } + const space: ITarget = getSpace(); const values = deepClone(fields); values.unshift({ id: 'id', @@ -1337,10 +1338,7 @@ const DetailTable: React.FC = (props) => { icon: 'add', onClick: async () => { const values = deepClone(fields); - let space: ITarget = props.service.belong; - if (props.info.selectBelong) { - space = props.service.target; - } + const space: ITarget = getSpace(); values.unshift({ id: 'id', name: '唯一标识', @@ -1582,10 +1580,7 @@ const DetailTable: React.FC = (props) => { text: '选择', icon: 'bulletlist', onClick: () => { - let space: ITarget = props.service.belong; - if (props.info.selectBelong) { - space = props.service.target; - } + const space: ITarget = getSpace(); EditModal.showFormSelect({ form: form, fields: fields, -- Gitee