@bit-sun/business-component 4.0.0-alpha.3 → 4.0.2

package/dist/index.js

@@ -54,88 +54,9 @@ var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var castArray__default = /*#__PURE__*/_interopDefaultLegacy(castArray);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray$1);
 
-function _arrayLikeToArray(r, a) {
-  (null == a || a > r.length) && (a = r.length);
-  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-  return n;
-}
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
-function _arrayWithoutHoles(r) {
-  if (Array.isArray(r)) return _arrayLikeToArray(r);
-}
-function _assertThisInitialized(e) {
-  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  return e;
-}
-function asyncGeneratorStep(n, t, e, r, o, a, c) {
-  try {
-    var i = n[a](c),
-      u = i.value;
-  } catch (n) {
-    return void e(n);
-  }
-  i.done ? t(u) : Promise.resolve(u).then(r, o);
-}
-function _asyncToGenerator(n) {
-  return function () {
-    var t = this,
-      e = arguments;
-    return new Promise(function (r, o) {
-      var a = n.apply(t, e);
-      function _next(n) {
-        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
-      }
-      function _throw(n) {
-        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
-      }
-      _next(void 0);
-    });
-  };
-}
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
 }
-function _classCallCheck(a, n) {
-  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
-}
-function _defineProperties(e, r) {
-  for (var t = 0; t < r.length; t++) {
-    var o = r[t];
-    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
-  }
-}
-function _createClass(e, r, t) {
-  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
-    writable: !1
-  }), e;
-}
-function _defineProperty(e, r, t) {
-  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-    value: t,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[r] = t, e;
-}
-function _getPrototypeOf(t) {
-  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
-    return t.__proto__ || Object.getPrototypeOf(t);
-  }, _getPrototypeOf(t);
-}
-function _inherits(t, e) {
-  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
-  t.prototype = Object.create(e && e.prototype, {
-    constructor: {
-      value: t,
-      writable: !0,
-      configurable: !0
-    }
-  }), Object.defineProperty(t, "prototype", {
-    writable: !1
-  }), e && _setPrototypeOf(t, e);
-}
 function _isNativeReflectConstruct() {
   try {
     var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -144,9 +65,6 @@ function _isNativeReflectConstruct() {
     return !!t;
   })();
 }
-function _iterableToArray(r) {
-  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
-}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -174,15 +92,6 @@ function _iterableToArrayLimit(r, l) {
     return a;
   }
 }
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _objectDestructuringEmpty(t) {
-  if (null == t) throw new TypeError("Cannot destructure " + t);
-}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -204,31 +113,6 @@ function _objectSpread2(e) {
   }
   return e;
 }
-function _objectWithoutProperties(e, t) {
-  if (null == e) return {};
-  var o,
-    r,
-    i = _objectWithoutPropertiesLoose(e, t);
-  if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
-  }
-  return i;
-}
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
-    t[n] = r[n];
-  }
-  return t;
-}
-function _possibleConstructorReturn(t, e) {
-  if (e && ("object" == typeof e || "function" == typeof e)) return e;
-  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
-  return _assertThisInitialized(t);
-}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return e;
@@ -530,20 +414,6 @@ function _regeneratorRuntime() {
     }
   }, e;
 }
-function _setPrototypeOf(t, e) {
-  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
-    return t.__proto__ = e, t;
-  }, _setPrototypeOf(t, e);
-}
-function _slicedToArray(r, e) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
-}
-function _toArray(r) {
-  return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableRest();
-}
-function _toConsumableArray(r) {
-  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
-}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -567,12 +437,180 @@ function _typeof(o) {
     return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
   }, _typeof(o);
 }
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if ("string" == typeof r) return _arrayLikeToArray(r, a);
-    var t = {}.toString.call(r).slice(8, -1);
-    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+      args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+      _next(undefined);
+    });
+  };
+}
+function _classCallCheck(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+function _defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor) descriptor.writable = true;
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+  }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+  if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
+  return Constructor;
+}
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _inherits(subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function");
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
+  Object.defineProperty(subClass, "prototype", {
+    writable: false
+  });
+  if (superClass) _setPrototypeOf(subClass, superClass);
+}
+function _getPrototypeOf(o) {
+  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
+    return o.__proto__ || Object.getPrototypeOf(o);
+  };
+  return _getPrototypeOf(o);
+}
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+  return _setPrototypeOf(o, p);
+}
+function _objectDestructuringEmpty(obj) {
+  if (obj == null) throw new TypeError("Cannot destructure " + obj);
+}
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (excluded.indexOf(key) >= 0) continue;
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
   }
+  return target;
+}
+function _assertThisInitialized(self) {
+  if (self === void 0) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+  return self;
+}
+function _possibleConstructorReturn(self, call) {
+  if (call && (typeof call === "object" || typeof call === "function")) {
+    return call;
+  } else if (call !== void 0) {
+    throw new TypeError("Derived constructors may only return object or undefined");
+  }
+  return _assertThisInitialized(self);
+}
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _toArray(arr) {
+  return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
+}
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+function _iterableToArray(iter) {
+  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+  return arr2;
+}
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
 var ENUM = {
@@ -868,7 +906,10 @@ var handleRequestHeader = function handleRequestHeader(url, options) {
   }
   !!!config.headers['x-biz-code'] && handleRequestAuthHeader(config);
   config.headers = _objectSpread2(_objectSpread2({}, commonHeaders), config.headers);
-  options.headers = config.headers;
+  if (options) {
+    options.headers = config.headers;
+  }
+  return options || config;
 };
 request__default['default'].interceptors.request.use(function (url, options) {
   handleRequestHeader(url, options);
@@ -1017,7 +1058,7 @@ var handleTextDouble = function handleTextDouble(textOne, textTwo) {
 var handleTextLineFeed = function handleTextLineFeed(text) {
   var width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 130;
   return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-    title: text || '- -'
+    title: text || '-'
   }, /*#__PURE__*/React__default['default'].createElement("span", {
     style: {
       width: width ? width + 'px' : '130px',
@@ -1026,13 +1067,13 @@ var handleTextLineFeed = function handleTextLineFeed(text) {
       whiteSpace: 'pre-line',
       top: '5px'
     }
-  }, text || '- -'));
+  }, text || '-'));
 };
 // 带有toptile 清提示 ...
 var handleTextOverflow = function handleTextOverflow(text) {
   var width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 130;
   return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-    title: text || '- -'
+    title: text || '-'
   }, /*#__PURE__*/React__default['default'].createElement("span", {
     style: {
       width: width ? width + 'px' : '130px',
@@ -1043,7 +1084,7 @@ var handleTextOverflow = function handleTextOverflow(text) {
       position: 'relative',
       top: '5px'
     }
-  }, text || '- -'));
+  }, text || '-'));
 };
 // 处理时间 带时分秒
 var handleTooltip = function handleTooltip(text, timeTrue) {
@@ -1141,11 +1182,11 @@ var userInfoCard = function userInfoCard(props) {
 };
 function handleCommonTimeRenderHours(text, format) {
   var formatType = format || 'YYYY-MM-DD';
-  return text && moment__default['default'](text).format(formatType) || '- -';
+  return text && moment__default['default'](text).format(formatType) || '-';
 }
 function handleCommonTimeRender(text, format) {
   var formatType = format || 'YYYY-MM-DD HH:mm:ss';
-  return text && moment__default['default'](text).format(formatType) || '- -';
+  return text && moment__default['default'](text).format(formatType) || '-';
 }
 //设置queryTable默认列宽
 var getItemDefaultWidth = function getItemDefaultWidth(item) {
@@ -1251,6 +1292,10 @@ var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
     umi.history.goBack();
   }
 };
+var parseWidth = function parseWidth(widthStr) {
+  var parsedWidth = parseInt(widthStr.replace('px', ''));
+  return isNaN(parsedWidth) ? 0 : parsedWidth;
+};
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行
@@ -1269,9 +1314,10 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
     };
   } else if (col.textOverflow) {
     // 处理文字太长
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (_ref3) {
       var text = _ref3.text;
-      return handleTextOverflow(text, col.width);
+      return handleTextOverflow(text, colWidth);
     };
   } else if (col.images) {
     col.render = function (_ref4) {
@@ -1299,8 +1345,8 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
       return authFn(item.code);
     });
   } else if (!col.render) {
-    // 没有值默认显示 - -
-    // col.render = ({ text }: any) => text || '- -';
+    // 没有值默认显示 -
+    // col.render = ({ text }: any) => text || '-';
     col.render = function (_ref8) {
       var text = _ref8.text;
       return text !== null && text !== void 0 ? text : '--';
@@ -1325,8 +1371,9 @@ var handleAntdColumnsSpecialParams = function handleAntdColumnsSpecialParams(col
   }
   // 处理文字太长
   if (col.textOverflow) {
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (text) {
-      return handleTextOverflow(text);
+      return handleTextOverflow(text, colWidth);
     };
   }
   if (col.images) {
@@ -1350,9 +1397,9 @@ var handleAntdColumnsSpecialParams = function handleAntdColumnsSpecialParams(col
       return index + 1;
     };
   }
-  // 没有值默认显示 - -
+  // 没有值默认显示 -
   if (!col.render) {
-    // col.render = ({ text }: any) => text || '- -';
+    // col.render = ({ text }: any) => text || '-';
     col.render = function (text) {
       return text || '--';
     };
@@ -1441,6 +1488,21 @@ var randomString = function randomString(len) {
 var createUniqID = function createUniqID(length) {
   return Number(Math.random().toString().substr(3, length) + Date.now()).toString(36);
 };
+// 格式化table响应数据
+var handleConvertResponse = function handleConvertResponse(items, total) {
+  var result = {
+    list: (items === null || items === void 0 ? void 0 : items.length) && items.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        keyIndex: "".concat(index + 1)
+      });
+    }) || [],
+    total: Number(total) || 0
+  };
+  return result;
+};
+var noEmptyArray = function noEmptyArray(targetObj) {
+  return Array.isArray(targetObj) && targetObj.length !== 0;
+};
 
 // 判断某个按钮/菜单 是否有权限，返回布尔值
 var authFunc = function authFunc(code) {
@@ -1567,37 +1629,38 @@ var resolveFile = /*#__PURE__*/function () {
 //读取文件 
 var readerXlsxToList = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, fileList, uploadRef, done, otherInfo) {
-    var _ref5, callback, sheetMap, data2, data;
+    var _ref5, callback, sheetMap, nowFile, data2, data;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _ref5 = otherInfo || {}, callback = _ref5.callback, sheetMap = _ref5.sheetMap;
           if (!(Array.isArray(fileList) && fileList.length > 0)) {
-            _context2.next = 14;
+            _context2.next = 15;
             break;
           }
-          _context2.next = 4;
-          return resolveFile(file.originFileObj, {
+          nowFile = fileList[fileList.length - 1]; // 阻止了默认上传file没有originFileObj了 得从fileList中去取
+          _context2.next = 5;
+          return resolveFile(nowFile.originFileObj, {
             sheetMap: fieldMappingReverse(sheetMap),
             sheetCount: 1
           });
-        case 4:
+        case 5:
           data2 = _context2.sent;
           data = data2[0];
           if (data.length) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
           antd.message.error("\u8BF7\u5148\u5F55\u5165\u6570\u636E\u518D\u5BFC\u5165");
           return _context2.abrupt("return");
-        case 9:
+        case 10:
           if (callback) callback(data);
           !callback && antd.message.success("\u5BFC\u5165\u6210\u529F");
           return _context2.abrupt("return", data);
-        case 14:
+        case 15:
           antd.message.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
           return _context2.abrupt("return");
-        case 16:
+        case 17:
         case "end":
           return _context2.stop();
       }
@@ -2302,7 +2365,7 @@ var getDictionaryTextByValue = function getDictionaryTextByValue(dicCode, value)
     dicData = storageDic[dicCode];
   }
   if (!dicData || !dicData.length) ;
-  if (value === undefined) return '- -';
+  if (value === undefined) return '-';
   var dicItemArray = (_dicData = dicData) === null || _dicData === void 0 ? void 0 : _dicData.filter(function (item) {
     return item.value === value.toString();
   });
@@ -2319,7 +2382,7 @@ var getJoinDictionaryText = function getJoinDictionaryText(dicCode, value) {
     var storageDic = localStorage.getItem(DIC_DATA_KEY) ? JSON.parse(localStorage.getItem(DIC_DATA_KEY) || '[]') : {};
     dicData = storageDic[dicCode];
   }
-  if (value === undefined) return '- -';
+  if (value === undefined) return '-';
   var newValue = value.split(',');
   var dicItemArray = (_dicData2 = dicData) === null || _dicData2 === void 0 ? void 0 : _dicData2.filter(function (item) {
     return newValue.find(function (d) {
@@ -3160,7 +3223,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3175,7 +3237,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             antd.message.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return antd.Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -3836,7 +3898,6 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3851,7 +3912,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
             antd.message.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return antd.Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -4578,9 +4639,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     if (labelInValue) {
       var formatResult = value.map(function (i) {
         return {
-          key: i[mappingValueField],
-          label: i[mappingTextField],
-          value: i[mappingValueField]
+          key: i[mappingValueField] || i.key,
+          label: i[mappingTextField] || i.label,
+          value: i[mappingValueField] || i.value
         };
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
@@ -4674,11 +4735,27 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     });
   };
   var onChangeCheckAll = function onChangeCheckAll(e) {
+    // 允许用户自定义 全选操作逻辑
+    if (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll) {
+      modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll(e, {
+        items: items,
+        itemsTotal: itemsTotal,
+        tablePagination: tablePagination,
+        onCheckAllData: onCheckAllData,
+        setSelectedRowKeys: setSelectedRowKeys,
+        setPopValue: setPopValue,
+        setSelectedRows: setSelectedRows,
+        setIndeterminate: setIndeterminate,
+        setCheckedAll: setCheckedAll
+      });
+      return;
+    }
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      if (items.length < itemsTotal) {
-        var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+      if (items.length < itemsTotal || items.length === itemsTotal && itemsTotal == 0) {
+        var totalCount = (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || itemsTotal; // 兼容有查询条件的情况 首次加载是没有所有数据的，默认给加载后端返回的总条数
+        var totalPage = Math.ceil(totalCount / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
         var allPageSize = totalPage * (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize);
         onCheckAllData(allPageSize);
       } else {
@@ -4775,7 +4852,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }
   };
   var themeColor = {
-    color: '#1890ff'
+    color: '#005cff'
   };
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
@@ -5018,8 +5095,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   })), needModalTable && ( /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     style: {
       width: '30px',
-      padding: '2px',
-      height: 'auto'
+      padding: '2px'
     },
     onClick: showModal,
     type: "primary"
@@ -5104,7 +5180,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         }
       };
     }
-  }), selectMode ? ( /*#__PURE__*/React__default['default'].createElement("div", {
+  }), selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.isHiddenCheckAll) ? ( /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'select_list_selectAll'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     indeterminate: indeterminate,
@@ -5765,7 +5841,7 @@ var setInitialShowColumn = function setInitialShowColumn(tableCode, columns, cal
  * @param arr 要判断的数据
  * @returns boolean
  */
-var noEmptyArray = function noEmptyArray(arr) {
+var noEmptyArray$1 = function noEmptyArray(arr) {
   return Array.isArray(arr) && arr.length > 0;
 };
 //设置queryTable默认列宽
@@ -6750,7 +6826,13 @@ var AddSelect = function AddSelect(props) {
       setPopValue(setBusinessDefaultValue(list, recordList));
       setSelectedRowKeys([]);
     } else {
-      setPopValue(selectRows);
+      // 修复选中的明细输入的数量 折扣等在再次添加时发生改变bug（上方选择列表只会同步记录第一下输入的值，第一下输入后popValue的item项地址改变，选择列表值不在同步修改）
+      setPopValue(selectRows.map(function (item) {
+        var latestItem = popvalue.find(function (popVal) {
+          return popVal[mappingValueField] === item[mappingValueField];
+        }) || {};
+        return _objectSpread2(_objectSpread2({}, item), latestItem);
+      }));
       setSelectedRowKeys(selectKeys);
     }
   };
@@ -6940,13 +7022,13 @@ var AddSelect = function AddSelect(props) {
       var indexArrInside = [].concat(_toConsumableArray(indexArr), [index]).filter(function (i) {
         return i || i === 0;
       });
-      if (noEmptyArray(item.children)) {
+      if (noEmptyArray$1(item.children)) {
         handleColumns(item.children, indexArrInside);
       } else {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -7992,13 +8074,13 @@ var BillEntry = function BillEntry(_ref3) {
       var indexArrInside = [].concat(_toConsumableArray(indexArr), [index]).filter(function (i) {
         return i || i === 0;
       });
-      if (noEmptyArray(item.children)) {
+      if (noEmptyArray$1(item.children)) {
         handleColumns(item.children, indexArrInside);
       } else {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -8236,6 +8318,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
       break;
     case 'deliveryMode':
     case 'ruleTemplate':
+    case 'priceItem':
       result = '/basic';
       break;
     default:
@@ -10070,7 +10153,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
           var _employeeType$find;
           return ((_employeeType$find = employeeType.find(function (i) {
             return i.value === text;
-          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text) || '- -';
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text) || '-';
         }
       }] : []), [{
         title: '邮箱',
@@ -10616,6 +10699,48 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
       }]
     }, modalTableBusProps);
   }
+  // 价格项选择器
+  if (type === 'priceItem') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/priceType"),
+      filter: 'qp-code,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-enabled-eq': true,
+        sorter: 'desc-id'
+      },
+      sourceName: 'priceCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-code-like',
+      label: '代码'
+    }, {
+      name: 'qp-name-like',
+      label: '名称'
+    }];
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择价格项',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '代码',
+        dataIndex: 'code'
+      }, {
+        title: '名称',
+        dataIndex: 'name'
+      }, {
+        title: '创建时间',
+        dataIndex: 'createTime',
+        render: function render(text) {
+          return handleTooltip(text, true);
+        }
+      }, {
+        title: '创建人',
+        dataIndex: 'createUserName'
+      }]
+    }, modalTableBusProps);
+  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -12399,7 +12524,7 @@ var index$2 = (function (props) {
   }));
 });
 
