@bit-sun/business-component 2.3.18 → 2.3.20

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { message as message$1, Popover, Card, Avatar, Tooltip, Image, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
+import { message as message$1, Image, Popover, Card, Avatar, Tooltip, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import { history, formatMessage, useLocation, Link, useModel, useIntl } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -136,33 +136,6 @@ axios.interceptors.request.use(function (config) {
   return config;
 });
 
-function _iterableToArrayLimit(arr, i) {
-  var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
-  if (null != _i) {
-    var _s,
-      _e,
-      _x,
-      _r,
-      _arr = [],
-      _n = !0,
-      _d = !1;
-    try {
-      if (_x = (_i = _i.call(arr)).next, 0 === i) {
-        if (Object(_i) !== _i) return;
-        _n = !1;
-      } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return;
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -319,9 +292,14 @@ function _regeneratorRuntime() {
     };
   }
   function maybeInvokeDelegate(delegate, context) {
-    var methodName = context.method,
-      method = delegate.iterator[methodName];
-    if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel;
+    var method = delegate.iterator[context.method];
+    if (undefined === method) {
+      if (context.delegate = null, "throw" === context.method) {
+        if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel;
+        context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method");
+      }
+      return ContinueSentinel;
+    }
     var record = tryCatch(method, delegate.iterator, context.arg);
     if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
     var info = record.arg;
@@ -535,7 +513,7 @@ function _defineProperties(target, props) {
     descriptor.enumerable = descriptor.enumerable || false;
     descriptor.configurable = true;
     if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+    Object.defineProperty(target, descriptor.key, descriptor);
   }
 }
 function _createClass(Constructor, protoProps, staticProps) {
@@ -547,7 +525,6 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 function _defineProperty(obj, key, value) {
-  key = _toPropertyKey(key);
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -690,6 +667,30 @@ function _arrayWithHoles(arr) {
 function _iterableToArray(iter) {
   if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
+function _iterableToArrayLimit(arr, i) {
+  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+  if (_i == null) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _s, _e;
+  try {
+    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+  return _arr;
+}
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -709,20 +710,6 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 var checkQuantityAccuracy = function checkQuantityAccuracy(value, accuracy, errorInfo) {
   var errorMessage = _objectSpread2({
@@ -1010,59 +997,58 @@ var getItemDefaultWidth = function getItemDefaultWidth(item) {
  * @returns 返回处理后的查询参数
  */
 function queryParams(params, flag) {
-  var _loop = function _loop() {
+  for (var key in params) {
     if (Object.prototype.hasOwnProperty.call(params, key)) {
-      var element = params[key];
-      if (element && key.indexOf('*number*') >= 0) {
-        var dataParams = key.split('*number*');
-        dataParams.forEach(function (value, index) {
-          params[value] = element[index];
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*address*') >= 0) {
-        var _dataParams = key.split('*address*');
-        _dataParams.forEach(function (value, index) {
-          params[value] = element.PCDCode[index];
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*costType*') >= 0) {
-        var _dataParams2 = key.split('*costType*');
-        // eslint-disable-next-line prefer-destructuring
-        params[_dataParams2[0]] = element[1];
-        delete params[key];
-      } else if (element && key.indexOf('*fullDate*') >= 0) {
-        var _dataParams3 = key.split('*fullDate*');
-        _dataParams3.forEach(function (value, index) {
-          if (index === 0) {
-            params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+      (function () {
+        var element = params[key];
+        if (element && key.indexOf('*number*') >= 0) {
+          var dataParams = key.split('*number*');
+          dataParams.forEach(function (value, index) {
+            params[value] = element[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*address*') >= 0) {
+          var _dataParams = key.split('*address*');
+          _dataParams.forEach(function (value, index) {
+            params[value] = element.PCDCode[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*costType*') >= 0) {
+          var _dataParams2 = key.split('*costType*');
+          // eslint-disable-next-line prefer-destructuring
+          params[_dataParams2[0]] = element[1];
+          delete params[key];
+        } else if (element && key.indexOf('*fullDate*') >= 0) {
+          var _dataParams3 = key.split('*fullDate*');
+          _dataParams3.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+            }
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*') >= 0) {
+          var _dataParams4 = key.split('*');
+          _dataParams4.forEach(function (value, index) {
+            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+          });
+          delete params[key];
+        } else if (element && key.indexOf('_likeIn_') >= 0) {
+          var _dataParams5 = key.split('_likeIn_');
+          if (element.indexOf(',') >= 0) {
+            params["qp-".concat(_dataParams5[0], "-in")] = element.split(',').join(',');
+            params["qp-".concat(_dataParams5[0], "-like")] = null;
           } else {
-            params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+            params["qp-".concat(_dataParams5[0], "-like")] = element;
+            params["qp-".concat(_dataParams5[0], "-in")] = null;
           }
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*') >= 0) {
-        var _dataParams4 = key.split('*');
-        _dataParams4.forEach(function (value, index) {
-          params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-        });
-        delete params[key];
-      } else if (element && key.indexOf('_likeIn_') >= 0) {
-        var _dataParams5 = key.split('_likeIn_');
-        if (element.indexOf(',') >= 0) {
-          params["qp-".concat(_dataParams5[0], "-in")] = element.split(',').join(',');
-          params["qp-".concat(_dataParams5[0], "-like")] = null;
-        } else {
-          params["qp-".concat(_dataParams5[0], "-like")] = element;
-          params["qp-".concat(_dataParams5[0], "-in")] = null;
+          delete params[key];
+        } else if (Array.isArray(element)) {
+          params[key] = element.join(',');
         }
-        delete params[key];
-      } else if (Array.isArray(element)) {
-        params[key] = element.join(',');
-      }
+      })();
     }
-  };
-  for (var key in params) {
-    _loop();
   }
   return flag ? params : qs.stringify(params);
 }
@@ -2579,7 +2565,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent;
+    fieldComponent = props.fieldComponent,
+    selectBusinessType = props.selectBusinessType;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -2790,85 +2777,84 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
     // 数组对象处理,对带有特殊标记的name进行处理
-    var _loop = function _loop() {
+    for (var key in params) {
       if (Object.prototype.hasOwnProperty.call(params, key)) {
-        var element = params[key];
-        if (element && key.indexOf('*number*') >= 0) {
-          var dataParams = key.split('*number*');
-          dataParams.forEach(function (value, index) {
-            params[value] = element[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*address*') >= 0) {
-          var _dataParams = key.split('*address*');
-          _dataParams.forEach(function (value, index) {
-            params[value] = element.PCDCode[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*costType*') >= 0) {
-          var _dataParams2 = key.split('*costType*');
-          // eslint-disable-next-line prefer-destructuring
-          params[_dataParams2[0]] = element[1];
-          delete params[key];
-        } else if (element && key.indexOf('*fullDate*') >= 0) {
-          var _dataParams3 = key.split('*fullDate*');
-          _dataParams3.forEach(function (value, index) {
-            if (index === 0) {
-              params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-            } else {
-              params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+        (function () {
+          var element = params[key];
+          if (element && key.indexOf('*number*') >= 0) {
+            var dataParams = key.split('*number*');
+            dataParams.forEach(function (value, index) {
+              params[value] = element[index];
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*address*') >= 0) {
+            var _dataParams = key.split('*address*');
+            _dataParams.forEach(function (value, index) {
+              params[value] = element.PCDCode[index];
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*costType*') >= 0) {
+            var _dataParams2 = key.split('*costType*');
+            // eslint-disable-next-line prefer-destructuring
+            params[_dataParams2[0]] = element[1];
+            delete params[key];
+          } else if (element && key.indexOf('*fullDate*') >= 0) {
+            var _dataParams3 = key.split('*fullDate*');
+            _dataParams3.forEach(function (value, index) {
+              if (index === 0) {
+                params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+              } else {
+                params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+              }
+            });
+            delete params[key];
+          } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
+            var _dataParams4 = key.split('*checkBox*');
+            if (element) {
+              params[_dataParams4[0]] = 0;
             }
-          });
-          delete params[key];
-        } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
-          var _dataParams4 = key.split('*checkBox*');
-          if (element) {
-            params[_dataParams4[0]] = 0;
-          }
-          delete params[key];
-        } else if (element && key.indexOf('*cascader*') >= 0) {
-          var _dataParams5 = key.split('*cascader*');
-          params[_dataParams5[0]] = element[element.length - 1];
-          delete params[key];
-        } else if (element && key.indexOf('*date*') >= 0) {
-          var _dataParams6 = key.split('*date*');
-          _dataParams6.forEach(function (value, index) {
-            if (index === 0) {
-              params[value] = moment(element[index]).format('YYYY-MM-DD');
+            delete params[key];
+          } else if (element && key.indexOf('*cascader*') >= 0) {
+            var _dataParams5 = key.split('*cascader*');
+            params[_dataParams5[0]] = element[element.length - 1];
+            delete params[key];
+          } else if (element && key.indexOf('*date*') >= 0) {
+            var _dataParams6 = key.split('*date*');
+            _dataParams6.forEach(function (value, index) {
+              if (index === 0) {
+                params[value] = moment(element[index]).format('YYYY-MM-DD');
+              } else {
+                params[value] = moment(element[index]).format('YYYY-MM-DD');
+              }
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*') >= 0) {
+            var _dataParams7 = key.split('*');
+            _dataParams7.forEach(function (value, index) {
+              params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+            });
+            delete params[key];
+          } else if (element && key.indexOf('_selectNumberRange') >= 0) {
+            // key = xxxxx_selectNumberRange   qp-xxxxx-gt
+            var _dataParams8 = key.split('_selectNumberRange')[0];
+            if (params[key][0] === 'range') {
+              if (params[key][1][0]) {
+                params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
+              }
+              if (params[key][1][1]) {
+                params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
+              }
             } else {
-              params[value] = moment(element[index]).format('YYYY-MM-DD');
-            }
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*') >= 0) {
-          var _dataParams7 = key.split('*');
-          _dataParams7.forEach(function (value, index) {
-            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-          });
-          delete params[key];
-        } else if (element && key.indexOf('_selectNumberRange') >= 0) {
-          // key = xxxxx_selectNumberRange   qp-xxxxx-gt
-          var _dataParams8 = key.split('_selectNumberRange')[0];
-          if (params[key][0] === 'range') {
-            if (params[key][1][0]) {
-              params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
+              params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
             }
-            if (params[key][1][1]) {
-              params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
-            }
-          } else {
-            params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
+            delete params[key];
+          } else if (Array.isArray(element)) {
+            params[key] = element.join(',');
+          } else if (element == null || element === undefined || String(element).trim() === '') {
+            delete params[key];
           }
-          delete params[key];
-        } else if (Array.isArray(element)) {
-          params[key] = element.join(',');
-        } else if (element == null || element === undefined || String(element).trim() === '') {
-          delete params[key];
-        }
+        })();
       }
-    };
-    for (var key in params) {
-      _loop();
     }
     var queryParams = _objectSpread2(_objectSpread2(_objectSpread2({
       pageSize: pageSize,
@@ -2996,6 +2982,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
+  useEffect(function () {
+    if (init) {
+      setItems([]);
+      setItemsTotal(0);
+      run('init');
+    }
+  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -4207,30 +4200,31 @@ var noEmptyArray = function noEmptyArray(arr) {
 };
 //设置queryTable默认列宽
 var getItemDefaultWidth$1 = function getItemDefaultWidth(item) {
+  var _ref;
   var defaultWidth = 200;
-  var lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
+  var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
   switch (true) {
     case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
       defaultWidth = 60;
       break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('number')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('quantity')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('amount')) > -1:
       defaultWidth = 90;
       break;
-    case lowerCaseKey.indexOf('no') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('no')) > -1:
       defaultWidth = 200;
       break;
-    case lowerCaseKey.indexOf('code') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('code')) > -1:
       defaultWidth = 170;
       break;
-    case lowerCaseKey.indexOf('time') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('time')) > -1:
       defaultWidth = 130;
       break;
-    case lowerCaseKey.indexOf('status') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('status')) > -1:
       defaultWidth = 100;
       break;
-    case lowerCaseKey.indexOf('user') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('user')) > -1:
       defaultWidth = 130;
       break;
   }
@@ -4377,7 +4371,9 @@ var AddSelect = function AddSelect(props) {
     _props$businessType = props.businessType,
     businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
     _props$isAllowRepeate = props.isAllowRepeatedSelect,
-    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate,
+    _props$noUseItemEanco = props.noUseItemEancode,
+    noUseItemEancode = _props$noUseItemEanco === void 0 ? true : _props$noUseItemEanco;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -4534,74 +4530,76 @@ var AddSelect = function AddSelect(props) {
     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$1.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$1.warning('相同商品相同配码颜色不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 7:
-            if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
-              _context.next = 10;
-              break;
-            }
-            message$1.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$1.warning('相同商品相同颜色配码不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 13:
-            if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
-              _context.next = 26;
+        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$1.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$1.warning('相同商品相同配码颜色不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 7:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+                _context.next = 10;
+                break;
+              }
+              message$1.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$1.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;
-            }
-            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();
+            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]]);
     }));
@@ -4793,27 +4791,29 @@ var AddSelect = function AddSelect(props) {
                   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];
+                      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;
                             }
-                            return i;
-                          });
-                          setPopValue(newPopValue);
-                        case 6:
-                        case "end":
-                          return _context2.stop();
+                            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();
+                        }
                       }
                     }, _callee2);
                   }));
@@ -4873,85 +4873,84 @@ var AddSelect = function AddSelect(props) {
       });
     }
     // 数组对象处理,对带有特殊标记的name进行处理
-    var _loop = function _loop() {
+    for (var key in params) {
       if (Object.prototype.hasOwnProperty.call(params, key)) {
-        var element = params[key];
-        if (element && key.indexOf('*number*') >= 0) {
-          var dataParams = key.split('*number*');
-          dataParams.forEach(function (value, index) {
-            params[value] = element[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*address*') >= 0) {
-          var _dataParams = key.split('*address*');
-          _dataParams.forEach(function (value, index) {
-            params[value] = element.PCDCode[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*costType*') >= 0) {
-          var _dataParams2 = key.split('*costType*');
-          // eslint-disable-next-line prefer-destructuring
-          params[_dataParams2[0]] = element[1];
-          delete params[key];
-        } else if (element && key.indexOf('*fullDate*') >= 0) {
-          var _dataParams3 = key.split('*fullDate*');
-          _dataParams3.forEach(function (value, index) {
-            if (index === 0) {
-              params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-            } else {
-              params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+        (function () {
+          var element = params[key];
+          if (element && key.indexOf('*number*') >= 0) {
+            var dataParams = key.split('*number*');
+            dataParams.forEach(function (value, index) {
+              params[value] = element[index];
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*address*') >= 0) {
+            var _dataParams = key.split('*address*');
+            _dataParams.forEach(function (value, index) {
+              params[value] = element.PCDCode[index];
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*costType*') >= 0) {
+            var _dataParams2 = key.split('*costType*');
+            // eslint-disable-next-line prefer-destructuring
+            params[_dataParams2[0]] = element[1];
+            delete params[key];
+          } else if (element && key.indexOf('*fullDate*') >= 0) {
+            var _dataParams3 = key.split('*fullDate*');
+            _dataParams3.forEach(function (value, index) {
+              if (index === 0) {
+                params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+              } else {
+                params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
+              }
+            });
+            delete params[key];
+          } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
+            var _dataParams4 = key.split('*checkBox*');
+            if (element) {
+              params[_dataParams4[0]] = 0;
             }
-          });
-          delete params[key];
-        } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
-          var _dataParams4 = key.split('*checkBox*');
-          if (element) {
-            params[_dataParams4[0]] = 0;
-          }
-          delete params[key];
-        } else if (element && key.indexOf('*cascader*') >= 0) {
-          var _dataParams5 = key.split('*cascader*');
-          params[_dataParams5[0]] = element[element.length - 1];
-          delete params[key];
-        } else if (element && key.indexOf('*date*') >= 0) {
-          var _dataParams6 = key.split('*date*');
-          _dataParams6.forEach(function (value, index) {
-            if (index === 0) {
-              params[value] = moment(element[index]).format('YYYY-MM-DD');
+            delete params[key];
+          } else if (element && key.indexOf('*cascader*') >= 0) {
+            var _dataParams5 = key.split('*cascader*');
+            params[_dataParams5[0]] = element[element.length - 1];
+            delete params[key];
+          } else if (element && key.indexOf('*date*') >= 0) {
+            var _dataParams6 = key.split('*date*');
+            _dataParams6.forEach(function (value, index) {
+              if (index === 0) {
+                params[value] = moment(element[index]).format('YYYY-MM-DD');
+              } else {
+                params[value] = moment(element[index]).format('YYYY-MM-DD');
+              }
+            });
+            delete params[key];
+          } else if (element && key.indexOf('*') >= 0) {
+            var _dataParams7 = key.split('*');
+            _dataParams7.forEach(function (value, index) {
+              params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+            });
+            delete params[key];
+          } else if (element && key.indexOf('_selectNumberRange') >= 0) {
+            // key = xxxxx_selectNumberRange   qp-xxxxx-gt
+            var _dataParams8 = key.split('_selectNumberRange')[0];
+            if (params[key][0] === 'range') {
+              if (params[key][1][0]) {
+                params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
+              }
+              if (params[key][1][1]) {
+                params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
+              }
             } else {
-              params[value] = moment(element[index]).format('YYYY-MM-DD');
+              params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
             }
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*') >= 0) {
-          var _dataParams7 = key.split('*');
-          _dataParams7.forEach(function (value, index) {
-            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-          });
-          delete params[key];
-        } else if (element && key.indexOf('_selectNumberRange') >= 0) {
-          // key = xxxxx_selectNumberRange   qp-xxxxx-gt
-          var _dataParams8 = key.split('_selectNumberRange')[0];
-          if (params[key][0] === 'range') {
-            if (params[key][1][0]) {
-              params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
-            }
-            if (params[key][1][1]) {
-              params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
-            }
-          } else {
-            params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
+            delete params[key];
+          } else if (Array.isArray(element)) {
+            params[key] = element.join(',');
+          } else if (element == null || element === undefined || String(element).trim() === '') {
+            delete params[key];
           }
-          delete params[key];
-        } else if (Array.isArray(element)) {
-          params[key] = element.join(',');
-        } else if (element == null || element === undefined || String(element).trim() === '') {
-          delete params[key];
-        }
+        })();
       }
-    };
-    for (var key in params) {
-      _loop();
     }
     var queryParams = _objectSpread2(_objectSpread2(_objectSpread2({
       pageSize: pageSize,
@@ -5051,8 +5050,10 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 3, tableSearchForm);
+        var searchPosition1 = noUseItemEancode ? 3 : 2;
+        var searchPosition2 = noUseItemEancode ? 4 : 3;
+        formatSource(x, 0, searchPosition1, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, searchPosition2, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -6406,70 +6407,72 @@ var BillEntry = function BillEntry(_ref3) {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var canEntryObject, _canEntryObject$error, messageInfo;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (data === null || data === void 0 ? void 0 : data.length) {
-              _context.next = 3;
-              break;
-            }
-            message$1.warning('至少录入一条数据');
-            return _context.abrupt("return");
-          case 3:
-            if (data === null || data === void 0 ? void 0 : data.every(function (d) {
-              return d.skuCode && d.name;
-            })) {
-              _context.next = 6;
-              break;
-            }
-            message$1.warning('请选择商品！');
-            return _context.abrupt("return");
-          case 6:
-            if (data === null || data === void 0 ? void 0 : data.every(function (d) {
-              return d.count;
-            })) {
-              _context.next = 9;
-              break;
-            }
-            message$1.warning('请填写商品数量！');
-            return _context.abrupt("return");
-          case 9:
-            _context.next = 11;
-            return isSkuCanEntry(data);
-          case 11:
-            canEntryObject = _context.sent;
-            if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
-              _context.next = 16;
-              break;
-            }
-            messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
-              return /*#__PURE__*/React.createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
-            }));
-            messageInfo && message$1.warning({
-              content: messageInfo,
-              duration: 6
-            });
-            return _context.abrupt("return");
-          case 16:
-            setLoading(true);
-            onSaveCallback(data).then(function (res) {
-              {
-                var _Object$keys;
-                var initSuccessMessage = '保存成功';
-                var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
-                if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
-                  (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message$1.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
-                } else {
-                  message$1.success(initSuccessMessage);
-                }
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (data === null || data === void 0 ? void 0 : data.length) {
+                _context.next = 3;
+                break;
               }
-              setLoading(false);
-            }).catch(function (Error) {
-              message$1.error(Error);
-              setLoading(false);
-            });
-          case 18:
-          case "end":
-            return _context.stop();
+              message$1.warning('至少录入一条数据');
+              return _context.abrupt("return");
+            case 3:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.skuCode && d.name;
+              })) {
+                _context.next = 6;
+                break;
+              }
+              message$1.warning('请选择商品！');
+              return _context.abrupt("return");
+            case 6:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.count;
+              })) {
+                _context.next = 9;
+                break;
+              }
+              message$1.warning('请填写商品数量！');
+              return _context.abrupt("return");
+            case 9:
+              _context.next = 11;
+              return isSkuCanEntry(data);
+            case 11:
+              canEntryObject = _context.sent;
+              if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
+                _context.next = 16;
+                break;
+              }
+              messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
+                return /*#__PURE__*/React.createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
+              }));
+              messageInfo && message$1.warning({
+                content: messageInfo,
+                duration: 6
+              });
+              return _context.abrupt("return");
+            case 16:
+              setLoading(true);
+              onSaveCallback(data).then(function (res) {
+                {
+                  var _Object$keys;
+                  var initSuccessMessage = '保存成功';
+                  var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
+                  if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+                    (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message$1.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
+                  } else {
+                    message$1.success(initSuccessMessage);
+                  }
+                }
+                setLoading(false);
+              }).catch(function (Error) {
+                message$1.error(Error);
+                setLoading(false);
+              });
+            case 18:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));
@@ -8682,7 +8685,7 @@ var BusinessSearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
   useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -8704,9 +8707,13 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
+  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
+    return false;
+  }
   return true;
 });
 
+// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -8718,7 +8725,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加
+  // 追加(最好不用这个，当组件不固定时候会有影响)
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -8731,6 +8738,7 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
+  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -8738,12 +8746,26 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var isNoUseItemBarcode = (parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode) !== undefined ? parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode : true; // 默认不加商品条码，兼容老项目
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
+  }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+    title: '商品条码',
+    width: 100,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemEancode',
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }]), [{
     title: 'SKU名称',
     width: 200,
     ellipsis: {
@@ -8819,7 +8841,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       }, text);
     },
     dataIndex: 'propertyNameAndValue'
-  }];
+  }]);
   var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
@@ -8830,11 +8852,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -8846,7 +8868,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
-    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect),
+    noUseItemEancode: isNoUseItemBarcode
   };
   var modalTableProps = {
     modalTableTitle: '选择商品',
@@ -8856,7 +8879,14 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      name: 'qp-code-in',
+      label: '商品条码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
+      }
+    }]), [{
       name: 'qp-brandId-in',
       type: 'select',
       label: '品牌',
@@ -8901,7 +8931,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           }
         }
       }
-    }],
+    }]),
     tableColumns: [{
       title: 'SKU编码',
       width: 150,
@@ -8935,20 +8965,20 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           height: 20
         }));
       }
-    }, {
-      title: '国际条码',
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      title: '商品条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'barCode',
+      dataIndex: 'itemEancode',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(Tooltip, {
           placement: "topLeft",
           title: text
         }, text);
       }
-    }, {
+    }]), [{
       title: '所属SPU名称',
       width: 100,
       ellipsis: {
@@ -9039,7 +9069,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }, text);
       },
       dataIndex: 'brandName'
-    }],
+    }]),
     selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -9047,6 +9077,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
