@bit-sun/business-component 2.2.25 → 2.2.27

package/dist/index.esm.js

@@ -9881,6 +9881,22 @@ var loadSelectSource = function loadSelectSource(url, params) {
     });
   });
 };
+var checkSpuMatchCode = function checkSpuMatchCode(data) {
+  return new Promise(function (resolve, reject) {
+    axios.post("/stock/rwFrontRecordSkcDetail/checkSpuMatchCode", data).then(function (result) {
+      var _result3, _result4;
+      result = result.data;
+      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+        message.error(result.msg);
+        reject(false);
+        return;
+      }
+      resolve(result);
+    }).catch(function (err) {
+      reject(err);
+    });
+  });
+};
 var ResizeableTitle = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
@@ -10121,6 +10137,101 @@ var AddSelect = function AddSelect(props) {
     setShowToChooseColumns = _useState46[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
+  var checkSelectChange = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(bType == 'skc' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 3;
+                break;
+              }
+              message.warning('相同skc配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 3:
+              if (!(bType == 'spu')) {
+                _context.next = 26;
+                break;
+              }
+              if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 7;
+                break;
+              }
+              message.warning('相同商品相同配码颜色不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 7:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+                _context.next = 10;
+                break;
+              }
+              message.warning('请先选择颜色！');
+              return _context.abrupt("return", false);
+            case 10:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 13;
+                break;
+              }
+              message.warning('相同商品相同颜色配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 13:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
+                _context.next = 26;
+                break;
+              }
+              result = true;
+              _context.prev = 15;
+              _context.next = 18;
+              return checkSpuMatchCode({
+                skcCode: recordItem[recordKey],
+                matchingCode: changeValue,
+                ext1: recordItem.colorName
+              });
+            case 18:
+              result = _context.sent;
+              result = true;
+              _context.next = 25;
+              break;
+            case 22:
+              _context.prev = 22;
+              _context.t0 = _context["catch"](15);
+              result = typeof _context.t0 == 'boolean' ? _context.t0 : false;
+            case 25:
+              return _context.abrupt("return", result);
+            case 26:
+              return _context.abrupt("return", true);
+            case 27:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[15, 22]]);
+    }));
+    return function checkSelectChange(_x, _x2, _x3, _x4, _x5, _x6) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var setBusinessDefaultValue = function setBusinessDefaultValue(list, record) {
+    var _record$colorValues;
+    var result = list;
+    if (businessType == 'spu' && (record === null || record === void 0 ? void 0 : (_record$colorValues = record.colorValues) === null || _record$colorValues === void 0 ? void 0 : _record$colorValues.length) == 1) {
+      result = list.map(function (i) {
+        if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
+          var _record$colorValues$;
+          i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
+        }
+        return i;
+      });
+    }
+    return result;
+  };
   useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns);
   }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]);