-var css_248z$a = ".guide-wrapper .form-guide {\n  cursor: pointer;\n  position: fixed;\n  right: 5px;\n  color: #B1BAD4;\n  padding: 5px 0;\n  width: 48px;\n  z-index: 10;\n  top: 50%;\n  transform: translateY(-50%);\n  background-color: #141620;\n  border-radius: 5px;\n}\n.guide-wrapper .form-guide .form-guide-top {\n  padding: 0px 10px;\n  display: flex;\n  justify-content: center;\n}\n.guide-wrapper .form-guide .form-guide-center {\n  border-top: 1px solid #6E7588;\n  border-bottom: 1px solid #6E7588;\n  padding: 0px 10px;\n}\n.guide-wrapper .form-guide .form-guide-item {\n  width: 28px;\n  padding: 5px 0;\n  display: block;\n  word-break: break-all;\n  color: #B1BAD4;\n  font-size: 14px;\n  line-height: 16px;\n  position: relative;\n}\n.guide-wrapper .form-guide .form-guide-item::after {\n  content: '';\n  display: block;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.guide-wrapper .form-guide .form-guide-bottom {\n  padding: 5px 10px;\n  display: flex;\n  justify-content: center;\n}\n.guide-wrapper .form-guide .form-guide-item:last-child::after {\n  content: '';\n  display: none;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.guide-wrapper .white-card.bitsun-form-card-class .guidewrapper-body-wrapper {\n  background-color: #FFFFFF;\n  padding: 0px;\n}\n.guide-wrapper .bitsun-form-card-class > .guidewrapper-body-wrapper {\n  margin-bottom: 10px;\n}\n.guide-wrapper .bitsun-form-card-class .guidewrapper-body-wrapper {\n  padding: 12px 0 0;\n  background-color: #F3F3F3;\n}\n.guide-wrapper .bitsun-form-card-class .ant-card-head-title {\n  display: flex;\n  align-items: center;\n  font-size: 16px;\n  color: #000000;\n  font-weight: 600;\n  background-color: #FFFFFF;\n  padding: 8px 0;\n  margin: 0px;\n}\n.guide-wrapper .bitsun-form-card-class .ant-card-head-title .title-left-line {\n  display: inline-block;\n  width: 4px;\n  height: 100%;\n  background-color: #005CFF;\n  height: 20px;\n  margin-right: 16px;\n}\n.guide-wrapper .field-group-hidden .guidewrapper-body-wrapper {\n  display: none !important;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap {\n  cursor: pointer;\n  color: #B6B6B6;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap .bs-guidewrap-icon {\n  transition: transform 0.3s;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap .bs-guidewrap-icon-toogle {\n  transform: rotate(180deg);\n}\n.guidewrapper-head-wrap {\n  padding-left: 16px;\n  height: 36px;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  background: #fff;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left {\n  display: flex;\n  align-items: center;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left::before {\n  content: '';\n  display: block;\n  width: 3px;\n  background: #005CFF;\n  height: 20px;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left .guidewrapper-head-title {\n  font-weight: 500;\n  font-size: 14px;\n  color: #000000;\n  padding: 0 6px;\n}\n.guidewrapper-head-border {\n  border-bottom: 1px solid #F0F0F0;\n}\n.guidewrapper-title-extra-wrap {\n  padding-left: 5px;\n}\n";
+var css_248z$a = ".guide-wrapper .form-guide {\n  cursor: pointer;\n  position: fixed;\n  right: 5px;\n  color: #B1BAD4;\n  padding: 5px 0;\n  width: 48px;\n  z-index: 10;\n  top: 50%;\n  transform: translateY(-50%);\n  background-color: #141620;\n  border-radius: 5px;\n}\n.guide-wrapper .form-guide .form-guide-top {\n  padding: 0px 10px;\n  display: flex;\n  justify-content: center;\n}\n.guide-wrapper .form-guide .form-guide-center {\n  border-top: 1px solid #6E7588;\n  border-bottom: 1px solid #6E7588;\n  padding: 0px 10px;\n}\n.guide-wrapper .form-guide .form-guide-item {\n  width: 28px;\n  padding: 5px 0;\n  display: block;\n  word-break: break-all;\n  color: #B1BAD4;\n  font-size: 14px;\n  line-height: 16px;\n  position: relative;\n}\n.guide-wrapper .form-guide .form-guide-item::after {\n  content: '';\n  display: block;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.guide-wrapper .form-guide .form-guide-bottom {\n  padding: 5px 10px;\n  display: flex;\n  justify-content: center;\n}\n.guide-wrapper .form-guide .form-guide-item:last-child::after {\n  content: '';\n  display: none;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.guide-wrapper .white-card.bitsun-form-card-class .guidewrapper-body-wrapper {\n  background-color: #FFFFFF;\n  padding: 0px;\n}\n.guide-wrapper .bitsun-form-card-class > .guidewrapper-body-wrapper {\n  margin-bottom: 10px;\n}\n.guide-wrapper .bitsun-form-card-class .guidewrapper-body-wrapper {\n  padding: 12px 0 0;\n  background-color: #F3F3F3;\n}\n.guide-wrapper .bitsun-form-card-class .ant-card-head-title {\n  display: flex;\n  align-items: center;\n  font-size: 16px;\n  color: #000000;\n  font-weight: 600;\n  background-color: #FFFFFF;\n  padding: 8px 0;\n  margin: 0px;\n}\n.guide-wrapper .bitsun-form-card-class .ant-card-head-title .title-left-line {\n  display: inline-block;\n  width: 4px;\n  height: 100%;\n  background-color: #005cff;\n  height: 20px;\n  margin-right: 16px;\n}\n.guide-wrapper .field-group-hidden .guidewrapper-body-wrapper {\n  display: none !important;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap {\n  cursor: pointer;\n  color: #B6B6B6;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap .bs-guidewrap-icon {\n  transition: transform 0.3s;\n}\n.guide-wrapper .bs-guidewrap-icon-wrap .bs-guidewrap-icon-toogle {\n  transform: rotate(180deg);\n}\n.guidewrapper-head-wrap {\n  padding-left: 16px;\n  height: 36px;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  background: #fff;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left {\n  display: flex;\n  align-items: center;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left::before {\n  content: '';\n  display: block;\n  width: 3px;\n  background: #005cff;\n  height: 20px;\n}\n.guidewrapper-head-wrap .guidewrapper-head-left .guidewrapper-head-title {\n  font-weight: 500;\n  font-size: 14px;\n  color: #000000;\n  padding: 0 6px;\n}\n.guidewrapper-head-border {\n  border-bottom: 1px solid #F0F0F0;\n}\n.guidewrapper-title-extra-wrap {\n  padding-left: 5px;\n}\n";
 styleInject(css_248z$a);
 
 var _excluded$7 = ["children", "titleExtra", "title", "extra", "bordered"],
@@ -12574,8 +12699,8 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       if (!tableCode) return;
       var configvalue = config ? config.map(function (item) {
         return {
-          key: item.key,
-          dataIndex: item.dataIndex,
+          key: item.key || item.dataIndex,
+          dataIndex: item.dataIndex || item.key,
           width: item.width,
           hidden: item.hidden,
           fixed: item.fixed
@@ -12656,20 +12781,22 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$2 = inner[0]) === null || _inner$2 === void 0 ? void 0 : _inner$2.width) || item.width,
           hidden: columnConfig.length && !inner.length
         });
-      }) : _toConsumableArray(datasource);
+      }) : _toConsumableArray(datasource.map(function (inner) {
+        return _objectSpread2(_objectSpread2({}, inner), {}, {
+          key: inner.key || inner.dataIndex
+        });
+      }));
       _this.setState({
         dataSource: initialDataSourceData.map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex
           });
         }),
-        sortDataSource: initialDataSourceData.filter(function (item) {
-          return !item.hidden;
-        }).map(function (item) {
+        sortDataSource: _toConsumableArray(showColumns.map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex
           });
-        })
+        }))
       });
     };
     _this.isColumnsChange = function () {
@@ -12873,7 +13000,8 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       var _this$props$datasourc = _this.props.datasource,
         datasource = _this$props$datasourc === void 0 ? [] : _this$props$datasourc;
       _this.setState({
-        visible: true
+        visible: true,
+        onSearchSort: false
       });
       _this.setInitValue(datasource);
     };
@@ -13018,7 +13146,47 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       _this.setInitValue(datasource);
     };
     _this.handleResetSetting = function () {
-      _this.patchUserColumnConfig('');
+      var _this$props4 = _this.props,
+        setShowColumns = _this$props4.setShowColumns,
+        _this$props4$datasour = _this$props4.datasource,
+        reSetInitialShowColumn = _this$props4.reSetInitialShowColumn,
+        appRequestConfig = _this$props4.appRequestConfig;
+      var tableCode = _this.props.tableCode;
+      return new Promise(function (resolve, reject) {
+        requestUtil({
+          url: handleRequestUrl('/user', '/appConfig/saveUserOrder', appRequestConfig),
+          method: 'POST',
+          data: {
+            code: tableCode,
+            detail: ''
+          }
+        }).then(function (res) {
+          if (judgeIsRequestSuccess(res === null || res === void 0 ? void 0 : res.data)) {
+            var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+            var configArray = JSON.parse(config);
+            var currentSetting = configArray.filter(function (item) {
+              return item.code === tableCode;
+            });
+            if (currentSetting.length) {
+              currentSetting[0].detail = JSON.stringify([]);
+            } else {
+              configArray.push({
+                code: tableCode,
+                detail: JSON.stringify([])
+              });
+            }
+            localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray));
+            antd.message.success('重置表头列成功！');
+            reSetInitialShowColumn(true);
+            _this.setState({
+              visible: false
+            });
+          } else {
+            antd.message.error('重置表头列自定义失败，请稍后尝试');
+            reject('');
+          }
+        });
+      });
     };
     _this.onSearch = function (e) {
       _this.setState({
@@ -13049,8 +13217,8 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
   return _createClass(SortableTable, [{
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      var _this$props4;
-      if (this.isColumnsChange((_this$props4 = this.props) === null || _this$props4 === void 0 ? void 0 : _this$props4.datasource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource)) {
+      var _this$props5;
+      if (this.isColumnsChange((_this$props5 = this.props) === null || _this$props5 === void 0 ? void 0 : _this$props5.datasource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource)) {
         this.setInitValue((nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource) || []);
       }
     }
@@ -13077,7 +13245,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       });
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'sort_table_wrapper'
-      }, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+      }, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
         title: "\u8BBE\u7F6E\u8868\u5934\u5185\u5BB9",
         wrapClassName: 'sort_table_wrapper',
         width: 820,
@@ -13212,10 +13380,14 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
         pagination: false,
         showHeader: false,
-        dataSource: onSearchSort ? sortDataSource.filter(function (item) {
+        dataSource: (onSearchSort ? sortDataSource.filter(function (item) {
           var _item$title6;
           return (item === null || item === void 0 ? void 0 : (_item$title6 = item.title) === null || _item$title6 === void 0 ? void 0 : _item$title6.indexOf(onSearchSort)) > -1;
-        }) : sortDataSource,
+        }) : sortDataSource).map(function (item) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            key: item.key || item.dataIndex
+          });
+        }),
         columns: this.columns,
         rowKey: "key",
         // rowSelection={rowSelection}
@@ -13415,13 +13587,13 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
           var indexArrInside = [].concat(_toConsumableArray(indexArr), [index]).filter(function (i) {
             return i || i === 0;
           });
-          if (noEmptyArray(item.children)) {
+          if (noEmptyArray$1(item.children)) {
             handleColumns(item.children, indexArrInside);
           } else {
             item.width = item.width || getItemDefaultWidth$2(item);
             item.onHeaderCell = function (column) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+                width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
                 onResize: _this2.handleResize(indexArrInside)
               });
             };
@@ -13491,6 +13663,13 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
         showColumns: showColumns
       });
     };
+    _this.reSetInitialShowColumn = function () {
+      var columns = _this.props.columns;
+      var showColumns = getShowColumns(columns, []);
+      _this.setState({
+        showColumns: showColumns
+      });
+    };
     _this.setShowColumns = function (newColumns) {
       _this.setState({
         showColumns: _toConsumableArray(newColumns)
@@ -13649,7 +13828,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
           var indexArrInside = [].concat(_toConsumableArray(indexArr), [index]).filter(function (i) {
             return i || i === 0;
           });
-          if (noEmptyArray(item.children)) {
+          if (noEmptyArray$1(item.children)) {
             handleColumns(item.children, indexArrInside);
           } else {
             item.width = item.width || getItemDefaultWidth$2(item);
@@ -13692,6 +13871,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
         setShowColumns: this.setShowColumns,
         showColumns: this.state.showColumns,
         datasource: columns || [],
+        reSetInitialShowColumn: this.reSetInitialShowColumn,
         tableCode: tableCode,
         appRequestConfig: appRequestConfig
       }))), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
@@ -13815,9 +13995,9 @@ function matchRoute(path, routeObj, hideRouteObj) {
 var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRouteArray, _ref) {
   var pathToRegexp = _ref.pathToRegexp;
   var newPath = path.split('?')[0];
-  var hideRouteObj = _defineProperty({}, newPath, hideRouteArray.find(function (itemRoute) {
+  var hideRouteObj = _defineProperty({}, newPath, Array.isArray(hideRouteArray) && (hideRouteArray === null || hideRouteArray === void 0 ? void 0 : hideRouteArray.find(function (itemRoute) {
     return pathToRegexp(itemRoute.path).test(newPath);
-  }));
+  })));
   var matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
   if (matchedRoute) {
     var modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
@@ -13833,7 +14013,7 @@ var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRoute
   return undefined;
 };
 
-var css_248z$c = ".detail_page_head {\n  padding: 8px 0;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 24px;\n  width: 24px;\n  border: 1px solid #BABABA;\n  margin: 0 8px 0 16px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #005CFF;\n  border: 1px solid #005CFF;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n  display: flex;\n  align-items: center;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 14px;\n  margin-top: 2px;\n  padding-right: 10px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
+var css_248z$c = ".detail_page_head {\n  padding: 8px 0;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 24px;\n  width: 24px;\n  border: 1px solid #BABABA;\n  margin: 0 8px 0 16px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #8bc7ff;\n  border: 1px solid #8bc7ff;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n  display: flex;\n  align-items: center;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 14px;\n  padding-right: 10px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$c);
 
 var quanping = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2234px%22%20height%3D%2234px%22%20viewBox%3D%220%200%2034%2034%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3E%E7%9F%A9%E5%BD%A2%3C%2Ftitle%3E%20%20%20%20%3Cg%20id%3D%22%E5%88%97%E8%A1%A8%E5%8A%9F%E8%83%BD%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%98%9F%E6%BE%9C-%E6%90%9C%E7%B4%A2-%E6%90%9C%E7%B4%A2%E5%8A%9F%E8%83%BD%22%20transform%3D%22translate%28-1823.000000%2C%20-297.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%90%9C%E7%B4%A2%E7%BB%84%E4%BB%B6-%E6%A0%B7%E5%BC%8F%E4%B8%80%22%20transform%3D%22translate%28230.000000%2C%20284.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%A1%AE%E5%AE%9A%E5%A4%87%E4%BB%BD-2%22%20transform%3D%22translate%281593.000000%2C%2013.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.55801813%2C1%20L28.4419819%2C1%20C30.0269041%2C1%2030.6016352%2C1.16502331%2031.181059%2C1.47490258%20C31.7604829%2C1.78478186%2032.2152181%2C2.2395171%2032.5250974%2C2.81894097%20C32.8349767%2C3.39836484%2033%2C3.97309593%2033%2C5.55801813%20L33%2C28.4419819%20C33%2C30.0269041%2032.8349767%2C30.6016352%2032.5250974%2C31.181059%20C32.2152181%2C31.7604829%2031.7604829%2C32.2152181%2031.181059%2C32.5250974%20C30.6016352%2C32.8349767%2030.0269041%2C33%2028.4419819%2C33%20L5.55801813%2C33%20C3.97309593%2C33%203.39836484%2C32.8349767%202.81894097%2C32.5250974%20C2.2395171%2C32.2152181%201.78478186%2C31.7604829%201.47490258%2C31.181059%20C1.16502331%2C30.6016352%201%2C30.0269041%201%2C28.4419819%20L1%2C5.55801813%20C1%2C3.97309593%201.16502331%2C3.39836484%201.47490258%2C2.81894097%20C1.78478186%2C2.2395171%202.2395171%2C1.78478186%202.81894097%2C1.47490258%20C3.39836484%2C1.16502331%203.97309593%2C1%205.55801813%2C1%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%22%20stroke%3D%22%23D9D9D9%22%20stroke-width%3D%220.888888889%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22scanning%22%20transform%3D%22translate%289.000000%2C%209.000000%29%22%20fill%3D%22%23000000%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.21873562%2C9.69278114%20L6.28954184%2C10.7432953%20L2.532%2C14.5%20L5.24949999%2C14.5%20L5.24949999%2C16%20L1.5%2C16%20C0.671572876%2C16%200%2C15.3284271%200%2C14.5%20L0%2C11%20L1.5%2C11%20L1.5%2C13.41%20L5.21873562%2C9.69278114%20Z%20M10.7898541%2C9.72266777%20L14.499%2C13.431%20L14.5%2C11%20L16%2C11%20L16%2C14.5%20C16%2C15.3284271%2015.3284271%2C16%2014.5%2C16%20L10.7495%2C16%20L10.7495%2C14.5%20L13.446%2C14.5%20L9.71904783%2C10.7731819%20L10.7898541%2C9.72266777%20Z%20M14.5%2C0%20C15.3284271%2C0%2016%2C0.671572876%2016%2C1.5%20L16%2C5%20L14.5%2C5%20L14.499%2C2.588%20L10.779708%2C6.3074783%20L9.71904783%2C5.24681813%20L13.465%2C1.5%20L10.75%2C1.5%20L10.75%2C0%20L14.5%2C0%20Z%20M5.25000001%2C0%20L5.25000001%2C1.5%20L2.567%2C1.5%20L6.31400442%2C5.24681813%20L5.25334424%2C6.3074783%20L1.5%2C2.554%20L1.5%2C5%20L0%2C5%20L0%2C1.5%20C0%2C0.671572876%200.671572876%2C0%201.5%2C0%20L5.25000001%2C0%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
@@ -13945,7 +14125,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem('commonInfo')) || {},
+    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem(getCommonInfoKey())) || {},
       _ref3$hideRouteArray = _ref3.hideRouteArray,
       hideRouteArray = _ref3$hideRouteArray === void 0 ? [] : _ref3$hideRouteArray;
     var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap) || getDetailMatchRoute("".concat(basePath).concat(pathname), breadcrumbNameMap, hideRouteArray, {
@@ -14099,7 +14279,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   return true;
 });
 
