@bit-sun/business-component 2.4.19 → 3.0.0-alpha.0

package/dist/index.js

@@ -12,7 +12,9 @@ var React = require('react');
 var moment$1 = require('moment');
 var icons = require('@ant-design/icons');
 var bssula = require('bssula');
+require('qs');
 var reactBeautifulDnd = require('react-beautiful-dnd');
+var request$1 = require('umi-request');
 var ahooks = require('ahooks');
 var querystring = require('querystring');
 var reactResizable = require('react-resizable');
@@ -21,6 +23,7 @@ var arrayMove = require('array-move');
 var ProLayout = require('@ant-design/pro-layout');
 var cloneDeep = require('lodash/cloneDeep');
 var classNames = require('classnames');
+var debounce = require('lodash/debounce');
 var reactDnd = require('react-dnd');
 var reactDndHtml5Backend = require('react-dnd-html5-backend');
 var Editor$1 = require('@monaco-editor/react');
@@ -38,9 +41,11 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment$1);
+var request__default = /*#__PURE__*/_interopDefaultLegacy(request$1);
 var ProLayout__default = /*#__PURE__*/_interopDefaultLegacy(ProLayout);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
+var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var Editor__default = /*#__PURE__*/_interopDefaultLegacy(Editor$1);
 var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var castArray__default = /*#__PURE__*/_interopDefaultLegacy(castArray);
@@ -484,20 +489,6 @@ function _defineProperty(obj, key, value) {
   }
   return obj;
 }
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
 function _inherits(subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function");
@@ -1164,109 +1155,57 @@ function handleCommonTimeRender(text, format) {
 var getItemDefaultWidth = function getItemDefaultWidth(item) {
   var _ref;
   var defaultWidth = 200;
+  if (Array.isArray(item.key) || Array.isArray(item.dataIndex)) return defaultWidth;
   var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
-  if (lowerCaseKey) {
-    switch (true) {
-      case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
-        defaultWidth = 60;
-        break;
-      case lowerCaseKey.indexOf('number') > -1:
-      case lowerCaseKey.indexOf('quantity') > -1:
-      case lowerCaseKey.indexOf('amount') > -1:
-        defaultWidth = 90;
-        break;
-      case lowerCaseKey.indexOf('no') > -1:
-        defaultWidth = 200;
-        break;
-      case lowerCaseKey.indexOf('code') > -1:
-        defaultWidth = 170;
-        break;
-      case lowerCaseKey.indexOf('time') > -1:
-        defaultWidth = 130;
-        break;
-      case lowerCaseKey.indexOf('status') > -1:
-        defaultWidth = 100;
-        break;
-      case lowerCaseKey.indexOf('user') > -1:
-        defaultWidth = 130;
-        break;
-    }
+  if (!lowerCaseKey) return defaultWidth;
+  switch (true) {
+    case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
+      defaultWidth = 60;
+      break;
+    case lowerCaseKey.indexOf('number') > -1:
+    case lowerCaseKey.indexOf('quantity') > -1:
+    case lowerCaseKey.indexOf('amount') > -1:
+      defaultWidth = 90;
+      break;
+    case lowerCaseKey.indexOf('no') > -1:
+      defaultWidth = 200;
+      break;
+    case lowerCaseKey.indexOf('code') > -1:
+      defaultWidth = 170;
+      break;
+    case lowerCaseKey.indexOf('time') > -1:
+      defaultWidth = 130;
+      break;
+    case lowerCaseKey.indexOf('status') > -1:
+      defaultWidth = 100;
+      break;
+    case lowerCaseKey.indexOf('user') > -1:
+      defaultWidth = 130;
+      break;
   }
   return defaultWidth;
 };
-/**
- * 查询参数处理
- * @param params 要应用于查询的参数
- * @returns 返回处理后的查询参数
- */
-function queryParams(params, flag) {
-  var _loop = function _loop() {
-    if (Object.prototype.hasOwnProperty.call(params, key)) {
-      var element = params[key];
-      if (element && key.indexOf('*number*') >= 0) {
-        var dataParams = key.split('*number*');
-        dataParams.forEach(function (value, index) {
-          params[value] = element[index];
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*address*') >= 0) {
-        var _dataParams = key.split('*address*');
-        _dataParams.forEach(function (value, index) {
-          params[value] = element.PCDCode[index];
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*costType*') >= 0) {
-        var _dataParams2 = key.split('*costType*');
-        // eslint-disable-next-line prefer-destructuring
-        params[_dataParams2[0]] = element[1];
-        delete params[key];
-      } else if (element && key.indexOf('*fullDate*') >= 0) {
-        var _dataParams3 = key.split('*fullDate*');
-        _dataParams3.forEach(function (value, index) {
-          if (index === 0) {
-            params[value] = moment__default['default'](element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-          } else {
-            params[value] = moment__default['default'](element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-          }
-        });
-        delete params[key];
-      } else if (element && key.indexOf('*') >= 0) {
-        var _dataParams4 = key.split('*');
-        _dataParams4.forEach(function (value, index) {
-          params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-        });
-        delete params[key];
-      } else if (element && key.indexOf('_likeIn_') >= 0) {
-        var _dataParams5 = key.split('_likeIn_');
-        if (element.indexOf(',') >= 0) {
-          params["qp-".concat(_dataParams5[0], "-in")] = element.split(',').join(',');
-          params["qp-".concat(_dataParams5[0], "-like")] = null;
-        } else {
-          params["qp-".concat(_dataParams5[0], "-like")] = element;
-          params["qp-".concat(_dataParams5[0], "-in")] = null;
-        }
-        delete params[key];
-      } else if (Array.isArray(element)) {
-        params[key] = element.join(',');
-      }
-    }
-  };
-  for (var key in params) {
-    _loop();
-  }
-  return flag ? params : qs.stringify(params);
-}
 /**
  * 根据用户权限检验对应按钮是够显示 ！！！！现在先去掉
  * @param code 对应权限值
  * @returns boolean
  */
 var authFn = function authFn(code) {
+  if (!code) {
+    return true;
+  }
   var authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)) : [];
   return authButton.findIndex(function (d) {
     return d === code;
   }) !== -1;
 };
+// 可以将普通字符串 或者tsx 转换成字符串
+var renderToString = function renderToString(render) {
+  return render;
+  // return typeof render === 'string'
+  //   ? render
+  //   : ReactDOMServer.renderToString(render);
+};
 
 var formatter = function formatter(data, parentAuthority, parentName) {
   return data.map(function (item) {
@@ -1317,52 +1256,49 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
       var text = _ref.text;
       return handleTooltipHours(text, col.timeRenderHour);
     };
-  }
-  // 处理不显示 时分秒的时间
-  if (col.timeRender) {
+  } else if (col.timeRender) {
+    // 处理不显示 时分秒的时间
     col.render = function (_ref2) {
       var text = _ref2.text;
       return handleTooltip(text, col.timeRender);
     };
-  }
-  // 处理文字太长
-  if (col.textOverflow) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
     col.render = function (_ref3) {
       var text = _ref3.text;
       return handleTextOverflow(text, col.width);
     };
-  }
-  if (col.images) {
+  } else if (col.images) {
     col.render = function (_ref4) {
       var text = _ref4.text;
       return tableColumnsImage(text);
     };
-  }
-  if (col.double) {
+  } else if (col.double) {
     col.render = function (_ref5) {
       var record = _ref5.record;
       return handleTextDouble(record[col.textOne], record[col.textTwo]);
     };
-  }
-  if (col.lineFeed) {
+  } else if (col.lineFeed) {
     col.render = function (_ref6) {
       var text = _ref6.text;
       return handleTextLineFeed(text);
     };
-  }
-  // 处理序号
-  if (col.indexNumber) {
+  } else if (col.indexNumber) {
+    // 处理序号
     col.render = function (_ref7) {
       var index = _ref7.index;
       return index + 1;
     };
-  }
-  // 没有值默认显示 - -
-  if (!col.render) {
+  } else if (col.isPermissionColumn && Array.isArray(col === null || col === void 0 ? void 0 : col.render)) {
+    col.render = col.render.filter(function (item) {
+      return authFn(item.code);
+    });
+  } else if (!col.render) {
+    // 没有值默认显示 - -
     // col.render = ({ text }: any) => text || '- -';
     col.render = function (_ref8) {
       var text = _ref8.text;
-      return text || '--';
+      return text !== null && text !== void 0 ? text : '--';
     };
   }
 };
@@ -1456,10 +1392,64 @@ var judgeIsEmpty = function judgeIsEmpty(value) {
   return false;
 };
 
+var _excluded = ["url"];
+var get = function get(url, params) {
+  return request__default['default'].get(url, _objectSpread2({}, params)).then(handleResponseData);
+};
+var post = function post(url, data) {
+  return request__default['default'].post(url, {
+    data: data
+  }).then(handleResponseData);
+};
+var patch = function patch(url, data) {
+  return request__default['default'].patch(url, {
+    data: data
+  }).then(handleResponseData);
+};
+var put = function put(url, data) {
+  return request__default['default'].put(url, {
+    data: data
+  }).then(handleResponseData);
+};
+var deleteS = function deleteS(url, data) {
+  return request__default['default'].delete(url, {
+    data: data
+  }).then(handleResponseData);
+};
+var requestUtil = function requestUtil(_ref) {
+  var url = _ref.url,
+    parms = _objectWithoutProperties(_ref, _excluded);
+  return request__default['default'](url, parms).then(handleResponseData);
+};
+var handleResponseData = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", Promise.resolve({
+            data: response,
+            status: response.status
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function handleResponseData(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+requestUtil.get = get;
+requestUtil.post = post;
+requestUtil.patch = patch;
+requestUtil.put = put;
+requestUtil.delete = deleteS;
+
 var css_248z$1 = ".luckysheet {\n  overflow: hidden;\n}\n.luckysheet .luckysheet-work-area.luckysheet-noselected-text {\n  display: none;\n}\n.sheet_table_top {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_top .menu_item_text {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n.sheet_table_footer {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_text {\n  color: #8f8f8f;\n}\n.sheet_table_dnd_text {\n  background: #f2f2f2;\n  border: 1px solid #d8d8d8;\n  display: inline-block;\n  width: 100px;\n  height: 30px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n";
 styleInject(css_248z$1);
 
-var _excluded = ["flag", "checkResults"],
+var _excluded$1 = ["flag", "checkResults"],
   _excluded2 = ["flag", "checkResults"];
 // const luckysheet = window.luckysheet;
 var itemsTemp = [];
@@ -1722,7 +1712,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         }).map(function (_ref2) {
           var flag = _ref2.flag,
             checkResults = _ref2.checkResults,
-            item = _objectWithoutProperties(_ref2, _excluded);
+            item = _objectWithoutProperties(_ref2, _excluded$1);
           return item;
         }),
         failData: resultData.filter(function (item) {
@@ -1768,7 +1758,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           brandAuth: 'ctl-withAuth'
         };
       }
-      axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
+      requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
         columns: columns,
         data: resultData,
         checkStockNum: isCheckStockNum
@@ -2028,7 +2018,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
 var css_248z$2 = ".luckysheet {\n  overflow: hidden;\n}\n.luckysheet .luckysheet-work-area.luckysheet-noselected-text {\n  display: none;\n}\n.sheet_table_top {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_top .menu_item_text {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n.sheet_table_footer {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_text {\n  color: #8f8f8f;\n}\n.sheet_table_dnd_text {\n  background: #f2f2f2;\n  border: 1px solid #d8d8d8;\n  display: inline-block;\n  width: 100px;\n  height: 30px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n";
 styleInject(css_248z$2);
 
-var _excluded$1 = ["flag", "checkResults"],
+var _excluded$2 = ["flag", "checkResults"],
   _excluded2$1 = ["flag", "checkResults"];
 // const luckysheet = window.luckysheet;
 var itemsTemp$1 = [];
@@ -2292,7 +2282,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         }).map(function (_ref2) {
           var flag = _ref2.flag,
             checkResults = _ref2.checkResults,
-            item = _objectWithoutProperties(_ref2, _excluded$1);
+            item = _objectWithoutProperties(_ref2, _excluded$2);
           return item;
         }),
         failData: resultData.filter(function (item) {
@@ -2329,7 +2319,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       var resultData = _this.getData().filter(function (d) {
         return ___default['default'].compact(Object.values(d)).length;
       });
-      axios__default['default'].post(validDataUrl, {
+      requestUtil.post(validDataUrl, {
         columns: columns,
         data: resultData
       }).then(function (result) {
@@ -2606,7 +2596,8 @@ var css_248z$3 = ".query_input_show {\n  display: flex;\n}\n.query_input_expand_
 styleInject(css_248z$3);
 
 var QueryMutipleInput = function QueryMutipleInput(_ref) {
-  var onValueChange = _ref.onValueChange;
+  var onValueChange = _ref.onValueChange,
+    _onPressEnter = _ref.onPressEnter;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isModalVisible = _useState2[0],
@@ -2669,7 +2660,10 @@ var QueryMutipleInput = function QueryMutipleInput(_ref) {
     style: {
       width: 'calc(100% - 30px)'
     },
-    placeholder: "\u8BF7\u8F93\u5165\uFF08\u67E5\u8BE2\u591A\u4E2A\u503C\u8BF7\u7528 ; \u6216 , \u5206\u5272\uFF09"
+    placeholder: "\u8BF7\u8F93\u5165\uFF08\u67E5\u8BE2\u591A\u4E2A\u503C\u8BF7\u7528 ; \u6216 , \u5206\u5272\uFF09",
+    onPressEnter: function onPressEnter() {
+      return _onPressEnter === null || _onPressEnter === void 0 ? void 0 : _onPressEnter();
+    }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     style: {
       width: '30px',
@@ -2719,7 +2713,7 @@ function ToCDB(str) {
   return tmp;
 }
 
-var css_248z$4 = ".search_select_show {\n  display: flex;\n}\n.search_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.search_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_wrapper {\n  position: relative;\n  display: flex;\n  min-height: 60vh;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.search_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_left {\n  width: 28%;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-left: 20px;\n}\n.search_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.search_select_wrapper_right {\n  width: 70%;\n  margin-left: 1%;\n}\n.search_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 20px;\n}\n.search_select_wrapper_right,\n.search_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.search_select_wrapper .select_list_columns {\n  width: 100%;\n  height: calc(60vh - 60px);\n  overflow-y: auto;\n  border: 1px solid #d8d8d8;\n}\n.search_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.search_select_wrapper .select_list_columns_formItems {\n  padding: 0 20px;\n}\n.search_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px 0px;\n  justify-content: flex-end;\n}\n.search_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 34px;\n  line-height: 32px;\n  background-color: #eee;\n  margin-bottom: 10px;\n  padding: 0 12px;\n}\n.search_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n";
+var css_248z$4 = ".search_select_show {\n  display: flex;\n}\n.search_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.search_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_wrapper {\n  position: relative;\n  display: flex;\n  min-height: 60vh;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.search_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_left {\n  width: 28%;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-left: 20px;\n}\n.search_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.search_select_wrapper_right {\n  width: 70%;\n  margin-left: 1%;\n}\n.search_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 20px;\n}\n.search_select_wrapper_right,\n.search_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.search_select_wrapper .select_list_columns {\n  width: 100%;\n  height: calc(60vh - 60px);\n  overflow-y: auto;\n  border: 1px solid #d8d8d8;\n}\n.search_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.search_select_wrapper .select_list_columns_formItems {\n  padding: 0 20px;\n}\n.search_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px 0px;\n  justify-content: flex-end;\n}\n.search_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 34px;\n  line-height: 32px;\n  background-color: #eee;\n  margin-bottom: 10px;\n  padding: 0 12px;\n}\n.search_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n";
 styleInject(css_248z$4);
 
 var handleSourceName = function handleSourceName(sName) {
@@ -3007,6 +3001,16 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
             }
           });
           delete params[key];
+        } else if (element && key.indexOf('*multiInput') >= 0) {
+          var name = '',
+            _value = element['value'];
+          if (_value.indexOf(',') >= 0) {
+            name = "qp-".concat(element['name'], "-in");
+          } else {
+            name = "qp-".concat(element['name'], "-like");
+          }
+          params[name] = _value;
+          delete params[key];
         } else if (element && key.indexOf('*') >= 0) {
           var _dataParams7 = key.split('*');
           _dataParams7.forEach(function (value, index) {
@@ -3041,7 +3045,10 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       pageSize: pageSize,
       currentPage: currentPage
     }, otherParams), fixedParam), params);
-    axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(queryParams)), {
+    if (_.isNil(queryParams[selectParamsKey])) {
+      queryParams[selectParamsKey] = searchValue;
+    }
+    requestUtil.get("".concat(url, "?").concat(querystring.stringify(queryParams)), {
       headers: _objectSpread2({}, extralHeaders)
     }).then(function (result) {
       setFetching(false);
@@ -3368,8 +3375,9 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       if (heightTxt === '') {
         return text;
       }
+      var searchString = _.escapeRegExp(heightTxt);
       // 前面filterOption 不区分大小写，这里用i
-      var regexp = new RegExp(heightTxt, 'gi');
+      var regexp = new RegExp(searchString, 'gi');
       return text.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
     return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
@@ -3602,9 +3610,10 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }
       }), menu);
     },
-    notFoundContent: fetching ? /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
-      size: "small"
-    }) : /*#__PURE__*/React__default['default'].createElement("div", {
+    notFoundContent: fetching ? ( /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
+      size: "small",
+      className: 'searchSelectSpin'
+    })) : ( /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         textAlign: 'center'
       }
@@ -3616,7 +3625,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       style: {
         fontSize: '50px'
       }
-    })), /*#__PURE__*/React__default['default'].createElement("div", null, "\u65E0\u5339\u914D\u7ED3\u679C\uFF0C\u8BF7\u66F4\u6362\u5176\u4ED6\u5185\u5BB9\u518D\u8BD5")),
+    })), /*#__PURE__*/React__default['default'].createElement("div", null, "\u65E0\u5339\u914D\u7ED3\u679C\uFF0C\u8BF7\u66F4\u6362\u5176\u4ED6\u5185\u5BB9\u518D\u8BD5"))),
     onPopupScroll: SelectScroll,
     style: {
       width: needModalTable ? 'calc(100% - 30px)' : 'calc(100%)'
@@ -3644,7 +3653,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClick: showModal,
     type: "primary"
   }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))))), needModalTable && isModalVisible && ( /*#__PURE__*/React__default['default'].createElement(antd.Modal, _objectSpread2({
-    width: '80%',
+    width: "80%",
     title: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalTableTitle,
     visible: isModalVisible,
     onOk: handleOk,
@@ -3677,16 +3686,16 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: 'select_list_columns_formItems'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
     form: form,
-    layout: 'vertical',
-    key: 'modalForm'
+    layout: "vertical",
+    key: "modalForm"
   }, formItem(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm)))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'select_list_searchButton'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    key: 'reset',
+    key: "reset",
     className: 'select_list_button_space',
     onClick: onResetTable
   }, "\u91CD\u7F6E"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    key: 'search',
+    key: "search",
     type: "primary",
     onClick: onSearchTable
   }, "\u67E5\u8BE2"))), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3699,14 +3708,14 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, "\u641C\u7D22\u7ED3\u679C\u5171", /*#__PURE__*/React__default['default'].createElement("span", {
     style: themeColor
-  }, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || 0), "\u9879", selectMode ? /*#__PURE__*/React__default['default'].createElement("span", null, "\uFF0C \u672C\u6B21\u5DF2\u9009", /*#__PURE__*/React__default['default'].createElement("span", {
+  }, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || 0), "\u9879", selectMode ? ( /*#__PURE__*/React__default['default'].createElement("span", null, "\uFF0C \u672C\u6B21\u5DF2\u9009", /*#__PURE__*/React__default['default'].createElement("span", {
     style: themeColor
-  }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\u9879") : ''), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\u9879")) : ''), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       color: 'rgba(127, 127, 127, 0.6470588235294118)'
     }
   }, selectMode ? '勾选后点击确定按钮完成选择' : '双击数据行或点击单选图标完成选择')), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    size: 'small',
+    size: "small",
     rowSelection: rowSelection,
     columns: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns,
     dataSource: tableData,
@@ -3724,14 +3733,14 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }
       };
     }
-  }), selectMode ? /*#__PURE__*/React__default['default'].createElement("div", {
+  }), selectMode ? ( /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'select_list_selectAll'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     indeterminate: indeterminate,
     checked: checkedAll,
     onChange: onChangeCheckAll,
     disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
-  }), " \u5168\u9009\u6240\u6709\u9875\u9762") : ''))))));
+  }), ' ', "\u5168\u9009\u6240\u6709\u9875\u9762")) : ''))))));
 });
 
 var css_248z$5 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n.react-resizable {\n  position: relative;\n  background-clip: padding-box;\n}\n.react-resizable-handle {\n  position: absolute;\n  width: 10px;\n  height: 100%;\n  bottom: 0;\n  right: -5px;\n  cursor: col-resize;\n  z-index: 1;\n}\n";
@@ -3754,7 +3763,7 @@ var fixedRightActive = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20enc
 var css_248z$6 = ".sort_table_wrapper .sort_table {\n  display: flex;\n}\n.sort_table_wrapper .sort_table .sort_table_column_wrapper {\n  width: 560px;\n  margin-right: 10px;\n}\n.sort_table_wrapper .sort_table .sort_table_content_wrapper {\n  width: 210px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count,\n.sort_table_wrapper .sort_table .sort_table_content_count {\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count span,\n.sort_table_wrapper .sort_table .sort_table_content_count span {\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column {\n  margin-top: 10px;\n  width: 560px;\n  height: 430px;\n  overflow: auto;\n  padding: 10px;\n  background: #ffffff;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: space-between;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all_empty {\n  width: 538px;\n  line-height: 360px;\n  text-align: center;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column_special {\n  margin-top: 40px;\n  width: 100px;\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper {\n  width: 144px;\n  margin-top: 16px;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper + .ant-checkbox-wrapper {\n  margin-left: 0px;\n}\n.sort_table_wrapper .sort_table .sort_table_content {\n  margin-top: 10px;\n  padding-top: 10px;\n  padding-bottom: 10px;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_content .ant-table-wrapper {\n  padding: 0px !important;\n}\n.sort_table_wrapper .sort_table .sort_table_content .sort_table_title {\n  height: 32px;\n  line-height: 32px;\n  padding-left: 10px;\n  color: gray;\n}\n.sort_table_wrapper div.ant-modal-header {\n  width: 820px;\n  height: 64px;\n  background: #ffffff;\n  padding: 20px;\n  border: 0px;\n}\n.sort_table_wrapper div.ant-modal-header div.ant-modal-title {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 24px;\n}\n.sort_table_wrapper .ant-modal-body {\n  padding: 0 20px !important;\n}\n.sort_table_wrapper .ant-modal-close-x {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-input-affix-wrapper {\n  padding: 0px;\n  padding-right: 10px;\n}\n.sort_table_wrapper input {\n  height: 32px;\n  padding: 6px 4px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-input-prefix {\n  width: 24px;\n  height: 24px;\n  margin: 4px;\n  display: flex;\n  justify-content: center;\n}\n.sort_table_wrapper .ant-modal-footer {\n  height: 70px;\n  border: 0;\n  padding: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn {\n  width: 80px;\n  height: 34px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn span {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 14px;\n  letter-spacing: 0;\n  text-align: center;\n  line-height: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn:first-child {\n  margin-right: 524px;\n}\n.sort_table_wrapper .ant-table-wrapper::-webkit-scrollbar {\n  display: none;\n}\n.sort_table_wrapper .ant-table-wrapper {\n  margin-top: 10px;\n  height: 364px;\n  overflow: scroll;\n  padding-bottom: 50px;\n}\n.sort_table_wrapper .ant-table-wrapper tr {\n  height: 36px;\n}\n.sort_table_wrapper .ant-table-wrapper tr td {\n  width: 24px !important;\n  height: 36px !important;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:first-child {\n  padding-left: 10px !important;\n  padding-right: 0px !important;\n  width: 115px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td img {\n  cursor: pointer;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:not(:first-child) {\n  padding-left: 0px !important;\n  padding-right: 0px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child {\n  padding-left: 0px !important;\n  padding-right: 3px !important;\n  width: 34px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child img {\n  position: relative;\n  top: 1px;\n}\n.global_tab_nav_style {\n  top: 2px !important;\n}\n.row-dragging {\n  background: #fafafa;\n  border: 1px solid #ccc;\n  z-index: 10000;\n}\n.row-dragging td {\n  padding: 7px 16px;\n  display: none;\n}\n.row-dragging td:first-child {\n  display: inline-block;\n}\n.row-dragging .drag-visible {\n  visibility: visible;\n}\n";
 styleInject(css_248z$6);
 