@@ -10270,40 +10381,55 @@ var AddSelect = function AddSelect(props) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           render: function render(text, record, index) {
             var _item$dataSource;
-            if ((_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) {
+            if ((item === null || item === void 0 ? void 0 : (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) || (item === null || item === void 0 ? void 0 : item.dataSourceCode)) {
+              var _item$dataSourceMappi, _item$dataSourceMappi2;
+              var dataSourceList = item.dataSource || (record === null || record === void 0 ? void 0 : record[item === null || item === void 0 ? void 0 : item.dataSourceCode]) || [];
+              var selectKey = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi = item.dataSourceMapping) === null || _item$dataSourceMappi === void 0 ? void 0 : _item$dataSourceMappi[0]) || 'code';
+              var selectText = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi2 = item.dataSourceMapping) === null || _item$dataSourceMappi2 === void 0 ? void 0 : _item$dataSourceMappi2[1]) || 'name';
               return /*#__PURE__*/React.createElement(Select, {
                 value: text || null,
-                onChange: function onChange(value) {
-                  if (businessType == 'skc' && popvalue.some(function (i) {
-                    return i.code == record.code && i[item.dataIndex] == value;
-                  })) {
-                    message.warning('相同skc配码不可设置相同哦');
-                    record[item.dataIndex] = null;
-                    var _newPopValue = popvalue.map(function (i, innerIndex) {
-                      if (innerIndex == index) {
-                        i[item.dataIndex] = record[item.dataIndex];
+                onChange: function () {
+                  var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
+                    var isConformToTheRules, newPopValue;
+                    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                      while (1) {
+                        switch (_context2.prev = _context2.next) {
+                          case 0:
+                            _context2.next = 2;
+                            return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
+                          case 2:
+                            isConformToTheRules = _context2.sent;
+                            if (isConformToTheRules) {
+                              record[item.dataIndex] = value;
+                            } else {
+                              record[item.dataIndex] = null;
+                            }
+                            newPopValue = popvalue.map(function (i, innerIndex) {
+                              if (innerIndex == index) {
+                                i[item.dataIndex] = record[item.dataIndex];
+                              }
+                              return i;
+                            });
+                            setPopValue(newPopValue);
+                          case 6:
+                          case "end":
+                            return _context2.stop();
+                        }
                       }
-                      return i;
-                    });
-                    setPopValue(_newPopValue);
-                    return false;
+                    }, _callee2);
+                  }));
+                  function onChange(_x7) {
+                    return _onChange.apply(this, arguments);
                   }
-                  record[item.dataIndex] = value;
-                  var newPopValue = popvalue.map(function (i, innerIndex) {
-                    if (innerIndex == index) {
-                      i[item.dataIndex] = record[item.dataIndex];
-                    }
-                    return i;
-                  });
-                  setPopValue(newPopValue);
-                },
+                  return onChange;
+                }(),
                 style: {
                   width: '160px'
                 }
-              }, item.dataSource.map(function (item) {
+              }, dataSourceList.map(function (item) {
                 return /*#__PURE__*/React.createElement(Select.Option, {
-                  value: item.code
-                }, item.name);
+                  value: item[selectKey]
+                }, item[selectText]);
               }));
             }
             return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -10432,10 +10558,10 @@ var AddSelect = function AddSelect(props) {
       currentPage: currentPage
     }, otherParams), fixedParam), params);
     axios.get("".concat(url, "?").concat(stringify(queryParams))).then(function (result) {
-      var _result3, _result4;
+      var _result5, _result6;
       setFetching(false);
       result = result.data;
-      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+      if (((_result5 = result) === null || _result5 === void 0 ? void 0 : _result5.status) && result.status !== '0' || ((_result6 = result) === null || _result6 === void 0 ? void 0 : _result6.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -10680,10 +10806,11 @@ var AddSelect = function AddSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
-    if (selectMode) {
-      getData(params);
-    }
+    // if (selectMode) {
+    //   getData(params)
+    // }
   };
+
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
@@ -10708,12 +10835,16 @@ var AddSelect = function AddSelect(props) {
       }
     }
     if (isAllowRepeatedSelect) {
+      var newUuid = uuid();
       var list = popvalue.concat(selectRows).map(function (i) {
         return _objectSpread2(_objectSpread2({}, i), {}, {
-          uuid: i.uuid || uuid()
+          uuid: i.uuid || newUuid
         });
       });
-      setPopValue(list);
+      var recordItem = _objectSpread2(_objectSpread2({}, selectRows[0]), {}, {
+        uuid: newUuid
+      });
+      setPopValue(setBusinessDefaultValue(list, recordItem));
       setSelectedRowKeys([]);
     } else {
       setPopValue(selectRows);
@@ -10861,8 +10992,8 @@ var AddSelect = function AddSelect(props) {
     });
   }, [tableColumns]);
   var handleResize = function handleResize(arr, index, callback) {
-    return function (_, _ref4) {
-      var size = _ref4.size;
+    return function (_, _ref5) {
+      var size = _ref5.size;
       var newColumns = arr.map(function (col) {
         return _objectSpread2({}, col);
       });
@@ -14221,14 +14352,9 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'sku'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'sku',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14519,8 +14645,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'skc',
-    isAllowRepeatedSelect: true
+    isAllowRepeatedSelect: (parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) !== undefined ? !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) : true // 默认开启一行选多次
   };
+
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14713,6 +14840,25 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     _useState8 = _slicedToArray(_useState7, 2),
     value = _useState8[0],
     setValue = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    propertyList = _useState10[0],
+    setPropertyList = _useState10[1];
+  useEffect(function () {
+    if (parProps === null || parProps === void 0 ? void 0 : parProps.isSingleColor) {
+      // type: 1 尺码组; 2 配码组
+      axios.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
+        var _result3, _result4;
+        result = result.data;
+        if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+          message.error(result.msg);
+          return;
+        }
+        var data = result.data || [];
+        setPropertyList(data);
+      }).catch(function (err) {});
+    }
+  }, []);
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: '商品编码',
@@ -14731,6 +14877,19 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
       }, text);
     },
     dataIndex: 'name'