+  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9124,9 +9155,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-skcStatus-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -9326,6 +9357,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
+  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9412,11 +9444,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),
@@ -9811,42 +9843,44 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
         var _ctx$form;
         var resData, coverData, data, dataList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              resData = (res === null || res === void 0 ? void 0 : res.data) || [];
-              if (!(resData.status === '0' || resData.code === '000000')) {
-                _context.next = 13;
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                resData = (res === null || res === void 0 ? void 0 : res.data) || [];
+                if (!(resData.status === '0' || resData.code === '000000')) {
+                  _context.next = 13;
+                  break;
+                }
+                data = resData.data;
+                if (!remoteSource.converter) {
+                  _context.next = 9;
+                  break;
+                }
+                _context.next = 6;
+                return remoteSource.converter({
+                  data: [data]
+                });
+              case 6:
+                coverData = _context.sent;
+                _context.next = 11;
                 break;
-              }
-              data = resData.data;
-              if (!remoteSource.converter) {
-                _context.next = 9;
+              case 9:
+                dataList = data && Array.isArray(data) ? data : data && [data] || [];
+                coverData = dataList.length && dataList.map(function (ites) {
+                  return mapSearchTree(ites);
+                }) || [];
+              case 11:
+                _context.next = 14;
                 break;
-              }
-              _context.next = 6;
-              return remoteSource.converter({
-                data: [data]
-              });
-            case 6:
-              coverData = _context.sent;
-              _context.next = 11;
-              break;
-            case 9:
-              dataList = data && Array.isArray(data) ? data : data && [data] || [];
-              coverData = dataList.length && dataList.map(function (ites) {
-                return mapSearchTree(ites);
-              }) || [];
-            case 11:
-              _context.next = 14;
-              break;
-            case 13:
-              coverData = [];
-            case 14:
-              setTreeData(coverData);
-              ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(ctx.name, coverData);
-            case 16:
-            case "end":
-              return _context.stop();
+              case 13:
+                coverData = [];
+              case 14:
+                setTreeData(coverData);
+                ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(ctx.name, coverData);
+              case 16:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
@@ -14036,19 +14070,21 @@ function _outLogin() {
   _outLogin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
     var res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return axios({
-            url: '/user/web/loginOut',
-            method: 'GET'
-          });
-        case 2:
-          res = _context.sent;
-          return _context.abrupt("return", res);
-        case 4:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return axios({
+              url: '/user/web/loginOut',
+              method: 'GET'
+            });
+          case 2:
+            res = _context.sent;
+            return _context.abrupt("return", res);
+          case 4:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -14177,29 +14213,31 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var sessionId;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return getSessionId();
-          case 2:
-            sessionId = _context.sent;
-            _context.next = 5;
-            return outLogin({
-              sessionId: sessionId
-            });
-          case 5:
-            // @ts-ignore
-            if (BUILD_TYPE) {
-              message$1.success('退出登录成功');
-              history.replace({
-                pathname: '/user/login'
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getSessionId();
+            case 2:
+              sessionId = _context.sent;
+              _context.next = 5;
+              return outLogin({
+                sessionId: sessionId
               });
-            } else {
-              setLoginOutPath();
-            }
-          case 6:
-          case "end":
-            return _context.stop();
+            case 5:
+              // @ts-ignore
+              if (BUILD_TYPE) {
+                message$1.success('退出登录成功');
+                history.replace({
+                  pathname: '/user/login'
+                });
+              } else {
+                setLoginOutPath();
+              }
+            case 6:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));
@@ -16027,7 +16065,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         showSubMenu: isShow
       });
     }, 500);
