多个复制到

chenxt
1 parent d8ff5390
Showing 2 changed files with 14 additions and 4 deletions
src/mes/common/commonOperationBarComponent/MesToolbar.js
src/mes/common/commonOperationBarComponent/index.js
@@ -1029,9 +1029,9 @@ const handleCalc = async (props, btnConfig) =&gt; {
         allReturnMap.masterData = returnData['master.' + masterTbName];
         allReturnMap.masterData.enabled = true;
       }
-      allReturnMap?.slaveChildData?.forEach(item => {
-        item.sSqlConditionId = allReturnMap?.slaveData?.[0].sSqlConditionId
-      })
+      // allReturnMap?.slaveChildData?.forEach(item => {
+      //   item.sSqlConditionId = allReturnMap?.slaveData?.[0].sSqlConditionId
+      // })
       allReturnMap.slaveSelectedRowKeys = [allReturnMap?.slaveData?.[0].sId]
       props.onSaveState({ ...allReturnMap, pageLoading: false });
@@ -595,8 +595,16 @@ const useCommonOperationBarComponentEvent = props =&gt; {
       const sConfigformId = commonUtils.isEmpty(copyToConfig) ? '' : copyToConfig[0]?.sParentId;
       const sControlName = commonUtils.isNotEmptyObject(config?.sControlName) ? config?.sControlName : 'BtnCopyTo.TmpInfoBySql';
       const selectedRowKeys = props[sName + 'SelectedRowKeys']?.[0] || ''
+      const selectedRowKeysList = props[sName + 'SelectedRowKeys']
       const slaveSelectedData = props[sName + 'Data'] || []
-      const sRowData = slaveSelectedData.filter(x => x.sId === selectedRowKeys || x.sSlaveId === selectedRowKeys)
+      const sRowData = slaveSelectedData.map(item => {
+        const i = selectedRowKeysList.findIndex(x => x === item.id || x === item.sSlaveId)
+        if (i !== -1) {
+          return item
+        } else {
+          return null
+        }
+      }).filter(x => x !== null)
       /* 塞原始数据  */
       if (commonUtils.isNotEmptyArr(slaveSelectedData)) {
         delete slaveSelectedData?.[0]?.bCheck
@@ -632,6 +640,8 @@ const useCommonOperationBarComponentEvent = props =&gt; {
                 tableRow.sId = commonUtils.createSid();
                 tableRow.sParentId = copyTo.masterData.sId;
                 tableRow.handleType = 'add';
+                tableRow.sSqlConditionOldId = tableRow.sSqlConditionId;
+                tableRow.sSqlConditionId = tableRow.sId
                 newData.push(tableRow);
               })
             }