+  }, {
+    title: '颜色',
+    dataIndex: 'colorName',
+    width: 200,
+    isSelectItem: true,
+    dataSourceCode: 'colorValues',
+    dataSourceMapping: ['value', 'value']
+  }, {
+    title: '配码',
+    dataIndex: 'selectPropertyGroupCode',
+    width: 160,
+    isSelectItem: true,
+    dataSource: propertyList
   }, {
     title: '数量',
     width: 100,
@@ -14773,14 +14932,9 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'spu'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'spu',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{

package/dist/index.js

@@ -9899,6 +9899,22 @@ var loadSelectSource = function loadSelectSource(url, params) {
     });
   });
 };
+var checkSpuMatchCode = function checkSpuMatchCode(data) {
+  return new Promise(function (resolve, reject) {
+    axios__default['default'].post("/stock/rwFrontRecordSkcDetail/checkSpuMatchCode", data).then(function (result) {
+      var _result3, _result4;
+      result = result.data;
+      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+        antd.message.error(result.msg);
+        reject(false);
+        return;
+      }
+      resolve(result);
+    }).catch(function (err) {
+      reject(err);
+    });
+  });
+};
 var ResizeableTitle = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
@@ -10139,6 +10155,101 @@ var AddSelect = function AddSelect(props) {
     setShowToChooseColumns = _useState46[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
+  var checkSelectChange = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(bType == 'skc' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 3;
+                break;
+              }
+              antd.message.warning('相同skc配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 3:
+              if (!(bType == 'spu')) {
+                _context.next = 26;
+                break;
+              }
+              if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 7;
+                break;
+              }
+              antd.message.warning('相同商品相同配码颜色不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 7:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+                _context.next = 10;
+                break;
+              }
+              antd.message.warning('请先选择颜色！');
+              return _context.abrupt("return", false);
+            case 10:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 13;
+                break;
+              }
+              antd.message.warning('相同商品相同颜色配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 13:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
+                _context.next = 26;
+                break;
+              }
+              result = true;
+              _context.prev = 15;
+              _context.next = 18;
+              return checkSpuMatchCode({
+                skcCode: recordItem[recordKey],
+                matchingCode: changeValue,
+                ext1: recordItem.colorName
+              });
+            case 18:
+              result = _context.sent;
+              result = true;
+              _context.next = 25;
+              break;
+            case 22:
+              _context.prev = 22;
+              _context.t0 = _context["catch"](15);
+              result = typeof _context.t0 == 'boolean' ? _context.t0 : false;
+            case 25:
+              return _context.abrupt("return", result);
+            case 26:
+              return _context.abrupt("return", true);
+            case 27:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[15, 22]]);
+    }));
+    return function checkSelectChange(_x, _x2, _x3, _x4, _x5, _x6) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var setBusinessDefaultValue = function setBusinessDefaultValue(list, record) {
+    var _record$colorValues;
+    var result = list;
+    if (businessType == 'spu' && (record === null || record === void 0 ? void 0 : (_record$colorValues = record.colorValues) === null || _record$colorValues === void 0 ? void 0 : _record$colorValues.length) == 1) {
+      result = list.map(function (i) {
+        if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
+          var _record$colorValues$;
+          i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
+        }
+        return i;
+      });
+    }
+    return result;
+  };
   React.useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns);
   }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]);