-    //设置tabs标签左右滚动
     _this.setTabNavTransLate = function (num) {
       var _document$getElementB, _document$getElementB2, _document$getElementB3, _document$getElementB4, _document$defaultView;
       var globalTabsNav = (_document$getElementB = document.getElementById('globalTabs')) === null || _document$getElementB === void 0 ? void 0 : (_document$getElementB2 = _document$getElementB.getElementsByClassName('ant-tabs-nav-list')) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2[0];
@@ -16708,12 +16745,14 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           request: function () {
             var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    return _context.abrupt("return", JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
-                  case 1:
-                  case "end":
-                    return _context.stop();
+                while (1) {
+                  switch (_context.prev = _context.next) {
+                    case 0:
+                      return _context.abrupt("return", JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
+                    case 1:
+                    case "end":
+                      return _context.stop();
+                  }
                 }
               }, _callee);
             }));
@@ -17056,6 +17095,7 @@ var FixedScrollBar = function FixedScrollBar(_ref, ref) {
     }
   };
   useEffect(function () {
+    onContainerScroll();
     var onscroll = throttle(onContainerScroll, 50);
     container.addEventListener('scroll', onscroll);
     return function () {
@@ -24393,26 +24433,28 @@ var valueType = {
 var getDynamicDict = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dictionaryCode) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return request$1({
-            url: "/basic/dictDynamicItem/getDynamicData/".concat(dictionaryCode),
-            converter: function converter(_ref2) {
-              var data = _ref2.data;
-              return data === null || data === void 0 ? void 0 : data.map(function (d) {
-                return {
-                  text: d.name,
-                  value: d.code || d.brandCode
-                };
-              });
-            }
-          });
-        case 2:
-          return _context.abrupt("return", _context.sent);
-        case 3:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return request$1({
+              url: "/basic/dictDynamicItem/getDynamicData/".concat(dictionaryCode),
+              converter: function converter(_ref2) {
+                var data = _ref2.data;
+                return data === null || data === void 0 ? void 0 : data.map(function (d) {
+                  return {
+                    text: d.name,
+                    value: d.code || d.brandCode
+                  };
+                });
+              }
+            });
+          case 2:
+            return _context.abrupt("return", _context.sent);
+          case 3:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -24462,53 +24504,55 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
   useMount( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _ref$current, source;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return setIsShowAndType(function (prev) {
-            if (record.inputType === 20 || record.inputType === 30) {
-              return {
-                isShow: true,
-                singleOrMultiple: record.inputType,
-                type: record.choiceType
-              };
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return setIsShowAndType(function (prev) {
+              if (record.inputType === 20 || record.inputType === 30) {
+                return {
+                  isShow: true,
+                  singleOrMultiple: record.inputType,
+                  type: record.choiceType
+                };
+              }
+              return prev;
+            });
+          case 2:
+            if (!record.dictionaryCode) {
+              _context.next = 17;
+              break;
             }
-            return prev;
-          });
-        case 2:
-          if (!record.dictionaryCode) {
-            _context.next = 17;
-            break;
-          }
-          if (!(record.choiceType == 20)) {
-            _context.next = 7;
+            if (!(record.choiceType == 20)) {
+              _context.next = 7;
+              break;
+            }
+            _context.t0 = getDictionarySource(record.dictionaryCode);
+            _context.next = 15;
             break;
-          }
-          _context.t0 = getDictionarySource(record.dictionaryCode);
-          _context.next = 15;
-          break;
-        case 7:
-          if (!(record.choiceType == 30)) {
-            _context.next = 13;
+          case 7:
+            if (!(record.choiceType == 30)) {
+              _context.next = 13;
+              break;
+            }
+            _context.next = 10;
+            return getDynamicDict(record.dictionaryCode);
+          case 10:
+            _context.t1 = _context.sent;
+            _context.next = 14;
             break;
-          }
-          _context.next = 10;
-          return getDynamicDict(record.dictionaryCode);
-        case 10:
-          _context.t1 = _context.sent;
-          _context.next = 14;
-          break;
-        case 13:
-          _context.t1 = [];
-        case 14:
-          _context.t0 = _context.t1;
-        case 15:
-          source = _context.t0;
-          // @ts-ignore
-          ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setFieldSource('defaultValue', source);
-        case 17:
-        case "end":
-          return _context.stop();
+          case 13:
+            _context.t1 = [];
+          case 14:
+            _context.t0 = _context.t1;
+          case 15:
+            source = _context.t0;
+            // @ts-ignore
+            ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setFieldSource('defaultValue', source);
+          case 17:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   })));
@@ -24576,28 +24620,30 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
               var _type = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
                 var form, values, name, relates, source;
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
-                    case 0:
-                      form = _ref3.form, values = _ref3.values, name = _ref3.name, relates = _ref3.relates;
-                      if (values[0]) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        form = _ref3.form, values = _ref3.values, name = _ref3.name, relates = _ref3.relates;
+                        if (values[0]) {
+                          form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
+                          form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
+                          form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], getDictionarySource(values[0]));
+                        }
+                        if (!values[1]) {
+                          _context2.next = 9;
+                          break;
+                        }
+                        _context2.next = 5;
+                        return getDynamicDict(record.dictionaryCode || values[1]);
+                      case 5:
+                        source = _context2.sent;
                         form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
                         form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