-var _excluded$2 = ["className", "style"];
+var _excluded$3 = ["className", "style"];
 var Search = antd.Input.Search;
 var DragHandle = reactSortableHoc.SortableHandle(function () {
   return /*#__PURE__*/React__default['default'].createElement("img", {
@@ -3800,7 +3809,7 @@ var TableColumnSetting = /*#__PURE__*/function (_React$Component) {
           fixed: item.fixed
         };
       });
-      axios__default['default']({
+      requestUtil({
         url: handleRequestUrl('/user', '/appConfig/saveUserOrder', appRequestConfig),
         method: 'POST',
         data: {
@@ -4108,7 +4117,7 @@ var TableColumnSetting = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$2);
+        restProps = _objectWithoutProperties(_ref2, _excluded$3);
       var sortDataSource = _this.state.sortDataSource;
       // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
@@ -4394,33 +4403,33 @@ var noEmptyArray = function noEmptyArray(arr) {
 var getItemDefaultWidth$1 = function getItemDefaultWidth(item) {
   var _ref;
   var defaultWidth = 200;
+  if (Array.isArray(item.key) || Array.isArray(item.dataIndex)) return defaultWidth;
   var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
-  if (lowerCaseKey) {
-    switch (true) {
-      case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
-        defaultWidth = 60;
-        break;
-      case lowerCaseKey.indexOf('number') > -1:
-      case lowerCaseKey.indexOf('quantity') > -1:
-      case lowerCaseKey.indexOf('amount') > -1:
-        defaultWidth = 90;
-        break;
-      case lowerCaseKey.indexOf('no') > -1:
-        defaultWidth = 200;
-        break;
-      case lowerCaseKey.indexOf('code') > -1:
-        defaultWidth = 170;
-        break;
-      case lowerCaseKey.indexOf('time') > -1:
-        defaultWidth = 130;
-        break;
-      case lowerCaseKey.indexOf('status') > -1:
-        defaultWidth = 100;
-        break;
-      case lowerCaseKey.indexOf('user') > -1:
-        defaultWidth = 130;
-        break;
-    }
+  if (!lowerCaseKey) return defaultWidth;
+  switch (true) {
+    case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
+      defaultWidth = 60;
+      break;
+    case lowerCaseKey.indexOf('number') > -1:
+    case lowerCaseKey.indexOf('quantity') > -1:
+    case lowerCaseKey.indexOf('amount') > -1:
+      defaultWidth = 90;
+      break;
+    case lowerCaseKey.indexOf('no') > -1:
+      defaultWidth = 200;
+      break;
+    case lowerCaseKey.indexOf('code') > -1:
+      defaultWidth = 170;
+      break;
+    case lowerCaseKey.indexOf('time') > -1:
+      defaultWidth = 130;
+      break;
+    case lowerCaseKey.indexOf('status') > -1:
+      defaultWidth = 100;
+      break;
+    case lowerCaseKey.indexOf('user') > -1:
+      defaultWidth = 130;
+      break;
   }
   return defaultWidth;
 };
@@ -4447,7 +4456,7 @@ var getSelectDataList = function getSelectDataList(record, item, selectKey) {
 };
 var loadSelectSource = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
-    axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
+    requestUtil.get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
       result = result.data;
       if (judgeIsRequestError(result)) {
         antd.message.error(result.msg);
@@ -4512,10 +4521,11 @@ var formatFormSourceList = function formatFormSourceList(x, loadList, tableSearc
   });
 };
 
-var _excluded$3 = ["onResize", "width"];
+var _excluded$4 = ["onResize", "width"],
+  _excluded2$2 = ["name", "label", "field", "type", "filterFormItem", "initialSource"];
 var checkSpuMatchCode = function checkSpuMatchCode(data) {
   return new Promise(function (resolve, reject) {
-    axios__default['default'].post("/stock/rwFrontRecordSkcDetail/checkSpuMatchCode", data).then(function (result) {
+    requestUtil.post("/stock/rwFrontRecordSkcDetail/checkSpuMatchCode", data).then(function (result) {
       result = result.data;
       if (judgeIsRequestError(result)) {
         antd.message.error(result.msg);
@@ -4531,7 +4541,7 @@ var checkSpuMatchCode = function checkSpuMatchCode(data) {
 var ResizeableTitle = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
-    restProps = _objectWithoutProperties(props, _excluded$3);
+    restProps = _objectWithoutProperties(props, _excluded$4);
   if (!width) {
     return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
   }
@@ -4566,6 +4576,7 @@ var AddSelect = function AddSelect(props) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     onSaveCallback = props.onSaveCallback,
+    onCancelCallback = props.onCancelCallback,
     _props$buttonText = props.buttonText,
     buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText,
     _props$buttonProps = props.buttonProps,
@@ -4576,7 +4587,8 @@ var AddSelect = function AddSelect(props) {
     _props$businessType = props.businessType,
     businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
     _props$isAllowRepeate = props.isAllowRepeatedSelect,
-    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate,
+    clearTitle = props.clearTitle;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -4729,6 +4741,7 @@ var AddSelect = function AddSelect(props) {
     setShowToChooseColumns = _useState46[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
+  // FIXME: 特殊业务逻辑
   var checkSelectChange = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
       var result;
@@ -4810,6 +4823,7 @@ var AddSelect = function AddSelect(props) {
   }();
   var setBusinessDefaultValue = function setBusinessDefaultValue(list, recordList) {
     var result = list;
+    // FIXME: 特殊业务逻辑
     if (businessType == 'spu' && ((recordList === null || recordList === void 0 ? void 0 : recordList.some(function (i) {
       var _i$colorValues;
       return (i === null || i === void 0 ? void 0 : (_i$colorValues = i.colorValues) === null || _i$colorValues === void 0 ? void 0 : _i$colorValues.length) == 1;
@@ -4848,6 +4862,7 @@ var AddSelect = function AddSelect(props) {
             var _record$packingUnitLi, _record$packingUnitLi2;
             // let
             if (record.needFocus === true && currentIndex === 0) ;
+            // FIXME: 特殊业务逻辑
             var precisionObj = businessType == 'skc' ? {
               precision: 0
             } : {};
@@ -5120,6 +5135,16 @@ var AddSelect = function AddSelect(props) {
             }
           });
           delete params[key];
+        } else if (element && key.indexOf('*multiInput') >= 0) {
+          var name = '',
+            _value = element['value'];
+          if (_value.indexOf(',') >= 0) {
+            name = "qp-".concat(element['name'], "-in");
+          } else {
+            name = "qp-".concat(element['name'], "-like");
+          }
+          params[name] = _value;
+          delete params[key];
         } else if (element && key.indexOf('*') >= 0) {
           var _dataParams7 = key.split('*');
           _dataParams7.forEach(function (value, index) {
@@ -5154,7 +5179,18 @@ var AddSelect = function AddSelect(props) {
       pageSize: pageSize,
       currentPage: currentPage
     }, otherParams), fixedParam), params);
-    axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(queryParams))).then(function (result) {
+    //todo 为了满足单个使用like查询，多个含，的使用in查询
+    if (!queryParams.unConvert) {
+      Object.keys(queryParams).forEach(function (key) {
+        if (String(queryParams[key]).includes(',')) {
+          if (key.includes('like')) {
+            queryParams[key.replace('like', 'in')] = queryParams[key];
+            delete queryParams[key];
+          }
+        }
+      });
+    }
+    requestUtil.get("".concat(url).concat(url.includes("?") ? "&" : "?").concat(querystring.stringify(queryParams))).then(function (result) {
       setFetching(false);
       result = result.data;
       if (judgeIsRequestError(result)) {
@@ -5349,27 +5385,31 @@ var AddSelect = function AddSelect(props) {
     setTableFormParams({});
     setIsModalVisible(false);
     setTableData([]);
+    onCancelCallback && onCancelCallback();
     // if (selectMode) {
     //   run();
     // }
   };
   var onSearchTable = function onSearchTable() {
-    var params = form.getFieldsValue();
-    setTableFormParams(params);
-    getData(_objectSpread2(_objectSpread2({}, params), {}, {
-      pageSize: tableInitPageSize
-    }), 2);
-    // if (selectMode) {
-    //   getData(params)
-    // }
+    form.validateFields().then(function () {
+      var params = form.getFieldsValue();
+      setTableFormParams(params);
+      getData(_objectSpread2(_objectSpread2({}, params), {}, {
+        pageSize: tableInitPageSize
+      }), 2);
+    });
   };
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
-    getData({
-      pageSize: tableInitPageSize,
-      currentPage: 1
-    }, 2);
+    form.validateFields().then(function () {
+      getData({
+        pageSize: tableInitPageSize,
+        currentPage: 1
+      }, 2);
+    }).catch(function () {
+      setTableData([]);
+    });
   };
   var handleTableChange = function handleTableChange(pagination) {
     getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
@@ -5437,62 +5477,69 @@ var AddSelect = function AddSelect(props) {
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
       return list.map(function (i, index) {
-        var _i$field, _i$field3, _i$field5, _i$field6, _i$field7;
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'select' || (i === null || i === void 0 ? void 0 : (_i$field = i.field) === null || _i$field === void 0 ? void 0 : _i$field.type) === 'select') {
-          var _i$field2, _i$initialSource;
-          return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-            name: i.name,
-            label: i.label,
-            key: i.name
-          }, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
+        var name = i.name,
+          label = i.label,
+          field = i.field,
+          _i$type = i.type,
+          type = _i$type === void 0 ? '' : _i$type,
+          filterFormItem = i.filterFormItem,
+          _i$initialSource = i.initialSource,
+          initialSource = _i$initialSource === void 0 ? [] : _i$initialSource,
+          restProps = _objectWithoutProperties(i, _excluded2$2);
+        if (type === 'custom_filter_form_item') return filterFormItem;
+        if (type === 'select' || (field === null || field === void 0 ? void 0 : field.type) === 'select') {
+          return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({
+            name: name,
+            label: label,
+            key: name
+          }, restProps), /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
             style: {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field2 = i.field) === null || _i$field2 === void 0 ? void 0 : _i$field2.props), (i === null || i === void 0 ? void 0 : (_i$initialSource = i.initialSource) === null || _i$initialSource === void 0 ? void 0 : _i$initialSource.length) && (i === null || i === void 0 ? void 0 : i.initialSource.map(function (m) {
+          }, field === null || field === void 0 ? void 0 : field.props), initialSource.length && initialSource.map(function (m) {
             return /*#__PURE__*/React__default['default'].createElement(Option$2, {
               value: m.value,
               key: m.value
             }, m.text);
-          }))));
+          })));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'treeSelect' || (i === null || i === void 0 ? void 0 : (_i$field3 = i.field) === null || _i$field3 === void 0 ? void 0 : _i$field3.type) === 'treeSelect') {
-          var _i$field4;
-          return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-            name: i.name,
-            label: i.label,
-            key: i.name
-          }, /*#__PURE__*/React__default['default'].createElement(antd.TreeSelect, _objectSpread2({
+        if (type === 'treeSelect' || (field === null || field === void 0 ? void 0 : field.type) === 'treeSelect') {
+          return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({
+            name: name,
+            label: label,
+            key: name
+          }, restProps), /*#__PURE__*/React__default['default'].createElement(antd.TreeSelect, _objectSpread2({
             style: {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field4 = i.field) === null || _i$field4 === void 0 ? void 0 : _i$field4.props)));
-        }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'BusinessSearchSelect' || (i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : _i$field5.type) === 'BusinessSearchSelect') {
-          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-            name: i.name,
-            label: i.label,
-            key: i.name
-          }, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, _objectSpread2({}, i.field.props))));
-        }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field6 = i.field) === null || _i$field6 === void 0 ? void 0 : _i$field6.type) === 'multipleQueryInput') {
-          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-            name: i.name,
-            label: i.label,
-            key: i.name
-          }, /*#__PURE__*/React__default['default'].createElement(QueryMutipleInput, {
+          }, field === null || field === void 0 ? void 0 : field.props)));
+        }
+        if (type === 'BusinessSearchSelect' || (field === null || field === void 0 ? void 0 : field.type) === 'BusinessSearchSelect') {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({
+            name: name,
+            label: label,
+            key: name
+          }, restProps), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, _objectSpread2({}, field === null || field === void 0 ? void 0 : field.props))));
+        }
+        if (type === 'multipleQueryInput' || (field === null || field === void 0 ? void 0 : field.type) === 'multipleQueryInput') {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({
+            name: name,
+            label: label,
+            key: name
+          }, restProps), /*#__PURE__*/React__default['default'].createElement(QueryMutipleInput, {
             onValueChange: function onValueChange(value) {
-              form.setFieldsValue(_defineProperty({}, i.name, value));
+              form.setFieldsValue(_defineProperty({}, name, value));
             }
           })));
         }
         // 默认type是input
-        return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-          name: i.name,
-          label: i.label,
-          key: i.name
-        }, /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({
+        return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({
+          name: name,
+          label: label,
+          key: name
+        }, restProps), /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({
           id: index === 0 ? "first-query" : 'index',
           style: {
             width: '100%'
@@ -5505,7 +5552,7 @@ var AddSelect = function AddSelect(props) {
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
-        }, i === null || i === void 0 ? void 0 : (_i$field7 = i.field) === null || _i$field7 === void 0 ? void 0 : _i$field7.props)));
+        }, field === null || field === void 0 ? void 0 : field.props)));
       });
     } else {
       return null;
@@ -5757,7 +5804,7 @@ var AddSelect = function AddSelect(props) {
     style: _objectSpread2(_objectSpread2({}, themeColor), {}, {
       cursor: 'pointer'
     })
-  }, "\u6E05\u7A7A\u6240\u9009\u5546\u54C1")))), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+  }, clearTitle !== null && clearTitle !== void 0 ? clearTitle : '清空所选商品')))), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     size: 'small',
     columns: showSelectedCol,
     dataSource: popvalue,
@@ -5796,7 +5843,7 @@ var getSkuImg = function getSkuImg(record) {
   return imgShow;
 };
 
