@bit-sun/business-component 2.3.0 → 2.3.1

package/dist/index.js

@@ -6,7 +6,7 @@ var axios = require('axios');
 var antd = require('antd');
 var _ = require('lodash');
 var umi = require('umi');
-var isEqual = require('lodash/isEqual');
+var isEqual$1 = require('lodash/isEqual');
 var React = require('react');
 var moment$1 = require('moment');
 var icons = require('@ant-design/icons');
@@ -33,7 +33,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual$1);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment$1);
 var ProLayout__default = /*#__PURE__*/_interopDefaultLegacy(ProLayout);
@@ -781,41 +781,52 @@ var precisionQuantity = function precisionQuantity(num, accuracy) {
   return '';
 };
 
-var simpleIsEqual = function simpleIsEqual(a, b) {
-  return a === b;
-};
-
-function index$1 (resultFn, isEqual) {
-  if (isEqual === void 0) {
-    isEqual = simpleIsEqual;
-  }
-
-  var lastThis;
-  var lastArgs = [];
-  var lastResult;
-  var calledOnce = false;
-
-  var isNewArgEqualToLast = function isNewArgEqualToLast(newArg, index) {
-    return isEqual(newArg, lastArgs[index], index);
-  };
-
-  var result = function result() {
-    for (var _len = arguments.length, newArgs = new Array(_len), _key = 0; _key < _len; _key++) {
-      newArgs[_key] = arguments[_key];
+var safeIsNaN = Number.isNaN ||
+    function ponyfill(value) {
+        return typeof value === 'number' && value !== value;
+    };
+function isEqual(first, second) {
+    if (first === second) {
+        return true;
     }
-
-    if (calledOnce && lastThis === this && newArgs.length === lastArgs.length && newArgs.every(isNewArgEqualToLast)) {
-      return lastResult;
+    if (safeIsNaN(first) && safeIsNaN(second)) {
+        return true;
     }
+    return false;
+}
+function areInputsEqual(newInputs, lastInputs) {
+    if (newInputs.length !== lastInputs.length) {
+        return false;
+    }
+    for (var i = 0; i < newInputs.length; i++) {
+        if (!isEqual(newInputs[i], lastInputs[i])) {
+            return false;
+        }
+    }
+    return true;
+}
 
-    lastResult = resultFn.apply(this, newArgs);
-    calledOnce = true;
-    lastThis = this;
-    lastArgs = newArgs;
-    return lastResult;
-  };
-
-  return result;
+function memoizeOne(resultFn, isEqual) {
+    if (isEqual === void 0) { isEqual = areInputsEqual; }
+    var lastThis;
+    var lastArgs = [];
+    var lastResult;
+    var calledOnce = false;
+    function memoized() {
+        var newArgs = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            newArgs[_i] = arguments[_i];
+        }
+        if (calledOnce && lastThis === this && isEqual(newArgs, lastArgs)) {
+            return lastResult;
+        }
+        lastResult = resultFn.apply(this, newArgs);
+        calledOnce = true;
+        lastThis = this;
+        lastArgs = newArgs;
+        return lastResult;
+    }
+    return memoized;
 }
 
 function styleInject(css, ref) {
@@ -1029,59 +1040,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__default['default'](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__default['default'](element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment__default['default'](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__default['default'](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);
 }
@@ -1127,7 +1137,7 @@ var formatter = function formatter(data, parentAuthority, parentName) {
     return item;
   });
 };
-var memoizeOneFormatter = index$1(formatter, isEqual__default['default']);
+var memoizeOneFormatter = memoizeOne(formatter, isEqual__default['default']);
 var go2BackAndClose = function go2BackAndClose() {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
   umi.history.goBack();
@@ -2802,85 +2812,84 @@ var SearchSelect = /*#__PURE__*/React.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,
@@ -4536,74 +4545,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;
-            }
-            antd.message.warning('相同skc配码不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 3:
-            if (!(bType == 'spu')) {
-              _context.next = 26;
-              break;
-            }
-            if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
-              return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
-            }))) {
-              _context.next = 7;
-              break;
-            }
-            antd.message.warning('相同商品相同配码颜色不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 7:
-            if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
-              _context.next = 10;
-              break;
-            }
-            antd.message.warning('请先选择颜色！');
-            return _context.abrupt("return", false);
-          case 10:
-            if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
-              return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
-            }))) {
-              _context.next = 13;
-              break;
-            }
-            antd.message.warning('相同商品相同颜色配码不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 13:
-            if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
-              _context.next = 26;
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(bType == 'skc' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 3;
+                break;
+              }
+              antd.message.warning('相同skc配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 3:
+              if (!(bType == 'spu')) {
+                _context.next = 26;
+                break;
+              }
+              if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 7;
+                break;
+              }
+              antd.message.warning('相同商品相同配码颜色不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 7:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+                _context.next = 10;
+                break;
+              }
+              antd.message.warning('请先选择颜色！');
+              return _context.abrupt("return", false);
+            case 10:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
+                return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
+              }))) {
+                _context.next = 13;
+                break;
+              }
+              antd.message.warning('相同商品相同颜色配码不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 13:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
+                _context.next = 26;
+                break;
+              }
+              result = true;
+              _context.prev = 15;
+              _context.next = 18;
+              return checkSpuMatchCode({
+                skcCode: recordItem[recordKey],
+                matchingCode: changeValue,
+                ext1: recordItem.colorName
+              });
+            case 18:
+              result = _context.sent;
+              result = true;
+              _context.next = 25;
               break;