-                        form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], getDictionarySource(values[0]));
-                      }
-                      if (!values[1]) {
-                        _context2.next = 9;
-                        break;
-                      }
-                      _context2.next = 5;
-                      return getDynamicDict(record.dictionaryCode || values[1]);
-                    case 5:
-                      source = _context2.sent;
-                      form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
-                      form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
-                      form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], source);
-                    case 9:
-                    case "end":
-                      return _context2.stop();
+                        form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], source);
+                      case 9:
+                      case "end":
+                        return _context2.stop();
+                    }
                   }
                 }, _callee2);
               }));
@@ -25057,41 +25103,43 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
             var _type2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref10) {
               var values, name, form, source;
               return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
-                  case 0:
-                    values = _ref10.values, name = _ref10.name, form = _ref10.form;
-                    if (values[1] === 40) {
-                      form === null || form === void 0 ? void 0 : form.setFieldValue(name, null);
-                      form.setFieldVisible(name, false);
-                    }
-                    if (!(values[0] === 30)) {
-                      _context3.next = 10;
-                      break;
-                    }
-                    _context3.next = 5;
-                    return request$1({
-                      url: '/basic/dictDynamicItem/queryList',
-                      converter: function converter(_ref11) {
-                        var data = _ref11.data;
-                        return data === null || data === void 0 ? void 0 : data.map(function (d) {
-                          return {
-                            text: d.dictCode,
-                            value: d.dictCode
-                          };
-                        });
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
+                    case 0:
+                      values = _ref10.values, name = _ref10.name, form = _ref10.form;
+                      if (values[1] === 40) {
+                        form === null || form === void 0 ? void 0 : form.setFieldValue(name, null);
+                        form.setFieldVisible(name, false);
                       }
-                    });
-                  case 5:
-                    source = _context3.sent;
-                    form === null || form === void 0 ? void 0 : form.setFieldSource(name, source);
-                    form.setFieldVisible(name, true);
-                    _context3.next = 11;
-                    break;
-                  case 10:
-                    form.setFieldVisible(name, false);
-                  case 11:
-                  case "end":
-                    return _context3.stop();
+                      if (!(values[0] === 30)) {
+                        _context3.next = 10;
+                        break;
+                      }
+                      _context3.next = 5;
+                      return request$1({
+                        url: '/basic/dictDynamicItem/queryList',
+                        converter: function converter(_ref11) {
+                          var data = _ref11.data;
+                          return data === null || data === void 0 ? void 0 : data.map(function (d) {
+                            return {
+                              text: d.dictCode,
+                              value: d.dictCode
+                            };
+                          });
+                        }
+                      });
+                    case 5:
+                      source = _context3.sent;
+                      form === null || form === void 0 ? void 0 : form.setFieldSource(name, source);
+                      form.setFieldVisible(name, true);
+                      _context3.next = 11;
+                      break;
+                    case 10:
+                      form.setFieldVisible(name, false);
+                    case 11:
+                    case "end":
+                      return _context3.stop();
+                  }
                 }
               }, _callee3);
             }));