@@ -10288,40 +10399,55 @@ var AddSelect = function AddSelect(props) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           render: function render(text, record, index) {
             var _item$dataSource;
-            if ((_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) {
+            if ((item === null || item === void 0 ? void 0 : (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) || (item === null || item === void 0 ? void 0 : item.dataSourceCode)) {
+              var _item$dataSourceMappi, _item$dataSourceMappi2;
+              var dataSourceList = item.dataSource || (record === null || record === void 0 ? void 0 : record[item === null || item === void 0 ? void 0 : item.dataSourceCode]) || [];
+              var selectKey = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi = item.dataSourceMapping) === null || _item$dataSourceMappi === void 0 ? void 0 : _item$dataSourceMappi[0]) || 'code';
+              var selectText = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi2 = item.dataSourceMapping) === null || _item$dataSourceMappi2 === void 0 ? void 0 : _item$dataSourceMappi2[1]) || 'name';
               return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
                 value: text || null,
-                onChange: function onChange(value) {
-                  if (businessType == 'skc' && popvalue.some(function (i) {
-                    return i.code == record.code && i[item.dataIndex] == value;
-                  })) {
-                    antd.message.warning('相同skc配码不可设置相同哦');
-                    record[item.dataIndex] = null;
-                    var _newPopValue = popvalue.map(function (i, innerIndex) {
-                      if (innerIndex == index) {
-                        i[item.dataIndex] = record[item.dataIndex];
+                onChange: function () {
+                  var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
+                    var isConformToTheRules, newPopValue;
+                    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                      while (1) {
+                        switch (_context2.prev = _context2.next) {
+                          case 0:
+                            _context2.next = 2;
+                            return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
+                          case 2:
+                            isConformToTheRules = _context2.sent;
+                            if (isConformToTheRules) {
+                              record[item.dataIndex] = value;
+                            } else {
+                              record[item.dataIndex] = null;
+                            }
+                            newPopValue = popvalue.map(function (i, innerIndex) {
+                              if (innerIndex == index) {
+                                i[item.dataIndex] = record[item.dataIndex];
+                              }
+                              return i;
+                            });
+                            setPopValue(newPopValue);
+                          case 6:
+                          case "end":
+                            return _context2.stop();
+                        }
                       }
-                      return i;
-                    });
-                    setPopValue(_newPopValue);
-                    return false;
+                    }, _callee2);
+                  }));
+                  function onChange(_x7) {
+                    return _onChange.apply(this, arguments);
                   }
-                  record[item.dataIndex] = value;
-                  var newPopValue = popvalue.map(function (i, innerIndex) {
-                    if (innerIndex == index) {
-                      i[item.dataIndex] = record[item.dataIndex];
-                    }
-                    return i;
-                  });
-                  setPopValue(newPopValue);
-                },
+                  return onChange;
+                }(),
                 style: {
                   width: '160px'
                 }