-            }
-            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]]);
     }));
@@ -4795,27 +4806,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);
                   }));
@@ -4875,85 +4888,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');
-            }
-          });
-          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];
+              params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][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,
@@ -6408,79 +6420,81 @@ 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;
-            }
-            antd.message.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;
-            }
-            antd.message.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;
-            }
-            antd.message.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__default['default'].createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
-            }));
-            messageInfo && antd.message.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) ? antd.message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
-                } else {
-                  antd.message.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) {
-              antd.message.error(Error);
-              setLoading(false);
-            });
-          case 18:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function handleSubmit() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-  var setShowColumnsCallback = function setShowColumnsCallback(newColumns) {
-    setShowColumns(_toConsumableArray(newColumns));
+              antd.message.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;
+              }
+              antd.message.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;
+              }
+              antd.message.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__default['default'].createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
+              }));
+              messageInfo && antd.message.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) ? antd.message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
+                  } else {
+                    antd.message.success(initSuccessMessage);
+                  }
+                }
+                setLoading(false);
+              }).catch(function (Error) {
+                antd.message.error(Error);
+                setLoading(false);
+              });
+            case 18:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return function handleSubmit() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var setShowColumnsCallback = function setShowColumnsCallback(newColumns) {
+    setShowColumns(_toConsumableArray(newColumns));
   };
   var handleResize = function handleResize(arr, index, callback) {
     return function (_, _ref5) {
@@ -9606,7 +9620,7 @@ var CommodityEntry = function CommodityEntry(props) {
  * @LastEditTime: 2022-01-14 17:17:26
  * @LastEditors: rodchen
  */
-var index$2 = (function (storageKeyString) {
+var index$1 = (function (storageKeyString) {
   var seconds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   var tipsCallFunction = arguments.length > 2 ? arguments[2] : undefined;
   if (typeof seconds !== 'number') throw new Error('seconds should be number');
@@ -9724,42 +9738,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);
       }));
@@ -9960,7 +9976,7 @@ var BusinessTreeSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Bus
 var css_248z$8 = ".form-status-label {\n  height: 48px;\n  margin-right: 12px;\n  display: inline-block;\n  position: relative;\n  background-color: #B0B4B7;\n  align-items: center;\n}\n.choosed-status-label.form-status-label {\n  background-color: #005CFF;\n}\n.form-status-label:last-child {\n  margin-right: 0px;\n}\n.form-status-label:first-child::after {\n  position: absolute;\n  display: block;\n  content: '';\n  right: -48px;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #B0B4B7;\n}\n.choosed-status-label.form-status-label::after {\n  border-left: 12px solid #005CFF;\n}\n.choosed-status-label.form-status-label:not(:first-child):not(:last-child)::after {\n  border-left: 12px solid #005CFF;\n}\n.form-status-label:last-child::after {\n  position: absolute;\n  display: block;\n  content: '';\n  left: 0;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #ffffff;\n}\n.form-status-label:not(:first-child):not(:last-child)::before {\n  position: absolute;\n  display: block;\n  content: '';\n  left: 0;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #ffffff;\n}\n.form-status-label:not(:first-child):not(:last-child)::after {\n  position: absolute;\n  display: block;\n  content: '';\n  right: -48px;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #B0B4B7;\n}\n.status-label-index {\n  display: inline-block;\n  width: 24px;\n  height: 24px;\n  border: 1px solid #FFFFFF;\n  color: #FFFFFF;\n  border-radius: 50%;\n  font-family: Montserrat;\n  font-size: 14px;\n  line-height: 24px;\n  text-align: center;\n  margin: 0 6px 0 20px;\n}\n.status-label-key {\n  width: 50px;\n  height: 100%;\n  display: inline-flex;\n  float: left;\n  align-items: center;\n  justify-content: center;\n}\n.status-label-operate {\n  float: left;\n  width: calc(100% - 50px);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  height: 100%;\n  margin: 4px 0;\n}\n.status-label-operate > div {\n  font-size: 12px;\n  height: 20px;\n  line-height: 20px;\n  color: #FFFFFF;\n  font-family: PingFangSC;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.status-label-operate > div:first-child {\n  font-size: 14px;\n  font-weight: 600;\n}\n.only-one-child.form-status-label::after,\n.only-one-child.form-status-label::before {\n  border-left: 0px;\n}\n";
 styleInject(css_248z$8);
 
-var index$3 = (function (props) {
+var index$2 = (function (props) {
   var _props$formStatusMapp = props.formStatusMapping,
     formStatusMapping = _props$formStatusMapp === void 0 ? [] : _props$formStatusMapp;
   return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -11384,7 +11400,7 @@ var iconMap = {
     src: moreIcon
   })
 };
-var index$4 = (function (props) {
+var index$3 = (function (props) {
   var _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname;
   var _useState = React.useState(pathname + 'id'),
@@ -11601,7 +11617,7 @@ var css_248z$d = ".home_page_head {\n  height: 54px;\n  display: flex;\n  justif
 styleInject(css_248z$d);
 
 var _excluded$c = ["children"];
-var index$5 = (function (props) {
+var index$4 = (function (props) {
   var _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname;
   var _useState = React.useState(pathname + 'id'),
@@ -13877,19 +13893,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__default['default']({
-            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__default['default']({
+              url: '/user/web/loginOut',
+              method: 'GET'
+            });
+          case 2:
+            res = _context.sent;
+            return _context.abrupt("return", res);
+          case 4:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -14018,29 +14036,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) {
-              antd.message.success('退出登录成功');
-              umi.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) {
+                antd.message.success('退出登录成功');
+                umi.history.replace({
+                  pathname: '/user/login'
+                });
+              } else {
+                setLoginOutPath();
+              }
+            case 6:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));
@@ -15868,7 +15888,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];
@@ -16549,12 +16568,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);
             }));
@@ -16692,7 +16713,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
   }]);
   return WrapperComponent;
 }(React__default['default'].Component);
-var index$6 = (function (props) {
+var index$5 = (function (props) {
   var _useModel = umi.useModel('@@initialState'),
     _useModel$initialStat = _useModel.initialState,
     initialState = _useModel$initialStat === void 0 ? {} : _useModel$initialStat;
@@ -16933,7 +16954,7 @@ var FixedScrollBar = function FixedScrollBar(_ref, ref) {
 };
 var FixedScrollBar$1 = /*#__PURE__*/React__default['default'].forwardRef(FixedScrollBar);
 
-var index$7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
+var index$6 = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     show = _useState2[0],
@@ -24226,26 +24247,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 bssula.request({
-            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 bssula.request({
+              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);
   }));
@@ -24295,53 +24318,55 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
   ahooks.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);
   })));
@@ -24409,28 +24434,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);
               }));