@@ -25280,64 +25328,66 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
         var _ref$current4, _res$editableStatus;
         var res, _res$defaultValue;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return ref === null || ref === void 0 ? void 0 : (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.validateFields();
-            case 2:
-              res = _context4.sent;
-              res.editableStatus = (_res$editableStatus = res.editableStatus) === null || _res$editableStatus === void 0 ? void 0 : _res$editableStatus.join(',');
-              res.fieldGroup = record.fieldGroup;
-              res.businessType = record.businessType;
-              res.info = {
-                enumeration: res.enumeration,
-                dictionaryCode: res.dictionaryCode || (res === null || res === void 0 ? void 0 : res['dictionaryCode_dynamic']),
-                formula: res.formula,
-                scale: res.scale,
-                variable: res.variable
-              };
-              res.createVisibleFlag = res.showValue.indexOf('createVisibleFlag') >= 0;
-              res.editVisibleFlag = res.showValue.indexOf('editVisibleFlag') >= 0;
-              res.createEditableFlag = res.showValue.indexOf('createEditableFlag') >= 0;
-              if (res.inputType === 40) {
-                res.valueType = 22;
-              }
-              // 把数组处理成文本
-              if (res.inputType === 30) {
-                if (res.defaultValue) {
-                  res.defaultValue = (_res$defaultValue = res.defaultValue) === null || _res$defaultValue === void 0 ? void 0 : _res$defaultValue.join(',');
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _context4.next = 2;
+                return ref === null || ref === void 0 ? void 0 : (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.validateFields();
+              case 2:
+                res = _context4.sent;
+                res.editableStatus = (_res$editableStatus = res.editableStatus) === null || _res$editableStatus === void 0 ? void 0 : _res$editableStatus.join(',');
+                res.fieldGroup = record.fieldGroup;
+                res.businessType = record.businessType;
+                res.info = {
+                  enumeration: res.enumeration,
+                  dictionaryCode: res.dictionaryCode || (res === null || res === void 0 ? void 0 : res['dictionaryCode_dynamic']),
+                  formula: res.formula,
+                  scale: res.scale,
+                  variable: res.variable
+                };
+                res.createVisibleFlag = res.showValue.indexOf('createVisibleFlag') >= 0;
+                res.editVisibleFlag = res.showValue.indexOf('editVisibleFlag') >= 0;
+                res.createEditableFlag = res.showValue.indexOf('createEditableFlag') >= 0;
+                if (res.inputType === 40) {
+                  res.valueType = 22;
                 }
-              }
-              res.fieldMapping = res.fieldMapping || '';
-              delete res.formula;
-              delete res.showValue;
-              if (!(mode === 'create')) {
-                _context4.next = 18;
-                break;
-              }
-              request$1({
-                url: "/basic/flow/businessField",
-                method: 'POST',
-                params: res,
-                successMessage: '创建成功！',
-                converter: function converter() {
-                  onParentOk();
+                // 把数组处理成文本
+                if (res.inputType === 30) {
+                  if (res.defaultValue) {
+                    res.defaultValue = (_res$defaultValue = res.defaultValue) === null || _res$defaultValue === void 0 ? void 0 : _res$defaultValue.join(',');
+                  }
                 }
-              });
-              return _context4.abrupt("return");
-            case 18:
-              request$1({
-                url: "/basic/flow/businessField/".concat(record.id),
-                method: 'PATCH',
-                params: res,
-                successMessage: '修改成功！',
-                converter: function converter() {
-                  onParentOk();
+                res.fieldMapping = res.fieldMapping || '';
+                delete res.formula;
+                delete res.showValue;
+                if (!(mode === 'create')) {
+                  _context4.next = 18;
+                  break;
                 }
-              });
-            case 19:
-            case "end":
-              return _context4.stop();
+                request$1({
+                  url: "/basic/flow/businessField",
+                  method: 'POST',
+                  params: res,
+                  successMessage: '创建成功！',
+                  converter: function converter() {
+                    onParentOk();
+                  }
+                });
+                return _context4.abrupt("return");
+              case 18:
+                request$1({
+                  url: "/basic/flow/businessField/".concat(record.id),
+                  method: 'PATCH',
+                  params: res,
+                  successMessage: '修改成功！',
+                  converter: function converter() {
+                    onParentOk();
+                  }
+                });
+              case 19:
+              case "end":
+                return _context4.stop();
+            }
           }
         }, _callee4);
       }));