-var _excluded$4 = ["onResize", "width"];
+var _excluded$5 = ["onResize", "width"];
 var _this = undefined;
 var InputElement = function InputElement(_ref) {
   var _record$packingUnitLi, _record$packingUnitLi2;
@@ -5824,7 +5871,7 @@ var InputElement = function InputElement(_ref) {
     setValue = _useState6[1];
   var inputRef = React.useRef(false);
   var onSerchdata = function onSerchdata(name) {
-    axios__default['default'].get("/items/sku/pager/v2?".concat(querystring.stringify({
+    requestUtil.get("/items/sku/pager/v2?".concat(querystring.stringify({
       'skuCodeAndSkuName': name,
       'pageSize': 100,
       'qp-combination-eq': false,
@@ -6299,7 +6346,7 @@ var InputElement = function InputElement(_ref) {
 var ResizeableTitle$1 = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
-    restProps = _objectWithoutProperties(props, _excluded$4);
+    restProps = _objectWithoutProperties(props, _excluded$5);
   if (!width) {
     return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
   }
@@ -6508,7 +6555,7 @@ var BillEntry = function BillEntry(_ref3) {
         brandAuth: 'ctl-withAuth'
       };
     }
-    return axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
+    return requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
       columns: ["skuCode", "quantity"],
       data: resultData.map(function (i) {
         return {
@@ -6792,16 +6839,6 @@ var nodeType = [{
   text: '商店',
   value: 100
 }];
-var personDataSourceType = [{
-  text: "平台自建",
-  value: 10
-}, {
-  text: "MDM",
-  value: 20
-}, {
-  text: "IAM",
-  value: 30
-}];
 
 var getDicData = function getDicData(dicCode) {
   var dicData = {};
@@ -6843,7 +6880,7 @@ var getDictionaryTextByValue = function getDictionaryTextByValue(dicCode, value)
 };
 var loadSelectSource$1 = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
-    axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
+    requestUtil.get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
       result = result.data;
       if (judgeIsRequestError(result)) {
         antd.message.error(result.msg);
@@ -6881,7 +6918,6 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
     case 'salesOrg':
     case 'employee2':
     case 'role':
-    case 'person':
       result = '/user';
       break;
     case 'deliveryMode':
@@ -9094,53 +9130,6 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
-  // 人员选择器
-  if (type === 'person') {
-    requestConfig = _objectSpread2({
-      url: "".concat(prefixUrl.selectPrefix, "/person"),
-      filter: 'qp-code,name-orGroup,like',
-      mappingTextField: 'name',
-      mappingTextShowKeyField: 'code',
-      mappingValueField: 'code',
-      otherParams: {
-        sorter: 'desc-id'
-      },
-      sourceName: 'personCode'
-    }, requestConfigProp);
-    tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '姓名'
-    }, {
-      name: 'qp-code-like',
-      label: '员工工号'
-    }, {
-      name: 'qp-phone-like',
-      label: '手机号'
-    }];
-    modalTableProps = _objectSpread2({
-      modalTableTitle: '添加人员',
-      tableSearchForm: tableSearchForm,
-      tableColumns: [{
-        title: '姓名',
-        dataIndex: 'name'
-      }, {
-        title: '员工工号',
-        dataIndex: 'code'
-      }, {
-        title: '员工类型',
-        dataIndex: 'dataSource',
-        render: function render(text) {
-          var _personDataSourceType;
-          return (_personDataSourceType = personDataSourceType.find(function (i) {
-            return i.value == text;
-          })) === null || _personDataSourceType === void 0 ? void 0 : _personDataSourceType.text;
-        }
-      }, {
-        title: '手机号',
-        dataIndex: 'phone'
-      }]
-    }, modalTableBusProps);
-  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -9202,24 +9191,28 @@ function handleSelectColumn(c, parentProps) {
   var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || [];
   var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || [];
   // 仅展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (showColumns === null || showColumns === void 0 ? void 0 : showColumns.length) {
     result = result.filter(function (i) {
       return showColumns.includes(i.dataIndex);
     });
   }
   // 过滤不需要展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (exceptColumns === null || exceptColumns === void 0 ? void 0 : exceptColumns.length) {
     result = result.filter(function (i) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
   // 追加(最好不用这个，当组件不固定时候会有影响)
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
     });
   }
   // 覆盖内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (coverColumns === null || coverColumns === void 0 ? void 0 : coverColumns.length) {
     result = coverColumns;
   }
@@ -9231,18 +9224,21 @@ function handleSearchForm(c, parentProps) {
   var exceptTableSearchForm = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptTableSearchForm) || [];
   var coverTableSearchForm = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverTableSearchForm) || [];
   // 仅展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (showTableSearchForm === null || showTableSearchForm === void 0 ? void 0 : showTableSearchForm.length) {
     result = result.filter(function (i) {
       return showTableSearchForm.includes(i.name);
     });
   }
   // 过滤不需要展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (exceptTableSearchForm === null || exceptTableSearchForm === void 0 ? void 0 : exceptTableSearchForm.length) {
     result = result.filter(function (i) {
       return !exceptTableSearchForm.includes(i.name);
     });
   }
   // 覆盖内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (coverTableSearchForm === null || coverTableSearchForm === void 0 ? void 0 : coverTableSearchForm.length) {
     result = coverTableSearchForm;
   }
@@ -9255,18 +9251,21 @@ function handleFormSearchSourceLoad(c, parentProps) {
   var coverTableFormSearchSourceLoad = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverTableFormSearchSourceLoad) || [];
   var noNeedTableFormSearchSourceLoad = parentProps === null || parentProps === void 0 ? void 0 : parentProps.noNeedTableFormSearchSourceLoad;
   // 仅展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (showTableFormSearchSourceLoad === null || showTableFormSearchSourceLoad === void 0 ? void 0 : showTableFormSearchSourceLoad.length) {
     result = result.filter(function (i) {
       return showTableFormSearchSourceLoad.includes(i.url);
     });
   }
   // 过滤不需要展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (exceptTableFormSearchSourceLoad === null || exceptTableFormSearchSourceLoad === void 0 ? void 0 : exceptTableFormSearchSourceLoad.length) {
     result = result.filter(function (i) {
       return !exceptTableFormSearchSourceLoad.includes(i.url);
     });
   }
   // 覆盖内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if (coverTableFormSearchSourceLoad === null || coverTableFormSearchSourceLoad === void 0 ? void 0 : coverTableFormSearchSourceLoad.length) {
     result = coverTableFormSearchSourceLoad;
   }
@@ -9298,6 +9297,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       showTitle: false
     },
     dataIndex: 'itemEancode',
+    // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115627
     render: function render(text) {
       return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
         placement: "topLeft",
@@ -9347,6 +9347,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     },
     render: function render(text, record) {
       var _record$packingUnitLi;
+      // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115636
       if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
         var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
         record.selectUnitCode = basePackUnit.unitCode;
@@ -9429,6 +9430,10 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       }, text);
     }
   }]), [{
+    title: 'SKC编码',
+    width: 150,
+    dataIndex: 'skcCode'
+  }, {
     title: '所属SPU名称',
     width: 100,
     ellipsis: {
@@ -9523,10 +9528,19 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   var mTpTableColumn = handleSelectColumn(initialTableColumn, parProps);
   var initialTableSearchForm = [{
     name: 'qp-skuCode-like',
-    label: 'SKU编码'
+    label: 'SKU编码',
+    type: 'multipleQueryInput'
   }, {
     name: 'qp-skuName-like',
     label: 'SKU名称'
+  }, {
+    name: 'qp-skcCode-like',
+    label: 'SKC编码',
+    type: 'multipleQueryInput'
+  }, {
+    name: 'qp-itemCode-like',
+    label: 'SPU编码',
+    type: 'multipleQueryInput'
   }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
     name: 'qp-code-in',
     label: '商品条码',
@@ -9654,7 +9668,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     setPropertyList = _useState6[1];
   React.useEffect(function () {
     // type: 1 尺码组; 2 配码组
-    axios__default['default'].get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
+    requestUtil.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
       result = result.data;
       if (judgeIsRequestError(result)) {
         antd.message.error(result.msg);
@@ -9711,7 +9725,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   var initialPromiseLoadList = [{
     url: "/items/item/propertyValue/sizeBySkcConfig",
     params: {
-      pageSize: 10000,
+      pageSize: 50,
       currentPage: 1,
       type: 2 // 类型：1尺码；2颜色
     },
@@ -9721,7 +9735,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   }, {
     url: "/items/category/queryCategoryTree",
     params: {
-      pageSize: 5000,
+      pageSize: 50,
       currentPage: 1
     },
     resType: 'treeList',
@@ -9972,7 +9986,7 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
   React.useEffect(function () {
     if (parProps === null || parProps === void 0 ? void 0 : parProps.isSingleColor) {
       // type: 1 尺码组; 2 配码组
-      axios__default['default'].get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
+      requestUtil.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
         result = result.data;
         if (judgeIsRequestError(result)) {
           antd.message.error(result.msg);
@@ -10057,7 +10071,7 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
   }, {
     url: "/items/category/queryCategoryTree",
     params: {
-      pageSize: 5000,
+      pageSize: 50,
       currentPage: 1
     },
     resType: 'treeList',
@@ -10395,7 +10409,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
-var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "rootDisabled", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
+var _excluded$6 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "rootDisabled", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
 var TreeSearchSelect = function TreeSearchSelect(props) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -10437,7 +10451,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     } : _props$style,
     getTreeData = props.getTreeData,
     disabled = props.disabled,
-    restProps = _objectWithoutProperties(props, _excluded$5);
+    restProps = _objectWithoutProperties(props, _excluded$6);
   var url = remoteSource.url,
     headers = remoteSource.headers,
     _remoteSource$paramsK = remoteSource.paramsKey,
@@ -10478,7 +10492,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
   var handleSearch = function handleSearch(q) {
     var paramsData = _objectSpread2(_defineProperty({}, "".concat(paramsKey), q), initialParams);
-    axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(paramsData)), {
+    requestUtil.get("".concat(url, "?").concat(querystring.stringify(paramsData)), {
       headers: headers
     }).then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
@@ -10837,11 +10851,11 @@ var arrow_top = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXA
 var css_248z$9 = ".form-guide {\n  cursor: pointer;\n  position: fixed;\n  right: 5px;\n  color: #B1BAD4;\n  padding: 5px 0;\n  width: 48px;\n  z-index: 10;\n  top: 50%;\n  transform: translateY(-50%);\n  background-color: #141620;\n  border-radius: 5px;\n}\n.form-guide .form-guide-top {\n  padding: 0px 10px;\n  display: flex;\n  justify-content: center;\n}\n.form-guide .form-guide-center {\n  border-top: 1px solid #6E7588;\n  border-bottom: 1px solid #6E7588;\n  padding: 0px 10px;\n}\n.form-guide .form-guide-item {\n  width: 28px;\n  padding: 5px 0;\n  display: block;\n  word-break: break-all;\n  color: #B1BAD4;\n  font-size: 14px;\n  line-height: 16px;\n  position: relative;\n}\n.form-guide .form-guide-item::after {\n  content: '';\n  display: block;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.form-guide .form-guide-bottom {\n  padding: 5px 10px;\n  display: flex;\n  justify-content: center;\n}\n.form-guide .form-guide-item:last-child::after {\n  content: '';\n  display: none;\n  width: 15px;\n  height: 1px;\n  background-color: #6E7588;\n  position: absolute;\n  bottom: 0px;\n  left: 7px;\n}\n.white-card.bitsun-form-card-class .ant-card-body {\n  background-color: #FFFFFF;\n  padding: 0px;\n}\n.bitsun-form-card-class > .ant-card-body {\n  margin-bottom: 10px;\n}\n.bitsun-form-card-class .ant-card-head {\n  border: 0px;\n  padding: 0px;\n  height: 48px;\n}\n.bitsun-form-card-class .ant-card-body {\n  padding: 12px 0 0;\n  margin-top: -4px;\n  background-color: #F3F3F3;\n}\n.bitsun-form-card-class .ant-card-head-title {\n  display: flex;\n  align-items: center;\n  font-size: 16px;\n  color: #000000;\n  font-weight: 600;\n  font-family: PingFangSC;\n  background-color: #FFFFFF;\n  padding: 8px 0;\n  margin: 0px;\n}\n.bitsun-form-card-class .ant-card-head-title .title-left-line {\n  display: inline-block;\n  width: 4px;\n  height: 100%;\n  background-color: #005CFF;\n  height: 20px;\n  margin-right: 16px;\n}\n.field-group-hidden .ant-card-body {\n  display: none !important;\n}\n";
 styleInject(css_248z$9);
 
-var _excluded$6 = ["children"],
-  _excluded2$2 = ["children"];
+var _excluded$7 = ["children"],
+  _excluded2$3 = ["children"];
 var Field = function Field(_ref) {
   var children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$7);
   var _React$useState = React__default['default'].useState(true),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     fieldGroupVisible = _React$useState2[0],
@@ -10887,8 +10901,10 @@ var GuideWrapper = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
         _this$props$children = _this$props.children,
         children = _this$props$children === void 0 ? [] : _this$props$children,
-        props = _objectWithoutProperties(_this$props, _excluded2$2);
-      var cardGroups = children.filter(function (item) {
+        props = _objectWithoutProperties(_this$props, _excluded2$3);
+      // 兼容容器下只有一个dom元素非数组的情况
+      var domList = Array.isArray(children) ? children : [children];
+      var cardGroups = domList.filter(function (item) {
         var _item$props, _item$props2;
         return (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.id) && (item === null || item === void 0 ? void 0 : (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.title);
       });
@@ -10910,6 +10926,12 @@ var GuideWrapper = /*#__PURE__*/function (_Component) {
               block: 'center',
               behavior: 'smooth'
             });
+            // 高亮
+            var heightLight = currentDom.getElementsByClassName('ant-card-head-title');
+            heightLight[0].style.backgroundColor = '#2065c7';
+            setTimeout(function () {
+              heightLight[0].style.backgroundColor = '';
+            }, 800);
           }
         }, item.props.title);
       })), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -10927,11 +10949,13 @@ GuideWrapper.Field = Field;
 var exportlogo = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEQAAABECAYAAAA4E5OyAAAAAXNSR0IArs4c6QAAB0JJREFUeF7tnFtsFFUYx/9nehFaaMGooDZWrTvdRAwoog8SbdUHL4nRwJPxRtRo1GC8JxLwghDvGowvGi8RDC/iAw/6YLDVaLwiqKjbWVepbUhRDLTSUtsyx/zX85FhmHZnlu6yu51JGtjd2dnz/eb/Xc539qyC79BaW0op1/u01rqqt7e3tqamxvKfXw6PR0dH3aamphGl1EGfXUfYqoJOyGQyja7rXuO67mVa69OVUg0AagFUlQOAgDESxIjWekAptdOyrC2WZW1uaWnp9wvgEBB5wXGcJQDWaa1PAaABDALYC2DUT7hc4FDhAGoAzAZQD0AppXYBWG7b9iYvlCwQD4yVWusnCcGyrHUANluWtau2tnb/4ODg6KxZsw5zpXIBsm/fPqu+vr5mZGRkhuu6vNFU/3LCUUqtsm17tTBQpMc7T2Vord8D8JtSaolt29u11iRJlVTMITY5jrNAa70JwJlKqaVGKVVZhaTT6Qat9Q6t9Ryl1MW2bX/V0dFRzdfa2tpEFeUOJmtrZ2dnNjG0t7ePOY5zodb6U6XUbqXUvEQiMSBAbnBdd71lWWsTicQKwuAbKkYWAYaIjel0eo3ruo9alnVjIpHYkAXS1dX1FoBbtNaLk8nk5+JGlQxEbEylUhcppT4D8HZra+uyLBDHcTq01gurq6vntbS0/BFUi1QaHLExk8mcNjY2tkMptdW27XYG1WrHcb4GcMK0adPmNzc3751KQLq7u2cPDw9/D2CPbdsXqJ6enulDQ0PfAJiutV6QTCb/qcTsElCRZzNoKpWaqZTaDuBAXV3dItXX11ff39//rVKqqqGh4dy5c+cOTiUgtH9gYGCb1vpgY2Pj+TGQGMj/ziNeUO4KYVElBeJRFYqVAEQmogKCj/OGUu5AxPizALwAYA0AlgqcxR7W4whbL5UzELoJ51NnAODk8zxOQAGwTcF0mReUYgHh4CjjiaQcVeYC5HoA77LRY5pVvQCuAvBjPlCKAeSofDqH1OXadwF4lc0q0/DJALguHyiFBiIDngdgKYCmAAN5p/8F8BCA/SEA8Hx/IGW8uM/EEboRFdltlPJzFKUUEohIejGADwHMMC7j7dfSTfj4AIBmAH+Zx3734TkSE4JcSz7rVgCvmc/h+WmjlJ/Gue4R/AsJRD7sIwCXe+R8WP86BxDp5kszajqAswGcCuBEAHOMiwjkYQA3AUgCYN+GzaxfAVwLgFAE3LhCLBQQcZU6AAxybOJygOsB7ARwnCfA8lwGxOcADHlG6oXBTHIHgEsAnGMawmEyqcSU9032yfmeYgDZbdyFbkGDOIPOlRLl9ZMA3MMuOIDGAJfzG0glETD/GFd4nS7jNr+UikIECOXcDuBLI3N/4SRuIbJmIN4AYL7HOAKg0n43QfNP85jPMzDTNehK4i6EwedSxzqGeF2Gg+aaB4FQIRNVkqIMxpyNbE55Yg9djS7HjjgzB42WoMx/7zdZRpTBIu0KE1hzKfKQ0orhMmGBiDIYND8GQHehcXyea0FPA+jz3Wl5z4MmBgUF0tAwCjnbjaoQOZ9xYguAhQYGDbyTjV4DRs6TWEFlrATARTSBQSVdadyEWSbSKkGpKEQG/hSAFR7jWFe8adInIXhXCAUO647bjebpJqxQfwgRuAMzTikAEdm3AvjE1BYc7EsmLhAWXSeoWJMY8rqpSi/NVxlCp5SAiPQ5th4ze90TMjuwYOPaLOcwkWLGeE3mye6YRY0hVAHrkwVmgI8AeDakcd6pgPzfW9RFWog/1goRcMws35npOwu4toiNHinGIhkfFESONRCRt/Q0OEbWKQRCMPm0DhYBYAeNKtlmapbQ1ykVIJy6v2ju2AcArg7pLkE3mc0iAubxBIDHw5TspRJUJd0+A+BhM6h3ANxsyntOzsIeogJmnNvMm5jC15YjkJcB3GuMeMMYFLWoEiCsW5aZa60CsLocgdBd6DY8YiAAXjHTfAIRl5nSCnkMwN1G2pQ848mUBCIB83gA/M4r48AAgL/zSLkVEUPCZpAw51UUEKk0aXiuBa3x4JQlEM5GvzAlel5rrxNIhUDY+2DvhHUMj5JMu9JTZUedJXmYJnMYF/GfE9QfKUkgbPvNNEsNzCRbTY/1qCdiPiIEwsqWEFj682BLgU2nnOsxhS7d5fr8Yj27V1w4EheJuqgdVS00nmC49sOKlS4UOoUXanJHI+SuPADgedP+K8a+GiqPn8MVO3b5ubuhJBQiPs39NFxsYrP4ZM9CddQ7H+Z8WSdm4Ka78HsioWFkU5zZ2DDZHTPv4AUM3Yd/hT7oklwDOhQWonxgsYAQymQH0Vx2RlJGsYJqUGrMZchkvJ534C6GQibDwKJdIwbiQx0DiYFM7H3jKiTeHuLbHhJvIPJtIKKw4i1mni1mBBJvQvRtQkyn0/E2Ve821Xgjs2cjc7zVPWCre/xjCJ4fQ/DM/rI/LhL/XIa3oWB+XSb+QZUAKN7Cdyr95M5/xzmpLRDiZSsAAAAASUVORK5CYII=";
 
 var ExportIcon = function ExportIcon(_ref) {
-  var request = _ref.request,
-    tableRef = _ref.tableRef;
-  var url = request.url,
-    params = request.params,
-    others = request.others;
+  var exportRequest = _ref.request,
+    tableRef = _ref.tableRef,
+    allowSelect = _ref.allowSelect,
+    columnsRowKey = _ref.columnsRowKey;
+  var url = exportRequest.url,
+    params = exportRequest.params,
+    others = exportRequest.others;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       cursor: 'pointer'
@@ -10942,21 +10966,27 @@ var ExportIcon = function ExportIcon(_ref) {
     width: 32,
     src: exportlogo,
     onClick: function onClick() {
-      var _tableRef$current, _convertedParams$sele, _convertedParams$sele2;
+      var _tableRef$current;
       var convertedParams = tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.getExportParams();
       var requestData;
       if (typeof params === 'function') {
         requestData = _objectSpread2({}, _.omit(params(convertedParams), 'selectedRows'));
+        requestData.pageSize = 100000;
       } else if (_typeof(params) === 'object') {
         requestData = _objectSpread2({}, params);
       }
       if (!params) {
         requestData = _.omit(convertedParams, 'selectedRows');
+        requestData.pageSize = 100000;
+      }
+      if (allowSelect) {
+        var _convertedParams$sele, _convertedParams$sele2;
+        var selectKey = (allowSelect === null || allowSelect === void 0 ? void 0 : allowSelect.key) || columnsRowKey;
+        requestData["qp-".concat(selectKey, "-in")] = convertedParams === null || convertedParams === void 0 ? void 0 : (_convertedParams$sele = convertedParams.selectedRows) === null || _convertedParams$sele === void 0 ? void 0 : (_convertedParams$sele2 = _convertedParams$sele.map(function (d) {
+          return d[selectKey];
+        })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
       }
-      requestData['qp-id-in'] = convertedParams === null || convertedParams === void 0 ? void 0 : (_convertedParams$sele = convertedParams.selectedRows) === null || _convertedParams$sele === void 0 ? void 0 : (_convertedParams$sele2 = _convertedParams$sele.map(function (d) {
-        return d.id;
-      })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
-      axios__default['default'](_objectSpread2({
+      requestUtil(_objectSpread2({
         url: url,
         method: 'POST',
         data: requestData
@@ -10976,7 +11006,7 @@ var ExportIcon = function ExportIcon(_ref) {
 var css_248z$a = ".sort_table_wrapper .sort_table {\n  display: flex;\n}\n.sort_table_wrapper .sort_table .sort_table_column_wrapper {\n  width: 560px;\n  margin-right: 10px;\n}\n.sort_table_wrapper .sort_table .sort_table_content_wrapper {\n  width: 210px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count,\n.sort_table_wrapper .sort_table .sort_table_content_count {\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count span,\n.sort_table_wrapper .sort_table .sort_table_content_count span {\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column {\n  margin-top: 10px;\n  width: 560px;\n  height: 430px;\n  overflow: auto;\n  padding: 10px;\n  background: #ffffff;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: space-between;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all_empty {\n  width: 538px;\n  line-height: 360px;\n  text-align: center;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column_special {\n  margin-top: 40px;\n  width: 100px;\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper {\n  width: 144px;\n  margin-top: 16px;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper + .ant-checkbox-wrapper {\n  margin-left: 0px;\n}\n.sort_table_wrapper .sort_table .sort_table_content {\n  margin-top: 10px;\n  padding-top: 10px;\n  padding-bottom: 10px;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_content .ant-table-wrapper {\n  padding: 0px !important;\n}\n.sort_table_wrapper .sort_table .sort_table_content .sort_table_title {\n  height: 32px;\n  line-height: 32px;\n  padding-left: 10px;\n  color: gray;\n}\n.sort_table_wrapper div.ant-modal-header {\n  width: 820px;\n  height: 64px;\n  background: #ffffff;\n  padding: 20px;\n  border: 0px;\n}\n.sort_table_wrapper div.ant-modal-header div.ant-modal-title {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 24px;\n}\n.sort_table_wrapper .ant-modal-body {\n  padding: 0 20px !important;\n}\n.sort_table_wrapper .ant-modal-close-x {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-input-affix-wrapper {\n  padding: 0px;\n  padding-right: 10px;\n}\n.sort_table_wrapper input {\n  height: 32px;\n  padding: 6px 4px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-input-prefix {\n  width: 24px;\n  height: 24px;\n  margin: 4px;\n  display: flex;\n  justify-content: center;\n}\n.sort_table_wrapper .ant-modal-footer {\n  height: 70px;\n  border: 0;\n  padding: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn {\n  width: 80px;\n  height: 34px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn span {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 14px;\n  letter-spacing: 0;\n  text-align: center;\n  line-height: 20px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn:first-child {\n  margin-right: 524px;\n}\n.sort_table_wrapper .ant-table-wrapper::-webkit-scrollbar {\n  display: none;\n}\n.sort_table_wrapper .ant-table-wrapper {\n  margin-top: 10px;\n  height: 364px;\n  overflow: scroll;\n  padding-bottom: 50px;\n}\n.sort_table_wrapper .ant-table-wrapper tr {\n  height: 36px;\n}\n.sort_table_wrapper .ant-table-wrapper tr td {\n  width: 24px !important;\n  height: 36px !important;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:first-child {\n  padding-left: 10px !important;\n  padding-right: 0px !important;\n  width: 115px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td img {\n  cursor: pointer;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:not(:first-child) {\n  padding-left: 0px !important;\n  padding-right: 0px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child {\n  padding-left: 0px !important;\n  padding-right: 3px !important;\n  width: 34px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child img {\n  position: relative;\n  top: 1px;\n}\n.global_tab_nav_style {\n  top: 2px !important;\n}\n.row-dragging {\n  background: #fafafa;\n  border: 1px solid #ccc;\n  z-index: 10000;\n}\n.row-dragging td {\n  padding: 7px 16px;\n  display: none;\n}\n.row-dragging td:first-child {\n  display: inline-block;\n}\n.row-dragging .drag-visible {\n  visibility: visible;\n}\n";
 styleInject(css_248z$a);
 
-var _excluded$7 = ["className", "style"];
+var _excluded$8 = ["className", "style"];
 var Search$1 = antd.Input.Search;
 var DragHandle$1 = reactSortableHoc.SortableHandle(function () {
   return /*#__PURE__*/React__default['default'].createElement("img", {
@@ -11022,7 +11052,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           fixed: item.fixed
         };
       });
-      axios__default['default']({
+      requestUtil({
         url: handleRequestUrl('/user', '/appConfig/saveUserOrder', appRequestConfig),
         method: 'POST',
         data: {
@@ -11088,6 +11118,17 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
         })
       });
     };
+    _this.isColumnsChange = function () {
+      var pre = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var next = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      var preKeyStr = pre.map(function (item) {
+        return item.key || item.dataIndex;
+      }).join(',');
+      var nextKeyStr = next.map(function (item) {
+        return item.key || item.dataIndex;
+      }).join(',');
+      return preKeyStr !== nextKeyStr;
+    };
     _this.columns = [{
       title: '列名称',
       dataIndex: 'title',
@@ -11344,7 +11385,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$7);
+        restProps = _objectWithoutProperties(_ref2, _excluded$8);
       var sortDataSource = _this.state.sortDataSource;
       // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
@@ -11437,8 +11478,8 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
   _createClass(SortableTable, [{
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      var _this$props3, _this$props4;
-      if (((_this$props3 = this.props) === null || _this$props3 === void 0 ? void 0 : _this$props3.datasource) && JSON.stringify((_this$props4 = this.props) === null || _this$props4 === void 0 ? void 0 : _this$props4.datasource) != JSON.stringify(nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource)) {
+      var _this$props3;
+      if (this.isColumnsChange((_this$props3 = this.props) === null || _this$props3 === void 0 ? void 0 : _this$props3.datasource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource)) {
         this.setInitValue((nextProps === null || nextProps === void 0 ? void 0 : nextProps.datasource) || []);
       }
     }
@@ -11611,8 +11652,8 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
   return SortableTable;
 }(React__default['default'].Component);
 
-var _excluded$8 = ["onResize", "width"],
-  _excluded2$3 = ["style", "columns", "tableCode", "appRequestConfig", "summary", "dynamicColumns", "scroll"];
+var _excluded$9 = ["onResize", "width"],
+  _excluded2$4 = ["style", "columns", "tableCode", "appRequestConfig", "summary", "dynamicColumns", "scroll"];
 var Text = antd.Typography.Text;
 var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
   _inherits(ColumnSettingSulaTable, _React$Component);
@@ -11724,7 +11765,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
     _this.ResizeableTitle = function (props) {
       var onResize = props.onResize,
         width = props.width,
-        restProps = _objectWithoutProperties(props, _excluded$8);
+        restProps = _objectWithoutProperties(props, _excluded$9);
       if (!width) {
         return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
       }
@@ -11783,7 +11824,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
         dynamicColumns = _this$props3$dynamicC === void 0 ? [] : _this$props3$dynamicC,
         _this$props3$scroll = _this$props3.scroll,
         scroll = _this$props3$scroll === void 0 ? {} : _this$props3$scroll,
-        restProps = _objectWithoutProperties(_this$props3, _excluded2$3);
+        restProps = _objectWithoutProperties(_this$props3, _excluded2$4);
       var otherTableInfo = _objectSpread2({}, restProps);
       var showSummary = null;
       if (this.state.showColumns.length) {
@@ -11858,8 +11899,8 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
   return ColumnSettingSulaTable;
 }(React__default['default'].Component);
 
-var _excluded$9 = ["onResize", "width"],
-  _excluded2$4 = ["columns", "tableCode", "appRequestConfig", "summary", "dynamicColumns", "scroll"];
+var _excluded$a = ["onResize", "width"],
+  _excluded2$5 = ["columns", "tableCode", "appRequestConfig", "summary", "dynamicColumns", "scroll"];
 var Text$1 = antd.Typography.Text;
 var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
   _inherits(ColumnSettingTable, _React$Component);
@@ -11970,7 +12011,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
     _this.ResizeableTitle = function (props) {
       var onResize = props.onResize,
         width = props.width,
-        restProps = _objectWithoutProperties(props, _excluded$9);
+        restProps = _objectWithoutProperties(props, _excluded$a);
       if (!width) {
         return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
       }
@@ -12026,7 +12067,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
         dynamicColumns = _this$props3$dynamicC === void 0 ? [] : _this$props3$dynamicC,
         _this$props3$scroll = _this$props3.scroll,
         scroll = _this$props3$scroll === void 0 ? {} : _this$props3$scroll,
-        restProps = _objectWithoutProperties(_this$props3, _excluded2$4);
+        restProps = _objectWithoutProperties(_this$props3, _excluded2$5);
       var otherTableInfo = _objectSpread2({}, restProps);
       var showSummary = null;
       if (this.state.showColumns.length) {
@@ -12182,12 +12223,12 @@ var moreIcon = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D
 var css_248z$c = "";
 styleInject(css_248z$c);
 
-var _excluded$a = ["message", "type"];
+var _excluded$b = ["message", "type"];
 var CommonAlert = (function (props) {
   var message = props.message,
     _props$type = props.type,
     type = _props$type === void 0 ? 'info' : _props$type,
-    reset = _objectWithoutProperties(props, _excluded$a);
+    reset = _objectWithoutProperties(props, _excluded$b);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       width: '100%',
@@ -12208,7 +12249,7 @@ var CommonAlert = (function (props) {
   }, reset)));
 });
 
-var _excluded$b = ["children"];
+var _excluded$c = ["children"];
 var iconMap = {
   edit: /*#__PURE__*/React__default['default'].createElement("img", {
     src: editIcon
@@ -12230,7 +12271,7 @@ var index$4 = (function (props) {
     _useState2 = _slicedToArray(_useState, 1),
     id = _useState2[0];
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$b);
+    restProps = _objectWithoutProperties(props, _excluded$c);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     id: id,
     className: 'detail_page_wrapper'
@@ -12440,7 +12481,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
 var css_248z$d = ".home_page_head {\n  height: 54px;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 0 20px;\n}\n.home_page_head .home_page_title {\n  height: 20px;\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 16px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n  flex-grow: 1;\n  margin-top: 2px;\n}\n.home_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.home_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.home_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  line-height: 16px;\n  cursor: pointer;\n}\n";
 styleInject(css_248z$d);
 
-var _excluded$c = ["children"];
+var _excluded$d = ["children"];
 var index$5 = (function (props) {
   var _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname;
@@ -12448,7 +12489,7 @@ var index$5 = (function (props) {
     _useState2 = _slicedToArray(_useState, 1),
     id = _useState2[0];
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$c);
+    restProps = _objectWithoutProperties(props, _excluded$d);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     id: id,
     className: 'home_page_wrapper'
@@ -12551,7 +12592,7 @@ var HeaderWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
 var css_248z$e = ".sort_table_wrapper .sort_table {\n  display: flex;\n}\n.sort_table_wrapper .sort_table .sort_table_column_wrapper {\n  width: 560px;\n  margin-right: 10px;\n}\n.sort_table_wrapper .sort_table .sort_table_content_wrapper {\n  width: 210px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count,\n.sort_table_wrapper .sort_table .sort_table_content_count {\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column_count span,\n.sort_table_wrapper .sort_table .sort_table_content_count span {\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column {\n  margin-top: 10px;\n  width: 560px;\n  height: 430px;\n  overflow: auto;\n  padding: 10px;\n  background: #ffffff;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: space-between;\n}\n.sort_table_wrapper .sort_table .sort_table_column_all_empty {\n  width: 538px;\n  line-height: 360px;\n  text-align: center;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n}\n.sort_table_wrapper .sort_table .sort_table_column_special {\n  margin-top: 40px;\n  width: 100px;\n  height: 20px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #848484;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper {\n  width: 144px;\n  margin-top: 16px;\n}\n.sort_table_wrapper .sort_table .sort_table_column .ant-checkbox-wrapper + .ant-checkbox-wrapper {\n  margin-left: 0px;\n}\n.sort_table_wrapper .sort_table .sort_table_content {\n  margin-top: 10px;\n  padding-top: 10px;\n  padding-bottom: 10px;\n  border: 1px solid #d9d9d9;\n  border-radius: 5px;\n}\n.sort_table_wrapper .sort_table .sort_table_content .ant-table-wrapper {\n  padding: 0px !important;\n}\n.sort_table_wrapper .sort_table .sort_table_content .sort_table_title {\n  height: 32px;\n  line-height: 32px;\n  padding-left: 10px;\n  color: gray;\n}\n.sort_table_wrapper div.ant-modal-header {\n  width: 820px;\n  height: 64px;\n  background: #ffffff;\n  padding: 20px;\n  border: 0px;\n}\n.sort_table_wrapper div.ant-modal-header div.ant-modal-title {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 24px;\n}\n.sort_table_wrapper .ant-modal-body {\n  padding: 0 20px !important;\n}\n.sort_table_wrapper .ant-modal-close-x {\n  height: 24px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-input-affix-wrapper {\n  padding: 0px;\n  padding-right: 10px;\n}\n.sort_table_wrapper input {\n  height: 32px;\n  padding: 6px 4px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-input-prefix {\n  width: 24px;\n  height: 24px;\n  margin: 4px;\n  display: flex;\n  justify-content: center;\n}\n.sort_table_wrapper .ant-modal-footer {\n  height: 70px;\n  border: 0;\n  padding: 20px;\n  display: flex;\n  justify-content: space-between;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn {\n  width: 80px;\n  height: 34px;\n  border-radius: 5px;\n}\n.sort_table_wrapper .ant-modal-footer .ant-btn span {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 14px;\n  letter-spacing: 0;\n  text-align: center;\n  line-height: 20px;\n}\n.sort_table_wrapper .ant-table-wrapper::-webkit-scrollbar {\n  display: none;\n}\n.sort_table_wrapper .ant-table-wrapper {\n  margin-top: 10px;\n  height: 364px;\n  overflow: scroll;\n  padding-bottom: 50px;\n}\n.sort_table_wrapper .ant-table-wrapper tr {\n  height: 36px;\n}\n.sort_table_wrapper .ant-table-wrapper tr td {\n  width: 24px !important;\n  height: 36px !important;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n  font-size: 14px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:first-child {\n  padding-left: 10px !important;\n  padding-right: 0px !important;\n  width: 115px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td img {\n  cursor: pointer;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:not(:first-child) {\n  padding-left: 0px !important;\n  padding-right: 0px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child {\n  padding-left: 0px !important;\n  padding-right: 3px !important;\n  width: 34px !important;\n}\n.sort_table_wrapper .ant-table-wrapper tr td:last-child img {\n  position: relative;\n  top: 1px;\n}\n";
 styleInject(css_248z$e);
 
-var _excluded$d = ["className", "style"];
+var _excluded$e = ["className", "style"];
 var DragHandle$2 = reactSortableHoc.SortableHandle(function () {
   return /*#__PURE__*/React__default['default'].createElement("img", {
     width: 25,
@@ -12598,7 +12639,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         };
       }) : '';
       return new Promise(function (resolve, reject) {
-        axios__default['default']({
+        requestUtil({
           url: handleRequestUrl('/user', '/appConfig/saveUserOrder', appRequestConfig),
           method: 'POST',
           data: {
@@ -12646,8 +12687,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         currentSetting[0].detail = JSON.stringify(configvalue);
       } else {
         configArray.push({
-          "code": bsTableCode,
-          "detail": JSON.stringify(configvalue)
+          code: bsTableCode,
+          detail: JSON.stringify(configvalue)
         });
       }
       localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray));
@@ -12919,10 +12960,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       //   this.patchUserColumnConfig('');
       //   return;
       // }
-      return _this.patchUserColumnConfig(sortDataSource);
+      _this.patchUserColumnConfig(sortDataSource);
     };
     _this.handleCancel = function (e) {
-      console.log(e);
       _this.setState({
         visible: false
       });
@@ -12985,7 +13025,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$d);
+        restProps = _objectWithoutProperties(_ref2, _excluded$e);
       var sortDataSource = _this.state.sortDataSource;
       // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
@@ -13002,11 +13042,11 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       if (!e.target.checked) {
         _this.setState({
           sortDataSource: sortDataSource.filter(function (item) {
-            return item.title !== title;
+            return renderToString(item.title) !== renderToString(title);
           }),
           isDefaultValue: false,
           dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.title === title) {
+            if (renderToString(item.title) === renderToString(title)) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 hidden: true
               });
@@ -13019,7 +13059,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         var _fixedRight = [];
         var noFixedSortSource = [];
         var newSortData = [].concat(_toConsumableArray(sortDataSource), _toConsumableArray(dataSource.filter(function (item) {
-          return item.title === title;
+          return renderToString(item.title) === renderToString(title);
         }).map(function (source) {
           return _objectSpread2(_objectSpread2({}, source), {}, {
             hidden: false
@@ -13038,7 +13078,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           sortDataSource: [].concat(_fixedLeft, noFixedSortSource, _fixedRight),
           isDefaultValue: false,
           dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.title === title) {
+            if (renderToString(item.title) === renderToString(title)) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 hidden: false
               });
@@ -13129,8 +13169,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         visible = _this$state5.visible,
         onSearchSort = _this$state5.onSearchSort;
       var seatchDataSource = dataSource.filter(function (item) {
-        var _item$title;
-        return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchDataSource || '')) > -1;
+        var _renderToString, _renderToString$index;
+        return ((_renderToString = renderToString(item === null || item === void 0 ? void 0 : item.title)) === null || _renderToString === void 0 ? void 0 : (_renderToString$index = _renderToString.indexOf) === null || _renderToString$index === void 0 ? void 0 : _renderToString$index.call(_renderToString, searchDataSource || '')) > -1;
       });
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'sort_table_wrapper'
@@ -13147,7 +13187,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: 0
           }
-        }, "\u6062\u590D\u9ED8\u8BA4"), ",", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        }, "\u6062\u590D\u9ED8\u8BA4"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
           key: "back",
           onClick: this.handleResetSetting
         }, "\u91CD\u7F6E\u8BBE\u7F6E")), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -13156,7 +13196,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: 0
           }
-        }, "\u53D6\u6D88"), ",", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
           key: "submit",
           type: "primary",
           onClick: this.handleOk
@@ -13223,8 +13263,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           }
         }, item.title);
       }) : dataSource.filter(function (item) {
-        var _item$title2, _item$title3;
-        return (item === null || item === void 0 ? void 0 : (_item$title2 = item.title) === null || _item$title2 === void 0 ? void 0 : _item$title2.indexOf('人')) === -1 && (item === null || item === void 0 ? void 0 : (_item$title3 = item.title) === null || _item$title3 === void 0 ? void 0 : _item$title3.indexOf('日期')) === -1;
+        var _title$indexOf, _title$indexOf2;
+        var title = renderToString(item.title);
+        return (title === null || title === void 0 ? void 0 : (_title$indexOf = title.indexOf) === null || _title$indexOf === void 0 ? void 0 : _title$indexOf.call(title, '人')) === -1 && (title === null || title === void 0 ? void 0 : (_title$indexOf2 = title.indexOf) === null || _title$indexOf2 === void 0 ? void 0 : _title$indexOf2.call(title, '日期')) === -1;
       }).map(function (item) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
           checked: !item.hidden,
@@ -13243,8 +13284,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React__default['default'].createElement("span", null, "\u4EBA\u5458\u65F6\u95F4\u5B57\u6BB5")), /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'sort_table_column_all'
       }, _toConsumableArray(dataSource).filter(function (item) {
-        var _item$title4, _item$title5;
-        return (item === null || item === void 0 ? void 0 : (_item$title4 = item.title) === null || _item$title4 === void 0 ? void 0 : _item$title4.indexOf('人')) > -1 || (item === null || item === void 0 ? void 0 : (_item$title5 = item.title) === null || _item$title5 === void 0 ? void 0 : _item$title5.indexOf('日期')) > -1;
+        var _item$title, _item$title$indexOf, _item$title2, _item$title2$indexOf;
+        return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : (_item$title$indexOf = _item$title.indexOf) === null || _item$title$indexOf === void 0 ? void 0 : _item$title$indexOf.call(_item$title, '人')) > -1 || (item === null || item === void 0 ? void 0 : (_item$title2 = item.title) === null || _item$title2 === void 0 ? void 0 : (_item$title2$indexOf = _item$title2.indexOf) === null || _item$title2$indexOf === void 0 ? void 0 : _item$title2$indexOf.call(_item$title2, '日期')) > -1;
       }).map(function (item) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
           checked: !item.hidden,
@@ -13280,8 +13321,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         pagination: false,
         showHeader: false,
         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;
+          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,
         columns: this.columns,
         rowKey: "key",
@@ -13303,7 +13344,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
   return SortableTable;
 }(React__default['default'].Component);
 
-var _excluded$e = ["className", "style"];
+var _excluded$f = ["className", "style"];
 var DragHandle$3 = reactSortableHoc.SortableHandle(function () {
   return /*#__PURE__*/React__default['default'].createElement("img", {
     width: 25,
@@ -13346,7 +13387,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           hidden: item.hidden
         };
       }) : '';
-      axios__default['default']({
+      requestUtil({
         url: handleRequestUrl('/user', '/appConfig/saveQueryCriteria', appRequestConfig),
         method: 'POST',
         data: {
@@ -13555,7 +13596,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$e);
+        restProps = _objectWithoutProperties(_ref2, _excluded$f);
       var sortDataSource = _this.state.sortDataSource;
       var index = sortDataSource.findIndex(function (x) {
         return x.name === restProps['data-row-key'];
@@ -13690,7 +13731,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: 0
           }
-        }, "\u6062\u590D\u9ED8\u8BA4"), ",", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        }, "\u6062\u590D\u9ED8\u8BA4"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
           key: "back",
           onClick: this.handleResetSetting
         }, "\u91CD\u7F6E\u8BBE\u7F6E")), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -13699,7 +13740,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: 0
           }
-        }, "\u53D6\u6D88"), ",", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
           key: "submit",
           type: "primary",
           onClick: this.handleOk
@@ -13811,12 +13852,16 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
   return SearchItemTable;
 }(React__default['default'].Component);
 
-var _excluded$f = ["onResize", "width"];
+var css_248z$f = "#bs-sula-query-table .ant-table-title + .ant-table-container table {\n  visibility: unset !important;\n}\n";
+styleInject(css_248z$f);
+
+var _excluded$g = ["onResize", "width"];
 var MemoQueryTable = /*#__PURE__*/React__default['default'].memo(bssula.QueryTable);
+var Text$2 = antd.Typography.Text;
 var ResizeableTitle$2 = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
-    restProps = _objectWithoutProperties(props, _excluded$f);
+    restProps = _objectWithoutProperties(props, _excluded$g);
   if (!width) {
     return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
   }
@@ -13830,80 +13875,52 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
   }, /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps)));
 };
 var BsSulaQueryTable = (function (props) {
-  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
-  var getConfigFromlocalstorage = function getConfigFromlocalstorage(type) {
-    var config = localStorage.getItem(type) || '[]';
-    var configArray = JSON.parse(config);
-    var configSetting = configArray.filter(function (item) {
-      return item.code === bsTableCode;
-    });
-    if (configSetting.length && configSetting[0].detail) {
-      return JSON.parse(configSetting[0].detail);
-    }
-    return [];
-  };
-  var getInitialSearchFieldsInfo = function getInitialSearchFieldsInfo() {
-    //获取搜索字段的缓存配置
-    var _props$fields = props.fields,
-      fields = _props$fields === void 0 ? [] : _props$fields;
-    var searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
-    var showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map(function (item) {
-      var inner = fields.filter(function (inneritem) {
-        var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-        var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-        return innerKey && innerKey === itemKey;
-      })[0];
-      return _objectSpread2(_objectSpread2({}, inner), item);
-    }) : fields;
-    return _toConsumableArray(showSearchFields);
-  };
+  var _props$expandable, _value$exportConfig7;
+  var _props$isPage = props.isPage,
+    pagination = props.pagination,
+    tableCode = props.tableCode;
   var refs = React.useRef(null);
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     pagePath = _useState2[0],
     setPagePath = _useState2[1];
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  var _useState3 = React.useState(props.columns.filter(function (col) {
-      return !col.hidden;
-    }).map(function (d) {
-      return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-    })),
-    _useState4 = _slicedToArray(_useState3, 2),
-    checkedList = _useState4[0],
-    setCheckedList = _useState4[1];
+  var checkedList = props.columns.filter(function (col) {
+    return !col.hidden;
+  }).map(function (d) {
+    return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
+  });
   var _useLocation = umi.useLocation(),
-    pathname = _useLocation.pathname;
-  var _useState5 = React.useState(Number(Math.random().toString().substr(2, 0) + Date.now()).toString(36)),
-    _useState6 = _slicedToArray(_useState5, 1),
-    id = _useState6[0];
-  var _useState7 = React.useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    isFullScreen = _useState8[0],
-    setIsFnllScreen = _useState8[1];
+    pathname = _useLocation.pathname,
+    _useLocation$state = _useLocation.state,
+    state = _useLocation$state === void 0 ? {} : _useLocation$state;
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isFullScreen = _useState4[0],
+    setIsFnllScreen = _useState4[1];
   // @ts-nocheck
-  var _useState9 = React.useState(props),
+  var value = props;
+  var _useState5 = React.useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showColumn = _useState6[0],
+    setShowColumns = _useState6[1]; // 列字段
+  var _useState7 = React.useState(props.fields || []),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showSearchFields = _useState8[0],
+    setShowSearchFields = _useState8[1]; //搜索项字段
+  var _useState9 = React.useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    value = _useState10[0],
-    setValue = _useState10[1];
-  var _useState11 = React.useState([]),
+    showExportColumn = _useState10[0],
+    setShowExportColumns = _useState10[1]; // 导出列字段
+  var _useState11 = React.useState('100vh'),
     _useState12 = _slicedToArray(_useState11, 2),
-    showColumn = _useState12[0],
-    setShowColumns = _useState12[1]; // 列字段
-  var originSearchFields = getInitialSearchFieldsInfo();
-  var _useState13 = React.useState(originSearchFields),
-    _useState14 = _slicedToArray(_useState13, 2),
-    showSearchFields = _useState14[0],
-    setShowSearchFields = _useState14[1]; //搜索项字段
-  var _props$isPage = props.isPage,
-    pagination = props.pagination,
-    tableCode = props.tableCode,
-    appRequestConfig = props.appRequestConfig;
-  var _useState15 = React.useState('100vh'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    height = _useState16[0],
-    setHeight = _useState16[1];
+    height = _useState12[0],
+    setHeight = _useState12[1];
   var sortTableRef = React.useRef(null);
   var searchTableRef = React.useRef(null);
+  var exportTableRef = React.useRef(null);
+  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
+  var bsTableCodeExport = "".concat(bsTableCode, "___Export"); //设置导出列字段的唯一标识
   // 获取table高度
   var getTableHeight = function getTableHeight() {
     setTimeout(function () {
@@ -13916,7 +13933,6 @@ var BsSulaQueryTable = (function (props) {
       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);
-      setValue(_objectSpread2({}, value));
     }, 0);
   };
   //监测是否按下esc键
@@ -13927,6 +13943,18 @@ var BsSulaQueryTable = (function (props) {
     if (isFull == undefined) isFull = false;
     return isFull;
   }
+  var getConfigFromlocalstorage = function getConfigFromlocalstorage(type) {
+    var tableCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : bsTableCode;
+    var config = localStorage.getItem(type) || '[]';
+    var configArray = JSON.parse(config);
+    var configSetting = configArray.filter(function (item) {
+      return item.code === tableCode;
+    });
+    if (configSetting.length && configSetting[0].detail) {
+      return JSON.parse(configSetting[0].detail);
+    }
+    return [];
+  };
   var setInitialTableInfo = function setInitialTableInfo() {
     var resourceCodeArray = {};
     if (props.actionsRender && props.actionsRender.length) {
@@ -13969,22 +13997,23 @@ var BsSulaQueryTable = (function (props) {
         }
       });
     }
-    setValue(_objectSpread2(_objectSpread2({}, value), {}, {
-      columns: _toConsumableArray(props.columns)
-    }));
-    var columns = props.columns;
+    var columns = props.columns,
+      exportColumns = props.exportColumns;
+    var getShowColumns = function getShowColumns(columnConfig, columns) {
+      return columnConfig.length ? columnConfig.map(function (item) {
+        var inner = columns.filter(function (inneritem) {
+          var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
+          var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
+          return innerKey && innerKey === itemKey;
+        })[0];
+        return _objectSpread2(_objectSpread2({}, inner), item);
+      }) : columns.filter(function (column) {
+        var columnKey = Array.isArray(column.key || column.dataIndex) ? JSON.stringify(column.key || column.dataIndex) : column.key || column.dataIndex;
+        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
+      });
+    };
     var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    var showColumns = columnConfig.length ? columnConfig.map(function (item) {
-      var inner = columns.filter(function (inneritem) {
-        var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
-        var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
-        return innerKey && innerKey === itemKey;
-      })[0];
-      return _objectSpread2(_objectSpread2({}, inner), item);
-    }) : columns.filter(function (column) {
-      var columnKey = Array.isArray(column.key || column.dataIndex) ? JSON.stringify(column.key || column.dataIndex) : column.key || column.dataIndex;
-      return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
-    });
+    var showColumns = getShowColumns(columnConfig, columns);
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -13996,11 +14025,24 @@ var BsSulaQueryTable = (function (props) {
       };
     });
     setShowColumns(_toConsumableArray(showColumns));
+    var exportColumnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION, bsTableCodeExport);
+    var showExportColumns = getShowColumns(exportColumnConfig, columns);
+    showExportColumns.forEach(function (item, index) {
+      item.width = item.width || getItemDefaultWidth(item);
+      handleBssulaColumnsSpecialParams(item);
+      item.onHeaderCell = function (column) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+          onResize: handleResize(index)
+        });
+      };
+    });
+    setShowExportColumns(_toConsumableArray(showExportColumns));
   };
   var setInitialSearchFieldsInfo = function setInitialSearchFieldsInfo() {
     //获取搜索字段的缓存配置
-    var _props$fields2 = props.fields,
-      fields = _props$fields2 === void 0 ? [] : _props$fields2;
+    var _props$fields = props.fields,
+      fields = _props$fields === void 0 ? [] : _props$fields;
     var searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
     var showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map(function (item) {
       var inner = fields.filter(function (inneritem) {
@@ -14093,7 +14135,7 @@ var BsSulaQueryTable = (function (props) {
         }
       },
       initialSelectedRowKeys: value.initialSelectedRowKeys || [],
-      expandable: value.expandable,
+      expandable: props.expandable,
       scroll: {
         x: props.overScrollX || 'max-content',
         y: height
@@ -14141,7 +14183,7 @@ var BsSulaQueryTable = (function (props) {
     }
   };
   var handleTimeValue = function handleTimeValue() {
-    var _sortTableRef$current, _value$exportConfig, _value$exportConfig2, _value$exportConfig3;
+    var _sortTableRef$current, _value$exportConfig, _exportTableRef$curre, _value$exportConfig2, _value$exportConfig3, _value$exportConfig4, _value$exportConfig5, _value$exportConfig6;
     var actionsRender = value.actionsRender || [];
     actionsRender = [].concat(_toConsumableArray(actionsRender), [{
       type: 'text',
@@ -14160,9 +14202,14 @@ var BsSulaQueryTable = (function (props) {
             setShowSearchFields: setShowSearchFields,
             showSearchFields: showSearchFields,
             datasource: (value === null || value === void 0 ? void 0 : value.fields) || [],
-            bsTableCode: bsTableCode,
-            appRequestConfig: appRequestConfig
-          }))),
+            bsTableCode: bsTableCode
+          })), (value === null || value === void 0 ? void 0 : (_value$exportConfig = value.exportConfig) === null || _value$exportConfig === void 0 ? void 0 : _value$exportConfig.settingColumns) && ( /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement("div", {
+            onClick: exportTableRef === null || exportTableRef === void 0 ? void 0 : (_exportTableRef$curre = exportTableRef.current) === null || _exportTableRef$curre === void 0 ? void 0 : _exportTableRef$curre.showModal,
+            style: {
+              fontSize: 14,
+              textAlign: 'center'
+            }
+          }, "\u5BFC\u51FA\u5B57\u6BB5\u8BBE\u7F6E")))),
           placement: "bottomRight"
         }, /*#__PURE__*/React__default['default'].createElement("span", {
           className: "ant-dropdown-link"
@@ -14195,12 +14242,14 @@ var BsSulaQueryTable = (function (props) {
     }, {
       type: 'text',
       props: {
-        children: (value === null || value === void 0 ? void 0 : value.exportConfig) && authFn(value === null || value === void 0 ? void 0 : (_value$exportConfig = value.exportConfig) === null || _value$exportConfig === void 0 ? void 0 : _value$exportConfig.code) ? ( /*#__PURE__*/React__default['default'].createElement(ExportIcon, {
+        children: (value === null || value === void 0 ? void 0 : value.exportConfig) && authFn(value === null || value === void 0 ? void 0 : (_value$exportConfig2 = value.exportConfig) === null || _value$exportConfig2 === void 0 ? void 0 : _value$exportConfig2.code) ? ( /*#__PURE__*/React__default['default'].createElement(ExportIcon, {
           request: {
-            url: "/oms-ops/excel/exportAsync/".concat(value === null || value === void 0 ? void 0 : (_value$exportConfig2 = value.exportConfig) === null || _value$exportConfig2 === void 0 ? void 0 : _value$exportConfig2.type),
-            params: (value === null || value === void 0 ? void 0 : (_value$exportConfig3 = value.exportConfig) === null || _value$exportConfig3 === void 0 ? void 0 : _value$exportConfig3.params) || queryParams
+            url: (value === null || value === void 0 ? void 0 : (_value$exportConfig3 = value.exportConfig) === null || _value$exportConfig3 === void 0 ? void 0 : _value$exportConfig3.url) || "/oms-ops/excel/exportAsync/".concat(value === null || value === void 0 ? void 0 : (_value$exportConfig4 = value.exportConfig) === null || _value$exportConfig4 === void 0 ? void 0 : _value$exportConfig4.type),
+            params: value === null || value === void 0 ? void 0 : (_value$exportConfig5 = value.exportConfig) === null || _value$exportConfig5 === void 0 ? void 0 : _value$exportConfig5.params
           },
-          tableRef: props.forwardedRef || refs
+          tableRef: props.forwardedRef || refs,
+          allowSelect: value === null || value === void 0 ? void 0 : (_value$exportConfig6 = value.exportConfig) === null || _value$exportConfig6 === void 0 ? void 0 : _value$exportConfig6.allowSelect,
+          columnsRowKey: value === null || value === void 0 ? void 0 : value.rowKey
         })) : ( /*#__PURE__*/React__default['default'].createElement("span", null))
       }
     }]);
@@ -14230,6 +14279,29 @@ var BsSulaQueryTable = (function (props) {
     var _sortTableRef$current2, _sortTableRef$current3;
     sortTableRef === null || sortTableRef === void 0 ? void 0 : (_sortTableRef$current2 = sortTableRef.current) === null || _sortTableRef$current2 === void 0 ? void 0 : (_sortTableRef$current3 = _sortTableRef$current2.handleTableHeadHidden) === null || _sortTableRef$current3 === void 0 ? void 0 : _sortTableRef$current3.call(_sortTableRef$current2, columnTitle);
   };
+  var toMapByKey = function toMapByKey(arr, key, fn) {
+    var map = {};
+    arr.forEach(function (i) {
+      return map[renderToString(i[key])] = i;
+    });
+    return map;
+  };
+  var getColumns = function getColumns() {
+    // 优化一下 减少复杂度
+    var titleMap = toMapByKey(value.columns, 'title');
+    // 加上排序
+    var cols = showColumn.map(function (i) {
+      var _titleMap$renderToStr, _titleMap$renderToStr2;
+      return _objectSpread2(_objectSpread2({}, i), {}, {
+        isPermissionColumn: (_titleMap$renderToStr = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr === void 0 ? void 0 : _titleMap$renderToStr.isPermissionColumn,
+        render: (_titleMap$renderToStr2 = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr2 === void 0 ? void 0 : _titleMap$renderToStr2.render
+      });
+    });
+    cols.forEach(function (i) {
+      return handleBssulaColumnsSpecialParams(i);
+    });
+    return cols;
+  };
   var config = _objectSpread2(_objectSpread2({
     visibleFieldsCount: 3,
     tableWrapperStyle: {
@@ -14251,45 +14323,109 @@ var BsSulaQueryTable = (function (props) {
     rowSelection: false
   }, handleTimeValue()), {}, {
     tableProps: setTableProps(),
-    columns: _toConsumableArray(showColumn),
+    columns: getColumns(),
     fields: _toConsumableArray(showSearchFields),
     ref: props.forwardedRef || refs,
     isFullScreen: isFullScreen
   });
   React.useEffect(function () {
-    if (!localStorage.getItem('isTabChange')) {
+    if (!localStorage.getItem('isTabChange') || (state === null || state === void 0 ? void 0 : state.updateCurrentPage)) {
       if (pagePath === pathname) {
         var _config$ref, _config$ref$current, _config$ref$current$t, _config$ref$current$t2;
         // @ts-ignore
         (_config$ref = config.ref) === null || _config$ref === void 0 ? void 0 : (_config$ref$current = _config$ref.current) === null || _config$ref$current === void 0 ? void 0 : (_config$ref$current$t = _config$ref$current.tableRef) === null || _config$ref$current$t === void 0 ? void 0 : (_config$ref$current$t2 = _config$ref$current$t.current) === null || _config$ref$current$t2 === void 0 ? void 0 : _config$ref$current$t2.refreshTable();
       }
-    } else {
-      setTimeout(function () {
-        // 处理页面刷新两面
-        localStorage.removeItem('isTabChange');
-      }, 0);
     }
+    setTimeout(function () {
+      // 处理页面刷新两面
+      localStorage.removeItem('isTabChange');
+    }, 0);
   }, [pathname]);
+  var expandedRowKeys = props === null || props === void 0 ? void 0 : (_props$expandable = props.expandable) === null || _props$expandable === void 0 ? void 0 : _props$expandable.expandedRowKeys;
+  //todo  summary属性已经被使用，为了兼容之前的，现在使用 summaryList
+  //结构为了实现多行总结栏   定义如下(lableShow: boolean 是否显示列文本)
+  /**
+   * [
+   *  {
+   *  cont:[{key: 'spuCode',value: 100,labelShow: false}]
+   *  }
+   * ]
+   * @returns []
+   */
+  var getTableSummaryInfo = function getTableSummaryInfo() {
+    var summaryList = props.summaryList,
+      rowSelection = props.rowSelection,
+      expandable = props.expandable;
+    if (summaryList && Array.isArray(summaryList)) {
+      var summaryRow = rowSelection ? [{}].concat(_toConsumableArray(showColumn)) : _toConsumableArray(showColumn);
+      if (expandable) {
+        summaryRow.unshift({});
+      }
+      // let summaryInitial = summary().cont;
+      return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary, {
+        fixed: true
+      }, Array.isArray(summaryList) && summaryList.map(function (summaryItem, summaryIndex) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Row, {
+          key: summaryIndex
+        }, summaryRow.map(function (item, index) {
+          var _summaryItem$cout = summaryItem.cout,
+            cout = _summaryItem$cout === void 0 ? [] : _summaryItem$cout;
+          var target = cout.filter(function (inner) {
+            return inner.key && (inner.key === item.dataIndex || inner.key === item.key);
+          })[0];
+          if (target) {
+            var _target$value;
+            var labelText = target.labelShow ? "".concat(item.title, ":") : "";
+            return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Cell, {
+              index: index,
+              key: "Table.Summary.Cell_".concat(item.index)
+            }, /*#__PURE__*/React__default['default'].createElement(Text$2, {
+              type: "danger"
+            }, "".concat(labelText, " ").concat((_target$value = target.value) !== null && _target$value !== void 0 ? _target$value : '')));
+          } else {
+            return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Cell, {
+              index: index,
+              key: "Table.Summary.Cell_".concat(item.index)
+            }, /*#__PURE__*/React__default['default'].createElement(Text$2, {
+              type: "danger"
+            }, " "));
+          }
+        }));
+      }));
+    } else {
+      return undefined;
+    }
+  };
   var memoConfig = React.useMemo(function () {
     return _objectSpread2(_objectSpread2({}, config), {}, {
       summary: props.summary,
-      statusMapping: props.statusMapping,
-      appRequestConfig: props.appRequestConfig
+      summaryList: props.summaryList ? getTableSummaryInfo : undefined,
+      statusMapping: props.statusMapping
     });
-  }, [value, checkedList, showColumn, props.statusMapping, showSearchFields]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(MemoQueryTable, _objectSpread2({}, memoConfig)), /*#__PURE__*/React__default['default'].createElement(SortableTable$1, {
+  }, [
+  // value,
+  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,
     datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
     bsTableCode: bsTableCode,
-    appRequestConfig: appRequestConfig,
     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,
+    showColumn: showExportColumn,
+    datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+    bsTableCode: bsTableCodeExport,
+    onlyModal: true
+  })));
 });
 
-var css_248z$f = ".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.allFunsList {\n  margin-bottom: 10px;\n}\n.isClons {\n  position: relative;\n  left: -8px;\n  width: 30px;\n  height: 36px;\n}\n.drawerWarp {\n  -moz-column-count: 3;\n       column-count: 3;\n}\n.allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.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.searchTop {\n  display: flex;\n  align-items: center;\n}\n.searchTopInp {\n  width: 528px;\n  height: 40px;\n  background: #f8f9fa;\n  border: 1px solid #d9d9d9;\n  border-radius: 4px;\n}\n.searchTopInp .ant-input {\n  background: #f8f9fa;\n}\n.searchTopBtn {\n  position: relative;\n  left: -1px;\n  width: 92px;\n  height: 40px;\n  background: #005cff;\n  border-radius: 0px 4px 4px 0px;\n}\n.contentWarp {\n  margin-top: 54px;\n  font-size: 14px;\n  font-weight: 400;\n  text-align: left;\n  color: #8c8c8c;\n}\n.themeColor {\n  color: #005CFF;\n}\n.serachView {\n  margin-top: 36px;\n  margin-bottom: 32px;\n}\n.content {\n  display: flex;\n  flex-wrap: wrap;\n}\n.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.content div:hover {\n  cursor: pointer;\n}\n";
-styleInject(css_248z$f);
+var css_248z$g = ".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.allFunsList {\n  margin-bottom: 10px;\n}\n.isClons {\n  position: relative;\n  left: -8px;\n  width: 30px;\n  height: 36px;\n}\n.drawerWarp {\n  -moz-column-count: 3;\n       column-count: 3;\n}\n.allFunsListWarp {\n  width: 200px;\n  margin-right: 10px;\n  border-radius: 4px;\n  -moz-column-break-inside: avoid;\n       break-inside: avoid;\n}\n.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.searchTop {\n  display: flex;\n  align-items: center;\n}\n.searchTopInp {\n  width: 528px;\n  height: 40px;\n  background: #f8f9fa;\n  border: 1px solid #d9d9d9;\n  border-radius: 4px;\n}\n.searchTopInp .ant-input {\n  background: #f8f9fa;\n}\n.searchTopBtn {\n  position: relative;\n  left: -1px;\n  width: 92px;\n  height: 40px;\n  background: #005cff;\n  border-radius: 0px 4px 4px 0px;\n}\n.contentWarp {\n  margin-top: 54px;\n  font-size: 14px;\n  font-weight: 400;\n  text-align: left;\n  color: #8c8c8c;\n}\n.themeColor {\n  color: #005CFF;\n}\n.serachView {\n  margin-top: 36px;\n  margin-bottom: 32px;\n}\n.content {\n  display: flex;\n  flex-wrap: wrap;\n}\n.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.content div:hover {\n  cursor: pointer;\n}\n";
+styleInject(css_248z$g);
 
 var cache = {};
 var cacheLimit = 10000;
@@ -14545,8 +14681,8 @@ var AllFunc = function AllFunc(props) {
   })))));
 };
 
-var css_248z$g = ".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";
-styleInject(css_248z$g);
+var css_248z$h = ".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";
+styleInject(css_248z$h);
 
 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";
 
@@ -14745,8 +14881,17 @@ var AllFunc$1 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }))));
 });
 
-var css_248z$h = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.rcom_right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.rcom_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.rcom_right .action > span {\n  vertical-align: middle;\n}\n.rcom_right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.rcom_right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.rcom_right .search {\n  padding: 0 12px;\n}\n.rcom_right .search:hover {\n  background: transparent;\n}\n.rcom_right .account .avatar {\n  margin-right: 8px;\n  color: #005cff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.rcom_right .ant-space-item {\n  margin: 0 10px 0 0;\n}\n.rcom_dark .action:hover {\n  background: #252a3d;\n}\n.rcom_dark .action .opened {\n  background: #252a3d;\n}\n.rcom_dark .ant-space-item {\n  margin: 0 10px 0 0;\n}\n.rcom_imgWap {\n  position: relative;\n  display: flex;\n  align-items: center;\n}\n.rcom_imgWap .rcom_headLine {\n  width: 1px;\n  height: 16px;\n  margin-right: 20px;\n  background: #cacaca;\n}\n.rcom_imgWap img {\n  width: 22px;\n  height: 22px;\n  margin-right: 20px;\n}\n.rcom_userWarp {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  width: 142px;\n  height: 35px;\n  margin-right: 10px;\n  border: 1px solid #c8c8c8;\n  border-radius: 4px;\n}\n.rcom_userWarp .rcom_l {\n  margin-left: 4px;\n}\n.rcom_userWarp .rcom_l img {\n  margin-right: 0;\n  width: 36px;\n  height: 36px;\n}\n.rcom_userWarp .rcom_c {\n  display: flex;\n  flex-direction: column;\n}\n.rcom_userWarp .rcom_c .rcom_ct {\n  color: #000000;\n  font-weight: 500;\n  font-size: 12px;\n  font-family: Montserrat, Montserrat-Medium;\n  line-height: 14px;\n  text-align: left;\n}\n.rcom_userWarp .rcom_c .rcom_cb {\n  color: #bfbfbf;\n  font-weight: 400;\n  font-size: 10px;\n  font-family: Montserrat, Montserrat-Regular;\n  line-height: 14px;\n  text-align: left;\n}\n.rcom_userWarp .rcom_r {\n  margin-right: 9px;\n}\n.rcom_.userWarp:hover,\n.rcom_c:hover,\n.rcom_l:hover,\n.rcom_r:hover {\n  cursor: pointer;\n}\n.userDownWarp {\n  width: 217px;\n  margin-top: 4px;\n  background: #ffffff;\n  box-shadow: 0px 2px 4px 0px rgba(185, 185, 185, 0.5);\n}\n.userDownWarp .userDownTop {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  height: 155px;\n  padding: 20px 0;\n  border-bottom: 1px solid #d9d9d9;\n}\n.userDownWarp .userDownTop .userDownTopT {\n  width: 68px;\n  height: 68px;\n  border-radius: 50%;\n}\n.userDownWarp .userDownTop .userDownTopC {\n  color: #000000;\n  font-weight: 500;\n  font-size: 14px;\n  font-family: Montserrat, Montserrat-Medium;\n  line-height: 26px;\n  text-align: center;\n}\n.userDownWarp .userDownTop .userDownTopB {\n  color: #bfbfbf;\n  font-weight: 400;\n  font-size: 12px;\n  font-family: Montserrat, Montserrat-Regular;\n  line-height: 15px;\n  text-align: center;\n}\n.userDownWarp .userDownB .userDownBList,\n.userDownWarp .userDownB .userDownOut {\n  display: flex;\n  align-items: center;\n  height: 36px;\n  background: #ffffff;\n  border-bottom: 1px solid #f3f3f3;\n}\n.userDownWarp .userDownB .userDownBList .rcom_label,\n.userDownWarp .userDownB .userDownOut .rcom_label {\n  margin: 0 4px 0 20px;\n}\n.userDownWarp .userDownB .userDownBList .rcom_label img,\n.userDownWarp .userDownB .userDownOut .rcom_label img {\n  width: 16px;\n  height: 16px;\n}\n.userDownWarp .userDownB .userDownBList .rcom_name,\n.userDownWarp .userDownB .userDownOut .rcom_name {\n  color: #000000;\n  font-weight: 400;\n  font-size: 12px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 16px;\n  text-align: left;\n}\n.userDownWarp .userDownB .userDownBList:hover,\n.userDownWarp .userDownB .userDownOut:hover {\n  cursor: pointer;\n}\n.userDownWarp .userDownB .userDownOut {\n  height: 46px;\n  border-bottom: none;\n}\n.userDownWarp .userDownB .userDownOut .rcom_name {\n  color: #fe0300;\n}\n";
-styleInject(css_248z$h);
+var i18n = {
+  'zh-CN': {
+    lang: '中文'
+  },
+  'en-US': {
+    lang: 'English'
+  }
+};
+
+var css_248z$i = ".menu .anticon {\n  margin-right: 8px;\n}\n.menu .ant-dropdown-menu-item {\n  min-width: 160px;\n}\n.rcom_right {\n  display: flex;\n  float: right;\n  height: 48px;\n  margin-left: auto;\n  overflow: hidden;\n}\n.rcom_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.rcom_right .action > span {\n  vertical-align: middle;\n}\n.rcom_right .action:hover {\n  background: rgba(0, 0, 0, 0.025);\n}\n.rcom_right .action .opened {\n  background: rgba(0, 0, 0, 0.025);\n}\n.rcom_right .search {\n  padding: 0 12px;\n}\n.rcom_right .search:hover {\n  background: transparent;\n}\n.rcom_right .account .avatar {\n  margin-right: 8px;\n  color: #005cff;\n  vertical-align: top;\n  background: rgba(255, 255, 255, 0.85);\n}\n.rcom_right .ant-space-item {\n  margin: 0 10px 0 0;\n}\n.rcom_dark .action:hover {\n  background: #252a3d;\n}\n.rcom_dark .action .opened {\n  background: #252a3d;\n}\n.rcom_dark .ant-space-item {\n  margin: 0 10px 0 0;\n}\n.rcom_imgWap {\n  position: relative;\n  display: flex;\n  align-items: center;\n}\n.rcom_imgWap .rcom_headLine {\n  width: 1px;\n  height: 16px;\n  margin-right: 20px;\n  background: #cacaca;\n}\n.rcom_imgWap img {\n  width: 22px;\n  height: 22px;\n  margin-right: 20px;\n}\n.rcom_userWarp {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  width: 142px;\n  height: 35px;\n  margin-right: 10px;\n  border: 1px solid #c8c8c8;\n  border-radius: 4px;\n}\n.rcom_userWarp .rcom_l {\n  margin-left: 4px;\n}\n.rcom_userWarp .rcom_l img {\n  margin-right: 0;\n  width: 36px;\n  height: 36px;\n}\n.rcom_userWarp .rcom_c {\n  display: flex;\n  flex-direction: column;\n}\n.rcom_userWarp .rcom_c .rcom_ct {\n  color: #000000;\n  font-weight: 500;\n  font-size: 12px;\n  font-family: Montserrat, Montserrat-Medium;\n  line-height: 14px;\n  text-align: left;\n}\n.rcom_userWarp .rcom_c .rcom_cb {\n  color: #bfbfbf;\n  font-weight: 400;\n  font-size: 10px;\n  font-family: Montserrat, Montserrat-Regular;\n  line-height: 14px;\n  text-align: left;\n}\n.rcom_userWarp .rcom_r {\n  margin-right: 9px;\n}\n.rcom_.userWarp:hover,\n.rcom_c:hover,\n.rcom_l:hover,\n.rcom_r:hover {\n  cursor: pointer;\n}\n.userDownWarp {\n  width: 217px;\n  margin-top: 4px;\n  background: #ffffff;\n  box-shadow: 0px 2px 4px 0px rgba(185, 185, 185, 0.5);\n}\n.userDownWarp .userDownTop {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  height: 155px;\n  padding: 20px 0;\n  border-bottom: 1px solid #d9d9d9;\n}\n.userDownWarp .userDownTop .userDownTopT {\n  width: 68px;\n  height: 68px;\n  border-radius: 50%;\n}\n.userDownWarp .userDownTop .userDownTopC {\n  color: #000000;\n  font-weight: 500;\n  font-size: 14px;\n  font-family: Montserrat, Montserrat-Medium;\n  line-height: 26px;\n  text-align: center;\n}\n.userDownWarp .userDownTop .userDownTopB {\n  color: #bfbfbf;\n  font-weight: 400;\n  font-size: 12px;\n  font-family: Montserrat, Montserrat-Regular;\n  line-height: 15px;\n  text-align: center;\n}\n.userDownWarp .userDownB .userDownBList,\n.userDownWarp .userDownB .userDownOut {\n  display: flex;\n  align-items: center;\n  height: 36px;\n  background: #ffffff;\n  border-bottom: 1px solid #f3f3f3;\n}\n.userDownWarp .userDownB .userDownBList .rcom_label,\n.userDownWarp .userDownB .userDownOut .rcom_label {\n  margin: 0 4px 0 20px;\n}\n.userDownWarp .userDownB .userDownBList .rcom_label img,\n.userDownWarp .userDownB .userDownOut .rcom_label img {\n  width: 16px;\n  height: 16px;\n}\n.userDownWarp .userDownB .userDownBList .rcom_name,\n.userDownWarp .userDownB .userDownOut .rcom_name {\n  color: #000000;\n  font-weight: 400;\n  font-size: 12px;\n  font-family: PingFangSC, PingFangSC-Regular;\n  line-height: 16px;\n  text-align: left;\n}\n.userDownWarp .userDownB .userDownBList:hover,\n.userDownWarp .userDownB .userDownOut:hover {\n  cursor: pointer;\n}\n.userDownWarp .userDownB .userDownOut {\n  height: 46px;\n  border-bottom: none;\n}\n.userDownWarp .userDownB .userDownOut .rcom_name {\n  color: #fe0300;\n}\n";
+styleInject(css_248z$i);
 
 var Morentouxiang = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2240px%22%20height%3D%2240px%22%20viewBox%3D%220%200%2040%2040%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%3E32%3C%2Ftitle%3E%20%20%20%20%3Cdefs%3E%20%20%20%20%20%20%20%20%3Ccircle%20id%3D%22path-1%22%20cx%3D%2213%22%20cy%3D%2213%22%20r%3D%2213%22%3E%3C%2Fcircle%3E%20%20%20%20%20%20%20%20%3Cfilter%20x%3D%22-40.4%25%22%20y%3D%22-40.4%25%22%20width%3D%22180.8%25%22%20height%3D%22180.8%25%22%20filterUnits%3D%22objectBoundingBox%22%20id%3D%22filter-2%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3CfeOffset%20dx%3D%220%22%20dy%3D%220%22%20in%3D%22SourceAlpha%22%20result%3D%22shadowOffsetOuter1%22%3E%3C%2FfeOffset%3E%20%20%20%20%20%20%20%20%20%20%20%20%3CfeGaussianBlur%20stdDeviation%3D%223.5%22%20in%3D%22shadowOffsetOuter1%22%20result%3D%22shadowBlurOuter1%22%3E%3C%2FfeGaussianBlur%3E%20%20%20%20%20%20%20%20%20%20%20%20%3CfeComposite%20in%3D%22shadowBlurOuter1%22%20in2%3D%22SourceAlpha%22%20operator%3D%22out%22%20result%3D%22shadowBlurOuter1%22%3E%3C%2FfeComposite%3E%20%20%20%20%20%20%20%20%20%20%20%20%3CfeColorMatrix%20values%3D%220%200%200%200%200.949019608%20%20%200%200%200%200%200.949019608%20%20%200%200%200%200%200.949019608%20%200%200%200%201%200%22%20type%3D%22matrix%22%20in%3D%22shadowBlurOuter1%22%3E%3C%2FfeColorMatrix%3E%20%20%20%20%20%20%20%20%3C%2Ffilter%3E%20%20%20%20%3C%2Fdefs%3E%20%20%20%20%3Cg%20id%3D%22-----6.1-%E9%BB%98%E8%AE%A4%E5%9B%BE%E7%89%87%2F-Default-picture%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%22B-Design-%E4%BD%93%E9%AA%8C%E8%A7%84%E8%8C%83%22%20transform%3D%22translate%28-1119.000000%2C%20-988.000000%29%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%2232%22%20transform%3D%22translate%281126.000000%2C%20995.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E5%9C%86%E5%BD%A2%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20fill%3D%22black%22%20fill-opacity%3D%221%22%20filter%3D%22url%28%23filter-2%29%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%3Ccircle%20stroke%3D%22%23FFFFFF%22%20stroke-width%3D%220.8328125%22%20stroke-linejoin%3D%22square%22%20fill%3D%22%23EDF4FF%22%20fill-rule%3D%22evenodd%22%20cx%3D%2213%22%20cy%3D%2213%22%20r%3D%2212.5835938%22%3E%3C%2Fcircle%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%20%20%20%20%3Cpath%20d%3D%22M15.644709%2C13.6190476%20L18.9119048%2C15.0892857%20L18.9119048%2C19.5%20L7.15%2C19.5%20L7.15%2C15.0892857%20L10.4171958%2C13.6190476%20L15.644709%2C13.6190476%20Z%20M16.1261905%2C16.4047619%20L13.65%2C16.4047619%20L13.65%2C17.6428571%20L16.1261905%2C17.6428571%20L16.1261905%2C16.4047619%20Z%20M13.1857143%2C6.5%20C14.9806397%2C6.5%2016.4357143%2C7.95507456%2016.4357143%2C9.75%20C16.4357143%2C11.5449254%2014.9806397%2C13%2013.1857143%2C13%20C11.3907888%2C13%209.93571429%2C11.5449254%209.93571429%2C9.75%20C9.93571429%2C7.95507456%2011.3907888%2C6.5%2013.1857143%2C6.5%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%20fill%3D%22%239AC4FF%22%3E%3C%2Fpath%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";
 
@@ -14764,7 +14909,7 @@ function _outLogin() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return axios__default['default']({
+          return requestUtil({
             url: '/user/web/loginOut',
             method: 'GET'
           });
@@ -14797,11 +14942,11 @@ var LoginModal = (function (props) {
     }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       onClick: function onClick() {
         form.validateFields().then(function (res) {
-          axios__default['default']({
+          requestUtil({
             url: "/bop/api/account/changePassWord/".concat(getAccountID()),
             method: 'patch',
             params: res
-          }).then(function (res) {
+          }).then(function () {
             loginOut();
           });
         });
@@ -14855,6 +15000,7 @@ var LoginModal = (function (props) {
 });
 
 var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
+  var _i18n$language;
   var menu = _ref.menu;
   var _useModel = umi.useModel('@@initialState'),
     initialState = _useModel.initialState;
@@ -14963,12 +15109,25 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
   })), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'rcom_name'
   }, "\u9000\u51FA\u767B\u5F55"))));
+  var changeLanguage = function changeLanguage(lang) {
+    localStorage.setItem('umi_locale', lang || "zh-CN");
+    umi.setLocale(lang || "zh-CN");
+    window.location.reload();
+  };
+  var language = localStorage.getItem('umi_locale') || 'zh-CN';
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: className,
     style: divStyle()
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'rcom_imgWap'
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    style: {
+      marginRight: '20px'
+    },
+    onClick: function onClick() {
+      changeLanguage(language === 'zh-CN' ? 'en-US' : 'zh-CN');
+    }
+  }, ((_i18n$language = i18n[language]) === null || _i18n$language === void 0 ? void 0 : _i18n$language.lang) || "English"), /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
     overlay: menus,
     trigger: ['click']
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -14993,8 +15152,277 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
   }))))), loginModalParams.visible && ( /*#__PURE__*/React__default['default'].createElement(LoginModal, _objectSpread2({}, loginModalParams))));
 };
 
