From aee48410a2fb758c71303428020e57e2b54f9498 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Wed, 4 Mar 2026 14:31:35 +0800
Subject: [PATCH] 出版选择颜色

---
 src/mes/common/commonModelComponent/index.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 3c83402..0a8e047 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -3163,6 +3163,13 @@ const SisColorChooseComponent = props => {
     const { [`${sisTableName}Data`]: tableData } = props;
     const iIndex = tableData?.findIndex(item => item.sId === controlSelectedRowId);
     // iPositiveColor sPositiveColor sOppositeColor
+    if (props?.sisColorSelectedData && props?.sisColorSelectedData?.length === 0) {
+      props.onSaveState({
+        sisColorChooseVisible: false,
+        sisColorSelectedData: []
+      });
+      return
+    }
     const colorList = JSON.parse(tableData[iIndex][sisColorField]).map(item => {
       const i = rightData.findIndex(rightItem => rightItem.sId === item.sId);
       let newItem = {
@@ -3176,13 +3183,24 @@ const SisColorChooseComponent = props => {
       }
       return newItem
     });
-    const totalDColor = rightData.reduce((total, item) => total + item.dColor, 0);
     tableData[iIndex] = {
       ...tableData[iIndex],
       [sisColorField]: JSON.stringify(colorList),
-      iOutsideQty: totalDColor,
-      iPublishQty: totalDColor
     }
+    const { sPositiveColor, sOppositeColor } = tableData[iIndex]
+    const sPositiveColorList = (sPositiveColor && sPositiveColor !== 'undefined' && sPositiveColor !== 'null')
+      ? JSON.parse(sPositiveColor).filter(item => item.bSelected)
+      : [];
+    const sOppositeColorList = (sOppositeColor && sOppositeColor !== 'undefined' && sOppositeColor !== 'null')
+      ? JSON.parse(sOppositeColor).filter(item => item.bSelected)
+      : [];
+    const allTotalDColor = sPositiveColorList.reduce((total, item) => total + item.dColor, 0) + sOppositeColorList.reduce((total, item) => total + item.dColor, 0);
+    tableData[iIndex] = {
+      ...tableData[iIndex],
+      iOutsideQty: allTotalDColor,
+      iPublishQty: allTotalDColor
+    }
+
     props.onSaveState({
       [`${sisTableName}Data`]: [...tableData],
       sisColorChooseVisible: false,
--
libgit2 0.22.2