@@ -26122,26 +26172,28 @@ var BsCascader = function BsCascader(_ref) {
   useEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var resData, data;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!(!source && initRequestSource)) {
-            _context.next = 6;
-            break;
-          }
-          _context.next = 3;
-          return initRequestSource();
-        case 3:
-          resData = _context.sent;
-          data = (resData === null || resData === void 0 ? void 0 : resData.map(function (item) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              label: item.text,
-              isLeaf: false
-            });
-          })) || [];
-          setHandSource(data);
-        case 6:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!source && initRequestSource)) {
+              _context.next = 6;
+              break;
+            }
+            _context.next = 3;
+            return initRequestSource();
+          case 3:
+            resData = _context.sent;
+            data = (resData === null || resData === void 0 ? void 0 : resData.map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                label: item.text,
+                isLeaf: false
+              });
+            })) || [];
+            setHandSource(data);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   })), []);
@@ -26273,18 +26325,20 @@ function getRegularThresholdRange(_x) {
 function _getRegularThresholdRange() {
   _getRegularThresholdRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          return _context.abrupt("return", axios({
-            url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
-            method: 'POST',
-            data: _objectSpread2(_objectSpread2({}, params), {}, {
-              queryIdentify: undefined
-            })
-          }));
-        case 1:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", axios({
+              url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
+              method: 'POST',
+              data: _objectSpread2(_objectSpread2({}, params), {}, {
+                queryIdentify: undefined
+              })
+            }));
+          case 1:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -26423,136 +26477,137 @@ var RuleField = /*#__PURE__*/function (_Component) {
         _this.getRegularThresholdRange(queryIdentify, propertyCode, queryIdentifyType);
       });
     };