@@ -24890,41 +24917,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 bssula.request({
-                      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 bssula.request({
+                        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);
             }));
@@ -25113,64 +25142,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;
-              }
-              bssula.request({
-                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:
-              bssula.request({
-                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();
+                bssula.request({
+                  url: "/basic/flow/businessField",
+                  method: 'POST',
+                  params: res,
+                  successMessage: '创建成功！',
+                  converter: function converter() {
+                    onParentOk();
+                  }
+                });
+                return _context4.abrupt("return");
+              case 18:
+                bssula.request({
+                  url: "/basic/flow/businessField/".concat(record.id),
+                  method: 'PATCH',
+                  params: res,
+                  successMessage: '修改成功！',
+                  converter: function converter() {
+                    onParentOk();
+                  }
+                });
+              case 19:
+              case "end":
+                return _context4.stop();
+            }
           }
         }, _callee4);
       }));
@@ -25192,7 +25223,9 @@ var FieldsSettingsTable = (function (props) {
     _props$codeProps = props.codeProps,
     codeProps = _props$codeProps === void 0 ? '' : _props$codeProps,
     moduleType = props.moduleType,
-    moduleRelationId = props.moduleRelationId;
+    moduleRelationId = props.moduleRelationId,
+    _props$tableFlag = props.tableFlag,
+    tableFlag = _props$tableFlag === void 0 ? false : _props$tableFlag;
   var ref = React.useRef(null);
   var _useState = React.useState({
       visible: false,
@@ -25281,6 +25314,9 @@ var FieldsSettingsTable = (function (props) {
       render: function render(_ref2) {
         var text = _ref2.text,
           record = _ref2.record;
+        if (tableFlag) {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, " \u5217\u8868\uFF1A", "{\"key\": \"extensionFields,".concat(record.code, "\",\"dataIndex\": \"extensionFields,").concat(record.code, "\",\"title\": \"").concat(record.name, "\"},"));
+        }
         if (!codeProps.columns) {
           return /*#__PURE__*/React__default['default'].createElement("div", null, "\u8868\u5355\uFF1A", "{\"name\": \"extensionFields,".concat(record.code, "\",\"label\": \"").concat(record.name, "\"},"));
         }
@@ -25421,6 +25457,13 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
         var _field$container6;
         var targetValue = convertFileds(item, falltValue, faltFieldRange, field === null || field === void 0 ? void 0 : (_field$container6 = field.container) === null || _field$container6 === void 0 ? void 0 : _field$container6.name);
         if (targetValue) {
+          if (item.dependency) {
+            targetValue.dependency = {
+              visible: _objectSpread2(_objectSpread2({}, item.dependency.visible), {}, {
+                type: new Function('axios', 'ctx', item.dependency.visible.type).bind(null, axios__default['default'])
+              })
+            };
+          }
           filedsValue.push(targetValue);
         }
       });
@@ -25429,6 +25472,14 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
       if (returnField) {
         var _returnField$name;
         returnField.label = field === null || field === void 0 ? void 0 : field.label;
+        if (field === null || field === void 0 ? void 0 : field.disabled) {
+          // 字段设置只读属性
+          returnField.field.props.disabled = true;
+        }
+        if (field === null || field === void 0 ? void 0 : field.invisible) {
+          // 字段设置不可见属性
+          returnField.initialVisible = false;
+        }
         if (Array.isArray(returnField.name) && ((_returnField$name = returnField.name) === null || _returnField$name === void 0 ? void 0 : _returnField$name.includes("extensionFields"))) {
           returnField.notShowLabel = true;
         }
@@ -25458,10 +25509,39 @@ function faltCustomerFieldRange(fileds) {
   });
   return columnsValue;
 }
+//form存在新加container属性分组得情况 组合操作
+function combineContainer(originFields, currentFields) {
+  var newCurrentFields = _toConsumableArray(originFields);
+  currentFields.map(function (item) {
+    if (!originFields.find(function (i) {
+      var _i$container, _i$container$props, _item$container;
+      return (i === null || i === void 0 ? void 0 : (_i$container = i.container) === null || _i$container === void 0 ? void 0 : (_i$container$props = _i$container.props) === null || _i$container$props === void 0 ? void 0 : _i$container$props.name) == (item === null || item === void 0 ? void 0 : (_item$container = item.container) === null || _item$container === void 0 ? void 0 : _item$container.name);
+    })) {
+      var _item$container2, _item$container3;
+      newCurrentFields = [].concat(_toConsumableArray(newCurrentFields), [{
+        container: {
+          type: 'card',
+          props: {
+            title: item === null || item === void 0 ? void 0 : (_item$container2 = item.container) === null || _item$container2 === void 0 ? void 0 : _item$container2.title,
+            level: 1,
+            id: Math.random(),
+            isWhiteCard: true,
+            bordered: false,
+            name: item === null || item === void 0 ? void 0 : (_item$container3 = item.container) === null || _item$container3 === void 0 ? void 0 : _item$container3.name
+          }
+        },
+        fields: (item === null || item === void 0 ? void 0 : item.fields) || []
+      }]);
+    }
+  });
+  return newCurrentFields;
+}
 function hanleCallbackValue(codeProps, value, customerFields) {
+  var cacheColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var faltFieldRange = faltCustomerFieldRange(customerFields);
+  // const falltValue = flatFileds({fields: codeProps.fields})
   var falltValue = flatFileds({
-    fields: codeProps.fields
+    fields: combineContainer(codeProps.fields, value === null || value === void 0 ? void 0 : value.fields)
   });
   var newCodeProps = _objectSpread2({}, codeProps);
   newCodeProps.fields = convertFileds({
@@ -25471,7 +25551,10 @@ function hanleCallbackValue(codeProps, value, customerFields) {
     var faltColumnsValue = faltColumns(codeProps.columns);
     newCodeProps.columns = value.columns.map(function (item) {
       if (item.isStaticCode) {
-        return faltColumnsValue[item.key];
+        var cacheFieldProperty = cacheColumns.find(function (k) {
+          return (k.key || k.dataIndex) == (item.key || item.dataIndex);
+        });
+        return _objectSpread2(_objectSpread2({}, faltColumnsValue[item.key]), cacheFieldProperty);
       } else {
         //自定义字段-列字段
         if ((item === null || item === void 0 ? void 0 : item.key) && (item === null || item === void 0 ? void 0 : item.key.includes('extensionFields')) && (item === null || item === void 0 ? void 0 : item.key.includes(','))) {
@@ -25479,10 +25562,26 @@ function hanleCallbackValue(codeProps, value, customerFields) {
             render: function render(_ref) {
               var record = _ref.record;
               try {
-                var lastName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
-                var lastName2 = "".concat(lastName1, "Name");
-                var target = (record === null || record === void 0 ? void 0 : record.extensionFields) || {};
-                return target[lastName2] || target[lastName1] || '';
+                var _record$extensionFiel = record.extensionFields,
+                  extensionFields = _record$extensionFiel === void 0 ? {} : _record$extensionFiel;
+                var fieldName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
+                var fieldName2 = "".concat(fieldName1, "Name");
+                if (customerFields.length) {
+                  var targetField = customerFields.find(function (k) {
+                    return k.name.includes(fieldName1);
+                  });
+                  if (targetField) {
+                    var _targetField$initialS = targetField.initialSource,
+                      initialSource = _targetField$initialS === void 0 ? [] : _targetField$initialS;
+                    if (initialSource.length) {
+                      var _initialSource$find;
+                      return ((_initialSource$find = initialSource.find(function (d) {
+                        return d.value == extensionFields[fieldName1];
+                      })) === null || _initialSource$find === void 0 ? void 0 : _initialSource$find.text) || extensionFields[fieldName1];
+                    }
+                  }
+                }
+                return extensionFields[fieldName2] || extensionFields[fieldName1] || '';
               } catch (e) {
                 console.log('e', e);
               }
@@ -25515,7 +25614,10 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     codeProps = props.codeProps,
     customerFields = props.customerFields,
     initialSetting = props.initialSetting,
-    pageType = props.pageType;
+    pageType = props.pageType,
+    _props$detailTablesSe = props.detailTablesSetting,
+    detailTablesSetting = _props$detailTablesSe === void 0 ? [] : _props$detailTablesSe,
+    saveTableCallBack = props.saveTableCallBack;
   var codeFilter = {};
   if (codeProps.columns) {
     // table
@@ -25539,7 +25641,6 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       fields: codeProps.fields
     }).fields;
   }
-  console.log('codeFilter', codeFilter);
   var styleRef = React.useRef(null);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25561,6 +25662,18 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     _useState10 = _slicedToArray(_useState9, 2),
     moduleParams = _useState10[0],
     setModuleParams = _useState10[1];
+  var _useState11 = React.useState('main'),
+    _useState12 = _slicedToArray(_useState11, 2),
+    activeKey = _useState12[0],
+    setActiveKey = _useState12[1]; //默认详情页配置
+  var _useState13 = React.useState({}),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tablesConfigParams = _useState14[0],
+    setTablesConfigParams = _useState14[1];
+  var _useState15 = React.useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    tableJsonEditorValsArr = _useState16[0],
+    setTableJsonEditorValsArr = _useState16[1];
   React.useEffect(function () {
     Promise.all([axios__default['default'].get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
@@ -25584,6 +25697,73 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       }
     });
   }, []);
+  React.useEffect(function () {
+    //明细表的配置数据
+    var axiosArr = detailTablesSetting.map(function (item) {
+      return axios__default['default'].get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(item.tableCode));
+    });
+    Promise.all(axiosArr).then(function (_ref5) {
+      var _ref6 = _toArray(_ref5),
+        resArr = _ref6.slice(0);
+      var configParams = {};
+      detailTablesSetting.map(function (item, index) {
+        var _resArr$index;
+        var _ref7 = ((_resArr$index = resArr[index]) === null || _resArr$index === void 0 ? void 0 : _resArr$index.data) || {},
+          code = _ref7.code,
+          data = _ref7.data;
+        if (data) {
+          var businessType = data.businessType,
+            fieldGroup = data.code,
+            moduleType = data.moduleType;
+          configParams[item.tableCode] = {
+            businessType: businessType,
+            fieldGroup: fieldGroup,
+            moduleType: moduleType,
+            tableFlag: true
+          };
+        }
+      });
+      setTablesConfigParams(_objectSpread2({}, configParams));
+    });
+    var detailTableCodeFilter = detailTablesSetting.map(function (item) {
+      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: item === null || item === void 0 ? void 0 : item.initialSetting
+        });
+      }
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        columns: item === null || item === void 0 ? void 0 : item.columns.map(function (childItem) {
+          return {
+            key: childItem.key || childItem.dataIndex,
+            dataIndex: childItem.dataIndex || childItem.key,
+            isStaticCode: true,
+            title: childItem.title
+          };
+        })
+      });
+    });
+    setTableJsonEditorValsArr(_toConsumableArray(detailTableCodeFilter));
+    var lastRes = detailTableCodeFilter.map(function (item) {
+      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
+        var _codeProps = {
+          fields: [],
+          columns: item === null || item === void 0 ? void 0 : item.columns
+        };
+        var newValue = {
+          fields: [],
+          columns: item.initialSetting
+        };
+        var result = hanleCallbackValue(_codeProps, newValue, item === null || item === void 0 ? void 0 : item.customerFields, item === null || item === void 0 ? void 0 : item.cacheColumns);
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: result === null || result === void 0 ? void 0 : result.columns
+        });
+      }
+      return item;
+    });
+    if (lastRes.length) {
+      saveTableCallBack(lastRes, false);
+    }
+  }, [detailTablesSetting.length]);
   var onClickRun = function onClickRun(value, isSave) {
     setJsonEditorVal(value);
     try {
@@ -25593,6 +25773,40 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       antd.message.error(e);
     }
   };
+  //明细表保存
+  var onClickRunDetailTables = function onClickRunDetailTables(value, isSave, tableCode, tableSouce) {
+    var targetCode = tableCode || activeKey;
+    var targetTableSource = tableSouce || tableJsonEditorValsArr;
+    var newArr = targetTableSource.map(function (item) {
+      if (item.tableCode == targetCode) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: value
+        });
+      }
+      return item;
+    });
+    setTableJsonEditorValsArr(_toConsumableArray(newArr));
+    try {
+      var target = targetTableSource.find(function (item) {
+        return item.tableCode == targetCode;
+      });
+      var _codeProps2 = {
+        fields: [],
+        columns: target === null || target === void 0 ? void 0 : target.columns
+      };
+      var newValue = {
+        fields: [],
+        columns: value
+      };
+      var result = hanleCallbackValue(_codeProps2, newValue, target === null || target === void 0 ? void 0 : target.customerFields, target === null || target === void 0 ? void 0 : target.cacheColumns);
+      saveTableCallBack({
+        columns: result.columns,
+        tableCode: targetCode
+      }, isSave, value);
+    } catch (e) {
+      antd.message.error(e);
+    }
+  };
   React__default['default'].useEffect(function () {
     localStorage.setItem('jsonEditorVal', JSON.stringify(jsonEditorVal || {}));
   }, [jsonEditorVal]);