-              }, item.dataSource.map(function (item) {
+              }, dataSourceList.map(function (item) {
                 return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
-                  value: item.code
-                }, item.name);
+                  value: item[selectKey]
+                }, item[selectText]);
               }));
             }
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
@@ -10450,10 +10576,10 @@ var AddSelect = function AddSelect(props) {
       currentPage: currentPage
     }, otherParams), fixedParam), params);
     axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(queryParams))).then(function (result) {
-      var _result3, _result4;
+      var _result5, _result6;
       setFetching(false);
       result = result.data;
-      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+      if (((_result5 = result) === null || _result5 === void 0 ? void 0 : _result5.status) && result.status !== '0' || ((_result6 = result) === null || _result6 === void 0 ? void 0 : _result6.code) && result.code !== '000000') {
         antd.message.error(result.msg);
         return;
       }
@@ -10698,10 +10824,11 @@ var AddSelect = function AddSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
-    if (selectMode) {
-      getData(params);
-    }
+    // if (selectMode) {
+    //   getData(params)
+    // }
   };
+
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
@@ -10726,12 +10853,16 @@ var AddSelect = function AddSelect(props) {
       }
     }
     if (isAllowRepeatedSelect) {
+      var newUuid = uuid();
       var list = popvalue.concat(selectRows).map(function (i) {
         return _objectSpread2(_objectSpread2({}, i), {}, {
-          uuid: i.uuid || uuid()
+          uuid: i.uuid || newUuid
         });
       });
-      setPopValue(list);
+      var recordItem = _objectSpread2(_objectSpread2({}, selectRows[0]), {}, {
+        uuid: newUuid
+      });
+      setPopValue(setBusinessDefaultValue(list, recordItem));
       setSelectedRowKeys([]);
     } else {
       setPopValue(selectRows);
@@ -10879,8 +11010,8 @@ var AddSelect = function AddSelect(props) {
     });
   }, [tableColumns]);
   var handleResize = function handleResize(arr, index, callback) {
-    return function (_, _ref4) {
-      var size = _ref4.size;
+    return function (_, _ref5) {
+      var size = _ref5.size;
       var newColumns = arr.map(function (col) {
         return _objectSpread2({}, col);
       });
@@ -14239,14 +14370,9 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'sku'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'sku',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14537,8 +14663,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'skc',
-    isAllowRepeatedSelect: true
+    isAllowRepeatedSelect: (parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) !== undefined ? !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) : true // 默认开启一行选多次
   };
+
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14731,6 +14858,25 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     _useState8 = _slicedToArray(_useState7, 2),
     value = _useState8[0],
     setValue = _useState8[1];
+  var _useState9 = React.useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    propertyList = _useState10[0],
+    setPropertyList = _useState10[1];
+  React.useEffect(function () {
+    if (parProps === null || parProps === void 0 ? void 0 : parProps.isSingleColor) {
+      // type: 1 尺码组; 2 配码组
+      axios__default['default'].get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
+        var _result3, _result4;
+        result = result.data;
+        if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+          antd.message.error(result.msg);
+          return;
+        }
+        var data = result.data || [];
+        setPropertyList(data);
+      }).catch(function (err) {});
+    }
+  }, []);
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: '商品编码',
@@ -14749,6 +14895,19 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
       }, text);
     },
     dataIndex: 'name'