-var css_248z$e = ".home_page_head {\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 10px 20px;\n}\n.home_page_head .home_page_title_wrapper {\n  display: flex;\n  align-items: center;\n}\n.home_page_head .home_page_title {\n  height: 20px;\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 16px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  flex-grow: 1;\n  margin-top: 2px;\n  padding-right: 10px;\n}\n.home_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.home_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.home_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  line-height: 16px;\n  cursor: pointer;\n}\n";
+var css_248z$e = ".home_page_head {\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 10px 20px;\n}\n.home_page_head .home_page_title_wrapper {\n  display: flex;\n  align-items: center;\n}\n.home_page_head .home_page_title {\n  height: 20px;\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 16px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  flex-grow: 1;\n  padding-right: 10px;\n}\n.home_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.home_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.home_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  line-height: 16px;\n  cursor: pointer;\n}\n";
 styleInject(css_248z$e);
 
 var _excluded$d = ["children"];
@@ -14549,7 +14729,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     }];
     _this.showModal = function () {
       _this.setState({
-        visible: true
+        visible: true,
+        onSearchSort: false
       });
       _this.setInitValue();
     };
@@ -14691,7 +14872,48 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       _this.setInitValue(true);
     };
     _this.handleResetSetting = function () {
-      _this.patchUserColumnConfig('');
+      var _this$props3 = _this.props,
+        setShowColumns = _this$props3.setShowColumns,
+        _this$props3$datasour = _this$props3.datasource,
+        setInitialTableInfo = _this$props3.setInitialTableInfo,
+        appRequestConfig = _this$props3.appRequestConfig;
+      var that = _this;
+      var bsTableCode = _this.state.bsTableCode;
+      return new Promise(function (resolve, reject) {
+        requestUtil({
+          url: handleRequestUrl('/user', '/appConfig/saveUserOrder', appRequestConfig),
+          method: 'POST',
+          data: {
+            code: that.state.bsTableCode,
+            detail: ''
+          }
+        }).then(function (res) {
+          if (judgeIsRequestSuccess(res === null || res === void 0 ? void 0 : res.data)) {
+            var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+            var configArray = JSON.parse(config);
+            var currentSetting = configArray.filter(function (item) {
+              return item.code === bsTableCode;
+            });
+            if (currentSetting.length) {
+              currentSetting[0].detail = JSON.stringify([]);
+            } else {
+              configArray.push({
+                code: bsTableCode,
+                detail: JSON.stringify([])
+              });
+            }
+            localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray));
+            antd.message.success('重置表头列成功！');
+            setInitialTableInfo(true);
+            _this.setState({
+              visible: false
+            });
+          } else {
+            antd.message.error('重置表头列自定义失败，请稍后尝试');
+            reject('');
+          }
+        });
+      });
     };
     _this.onSearch = function (e) {
       _this.setState({
@@ -14709,10 +14931,10 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
   return _createClass(SortableTable, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props3 = this.props,
-        datasource = _this$props3.datasource,
-        showColumn = _this$props3.showColumn,
-        bsTableCode = _this$props3.bsTableCode;
+      var _this$props4 = this.props,
+        datasource = _this$props4.datasource,
+        showColumn = _this$props4.showColumn,
+        bsTableCode = _this$props4.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
@@ -14925,10 +15147,14 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
         pagination: false,
         showHeader: false,
-        dataSource: onSearchSort ? sortDataSource.filter(function (item) {
+        dataSource: (onSearchSort ? sortDataSource.filter(function (item) {
           var _renderToString2;
           return ((_renderToString2 = renderToString(item === null || item === void 0 ? void 0 : item.title)) === null || _renderToString2 === void 0 ? void 0 : _renderToString2.indexOf(onSearchSort)) > -1;
-        }) : sortDataSource,
+        }) : sortDataSource).map(function (item) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            key: item.key || item.dataIndex
+          });
+        }),
         columns: this.columns,
         rowKey: "key",
         // rowSelection={rowSelection}
@@ -15500,12 +15726,12 @@ var BsSulaQueryTable = (function (props) {
     return [];
   };
   /**
-  * 根据保存的配置和原始配置，获取设置的字段或列。
-  * @param savedConfig 保存的配置数组，可能包含字段或列的配置。
-  * @param originConfig 原始配置数组，包含完整的字段或列信息。
-  * @param type 字段或列的类型，用于确定配置的属性。
-  * @returns 返回根据保存的配置处理后的字段或列数组，如果未保存任何配置，则返回原始配置。
-  */
+   * 根据保存的配置和原始配置，获取设置的字段或列。
+   * @param savedConfig 保存的配置数组，可能包含字段或列的配置。
+   * @param originConfig 原始配置数组，包含完整的字段或列信息。
+   * @param type 字段或列的类型，用于确定配置的属性。
+   * @returns 返回根据保存的配置处理后的字段或列数组，如果未保存任何配置，则返回原始配置。
+   */
   var getSettingFieldOrColumn = function getSettingFieldOrColumn(savedConfig, originConfig, type) {
     /**
      * 判断值是否为字符串数组。
@@ -15582,28 +15808,15 @@ var BsSulaQueryTable = (function (props) {
     _useState10 = _slicedToArray(_useState9, 2),
     showExportColumn = _useState10[0],
     setShowExportColumns = _useState10[1]; // 导出列字段
-  var _useState11 = React$1.useState('100vh'),
+  var _useState11 = React$1.useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
     height = _useState12[0],
     setHeight = _useState12[1];
   var sortTableRef = React$1.useRef(null);
   var searchTableRef = React$1.useRef(null);
   var exportTableRef = React$1.useRef(null);
+  var queryTableRef = React$1.useRef(null);
   var bsTableCodeExport = "".concat(bsTableCode, "___Export"); //设置导出列字段的唯一标识
-  // 获取table高度
-  var getTableHeight = function getTableHeight() {
-    setTimeout(function () {
-      var _window$top, _document$querySelect, _document$querySelect2, _document$querySelect3, _document$querySelect4;
-      var cancelHeight = window.top == window ? 303 : 223;
-      var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
-      // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
-      var realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : ((_window$top = window.top) === null || _window$top === void 0 ? void 0 : _window$top.document.body.clientHeight) - 76;
-      var summaryHeight = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary") ? ((_document$querySelect = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 22 : 0;
-      var listTabHeight = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav") ? ((_document$querySelect2 = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav")) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 48 : 0;
-      var h = realIframeClientHeight - summaryHeight - listTabHeight - (((_document$querySelect3 = document.querySelector(".ant-tabs-tabpane-active .ant-form ant-form-horizontal")) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight) || 0) - (isFullScreen ? 0 : ((_document$querySelect4 = document.querySelector(".ant-tabs-tabpane-active .ant-pro-page-container-warp")) === null || _document$querySelect4 === void 0 ? void 0 : _document$querySelect4.clientHeight) || 0) - cancelHeight + 'px';
-      setHeight(h);
-    }, 0);
-  };
   //监测是否按下esc键
   function checkFull() {
     var _window, _window$parent;
@@ -15612,7 +15825,7 @@ var BsSulaQueryTable = (function (props) {
     if (isFull == undefined) isFull = false;
     return isFull;
   }
-  var setInitialTableInfo = function setInitialTableInfo() {
+  var setInitialTableInfo = function setInitialTableInfo(isReset) {
     var resourceCodeArray = {};
     var uuIdList = [];
     if (props.actionsRender && props.actionsRender.length) {
@@ -15670,7 +15883,7 @@ var BsSulaQueryTable = (function (props) {
       var parsedWidth = parseInt(widthStr.replace('px', ''));
       return isNaN(parsedWidth) ? 0 : parsedWidth;
     };
-    var showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
+    var showColumns = getSettingFieldOrColumn(isReset ? [] : columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -15706,7 +15919,7 @@ var BsSulaQueryTable = (function (props) {
   };
   //组件初始挂载
   React$1.useEffect(function () {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
@@ -15740,7 +15953,7 @@ var BsSulaQueryTable = (function (props) {
     setInitialTableInfo();
   }, [props === null || props === void 0 ? void 0 : props.refreshColumns]);
   var watchWinResize = _.debounce(function () {
-    getTableHeight();
+    // getTableHeight();
     if (!checkFull()) {
       // addTabsNavStyle(true);
       // 全屏下按键esc后要执行的动作
@@ -15767,7 +15980,7 @@ var BsSulaQueryTable = (function (props) {
   };
   // 处理 table 基本参数
   var setTableProps = function setTableProps() {
-    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps2$initialP;
+    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps3, _tableProps3$initialP;
     var tableProps = value.tableProps || {};
     tableProps = _objectSpread2(_objectSpread2({}, tableProps), {}, {
       size: value.size || 'middle',
@@ -15795,14 +16008,14 @@ var BsSulaQueryTable = (function (props) {
       rowClassName: function rowClassName(record, index) {
         return index % 2 === 0 ? 'table_base' : 'table_odd';
       },
-      components: {
+      components: _objectSpread2({
         header: {
           cell: ResizeableTitle$2
         }
-      }
+      }, (_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : _tableProps2.components)
     });
     // @ts-ignore
-    if ((_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : (_tableProps2$initialP = _tableProps2.initialPaging) === null || _tableProps2$initialP === void 0 ? void 0 : _tableProps2$initialP.pagination) {
+    if ((_tableProps3 = tableProps) === null || _tableProps3 === void 0 ? void 0 : (_tableProps3$initialP = _tableProps3.initialPaging) === null || _tableProps3$initialP === void 0 ? void 0 : _tableProps3$initialP.pagination) {
       // @ts-ignore
       tableProps.initialPaging.pagination.showSizeChanger = true;
     }
@@ -16060,23 +16273,24 @@ var BsSulaQueryTable = (function (props) {
     return _objectSpread2(_objectSpread2({}, config), {}, {
       summary: props.summary,
       summaryList: props.summaryList ? getTableSummaryInfo : undefined,
-      statusMapping: props.statusMapping
+      statusMapping: props.statusMapping,
+      isBsSulaQueryTable: true
     });
-  }, [
-  // value,
-  checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys]);
+  }, [checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     id: "bs-sula-query-table"
   }, /*#__PURE__*/React__default['default'].createElement(MemoQueryTable, _objectSpread2({}, memoConfig)), /*#__PURE__*/React__default['default'].createElement(SortableTable$1, {
     ref: sortTableRef,
     setShowColumns: setShowColumns,
     showColumn: showColumn,
+    setInitialTableInfo: setInitialTableInfo,
     datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
     bsTableCode: bsTableCode,
     onlyModal: true
   }), (value === null || value === void 0 ? void 0 : (_value$exportConfig7 = value.exportConfig) === null || _value$exportConfig7 === void 0 ? void 0 : _value$exportConfig7.settingColumns) && ( /*#__PURE__*/React__default['default'].createElement(SortableTable$1, {
     ref: exportTableRef,
     setShowColumns: setShowExportColumns,
+    setInitialTableInfo: setInitialTableInfo,
     showColumn: showExportColumn,
     datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
     bsTableCode: bsTableCodeExport,
@@ -16341,7 +16555,7 @@ var AllFunc = function AllFunc(props) {
   })))));
 };
 
-var css_248z$i = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.right .action {\n  display: flex;\n  align-items: center;\n  height: 48px;\n  padding: 0 12px;\n  cursor: pointer;\n  transition: all 0.3s;\n}\n.right .action > span {\n  vertical-align: middle;\n}\n.right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .search {\n  padding: 0 12px;\n}\n.right .search:hover {\n  background: transparent;\n}\n.right .account .avatar {\n  margin-right: 8px;\n  color: #1890ff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.dark .action:hover {\n  background: #252a3d;\n}\n.dark .action .opened {\n  background: #252a3d;\n}\n.warp_allfunc {\n  z-index: 100;\n}\n.warp_allfunc .drawerWarp {\n  -moz-column-count: 4;\n       column-count: 4;\n}\n.warp_allfunc .drawer_header_warp .ant-list-header {\n  padding: 0 0 0 10px !important;\n  line-height: 40px;\n  border: 0px !important;\n}\n.warp_allfunc .drawer_header_warp .ant-list-header b {\n  width: 100%;\n  display: inline-block;\n  border-bottom: 1px solid #f0f0f0;\n}\n.warp_allfunc .drawer_header_warp .ant-list-item {\n  padding: 0 0 0 10px !important;\n  line-height: 30px !important;\n}\n.warp_allfunc .drawer_header_warp .ant-drawer-close {\n  position: absolute;\n  right: 0;\n}\n.warp_allfunc .p {\n  color: #b1bad4;\n  font-weight: 400;\n  font-size: 12px;\n  margin-bottom: 10px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 16px;\n  text-align: left;\n  opacity: 0.8;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n  text-align: center;\n  margin-left: 8px;\n}\n.warp_allfunc .btn {\n  display: flex;\n  align-items: center;\n  height: 44px;\n  color: #b1bad4;\n  background: #10234c;\n  border-radius: 8px;\n  width: 130px;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n}\n.warp_allfunc .btn:hover,\n.warp_allfunc .btnSpan1:hover,\n.warp_allfunc .btnSpan2:hover {\n  cursor: pointer;\n  color: #b1bad4;\n}\n.warp_allfunc .btnSpan1 {\n  margin: 0 7px;\n}\n.allfunc_drawcontent .allFunsList {\n  margin-bottom: 10px;\n}\n.allfunc_drawcontent .allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.allfunc_drawcontent .drawerWarp_p {\n  color: #8c8c8c;\n  font-weight: 400;\n  font-size: 14px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 20px;\n  text-align: left;\n}\n";
+var css_248z$i = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.right .action {\n  display: flex;\n  align-items: center;\n  height: 48px;\n  padding: 0 12px;\n  cursor: pointer;\n  transition: all 0.3s;\n}\n.right .action > span {\n  vertical-align: middle;\n}\n.right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .search {\n  padding: 0 12px;\n}\n.right .search:hover {\n  background: transparent;\n}\n.right .account .avatar {\n  margin-right: 8px;\n  color: #005cff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.dark .action:hover {\n  background: #252a3d;\n}\n.dark .action .opened {\n  background: #252a3d;\n}\n.warp_allfunc {\n  z-index: 100;\n}\n.warp_allfunc .drawerWarp {\n  -moz-column-count: 4;\n       column-count: 4;\n}\n.warp_allfunc .drawer_header_warp .ant-list-header {\n  padding: 0 0 0 10px !important;\n  line-height: 40px;\n  border: 0px !important;\n}\n.warp_allfunc .drawer_header_warp .ant-list-header b {\n  width: 100%;\n  display: inline-block;\n  border-bottom: 1px solid #f0f0f0;\n}\n.warp_allfunc .drawer_header_warp .ant-list-item {\n  padding: 0 0 0 10px !important;\n  line-height: 30px !important;\n}\n.warp_allfunc .drawer_header_warp .ant-drawer-close {\n  position: absolute;\n  right: 0;\n}\n.warp_allfunc .p {\n  color: #b1bad4;\n  font-weight: 400;\n  font-size: 12px;\n  margin-bottom: 10px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 16px;\n  text-align: left;\n  opacity: 0.8;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n  text-align: center;\n  margin-left: 8px;\n}\n.warp_allfunc .btn {\n  display: flex;\n  align-items: center;\n  height: 44px;\n  color: #b1bad4;\n  background: #10234c;\n  border-radius: 8px;\n  width: 130px;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n}\n.warp_allfunc .btn:hover,\n.warp_allfunc .btnSpan1:hover,\n.warp_allfunc .btnSpan2:hover {\n  cursor: pointer;\n  color: #b1bad4;\n}\n.warp_allfunc .btnSpan1 {\n  margin: 0 7px;\n}\n.allfunc_drawcontent .allFunsList {\n  margin-bottom: 10px;\n}\n.allfunc_drawcontent .allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.allfunc_drawcontent .drawerWarp_p {\n  color: #8c8c8c;\n  font-weight: 400;\n  font-size: 14px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 20px;\n  text-align: left;\n}\n";
 styleInject(css_248z$i);
 
 var allfunc = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2224px%22%20height%3D%2224px%22%20viewBox%3D%220%200%2024%2024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3Eicon%3C%2Ftitle%3E%20%20%20%20%3Cdefs%3E%20%20%20%20%20%20%20%20%3Crect%20id%3D%22path-1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2224%22%20height%3D%2224%22%3E%3C%2Frect%3E%20%20%20%20%3C%2Fdefs%3E%20%20%20%20%3Cg%20id%3D%22%E5%85%A8%E5%B1%80%E5%AF%BC%E8%88%AA%E7%9B%B8%E5%85%B3%E5%8A%9F%E8%83%BD%E9%9C%80%E6%B1%82%E8%AE%BE%E8%AE%A1%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E8%87%AA%E5%AE%9A%E4%B9%89%E5%B7%A6%E4%BE%A7%E8%8F%9C%E5%8D%95%22%20transform%3D%22translate%28-20.000000%2C%20-1016.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%BC%96%E7%BB%84-6%22%20transform%3D%22translate%280.000000%2C%2060.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%BC%96%E7%BB%84-5%E5%A4%87%E4%BB%BD%22%20transform%3D%22translate%280.000000%2C%20900.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%9F%A5%E7%9C%8B%E5%85%A8%E9%83%A8%E5%8A%9F%E8%83%BD%22%20transform%3D%22translate%2810.000000%2C%2046.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22icon%22%20transform%3D%22translate%2810.000000%2C%2010.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmask%20id%3D%22mask-2%22%20fill%3D%22white%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fmask%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20id%3D%22navigation-icon-allfunctions%22%20fill%3D%22%23D8D8D8%22%20opacity%3D%220%22%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22category%22%20mask%3D%22url%28%23mask-2%29%22%20fill%3D%22%23B1BAD4%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20transform%3D%22translate%283.000000%2C%205.000000%29%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M2.24999999%2C12.3585414%20L2.24999999%2C14%20L0%2C14%20L0%2C12.3585414%20L2.24999999%2C12.3585414%20Z%20M18%2C12.3585414%20L18%2C14%20L3.375%2C14%20L3.375%2C12.3585414%20L18%2C12.3585414%20Z%20M2.24999999%2C6.17954431%20L2.24999999%2C7.82100286%20L0%2C7.82100286%20L0%2C6.17954431%20L2.24999999%2C6.17954431%20L2.24999999%2C6.17954431%20Z%20M18%2C6.17954431%20L18%2C7.82100286%20L3.375%2C7.82100286%20L3.375%2C6.17954431%20L18%2C6.17954431%20L18%2C6.17954431%20Z%20M2.24999999%2C0%20L2.24999999%2C1.64145855%20L0%2C1.64145855%20L0%2C0%20L2.24999999%2C0%20L2.24999999%2C0%20Z%20M18%2C0%20L18%2C1.64145855%20L3.375%2C1.64145855%20L3.375%2C0%20L18%2C0%20L18%2C0%20Z%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
@@ -17160,7 +17374,7 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
       var afterStr = newName.substr(index + keyWord.length);
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("span", null, beforeStr), /*#__PURE__*/React__default['default'].createElement("span", {
         style: {
-          color: '#1890ff'
+          color: '#005cff'
         }
       }, keyWord), /*#__PURE__*/React__default['default'].createElement("span", null, afterStr));
     }