@@ -25609,25 +25823,97 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
   });
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Drawer, {
     visible: visible,
-    width: 800,
+    width: 1400,
     onClose: function onClose() {
       return setVisible(false);
     },
     className: 'customFieldsDrawer'
+  }, detailTablesSetting.length == 0 && /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex'
+    }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    ref: styleRef
-  }), _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1,
+      width: 500
+    }
+  }, _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       padding: "10px 0",
       fontSize: "16px",
       fontWeight: "bolder"
     }
-  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tableParams)), /*#__PURE__*/React__default['default'].createElement(Editor, {
+  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tableParams))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(Editor, {
     type: "table",
     onRun: onClickRun,
     value: jsonEditorVal,
     shallowHeight: height
-  })), !visible && isAdmin() && /*#__PURE__*/React__default['default'].createElement(ConfigButton, {
+  }))), detailTablesSetting.length > 0 && /*#__PURE__*/React__default['default'].createElement(antd.Tabs, {
+    defaultActiveKey: activeKey,
+    onChange: function onChange(v) {
+      return setActiveKey(v);
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Tabs.TabPane, {
+    tab: "\u8BE6\u60C5\u9875\u914D\u7F6E",
+    key: "main"
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1,
+      width: 500
+    }
+  }, _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      padding: "10px 0",
+      fontSize: "16px",
+      fontWeight: "bolder"
+    }
+  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tableParams))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(Editor, {
+    type: "table",
+    onRun: onClickRun,
+    value: jsonEditorVal,
+    shallowHeight: height
+  })))), tableJsonEditorValsArr.map(function (k) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Tabs.TabPane, {
+      tab: k.title,
+      key: k.tableCode
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        display: 'flex'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        flex: 1,
+        width: 500
+      }
+    }, !tablesConfigParams[k.tableCode] ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        padding: "10px 0",
+        fontSize: "16px",
+        fontWeight: "bolder"
+      }
+    }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tablesConfigParams[k.tableCode]))), /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        flex: 1
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(Editor, {
+      type: "table",
+      onRun: onClickRunDetailTables,
+      value: k.columns,
+      shallowHeight: height
+    }))));
+  }))), !visible && isAdmin() && /*#__PURE__*/React__default['default'].createElement(ConfigButton, {
     type: 'primary',
     onClick: function onClick() {
       return setVisible(true);
@@ -25700,26 +25986,28 @@ var BsCascader = function BsCascader(_ref) {
   React.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);
   })), []);