-var css_248z$i = ".headerContent {\n  position: relative;\n  display: flex;\n  align-items: center;\n  height: 100%;\n  background: #F3F3F3;\n  box-shadow: 0 1px 4px #EBECEC;\n  padding-left: 47px;\n}\n.navigationBtn {\n  display: inline-block;\n  height: 32px;\n  line-height: 32px;\n  border-radius: 5px;\n  margin-right: 15px;\n  padding: 0 10px;\n  background-color: #F4F6F7;\n  cursor: pointer;\n  color: rgba(0, 0, 0, 0.5);\n}\n.navigationBtn:hover {\n  border-color: #297eff;\n  border-right-width: 1px;\n  z-index: 1;\n}\n.headerContent {\n  background-color: #ffffff;\n}\n.headerContent .ant-input-affix-wrapper,\n.headerContent .ant-input {\n  color: rgba(0, 0, 0, 0.5);\n}\n.searchPanel {\n  position: absolute;\n  top: 36;\n  left: 0;\n  min-width: 268px;\n  height: 220px;\n  box-shadow: 0 1px 4px #EBECEC;\n  background-color: #FFFFFF;\n  overflow-y: auto;\n  box-shadow: 0px 2px 4px 0px rgba(185, 185, 185, 0.5);\n  padding: 0 10px;\n}\n.searchTitle {\n  margin-top: 20px;\n  font-size: 14px;\n  font-weight: 400;\n  text-align: left;\n  color: #8c8c8c;\n}\n.themeColor {\n  color: #005cff;\n}\n.itemPath {\n  height: 30px;\n  line-height: 30px;\n  width: 100%;\n  cursor: pointer;\n  overflow: hidden;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n}\n.itemPath:hover {\n  background-color: #E6EEFF;\n}\n";
-styleInject(css_248z$i);
+// -- 查询店铺 -- 
+function getStoreByName(_x) {
+  return _getStoreByName.apply(this, arguments);
+}
+function _getStoreByName() {
+  _getStoreByName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", requestUtil({
+            url: '/store-house/orgViewNode/listNoPage',
+            method: 'GET',
+            params: _objectSpread2({}, params)
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getStoreByName.apply(this, arguments);
+}
+
+var debounceTimeout = 800;
+var ChooseStore = function ChooseStore(props) {
+  var employeeCode = props.employeeCode;
+  var plainOptions = ['UR', '本来'];
+  var name = localStorage.getItem('WARE_HOUSE_NAME');
+  var code = localStorage.getItem('WARE_HOUSE_CODE');
+  var fetchRef = React.useRef(0);
+  var _useState = React.useState(-1),
+    _useState2 = _slicedToArray(_useState, 2),
+    index = _useState2[0],
+    setIndex = _useState2[1];
+  var _useState3 = React.useState([{
+      label: name,
+      value: code
+    }]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    value = _useState4[0],
+    setValue = _useState4[1];
+  // const [ key, setKey ] = useState(undefined);
+  var _useState5 = React.useState(undefined),
+    _useState6 = _slicedToArray(_useState5, 2),
+    key = _useState6[0],
+    setKey = _useState6[1];
+  var _useState7 = React.useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    openSelect = _useState8[0],
+    setOpenSelect = _useState8[1];
+  var _useState9 = React.useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    options = _useState10[0],
+    setOptions = _useState10[1];
+  var _useState11 = React.useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    rescouse = _useState12[0],
+    setRescouse = _useState12[1];
+  var _useState13 = React.useState(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    searchValue = _useState14[0],
+    setSearchValue = _useState14[1];
+  var _useState15 = React.useState([{
+      label: name,
+      value: code
+    }]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    store = _useState16[0],
+    setStore = _useState16[1];
+  function fetchUserList(_x, _x2) {
+    return _fetchUserList.apply(this, arguments);
+  }
+  function _fetchUserList() {
+    _fetchUserList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(storeName, init) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            return _context3.abrupt("return", getStoreByName({
+              orgName: storeName ? storeName : undefined,
+              platCompanyCode: init ? undefined : key,
+              'qp-employeeCode-eq': employeeCode || 'EMP231011000002',
+              'qp-orgViewCode-eq': 'business-organizational-view'
+            }).then(function (res) {
+              var data = res.data;
+              if (data.code != '000000') {
+                return;
+              }
+              return data.data.map(function (item) {
+                return {
+                  label: item.orgName,
+                  value: item.orgCode,
+                  defaultOrg: item.defaultOrg,
+                  platCompanyCode: item.platCompanyCode
+                };
+              });
+            }));
+          case 1:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return _fetchUserList.apply(this, arguments);
+  }
+  var debounceFetcher = React.useMemo(function () {
+    var loadOptions = function loadOptions(str) {
+      fetchRef.current += 1;
+      var fetchId = fetchRef.current;
+      setOptions([]);
+      setRescouse([]);
+      fetchUserList(str).then(function (newOptions) {
+        if (fetchId !== fetchRef.current) {
+          return;
+        }
+        setOptions(newOptions);
+        setRescouse(newOptions);
+      });
+    };
+    return debounce__default['default'](loadOptions, debounceTimeout);
+  }, [debounceTimeout, key]);
+  var changeInput = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(str) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return debounceFetcher(str);
+          case 2:
+            res = _context.sent;
+            setOptions(res);
+            setRescouse(res);
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function changeInput(_x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  React.useEffect(function () {
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return fetchUserList(undefined, true);
+          case 2:
+            res = _context2.sent;
+            res.map(function (item, indexNumber) {
+              if (item.label === name) {
+                setIndex(indexNumber);
+              }
+              if (item.defaultOrg) {
+                if (name) {
+                  return;
+                }
+                localStorage.setItem('WARE_HOUSE_NAME', item === null || item === void 0 ? void 0 : item.label);
+                localStorage.setItem('WARE_HOUSE_CODE', item === null || item === void 0 ? void 0 : item.value);
+                setValue([item]);
+              }
+            });
+            setOptions(res);
+            setRescouse(res);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }))();
+  }, []);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    value: value,
+    style: {
+      width: 280,
+      marginRight: 20
+    },
+    open: false,
+    onClick: function onClick() {
+      setOpenSelect(true);
+    }
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    open: openSelect,
+    onCancel: function onCancel() {
+      setOpenSelect(false);
+    },
+    onOk: function onOk() {
+      var _store$, _store$2;
+      localStorage.setItem('WARE_HOUSE_NAME', (_store$ = store[0]) === null || _store$ === void 0 ? void 0 : _store$.label);
+      localStorage.setItem('WARE_HOUSE_CODE', (_store$2 = store[0]) === null || _store$2 === void 0 ? void 0 : _store$2.value);
+      window.location.reload();
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
+    style: {
+      height: 300,
+      marginTop: 20
+    },
+    labelCol: {
+      span: 3
+    },
+    wrapperCol: {
+      span: 16
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    label: "\u54C1\u724C",
+    name: "brand"
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Radio.Group, {
+    options: plainOptions,
+    onChange: function onChange(item) {
+      var _item$target;
+      var str = item === null || item === void 0 ? void 0 : (_item$target = item.target) === null || _item$target === void 0 ? void 0 : _item$target.value;
+      setKey(str === 'UR' ? 'UR' : 'BL');
+      if (str === 'UR') {
+        var res = rescouse === null || rescouse === void 0 ? void 0 : rescouse.filter(function (current) {
+          return current.platCompanyCode === 'UR';
+        });
+        setOptions(res);
+        setSearchValue('');
+      } else {
+        var _res = rescouse === null || rescouse === void 0 ? void 0 : rescouse.filter(function (current) {
+          return current.platCompanyCode === 'BL';
+        });
+        setOptions(_res);
+        setSearchValue('');
+      }
+    },
+    optionType: "button",
+    buttonStyle: "solid"
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    label: "\u95E8\u5E97",
+    name: "store",
+    rules: [{
+      required: true,
+      message: '请选择门店'
+    }]
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u8F93\u5165\u95E8\u5E97\u540D\u79F0",
+    value: searchValue,
+    onChange: function onChange(e) {
+      changeInput(e.target.value);
+      setSearchValue(e.target.value);
+    }
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      height: 220,
+      overflowY: 'scroll'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.List, {
+    dataSource: options,
+    bordered: true,
+    renderItem: function renderItem(item, indexNumber) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.List.Item, {
+        style: indexNumber === index ? {
+          // opacity
+          color: '#0047bb'
+        } : {},
+        onClick: function onClick(current) {
+          // setValue([item]);
+          setStore([item]);
+          setIndex(indexNumber);
+        }
+      }, item.label);
+    }
+  }))))));
+};
+
+var css_248z$j = ".headerContent {\n  position: relative;\n  display: flex;\n  align-items: center;\n  height: 100%;\n  background: #F3F3F3;\n  box-shadow: 0 1px 4px #EBECEC;\n  padding-left: 47px;\n}\n.navigationBtn {\n  display: inline-block;\n  height: 32px;\n  line-height: 32px;\n  border-radius: 5px;\n  margin-right: 15px;\n  padding: 0 10px;\n  background-color: #F4F6F7;\n  cursor: pointer;\n  color: rgba(0, 0, 0, 0.5);\n}\n.navigationBtn:hover {\n  border-color: #297eff;\n  border-right-width: 1px;\n  z-index: 1;\n}\n.headerContent {\n  background-color: #ffffff;\n}\n.headerContent .ant-input-affix-wrapper,\n.headerContent .ant-input {\n  color: rgba(0, 0, 0, 0.5);\n}\n.searchPanel {\n  position: absolute;\n  top: 36;\n  left: 0;\n  min-width: 268px;\n  height: 220px;\n  box-shadow: 0 1px 4px #EBECEC;\n  background-color: #FFFFFF;\n  overflow-y: auto;\n  box-shadow: 0px 2px 4px 0px rgba(185, 185, 185, 0.5);\n  padding: 0 10px;\n}\n.searchTitle {\n  margin-top: 20px;\n  font-size: 14px;\n  font-weight: 400;\n  text-align: left;\n  color: #8c8c8c;\n}\n.themeColor {\n  color: #005cff;\n}\n.itemPath {\n  height: 30px;\n  line-height: 30px;\n  width: 100%;\n  cursor: pointer;\n  overflow: hidden;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n}\n.itemPath:hover {\n  background-color: #E6EEFF;\n}\n";
+styleInject(css_248z$j);
 
 var judgeIsEmpty$2 = function judgeIsEmpty(value) {
   if (value == null || value == undefined || String(value).trim() == '') {
@@ -15004,7 +15432,11 @@ var judgeIsEmpty$2 = function judgeIsEmpty(value) {
 };
 var GlobalHeaderCom = function GlobalHeaderCom(props) {
   var _props$route$routes = props.route.routes,
-    routes = _props$route$routes === void 0 ? [] : _props$route$routes;
+    routes = _props$route$routes === void 0 ? [] : _props$route$routes,
+    _props$showSelectStor = props.showSelectStore,
+    showSelectStore = _props$showSelectStor === void 0 ? false : _props$showSelectStor,
+    _props$employeeCode = props.employeeCode,
+    employeeCode = _props$employeeCode === void 0 ? "EMP231011000002" : _props$employeeCode;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     keyWord = _useState2[0],
@@ -15141,13 +15573,15 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
       },
       title: item.fullPathName
     }, renderLineStyl(item.fullPathName));