-    //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
     _this.getRegularThresholdRange = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryIdentify, propertyCode, queryIdentifyType) {
         var thresholdQuery, extraRequestUrl, querParams, needQueryList, res;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (queryIdentify) {
-                _context.next = 2;
-                break;
-              }
-              return _context.abrupt("return");
-            case 2:
-              thresholdQuery = _this.state.thresholdQuery;
-              extraRequestUrl = '';
-              querParams = setParams(propertyCode, thresholdQuery);
-              if (!queryIdentityInfo.find(function (item) {
-                return item.identity == propertyCode;
-              })) {
-                _context.next = 10;
-                break;
-              }
-              //判断查询属性枚举时有没有必传参数，如果必传参数没有值则不调用查询接口
-              needQueryList = queryIdentityInfo.find(function (item) {
-                return item.identity == propertyCode;
-              }).queryParam.filter(function (item) {
-                return item.isRequired;
-              }).map(function (item) {
-                return item.queryKey;
-              });
-              if (!needQueryList.some(function (item) {
-                return !querParams[item] || !querParams[item].length;
-              })) {
-                _context.next = 9;
-                break;
-              }
-              return _context.abrupt("return");
-            case 9:
-              extraRequestUrl = queryIdentityInfo.find(function (item) {
-                return item.identity == propertyCode;
-              }).requestUrl || '';
-            case 10:
-              if (queryIdentifyType === 'dictCodeIdentify') {
-                extraRequestUrl = "bscDictItem/selectDictItemsByDictCode"; // 字典接口
-                querParams = {
-                  dictCode: queryIdentify
-                };
-              } else if (queryIdentifyType === 'dynamicDictCodeIdentify') {
-                extraRequestUrl = "dictDynamicItem/getDynamicData/".concat(queryIdentify); // 字典接口
-                // querParams = { dictCode: queryIdentify }
-              }
-              if (!extraRequestUrl) {
-                _context.next = 16;
-                break;
-              }
-              if (queryIdentify == 'maintain_area_code') {
-                extraRequestUrl = "/basic/".concat(extraRequestUrl).concat(querParams.memberCardCode, "?").concat(stringify(querParams));
-              } else if (queryIdentifyType == 'dictCodeIdentify') {
-                extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(stringify(querParams));
-              } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
-                extraRequestUrl = "/basic/".concat(extraRequestUrl);
-              }
-              request$1({
-                url: extraRequestUrl,
-                method: 'get',
-                converter: function converter(res) {
-                  if (handleError(res)) {
-                    var _handleData = (res === null || res === void 0 ? void 0 : res.data) || [];
-                    if (queryIdentifyType === 'dictCodeIdentify') {
-                      var _handleData2;
-                      _handleData = ((_handleData2 = _handleData) === null || _handleData2 === void 0 ? void 0 : _handleData2.length) ? _handleData.map(function (i) {
-                        return {
-                          code: i.dictItemCode,
-                          name: i.dictItemName
-                        };
-                      }) : [];
-                    }
-                    if (queryIdentifyType === 'dynamicDictCodeIdentify') {
-                      var _handleData3;
-                      _handleData = ((_handleData3 = _handleData) === null || _handleData3 === void 0 ? void 0 : _handleData3.length) ? _handleData.map(function (i) {
-                        return {
-                          code: i.code.toString(),
-                          name: i.name
-                        };
-                      }) : [];
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (queryIdentify) {
+                  _context.next = 2;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 2:
+                thresholdQuery = _this.state.thresholdQuery;
+                extraRequestUrl = '';
+                querParams = setParams(propertyCode, thresholdQuery);
+                if (!queryIdentityInfo.find(function (item) {
+                  return item.identity == propertyCode;
+                })) {
+                  _context.next = 10;
+                  break;
+                }
+                //判断查询属性枚举时有没有必传参数，如果必传参数没有值则不调用查询接口
+                needQueryList = queryIdentityInfo.find(function (item) {
+                  return item.identity == propertyCode;
+                }).queryParam.filter(function (item) {
+                  return item.isRequired;
+                }).map(function (item) {
+                  return item.queryKey;
+                });
+                if (!needQueryList.some(function (item) {
+                  return !querParams[item] || !querParams[item].length;
+                })) {
+                  _context.next = 9;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 9:
+                extraRequestUrl = queryIdentityInfo.find(function (item) {
+                  return item.identity == propertyCode;
+                }).requestUrl || '';
+              case 10:
+                if (queryIdentifyType === 'dictCodeIdentify') {
+                  extraRequestUrl = "bscDictItem/selectDictItemsByDictCode"; // 字典接口
+                  querParams = {
+                    dictCode: queryIdentify
+                  };
+                } else if (queryIdentifyType === 'dynamicDictCodeIdentify') {
+                  extraRequestUrl = "dictDynamicItem/getDynamicData/".concat(queryIdentify); // 字典接口
+                  // querParams = { dictCode: queryIdentify }
+                }
+                if (!extraRequestUrl) {
+                  _context.next = 16;
+                  break;
+                }
+                if (queryIdentify == 'maintain_area_code') {
+                  extraRequestUrl = "/basic/".concat(extraRequestUrl).concat(querParams.memberCardCode, "?").concat(stringify(querParams));
+                } else if (queryIdentifyType == 'dictCodeIdentify') {
+                  extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(stringify(querParams));
+                } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
+                  extraRequestUrl = "/basic/".concat(extraRequestUrl);
+                }
+                request$1({
+                  url: extraRequestUrl,
+                  method: 'get',
+                  converter: function converter(res) {
+                    if (handleError(res)) {
+                      var _handleData = (res === null || res === void 0 ? void 0 : res.data) || [];
+                      if (queryIdentifyType === 'dictCodeIdentify') {
+                        var _handleData2;
+                        _handleData = ((_handleData2 = _handleData) === null || _handleData2 === void 0 ? void 0 : _handleData2.length) ? _handleData.map(function (i) {
+                          return {
+                            code: i.dictItemCode,
+                            name: i.dictItemName
+                          };
+                        }) : [];
+                      }
+                      if (queryIdentifyType === 'dynamicDictCodeIdentify') {
+                        var _handleData3;
+                        _handleData = ((_handleData3 = _handleData) === null || _handleData3 === void 0 ? void 0 : _handleData3.length) ? _handleData.map(function (i) {
+                          return {
+                            code: i.code.toString(),
+                            name: i.name
+                          };
+                        }) : [];
+                      }
+                      _this.setState({
+                        thresholdList: _handleData
+                      });
                     }
-                    _this.setState({
-                      thresholdList: _handleData
-                    });
+                    return handleData;
                   }
-                  return handleData;
-                }
-              });
-              _context.next = 29;
-              break;
-            case 16:
-              if (!(queryIdentifyType == 'objectPropertyListIdentify')) {
-                _context.next = 20;
+                });
+                _context.next = 29;
                 break;
-              }
-              _this.setState({
-                thresholdList: queryIdentify
-              });
-              _context.next = 29;
-              break;
-            case 20:
-              if (!(queryIdentifyType == 'objectPropertyCodeIdentify')) {
-                _context.next = 24;
+              case 16:
+                if (!(queryIdentifyType == 'objectPropertyListIdentify')) {
+                  _context.next = 20;
+                  break;
+                }
+                _this.setState({
+                  thresholdList: queryIdentify
+                });
+                _context.next = 29;
                 break;
-              }
-              // TODO待处理
-              _this.setState({
-                thresholdList: []
-              });
-              _context.next = 29;
-              break;
-            case 24:
-              querParams.queryIdentify = queryIdentify;
-              _context.next = 27;
-              return getRegularThresholdRange(querParams);
-            case 27:
-              res = _context.sent;
-              if (handleError(res)) {
+              case 20:
+                if (!(queryIdentifyType == 'objectPropertyCodeIdentify')) {
+                  _context.next = 24;
+                  break;
+                }
+                // TODO待处理
                 _this.setState({
-                  thresholdList: (res === null || res === void 0 ? void 0 : res.data) || []
+                  thresholdList: []
                 });
-              }
-            case 29:
-            case "end":
-              return _context.stop();
+                _context.next = 29;
+                break;
+              case 24:
+                querParams.queryIdentify = queryIdentify;
+                _context.next = 27;
+                return getRegularThresholdRange(querParams);
+              case 27:
+                res = _context.sent;
+                if (handleError(res)) {
+                  _this.setState({
+                    thresholdList: (res === null || res === void 0 ? void 0 : res.data) || []
+                  });
+                }
+              case 29:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
@@ -27371,30 +27426,32 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
-                    case 0:
-                      _context2.next = 2;
-                      return request$1({
-                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                        method: 'get',
-                        converter: function converter(_ref3) {
-                          var data = _ref3.data;
-                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                            return {
-                              text: item.name,
-                              value: item.id,
-                              level: item.level,
-                              id: item.id
-                            };
-                          }) : [];
-                          return handleData;
-                        }
-                      });
-                    case 2:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 3:
-                    case "end":
-                      return _context2.stop();
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        _context2.next = 2;
+                        return request$1({
+                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                          method: 'get',
+                          converter: function converter(_ref3) {
+                            var data = _ref3.data;
+                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                              return {
+                                text: item.name,
+                                value: item.id,
+                                level: item.level,
+                                id: item.id
+                              };
+                            }) : [];
+                            return handleData;
+                          }
+                        });
+                      case 2:
+                        return _context2.abrupt("return", _context2.sent);
+                      case 3:
+                      case "end":
+                        return _context2.stop();
+                    }
                   }
                 }, _callee2);
               })),
