diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 59c8bc5..5900335 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -3142,18 +3142,21 @@ const TaskConfirmModal = props => {
 const SisColorChooseComponent = props => {
   const { sisColorChooseVisible, sisColorField, sisTableName, controlSelectedRowId } = props;
 
-  const [rightData, setRightData] = useState([]);
-
+  const [rightData, setRightData] = useState(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
+  useEffect(() => {
+    if (props.sisColorSelectedData && props.sisColorSelectedData.length > 0) {
+      setRightData(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
+    } else {
+      setRightData([]);
+    }
+  }, [props.sisColorSelectedData, props.sisColorChooseVisible])
   if (!sisColorChooseVisible) return "";
 
   const handleClose = () => {
 
     props.onSaveState({
       sisColorChooseVisible: false,
-      sisColorSelectedData: []
     });
-
-    setRightData([]);
   };
 
   const handelSubmit = () => {
@@ -3179,8 +3182,6 @@ const SisColorChooseComponent = props => {
       [sisColorField]: JSON.stringify(colorList),
       iOutsideQty: totalDColor
     }
-    console.log("🚀 ~ handelSubmit ~ tableData[iIndex]:", totalDColor);
-
     props.onSaveState({
       [`${sisTableName}Data`]: [...tableData],
       sisColorChooseVisible: false,