@@ -25851,18 +26139,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__default['default']({
-            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__default['default']({
+              url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
+              method: 'POST',
+              data: _objectSpread2(_objectSpread2({}, params), {}, {
+                queryIdentify: undefined
+              })
+            }));
+          case 1:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -26001,136 +26291,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(querystring.stringify(querParams));
-              } else if (queryIdentifyType == 'dictCodeIdentify') {
-                extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(querystring.stringify(querParams));
-              } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
-                extraRequestUrl = "/basic/".concat(extraRequestUrl);
-              }
-              bssula.request({
-                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(querystring.stringify(querParams));
+                } else if (queryIdentifyType == 'dictCodeIdentify') {
+                  extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(querystring.stringify(querParams));
+                } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
+                  extraRequestUrl = "/basic/".concat(extraRequestUrl);
+                }
+                bssula.request({
+                  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);
       }));
@@ -26889,30 +27180,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 bssula.request({
-                        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 bssula.request({
+                          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);
               })),
@@ -26938,30 +27231,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 bssula.request({
-                        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 bssula.request({
+                          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);
               })),
@@ -26989,30 +27284,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 bssula.request({
-                        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 bssula.request({
+                          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);
               })),
@@ -28079,6 +28376,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
         });
       }
     }
+
+    //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
   }, {
     key: "render",
     value: function render() {
@@ -28909,7 +29208,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 树结构 转化成 平行树 (递归函数)
     _this.coverToParallel = function (treeData, result) {
       treeData.forEach(function (el) {
         result.push(el);
@@ -29163,7 +29461,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 场景需要返回值2022.11.15
     _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
@@ -29461,30 +29758,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 bssula.request({
-                  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 bssula.request({
+                    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);
         })),
@@ -29818,7 +30117,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, "\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);
     };
-    //添加同一层级条件
     _this.addPeerRule = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var _this$props4 = _this.props,
@@ -29839,7 +30137,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    //添加子层级条件
     _this.addChildRules = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
@@ -29915,7 +30212,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 新增执行顺序
     _this.handleSelectRuleAction = function (keys, classDataIndex, callback) {
       callback();
       var callBack = _this.props.callBack;
@@ -30072,26 +30368,26 @@ exports.AddSkuSelect = AddSkuSelect;
 exports.AddSpuSelect = AddSpuSelect;
 exports.BillEntry = BillEntry;
 exports.BsCascader = BsCascader;
-exports.BsLayout = index$6;
+exports.BsLayout = index$5;
 exports.BsSulaQueryTable = BsSulaQueryTable;
 exports.BusinessSearchSelect = BusinessSearchSelect$1;
 exports.BusinessTreeSearchSelect = BusinessTreeSearchSelect$1;
-exports.CheckOneUser = index$2;
+exports.CheckOneUser = index$1;
 exports.ColumnSettingTable = ColumnSettingTable;
 exports.CommodityEntry = CommodityEntry;
 exports.DataImport = DataImport;
 exports.DataValidation = DataValidation;
-exports.DetailPageWrapper = index$4;
+exports.DetailPageWrapper = index$3;
 exports.EllipsisTooltip = EllipsisTooltip;
 exports.ExportIcon = ExportIcon;
 exports.GuideWrapper = GuideWrapper;
-exports.HomePageWrapper = index$5;
+exports.HomePageWrapper = index$4;
 exports.JsonQueryTable = JsonQueryTable;
-exports.MoreTreeTable = index$7;
+exports.MoreTreeTable = index$6;
 exports.QueryMutipleInput = QueryMutipleInput;
 exports.RuleComponent = RuleObjectComponent;
 exports.SearchSelect = SearchSelect;
-exports.StateFlow = index$3;
+exports.StateFlow = index$2;
 exports.SulaColumnSettingTable = ColumnSettingSulaTable;
 exports.TableColumnSetting = TableColumnSetting;
 exports.TreeSearchSelect = TreeSearchSelect;