+  }, {
+    title: '颜色',
+    dataIndex: 'colorName',
+    width: 200,
+    isSelectItem: true,
+    dataSourceCode: 'colorValues',
+    dataSourceMapping: ['value', 'value']
+  }, {
+    title: '配码',
+    dataIndex: 'selectPropertyGroupCode',
+    width: 160,
+    isSelectItem: true,
+    dataSource: propertyList
   }, {
     title: '数量',
     width: 100,
@@ -14791,14 +14950,9 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'spu'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'spu',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.2.25",
+  "version": "2.2.27",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/AddSelectBusiness/index.md

@@ -76,6 +76,7 @@ export default () => {
   const config = {
     buttonText: 'context',
     buttonProps: { disabled: false },
+    // isAllowRepeatedSelect: false,
     beforeShowModal: () => {
       return Promise.resolve(true);
       // return Promise.reject('校验有误');
@@ -108,7 +109,7 @@ export default () => {
   const config = {
     buttonText: 'context',
     buttonProps: { disabled: false },
-    exceptColumns: ['count', 'categoryText', 'className'],
+    exceptColumns: ['colorName','selectPropertyGroupCode','count', 'categoryText', 'className'],
     tableCodeList: [null,'spuSelect-tableSelectedItemPartCode_ItemLabel'],
     beforeShowModal: () => {
       return Promise.resolve(true);
@@ -127,3 +128,34 @@ export default () => {
   );
 };
 ```
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import { AddSpuSelect } from '../../../index.ts';
+
+export default () => {
+  const config = {
+    buttonText: '添加商品（单色配码）',
+    buttonProps: { disabled: false },
+    isSingleColor: true,
+    isAllowRepeatedSelect: true,
+    exceptColumns: ['ownOrgSignName', 'brandName', 'categoryText', 'className'],
+    tableCodeList: [null,'spuSelect-tableSelectedItemPartCode_ItemMatchingColor'],
+    beforeShowModal: () => {
+      return Promise.resolve(true);
+      // return Promise.reject('校验有误');
+    },
+    onSaveCallback: (rows) => {
+      console.log('save call', rows);
+      return Promise.resolve(true);
+      // return Promise.reject('FAILE')
+    }
+  }
+  return (
+    <div>
+      <AddSpuSelect {...config}  />
+    </div>
+  );
+};
+```

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -149,12 +149,8 @@ export const AddSkuSelect = (parProps: any) => {
     },
     beforeShowModal: parProps?.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'sku'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'sku',
+    isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
   };
   const modalTableProps = {
     modalTableTitle: '选择商品',
@@ -436,7 +432,7 @@ export const AddSkcSelect = (parProps: any) => {
     beforeShowModal: parProps?.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'skc',
-    isAllowRepeatedSelect: true
+    isAllowRepeatedSelect: parProps?.isAllowRepeatedSelect!==undefined ? !!parProps?.isAllowRepeatedSelect : true, // 默认开启一行选多次
   };
   const modalTableProps = {
     modalTableTitle: '选择商品',
@@ -608,6 +604,23 @@ export const AddSpuSelect = (parProps: any) => {
     mode: 'multiple',
   }
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const [propertyList, setPropertyList] = useState([]);
+
+  useEffect(() => {
+    if(parProps?.isSingleColor) {
+      // type: 1 尺码组; 2 配码组
+      axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
+        result = result.data;
+        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+          message.error(result.msg);
+          return;
+        }
+        const data = result.data || [];
+        setPropertyList(data)
+      }).catch((err) => {});
+    }
+  },[])
+
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   const initialSelectColumn = [
     {
@@ -628,6 +641,21 @@ export const AddSpuSelect = (parProps: any) => {
       ),
       dataIndex: 'name',
     },
+    {
+      title: '颜色',
+      dataIndex: 'colorName',
+      width: 200,
+      isSelectItem: true,
+      dataSourceCode: 'colorValues',
+      dataSourceMapping: ['value', 'value']
+    },
+    {
+      title: '配码',
+      dataIndex: 'selectPropertyGroupCode',
+      width: 160,
+      isSelectItem: true,
+      dataSource: propertyList,
+    },
     {
       title: '数量',
       width: 100,
@@ -677,11 +705,7 @@ export const AddSpuSelect = (parProps: any) => {
     beforeShowModal: parProps?.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'spu',
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
   };
   const modalTableProps = {
     modalTableTitle: '选择商品',

package/src/components/Functional/AddSelect/index.tsx

@@ -34,6 +34,24 @@ const loadSelectSource = (url: string, params?: any) => {
   })
 };
 
+const checkSpuMatchCode = (data: any) => {
+  return new Promise((resolve, reject) => {
+      axios.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
+        .then((result: any) => {
+          result = result.data;
+          if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+            message.error(result.msg);
+            reject(false);
+            return;
+          }
+          resolve(result);
+        })
+        .catch((err) => {
+          reject(err);
+        });
+    })
+}
+
 const ResizeableTitle = (props) => {
   const { onResize, width, ...restProps } = props;
 
@@ -180,6 +198,50 @@ const AddSelect = (props: any) => {
   const codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   const codeSelected = tableCodeList[1] || initTableCode[businessType][1];
 
+  const checkSelectChange = async (bType: string, tList: any, recordKey: string, recordItem: any, selectItem: any, changeValue: string) => {
+    if(bType == 'skc' && tList.some((i: any) => i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue)) {
+      message.warning('相同skc配码不可设置相同哦')
+      return false
+    }
+    if(bType == 'spu') {
+      if(selectItem.dataIndex == 'colorName' && tList.some((i: any) => i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue)){
+        message.warning('相同商品相同配码颜色不可设置相同哦')
+        return false
+      }
+      if(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName) {
+        message.warning('请先选择颜色！')
+        return false
+      }
+      if(selectItem.dataIndex == 'selectPropertyGroupCode'&& tList.some((i: any) => i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue)){
+        message.warning('相同商品相同颜色配码不可设置相同哦')
+        return false
+      }
+      if(selectItem.dataIndex == 'selectPropertyGroupCode') {
+        let result = true
+        try {
+          result = await checkSpuMatchCode({ skcCode: recordItem[recordKey], matchingCode: changeValue, ext1: recordItem.colorName });
+          result = true
+        }  catch (e) {
+          result = typeof e == 'boolean' ? e : false
+        }
+        return result
+      }
+    }
+    return true
+  }
+  const setBusinessDefaultValue = (list: any, record: any) => {
+    let result = list;
+    if(businessType == 'spu' && record?.colorValues?.length == 1) {
+      result = list.map((i: any) => {
+        if(i.uuid == record?.uuid) {
+          i.colorName = record.colorValues[0]?.value
+        }
+        return i
+      })
+    }
+    return result
+  }
+
   useEffect(() => {
     setTableColumns(modalTableProps?.tableColumns)
   }, [modalTableProps?.tableColumns])
@@ -324,24 +386,20 @@ const AddSelect = (props: any) => {
         return {
           ...item,
           render: (text, record, index) => {
-            if (item.dataSource?.length) {
+            if (item?.dataSource?.length || item?.dataSourceCode) {
+              const dataSourceList = item.dataSource || record?.[item?.dataSourceCode] || [];
+              const selectKey = item?.dataSourceMapping?.[0] || 'code';
+              const selectText = item?.dataSourceMapping?.[1] || 'name';
               return (
                 <Select
                   value={text || null}
-                  onChange={(value) => {
-                    if(businessType == 'skc' && popvalue.some((i: any) => i.code == record.code && i[item.dataIndex] == value)) {
-                      message.warning('相同skc配码不可设置相同哦')
+                  onChange={async (value) => {
+                    const isConformToTheRules = await checkSelectChange(businessType,popvalue,mappingValueField,record,item,value)
+                    if(isConformToTheRules) {
+                      record[item.dataIndex] = value
+                    } else {
                       record[item.dataIndex] = null;
-                      const newPopValue = popvalue.map((i: any, innerIndex: number) => {
-                        if(innerIndex == index) {
-                          i[item.dataIndex] =  record[item.dataIndex]
-                        }
-                        return i
-                      })
-                      setPopValue(newPopValue)
-                      return false
                     }
-                    record[item.dataIndex] = value
                     const newPopValue = popvalue.map((i: any, innerIndex: number) => {
                       if(innerIndex == index) {
                         i[item.dataIndex] =  record[item.dataIndex]
@@ -352,8 +410,8 @@ const AddSelect = (props: any) => {
                   }}
                   style={{width: '160px'}}
                 >
-                  {item.dataSource.map((item: any) => {
-                    return <Select.Option value={item.code}>{item.name}</Select.Option>
+                  {dataSourceList.map((item: any) => {
+                    return <Select.Option value={item[selectKey]}>{item[selectText]}</Select.Option>
                   })}
                 </Select>
               )
@@ -798,9 +856,9 @@ const AddSelect = (props: any) => {
     const params = form.getFieldsValue();
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2)
-    if (selectMode) {
-      getData(params)
-    }
+    // if (selectMode) {
+    //   getData(params)
+    // }
   }
 
   const onResetTable = () => {
@@ -838,8 +896,10 @@ const AddSelect = (props: any) => {
       }
     }
     if(isAllowRepeatedSelect) {
-      const list = popvalue.concat(selectRows).map((i: any) => ({...i, uuid: i.uuid || uuid()}))
-      setPopValue(list);
+      const newUuid = uuid();
+      const list = popvalue.concat(selectRows).map((i: any) => ({...i, uuid: i.uuid || newUuid}));
+      const recordItem = {...selectRows[0], uuid: newUuid }
+      setPopValue(setBusinessDefaultValue(list,recordItem));
       setSelectedRowKeys([])
     } else {
       setPopValue(selectRows);