-  }))))), /*#__PURE__*/React__default['default'].createElement(GlobalHeaderRight, null));
+  }))))), showSelectStore && ( /*#__PURE__*/React__default['default'].createElement(ChooseStore, {
+    employeeCode: employeeCode
+  })), /*#__PURE__*/React__default['default'].createElement(GlobalHeaderRight, null));
 };
 
 var addIcon = "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%3E%E7%BC%96%E7%BB%84%2014%401x%3C%2Ftitle%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-21.000000%2C%20-71.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-15%22%20transform%3D%22translate%2821.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%3Cg%20id%3D%22%E7%BC%96%E7%BB%84-14%22%20transform%3D%22translate%280.000000%2C%201.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%3Crect%20id%3D%22%E7%9F%A9%E5%BD%A2%22%20fill%3D%22%23D8D8D8%22%20opacity%3D%220%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%20%20%20%20%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%22%20transform%3D%22translate%284.000000%2C%204.000000%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%3Cpath%20d%3D%22M8%2C0%20C12.4183529%2C0%2016%2C3.58164706%2016%2C8%20C16%2C12.4183529%2012.4183529%2C16%208%2C16%20C3.58164706%2C16%200%2C12.4183529%200%2C8%20C0%2C3.58164706%203.58164706%2C0%208%2C0%20Z%20M8%2C1.4117647%20C4.36141178%2C1.4117647%201.4117647%2C4.36141175%201.4117647%2C8%20C1.4117647%2C11.6385882%204.36141175%2C14.5882353%208%2C14.5882353%20C11.6385882%2C14.5882353%2014.5882353%2C11.6385882%2014.5882353%2C8%20C14.5882353%2C4.36141175%2011.6385882%2C1.4117647%208%2C1.4117647%20Z%20M8.70588235%2C3.76470589%20L8.70588235%2C7.29411765%20L12.2352941%2C7.29411765%20L12.2352941%2C8.70588235%20L8.70588235%2C8.70588235%20L8.70588235%2C12.2352941%20L7.29411765%2C12.2352941%20L7.29411765%2C8.70541177%20L3.76470589%2C8.70588235%20L3.76470589%2C7.29411765%20L7.29411765%2C7.29364707%20L7.29411765%2C3.76470589%20L8.70588235%2C3.76470589%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%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";
 
