diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx index bb41549ada12c6be6d619dc790756040f7b84864..d38f5f8f7de5ef53c646175d2baedf0dbd91e3af 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 () => { + const space: ITarget = getSpace(); const values = deepClone(fields); values.unshift({ id: 'id', @@ -1280,7 +1285,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 +1311,7 @@ const DetailTable: React.FC = (props) => { return; } matching( - props.service.target, + space, form, excel.handlers[0].sheet.data, formData.current, @@ -1333,6 +1338,7 @@ const DetailTable: React.FC = (props) => { icon: 'add', onClick: async () => { const values = deepClone(fields); + const space: ITarget = getSpace(); values.unshift({ id: 'id', name: '唯一标识', @@ -1341,7 +1347,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 +1370,7 @@ const DetailTable: React.FC = (props) => { return; } matching( - props.service.target, + space, form, excel.handlers[0].sheet.data, formData.current, @@ -1574,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,