@@ -18003,7 +18217,7 @@ var CustomerMenu = /*#__PURE__*/React$1.forwardRef(function (_ref, ref) {
   })));
 });
 
-var css_248z$n = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.right .action {\n  display: flex;\n  align-items: center;\n  height: 48px;\n  padding: 0 12px;\n  cursor: pointer;\n  transition: all 0.3s;\n}\n.right .action > span {\n  vertical-align: middle;\n}\n.right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .search {\n  padding: 0 12px;\n}\n.right .search:hover {\n  background: transparent;\n}\n.right .account .avatar {\n  margin-right: 8px;\n  color: #1890ff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.dark .action:hover {\n  background: #252a3d;\n}\n.dark .action .opened {\n  background: #252a3d;\n}\n.global_menu_draw_content {\n  display: flex;\n  height: 100%;\n}\n.global_menu_draw_content .allFunsList {\n  margin-bottom: 10px;\n}\n.global_menu_draw_content .drawerWarp_left {\n  width: 150px;\n  height: 100%;\n  flex-shrink: 0;\n  border-right: 1px solid #f0f0f0;\n}\n.global_menu_draw_content .drawerWarp_left .left_item_title {\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 12px;\n  color: #8c8c8c;\n  letter-spacing: 0;\n  line-height: 20px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  margin: 20px 0px;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_left .left_item {\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  cursor: pointer;\n  margin: 20px 0px;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_left .left_item:hover {\n  color: #1890ff !important;\n}\n.global_menu_draw_content .drawerWarp_right {\n  -moz-column-count: 4;\n       column-count: 4;\n  flex-grow: 1;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-header {\n  padding: 0 0 0 10px !important;\n  line-height: 30px;\n  border: 0px !important;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-header b {\n  width: 100%;\n  box-sizing: border-box;\n  display: inline-block;\n  border-bottom: 1px solid #f0f0f0;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-item {\n  padding: 0 0 0 10px !important;\n  line-height: 30px !important;\n}\n.global_menu_draw_content .drawerWarp_right .ant-drawer-close {\n  position: absolute;\n  right: 0;\n}\n.global_menu_draw_content .search_menu_content {\n  flex-grow: 1;\n  display: flex;\n  flex-wrap: wrap;\n  background-color: #ffffff;\n}\n.global_menu_draw_content .search_menu_content div {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  padding: 8px 20px;\n  font-size: 14px;\n  font-weight: 400;\n  color: #000000;\n  background: #f8f9fa;\n  border-radius: 100px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n}\n.global_menu_draw_content .search_menu_content div:hover {\n  cursor: pointer;\n}\n.global_menu_draw_content .allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.global_menu_draw_content .choosedStyle .ant-list-header {\n  background-color: #005CFF;\n  opacity: 0.8;\n}\n.global_menu_draw_content .choosedStyle .ant-list-header b {\n  border-bottom: 1px solid #005CFF;\n}\n";
+var css_248z$n = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.right .action {\n  display: flex;\n  align-items: center;\n  height: 48px;\n  padding: 0 12px;\n  cursor: pointer;\n  transition: all 0.3s;\n}\n.right .action > span {\n  vertical-align: middle;\n}\n.right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.right .search {\n  padding: 0 12px;\n}\n.right .search:hover {\n  background: transparent;\n}\n.right .account .avatar {\n  margin-right: 8px;\n  color: #005cff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.dark .action:hover {\n  background: #252a3d;\n}\n.dark .action .opened {\n  background: #252a3d;\n}\n.global_menu_draw_content {\n  display: flex;\n  height: 100%;\n}\n.global_menu_draw_content .allFunsList {\n  margin-bottom: 10px;\n}\n.global_menu_draw_content .drawerWarp_left {\n  width: 150px;\n  height: 100%;\n  flex-shrink: 0;\n  border-right: 1px solid #f0f0f0;\n}\n.global_menu_draw_content .drawerWarp_left .left_item_title {\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 12px;\n  color: #8c8c8c;\n  letter-spacing: 0;\n  line-height: 20px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  margin: 20px 0px;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_left .left_item {\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  cursor: pointer;\n  margin: 20px 0px;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_left .left_item:hover {\n  color: #005cff !important;\n}\n.global_menu_draw_content .drawerWarp_right {\n  -moz-column-count: 4;\n       column-count: 4;\n  flex-grow: 1;\n  padding-left: 10px;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-header {\n  padding: 0 0 0 10px !important;\n  line-height: 30px;\n  border: 0px !important;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-header b {\n  width: 100%;\n  box-sizing: border-box;\n  display: inline-block;\n  border-bottom: 1px solid #f0f0f0;\n}\n.global_menu_draw_content .drawerWarp_right .ant-list-item {\n  padding: 0 0 0 10px !important;\n  line-height: 30px !important;\n}\n.global_menu_draw_content .drawerWarp_right .ant-drawer-close {\n  position: absolute;\n  right: 0;\n}\n.global_menu_draw_content .search_menu_content {\n  flex-grow: 1;\n  display: flex;\n  flex-wrap: wrap;\n  background-color: #ffffff;\n}\n.global_menu_draw_content .search_menu_content div {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  padding: 8px 20px;\n  font-size: 14px;\n  font-weight: 400;\n  color: #000000;\n  background: #f8f9fa;\n  border-radius: 100px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n}\n.global_menu_draw_content .search_menu_content div:hover {\n  cursor: pointer;\n}\n.global_menu_draw_content .allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.global_menu_draw_content .choosedStyle .ant-list-header {\n  background-color: #005CFF;\n  opacity: 0.8;\n}\n.global_menu_draw_content .choosedStyle .ant-list-header b {\n  border-bottom: 1px solid #005CFF;\n}\n";
 styleInject(css_248z$n);
 
 var closeicon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAiZJREFUSEvFll1LVFEUhh/1QqjAxALrot+ggR9RQWh1UZl9kNCtv8ALf0Q3/YVuiyIqLKOUyI80RP0VXVSU+UGKF2W88q7hzPacOY4QHhiGmVn7fdZe691rTwP/+WlI9Bv9eQfQq55HWqH3NxamgOz3+q0SWEJSYpFQVWIBUIDE+oARYBj4ATQBf0rEI+Yk8Ah4CHwEdjUDoHeRnwN3gBngJrBaAgnxVmAMOA88A4aKAAp8A5wzZABYK4Dkic8CWqPEdpPO9iB20Qa8BnqBae9EkCijKhbixx2rzOeAG8CvEFdg2uRYKIh20mOIslo3RGvUlxaLXwDmgesWr+pbnovyIFPe+oYbLnHV/CLw2eIreaUssmlATngn3YAg17yL8f2I55Uo68is/VSuLuC9AZeBBQN/1nJa0Q4ClHVKuEu/fXJZihxWSbQMEM5pBlQWHUQ9E+7JduKuPWeyFiDEj7mhl2xFrdE5+WAL/64FKQJkxV858yXgqq09CXQAer8FFELyAFnxl0A/sOiaf3cN2u2usy7X7SJI3rjW0DsKSFxuUeY6RN/sFjF00ARRXzrtLkE203LljQqJvwCuAMu2YojHZA13nTJE5XrnQSlIjJ3KqIgvjlhctZa4Mv9aMuxOu1yCvAXuAlvpsAvAU+DePsTTc5KFPAHup+M6GjsIjDrgS50XzhngMfDAtq66cNIRoUYf5MqUaNUNeCiXfsUB9fylcOyetf8AAkCfGYuSNSEAAAAASUVORK5CYII=";
@@ -18168,8 +18382,8 @@ var DrawContent$1 = function DrawContent(_ref) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: 'left_item',
       style: {
-        borderLeft: currentOneLevel === item.path ? '2px solid #1890ff' : 'none',
-        color: currentOneLevel === item.path ? '#1890ff' : '#000000'
+        borderLeft: currentOneLevel === item.path ? '2px solid #005cff' : 'none',
+        color: currentOneLevel === item.path ? '#005cff' : '#000000'
       },
       onClick: function onClick(e) {
         e.stopPropagation();
@@ -18419,7 +18633,7 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
   })));
 };
 