-var css_248z$j = ".setting_content > div {\n  width: 50%;\n  box-sizing: border-box;\n  margin: 0 10px;\n}\n.setting_content {\n  display: flex;\n}\n.tree_title {\n  height: 50px;\n}\n.tree_content {\n  height: 400px;\n  overflow: auto;\n  border: 1px solid #d9d9d9;\n  padding: 5px;\n}\n.setting_content::after {\n  clear: both;\n  display: block;\n  content: '';\n}\n.choosed_label_color {\n  color: #f50;\n}\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper {\n  flex-grow: 1;\n}\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper .ant-tree-title {\n  width: 100%;\n}\n.left_tree_content .ant-tree .ant-tree-treenode {\n  width: 100%;\n}\n.right_tree_content .ant-tree .ant-tree-node-content-wrapper,\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper {\n  display: flex;\n  margin-left: -3px;\n}\n.right_tree_content .ant-tree-checkbox,\n.left_tree_content .ant-tree-checkbox {\n  top: auto;\n  top: initial;\n}\n.node_title_content:hover .right_arrow {\n  display: block !important;\n}\n.right_arrow {\n  float: right;\n  display: none;\n  color: #999999;\n  margin-right: 10px;\n}\n.right_tree_content .ant-tree-title {\n  width: 100%;\n  display: inline-block;\n  padding-right: 10px;\n}\n.right_tree_content .ant-dropdown-trigger {\n  color: gray !important;\n}\n.right_tree_content .tree_node_title {\n  font-size: 20px;\n  color: #d9d9d9;\n  float: right;\n}\n.right_tree_content .tree_node_title span {\n  margin-right: 5px;\n}\n";
-styleInject(css_248z$j);
+var css_248z$k = ".setting_content > div {\n  width: 50%;\n  box-sizing: border-box;\n  margin: 0 10px;\n}\n.setting_content {\n  display: flex;\n}\n.tree_title {\n  height: 50px;\n}\n.tree_content {\n  height: 400px;\n  overflow: auto;\n  border: 1px solid #d9d9d9;\n  padding: 5px;\n}\n.setting_content::after {\n  clear: both;\n  display: block;\n  content: '';\n}\n.choosed_label_color {\n  color: #f50;\n}\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper {\n  flex-grow: 1;\n}\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper .ant-tree-title {\n  width: 100%;\n}\n.left_tree_content .ant-tree .ant-tree-treenode {\n  width: 100%;\n}\n.right_tree_content .ant-tree .ant-tree-node-content-wrapper,\n.left_tree_content .ant-tree .ant-tree-node-content-wrapper {\n  display: flex;\n  margin-left: -3px;\n}\n.right_tree_content .ant-tree-checkbox,\n.left_tree_content .ant-tree-checkbox {\n  top: auto;\n  top: initial;\n}\n.node_title_content:hover .right_arrow {\n  display: block !important;\n}\n.right_arrow {\n  float: right;\n  display: none;\n  color: #999999;\n  margin-right: 10px;\n}\n.right_tree_content .ant-tree-title {\n  width: 100%;\n  display: inline-block;\n  padding-right: 10px;\n}\n.right_tree_content .ant-dropdown-trigger {\n  color: gray !important;\n}\n.right_tree_content .tree_node_title {\n  font-size: 20px;\n  color: #d9d9d9;\n  float: right;\n}\n.right_tree_content .tree_node_title span {\n  margin-right: 5px;\n}\n";
+styleInject(css_248z$k);
 
 var arrowRight = "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%3E%E7%BC%96%E7%BB%84%20186%E5%A4%87%E4%BB%BD%203%3C%2Ftitle%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%E8%8F%9C%E5%8D%95%22%20transform%3D%22translate%28-949.000000%2C%20-484.000000%29%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%BC%96%E7%BB%84-8%22%20transform%3D%22translate%28534.000000%2C%20180.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%B1%BB%E7%9B%AE%E4%B8%80%E5%A4%87%E4%BB%BD-101%22%20transform%3D%22translate%2831.000000%2C%20298.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%E7%BC%96%E7%BB%84-186%E5%A4%87%E4%BB%BD-2%22%20transform%3D%22translate%28384.000000%2C%206.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%22%E7%BC%96%E7%BB%84-132%E5%A4%87%E4%BB%BD-85%22%20opacity%3D%220%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%3Cpath%20d%3D%22M24%2C0%20L24%2C24%20L0%2C24%20L0%2C0%20L24%2C0%20Z%20M23.765625%2C0.234375%20L0.234375%2C0.234375%20L0.234375%2C23.765625%20L23.765625%2C23.765625%20L23.765625%2C0.234375%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%E5%A4%87%E4%BB%BD-235%22%20fill%3D%22%23979797%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%3Cpath%20d%3D%22M21.39%2C2.64%20L21.39%2C21.39%20L2.64%2C21.39%20L2.64%2C2.64%20L21.39%2C2.64%20Z%20M21.155625%2C2.874375%20L2.874375%2C2.874375%20L2.874375%2C21.155625%20L21.155625%2C21.155625%20L21.155625%2C2.874375%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%E5%A4%87%E4%BB%BD-236%22%20fill%3D%22%23979797%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%3Cpath%20d%3D%22M20.22%2C1.56%20L20.22%2C22.56%20L3.72%2C22.56%20L3.72%2C1.56%20L20.22%2C1.56%20Z%20M19.985625%2C1.794375%20L3.954375%2C1.794375%20L3.954375%2C22.325625%20L19.985625%2C22.325625%20L19.985625%2C1.794375%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%E5%A4%87%E4%BB%BD-237%22%20fill%3D%22%23FA6400%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%3Cpath%20d%3D%22M22.56%2C3.72%20L22.56%2C20.22%20L1.56%2C20.22%20L1.56%2C3.72%20L22.56%2C3.72%20Z%20M22.325625%2C3.954375%20L1.794375%2C3.954375%20L1.794375%2C19.985625%20L22.325625%2C19.985625%20L22.325625%2C3.954375%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%E5%A4%87%E4%BB%BD-238%22%20fill%3D%22%2344D7B6%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%3Cpath%20d%3D%22M12.06%2C1.56%20C17.8589899%2C1.56%2022.56%2C6.26101013%2022.56%2C12.06%20C22.56%2C17.8589899%2017.8589899%2C22.56%2012.06%2C22.56%20C6.26101013%2C22.56%201.56%2C17.8589899%201.56%2C12.06%20C1.56%2C6.26101013%206.26101013%2C1.56%2012.06%2C1.56%20Z%20M12.06%2C1.794375%20C6.39045187%2C1.794375%201.794375%2C6.39045187%201.794375%2C12.06%20C1.794375%2C17.7295481%206.39045187%2C22.325625%2012.06%2C22.325625%20C17.7295481%2C22.325625%2022.325625%2C17.7295481%2022.325625%2C12.06%20C22.325625%2C6.39045187%2017.7295481%2C1.794375%2012.06%2C1.794375%20Z%22%20id%3D%22%E6%A4%AD%E5%9C%86%E5%BD%A2%E5%A4%87%E4%BB%BD-59%22%20fill%3D%22%23F7B500%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%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%3Cg%20id%3D%22%E7%BC%96%E7%BB%84%E5%A4%87%E4%BB%BD-43%22%20transform%3D%22translate%281.560000%2C%201.680000%29%22%20fill%3D%22%23999999%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%3Cpath%20d%3D%22M10.44%2C0%20C16.2059506%2C0%2020.88%2C4.67404941%2020.88%2C10.44%20C20.88%2C16.2059506%2016.2059506%2C20.88%2010.44%2C20.88%20C4.67404941%2C20.88%200%2C16.2059506%200%2C10.44%20C0%2C4.67404941%204.67404941%2C0%2010.44%2C0%20Z%20M10.44%2C1.84235294%20C5.69164237%2C1.84235294%201.84235294%2C5.69164234%201.84235294%2C10.44%20C1.84235294%2C15.1883577%205.69164234%2C19.0376471%2010.44%2C19.0376471%20C15.1883577%2C19.0376471%2019.0376471%2C15.1883577%2019.0376471%2C10.44%20C19.0376471%2C5.69164234%2015.1883577%2C1.84235294%2010.44%2C1.84235294%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%20%20%20%20%20%20%20%20%3Cpolygon%20id%3D%22%E5%BD%A2%E7%8A%B6%22%20points%3D%2210.4408066%206.32%2014.3966662%2010.2757133%2010.4408066%2014.2314265%209.2540487%2013.0447125%2011.1949264%2011.1039067%206%2011.1033618%206%209.42518043%2011.1725861%209.42518043%209.25459358%207.50671398%2010.4408066%206.32%22%3E%3C%2Fpolygon%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";
 
@@ -15778,8 +16212,8 @@ var MenuSetting = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }));
 });
 
