@bit-sun/business-component 2.2.0-alpha.21 → 2.2.0-alpha.23

package/dist/index.esm.js

@@ -2082,6 +2082,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     isMap = _ref.isMap,
     fixedparameter = _ref.fixedparameter,
     fieldValToParam = _ref.fieldValToParam,
+    _ref$fixedparamsDisab = _ref.fixedparamsDisabled,
+    fixedparamsDisabled = _ref$fixedparamsDisab === void 0 ? false : _ref$fixedparamsDisab,
     _ref$mappingTextField = _ref.mappingTextField,
     mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
     mappingTextShowKeyField = _ref.mappingTextShowKeyField,
@@ -2109,6 +2111,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     optionLabelProp: "label",
     autoClearSearchValue: false
   });
+  var tableInitPagination = {
+    showQuickJumper: true,
+    total: 0,
+    current: 1,
+    pageSize: tableInitPageSize
+  };
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
@@ -2177,12 +2185,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     tableData = _useState20[0],
     setTableData = _useState20[1];
-  var _useState21 = useState({
-      showQuickJumper: true,
-      total: 0,
-      current: 1,
-      pageSize: tableInitPageSize
-    }),
+  var _useState21 = useState(tableInitPagination),
     _useState22 = _slicedToArray(_useState21, 2),
     tablePagination = _useState22[0],
     setTablePagination = _useState22[1];
@@ -2231,10 +2234,21 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       },
       getTableFormRef: function getTableFormRef() {
         return form;
+      },
+      // 解决下拉框数据源的问题
+      getSelectDataSource: function getSelectDataSource() {
+        return items;
+      },
+      setSelectDataSource: function setSelectDataSource(list, listTotal) {
+        setItems(list);
+        setItemsTotal(listTotal);
+      },
+      refreshSelectDataSource: function refreshSelectDataSource() {
+        refreshItems();
       }
     };
   });
-  // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+  // 获取数据源 （type: 1下拉框 2/3弹框  不传值默认为下拉框）
   var getData = function getData() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
@@ -2247,7 +2261,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
         if (fixedParamVal) {
           fixedParam[item] = fixedParamVal;
-          form.setFieldsValue(_objectSpread2(_objectSpread2({}, form === null || form === void 0 ? void 0 : form.getFieldsValue()), {}, _defineProperty({}, item, fixedParamVal)));
+          // 解决依赖项在弹窗中回显/更改（如果不能更改，传参fixedparamsDisabled为true即可）
+          if (type == 2 || type == 3) {
+            var fixedChangeParamVal = form.getFieldValue(item);
+            // 依赖项在弹窗form中更改--①更换依赖值；②去掉依赖值
+            var isDependenceValueChange = fixedChangeParamVal && fixedChangeParamVal !== fixedParamVal || type == 2 && !fixedChangeParamVal;
+            var dependenceValue = isDependenceValueChange ? fixedChangeParamVal : fixedParamVal;
+            fixedParam[item] = dependenceValue;
+            form.setFieldsValue(_objectSpread2(_objectSpread2({}, form === null || form === void 0 ? void 0 : form.getFieldsValue()), {}, _defineProperty({}, item, dependenceValue)));
+            if (isDependenceValueChange) {
+              ctx.form.setFieldValue(fieldValToParam[index], fixedChangeParamVal); // 更改依赖项
+              ctx.form.setFieldValue(resultSourceKey, null); // 同时清空之前依赖项对应的选择项
+              refreshItems();
+            }
+          }
         }
       });
     }