@@ -27420,30 +27477,32 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                 return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                  while (1) switch (_context3.prev = _context3.next) {
-                    case 0:
-                      _context3.next = 2;
-                      return request$1({
-                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                        method: 'get',
-                        converter: function converter(_ref5) {
-                          var data = _ref5.data;
-                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                            return {
-                              text: item.name,
-                              value: item.id,
-                              level: item.level,
-                              id: item.id
-                            };
-                          }) : [];
-                          return handleData;
-                        }
-                      });
-                    case 2:
-                      return _context3.abrupt("return", _context3.sent);
-                    case 3:
-                    case "end":
-                      return _context3.stop();
+                  while (1) {
+                    switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _context3.next = 2;
+                        return request$1({
+                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                          method: 'get',
+                          converter: function converter(_ref5) {
+                            var data = _ref5.data;
+                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                              return {
+                                text: item.name,
+                                value: item.id,
+                                level: item.level,
+                                id: item.id
+                              };
+                            }) : [];
+                            return handleData;
+                          }
+                        });
+                      case 2:
+                        return _context3.abrupt("return", _context3.sent);
+                      case 3:
+                      case "end":
+                        return _context3.stop();
+                    }
                   }
                 }, _callee3);
               })),
@@ -27471,30 +27530,32 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
                 return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
-                    case 0:
-                      _context4.next = 2;
-                      return request$1({
-                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                        method: 'get',
-                        converter: function converter(_ref7) {
-                          var data = _ref7.data;
-                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                            return {
-                              text: item.name,
-                              value: item.id,
-                              level: item.level,
-                              id: item.id
-                            };
-                          }) : [];
-                          return handleData;
-                        }
-                      });
-                    case 2:
-                      return _context4.abrupt("return", _context4.sent);
-                    case 3:
-                    case "end":
-                      return _context4.stop();
+                  while (1) {
+                    switch (_context4.prev = _context4.next) {
+                      case 0:
+                        _context4.next = 2;
+                        return request$1({
+                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                          method: 'get',
+                          converter: function converter(_ref7) {
+                            var data = _ref7.data;
+                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                              return {
+                                text: item.name,
+                                value: item.id,
+                                level: item.level,
+                                id: item.id
+                              };
+                            }) : [];
+                            return handleData;
+                          }
+                        });
+                      case 2:
+                        return _context4.abrupt("return", _context4.sent);
+                      case 3:
+                      case "end":
+                        return _context4.stop();
+                    }
                   }
                 }, _callee4);
               })),
@@ -28611,6 +28672,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
         });
       }
     }
+
+    //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
   }, {
     key: "render",
     value: function render() {
@@ -29441,7 +29504,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 树结构 转化成 平行树 (递归函数)
     _this.coverToParallel = function (treeData, result) {
       treeData.forEach(function (el) {
         result.push(el);
@@ -29480,7 +29542,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }
       var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
-        return i.key === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
+        var _i$key;
+        return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
       });
       var dataChoiceBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataChoiceBusinessType;
       var dataInputBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataInputBusinessType;
@@ -29685,18 +29748,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"))));
     };
-    _this.handleEditExtraInfoResponse = function (code, val, parentDetail) {
+    _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
       parentDetail.extraInfo.response[code] = val;
+      ruleClassData[classDataIndex].extraInfo.response[code] = val;
       _this.setState({
         ruleClassData: ruleClassData
       }, function () {
         callBack(ruleClassData);
       });
     };
-    // 场景需要返回值2022.11.15
-    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, disabled, boxStyle) {
+    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
       var isRightText = ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : (_ruleReturnConfig$rig = ruleReturnConfig.rightText) === null || _ruleReturnConfig$rig === void 0 ? void 0 : _ruleReturnConfig$rig.length;
@@ -29712,7 +29775,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         var value = val;
         if (isObj(code)) {
           Object.keys(code).forEach(function (ite) {
-            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail);
+            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail, classDataIndex);
           });
           return;
         }
@@ -29725,7 +29788,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           var _val$PCDCode;
           value = val.value || ((_val$PCDCode = val.PCDCode) === null || _val$PCDCode === void 0 ? void 0 : _val$PCDCode.join('/'));
         }
-        _this.handleEditExtraInfoResponse('value', value, parentDetail);
+        _this.handleEditExtraInfoResponse('value', value, parentDetail, classDataIndex);
       };
       return isShowResponse && /*#__PURE__*/React.createElement("div", {
         style: {
@@ -29734,7 +29797,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
-          _this.handleEditExtraInfoResponse('enable', false, parentDetail);
+          _this.handleEditExtraInfoResponse('enable', false, parentDetail, classDataIndex);
         },
         style: {
           color: 'gray',
@@ -29993,30 +30056,32 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         notChangeOnSelect: true,
         initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return request$1({
-                  url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                  method: 'get',
-                  converter: function converter(_ref2) {
-                    var data = _ref2.data;
-                    var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                      return {
-                        text: item.name,
-                        value: item.id,
-                        level: item.level,
-                        id: item.id
-                      };
-                    }) : [];
-                    return handleData;
-                  }
-                });
-              case 2:
-                return _context.abrupt("return", _context.sent);
-              case 3:
-              case "end":
-                return _context.stop();
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return request$1({
+                    url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                    method: 'get',
+                    converter: function converter(_ref2) {
+                      var data = _ref2.data;
+                      var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                        return {
+                          text: item.name,
+                          value: item.id,
+                          level: item.level,
+                          id: item.id
+                        };
+                      }) : [];
+                      return handleData;
+                    }
+                  });
+                case 2:
+                  return _context.abrupt("return", _context.sent);
+                case 3:
+                case "end":
+                  return _context.stop();
+              }
             }
           }, _callee);
         })),
@@ -30343,14 +30408,13 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         type: "link",
         onClick: function onClick() {
           if (isHaveRuleReturnConfig) {
-            _this.handleEditExtraInfoResponse('enable', true, parentDetail);
+            _this.handleEditExtraInfoResponse('enable', true, parentDetail, classDataIndex);
           } else {
             message$1.warn('未配置返回');
           }
         }
-      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
+      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
     };
-    //添加同一层级条件
     _this.addPeerRule = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var _this$props4 = _this.props,
@@ -30371,7 +30435,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    //添加子层级条件
     _this.addChildRules = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
@@ -30447,7 +30510,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 新增执行顺序
     _this.handleSelectRuleAction = function (keys, classDataIndex, callback) {
       callback();
       var callBack = _this.props.callBack;