-var css_248z$k = ".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: 45px;\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.customer_menu_content .ant-drawer-body {\n  padding: 10px !important;\n}\n.menu_drawer_header_warp .ant-drawer-body {\n  background-color: #F8F9FA;\n  padding: 10px 0 0 0 !important;\n}\n.menu_title_line {\n  font-size: 16px;\n  font-weight: bold;\n  color: #b1bad4;\n  text-align: center;\n  margin-bottom: 10px;\n}\n.menu_item {\n  line-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}\n.header_style {\n  height: 50px;\n  position: fixed;\n  top: 0;\n  left: 0;\n  padding: 0;\n  display: flex;\n  align-items: center;\n  background-color: #ffffff;\n}\n.global_menu_draw .ant-drawer-body {\n  padding: 10px !important;\n}\n";
-styleInject(css_248z$k);
+var css_248z$l = ".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: 45px;\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.customer_menu_content .ant-drawer-body {\n  padding: 10px !important;\n}\n.menu_drawer_header_warp .ant-drawer-body {\n  background-color: #F8F9FA;\n  padding: 10px 0 0 0 !important;\n}\n.menu_title_line {\n  font-size: 16px;\n  font-weight: bold;\n  color: #b1bad4;\n  text-align: center;\n  margin-bottom: 10px;\n}\n.menu_item {\n  line-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}\n.header_style {\n  height: 50px;\n  position: fixed;\n  top: 0;\n  left: 0;\n  padding: 0;\n  display: flex;\n  align-items: center;\n  background-color: #ffffff;\n}\n.global_menu_draw .ant-drawer-body {\n  padding: 10px !important;\n}\n";
+styleInject(css_248z$l);
 
 var CustomerMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var isCollapse = _ref.isCollapse,
@@ -15915,8 +16349,8 @@ var CustomerMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   })));
 });
 
-var css_248z$l = ".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";
-styleInject(css_248z$l);
+var css_248z$m = ".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";
+styleInject(css_248z$m);
 
 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=";
 
@@ -16331,10 +16765,10 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
   })));
 };
 
-var css_248z$m = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
-styleInject(css_248z$m);
+var css_248z$n = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
+styleInject(css_248z$n);
 
-var _excluded$g = ["route"];
+var _excluded$h = ["route"];
 var TabPane = antd.Tabs.TabPane;
 var UN_LISTTEN_DRP;
 var routerArray = [];
@@ -17020,7 +17454,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         if (!istParent) {
           var _window$$wujie2;
           if (route.pathname === '/') return;
-          (_window$$wujie2 = window.$wujie) === null || _window$$wujie2 === void 0 ? void 0 : _window$$wujie2.bus.$emit('sub-route-change', itemPath, currentKey);
+          (_window$$wujie2 = window.$wujie) === null || _window$$wujie2 === void 0 ? void 0 : _window$$wujie2.bus.$emit('sub-route-change', itemPath, currentKey, route === null || route === void 0 ? void 0 : route.state);
           // window.parent.postMessage(`/parent/${itemPath}${currentKey}`, '*');
         }
         // 防止出错
@@ -17058,39 +17492,49 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             newListenRouterKey = [].concat(_toConsumableArray(listenRouterKey), [currentKey]);
           }
         }
-        // 处理hideMenu页面自动关闭
+        // -------------------处理页签关闭----------------------------
         lastTwoRouterArray.push(route.pathname);
         lastTwoRouterArray.shift();
-        if (!localStorage.getItem('isTabChange') && !localStorage.getItem('isMenuClick')) {
-          if (lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string') {
-            var _route$state;
-            var needRemoveKeyArray = hideMenuArray.filter(function (itemRoute) {
-              return pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]);
-            });
-            // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
-            if (needRemoveKeyArray.length && lastTwoRouterArray[0] != lastTwoRouterArray[1] && !((_route$state = route.state) === null || _route$state === void 0 ? void 0 : _route$state.thisHideInMenuDoNotClose)) {
-              newListenRouterState = newListenRouterState.filter(function (item) {
-                var _ref3 = item.key ? item.key.split('?') : [],
-                  _ref4 = _slicedToArray(_ref3, 1),
-                  pathname = _ref4[0];
-                return pathname && pathname !== lastTwoRouterArray[0];
-              });
-              newListenRouterKey = newListenRouterKey.filter(function (item) {
-                var _ref5 = item ? item.split('?') : [],
-                  _ref6 = _slicedToArray(_ref5, 1),
-                  pathname = _ref6[0];
-                return pathname && pathname !== lastTwoRouterArray[0];
-              });
-            }
-          }
-          // refs?.tableRef?.current?.refreshTable();
+        var _ref3 = (route === null || route === void 0 ? void 0 : route.state) || {},
+          _ref3$thisHideInMenuD = _ref3.thisHideInMenuDoNotClose,
+          thisHideInMenuDoNotClose = _ref3$thisHideInMenuD === void 0 ? false : _ref3$thisHideInMenuD,
+          _ref3$closePrevPage = _ref3.closePrevPage,
+          closePrevPage = _ref3$closePrevPage === void 0 ? false : _ref3$closePrevPage,
+          _ref3$updateCurrentPa = _ref3.updateCurrentPage;
+        var needRemoveKey = '';
+        // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
+        var notSamePageFlag = lastTwoRouterArray[0] != lastTwoRouterArray[1];
+        // 满足包含closePrevPage标识则直接删除上一页
+        if (closePrevPage) {
+          needRemoveKey = lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string' && notSamePageFlag ? lastTwoRouterArray[0] : '';
         } else {
-          setTimeout(function () {
-            // 处理页面刷新两面
-            localStorage.removeItem('isTabChange');
-            localStorage.removeItem('isMenuClick');
-          }, 0);
+          // 满足非tabclick或者menuClick的hideInMenu类型菜单自动关闭
+          var shouldClosePrev = !localStorage.getItem('isTabChange') && !localStorage.getItem('isMenuClick');
+          var needRemoveKeyArray = lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string' && shouldClosePrev ? hideMenuArray.filter(function (itemRoute) {
+            return pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]);
+          }) : [];
+          needRemoveKey = needRemoveKeyArray.length && notSamePageFlag && !thisHideInMenuDoNotClose ? needRemoveKeyArray[0] : '';
+        }
+        if (needRemoveKey) {
+          newListenRouterState = newListenRouterState.filter(function (item) {
+            var _ref4 = item.key ? item.key.split('?') : [],
+              _ref5 = _slicedToArray(_ref4, 1),
+              pathname = _ref5[0];
+            return pathname && pathname !== lastTwoRouterArray[0];
+          });
+          newListenRouterKey = newListenRouterKey.filter(function (item) {
+            var _ref6 = item ? item.split('?') : [],
+              _ref7 = _slicedToArray(_ref6, 1),
+              pathname = _ref7[0];
+            return pathname && pathname !== lastTwoRouterArray[0];
+          });
         }
+        setTimeout(function () {
+          // 处理页面刷新两面
+          localStorage.removeItem('isTabChange');
+          localStorage.removeItem('isMenuClick');
+        }, 0);
+        // -------------------处理页签关闭 end----------------------------
         _this2.setState({
           //路由监听函数最后执行setState，避免处理hideMenu类型页面自动关闭的逻辑块内获取不到最新state的listenRouterState和listenRouterKey
           activeKey: currentKey,
@@ -17138,10 +17582,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         defaultSettings = _this$props2.defaultSettings,
         _this$props2$transpar = _this$props2.transparentProps,
         transparentProps = _this$props2$transpar === void 0 ? {} : _this$props2$transpar;
-      var TabTitle = function TabTitle(_ref7) {
-        var item = _ref7.item,
-          index = _ref7.index,
-          updateState = _ref7.updateState;
+      var TabTitle = function TabTitle(_ref8) {
+        var item = _ref8.item,
+          index = _ref8.index,
+          updateState = _ref8.updateState;
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "tab_title_content"
         }, item.tab, item.key !== '/' && ( /*#__PURE__*/React__default['default'].createElement(ItemMenu, {
@@ -17156,7 +17600,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       }); // 添加数据大屏
       var _this$props3 = this.props,
         route = _this$props3.route,
-        restPrpos = _objectWithoutProperties(_this$props3, _excluded$g);
+        restPrpos = _objectWithoutProperties(_this$props3, _excluded$h);
       var exist = route.routes.find(function (route) {
         return route.path === '/homePage/data-show';
       });
@@ -17311,8 +17755,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         onMenuHeaderClick: function onMenuHeaderClick() {
           return umi.history.push('/');
         },
-        menuHeaderRender: function menuHeaderRender(_ref8) {
-          _objectDestructuringEmpty(_ref8);
+        menuHeaderRender: function menuHeaderRender(_ref9) {
+          _objectDestructuringEmpty(_ref9);
           return /*#__PURE__*/React__default['default'].createElement(CustomerMenuHeader, {
             originRoutes: originRoutes,
             itemPath: itemPath,
@@ -17716,8 +18160,8 @@ var headersToRows = function headersToRows(originColumns) {
   };
 };
 
-var css_248z$n = ".editTableWrapper {\n  width: 1000px;\n  height: 500px;\n  overflow: auto;\n  position: relative;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n}\n.editTableWrapper table {\n  table-layout: fixed;\n}\n.editTableWrapper .editTable {\n  position: relative;\n  overflow: hidden;\n  border-top: 0;\n  background: #fff;\n}\n.editTableWrapper .north__west {\n  position: sticky;\n  background-color: #f7f8fb;\n  left: 0px;\n  top: 0px;\n  font-size: 14px;\n  color: #606266;\n  z-index: 5;\n}\n.editTableWrapper .north__west th {\n  background: #fff;\n  font-size: 14px;\n  color: #606266;\n  z-index: 5;\n}\n.editTableWrapper .south__west {\n  z-index: 4;\n  position: absolute;\n  left: 0px;\n  top: 0;\n}\n.editTableWrapper .south__west th {\n  background: #fff;\n  font-size: 14px;\n  color: #606266;\n  z-index: 4;\n}\n.editTableWrapper .south__west td {\n  font-size: 12px;\n  background: #fff;\n  color: #6a6a6a;\n}\n.editTableWrapper .south__west td svg {\n  width: 20px;\n  height: 20px;\n  vertical-align: middle;\n}\n.editTableWrapper .editTable__block {\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n  position: absolute;\n  border-collapse: collapse;\n  padding: 0;\n}\n.editTableWrapper .editTable__block th,\n.editTableWrapper .editTable__block td {\n  box-sizing: border-box;\n  font-size: 11px;\n  color: #6a6a6a;\n}\n.editTableWrapper .value_table table {\n  table-layout: fixed;\n  min-width: 100%;\n}\n.editTableWrapper .table_border_style {\n  border-collapse: separate;\n  border-spacing: 0;\n  border-left: 1px solid #f0f0f0;\n  border-top: 1px solid #f0f0f0;\n}\n.editTableWrapper .table_border_style td {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  box-sizing: border-box;\n  border-right: 1px solid #f0f0f0;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 0 10px;\n  font-size: 14px;\n  line-height: 28px;\n}\n";
-styleInject(css_248z$n);
+var css_248z$o = ".editTableWrapper {\n  width: 1000px;\n  height: 500px;\n  overflow: auto;\n  position: relative;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n}\n.editTableWrapper table {\n  table-layout: fixed;\n}\n.editTableWrapper .editTable {\n  position: relative;\n  overflow: hidden;\n  border-top: 0;\n  background: #fff;\n}\n.editTableWrapper .north__west {\n  position: sticky;\n  background-color: #f7f8fb;\n  left: 0px;\n  top: 0px;\n  font-size: 14px;\n  color: #606266;\n  z-index: 5;\n}\n.editTableWrapper .north__west th {\n  background: #fff;\n  font-size: 14px;\n  color: #606266;\n  z-index: 5;\n}\n.editTableWrapper .south__west {\n  z-index: 4;\n  position: absolute;\n  left: 0px;\n  top: 0;\n}\n.editTableWrapper .south__west th {\n  background: #fff;\n  font-size: 14px;\n  color: #606266;\n  z-index: 4;\n}\n.editTableWrapper .south__west td {\n  font-size: 12px;\n  background: #fff;\n  color: #6a6a6a;\n}\n.editTableWrapper .south__west td svg {\n  width: 20px;\n  height: 20px;\n  vertical-align: middle;\n}\n.editTableWrapper .editTable__block {\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n  position: absolute;\n  border-collapse: collapse;\n  padding: 0;\n}\n.editTableWrapper .editTable__block th,\n.editTableWrapper .editTable__block td {\n  box-sizing: border-box;\n  font-size: 11px;\n  color: #6a6a6a;\n}\n.editTableWrapper .value_table table {\n  table-layout: fixed;\n  min-width: 100%;\n}\n.editTableWrapper .table_border_style {\n  border-collapse: separate;\n  border-spacing: 0;\n  border-left: 1px solid #f0f0f0;\n  border-top: 1px solid #f0f0f0;\n}\n.editTableWrapper .table_border_style td {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  box-sizing: border-box;\n  border-right: 1px solid #f0f0f0;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 0 10px;\n  font-size: 14px;\n  line-height: 28px;\n}\n";
+styleInject(css_248z$o);
 
 var useSticky = function useSticky(sticky) {
   var _ref = _typeof(sticky) === 'object' ? sticky : {},
@@ -18129,10 +18573,10 @@ var index$7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }))))));
 });
 
-var _excluded$h = ["children"];
+var _excluded$i = ["children"];
 var Drawer = (function (props) {
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$h);
+    restProps = _objectWithoutProperties(props, _excluded$i);
   return /*#__PURE__*/React__default['default'].createElement(antd.Drawer, _objectSpread2({
     mask: true,
     closable: false,
@@ -23956,8 +24400,8 @@ var nameRender = (function (data) {
   }, " ");
 });
 
-var css_248z$o = ".si-tree {\n  font-size: 14px;\n}\n.si-tree-node-block {\n  display: flex;\n  align-items: center;\n  padding: 2px 4px;\n  cursor: pointer;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n}\n.si-tree-node-block:hover {\n  background-color: #1990ffab;\n  color: #fff;\n}\n.si-tree-node-block-actived {\n  background-color: #1990ffab;\n  color: #fff;\n}\n.si-tree-node-switcher {\n  margin-right: 2px;\n}\n.si-tree-node-icon {\n  margin-right: 4px;\n  display: flex;\n}\n.tree-compact {\n  margin-left: 4px;\n  font-size: 13px;\n  font-style: italic;\n  color: #49aa19;\n}\n";
-styleInject(css_248z$o);
+var css_248z$p = ".si-tree {\n  font-size: 14px;\n}\n.si-tree-node-block {\n  display: flex;\n  align-items: center;\n  padding: 2px 4px;\n  cursor: pointer;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n          user-select: none;\n}\n.si-tree-node-block:hover {\n  background-color: #1990ffab;\n  color: #fff;\n}\n.si-tree-node-block-actived {\n  background-color: #1990ffab;\n  color: #fff;\n}\n.si-tree-node-switcher {\n  margin-right: 2px;\n}\n.si-tree-node-icon {\n  margin-right: 4px;\n  display: flex;\n}\n.tree-compact {\n  margin-left: 4px;\n  font-size: 13px;\n  font-style: italic;\n  color: #49aa19;\n}\n";
+styleInject(css_248z$p);
 
 function parseData(data) {
   var res;
@@ -24168,8 +24612,8 @@ function registerSuggestions(monaco) {
   });
 }
 
-var css_248z$p = ":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";
-styleInject(css_248z$p);
+var css_248z$q = ":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";
+styleInject(css_248z$q);
 
 var Title = antd.Typography.Title;
 var STRTEMP = 'const config = ';
@@ -24363,7 +24807,7 @@ var Editor = (function (props) {
   }, [shallowHeight]);
   var hasConfigTree = type !== 'editor';
   return /*#__PURE__*/React__default['default'].createElement("div", {
-    className: isFull ? css_248z$p.editorWrapper : ''
+    className: isFull ? css_248z$q.editorWrapper : ''
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       overflow: 'hidden'
@@ -24431,7 +24875,7 @@ var Editor = (function (props) {
   })), hasConfigTree && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     span: 8
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: css_248z$p.title
+    className: css_248z$q.title
   }, "\u5C5E\u6027\u8282\u70B9\u6811"), /*#__PURE__*/React__default['default'].createElement(ConfigTree, {
     style: {
       height: 'calc(100vh - 300px)',
@@ -26314,8 +26758,8 @@ var FieldsSettingsTable = (function (props) {
   })), fieldsModify.visible && /*#__PURE__*/React__default['default'].createElement(FieldsModifyModal, _objectSpread2({}, fieldsModify)));
 });
 