@@ -2457,7 +2484,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     getData({
       pageSize: tableInitPageSize,
       currentPage: 1
-    }, 2);
+    }, 3);
     setIsModalVisible(true);
     // 回显
     if (value) {
@@ -2495,18 +2522,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var handleSelectOver = function handleSelectOver(selectedValue) {
     if (selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.length) {
       var _ctx$form2;
-      formaData(selectedValue);
       // 解决选择最后1页的sku，返回后，不显示名称问题
       var source = _.uniqBy(items.concat(selectedValue), 'value');
       ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(resultSourceKey, source);
       setItems(source);
+      formaData(selectedValue, source);
     }
   };
   var handleOk = function handleOk() {
     handleSelectOver(popvalue);
     handleCancel();
   };
-  var formaData = function formaData(value) {
+  var formaData = function formaData(value, source) {
     if (labelInValue) {
       var formatResult = value.map(function (i) {
         return {
@@ -2515,17 +2542,26 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
           value: i[mappingValueField]
         };
       });
-      onChange(selectMode ? formatResult : formatResult[0], value);
+      onChange(selectMode ? formatResult : formatResult[0], value, source);
     } else {
       var _formatResult = selectMode ? value.map(function (i) {
         return i.value;
       }) : _.get(value[0], 'value');
-      onChange(_formatResult, value);
+      onChange(_formatResult, value, source);
     }
   };
-  var handleCancel = function handleCancel() {
+  var clearModalTable = function clearModalTable() {
     form.resetFields();
     setTableFormParams({});
+    setTableData([]);
+    setTablePagination(tableInitPagination);
+    setSelectedRowKeys([]);
+    setDoubleArr([]);
+    setCheckedAll(false);
+    setIndeterminate(false);
+  };
+  var handleCancel = function handleCancel() {
+    clearModalTable();
     setIsModalVisible(false);
     if (selectMode) {
       run();
@@ -2533,7 +2569,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
-    if (fieldValToParam && ctx) {
+    if (fieldValToParam && ctx && fixedparamsDisabled) {
       var formValueList = [];
       fieldValToParam.forEach(function (item, index) {
         var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
@@ -2707,11 +2743,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
       var setDisabled = function setDisabled(name) {
-        var _requestConfig$fixedp = requestConfig.fixedparamsDisabled,
-          fixedparamsDisabled = _requestConfig$fixedp === void 0 ? false : _requestConfig$fixedp,
-          _requestConfig$fixedp2 = requestConfig.fixedparameter,
-          fixedparameter = _requestConfig$fixedp2 === void 0 ? [] : _requestConfig$fixedp2;
-        if (fixedparamsDisabled && fixedparameter.find(function (item) {
+        if (fixedparamsDisabled && (fixedparameter === null || fixedparameter === void 0 ? void 0 : fixedparameter.length) && fixedparameter.find(function (item) {
           return item === name;
         })) {
           return true;
@@ -9849,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,
@@ -10089,6 +10137,87 @@ 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);
+    };
+  }();
   useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns);
   }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]);
@@ -10238,40 +10367,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);
@@ -10400,10 +10544,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;
       }
@@ -10498,10 +10642,10 @@ var AddSelect = function AddSelect(props) {
       });
     }
     if (businessType == 'skc') {
-      Promise.all([loadSelectSource("/items/item/propertyValue", {
-        pageSize: 5000,
+      Promise.all([loadSelectSource("/items/item/propertyValue/sizeBySkcConfig", {
+        pageSize: 10000,
         currentPage: 1,
-        'qp-propertyId-eq': '1467042217951883265'
+        type: 2 // 类型：1尺码；2颜色
       }), loadSelectSource("/items/category/queryCategoryTree", {
         pageSize: 5000,
         currentPage: 1
@@ -10648,10 +10792,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({});
@@ -10829,8 +10974,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);
       });
@@ -12807,6 +12952,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       filter: 'qp-code,name-orGroup,like',
       mappingTextField: 'name',
       mappingValueField: 'code',
+      otherParams: {
+        'qp-skcStatus-eq': 1 // 状态：0禁用 1启用
+      },
+
       sourceName: 'qp-skcCode-eq'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -12902,10 +13051,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/item/propertyValue"), {
-      pageSize: 5000,
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/item/propertyValue/sizeBySkcConfig"), {
+      pageSize: 10000,
       currentPage: 1,
-      'qp-propertyId-eq': '1467042217951883265'
+      type: 2 // 类型：1尺码；2颜色
     }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
       pageSize: 5000,
       currentPage: 1
@@ -13823,6 +13972,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
   }
   // 配送方式选择器
   if (type === 'deliveryMode') {
+    var _requestConfigProp$fi;
+    var isLogisCompanyCodeSingleSearch = requestConfigProp === null || requestConfigProp === void 0 ? void 0 : (_requestConfigProp$fi = requestConfigProp.fixedparameter) === null || _requestConfigProp$fi === void 0 ? void 0 : _requestConfigProp$fi.some(function (i) {
+      return i == 'qp-logisCompanyCode-eq';
+    });
+    var logisCompanyCodeSingleSearchName = isLogisCompanyCodeSingleSearch ? 'qp-logisCompanyCode-eq' : 'qp-logisCompanyCode-in';
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/deliveryMode"),
       filter: 'qp-name,code-orGroup,like',
@@ -13841,23 +13995,24 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-code-like',
       label: '配送方式编码'
     }, {
-      name: 'qp-logisCompanyCode-in',
+      name: logisCompanyCodeSingleSearchName,
       type: 'select',
       label: '所属物流商',
       field: {
         type: 'select',
-        props: {
+        props: _objectSpread2(_objectSpread2({}, isLogisCompanyCodeSingleSearch ? {} : {
           mode: 'multiple',
+          maxTagCount: 1
+        }), {}, {
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
           }
-        }
+        })
       }
     }, {
       name: 'qp-recordChannnelCode-in',
@@ -14179,14 +14334,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: [{
@@ -14399,7 +14549,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     setPropertyList = _useState6[1];
   useEffect(function () {
     // type: 1 尺码组; 2 配码组
-    axios.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2").then(function (result) {
+    axios.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
       var _result, _result2;
       result = result.data;
       if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
@@ -14463,7 +14613,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: {},
+      otherParams: {
+        'qp-skcStatus-eq': 1
+      },
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -14475,8 +14627,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: [{
@@ -14669,6 +14822,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: '商品编码',
@@ -14687,6 +14859,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,
@@ -14729,14 +14914,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: [{
@@ -15032,6 +15212,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
+var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
 var TreeSearchSelect = function TreeSearchSelect(props) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -15064,13 +15245,14 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _props$allowClear = props.allowClear,
     allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
     _props$showCheckedStr = props.showCheckedStrategy,
-    showCheckedStrategy = _props$showCheckedStr === void 0 ? TreeSelect.SHOW_PARENT : _props$showCheckedStr,
+    showCheckedStrategy = _props$showCheckedStr === void 0 ? (props === null || props === void 0 ? void 0 : props.treeCheckStrictly) ? TreeSelect.SHOW_ALL : TreeSelect.SHOW_PARENT : _props$showCheckedStr,
     _props$style = props.style,
     style = _props$style === void 0 ? {
       width: '100%'
     } : _props$style,
     getTreeData = props.getTreeData,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    restProps = _objectWithoutProperties(props, _excluded$5);
   var url = remoteSource.url,
     _remoteSource$paramsK = remoteSource.paramsKey,
     paramsKey = _remoteSource$paramsK === void 0 ? 'qp-name-like' : _remoteSource$paramsK,
@@ -15111,7 +15293,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
             switch (_context.prev = _context.next) {
               case 0:
                 resData = (res === null || res === void 0 ? void 0 : res.data) || [];
-                if (!(resData.status === '0')) {
+                if (!(resData.status === '0' || resData.code === '000000')) {
                   _context.next = 13;
                   break;
                 }
@@ -15155,7 +15337,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
   };
   var formatData = function formatData(value) {
     if (labelInValue) {
-      var formatResult = multiple ? value.map(function (i) {
+      var formatResult = multiple || treeCheckable ? value.map(function (i) {
         return _objectSpread2(_objectSpread2({}, i), {}, {
           key: i.value
         });
@@ -15164,9 +15346,9 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       });
       return formatResult;
     } else {
-      var _formatResult = multiple ? value.map(function (i) {
+      var _formatResult = multiple || treeCheckable ? value.map(function (i) {
         return (i === null || i === void 0 ? void 0 : i.value) || i;
-      }) : _.get(value[0], 'value') || value;
+      }) : _.get(value === null || value === void 0 ? void 0 : value[0], 'value') || value;
       return _formatResult;
     }
   };
@@ -15213,7 +15395,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: 'tree_search_select'
-  }, /*#__PURE__*/React.createElement(TreeSelect, {
+  }, /*#__PURE__*/React.createElement(TreeSelect, _objectSpread2(_objectSpread2({}, restProps), {}, {
     treeCheckable: treeCheckable,
     maxTagCount: maxTagCount,
     showSearch: showSearch,
@@ -15239,7 +15421,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     getPopupContainer: function getPopupContainer() {
       return _getPopupContainer && _getPopupContainer() || document.body;
     }
-  }));
+  })));
 };
 
 var handleDefaultProps = function handleDefaultProps(type) {
@@ -15264,7 +15446,8 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'sales-organizational-view'
+            'orgViewCode': 'sales-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }
@@ -15276,7 +15459,8 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'purchase-organizational-view'
+            'orgViewCode': 'purchase-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }
@@ -15288,12 +15472,22 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'stock-organizational-view'
+            'orgViewCode': 'stock-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }
       };
       break;
+    case 'market-area':
+      result = {
+        isChoose: true,
+        remoteSource: {
+          url: "/channel-manage/tagNode/getTree/10",
+          resKeyValue: ['code', 'name']
+        }
+      };
+      break;
     default:
       result = {
         treeCheckable: true,
@@ -15376,11 +15570,11 @@ var arrow_top = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXA
 var css_248z$9 = ".form-guide {\n  cursor: pointer;\n  position: fixed;\n  right: 5px;\n  color: #B1BAD4;\n  padding: 5px 0;\n  width: 48px;\n  z-index: 10;\n  top: 50%;\n  transform: translateY(-50%);\n  background-color: #141620;\n  border-radius: 5px;\n}\n.form-guide .form-guide-top {\n  padding: 0px 10px;\n  display: flex;\n  justify-content: center;\n}\n.form-guide .form-guide-center {\n  border-top: 1px solid #6E7588;\n  border-bottom: 1px solid #6E7588;\n  padding: 0px 10px;\n}\n.form-guide .form-guide-item {\n  width: 28px;\n  padding: 5px 0;\n  display: block;\n  word-break: break-all;\n  color: #B1BAD4;\n  font-size: 14px;\n  line-height: 16px;\n  position: relative;\n}\n.form-guide .form-guide-item::after {\n  content: '';\n  display: block;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.form-guide .form-guide-bottom {\n  padding: 5px 10px;\n  display: flex;\n  justify-content: center;\n}\n.form-guide .form-guide-item:last-child::after {\n  content: '';\n  display: none;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.white-card.bitsun-form-card-class .ant-card-body {\n  background-color: #FFFFFF;\n  padding: 0px;\n}\n.bitsun-form-card-class > .ant-card-body {\n  margin-bottom: 10px;\n}\n.bitsun-form-card-class .ant-card-head {\n  border: 0px;\n  padding: 0px;\n  height: 48px;\n}\n.bitsun-form-card-class .ant-card-body {\n  padding: 12px 0 0;\n  margin-top: -4px;\n  background-color: #F3F3F3;\n}\n.bitsun-form-card-class .ant-card-head-title {\n  display: flex;\n  align-items: center;\n  font-size: 16px;\n  color: #000000;\n  font-weight: 600;\n  font-family: PingFangSC;\n  background-color: #FFFFFF;\n  padding: 8px 0;\n  margin: 0px;\n}\n.bitsun-form-card-class .ant-card-head-title .title-left-line {\n  display: inline-block;\n  width: 4px;\n  height: 100%;\n  background-color: #005CFF;\n  height: 20px;\n  margin-right: 16px;\n}\n.field-group-hidden .ant-card-body {\n  display: none !important;\n}\n";
 styleInject(css_248z$9);
 
-var _excluded$5 = ["children"],
+var _excluded$6 = ["children"],
   _excluded2$2 = ["children"];
 var Field = function Field(_ref) {
   var children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$6);
   var _React$useState = React.useState(true),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     fieldGroupVisible = _React$useState2[0],
@@ -15515,7 +15709,7 @@ var ExportIcon = function ExportIcon(_ref) {
 var css_248z$a = ".sort_table_wrapper .sort_table {\n  display: flex;\n}\n.sort_table_wrapper .sort_table .sort_table_column_wrapper {\n  width: 560px;\n  margin-right: 10px;\n}\n.sort_table_wrapper .sort_table .sort_table_content_wrapper {\n  width: 210px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count,\n.sort_table_wrapper .sort_table .sort_table_content_count {\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count span,\n.sort_table_wrapper .sort_table .sort_table_content_count span {\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column {\n  margin-top: 10px;\n  width: 560px;\n  height: 430px;\n  overflow: auto;\n  padding: 10px;\n  background: #ffffff;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: space-between;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all_empty {\n  width: 538px;\n  line-height: 360px;\n  text-align: center;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column_special {\n  margin-top: 40px;\n  width: 100px;\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper {\n  width: 144px;\n  margin-top: 16px;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper + .ant-checkbox-wrapper {\n  margin-left: 0px;\n}\n.sort_table_wrapper .sort_table .sort_table_content {\n  margin-top: 10px;\n  padding-top: 10px;\n  padding-bottom: 10px;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_content .ant-table-wrapper {\n  padding: 0px !important;\n}\n.sort_table_wrapper .sort_table .sort_table_content .sort_table_title {\n  height: 32px;\n  line-height: 32px;\n  padding-left: 10px;\n  color: gray;\n}\n.sort_table_wrapper div.ant-modal-header {\n  width: 820px;\n  height: 64px;\n  background: #ffffff;\n  padding: 20px;\n  border: 0px;\n}\n.sort_table_wrapper div.ant-modal-header div.ant-modal-title {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 24px;\n}\n.sort_table_wrapper .ant-modal-body {\n  padding: 0 20px !important;\n}\n.sort_table_wrapper .ant-modal-close-x {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-input-affix-wrapper {\n  padding: 0px;\n  padding-right: 10px;\n}\n.sort_table_wrapper input {\n  height: 32px;\n  padding: 6px 4px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-input-prefix {\n  width: 24px;\n  height: 24px;\n  margin: 4px;\n  display: flex;\n  justify-content: center;\n}\n.sort_table_wrapper .ant-modal-footer {\n  height: 70px;\n  border: 0;\n  padding: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn {\n  width: 80px;\n  height: 34px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn span {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 14px;\n  letter-spacing: 0;\n  text-align: center;\n  line-height: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn:first-child {\n  margin-right: 524px;\n}\n.sort_table_wrapper .ant-table-wrapper::-webkit-scrollbar {\n  display: none;\n}\n.sort_table_wrapper .ant-table-wrapper {\n  margin-top: 10px;\n  height: 364px;\n  overflow: scroll;\n  padding-bottom: 50px;\n}\n.sort_table_wrapper .ant-table-wrapper tr {\n  height: 36px;\n}\n.sort_table_wrapper .ant-table-wrapper tr td {\n  width: 24px !important;\n  height: 36px !important;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:first-child {\n  padding-left: 10px !important;\n  padding-right: 0px !important;\n  width: 115px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td img {\n  cursor: pointer;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:not(:first-child) {\n  padding-left: 0px !important;\n  padding-right: 0px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child {\n  padding-left: 0px !important;\n  padding-right: 3px !important;\n  width: 34px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child img {\n  position: relative;\n  top: 1px;\n}\n.global_tab_nav_style {\n  top: 2px !important;\n}\n.row-dragging {\n  background: #fafafa;\n  border: 1px solid #ccc;\n  z-index: 10000;\n}\n.row-dragging td {\n  padding: 7px 16px;\n  display: none;\n}\n.row-dragging td:first-child {\n  display: inline-block;\n}\n.row-dragging .drag-visible {\n  visibility: visible;\n}\n";
 styleInject(css_248z$a);
 
-var _excluded$6 = ["className", "style"];
+var _excluded$7 = ["className", "style"];
 var Search$1 = Input.Search;
 var DragHandle$1 = SortableHandle(function () {
   return /*#__PURE__*/React.createElement("img", {
@@ -15882,7 +16076,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$6);
+        restProps = _objectWithoutProperties(_ref2, _excluded$7);
       var sortDataSource = _this.state.sortDataSource;
       // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
@@ -16149,7 +16343,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
   return SortableTable;
 }(React.Component);
 
-var _excluded$7 = ["onResize", "width"],
+var _excluded$8 = ["onResize", "width"],
   _excluded2$3 = ["style", "columns", "tableCode", "summary", "dynamicColumns", "scroll"];
 var Text = Typography.Text;
 var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
@@ -16262,7 +16456,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
     _this.ResizeableTitle = function (props) {
       var onResize = props.onResize,
         width = props.width,
-        restProps = _objectWithoutProperties(props, _excluded$7);
+        restProps = _objectWithoutProperties(props, _excluded$8);
       if (!width) {
         return /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps));
       }
@@ -16394,7 +16588,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
   return ColumnSettingSulaTable;
 }(React.Component);
 
-var _excluded$8 = ["onResize", "width"],
+var _excluded$9 = ["onResize", "width"],
   _excluded2$4 = ["columns", "tableCode", "summary", "dynamicColumns", "scroll"];
 var Text$1 = Typography.Text;
 var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
@@ -16506,7 +16700,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
     _this.ResizeableTitle = function (props) {
       var onResize = props.onResize,
         width = props.width,
-        restProps = _objectWithoutProperties(props, _excluded$8);
+        restProps = _objectWithoutProperties(props, _excluded$9);
       if (!width) {
         return /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps));
       }
@@ -16716,12 +16910,12 @@ var moreIcon = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D
 var css_248z$c = "";
 styleInject(css_248z$c);
 
-var _excluded$9 = ["message", "type"];
+var _excluded$a = ["message", "type"];
 var CommonAlert = (function (props) {
   var message = props.message,
     _props$type = props.type,
     type = _props$type === void 0 ? 'info' : _props$type,
-    reset = _objectWithoutProperties(props, _excluded$9);
+    reset = _objectWithoutProperties(props, _excluded$a);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
@@ -16742,7 +16936,7 @@ var CommonAlert = (function (props) {
   }, reset)));
 });
 
-var _excluded$a = ["children"];
+var _excluded$b = ["children"];
 var iconMap = {
   edit: /*#__PURE__*/React.createElement("img", {
     src: editIcon
@@ -16764,7 +16958,7 @@ var index$3 = (function (props) {
     _useState2 = _slicedToArray(_useState, 1),
     id = _useState2[0];
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$a);
+    restProps = _objectWithoutProperties(props, _excluded$b);
   return /*#__PURE__*/React.createElement("div", {
     id: id,
     className: 'detail_page_wrapper'
@@ -16973,7 +17167,7 @@ var DetailWrapper = /*#__PURE__*/React.memo(function (_ref) {
 var css_248z$d = ".home_page_head {\n  height: 54px;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 0 20px;\n}\n.home_page_head .home_page_title {\n  height: 20px;\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 16px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  flex-grow: 1;\n  margin-top: 2px;\n}\n.home_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.home_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.home_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  line-height: 16px;\n  cursor: pointer;\n}\n";
 styleInject(css_248z$d);
 
-var _excluded$b = ["children"];
+var _excluded$c = ["children"];
 var index$4 = (function (props) {
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname;
@@ -16981,7 +17175,7 @@ var index$4 = (function (props) {
     _useState2 = _slicedToArray(_useState, 1),
     id = _useState2[0];
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$b);
+    restProps = _objectWithoutProperties(props, _excluded$c);
   return /*#__PURE__*/React.createElement("div", {
     id: id,
     className: 'home_page_wrapper'
@@ -17084,7 +17278,7 @@ var HeaderWrapper = /*#__PURE__*/React.memo(function (_ref) {
 var css_248z$e = ".sort_table_wrapper .sort_table {\n  display: flex;\n}\n.sort_table_wrapper .sort_table .sort_table_column_wrapper {\n  width: 560px;\n  margin-right: 10px;\n}\n.sort_table_wrapper .sort_table .sort_table_content_wrapper {\n  width: 210px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count,\n.sort_table_wrapper .sort_table .sort_table_content_count {\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count span,\n.sort_table_wrapper .sort_table .sort_table_content_count span {\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column {\n  margin-top: 10px;\n  width: 560px;\n  height: 430px;\n  overflow: auto;\n  padding: 10px;\n  background: #ffffff;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: space-between;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all_empty {\n  width: 538px;\n  line-height: 360px;\n  text-align: center;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column_special {\n  margin-top: 40px;\n  width: 100px;\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper {\n  width: 144px;\n  margin-top: 16px;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper + .ant-checkbox-wrapper {\n  margin-left: 0px;\n}\n.sort_table_wrapper .sort_table .sort_table_content {\n  margin-top: 10px;\n  padding-top: 10px;\n  padding-bottom: 10px;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_content .ant-table-wrapper {\n  padding: 0px !important;\n}\n.sort_table_wrapper .sort_table .sort_table_content .sort_table_title {\n  height: 32px;\n  line-height: 32px;\n  padding-left: 10px;\n  color: gray;\n}\n.sort_table_wrapper div.ant-modal-header {\n  width: 820px;\n  height: 64px;\n  background: #ffffff;\n  padding: 20px;\n  border: 0px;\n}\n.sort_table_wrapper div.ant-modal-header div.ant-modal-title {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 24px;\n}\n.sort_table_wrapper .ant-modal-body {\n  padding: 0 20px !important;\n}\n.sort_table_wrapper .ant-modal-close-x {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-input-affix-wrapper {\n  padding: 0px;\n  padding-right: 10px;\n}\n.sort_table_wrapper input {\n  height: 32px;\n  padding: 6px 4px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-input-prefix {\n  width: 24px;\n  height: 24px;\n  margin: 4px;\n  display: flex;\n  justify-content: center;\n}\n.sort_table_wrapper .ant-modal-footer {\n  height: 70px;\n  border: 0;\n  padding: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn {\n  width: 80px;\n  height: 34px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn span {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 14px;\n  letter-spacing: 0;\n  text-align: center;\n  line-height: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn:first-child {\n  margin-right: 524px;\n}\n.sort_table_wrapper .ant-table-wrapper::-webkit-scrollbar {\n  display: none;\n}\n.sort_table_wrapper .ant-table-wrapper {\n  margin-top: 10px;\n  height: 364px;\n  overflow: scroll;\n  padding-bottom: 50px;\n}\n.sort_table_wrapper .ant-table-wrapper tr {\n  height: 36px;\n}\n.sort_table_wrapper .ant-table-wrapper tr td {\n  width: 24px !important;\n  height: 36px !important;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:first-child {\n  padding-left: 10px !important;\n  padding-right: 0px !important;\n  width: 115px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td img {\n  cursor: pointer;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:not(:first-child) {\n  padding-left: 0px !important;\n  padding-right: 0px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child {\n  padding-left: 0px !important;\n  padding-right: 3px !important;\n  width: 34px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child img {\n  position: relative;\n  top: 1px;\n}\n";
 styleInject(css_248z$e);
 
-var _excluded$c = ["className", "style"];
+var _excluded$d = ["className", "style"];
 var DragHandle$2 = SortableHandle(function () {
   return /*#__PURE__*/React.createElement("img", {
     src: drag
@@ -17471,7 +17665,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$c);
+        restProps = _objectWithoutProperties(_ref2, _excluded$d);
       var sortDataSource = _this.state.sortDataSource;
       // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
@@ -17776,7 +17970,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
   return SortableTable;
 }(React.Component);
 
-var _excluded$d = ["className", "style"];
+var _excluded$e = ["className", "style"];
 var DragHandle$3 = SortableHandle(function () {
   return /*#__PURE__*/React.createElement("img", {
     src: drag
@@ -18006,7 +18200,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$d);
+        restProps = _objectWithoutProperties(_ref2, _excluded$e);
       var sortDataSource = _this.state.sortDataSource;
       var index = sortDataSource.findIndex(function (x) {
         return x.name === restProps['data-row-key'];
@@ -18249,12 +18443,12 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
   return SearchItemTable;
 }(React.Component);
 
-var _excluded$e = ["onResize", "width"];
+var _excluded$f = ["onResize", "width"];
 var MemoQueryTable = /*#__PURE__*/React.memo(QueryTable);
 var ResizeableTitle$2 = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
-    restProps = _objectWithoutProperties(props, _excluded$e);
+    restProps = _objectWithoutProperties(props, _excluded$f);
   if (!width) {
     return /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps));
   }
@@ -20747,7 +20941,7 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
 var css_248z$m = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
 styleInject(css_248z$m);
 
-var _excluded$f = ["route"];
+var _excluded$g = ["route"];
 var TabPane = Tabs.TabPane;
 var UN_LISTTEN_DRP;
 var routerArray = [];
@@ -21391,6 +21585,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       //     }
       //   });
       (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.bus.$on("main-route-change", function (appname, info) {
+        localStorage.setItem('isTabChange', true);
         if (appname === itemPath) {
           istParent = 1;
           if (info.type === 'main') {
@@ -21563,7 +21758,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       }); // 添加数据大屏
       var _this$props3 = this.props,
         route = _this$props3.route,
-        restPrpos = _objectWithoutProperties(_this$props3, _excluded$f);
+        restPrpos = _objectWithoutProperties(_this$props3, _excluded$g);
       var exist = route.routes.find(function (route) {
         return route.path === '/homePage/data-show';
       });
@@ -22412,10 +22607,10 @@ var index$6 = /*#__PURE__*/forwardRef(function (props, ref) {
   }))))));
 });
 
-var _excluded$g = ["children"];
+var _excluded$h = ["children"];
 var Drawer = (function (props) {
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$g);
+    restProps = _objectWithoutProperties(props, _excluded$h);
   return /*#__PURE__*/React.createElement(Drawer$1, _objectSpread2({
     mask: true,
     closable: false,
@@ -29187,6 +29382,20 @@ var inputTypes = {
     310: {
       type: 'bs-deliveryModeSearchSelect',
       props: _objectSpread2({}, normalSingleSelectProps)
+    },
+    340: {
+      type: 'bs-RuleTemplateSearchSelect',
+      props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
+    },
+    350: {
+      type: 'bs-marketAreaOrgSelect',
+      props: _objectSpread2({
+        treeCheckable: false
+      }, normalSingleSelectProps)
     }
   },
   30: {
@@ -29323,6 +29532,20 @@ var inputTypes = {
           filter: 'qp-name,code-orGroup,in'
         }
       })
+    },
+    340: {
+      type: 'bs-RuleTemplateSearchSelect',
+      props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
+    },
+    350: {
+      type: 'bs-marketAreaOrgSelect',
+      props: _objectSpread2({
+        treeCheckable: false
+      }, normalSingleSelectProps)
     }
   }
 };
@@ -29351,7 +29574,9 @@ var choiceType = Object.freeze({
   270: '员工选择器',
   280: '库存组织选择器',
   310: '配送方式选择器',
-  330: '变量'
+  330: '变量',
+  340: '规则场景选择器',
+  350: '营销区域选择器'
 });
 var inputType = {
   10: '输入',
@@ -30687,26 +30912,10 @@ function hanleCallbackValue(codeProps, value, customerFields) {
             render: function render(_ref) {
               var record = _ref.record;
               try {
-                var _record$extensionFiel = record.extensionFields,
-                  extensionFields = _record$extensionFiel === void 0 ? {} : _record$extensionFiel;
-                var fieldName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
-                var fieldName2 = "".concat(fieldName1, "Name");
-                if (customerFields.length) {
-                  var targetField = customerFields.find(function (k) {
-                    return k.name.includes(fieldName1);
-                  });
-                  if (targetField) {
-                    var _targetField$initialS = targetField.initialSource,
-                      initialSource = _targetField$initialS === void 0 ? [] : _targetField$initialS;
-                    if (initialSource.length) {
-                      var _initialSource$find;
-                      return ((_initialSource$find = initialSource.find(function (d) {
-                        return d.value == extensionFields[fieldName1];
-                      })) === null || _initialSource$find === void 0 ? void 0 : _initialSource$find.text) || extensionFields[fieldName1];
-                    }
-                  }
-                }
-                return extensionFields[fieldName2] || extensionFields[fieldName1] || '';
+                var lastName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
+                var lastName2 = "".concat(lastName1, "Name");
+                var target = (record === null || record === void 0 ? void 0 : record.extensionFields) || {};
+                return target[lastName2] || target[lastName1] || '';
               } catch (e) {
                 console.log('e', e);
               }