-var css_248z$o = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
+var css_248z$o = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #005cff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
 styleInject(css_248z$o);
 
 /*
@@ -18778,14 +18992,12 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         var _dicData = [];
         _dicData = dicDataTextValue[dicCode];
         var endPerformance1 = performance.now();
-        console.log("字典方法时间花费1：", endPerformance1 - startPerformance);
-        if (value === undefined) return "- -";
+        if (value === undefined) return "-";
         if (!_dicData) {
           // throw new Error(`当前${dicCode}字典值合没有${value}的数据`)
           return value;
         }
         var endPerformance = performance.now();
-        console.log("字典方法时间花费：", endPerformance - startPerformance);
         return _dicData[value] || value;
       }
       var dicData = [];
@@ -18794,7 +19006,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         dicData = storageDic[dicCode];
       }
       if (!dicData || !dicData.length) ;
-      if (value === undefined) return '- -';
+      if (value === undefined) return '-';
       var dicItemArray = (_dicData2 = dicData) === null || _dicData2 === void 0 ? void 0 : _dicData2.filter(function (item) {
         return item.value === value.toString();
       });
@@ -18805,11 +19017,11 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return dicItemArray[0].text;
     };
     _this.timeFormat = function (timeStr, format, notNeedConvertTimeZone) {
-      if (!timeStr) return '- -';
+      if (!timeStr) return '-';
       if (notNeedConvertTimeZone) {
         return moment__default['default'](timeStr).format(format);
       }
-      return moment__default['default'](timeStr).add(8, 'hours').format(format) || '- -';
+      return moment__default['default'](timeStr).add(8, 'hours').format(format) || '-';
     };
     _this.onChange = function (key) {
       if (key !== _this.state.activeKey) {
@@ -26378,7 +26590,7 @@ function registerSuggestions(monaco) {
   });
 }
 
-var css_248z$r = ":global .si-editor-highlight {\n  background: #1990ffab;\n}\n.title {\n  color: #1890ff;\n  padding: 12px;\n  font-weight: bold;\n}\n.editorWrapper {\n  position: fixed;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  padding: 24px;\n  background-color: #fff;\n  z-index: 10000;\n}\n";
+var css_248z$r = ":global .si-editor-highlight {\n  background: #1990ffab;\n}\n.title {\n  color: #005cff;\n  padding: 12px;\n  font-weight: bold;\n}\n.editorWrapper {\n  position: fixed;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  padding: 24px;\n  background-color: #fff;\n  z-index: 10000;\n}\n";
 styleInject(css_248z$r);
 
 var Title = antd.Typography.Title;
@@ -28466,7 +28678,7 @@ var FieldsSettingsTable = (function (props) {
       title: '显示类型',
       render: function render(_ref3) {
         var text = _ref3.text;
-        return inputType[text] || '- -';
+        return inputType[text] || '-';
       },
       width: 80
     }, {
@@ -28474,7 +28686,7 @@ var FieldsSettingsTable = (function (props) {
       title: '字段类型',
       render: function render(_ref4) {
         var text = _ref4.text;
-        return valueType[text] || '- -';
+        return valueType[text] || '-';
       },
       width: 80
     }, {
@@ -29404,6 +29616,807 @@ var isObj = function isObj(object) {
 var dateFormat = 'YYYY-MM-DD';
 var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
 
+// 处理表头
+var getColumnItem = function getColumnItem(_ref) {
+  var item = _ref.item;
+  var ites = {
+    title: item.name,
+    key: item.code,
+    render: function render(_ref2) {
+      var text = _ref2.text,
+        record = _ref2.record;
+      var showText = (record === null || record === void 0 ? void 0 : record["".concat(item.code, "_Name")]) || text;
+      return showText;
+    }
+  };
+  // 处理列展示类型基础数据
+  if (item.choiceType == 20) {
+    // 数据字典
+    var dictionaryCode;
+    try {
+      if (JSON.parse(item.info || '{}').dictionaryCode) {
+        dictionaryCode = JSON.parse(item.info || '{}').dictionaryCode;
+      }
+    } catch (e) {
+      console.log('error', e);
+    }
+    ites.sourceList = dictionaryCode && getDictionarySource(dictionaryCode) || [];
+  }
+  if (item.choiceType == 10) {
+    // 自定义枚举值
+    var enumeration;
+    try {
+      if (JSON.parse(item.info || '{}').enumeration) {
+        enumeration = JSON.parse(item.info || '{}').enumeration;
+      }
+    } catch (e) {
+      console.log('error', e);
+    }
+    ites.sourceList = enumeration && Object.keys(enumeration).map(function (key) {
+      return {
+        value: key,
+        text: enumeration[key]
+      };
+    }) || [];
+  }
+  return ites;
+};
+var formatListName = function formatListName(list, columns) {
+  if (!(list === null || list === void 0 ? void 0 : list.length)) return [];
+  if (!(columns === null || columns === void 0 ? void 0 : columns.length)) return list; // 下拉框无需格式化
+  return list.map(function (item) {
+    var resultItem = _objectSpread2({}, item);
+    // 弹窗table编码展示名称
+    var column = columns.filter(function (col) {
+      var _Object$keys, _col$sourceList;
+      return ((_Object$keys = Object.keys(item)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.includes(col.key)) && (col === null || col === void 0 ? void 0 : (_col$sourceList = col.sourceList) === null || _col$sourceList === void 0 ? void 0 : _col$sourceList.length);
+    }) || [];
+    Array.isArray(column) && (column === null || column === void 0 ? void 0 : column.length) && column.forEach(function (element) {
+      if (element === null || element === void 0 ? void 0 : element.sourceList) {
+        var _element$sourceList$f;
+        resultItem["".concat(element.key, "_Name")] = element === null || element === void 0 ? void 0 : (_element$sourceList$f = element.sourceList.find(function (source) {
+          return source.value == item[element.key];
+        })) === null || _element$sourceList$f === void 0 ? void 0 : _element$sourceList$f.text;
+      }
+    });
+    return resultItem;
+  });
+};
+
+var _excluded$j = ["sorter"];
+/**
+ * 删掉查询条件的qp- 和 -eq等
+ * @param {object} data
+ * @return {object}
+ * */
+function deleteQuerySymbol(data) {
+  var result = {};
+  Object.keys(data).map(function (item) {
+    var newKey = deleteQuerySymbolSingle(item);
+    result[newKey] = data[item];
+  });
+  return result;
+}
+function deleteQuerySymbolSingle(key) {
+  return key.replace(/(qp-|-\w+)/g, '');
+}
+
+// 把{G1001F1001:123} 换成 {G1001:{F1001: 123}}
+function convertToMapByKey(data) {
+  var result = {};
+  Object.keys(data).map(function (item) {
+    var groupCode = item.match(/G\d+/);
+    var fieldCode = item.match(/F\d+/);
+    if ((groupCode === null || groupCode === void 0 ? void 0 : groupCode.length) > 0 && (fieldCode === null || fieldCode === void 0 ? void 0 : fieldCode.length) > 0) {
+      if (result[groupCode]) {
+        result[groupCode][fieldCode] = data[item];
+      } else if (!result[groupCode]) {
+        result[groupCode] = _defineProperty({}, fieldCode, data[item]);
+      }
+    }
+  });
+  return result;
+}
+
+/**
+ * 去掉查询表格的qp-eq -in，与普通表格一样的格式
+ * @param{string} prop 键
+ * @param{boolean} flag 是不是查询表格
+ * */
+function convertProp(prop, flag) {
+  var _prop$replace, _prop$replace$replace, _prop$replace$replace2, _prop$replace$replace3;
+  return flag ? prop === null || prop === void 0 ? void 0 : (_prop$replace = prop.replace(/(G\d+)/, '')) === null || _prop$replace === void 0 ? void 0 : (_prop$replace$replace = _prop$replace.replace('qp-', '')) === null || _prop$replace$replace === void 0 ? void 0 : (_prop$replace$replace2 = _prop$replace$replace.replace('-eq', '')) === null || _prop$replace$replace2 === void 0 ? void 0 : (_prop$replace$replace3 = _prop$replace$replace2.replace('-in', '')) === null || _prop$replace$replace3 === void 0 ? void 0 : _prop$replace$replace3.replace('-like', '') : prop;
+}
+// 获取元数据，是表格中列的数据来源
+function getMetaData(_x) {
+  return _getMetaData.apply(this, arguments);
+}
+
+// 获取数据
+function _getMetaData() {
+  _getMetaData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            umi.request('/basic/entityProperty/listNoPage', {
+              params: {
+                'qp-entityId-eq': id
+              }
+            }).then(function (res) {
+              resolve(res.data);
+            }).catch(function (error) {
+              console.log(error, 'error');
+              reject([]);
+            });
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getMetaData.apply(this, arguments);
+}
+var remoteFetch = function remoteFetch(requestConfig, coloumns) {
+  return {
+    url: '/basic/function/sendRequest',
+    method: 'post',
+    convertParams: function convertParams(_ref) {
+      var _requestConfig$method;
+      var params = _ref.params;
+      var sorter = params.sorter,
+        paramsTemp = _objectWithoutProperties(params, _excluded$j);
+      var queryParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestConfig.params), requestConfig.body), ___default['default'].omit(paramsTemp, ['filters', 'current'])), (paramsTemp === null || paramsTemp === void 0 ? void 0 : paramsTemp.filters) || {}), {
+        currentPage: (paramsTemp === null || paramsTemp === void 0 ? void 0 : paramsTemp.currentPage) || paramsTemp.current || 1
+      });
+
+      // 清除值为空的
+      Object.keys(queryParams).forEach(function (itemKey) {
+        if (judgeIsEmpty(queryParams[itemKey])) {
+          delete queryParams[itemKey];
+        }
+      });
+      return {
+        path: requestConfig.url,
+        httpMethod: requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$method = requestConfig.method) === null || _requestConfig$method === void 0 ? void 0 : _requestConfig$method.toUpperCase(),
+        serviceName: requestConfig.serviceName,
+        requestBody: JSON.stringify(queryParams),
+        header: handleRequestHeader().headers
+      };
+    },
+    converter: function converter(_ref2) {
+      var data = _ref2.data;
+      return _objectSpread2({}, handleConvertResponse(handleList(data, coloumns), handleListToTal(data)));
+    }
+  };
+};
+function handleList(data, coloumns) {
+  var resultList = Array.isArray(data) ? data : Array.isArray(data === null || data === void 0 ? void 0 : data.list) ? data.list : Array.isArray(data === null || data === void 0 ? void 0 : data.items) ? data.items : [];
+  return formatListName(resultList, coloumns);
+}
+function handleListToTal(data) {
+  return Array.isArray(data) ? data.length : data.total || data.totalCount;
+}
+
+// 路径
+function convertPath(path, formData) {
+  var matchedGF = path.match(/G\d+F\d+/g);
+  var matchedJavaCode = path.match(/{\w+\.\w+}/g);
+  var url = path;
+  if (!matchedGF && !matchedJavaCode) return url;
+  if (matchedGF === null || matchedGF === void 0 ? void 0 : matchedGF.length) {
+    matchedGF.map(function (item) {
+      var _formData$group;
+      var group = item.match(/G\d+/);
+      var field = item.match(/F\d+/);
+      var replaceValue = (formData === null || formData === void 0 ? void 0 : (_formData$group = formData[group]) === null || _formData$group === void 0 ? void 0 : _formData$group[field]) || (formData === null || formData === void 0 ? void 0 : formData[field]);
+      url = url.replace(item, replaceValue);
+    });
+  } else if (matchedJavaCode === null || matchedJavaCode === void 0 ? void 0 : matchedJavaCode.length) {
+    matchedJavaCode.map(function (item) {
+      var group, field;
+      try {
+        var val = item.replace(/[{}]/g, '').split('.');
+        group = val[0];
+        field = val[1];
+      } catch (e) {}
+      if (group && field) {
+        var _formData$group2;
+        var replaceValue = (formData === null || formData === void 0 ? void 0 : (_formData$group2 = formData[group]) === null || _formData$group2 === void 0 ? void 0 : _formData$group2[field]) || (formData === null || formData === void 0 ? void 0 : formData[field]);
+        url = url.replace(item, replaceValue);
+      }
+    });
+  }
+  return url;
+}
+
+// 组装数据接口请求
+function assembleRequest(customSelectorConfig, _ref3) {
+  var _customSelectorConfig, _customSelectorConfig2, _customSelectorConfig3;
+  var isSearchForm = _ref3.isSearchForm,
+    newestFormData = _ref3.newestFormData,
+    searchFormData = _ref3.searchFormData;
+  var functionInfo = customSelectorConfig === null || customSelectorConfig === void 0 ? void 0 : (_customSelectorConfig = customSelectorConfig.businessFunction) === null || _customSelectorConfig === void 0 ? void 0 : (_customSelectorConfig2 = _customSelectorConfig.functionInfo) === null || _customSelectorConfig2 === void 0 ? void 0 : (_customSelectorConfig3 = _customSelectorConfig2.actionList) === null || _customSelectorConfig3 === void 0 ? void 0 : _customSelectorConfig3[0];
+  var requestTemplate = functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.requestTemplate;
+  if (!functionInfo || !requestTemplate) {
+    return false;
+  }
+  var isGet = requestTemplate.method.toLowerCase() === 'get';
+  var requestBodyName = isGet ? 'params' : 'data';
+  var params = requestTemplate.param;
+  try {
+    params = JSON.parse(requestTemplate.param);
+  } catch (e) {}
+  var path = requestTemplate.path;
+  var requestBody = isGet ? params : requestTemplate.requestBody;
+  if (!isSearchForm) {
+    // 非查询表格，普通表格的数据组装
+    path = convertPath(requestTemplate.path, newestFormData);
+    requestBody = convertBody(requestBody, newestFormData);
+  } else if (isSearchForm) {
+    // 查询表格数据组装，key会带有qp-  和 -eq，并且转换成map的数据格式
+    var newSearchFormData = convertToMapByKey(deleteQuerySymbol(searchFormData));
+    path = convertPath(requestTemplate.path, newSearchFormData);
+    requestBody = convertBody(requestBody, newSearchFormData);
+  }
+  var requestConfig = _defineProperty(_defineProperty({
+    url: path,
+    method: requestTemplate.method,
+    headers: requestTemplate.header
+  }, requestBodyName, requestBody), "serviceName", functionInfo.serviceName || (requestTemplate === null || requestTemplate === void 0 ? void 0 : requestTemplate.serviceName));
+  return requestConfig;
+}
+
+// 请求体
+function convertBody(param, formData) {
+  var keys = Object.keys(param || {});
+  if (!keys.length) return {};
+  var result = {};
+  keys.map(function (key) {
+    var _param$key$match, _param$key$match2;
+    var matchedGF = (_param$key$match = param[key].match(/G\d+F\d+/)) === null || _param$key$match === void 0 ? void 0 : _param$key$match[0];
+    var matchedJavaCode = (_param$key$match2 = param[key].match(/{\w+\.\w+}/)) === null || _param$key$match2 === void 0 ? void 0 : _param$key$match2[0];
+    if (matchedGF) {
+      var _formData$group3;
+      var group = matchedGF.match(/G\d+/);
+      var field = matchedGF.match(/F\d+/);
+      // 有值才赋值 【当formData中的值key是GxxxFxxx形式时】
+      if ((formData === null || formData === void 0 ? void 0 : (_formData$group3 = formData[group]) === null || _formData$group3 === void 0 ? void 0 : _formData$group3[field]) && formData[group][field] !== '') {
+        if (Array.isArray(formData[group][field])) {
+          result[key] = formData[group][field].join(',');
+        } else {
+          result[key] = formData[group][field];
+        }
+      }
+      // 有值才赋值 【当formData中的值key是Fxxx形式时】
+      if ((formData === null || formData === void 0 ? void 0 : formData[field]) && formData[field] !== '') {
+        if (Array.isArray(formData[field])) {
+          result[key] = formData[field].join(',');
+        } else {
+          result[key] = formData[field];
+        }
+      }
+    } else if (matchedJavaCode) {
+      var _formData$_group;
+      var _group, _field;
+      try {
+        var _matchedJavaCode$repl = matchedJavaCode.replace(/[{}]/g).split('.');
+        var _matchedJavaCode$repl2 = _slicedToArray(_matchedJavaCode$repl, 2);
+        _group = _matchedJavaCode$repl2[0];
+        _field = _matchedJavaCode$repl2[1];
+      } catch (e) {}
+      if ((formData === null || formData === void 0 ? void 0 : (_formData$_group = formData[_group]) === null || _formData$_group === void 0 ? void 0 : _formData$_group[_field]) && formData[_group][_field] !== '') {
+        if (Array.isArray(formData[_group][_field])) {
+          result[key] = formData[_group][_field].join(',');
+        } else {
+          result[key] = formData[_group][_field];
+        }
+      }
+    } else {
+      if (param[key] !== '') {
+        result[key] = param[key];
+      }
+    }
+  });
+  return result;
+}
+
+var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
+  var _props$ctx, _props$ctx2, _props$ctx2$form, _Object$keys, _Object$keys2, _props$ctx3, _props$customSelector3, _props$customSelector4, _props$customSelector5, _ref3, _fieldMappingItem$cod, _props$selectProps4;
+  React$1.useImperativeHandle(ref, function () {
+    return {
+      handleOk: handleOk,
+      refreshSelectSource: refreshSelectSource
+    };
+  });
+  var prop = convertProp(props === null || props === void 0 ? void 0 : (_props$ctx = props.ctx) === null || _props$ctx === void 0 ? void 0 : _props$ctx.name, props.isSearchForm);
+  var newFormData = (props === null || props === void 0 ? void 0 : (_props$ctx2 = props.ctx) === null || _props$ctx2 === void 0 ? void 0 : (_props$ctx2$form = _props$ctx2.form) === null || _props$ctx2$form === void 0 ? void 0 : _props$ctx2$form.getFieldsValue()) || {};
+  var newestFormData = newFormData && ((_Object$keys = Object.keys(newFormData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? newFormData : (props === null || props === void 0 ? void 0 : props.formData) || {}; // 最新的formData，用来下面监听最新值的改变，做级联效果
+  var searchFormData = newFormData && ((_Object$keys2 = Object.keys(newFormData)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) ? newFormData : (props === null || props === void 0 ? void 0 : props.formData) || {}; // 如果是表格上面的查询表单情况
+  var isView = (props === null || props === void 0 ? void 0 : (_props$ctx3 = props.ctx) === null || _props$ctx3 === void 0 ? void 0 : _props$ctx3.mode) == 'view';
+  var queryTableRef = React$1.useRef(null);
+  var _useState = React$1.useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    requestConfig = _useState2[0],
+    setRequestConfig = _useState2[1];
+  var _useState3 = React$1.useState({
+      pages: {
+        page: 1,
+        limit: 20,
+        total: 0
+      },
+      columns: [],
+      fields: [],
+      dataList: [],
+      currentQuery: {},
+      selectedLine: {}
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tableState = _useState4[0],
+    setTableState = _useState4[1];
+  var handleOpen = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _props$customSelector, _props$customSelector2, _props$ctx4, _props$value, _props$value$map, _props$ctx5, _props$ctx5$form, _props$selectProps;
+      var requestConfigNew, metaDataId, metaData, realMetaData, columns, fields, initValue, _queryTableRef$curren, _queryTableRef$curren2, _queryTableRef$curren3;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            requestConfigNew = assembleRequest(props.customSelectorConfig, {
+              isSearchForm: props.isSearchForm,
+              newestFormData: newestFormData,
+              searchFormData: searchFormData
+            });
+            if (requestConfigNew) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            metaDataId = (_props$customSelector = props.customSelectorConfig) === null || _props$customSelector === void 0 ? void 0 : (_props$customSelector2 = _props$customSelector.targetMetaData) === null || _props$customSelector2 === void 0 ? void 0 : _props$customSelector2.id;
+            _context.next = 6;
+            return getMetaData(metaDataId);
+          case 6:
+            metaData = _context.sent;
+            realMetaData = (metaData === null || metaData === void 0 ? void 0 : metaData.filter(function (item) {
+              return (item === null || item === void 0 ? void 0 : item.inputType) != 1;
+            })) || [];
+            columns = realMetaData.map(function (item) {
+              return getColumnItem({
+                item: item,
+                props: props
+              });
+            }); // tableState.columns = columns
+            fields = realMetaData === null || realMetaData === void 0 ? void 0 : realMetaData.filter(function (item) {
+              var _item$infoVo;
+              return (_item$infoVo = item.infoVo) === null || _item$infoVo === void 0 ? void 0 : _item$infoVo.isQuery;
+            }).map(function (item) {
+              var name = "qp-".concat(item.code, "-eq");
+              try {
+                if (JSON.parse(item.info).isLikeQuery) {
+                  name = "qp-".concat(item.code, "-like");
+                }
+              } catch (e) {
+                console.log('error', e);
+              }
+              return {
+                name: name,
+                label: item.name,
+                field: 'input'
+              };
+            });
+            setTableState(_objectSpread2(_objectSpread2({}, tableState), {}, {
+              columns: columns,
+              fields: fields
+            }));
+            setRequestConfig(requestConfigNew);
+            initValue = !(props === null || props === void 0 ? void 0 : (_props$ctx4 = props.ctx) === null || _props$ctx4 === void 0 ? void 0 : _props$ctx4.form) && (props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : (_props$value$map = _props$value.map) === null || _props$value$map === void 0 ? void 0 : _props$value$map.call(_props$value, function (v) {
+              return v.key || v;
+            })) || (props === null || props === void 0 ? void 0 : (_props$ctx5 = props.ctx) === null || _props$ctx5 === void 0 ? void 0 : (_props$ctx5$form = _props$ctx5.form) === null || _props$ctx5$form === void 0 ? void 0 : _props$ctx5$form.getFieldValue(props.id));
+            if ((props === null || props === void 0 ? void 0 : (_props$selectProps = props.selectProps) === null || _props$selectProps === void 0 ? void 0 : _props$selectProps.multipleForQuery) && !isView && initValue) {
+              // @ts-ignore
+              queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren = queryTableRef.current) === null || _queryTableRef$curren === void 0 ? void 0 : (_queryTableRef$curren2 = _queryTableRef$curren.tableRef) === null || _queryTableRef$curren2 === void 0 ? void 0 : (_queryTableRef$curren3 = _queryTableRef$curren2.current) === null || _queryTableRef$curren3 === void 0 ? void 0 : _queryTableRef$curren3.bsSetSelectInfo(initValue);
+            }
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleOpen() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var fieldMapping = ((_props$customSelector3 = props.customSelectorConfig) === null || _props$customSelector3 === void 0 ? void 0 : _props$customSelector3.fieldMapping) || [];
+  var fieldMappingItem = fieldMapping.find(function (item) {
+    return item.codeMappingTo === prop;
+  });
+  var echoLabel = (_props$customSelector4 = props.customSelectorConfig) === null || _props$customSelector4 === void 0 ? void 0 : (_props$customSelector5 = _props$customSelector4.extraData) === null || _props$customSelector5 === void 0 ? void 0 : _props$customSelector5.echoLabel;
+  //初始获取下拉列表
+  var fetchFieldSource = function fetchFieldSource(obj, init) {
+    var _params$path;
+    var url = obj.url,
+      method = obj.method,
+      convertParams = obj.convertParams,
+      converter = obj.converter;
+    var params = convertParams({
+      params: _objectSpread2({
+        pageSize: 20,
+        currentPage: 1
+      }, init)
+    });
+    // 容错处理
+    if (!(params === null || params === void 0 ? void 0 : params.path) || (params === null || params === void 0 ? void 0 : (_params$path = params.path) === null || _params$path === void 0 ? void 0 : _params$path.indexOf('undefined')) > -1) return;
+    bssula.request({
+      url: url,
+      method: method,
+      params: params
+    }).then(function (res) {
+      var _converter = converter({
+          data: res
+        }),
+        list = _converter.list;
+      var currentField = fieldMappingItem;
+      var sourceList = [];
+      var codeList = [];
+      var options = list.map(function (item) {
+        if (currentField && echoLabel) {
+          return {
+            label: item[echoLabel],
+            value: item[currentField.codeMappingFrom]
+          };
+        }
+        if (echoLabel && !currentField) {
+          return {
+            label: item[echoLabel],
+            value: item[echoLabel]
+          };
+        }
+        return {
+          label: item[currentField.codeMappingTo],
+          value: item[currentField.codeMappingTo]
+        };
+      });
+      options.forEach(function (item) {
+        if (!codeList.includes(item.value)) {
+          codeList.push(item.value);
+          sourceList.push(item);
+        }
+      });
+      props.setFieldSource(sourceList);
+      props.setAllListData(list || []);
+    });
+  };
+  React$1.useEffect(function () {
+    if (props.visible) {
+      handleOpen();
+    }
+  }, [props.visible]);
+  var refreshSelectSource = function refreshSelectSource() {
+    var init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var requestConfigNew = assembleRequest(props.customSelectorConfig, {
+      isSearchForm: props.isSearchForm,
+      newestFormData: newestFormData,
+      searchFormData: searchFormData
+    });
+    var obj = remoteFetch(requestConfigNew);
+    //初始化请求下拉列表
+    fetchFieldSource(obj, init);
+  };
+  React$1.useEffect(function () {
+    var _props$ctx6, _props$ctx7, _props$ctx7$form;
+    var isNeedBack = (props === null || props === void 0 ? void 0 : (_props$ctx6 = props.ctx) === null || _props$ctx6 === void 0 ? void 0 : _props$ctx6.mode) != 'create' || props.disabled;
+    var initValue = props === null || props === void 0 ? void 0 : (_props$ctx7 = props.ctx) === null || _props$ctx7 === void 0 ? void 0 : (_props$ctx7$form = _props$ctx7.form) === null || _props$ctx7$form === void 0 ? void 0 : _props$ctx7$form.getFieldValue(props.id);
+    var formCodeKey = "".concat(fieldMappingItem === null || fieldMappingItem === void 0 ? void 0 : fieldMappingItem.codeMappingFrom);
+    var initKey = Array.isArray(initValue) && (initValue === null || initValue === void 0 ? void 0 : initValue.length) > 1 ? "qp-".concat(formCodeKey, "-in") : "qp-".concat(formCodeKey, "-eq");
+    var initParams = isNeedBack && formCodeKey && initValue ? _defineProperty({}, initKey, Array.isArray(initValue) ? initValue.join(',') : initValue) : {};
+    refreshSelectSource(null, initParams);
+  }, []);
+  var remoteDataSource = React$1.useMemo(function () {
+    if (Object.keys(requestConfig).length) {
+      var obj = remoteFetch(requestConfig, tableState.columns);
+      return obj;
+    } else {
+      return {};
+    }
+  }, [requestConfig, tableState.columns]);
+  var rowKey = (_ref3 = (_fieldMappingItem$cod = fieldMappingItem === null || fieldMappingItem === void 0 ? void 0 : fieldMappingItem.codeMappingFrom) !== null && _fieldMappingItem$cod !== void 0 ? _fieldMappingItem$cod : 'id') !== null && _ref3 !== void 0 ? _ref3 : 'code';
+  var handleOk = function handleOk(rowData) {
+    var _props$selectProps2, _props$customSelector6, _props$customSelector7, _queryTableRef$curren13, _queryTableRef$curren14, _queryTableRef$curren15;
+    var setSource = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    //多选数据处理
+    if (props === null || props === void 0 ? void 0 : (_props$selectProps2 = props.selectProps) === null || _props$selectProps2 === void 0 ? void 0 : _props$selectProps2.multipleForQuery) {
+      var _queryTableRef$curren4, _queryTableRef$curren5, _queryTableRef$curren6, _queryTableRef$curren7, _queryTableRef$curren8, _queryTableRef$curren9;
+      // @ts-ignore
+      var selectedKesys = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren4 = queryTableRef.current) === null || _queryTableRef$curren4 === void 0 ? void 0 : (_queryTableRef$curren5 = _queryTableRef$curren4.tableRef) === null || _queryTableRef$curren5 === void 0 ? void 0 : (_queryTableRef$curren6 = _queryTableRef$curren5.current) === null || _queryTableRef$curren6 === void 0 ? void 0 : _queryTableRef$curren6.getSelectedRowKeys()) || [];
+      // @ts-ignore
+      var selectedRows = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren7 = queryTableRef.current) === null || _queryTableRef$curren7 === void 0 ? void 0 : (_queryTableRef$curren8 = _queryTableRef$curren7.tableRef) === null || _queryTableRef$curren8 === void 0 ? void 0 : (_queryTableRef$curren9 = _queryTableRef$curren8.current) === null || _queryTableRef$curren9 === void 0 ? void 0 : _queryTableRef$curren9.getSelectedRows()) || [];
+      var realSelectedRows = selectedRows;
+      if (!rowData && (selectedKesys === null || selectedKesys === void 0 ? void 0 : selectedKesys.length) !== (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length)) {
+        var _queryTableRef$curren10, _queryTableRef$curren11, _queryTableRef$curren12;
+        // @ts-ignore
+        var dataSource = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren10 = queryTableRef.current) === null || _queryTableRef$curren10 === void 0 ? void 0 : (_queryTableRef$curren11 = _queryTableRef$curren10.tableRef) === null || _queryTableRef$curren11 === void 0 ? void 0 : (_queryTableRef$curren12 = _queryTableRef$curren11.current) === null || _queryTableRef$curren12 === void 0 ? void 0 : _queryTableRef$curren12.getDataSource()) || [];
+        realSelectedRows = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (s) {
+          return selectedKesys.includes(s[rowKey]);
+        });
+      }
+      //@ts-ignore
+      var rowDataList = rowData ? rowData : realSelectedRows;
+      var rowDataTemp = {};
+      rowDataList.forEach(function (item, index) {
+        Object.keys(item).forEach(function (key) {
+          if (!Reflect.has(rowDataTemp, key)) {
+            rowDataTemp[key] = [item[key]];
+          } else {
+            rowDataTemp[key].push(item[key]);
+            //数组去重
+            rowDataTemp[key] = _toConsumableArray(new Set(rowDataTemp[key]));
+          }
+        });
+      });
+      rowData = rowDataTemp;
+    }
+    var mappings = props.customSelectorConfig.fieldMapping;
+    var values = {};
+    //没有映射且有echoLabel的话，默认塞入一条
+    if ((!mappings || Array.isArray(mappings) && !mappings.length) && ((_props$customSelector6 = props.customSelectorConfig) === null || _props$customSelector6 === void 0 ? void 0 : (_props$customSelector7 = _props$customSelector6.extraData) === null || _props$customSelector7 === void 0 ? void 0 : _props$customSelector7.echoLabel)) {
+      var _props$customSelector8, _props$customSelector9;
+      mappings.push({
+        codeMappingFrom: (_props$customSelector8 = props.customSelectorConfig) === null || _props$customSelector8 === void 0 ? void 0 : (_props$customSelector9 = _props$customSelector8.extraData) === null || _props$customSelector9 === void 0 ? void 0 : _props$customSelector9.echoLabel,
+        codeMappingTo: prop,
+        uuid: ''
+      });
+    }
+    mappings.map(function (item) {
+      var _props$customSelector10, _props$customSelector11, _props$customSelector12, _props$customSelector13;
+      if (((_props$customSelector10 = props.customSelectorConfig) === null || _props$customSelector10 === void 0 ? void 0 : (_props$customSelector11 = _props$customSelector10.extraData) === null || _props$customSelector11 === void 0 ? void 0 : _props$customSelector11.echoLabel) && item.codeMappingTo === prop && rowData[(_props$customSelector12 = props.customSelectorConfig) === null || _props$customSelector12 === void 0 ? void 0 : (_props$customSelector13 = _props$customSelector12.extraData) === null || _props$customSelector13 === void 0 ? void 0 : _props$customSelector13.echoLabel]) {
+        var _props$customSelector14, _props$customSelector15;
+        values["".concat(item.codeMappingTo, "Name")] = rowData[(_props$customSelector14 = props.customSelectorConfig) === null || _props$customSelector14 === void 0 ? void 0 : (_props$customSelector15 = _props$customSelector14.extraData) === null || _props$customSelector15 === void 0 ? void 0 : _props$customSelector15.echoLabel];
+      }
+      values[item.codeMappingTo] = rowData[item.codeMappingFrom];
+    });
+    // 表单查询项就不给其他字段赋值
+    if (!props.isSearchForm) {
+      Object.keys(values).map(function (key, index, list) {
+        if (key.includes('Name')) {
+          var valueKey = key.replace('Name', '');
+          if (setSource) {
+            if (Array.isArray(values[valueKey])) {
+              var valueList = [];
+              values[valueKey].forEach(function (item, index) {
+                valueList.push({
+                  label: values[key][index],
+                  value: values[valueKey][index]
+                });
+              });
+              props.setFieldSource(valueList);
+            } else {
+              props.setFieldSource([{
+                label: values[key],
+                value: values[valueKey]
+              }]);
+            }
+          }
+        } else {
+          var _props$setFieldValue;
+          props === null || props === void 0 ? void 0 : (_props$setFieldValue = props.setFieldValue) === null || _props$setFieldValue === void 0 ? void 0 : _props$setFieldValue.call(props, key, values[key]);
+        }
+      });
+    } else {
+      var _props$ctx8;
+      if (setSource) {
+        if (Array.isArray(values[prop])) {
+          var valueList = [];
+          values[prop].forEach(function (item, index) {
+            valueList.push({
+              label: values["".concat(prop, "Name")][index],
+              value: values[prop][index]
+            });
+          });
+          props.setFieldSource(valueList);
+        } else {
+          props.setFieldSource([{
+            label: values["".concat(prop, "Name")],
+            value: values[prop]
+          }]);
+        }
+      }
+      var fieldKey = (props === null || props === void 0 ? void 0 : (_props$ctx8 = props.ctx) === null || _props$ctx8 === void 0 ? void 0 : _props$ctx8.name) || prop;
+      props.setFieldValue(fieldKey, values[prop], props.fieldSource);
+    }
+    props.onCancel();
+    //@ts-ignore
+    queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren13 = queryTableRef.current) === null || _queryTableRef$curren13 === void 0 ? void 0 : (_queryTableRef$curren14 = _queryTableRef$curren13.tableRef) === null || _queryTableRef$curren14 === void 0 ? void 0 : (_queryTableRef$curren15 = _queryTableRef$curren14.current) === null || _queryTableRef$curren15 === void 0 ? void 0 : _queryTableRef$curren15.clearRowSelection();
+  };
+  var config = React$1.useMemo(function () {
+    var _props$selectProps3, _props$ctx9, _props$value2, _props$ctx10, _props$ctx10$form;
+    var returnConfig = {
+      size: 'small',
+      needPageHeader: false,
+      tableWrapperStyle: {},
+      isHorizontally: false,
+      rowSelection: (props === null || props === void 0 ? void 0 : (_props$selectProps3 = props.selectProps) === null || _props$selectProps3 === void 0 ? void 0 : _props$selectProps3.multipleForQuery) && !isView ? {
+        selectedRowKeys: !(props === null || props === void 0 ? void 0 : (_props$ctx9 = props.ctx) === null || _props$ctx9 === void 0 ? void 0 : _props$ctx9.form) && (props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.map(function (v) {
+          return v.key || v;
+        })) || (props === null || props === void 0 ? void 0 : (_props$ctx10 = props.ctx) === null || _props$ctx10 === void 0 ? void 0 : (_props$ctx10$form = _props$ctx10.form) === null || _props$ctx10$form === void 0 ? void 0 : _props$ctx10$form.getFieldValue(props.id))
+      } : false,
+      remoteDataSource: remoteDataSource,
+      fields: tableState.fields,
+      columns: tableState.columns,
+      rowKey: rowKey,
+      tableProps: !isView && {
+        rowClassName: function rowClassName(record) {
+          var _props$ctx11, _props$value3, _props$ctx12, _props$ctx12$form;
+          return record[rowKey] == (!(props === null || props === void 0 ? void 0 : (_props$ctx11 = props.ctx) === null || _props$ctx11 === void 0 ? void 0 : _props$ctx11.form) && ((props === null || props === void 0 ? void 0 : (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.key) || (props === null || props === void 0 ? void 0 : props.value)) || (props === null || props === void 0 ? void 0 : (_props$ctx12 = props.ctx) === null || _props$ctx12 === void 0 ? void 0 : (_props$ctx12$form = _props$ctx12.form) === null || _props$ctx12$form === void 0 ? void 0 : _props$ctx12$form.getFieldValue(props.id))) ? 'tableSelectedRow' : '';
+        },
+        onRow: function onRow(record) {
+          return {
+            onDoubleClick: function onDoubleClick() {
+              handleOk(record);
+            } //双击
+          };
+        }
+      } || {}
+    };
+    if (Object.keys(remoteDataSource).length) {
+      return returnConfig;
+    } else {
+      return false;
+    }
+  }, [tableState, remoteDataSource]);
+  return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: "",
+    width: 1300,
+    open: props.visible,
+    footer: null,
+    onCancel: function onCancel() {
+      props.onCancel();
+    },
+    destroyOnClose: true
+  }, config && /*#__PURE__*/React__default['default'].createElement(bssula.QueryTable, _objectSpread2({
+    ref: queryTableRef
+  }, config)), (props === null || props === void 0 ? void 0 : (_props$selectProps4 = props.selectProps) === null || _props$selectProps4 === void 0 ? void 0 : _props$selectProps4.multipleForQuery) && !isView && ( /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+    justify: "center",
+    style: {
+      marginBottom: 30,
+      marginTop: 10
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    type: "primary",
+    style: {
+      marginRight: 20
+    },
+    onClick: function onClick() {
+      return handleOk();
+    }
+  }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    type: "default",
+    onClick: function onClick() {
+      var _queryTableRef$curren16, _queryTableRef$curren17, _queryTableRef$curren18;
+      props.onCancel();
+      //@ts-ignore
+      queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren16 = queryTableRef.current) === null || _queryTableRef$curren16 === void 0 ? void 0 : (_queryTableRef$curren17 = _queryTableRef$curren16.tableRef) === null || _queryTableRef$curren17 === void 0 ? void 0 : (_queryTableRef$curren18 = _queryTableRef$curren17.current) === null || _queryTableRef$curren18 === void 0 ? void 0 : _queryTableRef$curren18.clearRowSelection();
+    }
+  }, "\u53D6\u6D88"))));
+});
+
+var CustomSelector = (function (props) {
+  var _props$ctx, _props$customSelector3, _props$customSelector4, _props$customSelector5, _props$selectProps2, _props$ctx4, _props$ctx5, _props$ctx6, _props$ctx6$form;
+  var showType = React$1.useMemo(function () {
+    var _props$customSelector, _props$customSelector2;
+    return (props === null || props === void 0 ? void 0 : (_props$customSelector = props.customSelectorConfig) === null || _props$customSelector === void 0 ? void 0 : (_props$customSelector2 = _props$customSelector.extraData) === null || _props$customSelector2 === void 0 ? void 0 : _props$customSelector2.showType) || 'modalTable';
+  }, [props]);
+  var _useState = React$1.useState({
+      visible: false,
+      onShow: function onShow() {
+        setModalConfig(_objectSpread2(_objectSpread2({}, modalConfig), {}, {
+          visible: true
+        }));
+      },
+      onCancel: function onCancel() {
+        setModalConfig(_objectSpread2(_objectSpread2({}, modalConfig), {}, {
+          visible: false
+        }));
+      }
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    modalConfig = _useState2[0],
+    setModalConfig = _useState2[1];
+  var _useState3 = React$1.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    fieldSource = _useState4[0],
+    setFieldSource = _useState4[1];
+  var _useState5 = React$1.useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    allListData = _useState6[0],
+    setAllListData = _useState6[1];
+  var customRef = React$1.useRef();
+  var prop = convertProp(props === null || props === void 0 ? void 0 : (_props$ctx = props.ctx) === null || _props$ctx === void 0 ? void 0 : _props$ctx.name, props.isSearchForm);
+  var fieldMapping = ((_props$customSelector3 = props.customSelectorConfig) === null || _props$customSelector3 === void 0 ? void 0 : _props$customSelector3.fieldMapping) || [];
+  var fieldMappingItem = fieldMapping.find(function (item) {
+    return item.codeMappingTo === prop;
+  });
+  var echoLabel = (_props$customSelector4 = props.customSelectorConfig) === null || _props$customSelector4 === void 0 ? void 0 : (_props$customSelector5 = _props$customSelector4.extraData) === null || _props$customSelector5 === void 0 ? void 0 : _props$customSelector5.echoLabel;
+  React$1.useEffect(function () {
+    if (props.source && noEmptyArray(props.source)) {
+      var source = (props === null || props === void 0 ? void 0 : props.source) || [];
+      if ((source === null || source === void 0 ? void 0 : source[0]) === true) {
+        var _customRef$current;
+        //@ts-ignore
+        customRef === null || customRef === void 0 ? void 0 : (_customRef$current = customRef.current) === null || _customRef$current === void 0 ? void 0 : _customRef$current.refreshSelectSource();
+      } else if ((source === null || source === void 0 ? void 0 : source[0]) === false) {
+        var _customRef$current2;
+        //@ts-ignore
+        customRef === null || customRef === void 0 ? void 0 : (_customRef$current2 = customRef.current) === null || _customRef$current2 === void 0 ? void 0 : _customRef$current2.refreshSelectSource(true);
+      }
+    }
+  }, [props.source]);
+  var setFieldValue = function setFieldValue(key, value, sourceList) {
+    var _props$ctx2, _props$ctx2$form, _props$ctx2$form$setF, _props$onChange;
+    props === null || props === void 0 ? void 0 : (_props$ctx2 = props.ctx) === null || _props$ctx2 === void 0 ? void 0 : (_props$ctx2$form = _props$ctx2.form) === null || _props$ctx2$form === void 0 ? void 0 : (_props$ctx2$form$setF = _props$ctx2$form.setFieldValue) === null || _props$ctx2$form$setF === void 0 ? void 0 : _props$ctx2$form$setF.call(_props$ctx2$form, key, value);
+    props === null || props === void 0 ? void 0 : (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, value, sourceList);
+  };
+  var onChange = function onChange(value) {
+    if (!value) return;
+    var dataItem = allListData.filter(function (item) {
+      return Array.isArray(value) ? value.includes(item === null || item === void 0 ? void 0 : item[(fieldMappingItem === null || fieldMappingItem === void 0 ? void 0 : fieldMappingItem.codeMappingFrom) || echoLabel]) : (item === null || item === void 0 ? void 0 : item[(fieldMappingItem === null || fieldMappingItem === void 0 ? void 0 : fieldMappingItem.codeMappingFrom) || echoLabel]) == value;
+    }) || [];
+    if (showType === 'modalTable') {
+      var _props$selectProps, _customRef$current3;
+      var rowData = (props === null || props === void 0 ? void 0 : (_props$selectProps = props.selectProps) === null || _props$selectProps === void 0 ? void 0 : _props$selectProps.multipleForQuery) ? dataItem : (dataItem === null || dataItem === void 0 ? void 0 : dataItem[0]) || {};
+      //@ts-ignore
+      customRef === null || customRef === void 0 ? void 0 : (_customRef$current3 = customRef.current) === null || _customRef$current3 === void 0 ? void 0 : _customRef$current3.handleOk(rowData, false);
+    } else {
+      var _props$ctx3;
+      setFieldValue((_props$ctx3 = props.ctx) === null || _props$ctx3 === void 0 ? void 0 : _props$ctx3.name, value, fieldSource);
+    }
+  };
+  var multipleForQuery = props === null || props === void 0 ? void 0 : (_props$selectProps2 = props.selectProps) === null || _props$selectProps2 === void 0 ? void 0 : _props$selectProps2.multipleForQuery;
+  var isView = (props === null || props === void 0 ? void 0 : (_props$ctx4 = props.ctx) === null || _props$ctx4 === void 0 ? void 0 : _props$ctx4.mode) == 'view';
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, props === null || props === void 0 ? void 0 : props.selectProps), {}, {
+    showSearch: true,
+    optionFilterProp: 'label',
+    placeholder: "\u8BF7\u9009\u62E9",
+    onChange: onChange,
+    options: fieldSource,
+    value: !(props === null || props === void 0 ? void 0 : (_props$ctx5 = props.ctx) === null || _props$ctx5 === void 0 ? void 0 : _props$ctx5.form) && (props === null || props === void 0 ? void 0 : props.value) || (props === null || props === void 0 ? void 0 : (_props$ctx6 = props.ctx) === null || _props$ctx6 === void 0 ? void 0 : (_props$ctx6$form = _props$ctx6.form) === null || _props$ctx6$form === void 0 ? void 0 : _props$ctx6$form.getFieldValue(props.id)),
+    disabled: isView || props.disabled,
+    mode: multipleForQuery ? 'multiple' : undefined,
+    allowClear: props === null || props === void 0 ? void 0 : props.allowClear,
+    onClear: function onClear() {
+      var _props$ctx7;
+      return setFieldValue((_props$ctx7 = props.ctx) === null || _props$ctx7 === void 0 ? void 0 : _props$ctx7.name, multipleForQuery ? [] : '', fieldSource);
+    }
+  })), showType === 'modalTable' && ( /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    type: "primary",
+    style: {
+      width: '30px',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    },
+    onClick: function onClick() {
+      modalConfig.onShow();
+    },
+    disabled: props.disabled
+  }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, {
+    className: "site-form-item-icon"
+  }))), /*#__PURE__*/React__default['default'].createElement(CustomSelectorModal, _objectSpread2(_objectSpread2(_objectSpread2({
+    ref: customRef
+  }, modalConfig), props), {}, {
+    showType: showType,
+    fieldSource: fieldSource,
+    setFieldSource: setFieldSource,
+    setFieldValue: setFieldValue,
+    setAllListData: setAllListData,
+    ismultiple: multipleForQuery
+  })));
+});
+
 var RangePicker = antd.DatePicker.RangePicker;
 var RuleField = /*#__PURE__*/function (_Component) {
   function RuleField(props) {
@@ -29569,7 +30582,12 @@ var RuleField = /*#__PURE__*/function (_Component) {
         callback = _this$props2.callback,
         queryIdentify = _this$props2.queryIdentify,
         disabled = _this$props2.disabled,
-        customerWidth = _this$props2.customerWidth;
+        customerWidth = _this$props2.customerWidth,
+        _this$props2$itemDeta = _this$props2.itemDetail,
+        itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
+        _this$props2$others = _this$props2.others,
+        others = _this$props2$others === void 0 ? {} : _this$props2$others,
+        propertyCode = _this$props2.propertyCode;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '150px'
@@ -30795,10 +31813,238 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 return document.body;
               }
             }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "supplier2",
+              selectBusinessType: "supplier2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择供应商'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[1] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[1] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[1] = [value.key];
+                  valueNames[1] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }));
+          } else {
+            var _values7;
+            var _currentValue6 = dataInputBusinessType === 12 ? ((_values7 = values) === null || _values7 === void 0 ? void 0 : _values7.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "supplier2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择供应商'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: _currentValue6,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values = value.map(function (i) {
+                    return i.key;
+                  }) || [];
+                  valueNames = value.map(function (i) {
+                    return i.label || '';
+                  }) || [];
+                } else {
+                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
+                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            });
+          }
+        }
+        // 客户选择器
+        if (dataChoiceBusinessType == 250) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "customer2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择客户'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[0],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[0] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[0] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[0] = [value.key];
+                  valueNames[0] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "customer2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择客户'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[1] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[1] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[1] = [value.key];
+                  valueNames[1] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }));
+          } else {
+            var _values8;
+            var _currentValue7 = dataInputBusinessType === 12 ? ((_values8 = values) === null || _values8 === void 0 ? void 0 : _values8.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "customer2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择客户'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: _currentValue7,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values = value.map(function (i) {
+                    return i.key;
+                  }) || [];
+                  valueNames = value.map(function (i) {
+                    return i.label || '';
+                  }) || [];
+                } else {
+                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
+                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            });
+          }
+        }
+        // 店铺选择器
+        if (dataChoiceBusinessType == 260) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "shopFile2",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择店铺'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[0],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[0] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[0] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[0] = [value.key];
+                  valueNames[0] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "shopFile2",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择供应商'
+                placeholder: '请选择店铺'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
@@ -30828,8 +32074,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values7;
-            var _currentValue6 = dataInputBusinessType === 12 ? ((_values7 = values) === null || _values7 === void 0 ? void 0 : _values7.map(function (s, vIndex) {
+            var _values9;
+            var _currentValue8 = dataInputBusinessType === 12 ? ((_values9 = values) === null || _values9 === void 0 ? void 0 : _values9.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex]
@@ -30839,17 +32085,17 @@ var RuleField = /*#__PURE__*/function (_Component) {
               label: valueNames[0]
             } || {};
             return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "supplier2",
+              selectBusinessType: "shopFile2",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择供应商'
+                placeholder: '请选择店铺'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue6,
+              value: _currentValue8,
               requestConfig: {
                 filterInit: 'qp-code-in'
               },
@@ -30873,14 +32119,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 客户选择器
-        if (dataChoiceBusinessType == 250) {
+        // 员工选择器
+        if (dataChoiceBusinessType == 270) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "customer2",
+              selectBusinessType: "employee2",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择客户'
+                placeholder: '请选择员工'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
@@ -30889,7 +32135,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: values[0],
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-id-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -30909,10 +32155,10 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 return document.body;
               }
             }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "customer2",
+              selectBusinessType: "employee2",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择客户'
+                placeholder: '请选择员工'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
@@ -30921,7 +32167,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: values[1],
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-id-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -30942,8 +32188,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values8;
-            var _currentValue7 = dataInputBusinessType === 12 ? ((_values8 = values) === null || _values8 === void 0 ? void 0 : _values8.map(function (s, vIndex) {
+            var _values10;
+            var _currentValue9 = dataInputBusinessType === 12 ? ((_values10 = values) === null || _values10 === void 0 ? void 0 : _values10.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex]
@@ -30953,19 +32199,19 @@ var RuleField = /*#__PURE__*/function (_Component) {
               label: valueNames[0]
             } || {};
             return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "customer2",
+              selectBusinessType: "employee2",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择客户'
+                placeholder: '请选择员工'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue7,
+              value: _currentValue9,
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-id-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -30987,24 +32233,17 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 店铺选择器
-        if (dataChoiceBusinessType == 260) {
+        // 库存组织选择器
+        if (dataChoiceBusinessType == 280) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "shopFile2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择店铺'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "stock-organization",
               labelInValue: true,
-              value: values[0],
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              value: dataInputBusinessType === 12 ? values : values[0],
+              style: styleCommon,
+              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -31022,21 +32261,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
               getPopupContainer: function getPopupContainer() {
                 return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "shopFile2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择店铺'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "stock-organization",
               labelInValue: true,
-              value: values[1],
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              value: dataInputBusinessType === 12 ? values : values[0],
+              style: styleCommon,
+              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -31056,31 +32288,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values9;
-            var _currentValue8 = dataInputBusinessType === 12 ? ((_values9 = values) === null || _values9 === void 0 ? void 0 : _values9.map(function (s, vIndex) {
-              return {
-                key: s,
-                label: valueNames[vIndex]
-              };
-            })) || [] : values[0] && {
-              key: values[0],
-              label: valueNames[0]
-            } || {};
-            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "shopFile2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择店铺'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "stock-organization",
               labelInValue: true,
-              value: _currentValue8,
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              value: dataInputBusinessType === 12 ? values : values[0],
+              style: styleCommon,
+              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -31101,24 +32316,16 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 员工选择器
-        if (dataChoiceBusinessType == 270) {
+        // 结算组织选择器
+        if (dataChoiceBusinessType == 290) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "employee2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择员工'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
               labelInValue: true,
               value: values[0],
-              requestConfig: {
-                filterInit: 'qp-id-in'
-              },
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -31136,21 +32343,13 @@ var RuleField = /*#__PURE__*/function (_Component) {
               getPopupContainer: function getPopupContainer() {
                 return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "employee2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择员工'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
               labelInValue: true,
-              value: values[1],
-              requestConfig: {
-                filterInit: 'qp-id-in'
-              },
+              value: values[0],
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -31170,31 +32369,13 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values10;
-            var _currentValue9 = dataInputBusinessType === 12 ? ((_values10 = values) === null || _values10 === void 0 ? void 0 : _values10.map(function (s, vIndex) {
-              return {
-                key: s,
-                label: valueNames[vIndex]
-              };
-            })) || [] : values[0] && {
-              key: values[0],
-              label: valueNames[0]
-            } || {};
-            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "employee2",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择员工'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
               labelInValue: true,
-              value: _currentValue9,
-              requestConfig: {
-                filterInit: 'qp-id-in'
-              },
+              value: values[0],
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -31215,17 +32396,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 库存组织选择器
-        if (dataChoiceBusinessType == 280) {
+        // 配送方式选择器
+        if (dataChoiceBusinessType == 310) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "deliveryMode",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择配送方式'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "stock-organization",
               labelInValue: true,
-              value: dataInputBusinessType === 12 ? values : values[0],
-              style: styleCommon,
-              treeCheckStrictly: true,
+              value: values[0],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -31243,14 +32431,21 @@ var RuleField = /*#__PURE__*/function (_Component) {
               getPopupContainer: function getPopupContainer() {
                 return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "deliveryMode",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择配送方式'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "stock-organization",
               labelInValue: true,
-              value: dataInputBusinessType === 12 ? values : values[0],
-              style: styleCommon,
-              treeCheckStrictly: true,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -31270,14 +32465,31 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            var _values11;
+            var _currentValue10 = dataInputBusinessType === 12 ? ((_values11 = values) === null || _values11 === void 0 ? void 0 : _values11.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "deliveryMode",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择配送方式'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "stock-organization",
               labelInValue: true,
-              value: dataInputBusinessType === 12 ? values : values[0],
-              style: styleCommon,
-              treeCheckStrictly: true,
+              value: _currentValue10,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -31298,16 +32510,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 结算组织选择器
-        if (dataChoiceBusinessType == 290) {
+        // 角色选择器
+        if (dataChoiceBusinessType == 360) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "settle-organization",
               labelInValue: true,
               value: values[0],
-              style: styleCommon,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -31325,13 +32545,21 @@ var RuleField = /*#__PURE__*/function (_Component) {
               getPopupContainer: function getPopupContainer() {
                 return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "settle-organization",
               labelInValue: true,
-              value: values[0],
-              style: styleCommon,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -31351,13 +32579,31 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+            var _values12;
+            var _currentValue11 = dataInputBusinessType === 12 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "settle-organization",
               labelInValue: true,
-              value: values[0],
-              style: styleCommon,
+              value: _currentValue11,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -31378,14 +32624,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 配送方式选择器
-        if (dataChoiceBusinessType == 310) {
+        // 品牌选择器
+        if (dataChoiceBusinessType == 410) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "deliveryMode",
+              selectBusinessType: "brand",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择配送方式'
+                placeholder: '请选择品牌'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
@@ -31394,7 +32640,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: values[0],
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-brandCode-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -31414,10 +32660,10 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 return document.body;
               }
             }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "deliveryMode",
+              selectBusinessType: "brand",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择配送方式'
+                placeholder: '请选择品牌'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
@@ -31426,7 +32672,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: values[1],
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-brandCode-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -31447,8 +32693,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values11;
-            var _currentValue10 = dataInputBusinessType === 12 ? ((_values11 = values) === null || _values11 === void 0 ? void 0 : _values11.map(function (s, vIndex) {
+            var _values13;
+            var _currentValue12 = dataInputBusinessType === 12 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex]
@@ -31458,19 +32704,19 @@ var RuleField = /*#__PURE__*/function (_Component) {
               label: valueNames[0]
             } || {};
             return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "deliveryMode",
+              selectBusinessType: "brand",
               selectProps: _objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择配送方式'
+                placeholder: '请选择品牌'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
                 maxTagCount: 1
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue10,
+              value: _currentValue12,
               requestConfig: {
-                filterInit: 'qp-code-in'
+                filterInit: 'qp-brandCode-in'
               },
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
@@ -31492,24 +32738,16 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 角色选择器
-        if (dataChoiceBusinessType == 360) {
+        // 类目选择器
+        if (dataChoiceBusinessType == 420) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "role",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择角色'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "background-category",
               labelInValue: true,
               value: values[0],
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -31527,21 +32765,13 @@ var RuleField = /*#__PURE__*/function (_Component) {
               getPopupContainer: function getPopupContainer() {
                 return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "role",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择角色'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "background-category",
               labelInValue: true,
-              value: values[1],
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              value: values[0],
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -31561,31 +32791,13 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values12;
-            var _currentValue11 = dataInputBusinessType === 12 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
-              return {
-                key: s,
-                label: valueNames[vIndex]
-              };
-            })) || [] : values[0] && {
-              key: values[0],
-              label: valueNames[0]
-            } || {};
-            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "role",
-              selectProps: _objectSpread2({
-                style: styleCommon,
-                placeholder: '请选择角色'
-              }, dataInputBusinessType === 12 ? {
-                mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
               disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "background-category",
               labelInValue: true,
-              value: _currentValue11,
-              requestConfig: {
-                filterInit: 'qp-code-in'
-              },
+              value: values[0],
+              style: styleCommon,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -31606,77 +32818,95 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 品牌选择器
-        if (dataChoiceBusinessType == 410) {
+        // 自定义选择器
+        if (dataChoiceBusinessType == 40) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "brand",
-              selectProps: _objectSpread2({
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(CustomSelector, {
+              selectProps: _objectSpread2(_objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择品牌'
+                placeholder: '请选择'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+                maxTagCount: 1,
+                multipleForQuery: true
+              } : {}), {}, {
+                getPopupContainer: function getPopupContainer() {
+                  return document.body;
+                }
+              }),
+              ctx: {
+                name: propertyCode || (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.propertyPath)
+              },
+              isSearchForm: true,
+              customSelectorConfig: (others === null || others === void 0 ? void 0 : others.customSelectorConfig) || {},
               disabled: disabled,
-              labelInValue: true,
               value: values[0],
-              requestConfig: {
-                filterInit: 'qp-brandCode-in'
-              },
-              onChange: function onChange(value) {
+              onChange: function onChange(value, sourceList) {
                 if (dataInputBusinessType === 12) {
-                  values[0] = value.map(function (i) {
-                    return i.key;
-                  });
-                  valueNames[0] = value.map(function (i) {
+                  var _value$map, _sourceList$filter;
+                  values[0] = (value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (i) {
+                    return i;
+                  })) || [];
+                  valueNames[0] = (sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$filter = sourceList.filter(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$filter === void 0 ? void 0 : _sourceList$filter.map(function (i) {
                     return i.label || '';
-                  });
+                  })) || [];
                 } else {
-                  values[0] = [value.key];
-                  valueNames[0] = [value.label || ''];
+                  var _sourceList$find;
+                  var vLabel = sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$find = sourceList.find(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$find === void 0 ? void 0 : _sourceList$find.label;
+                  values[0] = value ? [value] : [];
+                  valueNames[0] = vLabel ? [vLabel] : [];
                 }
                 callback(values, valueNames);
-              },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
               }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "brand",
-              selectProps: _objectSpread2({
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(CustomSelector, {
+              selectProps: _objectSpread2(_objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择品牌'
+                placeholder: '请选择'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
+                maxTagCount: 1,
+                multipleForQuery: true
+              } : {}), {}, {
+                getPopupContainer: function getPopupContainer() {
+                  return document.body;
+                }
+              }),
+              ctx: {
+                name: propertyCode || (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.propertyPath)
+              },
+              isSearchForm: true,
+              customSelectorConfig: (others === null || others === void 0 ? void 0 : others.customSelectorConfig) || {},
               disabled: disabled,
-              labelInValue: true,
               value: values[1],
-              requestConfig: {
-                filterInit: 'qp-brandCode-in'
-              },
-              onChange: function onChange(value) {
+              onChange: function onChange(value, sourceList) {
                 if (dataInputBusinessType === 12) {
-                  values[1] = value.map(function (i) {
-                    return i.key;
-                  });
-                  valueNames[1] = value.map(function (i) {
+                  var _value$map2, _sourceList$filter2;
+                  values[1] = (value === null || value === void 0 ? void 0 : (_value$map2 = value.map) === null || _value$map2 === void 0 ? void 0 : _value$map2.call(value, function (i) {
+                    return i;
+                  })) || [];
+                  valueNames[1] = (sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$filter2 = sourceList.filter(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$filter2 === void 0 ? void 0 : _sourceList$filter2.map(function (i) {
                     return i.label || '';
-                  });
+                  })) || [];
                 } else {
-                  values[1] = [value.key];
-                  valueNames[1] = [value.label || ''];
+                  var _sourceList$find2;
+                  var vLabel = sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$find2 = sourceList.find(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$find2 === void 0 ? void 0 : _sourceList$find2.label;
+                  values[1] = value ? [value] : [];
+                  valueNames[1] = vLabel ? [vLabel] : [];
                 }
                 callback(values, valueNames);
-              },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
               }
             }));
           } else {
-            var _values13;
-            var _currentValue12 = dataInputBusinessType === 12 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
+            var _values14;
+            var _currentValue13 = dataInputBusinessType === 12 ? ((_values14 = values) === null || _values14 === void 0 ? void 0 : _values14.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex]
@@ -31685,117 +32915,46 @@ var RuleField = /*#__PURE__*/function (_Component) {
               key: values[0],
               label: valueNames[0]
             } || {};
-            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-              selectBusinessType: "brand",
-              selectProps: _objectSpread2({
+            return /*#__PURE__*/React__default['default'].createElement(CustomSelector, {
+              selectProps: _objectSpread2(_objectSpread2({
                 style: styleCommon,
-                placeholder: '请选择品牌'
+                placeholder: '请选择'
               }, dataInputBusinessType === 12 ? {
                 mode: 'multiple',
-                maxTagCount: 1
-              } : {}),
-              disabled: disabled,
-              labelInValue: true,
-              value: _currentValue12,
-              requestConfig: {
-                filterInit: 'qp-brandCode-in'
-              },
-              onChange: function onChange(value) {
-                if (dataInputBusinessType === 12) {
-                  values = value.map(function (i) {
-                    return i.key;
-                  }) || [];
-                  valueNames = value.map(function (i) {
-                    return i.label || '';
-                  }) || [];
-                } else {
-                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
-                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                maxTagCount: 1,
+                multipleForQuery: true
+              } : {}), {}, {
+                getPopupContainer: function getPopupContainer() {
+                  return document.body;
                 }
-                callback(values, valueNames);
-              },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
-              }
-            });
-          }
-        }
-        // 类目选择器
-        if (dataChoiceBusinessType == 420) {
-          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-              disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "background-category",
-              labelInValue: true,
-              value: values[0],
-              style: styleCommon,
-              onChange: function onChange(value) {
-                if (dataInputBusinessType === 12) {
-                  values[0] = value.map(function (i) {
-                    return i.key;
-                  });
-                  valueNames[0] = value.map(function (i) {
-                    return i.label || '';
-                  });
-                } else {
-                  values[0] = [value.key];
-                  valueNames[0] = [value.label || ''];
-                }
-                callback(values, valueNames);
+              }),
+              ctx: {
+                name: propertyCode || (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.propertyPath)
               },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
-              }
-            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+              isSearchForm: true,
+              customSelectorConfig: (others === null || others === void 0 ? void 0 : others.customSelectorConfig) || {},
               disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "background-category",
-              labelInValue: true,
-              value: values[0],
-              style: styleCommon,
-              onChange: function onChange(value) {
+              value: _currentValue13,
+              onChange: function onChange(value, sourceList) {
                 if (dataInputBusinessType === 12) {
-                  values[1] = value.map(function (i) {
-                    return i.key;
-                  });
-                  valueNames[1] = value.map(function (i) {
+                  var _value$map3, _sourceList$filter3;
+                  values = (value === null || value === void 0 ? void 0 : (_value$map3 = value.map) === null || _value$map3 === void 0 ? void 0 : _value$map3.call(value, function (i) {
+                    return i;
+                  })) || [];
+                  valueNames = (sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$filter3 = sourceList.filter(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$filter3 === void 0 ? void 0 : _sourceList$filter3.map(function (i) {
                     return i.label || '';
-                  });
+                  })) || [];
                 } else {
-                  values[1] = [value.key];
-                  valueNames[1] = [value.label || ''];
+                  var _sourceList$find3;
+                  var vLabel = sourceList === null || sourceList === void 0 ? void 0 : (_sourceList$find3 = sourceList.find(function (s) {
+                    return s.value == value;
+                  })) === null || _sourceList$find3 === void 0 ? void 0 : _sourceList$find3.label;
+                  values = value ? [value] : [];
+                  valueNames = vLabel ? [vLabel] : [];
                 }
                 callback(values, valueNames);
-              },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
-              }
-            }));
-          } else {
-            return /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-              disabled: disabled,
-              treeCheckable: dataInputBusinessType === 12,
-              businessType: "background-category",
-              labelInValue: true,
-              value: values[0],
-              style: styleCommon,
-              onChange: function onChange(value) {
-                if (dataInputBusinessType === 12) {
-                  values = value.map(function (i) {
-                    return i.key;
-                  }) || [];
-                  valueNames = value.map(function (i) {
-                    return i.label || '';
-                  }) || [];
-                } else {
-                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
-                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
-                }
-                callback(values, valueNames);
-              },
-              getPopupContainer: function getPopupContainer() {
-                return document.body;
               }
             });
           }
@@ -31922,6 +33081,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
       dataTypeCode: '',
       dataChoiceBusinessType: '',
       dataInputBusinessType: '',
+      others: {},
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
@@ -31939,6 +33099,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
         dataTypeCode = _this$props3.dataTypeCode,
         dataChoiceBusinessType = _this$props3.dataChoiceBusinessType,
         dataInputBusinessType = _this$props3.dataInputBusinessType,
+        others = _this$props3.others,
         options = _this$props3.options,
         values = _this$props3.values,
         initialThresholdQuery = _this$props3.initialThresholdQuery,
@@ -31951,6 +33112,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        others: others,
         fieldValues: _toConsumableArray(values),
         options: options
       }, function () {
@@ -31987,6 +33149,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
           dataInputBusinessType: nextProps.dataInputBusinessType
         });
       }
+      if (nextProps.others != this.props.others) {
+        this.setState({
+          others: nextProps.others
+        });
+      }
       // if (nextProps.selectOperation != this.props.selectOperation) {
       //     this.setState({
       //         options: nextProps.options
@@ -32533,6 +33700,7 @@ var InnerSelect = (function (props) {
 
 var RangePicker$1 = antd.DatePicker.RangePicker;
 function RenderCompItem(props) {
+  var _others;
   var regularDataList = props.regularDataList,
     ites = props.ites,
     showValue = props.showValue,
@@ -33087,6 +34255,29 @@ function RenderCompItem(props) {
     getPopupContainer: function getPopupContainer() {
       return document.body;
     }
+  })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 40 && ( /*#__PURE__*/React__default['default'].createElement(CustomSelector, {
+    selectProps: _objectSpread2(_objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1,
+      multipleForQuery: true
+    } : {}), {}, {
+      getPopupContainer: function getPopupContainer() {
+        return document.body;
+      }
+    }),
+    ctx: {
+      name: ites.code
+    },
+    isSearchForm: true,
+    customSelectorConfig: ((_others = others) === null || _others === void 0 ? void 0 : _others.customSelectorConfig) || {},
+    disabled: disabled,
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
   })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 40 && ( /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       display: 'flex'
@@ -33161,7 +34352,10 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
               dataTypeCode: element.valueType,
               dataChoiceBusinessType: element.choiceType,
               dataInputBusinessType: element.inputType,
-              info: element.info
+              info: element.info,
+              otherMainInfo: {
+                customSelectorConfig: element.customSelectorConfig
+              }
             };
             if (element === null || element === void 0 ? void 0 : (_element$propertyList = element.propertyList) === null || _element$propertyList === void 0 ? void 0 : _element$propertyList.length) {
               child.children = _this.parseChildTreeData(element.propertyList, "".concat(element.code), "".concat(item.name, "-").concat(element.name), item.code);
@@ -33212,7 +34406,10 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           dataTypeCode: element.valueType,
           dataChoiceBusinessType: element.choiceType,
           dataInputBusinessType: element.inputType,
-          info: element.info
+          info: element.info,
+          otherMainInfo: {
+            customSelectorConfig: element.customSelectorConfig
+          }
         };
         if (element.propertyList) {
           child.children = _this.parseChildTreeData(element.propertyList, "".concat(parentKey, ".").concat(element.code), "".concat(parentTitle, "-").concat(element.name), rootObjCode);
@@ -33611,6 +34808,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           alignItems: 'center'
         }
       }, /*#__PURE__*/React__default['default'].createElement(antd.TreeSelect, {
+        showSearch: true,
+        treeNodeFilterProp: "title",
         value: itemDetail.elementId,
         disabled: disabled,
         onChange: function onChange(value, name, nodeInfo) {
@@ -33671,6 +34870,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         // propertyCode={`${itemDetail.metaObjectCode}.${itemDetail.propertyPath}`}
         ,
         relateDatas: relateDatas,
+        others: currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.otherMainInfo,
         values: itemDetail.params || [],
         valueNames: itemDetail.paramNames || [],
         callback: function callback(newValues, newValueNames) {
@@ -33813,6 +35013,21 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             }) : pCode;
           }
         }
+        if ((configItem === null || configItem === void 0 ? void 0 : configItem.inputType) === 30) {
+          var _pCode$split;
+          var _newPCode = Array.isArray(pCode) ? pCode === null || pCode === void 0 ? void 0 : pCode.map(function (s) {
+            return isObj(s) ? s : {
+              key: s,
+              value: s
+            };
+          }) : pCode === null || pCode === void 0 ? void 0 : (_pCode$split = pCode.split(',')) === null || _pCode$split === void 0 ? void 0 : _pCode$split.map(function (s) {
+            return {
+              key: s,
+              value: s
+            };
+          });
+          return _newPCode || pCode || defaultValue;
+        }
         return pCode || defaultValue;
       };
       var handleEdit = function handleEdit(code, val, functionItem) {
@@ -33823,7 +35038,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           });
           return;
         }
-        if (Array.isArray(val)) {
+        if (Array.isArray(val) && (val === null || val === void 0 ? void 0 : val.length)) {
           value = val.map(function (m) {
             return m.value || m;
           }).join(',');
@@ -34258,12 +35473,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'base_rule_content'
       }, headerButtonComponentFun ? headerButtonComponentFun(this.handleAddRule) : /*#__PURE__*/React__default['default'].createElement("div", {
-        disabled: disabled,
         style: {
           display: onlyOneRule ? 'none' : 'block'
         },
         className: 'base_rule_line_title'
       }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        disabled: disabled,
         onClick: this.handleAddRule,
         className: 'base_rule_btn_style',
         type: "link"
@@ -35294,17 +36509,17 @@ var index$7 = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   })));
 });
 
-var css_248z$v = ".bs-collapse-wrap {\n  border-radius: 4px;\n  overflow: hidden;\n}\n.bs-collapse-wrap .bs-collapse-header-wrap {\n  background: #fff;\n}\n.bs-collapse-wrap .bs-collapse-icon {\n  color: #b6b6b6;\n  transition: transform 0.3s;\n}\n.bs-collapse-wrap .bs-guidewrap-icon-toogle {\n  transform: rotate(180deg);\n}\n.bs-collapse-wrap .bs-collapse-header-title {\n  font-weight: 500;\n  font-size: 14px;\n  color: #000000;\n}\n.bs-collapse-wrap .bs-collapse-header-divider {\n  width: 3px;\n  height: 20px;\n  background: #005CFF;\n}\n.bs-collapse-header-boder .ant-collapse .ant-collapse-item > .ant-collapse-header {\n  border-bottom: 1px solid #f0f0f0;\n  padding: 8px 16px;\n}\n";
+var css_248z$v = ".bs-collapse-wrap {\n  border-radius: 4px;\n  overflow: hidden;\n}\n.bs-collapse-wrap .bs-collapse-header-wrap {\n  background: #fff;\n}\n.bs-collapse-wrap .bs-collapse-icon {\n  color: #b6b6b6;\n  transition: transform 0.3s;\n}\n.bs-collapse-wrap .bs-guidewrap-icon-toogle {\n  transform: rotate(180deg);\n}\n.bs-collapse-wrap .bs-collapse-header-title {\n  font-weight: 500;\n  font-size: 14px;\n  color: #000000;\n}\n.bs-collapse-wrap .bs-collapse-header-divider {\n  width: 3px;\n  height: 20px;\n  background: #005cff;\n}\n.bs-collapse-header-boder .ant-collapse .ant-collapse-item > .ant-collapse-header {\n  border-bottom: 1px solid #f0f0f0;\n  padding: 8px 16px;\n}\n";
 styleInject(css_248z$v);
 
-var _excluded$j = ["titleExtra", "header", "showArrow"];
+var _excluded$k = ["titleExtra", "header", "showArrow"];
 var Panel = antd.Collapse.Panel;
 var ExtendedPanel = function ExtendedPanel(_ref) {
   var titleExtra = _ref.titleExtra,
     header = _ref.header,
     _ref$showArrow = _ref.showArrow,
     showArrow = _ref$showArrow === void 0 ? false : _ref$showArrow,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   var renderHeader = function renderHeader() {
     return /*#__PURE__*/React__default['default'].createElement(antd.Space, {
       align: "center"
@@ -35328,11 +36543,11 @@ var ExtendedPanel = function ExtendedPanel(_ref) {
   }), props.children);
 };
 
-var _excluded$k = ["children", "bordered"];
+var _excluded$l = ["children", "bordered"];
 var ExtendedCollapse = function ExtendedCollapse(props) {
   var children = props.children,
     bordered = props.bordered,
-    restProps = _objectWithoutProperties(props, _excluded$k);
+    restProps = _objectWithoutProperties(props, _excluded$l);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: classNames__default['default']({
       'bs-collapse-wrap': true,
@@ -35399,6 +36614,53 @@ var Section = function Section(_ref) {
   }, children));
 };
 
+var IconFont = icons.createFromIconfontCN({
+  scriptUrl: '//at.alicdn.com/t/c/font_4645959_8nhs21v6bnp.js'
+});
+var Paragraph$1 = antd.Typography.Paragraph;
+var ParagraphCopier = function ParagraphCopier(props) {
+  var children = props.children,
+    text = props.text,
+    _props$enableHover = props.enableHover,
+    enableHover = _props$enableHover === void 0 ? false : _props$enableHover;
+  var _useState = React$1.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isHover = _useState2[0],
+    setIsHover = _useState2[1]; // 只有当 enableHover 为 true 时才使用
+  // 鼠标进入和离开的事件处理函数
+  var handleMouseEnter = function handleMouseEnter() {
+    if (enableHover) {
+      setIsHover(true);
+    }
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    if (enableHover) {
+      setIsHover(false);
+    }
+  };
+  // 拷贝选项，包含图标和提示信息
+  var copyableOptions = {
+    text: text,
+    icon: /*#__PURE__*/React__default['default'].createElement(IconFont, {
+      type: "icon-qyhtfuzhi",
+      style: {
+        fontSize: '14px'
+      }
+    }),
+    tooltips: ['点击复制', '复制成功']
+  };
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave
+  }, /*#__PURE__*/React__default['default'].createElement(Paragraph$1, {
+    copyable: enableHover ? isHover && copyableOptions : copyableOptions,
+    style: {
+      marginBottom: '0',
+      cursor: 'pointer'
+    }
+  }, children));
+};
+
 exports.AddSelect = AddSelect;
 exports.AddSkcSelect = AddSkcSelect;
 exports.AddSkuSelect = AddSkuSelect;
@@ -35425,6 +36687,7 @@ exports.HandleTotalCount = HandleTotalCount;
 exports.HomePageWrapper = index$4;
 exports.JsonQueryTable = JsonQueryTable;
 exports.MoreTreeTable = index$6;
+exports.ParagraphCopier = ParagraphCopier;
 exports.QueryMutipleInput = QueryMutipleInput;
 exports.RuleComponent = RuleObjectComponent;
 exports.RuleSetter = index$7;
@@ -35469,12 +36732,14 @@ exports.handleBaseUrlPre = handleBaseUrlPre;
 exports.handleBeforeUpload = handleBeforeUpload;
 exports.handleBssulaColumnsSpecialParams = handleBssulaColumnsSpecialParams;
 exports.handleCommonTimeRender = handleCommonTimeRender$1;
+exports.handleConvertResponse = handleConvertResponse;
 exports.handleError = handleError;
 exports.handleExport = handleExport;
 exports.handleExportBarCode = handleExportBarCode;
 exports.handleJudgeAuthButtons = handleJudgeAuthButtons;
 exports.handleOssUrl = handleOssUrl;
 exports.handleRequestAuthHeader = handleRequestAuthHeader;
+exports.handleRequestHeader = handleRequestHeader;
 exports.handleRequestUrl = handleRequestUrl;
 exports.handleStatusBadge = handleStatusBadge;
 exports.handleTextBreakSpaces = handleTextBreakSpaces;
@@ -35494,7 +36759,9 @@ exports.judgeIsRequestSuccess = judgeIsRequestSuccess;
 exports.keyToWord = keyToWord;
 exports.memoizeOneFormatter = memoizeOneFormatter;
 exports.noEmptyArr = noEmptyArr;
+exports.noEmptyArray = noEmptyArray;
 exports.paramsControl = paramsControl;
+exports.parseWidth = parseWidth;
 exports.precisionQuantity = precisionQuantity;
 exports.randomString = randomString;
 exports.readerXlsxToList = readerXlsxToList;