-var css_248z$q = ".customFieldsDrawer .ant-col-8 {\n  flex: 0 0 100%!important;\n  max-width: 100%!important;\n}\n.customFieldsDrawer .ant-form-item {\n  margin-bottom: 0!important;\n}\n.customFieldsDrawer .ant-form {\n  margin-bottom: 15px;\n}\n.customFieldsDrawer .sula-template-query-table-fields-wrapper {\n  align-items: center;\n}\n";
-styleInject(css_248z$q);
+var css_248z$r = ".customFieldsDrawer .ant-col-8 {\n  flex: 0 0 100%!important;\n  max-width: 100%!important;\n}\n.customFieldsDrawer .ant-form-item {\n  margin-bottom: 0!important;\n}\n.customFieldsDrawer .ant-form {\n  margin-bottom: 15px;\n}\n.customFieldsDrawer .sula-template-query-table-fields-wrapper {\n  align-items: center;\n}\n";
+styleInject(css_248z$r);
 
 function iterFileds(fields) {
   var filedsValue = [];
@@ -26381,7 +26825,7 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
           if (item.dependency) {
             targetValue.dependency = {
               visible: _objectSpread2(_objectSpread2({}, item.dependency.visible), {}, {
-                type: new Function('axios', 'ctx', item.dependency.visible.type).bind(null, axios__default['default'])
+                type: new Function('request', 'ctx', item.dependency.visible.type).bind(null, requestUtil)
               })
             };
           }
@@ -26596,12 +27040,13 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     tableJsonEditorValsArr = _useState16[0],
     setTableJsonEditorValsArr = _useState16[1];
   React.useEffect(function () {
-    Promise.all([axios__default['default'].get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
+    Promise.all([requestUtil.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
         res = _ref3[0];
-      var resD = (res === null || res === void 0 ? void 0 : res.data) || {};
-      var data = resD.data;
-      if (judgeIsRequestSuccess(resD)) {
+      var _ref4 = (res === null || res === void 0 ? void 0 : res.data) || {},
+        code = _ref4.code,
+        data = _ref4.data;
+      if (code === '000000') {
         if (data) {
           var businessType = data.businessType,
             fieldGroup = data.code,
@@ -26620,17 +27065,17 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
   React.useEffect(function () {
     //明细表的配置数据
     var axiosArr = detailTablesSetting.map(function (item) {
-      return axios__default['default'].get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(item.tableCode));
+      return requestUtil.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(item.tableCode));
     });
-    Promise.all(axiosArr).then(function (_ref4) {
-      var _ref5 = _toArray(_ref4),
-        resArr = _ref5.slice(0);
+    Promise.all(axiosArr).then(function (_ref5) {
+      var _ref6 = _toArray(_ref5),
+        resArr = _ref6.slice(0);
       var configParams = {};
       detailTablesSetting.map(function (item, index) {
         var _resArr$index;
-        var _ref6 = ((_resArr$index = resArr[index]) === null || _resArr$index === void 0 ? void 0 : _resArr$index.data) || {},
-          code = _ref6.code,
-          data = _ref6.data;
+        var _ref7 = ((_resArr$index = resArr[index]) === null || _resArr$index === void 0 ? void 0 : _resArr$index.data) || {},
+          code = _ref7.code,
+          data = _ref7.data;
         if (data) {
           var businessType = data.businessType,
             fieldGroup = data.code,
@@ -27047,8 +27492,8 @@ var BsCascader = function BsCascader(_ref) {
   });
 };
 
-var css_248z$r = ".base_rule p {\n  margin: 0;\n}\n.base_rule .base_rule_content {\n  min-height: 80px;\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title {\n  position: relative;\n  height: 40px;\n}\n.base_rule .base_rule_line_title .rule_title {\n  height: 35px;\n  padding: 0 10px;\n  font-weight: bold;\n  font-size: 16px;\n  line-height: 35px;\n}\n.base_rule .base_rule_line_title .base_rule_btn_style {\n  position: absolute;\n  right: 0px;\n}\n.base_rule .base_rule_line_title :global .ant-btn-link {\n  color: #008fe0;\n  font-weight: bold;\n  border: 0px !important;\n}\n.base_rule .base_rule_line_title :global .ant-btn-link:hover,\n.base_rule .base_rule_line_title :global .ant-btn-link:focus {\n  color: #008fe0;\n  background-color: transparent;\n  border: 0px;\n  border-color: #008fe0;\n}\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):hover,\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):active,\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):focus {\n  color: #008fe0;\n}\n.base_rule .base_rule_line_content {\n  display: flex;\n  padding: 15px;\n  overflow-x: auto;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn {\n  margin-right: 10px;\n  color: #89b9cf;\n  font-size: 20px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn:hover {\n  cursor: pointer;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc_content {\n  height: 45px;\n  line-height: 45px;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc {\n  margin-right: 15px;\n}\n.base_rule .base_rule_line_content .base_rule_item1 {\n  align-items: center;\n  width: 120px;\n  color: #f8ab3c;\n  font-size: 16px;\n}\n.base_rule .base_rule_line_content .base_rule_item2 {\n  width: 1200px;\n}\n.base_rule .base_rule_line_content .base_rule_item3 {\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  margin-top: -20px;\n  padding-left: 20px;\n}\n.base_rule .base_rule_line_content .line_color_red {\n  color: #ed869b;\n}\n.base_rule .base_rule_line_content .base_rule_item4 {\n  width: 80px;\n}\n.base_rule .footer_line > span {\n  color: #008fe0;\n  font-weight: bold;\n  font-size: 16px;\n}\n.rule_name_title {\n  display: inline-block;\n  height: 30px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n  color: #f8ab3c;\n  font-size: 16px;\n  line-height: 30px;\n}\n.logical_operate_content {\n  position: relative;\n}\n.logical_operate_content .top_line {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content .bottom_line {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 998;\n  width: 2px;\n  height: 100%;\n  overflow: hidden;\n  background: #d6efe8;\n  content: ' ';\n}\n.logical_item_btn {\n  position: absolute !important;\n  top: 50%;\n  left: 50%;\n  z-index: 999;\n  display: flex !important;\n  align-items: center;\n  width: 50px;\n  height: 30px !important;\n  margin-top: -15px;\n  margin-left: -25px;\n  padding: 0px !important;\n  color: #008fe0 !important;\n  line-height: 30px !important;\n  text-align: center !important;\n  background-color: #ffffff !important;\n  cursor: pointer !important;\n}\n.logical_item_btn1 {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  display: inline-block;\n  width: 30px;\n  height: 30px;\n  margin-left: -15px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.rule_field_style {\n  display: inline-block;\n}\n.icon_btn_style {\n  margin-right: 10px;\n  font-size: 20px;\n}\n.choose_logical_type {\n  height: 25px;\n  margin: 0px;\n  padding: 0 10px;\n  line-height: 25px;\n  cursor: pointer;\n}\n.choose_logical_type:first-child {\n  border-bottom: 1px solid #d9d9d9;\n}\n.choose_logical_type:hover {\n  color: white;\n  background-color: #008fe0;\n}\n.action_list_item {\n  display: flex;\n  justify-content: space-between;\n  margin-bottom: 10px;\n  padding: 10px;\n  border: 1px solid #e1e1f0;\n  border-radius: 2px;\n  cursor: pointer;\n}\n:global .ant-popover-inner-content {\n  padding: 0px;\n}\n";
-styleInject(css_248z$r);
+var css_248z$s = ".base_rule p {\n  margin: 0;\n}\n.base_rule .base_rule_content {\n  min-height: 80px;\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title {\n  position: relative;\n  height: 40px;\n}\n.base_rule .base_rule_line_title .rule_title {\n  height: 35px;\n  padding: 0 10px;\n  font-weight: bold;\n  font-size: 16px;\n  line-height: 35px;\n}\n.base_rule .base_rule_line_title .base_rule_btn_style {\n  position: absolute;\n  right: 0px;\n}\n.base_rule .base_rule_line_title :global .ant-btn-link {\n  color: #008fe0;\n  font-weight: bold;\n  border: 0px !important;\n}\n.base_rule .base_rule_line_title :global .ant-btn-link:hover,\n.base_rule .base_rule_line_title :global .ant-btn-link:focus {\n  color: #008fe0;\n  background-color: transparent;\n  border: 0px;\n  border-color: #008fe0;\n}\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):hover,\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):active,\n.base_rule .base_rule_line_title :global .ant-btn:not(.ant-btn-primary .ant-btn-danger):focus {\n  color: #008fe0;\n}\n.base_rule .base_rule_line_content {\n  display: flex;\n  padding: 15px;\n  overflow-x: auto;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn {\n  margin-right: 10px;\n  color: #89b9cf;\n  font-size: 20px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn:hover {\n  cursor: pointer;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc_content {\n  height: 45px;\n  line-height: 45px;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc {\n  margin-right: 15px;\n}\n.base_rule .base_rule_line_content .base_rule_item1 {\n  align-items: center;\n  width: 120px;\n  color: #f8ab3c;\n  font-size: 16px;\n}\n.base_rule .base_rule_line_content .base_rule_item2 {\n  width: 1200px;\n}\n.base_rule .base_rule_line_content .base_rule_item3 {\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  margin-top: -20px;\n  padding-left: 20px;\n}\n.base_rule .base_rule_line_content .line_color_red {\n  color: #ed869b;\n}\n.base_rule .base_rule_line_content .base_rule_item4 {\n  width: 80px;\n}\n.base_rule .footer_line > span {\n  color: #008fe0;\n  font-weight: bold;\n  font-size: 16px;\n}\n.rule_name_title {\n  display: inline-block;\n  height: 30px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n  color: #f8ab3c;\n  font-size: 16px;\n  line-height: 30px;\n}\n.logical_operate_content {\n  position: relative;\n}\n.logical_operate_content .top_line {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content .bottom_line {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 998;\n  width: 2px;\n  height: 100%;\n  overflow: hidden;\n  background: #d6efe8;\n  content: ' ';\n}\n.logical_item_btn {\n  position: absolute !important;\n  top: 50%;\n  left: 50%;\n  z-index: 999;\n  display: flex !important;\n  align-items: center;\n  width: 50px;\n  height: 30px !important;\n  margin-top: -15px;\n  margin-left: -25px;\n  padding: 0px !important;\n  color: #008fe0 !important;\n  line-height: 30px !important;\n  text-align: center !important;\n  background-color: #ffffff !important;\n  cursor: pointer !important;\n}\n.logical_item_btn1 {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  display: inline-block;\n  width: 30px;\n  height: 30px;\n  margin-left: -15px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.rule_field_style {\n  display: inline-block;\n}\n.icon_btn_style {\n  margin-right: 10px;\n  font-size: 20px;\n}\n.choose_logical_type {\n  height: 25px;\n  margin: 0px;\n  padding: 0 10px;\n  line-height: 25px;\n  cursor: pointer;\n}\n.choose_logical_type:first-child {\n  border-bottom: 1px solid #d9d9d9;\n}\n.choose_logical_type:hover {\n  color: white;\n  background-color: #008fe0;\n}\n.action_list_item {\n  display: flex;\n  justify-content: space-between;\n  margin-bottom: 10px;\n  padding: 10px;\n  border: 1px solid #e1e1f0;\n  border-radius: 2px;\n  cursor: pointer;\n}\n:global .ant-popover-inner-content {\n  padding: 0px;\n}\n";
+styleInject(css_248z$s);
 
 // 查询规则对象属性thresholdList
 function getRegularThresholdRange(_x) {
@@ -27059,7 +27504,7 @@ function _getRegularThresholdRange() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", axios__default['default']({
+          return _context.abrupt("return", requestUtil({
             url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
             method: 'POST',
             data: _objectSpread2(_objectSpread2({}, params), {}, {
@@ -29594,7 +30039,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
         style: {
           marginLeft: '10px'
         },
-        className: css_248z$r.rule_field_style
+        className: css_248z$s.rule_field_style
       }, this.renderConditionField());
     }
   }]);
@@ -30037,7 +30482,7 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
         disabled = _this$props.disabled;
       return /*#__PURE__*/React__default['default'].createElement("div", null, ruleTypeData.map(function (i) {
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          className: css_248z$r.action_list_item
+          className: css_248z$s.action_list_item
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           onClick: function onClick() {
             return handleOperatingAction(i.code, 'view');
@@ -30061,55 +30506,537 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
   return RuleField;
 }(React.Component);
 
-var InnerSelect = (function (props) {
-  var disabled = props.disabled,
-    inputType = props.inputType,
-    defaultValue = props.defaultValue,
-    styleCommon = props.styleCommon,
-    value = props.value,
-    _onChange = props.onChange,
-    dictionaryCode = props.dictionaryCode;
-  var _useState = React.useState(getDictionarySource(dictionaryCode !== null && dictionaryCode !== void 0 ? dictionaryCode : '') || []),
-    _useState2 = _slicedToArray(_useState, 2),
-    dataSource = _useState2[0],
-    setDataSource = _useState2[1];
-  React.useEffect(function () {
-    if (!!dictionaryCode && !getDictionarySource(dictionaryCode)) {
-      bssula.request({
-        url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(dictionaryCode),
-        method: 'get',
-        converter: function converter(_ref) {
-          var _data$map;
-          var data = _ref.data;
-          var dataList = (data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
-            return {
-              label: item.dictItemName,
-              value: item.dictItemCode
-            };
-          })) || [];
-          setDataSource(dataList);
-          return dataList;
-        }
+var RangePicker$1 = antd.DatePicker.RangePicker;
+function RenderCompItem(props) {
+  var _showValue, _showValue2;
+  var regularDataList = props.regularDataList,
+    ites = props.ites,
+    showValue = props.showValue,
+    handleEdit = props.handleEdit,
+    disabled = props.disabled;
+  var fieldListGroup = regularDataList.map(function (item) {
+    var Item = {
+      id: item.id,
+      code: item.code,
+      name: item.name,
+      value: item.code
+    };
+    if (item.propertyList) {
+      // @ts-ignore
+      Item.propertyList = item.propertyList.map(function (field) {
+        return {
+          id: field.id,
+          code: field.code,
+          name: field.name,
+          value: "".concat(item.code, ".").concat(field.code),
+          valueText: "".concat(item.name, ".").concat(field.name)
+        };
       });
     }
-  }, [dictionaryCode]);
-  return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
-    disabled: disabled
-  }, inputType === 30 ? {
-    mode: 'multiple'
-  } : {}), {}, {
-    defaultValue: defaultValue,
-    style: styleCommon,
-    value: value === null || value === void 0 ? void 0 : value.split(','),
-    onChange: function onChange(changeValue) {
-      _onChange(changeValue);
-      // handleEdit(ites.code, value);
-    },
-    options: dataSource
-  }));
-});
+    return Item;
+  });
+  console.log((ites === null || ites === void 0 ? void 0 : ites.dictionaryCode) && !getDictionarySource(ites.dictionaryCode));
+  var _useState = React.useState(getDictionarySource(ites.dictionaryCode) || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    dictData = _useState2[0],
+    setDictData = _useState2[1];
+  var getDictData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _data$map;
+      var data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return bssula.request({
+              url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(ites.dictionaryCode)
+            });
+          case 2:
+            data = _context.sent;
+            setDictData(data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
+              return {
+                text: item.dictItemName,
+                value: item.dictItemCode
+              };
+            }));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getDictData() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  React.useEffect(function () {
+    if ((ites === null || ites === void 0 ? void 0 : ites.dictionaryCode) && !getDictionarySource(ites.dictionaryCode)) {
+      getDictData();
+    }
+  }, []);
+  if (!ites) return;
+  var styleCommon = _objectSpread2({
+    width: '200px'
+  }, (ites === null || ites === void 0 ? void 0 : ites.rightText) ? {
+    marginLeft: 10
+  } : {});
+  var style2 = {
+    width: '100px'
+  };
+  console.log('value');
+  console.log(ites === null || ites === void 0 ? void 0 : ites.code);
+  console.log(showValue(ites.code));
+  console.log((_showValue = showValue(ites.code)) === null || _showValue === void 0 ? void 0 : _showValue.split(','));
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 21 && ( /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled,
+    allowClear: true,
+    onClear: function onClear() {
+      return handleEdit(ites.code, undefined);
+    },
+    defaultValue: showValue(ites.code, 'input'),
+    style: styleCommon,
+    onBlur: function onBlur(e) {
+      handleEdit(ites.code, String(e.target.value).trim() == '' ? undefined : e.target.value);
+    }
+  })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && ((ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 || (ites === null || ites === void 0 ? void 0 : ites.valueType) === 22) && ( /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+    disabled: disabled,
+    max: Number.MAX_SAFE_INTEGER,
+    min: (ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 ? 0 : Number.MIN_SAFE_INTEGER,
+    precision: (ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 ? 0 : 2,
+    defaultValue: ites.defaultValue,
+    style: style2,
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
+  })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 && ( /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
+    disabled: disabled,
+    defaultValue: ites.defaultValue,
+    style: style2,
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
+  })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 40 && ( /*#__PURE__*/React__default['default'].createElement(RangePicker$1, {
+    showTime: true,
+    disabled: disabled,
+    defaultValue: ites.defaultValue,
+    style: style2,
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
+  })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 24 && ( /*#__PURE__*/React__default['default'].createElement(antd.Switch, {
+    disabled: disabled,
+    defaultChecked: !!ites.defaultValue,
+    style: style2,
+    checked: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
+  })) || 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) === 10 && ( /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
+    disabled: disabled,
+    allowClear: true,
+    showArrow: true
+  }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+    mode: 'multiple'
+  } : {}), {}, {
+    defaultValue: ites.defaultValue,
+    style: styleCommon,
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    }
+  }), Object.keys(ites.enumeration).map(function (it) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+      key: it,
+      value: it
+    }, ites.enumeration[it]);
+  }))) || 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) === 20 && ( /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
+    disabled: disabled
+  }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+    mode: 'multiple'
+  } : {}), {}, {
+    defaultValue: ites.defaultValue,
+    style: styleCommon,
+    value: (_showValue2 = showValue(ites.code)) === null || _showValue2 === void 0 ? void 0 : _showValue2.split(','),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    showSearch: true,
+    optionFilterProp: "children",
+    filterOption: function filterOption(input, option) {
+      return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    }
+  }), dictData === null || dictData === void 0 ? void 0 : dictData.map(function (it) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+      key: it.value,
+      value: it.value
+    }, it.text);
+  }))) || 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) === 110 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "physicalWarehouse",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择物理仓'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      mappingValueField: 'physicalWarehouseCode',
+      filterInit: 'qp-physicalWarehouseCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 120 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "realWarehouse",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择逻辑仓'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      mappingValueField: 'realWarehouseCode',
+      filterInit: 'qp-realWarehouseCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 130 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "virtualWarehouse",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择虚拟仓'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      mappingValueField: 'virtualWarehouseCode',
+      filterInit: 'qp-virtualWarehouseCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 140 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "channelWarehouse",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择渠道仓'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      mappingValueField: 'channelWarehouseCode',
+      filterInit: 'qp-channelWarehouseCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 150 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "spuCommodity",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择SPU'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-itemCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 160 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "skuCommodity",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择商品'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-skuCode-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 190 && ( /*#__PURE__*/React__default['default'].createElement(BsCascader, {
+    disabled: disabled,
+    isAll: true,
+    needNameAndCode: true,
+    notChangeOnSelect: true,
+    initRequestSource: function () {
+      var _initRequestSource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return bssula.request({
+                url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                method: 'get',
+                converter: function converter(_ref2) {
+                  var data = _ref2.data;
+                  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115629
+                  var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                    return {
+                      text: item.name,
+                      value: item.id,
+                      level: item.level,
+                      id: item.id
+                    };
+                  }) : [];
+                  return handleData;
+                }
+              });
+            case 2:
+              return _context2.abrupt("return", _context2.sent);
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function initRequestSource() {
+        return _initRequestSource.apply(this, arguments);
+      }
+      return initRequestSource;
+    }(),
+    value: showValue(ites.code),
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 210 && ( /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+    disabled: disabled,
+    treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
+    businessType: "department",
+    labelInValue: true,
+    value: showValue(ites.code),
+    style: styleCommon,
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 220 && ( /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+    disabled: disabled,
+    treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
+    businessType: "purchase-organization",
+    labelInValue: true,
+    value: showValue(ites.code),
+    style: styleCommon,
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 230 && ( /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+    disabled: disabled,
+    treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
+    businessType: "sales-organization",
+    labelInValue: true,
+    value: showValue(ites.code),
+    style: styleCommon,
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 240 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "supplier2",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择供应商'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-code-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 250 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "customer2",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择客户'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-code-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 260 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "shopFile2",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择店铺'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-code-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 270 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "employee2",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择员工'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-id-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 280 && ( /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
+    disabled: disabled,
+    treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
+    businessType: "stock-organization",
+    labelInValue: true,
+    value: showValue(ites.code),
+    style: styleCommon,
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    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) === 310 && ( /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+    selectBusinessType: "deliveryMode",
+    selectProps: _objectSpread2({
+      style: styleCommon,
+      placeholder: '请选择配送方式'
+    }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+      mode: 'multiple',
+      maxTagCount: 1
+    } : {}),
+    disabled: disabled,
+    labelInValue: true,
+    value: showValue(ites.code),
+    requestConfig: {
+      filterInit: 'qp-code-in'
+    },
+    onChange: function onChange(value) {
+      handleEdit(ites.code, value);
+    },
+    getPopupContainer: function getPopupContainer() {
+      return document.body;
+    }
+  })) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 40 && ( /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(App$1, {
+    disabled: disabled,
+    key: showValue(ites.code),
+    // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115667
+    setValue: function setValue(val, formulaName) {
+      console.log(val, 'val');
+      var value = val.map(function (item) {
+        return item.value.replace(/[a-zA-Z_]+\.\w+/g, function (i) {
+          return '{' + i + '}';
+        });
+      });
+      handleEdit(ites.code, value.join(''));
+      handleEdit({
+        inputType: 40,
+        formulaName: formulaName
+      });
+    },
+    record: {
+      expression: showValue(ites.code)
+    },
+    sourceData: fieldListGroup
+  }))));
+}
 
-var RangePicker$1 = antd.DatePicker.RangePicker;
+var RangePicker$2 = antd.DatePicker.RangePicker;
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   _inherits(RuleObjectComponent, _Component);
   var _super = _createSuper(RuleObjectComponent);
@@ -30178,6 +31105,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         } else if (element.choiceType === 20) {
           _this.dictCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = infoVo === null || infoVo === void 0 ? void 0 : infoVo.dictionaryCode;
         } else if (element.choiceType === 10) {
+          // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115669
           var _list = Object.keys(infoVo).length && infoVo.enumeration && Object.keys(infoVo.enumeration).map(function (i) {
             return {
               code: i,
@@ -30522,18 +31450,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'or');
           }
-        }, "\u6216\u8005"), /*#__PURE__*/React__default['default'].createElement("p", {
+        }, "OR"), /*#__PURE__*/React__default['default'].createElement("p", {
           className: 'choose_logical_type',
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'and');
           }
-        }, "\u5E76\u4E14")),
+        }, "AND")),
         trigger: "focus"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
         disabled: disabled,
         type: "link",
         className: 'logical_item_btn'
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? '或者' : '并且', /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? 'OR' : 'AND', /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, {
         style: {
           marginLeft: '6px'
         }
@@ -30628,7 +31556,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         onChange: function onChange(value) {
           var _systemVariableList$f;
           var ruleClassData = _this.state.ruleClassData;
-          console.log(itemDetail);
           itemDetail.params = [value && "{".concat(value, "}") || ''];
           var name = (_systemVariableList$f = systemVariableList.find(function (i) {
             return i.code == value;
@@ -30763,503 +31690,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       })) || null;
     };
-    _this.renderCompItem = function (ites, showValue, handleEdit, disabled) {
-      var regularDataList = _this.props.regularDataList;
-      var fieldListGroup = regularDataList.map(function (item) {
-        var Item = {
-          id: item.id,
-          code: item.code,
-          name: item.name,
-          value: item.code
-        };
-        if (item.propertyList) {
-          Item.propertyList = item.propertyList.map(function (field) {
-            return {
-              id: field.id,
-              code: field.code,
-              name: field.name,
-              value: "".concat(item.code, ".").concat(field.code),
-              valueText: "".concat(item.name, ".").concat(field.name)
-            };
-          });
-        }
-        return Item;
-      });
-      if (!ites) return;
-      var styleCommon = _objectSpread2({
-        width: '200px'
-      }, (ites === null || ites === void 0 ? void 0 : ites.rightText) ? {
-        marginLeft: 10
-      } : {});
-      var style2 = {
-        width: '100px'
-      };
-      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 21 && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-        disabled: disabled,
-        allowClear: true,
-        onClear: function onClear() {
-          handleEdit(ites.code, undefined);
-        },
-        defaultValue: showValue(ites.code, 'input'),
-        style: styleCommon,
-        onBlur: function onBlur(e) {
-          handleEdit(ites.code, String(e.target.value).trim() == '' ? undefined : e.target.value);
-        }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && ((ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 || (ites === null || ites === void 0 ? void 0 : ites.valueType) === 22) && /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-        disabled: disabled,
-        max: Number.MAX_SAFE_INTEGER,
-        min: (ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 ? 0 : Number.MIN_SAFE_INTEGER,
-        precision: (ites === null || ites === void 0 ? void 0 : ites.valueType) === 23 ? 0 : 2,
-        defaultValue: ites.defaultValue,
-        style: style2,
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && ((ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 || (ites === null || ites === void 0 ? void 0 : ites.valueType) === 32) && /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
-        showTime: dataTypeCode == 32,
-        format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
-        disabled: disabled,
-        defaultValue: ites.defaultValue,
-        style: style2,
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 40 && /*#__PURE__*/React__default['default'].createElement(RangePicker$1, {
-        showTime: true,
-        disabled: disabled,
-        defaultValue: ites.defaultValue,
-        style: style2,
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 24 && /*#__PURE__*/React__default['default'].createElement(antd.Switch, {
-        disabled: disabled,
-        defaultChecked: !!ites.defaultValue,
-        style: style2,
-        checked: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        }
-      }) || 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) === 10 && /*#__PURE__*/React__default['default'].createElement(antd.Select, _extends({
-        disabled: disabled,
-        allowClear: true,
-        showArrow: true
-      }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-        mode: 'multiple'
-      } : {}, {
-        defaultValue: ites.defaultValue,
-        style: styleCommon,
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        }
-      }), Object.keys(ites.enumeration).map(function (it) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
-          key: it,
-          value: it
-        }, ites.enumeration[it]);
-      })) || 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) === 20 && /*#__PURE__*/React__default['default'].createElement(InnerSelect, {
-        disabled: disabled,
-        inputType: ites === null || ites === void 0 ? void 0 : ites.inputType,
-        defaultValue: ites.defaultValue,
-        styleCommon: styleCommon,
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        dictionaryCode: ites.dictionaryCode
-      }) || 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) === 110 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "physicalWarehouse",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择物理仓'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          mappingValueField: 'physicalWarehouseCode',
-          filterInit: 'qp-physicalWarehouseCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 120 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "realWarehouse",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择逻辑仓'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          mappingValueField: 'realWarehouseCode',
-          filterInit: 'qp-realWarehouseCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 130 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "virtualWarehouse",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择虚拟仓'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          mappingValueField: 'virtualWarehouseCode',
-          filterInit: 'qp-virtualWarehouseCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 140 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "channelWarehouse",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择渠道仓'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          mappingValueField: 'channelWarehouseCode',
-          filterInit: 'qp-channelWarehouseCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 150 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "spuCommodity",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择SPU'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-itemCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 160 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "skuCommodity",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择商品'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-skuCode-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 190 && /*#__PURE__*/React__default['default'].createElement(BsCascader, {
-        disabled: disabled,
-        isAll: true,
-        needNameAndCode: true,
-        notChangeOnSelect: true,
-        initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return bssula.request({
-                  url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                  method: 'get',
-                  converter: function converter(_ref2) {
-                    var data = _ref2.data;
-                    var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                      return {
-                        text: item.name,
-                        value: item.id,
-                        level: item.level,
-                        id: item.id
-                      };
-                    }) : [];
-                    return handleData;
-                  }
-                });
-              case 2:
-                return _context.abrupt("return", _context.sent);
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        })),
-        value: showValue(ites.code),
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 210 && /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-        disabled: disabled,
-        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
-        businessType: "department",
-        labelInValue: true,
-        value: showValue(ites.code),
-        style: styleCommon,
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 220 && /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-        disabled: disabled,
-        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
-        businessType: "purchase-organization",
-        labelInValue: true,
-        value: showValue(ites.code),
-        style: styleCommon,
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 230 && /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-        disabled: disabled,
-        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
-        businessType: "sales-organization",
-        labelInValue: true,
-        value: showValue(ites.code),
-        style: styleCommon,
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 240 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "supplier2",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择供应商'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-code-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 250 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "customer2",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择客户'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-code-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 260 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "shopFile2",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择店铺'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-code-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 270 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "employee2",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择员工'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-id-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 280 && /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-        disabled: disabled,
-        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
-        businessType: "stock-organization",
-        labelInValue: true,
-        value: showValue(ites.code),
-        style: styleCommon,
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 290 && /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
-        disabled: disabled,
-        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
-        businessType: "settle-organization",
-        labelInValue: true,
-        value: showValue(ites.code),
-        style: styleCommon,
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 310 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "deliveryMode",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择配送方式'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-code-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        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) === 360 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
-        selectBusinessType: "role",
-        selectProps: _objectSpread2({
-          style: styleCommon,
-          placeholder: '请选择角色'
-        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-          mode: 'multiple',
-          maxTagCount: 1
-        } : {}),
-        disabled: disabled,
-        labelInValue: true,
-        value: showValue(ites.code),
-        requestConfig: {
-          filterInit: 'qp-code-in'
-        },
-        onChange: function onChange(value) {
-          handleEdit(ites.code, value);
-        },
-        getPopupContainer: function getPopupContainer() {
-          return document.body;
-        }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 40 && /*#__PURE__*/React__default['default'].createElement("div", {
-        style: {
-          display: 'flex'
-        }
-      }, /*#__PURE__*/React__default['default'].createElement(App$1, {
-        disabled: disabled,
-        key: showValue(ites.code),
-        setValue: function setValue(val, formulaName) {
-          console.log(val, 'val');
-          var value = val.map(function (item) {
-            return item.value.replace(/[a-zA-Z_]+\.\w+/g, function (i) {
-              return '{' + i + '}';
-            });
-          });
-          handleEdit(ites.code, value.join(''));
-          handleEdit({
-            inputType: 40,
-            formulaName: formulaName
-          });
-        },
-        record: {
-          expression: showValue(ites.code)
-        },
-        sourceData: fieldListGroup
-      })));
-    };
-    _this.renderFormCompItem = function (config, showValue, handleEdit, parentItem, boxStyle, disabled) {
+    _this.renderFormCompItem = function (config, _showValue, _handleEdit, parentItem, boxStyle, disabled) {
       if (!config) return;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         style: boxStyle
@@ -31277,15 +31708,21 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         className: "requiredMark"
-      })) || null, _this.renderCompItem(config, function (a, b) {
-        var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-        var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-        return showValue(a, b, c, d);
-      }, function (a, b) {
-        var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-        var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-        return handleEdit(a, b, c, d);
-      }, disabled), (config === null || config === void 0 ? void 0 : config.rightText) && /*#__PURE__*/React__default['default'].createElement("div", {
+      })) || null, /*#__PURE__*/React__default['default'].createElement(RenderCompItem, {
+        regularDataList: _this.props.regularDataList,
+        ites: config,
+        showValue: function showValue(a, b) {
+          var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
+          var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
+          return _showValue(a, b, c, d);
+        },
+        handleEdit: function handleEdit(a, b) {
+          var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
+          var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
+          return _handleEdit(a, b, c, d);
+        },
+        disabled: disabled
+      }), (config === null || config === void 0 ? void 0 : config.rightText) && /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
           flex: 'none',
           marginLeft: 10