@bit-sun/business-component 2.4.31-alpha.9 → 2.4.31

package/dist/index.js

@@ -6,9 +6,8 @@ var axios = require('axios');
 var cookie = require('js-cookie');
 var antd = require('antd');
 var _ = require('lodash');
-var memoizeOne = require('memoize-one');
 var umi = require('umi');
-var isEqual = require('lodash/isEqual');
+var isEqual$1 = require('lodash/isEqual');
 var React$1 = require('react');
 var moment$1 = require('moment');
 var icons = require('@ant-design/icons');
@@ -36,8 +35,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var cookie__default = /*#__PURE__*/_interopDefaultLegacy(cookie);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-var memoizeOne__default = /*#__PURE__*/_interopDefaultLegacy(memoizeOne);
-var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual$1);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React$1);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment$1);
 var ProLayout__default = /*#__PURE__*/_interopDefaultLegacy(ProLayout);
@@ -990,6 +988,56 @@ var precisionQuantity = function precisionQuantity(num, accuracy) {
   return '';
 };
 
+var safeIsNaN = Number.isNaN ||
+    function ponyfill(value) {
+        return typeof value === 'number' && value !== value;
+    };
+function isEqual(first, second) {
+    if (first === second) {
+        return true;
+    }
+    if (safeIsNaN(first) && safeIsNaN(second)) {
+        return true;
+    }
+    return false;
+}
+function areInputsEqual(newInputs, lastInputs) {
+    if (newInputs.length !== lastInputs.length) {
+        return false;
+    }
+    for (var i = 0; i < newInputs.length; i++) {
+        if (!isEqual(newInputs[i], lastInputs[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function memoizeOne(resultFn, isEqual) {
+    if (isEqual === void 0) { isEqual = areInputsEqual; }
+    var cache = null;
+    function memoized() {
+        var newArgs = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            newArgs[_i] = arguments[_i];
+        }
+        if (cache && cache.lastThis === this && isEqual(newArgs, cache.lastArgs)) {
+            return cache.lastResult;
+        }
+        var lastResult = resultFn.apply(this, newArgs);
+        cache = {
+            lastResult: lastResult,
+            lastArgs: newArgs,
+            lastThis: this,
+        };
+        return lastResult;
+    }
+    memoized.clear = function clear() {
+        cache = null;
+    };
+    return memoized;
+}
+
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -1313,7 +1361,7 @@ var formatter = function formatter(data, parentAuthority, parentName) {
     return item;
   });
 };
-var memoizeOneFormatter = memoizeOne__default['default'](formatter, isEqual__default['default']);
+var memoizeOneFormatter = memoizeOne(formatter, isEqual__default['default']);
 var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
   if (backHistoryPath) {
@@ -1474,7 +1522,7 @@ var judgeIsEmpty = function judgeIsEmpty(value) {
 // 判断某个按钮/菜单 是否有权限，返回布尔值
 var authFunc = function authFunc(code) {
   var _JSON$parse;
-  return !shouldUseAuth() ? true : (_JSON$parse = JSON.parse(localStorage.getItem(getMenuAuthDataKey()) || '[]')) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.find(function (d) {
+  return (_JSON$parse = JSON.parse(localStorage.getItem(getMenuAuthDataKey()) || '[]')) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.find(function (d) {
     return d === code;
   });
 };
@@ -1500,11 +1548,6 @@ var handleJudgeAuthButtons = function handleJudgeAuthButtons(buttonCodeArray) {
   });
   return result;
 };
-// 判断何时菜单权限和表格权限生效
-var shouldUseAuth = function shouldUseAuth() {
-  // @ts-ignore
-  return window.__POWERED_BY_WUJIE__ ? true : false;
-};
 
 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);
@@ -1553,21 +1596,8 @@ var filterLetters = function filterLetters(i) {
     return undefined;
   }
 };
-// 抽象出创建对象的共通逻辑
-function createItem(idPrefix, index, title, name, format) {
-  return {
-    id: "".concat(idPrefix).concat(index),
-    content: title,
-    code: name,
-    "ct": format //单元格值格式
-  };
-}
-// 定义[单元格值]常量以避免魔术字符串
-var FORMAT_NAME_GENERAL = "General"; //格式名称为自动格式
-var FORMAT_TYPE_STRING = "s"; //格式类型为数字类型
 var DataValidation = /*#__PURE__*/function (_React$Component) {
   function DataValidation(props) {
-    var _props$customerColumn;
     var _this;
     _classCallCheck(this, DataValidation);
     _this = _callSuper(this, DataValidation, [props]);
@@ -1582,7 +1612,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     };
     _this.setConfig = function (data) {
       var items = _this.state.items;
-      var notValid = _this.props.notValid;
       return {
         container: 'luckysheet',
         showtoolbar: false,
@@ -1591,7 +1620,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             if (columnAbc.name) {
               var charCode = columnAbc.name.charCodeAt();
               if (charCode - 65 <= items.length) {
-                columnAbc.name = itemsTemp[charCode - 65] ? itemsTemp[charCode - 65].content : !notValid ? '校验结果' : '';
+                columnAbc.name = itemsTemp[charCode - 65] ? itemsTemp[charCode - 65].content : '校验结果';
               } else {
                 columnAbc.name = '';
               }
@@ -1944,7 +1973,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       onClick: function onClick() {
         return _this.filterData('all');
       }
-    }, "\u6E05\u7A7A\u5168\u90E8\u6570\u636E")), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Divider, null), !_this.props.notValid && /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, {
+    }, "\u6E05\u7A7A\u5168\u90E8\u6570\u636E")), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Divider, null), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, {
       key: "2",
       className: "sheet_table-menu_item_text"
     }, /*#__PURE__*/React__default['default'].createElement("a", {
@@ -1987,22 +2016,18 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }), provided.placeholder);
     }))));
     _this.props.onRef(_this);
-    var format = {
-      fa: FORMAT_NAME_GENERAL,
-      t: FORMAT_TYPE_STRING
-    };
-    if (props === null || props === void 0 ? void 0 : (_props$customerColumn = props.customerColumnsMapping) === null || _props$customerColumn === void 0 ? void 0 : _props$customerColumn.length) {
-      var _props$customerColumn2;
-      itemsTemp = (props === null || props === void 0 ? void 0 : (_props$customerColumn2 = props.customerColumnsMapping) === null || _props$customerColumn2 === void 0 ? void 0 : _props$customerColumn2.map(function (item, index) {
-        return createItem('item-0', index, item.title, item.name, format);
-      })) || [];
-    } else {
-      var _props$columns;
-      itemsTemp = (props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (item, index) {
-        if (!mapping.get(item)) throw Error("".concat(item, " is not in DataValidation component, please fix this error"));
-        return createItem('item-0', index, mapping.get(item), item, format);
-      })) || [];
-    }
+    itemsTemp = props.columns.map(function (item, index) {
+      if (!mapping.get(item)) throw Error("".concat(item, " is not in DataValidation component, please fix this error"));
+      return {
+        id: "item-0".concat(index),
+        content: mapping.get(item),
+        code: item,
+        "ct": {
+          "fa": "General",
+          "t": "s" //格式类型为数字类型
+        }
+      };
+    });
     luckysheet = window.luckysheet || window.top.luckysheet;
     _this.state = {
       showErrorData: false,
@@ -2043,9 +2068,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var errorListCheck = this.state.errorListCheck;
-      var _this$props2 = this.props,
-        title = _this$props2.title,
-        notValid = _this$props2.notValid;
+      var title = this.props.title;
       var totalSummary = this.getCount();
       var luckyCss = {
         margin: '0px',
@@ -2068,7 +2091,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         trigger: ['click'],
         overlay: this.menuList,
         placement: "bottomRight"
-      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u6E05\u7A7A", /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null))), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u6E05\u7A7A", /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null))), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
         type: "primary",
         onClick: this.resetData
       }, "\u8BC6\u522B"))), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -2079,11 +2102,11 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         id: "luckysheet",
         style: luckyCss
-      })), !this.props.notValid && /*#__PURE__*/React__default['default'].createElement("div", {
+      })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "sheet_table_footer"
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         className: "sheet_table_footer_l"
-      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E", !notValid && ", \u5176\u4E2D\u9519\u8BEF ".concat(totalSummary.error, " \u9879")), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E, \u5176\u4E2D\u9519\u8BEF ", totalSummary.error, " \u9879"), /*#__PURE__*/React__default['default'].createElement(antd.Space, {
         className: "sheet_table_footer_r"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
         checked: errorListCheck,
@@ -2140,21 +2163,8 @@ var filterLetters$1 = function filterLetters(i) {
     return undefined;
   }
 };
-// 抽象出创建对象的共通逻辑
-function createItem$1(idPrefix, index, title, name, format) {
-  return {
-    id: "".concat(idPrefix).concat(index),
-    content: title,
-    code: name,
-    "ct": format //单元格值格式
-  };
-}
-// 定义[单元格值]常量以避免魔术字符串
-var FORMAT_NAME_GENERAL$1 = "General"; //格式名称为自动格式
-var FORMAT_TYPE_STRING$1 = "s"; //格式类型为数字类型
 var DataImport = /*#__PURE__*/function (_React$Component) {
   function DataImport(props) {
-    var _props$customerColumn;
     var _this;
     _classCallCheck(this, DataImport);
     _this = _callSuper(this, DataImport, [props]);
@@ -2396,32 +2406,22 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         });
         return obj;
       });
-      return data;
+      return data.filter(function (item) {
+        return item[_this.props.customerColumnsMapping[0].name];
+      });
     };
     _this.resetData = function () {
       var _this$props = _this.props,
         validDataUrl = _this$props.validDataUrl,
-        validDataParams = _this$props.validDataParams,
         updateData = _this$props.updateData,
-        columns = _this$props.columns,
-        isBrandAuth = _this$props.isBrandAuth,
-        _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt;
+        columns = _this$props.columns;
       var resultData = _this.getData().filter(function (d) {
         return ___default['default'].compact(Object.values(d)).length;
       });
-      // 处理业务参数
-      var otherParams = {};
-      if (isBrandAuth) {
-        otherParams = {
-          brandAuth: 'ctl-withAuth'
-        };
-      }
-      axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
+      axios__default['default'].post(validDataUrl, {
         columns: columns,
-        data: resultData,
-        checkStockNum: isCheckStockNum
-      })).then(function (result) {
+        data: resultData
+      }).then(function (result) {
         result = result.data;
         if (judgeIsRequestError(result)) {
           antd.message.error(result.msg);
@@ -2574,21 +2574,31 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       }), provided.placeholder);
     }))));
     _this.props.onRef(_this);
-    var format = {
-      fa: FORMAT_NAME_GENERAL$1,
-      t: FORMAT_TYPE_STRING$1
-    };
-    if (props === null || props === void 0 ? void 0 : (_props$customerColumn = props.customerColumnsMapping) === null || _props$customerColumn === void 0 ? void 0 : _props$customerColumn.length) {
-      var _props$customerColumn2;
-      itemsTemp$1 = (props === null || props === void 0 ? void 0 : (_props$customerColumn2 = props.customerColumnsMapping) === null || _props$customerColumn2 === void 0 ? void 0 : _props$customerColumn2.map(function (item, index) {
-        return createItem$1('item-0', index, item.title, item.name, format);
-      })) || [];
+    if (props.customerColumnsMapping) {
+      itemsTemp$1 = props.customerColumnsMapping.map(function (item, index) {
+        return {
+          id: "item-0".concat(index),
+          content: item.title,
+          code: item.name,
+          "ct": {
+            "fa": "General",
+            "t": "s" //格式类型为数字类型
+          }
+        };
+      });
     } else {
-      var _props$columns;
-      itemsTemp$1 = (props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (item, index) {
-        if (!mapping$1.get(item)) throw Error("".concat(item, " is not in DataValidation component, please fix this error"));
-        return createItem$1('item-0', index, mapping$1.get(item), item, format);
-      })) || [];
+      itemsTemp$1 = props.columns.map(function (item, index) {
+        if (!mapping$1.get(item)) throw Error("".concat(item, " is not in DataImport component, please fix this error"));
+        return {
+          id: "item-0".concat(index),
+          content: mapping$1.get(item),
+          code: item,
+          "ct": {
+            "fa": "General",
+            "t": "s" //格式类型为数字类型
+          }
+        };
+      });
     }
     luckysheet$1 = window.luckysheet || window.top.luckysheet;
     _this.state = {
@@ -2632,7 +2642,8 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       var errorListCheck = this.state.errorListCheck;
       var _this$props2 = this.props,
         title = _this$props2.title,
-        notValid = _this$props2.notValid;
+        notValid = _this$props2.notValid,
+        customerColumnsMapping = _this$props2.customerColumnsMapping;
       var totalSummary = this.getCount();
       var luckyCss = {
         margin: '0px',
@@ -2845,7 +2856,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     specialBracket = _ref$specialBracket === void 0 ? false : _ref$specialBracket,
     _ref$noNeedSplit = _ref.noNeedSplit,
     noNeedSplit = _ref$noNeedSplit === void 0 ? false : _ref$noNeedSplit;
-  var resultSourceKey = handleSourceName(sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || (ctx === null || ctx === void 0 ? void 0 : ctx.name) || 'supplierCode');
+  var resultSourceKey = handleSourceName(sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode');
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   var initVal = value || (selectMode ? [] : null);
   var pageSize = 100; // 下拉框默认分页 条数
@@ -4509,7 +4520,7 @@ var getSelectDataList = function getSelectDataList(record, item, selectKey) {
   var _item$dataSource;
   var result = [];
   if (item === null || item === void 0 ? void 0 : item.dataSourceCode) {
-    result = (record === null || record === void 0 ? void 0 : record[item === null || item === void 0 ? void 0 : item.dataSourceCode]) || [];
+    result = record === null || record === void 0 ? void 0 : record[item === null || item === void 0 ? void 0 : item.dataSourceCode];
   }
   if (item === null || item === void 0 ? void 0 : (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) {
     result = (item === null || item === void 0 ? void 0 : item.filterDataSourceCode) ? item.dataSource.filter(function (i) {
@@ -4623,11 +4634,12 @@ var ResizeableTitle = function ResizeableTitle(props) {
 var initTableCode = {
   'sku': ['skuSelect-tableOptionsToChoosePartCode', 'skuSelect-tableSelectedItemPartCode'],
   'skc': ['skcSelect-tableOptionsToChoosePartCode', 'skcSelect-tableSelectedItemPartCode'],
-  'spu': ['spuSelect-tableOptionsToChoosePartCode', 'spuSelect-tableSelectedItemPartCode']
+  'spu': [['spuSelect-tableOptionsToChoosePartCode', 'spuSelect-tableSelectedItemPartCode']]
 };
 var Option$2 = antd.Select.Option;
 var AddSelect = function AddSelect(props) {
   var value = props.value,
+    onChange = props.onChange,
     _props$selectProps = props.selectProps,
     selectProps = _props$selectProps === void 0 ? {} : _props$selectProps,
     _props$modalTableProp = props.modalTableProps,
@@ -4635,7 +4647,11 @@ var AddSelect = function AddSelect(props) {
     _props$labelInValue = props.labelInValue,
     labelInValue = _props$labelInValue === void 0 ? false : _props$labelInValue,
     requestConfig = props.requestConfig,
+    ctx = props.ctx,
     sourceName = props.sourceName,
+    _props$needModalTable = props.needModalTable,
+    needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
+    _props$getPopupContai = props.getPopupContainer,
     onSaveCallback = props.onSaveCallback,
     _props$buttonText = props.buttonText,
     buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText,
@@ -4652,8 +4668,15 @@ var AddSelect = function AddSelect(props) {
     url = _ref.url,
     otherParams = _ref.otherParams,
     isMap = _ref.isMap,
+    fixedparameter = _ref.fixedparameter,
+    fieldValToParam = _ref.fieldValToParam,
+    _ref$mappingTextField = _ref.mappingTextField,
+    mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
+    mappingTextShowKeyField = _ref.mappingTextShowKeyField,
     _ref$mappingValueFiel = _ref.mappingValueField,
-    mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel;
+    mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
+    mappingTextShowTextField = _ref.mappingTextShowTextField;
+  var resultSourceKey = sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode';
   var realButtonProps = _objectSpread2({
     type: "primary"
   }, buttonProps);
@@ -4663,82 +4686,138 @@ var AddSelect = function AddSelect(props) {
   var pageSize = 100; // 下拉框默认分页 条数
   var tableInitPageSize = 10; // 弹框默认分页 条数
   var currentPage = 1;
-  var _useState = React$1.useState(false),
+  var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
+  var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
+  var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
+    // 以下属性不可更改----设计配置项
+    showSearch: false,
+    filterOption: false,
+    allowClear: true,
+    listHeight: 160,
+    optionLabelProp: "label",
+    autoClearSearchValue: false
+  });
+  var _useState = React$1.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
-    fetching = _useState2[0],
-    setFetching = _useState2[1];
-  var _useState3 = React$1.useState(false),
+    items = _useState2[0],
+    setItems = _useState2[1];
+  var _useState3 = React$1.useState(1),
     _useState4 = _slicedToArray(_useState3, 2),
-    isModalVisible = _useState4[0],
-    setIsModalVisible = _useState4[1];
-  var _useState5 = React$1.useState(initVal),
+    scrollPage = _useState4[0],
+    setScrollPage = _useState4[1];
+  var _useState5 = React$1.useState(0),
     _useState6 = _slicedToArray(_useState5, 2),
-    popvalue = _useState6[0],
-    setPopValue = _useState6[1];
-  var _useState7 = React$1.useState(sourceName),
+    itemsTotal = _useState6[0],
+    setItemsTotal = _useState6[1];
+  var _useState7 = React$1.useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    uniqueValue = _useState8[0],
-    setUniqueValue = _useState8[1];
-  var _Form$useForm = antd.Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  var _useState9 = React$1.useState(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
+    fetching = _useState8[0],
+    setFetching = _useState8[1];
+  var _useState9 = React$1.useState(''),
     _useState10 = _slicedToArray(_useState9, 2),
-    tableSearchForm = _useState10[0],
-    setTableSearchForm = _useState10[1];
-  var _useState11 = React$1.useState(true),
+    searchValue = _useState10[0],
+    setSearchValue = _useState10[1];
+  var _useState11 = React$1.useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    caretLeftFlag = _useState12[0],
-    setCaretLeftFlag = _useState12[1];
-  var _useState13 = React$1.useState([]),
+    isModalVisible = _useState12[0],
+    setIsModalVisible = _useState12[1];
+  var _useState13 = React$1.useState(initVal),
     _useState14 = _slicedToArray(_useState13, 2),
-    tableData = _useState14[0],
-    setTableData = _useState14[1];
-  var _useState15 = React$1.useState({
+    popvalue = _useState14[0],
+    setPopValue = _useState14[1];
+  var _useState15 = React$1.useState(sourceName),
+    _useState16 = _slicedToArray(_useState15, 2),
+    uniqueValue = _useState16[0],
+    setUniqueValue = _useState16[1];
+  var _useDebounceFn = ahooks.useDebounceFn(function (v) {
+      // 优化搜索参数 支持传多个
+      var searchParams = {};
+      if (typeof selectParamsKey === 'string') {
+        searchParams = v ? _defineProperty({}, selectParamsInitKey, initVal) : _defineProperty({}, selectParamsKey, searchValue);
+      }
+      if (Array.isArray(selectParamsKey)) {
+        selectParamsKey.forEach(function (i) {
+          searchParams = _objectSpread2(_objectSpread2({}, searchParams), {}, _defineProperty({}, i, searchValue));
+        });
+      }
+      // 防抖函数  待定
+      getData(searchParams);
+    }, {
+      wait: 1000
+    }),
+    run = _useDebounceFn.run;
+  var _Form$useForm = antd.Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useState17 = React$1.useState(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
+    _useState18 = _slicedToArray(_useState17, 2),
+    tableSearchForm = _useState18[0],
+    setTableSearchForm = _useState18[1];
+  var _useState19 = React$1.useState(true),
+    _useState20 = _slicedToArray(_useState19, 2),
+    caretLeftFlag = _useState20[0],
+    setCaretLeftFlag = _useState20[1];
+  var _useState21 = React$1.useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    tableData = _useState22[0],
+    setTableData = _useState22[1];
+  var _useState23 = React$1.useState({
       total: 0,
       size: "small",
       current: 1,
       pageSize: tableInitPageSize
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    tablePagination = _useState16[0],
-    setTablePagination = _useState16[1];
-  var _useState17 = React$1.useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    selectedRowKeys = _useState18[0],
-    setSelectedRowKeys = _useState18[1];
-  var _useState19 = React$1.useState({}),
-    _useState20 = _slicedToArray(_useState19, 2),
-    tableFormParams = _useState20[0],
-    setTableFormParams = _useState20[1];
-  var _useState21 = React$1.useState(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    confirmLoading = _useState22[0],
-    setConfirmLoading = _useState22[1];
-  var _useState23 = React$1.useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    confirmContinueLoading = _useState24[0],
-    setConfirmContinueLoading = _useState24[1];
+    tablePagination = _useState24[0],
+    setTablePagination = _useState24[1];
   var _useState25 = React$1.useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    selectColumns = _useState26[0],
-    setSelectColumns = _useState26[1];
+    selectedRowKeys = _useState26[0],
+    setSelectedRowKeys = _useState26[1];
   var _useState27 = React$1.useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    showColumns = _useState28[0],
-    setShowColumns = _useState28[1];
-  var _useState29 = React$1.useState([]),
+    doubleArr = _useState28[0],
+    setDoubleArr = _useState28[1]; // 存放双数组的数组
+  var _useState29 = React$1.useState(false),
     _useState30 = _slicedToArray(_useState29, 2),
-    tableColumns = _useState30[0],
-    setTableColumns = _useState30[1];
-  var _useState31 = React$1.useState([]),
+    checkedAll = _useState30[0],
+    setCheckedAll = _useState30[1];
+  var _useState31 = React$1.useState(false),
     _useState32 = _slicedToArray(_useState31, 2),
-    showToChooseColumns = _useState32[0],
-    setShowToChooseColumns = _useState32[1];
+    indeterminate = _useState32[0],
+    setIndeterminate = _useState32[1];
+  var _useState33 = React$1.useState({}),
+    _useState34 = _slicedToArray(_useState33, 2),
+    tableFormParams = _useState34[0],
+    setTableFormParams = _useState34[1];
+  var _useState35 = React$1.useState(false),
+    _useState36 = _slicedToArray(_useState35, 2),
+    confirmLoading = _useState36[0],
+    setConfirmLoading = _useState36[1];
+  var _useState37 = React$1.useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    confirmContinueLoading = _useState38[0],
+    setConfirmContinueLoading = _useState38[1];
+  var _useState39 = React$1.useState([]),
+    _useState40 = _slicedToArray(_useState39, 2),
+    selectColumns = _useState40[0],
+    setSelectColumns = _useState40[1];
+  var _useState41 = React$1.useState([]),
+    _useState42 = _slicedToArray(_useState41, 2),
+    showColumns = _useState42[0],
+    setShowColumns = _useState42[1];
+  var _useState43 = React$1.useState([]),
+    _useState44 = _slicedToArray(_useState43, 2),
+    tableColumns = _useState44[0],
+    setTableColumns = _useState44[1];
+  var _useState45 = React$1.useState([]),
+    _useState46 = _slicedToArray(_useState45, 2),
+    showToChooseColumns = _useState46[0],
+    setShowToChooseColumns = _useState46[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
   var checkSelectChange = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -4813,7 +4892,7 @@ var AddSelect = function AddSelect(props) {
       }, _callee, null, [[15, 22]]);
     }));
     return function checkSelectChange(_x, _x2, _x3, _x4, _x5, _x6) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var setBusinessDefaultValue = function setBusinessDefaultValue(list, recordList) {
@@ -4879,7 +4958,7 @@ var AddSelect = function AddSelect(props) {
                 // precision: unitAccuracy
               };
             }
-            return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2(_objectSpread2({}, item.inputProps), {}, {
+            return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2({
               value: text || '',
               min: 0,
               autoFocus: record.needFocus,
@@ -4887,7 +4966,13 @@ var AddSelect = function AddSelect(props) {
             }, precisionObj), {}, {
               onChange: function onChange(value) {
                 record[item.dataIndex] = value;
-                editRecord(record);
+                var newPopValue = popvalue.map(function (i, innerIndex) {
+                  if (innerIndex == index) {
+                    i[item.dataIndex] = record[item.dataIndex];
+                  }
+                  return i;
+                });
+                setPopValue(newPopValue);
               },
               // onFocus={(e)=> {
               //   let dom1 = e.currentTarget;
@@ -4986,90 +5071,35 @@ var AddSelect = function AddSelect(props) {
               var selectKey = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi = item.dataSourceMapping) === null || _item$dataSourceMappi === void 0 ? void 0 : _item$dataSourceMappi[0]) || 'code';
               var selectText = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi2 = item.dataSourceMapping) === null || _item$dataSourceMappi2 === void 0 ? void 0 : _item$dataSourceMappi2[1]) || 'name';
               var dataSourceList = getSelectDataList(record, item, selectKey);
-              return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, item.selectProps), {}, {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
                 value: text || null,
                 onChange: function () {
                   var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
-                    var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules;
+                    var isConformToTheRules, newPopValue;
                     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                       while (1) switch (_context2.prev = _context2.next) {
                         case 0:
-                          dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
-                            return d[selectKey] == value;
-                          })) || {};
-                          if (!(item === null || item === void 0 ? void 0 : item.selectChangeCallback)) {
-                            _context2.next = 6;
-                            break;
-                          }
-                          _context2.next = 4;
-                          return item === null || item === void 0 ? void 0 : (_item$selectChangeCal = item.selectChangeCallback) === null || _item$selectChangeCal === void 0 ? void 0 : _item$selectChangeCal.call(item, popvalue, setPopValue, {
-                            record: record,
-                            index: index,
-                            item: item,
-                            oldValue: text,
-                            changeValue: value,
-                            dataSourceSelectItem: dataSourceSelectItem,
-                            editRecord: editRecord
-                          });
-                        case 4:
-                          _context2.next = 25;
-                          break;
-                        case 6:
-                          // 更新当前行数据函数
-                          changeValue = function changeValue(v, dSSItem) {
-                            var _item$dataSourceSelec;
-                            record[item.dataIndex] = v;
-                            // 下拉框带出需要回填的数据
-                            if (item === null || item === void 0 ? void 0 : (_item$dataSourceSelec = item.dataSourceSelectBackData) === null || _item$dataSourceSelec === void 0 ? void 0 : _item$dataSourceSelec.length) {
-                              item === null || item === void 0 ? void 0 : item.dataSourceSelectBackData.forEach(function (s) {
-                                record[s] = dSSItem ? dSSItem[s] : null;
-                              });
-                            }
-                          }; // 处理校验，默认不校验
-                          isCheckPass = true;
-                          _context2.prev = 8;
-                          if (!(item === null || item === void 0 ? void 0 : item.selectCheckCallback)) {
-                            _context2.next = 15;
-                            break;
-                          }
-                          _context2.next = 12;
-                          return item === null || item === void 0 ? void 0 : item.selectCheckCallback(popvalue, {
-                            record: record,
-                            index: index,
-                            item: item,
-                            oldValue: text,
-                            changeValue: value,
-                            dataSourceSelectItem: dataSourceSelectItem
-                          });
-                        case 12:
-                          isCheckPass = _context2.sent;
-                          _context2.next = 19;
-                          break;
-                        case 15:
-                          _context2.next = 17;
+                          _context2.next = 2;
                           return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
-                        case 17:
+                        case 2:
                           isConformToTheRules = _context2.sent;
-                          isCheckPass = !isConformToTheRules;
-                        case 19:
-                          _context2.next = 23;
-                          break;
-                        case 21:
-                          _context2.prev = 21;
-                          _context2.t0 = _context2["catch"](8);
-                        case 23:
-                          if (isCheckPass) {
-                            changeValue(value, dataSourceSelectItem);
+                          if (isConformToTheRules) {
+                            record[item.dataIndex] = value;
                           } else {
-                            changeValue(null);
+                            record[item.dataIndex] = null;
                           }
-                          // 更新已选表格函数
-                          editRecord(record);
-                        case 25:
+                          newPopValue = popvalue.map(function (i, innerIndex) {
+                            if (innerIndex == index) {
+                              i[item.dataIndex] = record[item.dataIndex];
+                            }
+                            return i;
+                          });
+                          setPopValue(newPopValue);
+                        case 6:
                         case "end":
                           return _context2.stop();
                       }
-                    }, _callee2, null, [[8, 21]]);
+                    }, _callee2);
                   }));
                   function onChange(_x7) {
                     return _onChange.apply(this, arguments);
@@ -5077,9 +5107,9 @@ var AddSelect = function AddSelect(props) {
                   return onChange;
                 }(),
                 style: {
-                  width: "".concat((item === null || item === void 0 ? void 0 : item.width) && (item === null || item === void 0 ? void 0 : item.width) - 20 || '160', "px")
+                  width: '160px'
                 }
-              }), dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.map(function (item) {
+              }, dataSourceList.map(function (item) {
                 return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
                   value: item[selectKey]
                 }, item[selectText]);
@@ -5112,10 +5142,20 @@ var AddSelect = function AddSelect(props) {
   // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
   var getData = function getData() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
     if (!requestConfig) return;
     setFetching(true);
     // 处理dependence参数
     var fixedParam = {};
+    if (fixedparameter && fieldValToParam && ctx) {
+      fixedparameter.forEach(function (item, index) {
+        var fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
+        if (fixedParamVal) {
+          fixedParam[item] = fixedParamVal;
+          form.setFieldsValue(_objectSpread2(_objectSpread2({}, form === null || form === void 0 ? void 0 : form.getFieldsValue()), {}, _defineProperty({}, item, fixedParamVal)));
+        }
+      });
+    }
     // 数组对象处理,对带有特殊标记的name进行处理
     var _loop = function _loop() {
       if (Object.prototype.hasOwnProperty.call(params, key)) {
@@ -5221,7 +5261,21 @@ var AddSelect = function AddSelect(props) {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
           var _item$packingUnitList, _item$packingUnitList2;
+          var textShowText = item[mappingTextField];
+          if (mappingTextShowTextField) {
+            textShowText = [];
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
           return _objectSpread2(_objectSpread2({}, item), {}, {
+            text: item[mappingTextField],
+            textShowText: textShowText,
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField],
             baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList = item.packingUnitList) === null || _item$packingUnitList === void 0 ? void 0 : (_item$packingUnitList2 = _item$packingUnitList.find(function (item) {
               return item.baseUnit === true;
@@ -5229,7 +5283,21 @@ var AddSelect = function AddSelect(props) {
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
           var _item$packingUnitList3, _item$packingUnitList4;
+          var textShowText = item[mappingTextField];
+          if (mappingTextShowTextField) {
+            textShowText = [];
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
           return _objectSpread2(_objectSpread2({}, item), {}, {
+            text: item[mappingTextField],
+            textShowText: textShowText,
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField],
             baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList3 = item.packingUnitList) === null || _item$packingUnitList3 === void 0 ? void 0 : (_item$packingUnitList4 = _item$packingUnitList3.find(function (item) {
               return item.baseUnit === true;
@@ -5238,12 +5306,19 @@ var AddSelect = function AddSelect(props) {
         })) : [];
       }
       source = Array.isArray(source) ? source : [];
-      setTableData(source);
-      setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), {}, {
-        total: Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length),
-        pageSize: Number((res === null || res === void 0 ? void 0 : res.size) || (res === null || res === void 0 ? void 0 : res.pageSize) || (params === null || params === void 0 ? void 0 : params.pageSize) || pageSize),
-        current: Number((res === null || res === void 0 ? void 0 : res.page) || (res === null || res === void 0 ? void 0 : res.currentPage) || (params === null || params === void 0 ? void 0 : params.currentPage) || currentPage)
-      }));
+      if (type === 1) {
+        var _ctx$form;
+        ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(resultSourceKey, source);
+        setItems(source);
+        setItemsTotal(Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length));
+      } else {
+        setTableData(source);
+        setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), {}, {
+          total: Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length),
+          pageSize: Number((res === null || res === void 0 ? void 0 : res.size) || (res === null || res === void 0 ? void 0 : res.pageSize) || (params === null || params === void 0 ? void 0 : params.pageSize) || pageSize),
+          current: Number((res === null || res === void 0 ? void 0 : res.page) || (res === null || res === void 0 ? void 0 : res.currentPage) || (params === null || params === void 0 ? void 0 : params.currentPage) || currentPage)
+        }));
+      }
     }).catch(function (err) {
       setFetching(false);
     });
@@ -5285,6 +5360,12 @@ var AddSelect = function AddSelect(props) {
             value: i
           };
         }));
+        setIndeterminate(!!value.length && value.length < itemsTotal);
+        setCheckedAll(itemsTotal && value.length === itemsTotal);
+        // 需清空数据
+        if (!value.length) {
+          setDoubleArr([]);
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
         setPopValue(labelInValue ? [{
@@ -5319,6 +5400,7 @@ var AddSelect = function AddSelect(props) {
       antd.message.warning('至少选中一条数据');
       return;
     }
+    // handleSelectOver(popvalue)
     if (onSaveCallback) {
       handleLoading(isContinue, true);
       onSaveCallback(popvalue).then(function (res) {
@@ -5354,6 +5436,9 @@ var AddSelect = function AddSelect(props) {
     setTableFormParams({});
     setIsModalVisible(false);
     setTableData([]);
+    // if (selectMode) {
+    //   run();
+    // }
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
@@ -5361,6 +5446,9 @@ var AddSelect = function AddSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
+    // if (selectMode) {
+    //   getData(params)
+    // }
   };
   var onResetTable = function onResetTable() {
     form.resetFields();
@@ -5399,6 +5487,8 @@ var AddSelect = function AddSelect(props) {
       setPopValue(selectRows);
       setSelectedRowKeys(selectKeys);
     }
+    // setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
+    // setCheckedAll(filterRows.length === tablePagination?.total);
   };
   // 生成唯一值
   var makeUniqueValue = function makeUniqueValue() {
@@ -5527,15 +5617,6 @@ var AddSelect = function AddSelect(props) {
       })));
     }
   };
-  var editRecord = function editRecord(record) {
-    var newPopValue = _toConsumableArray(popvalue);
-    var index = newPopValue.findIndex(function (item) {
-      return record[selectRowKey] == item[selectRowKey];
-    });
-    var item = newPopValue[index];
-    newPopValue.splice(index, 1, _objectSpread2(_objectSpread2({}, item), record));
-    setPopValue(_toConsumableArray(newPopValue));
-  };
   var inputIndex = 0;
   React$1.useEffect(function () {
     setInitialShowColumn(codeSelected, selectColumns, function (res) {
@@ -5548,8 +5629,8 @@ var AddSelect = function AddSelect(props) {
     });
   }, [tableColumns]);
   var handleResize = function handleResize(arr, index, callback) {
-    return function (_, _ref3) {
-      var size = _ref3.size;
+    return function (_, _ref5) {
+      var size = _ref5.size;
       var newColumns = arr.map(function (col) {
         return _objectSpread2({}, col);
       });
@@ -5614,7 +5695,7 @@ var AddSelect = function AddSelect(props) {
     id: "add_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React__default['default'].createElement(antd.Button, _objectSpread2({
     onClick: handleShowModal
-  }, realButtonProps), buttonText)), isModalVisible && ( /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+  }, realButtonProps), buttonText)), needModalTable && isModalVisible && ( /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     width: '1200px',
     style: {
       top: 20
@@ -5622,6 +5703,7 @@ var AddSelect = function AddSelect(props) {
     bodyStyle: {
       padding: '0px'
     },
+    // title={modalTableProps?.modalTableTitle}
     visible: isModalVisible,
     closable: false,
     onCancel: handleCancel,
@@ -5767,6 +5849,7 @@ var AddSelect = function AddSelect(props) {
     columns: showSelectedCol,
     dataSource: popvalue,
     pagination: false,
+    // onChange={handleTableChange}
     rowKey: selectRowKey,
     rowClassName: 'row-class',
     scroll: {
@@ -9253,40 +9336,10 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
 // import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
-  var showColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.showColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.showSelectColumns) || [];
-  var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptSelectColumns) || [];
-  var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverSelectColumns) || [];
-  var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionSelectColumns) || [];
-  // 仅展示内容
-  if (showColumns === null || showColumns === void 0 ? void 0 : showColumns.length) {
-    result = result.filter(function (i) {
-      return showColumns.includes(i.dataIndex);
-    });
-  }
-  // 过滤不需要展示内容
-  if (exceptColumns === null || exceptColumns === void 0 ? void 0 : exceptColumns.length) {
-    result = result.filter(function (i) {
-      return !exceptColumns.includes(i.dataIndex);
-    });
-  }
-  // 追加(最好不用这个，当组件不固定时候会有影响)
-  if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
-    additionColumns.forEach(function (i) {
-      result.splice(i.position, 0, i.column);
-    });
-  }
-  // 覆盖内容
-  if (coverColumns === null || coverColumns === void 0 ? void 0 : coverColumns.length) {
-    result = coverColumns;
-  }
-  return result;
-}
-function handleTableColumn(c, parentProps) {
-  var result = c;
-  var showColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.showColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.showTableColumns) || [];
-  var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptTableColumns) || [];
-  var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverTableColumns) || [];
-  var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionTableColumns) || [];
+  var showColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.showColumns) || [];
+  var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
+  var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || [];
+  var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || [];
   // 仅展示内容
   if (showColumns === null || showColumns === void 0 ? void 0 : showColumns.length) {
     result = result.filter(function (i) {
@@ -9606,7 +9659,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     },
     dataIndex: 'brandName'
   }]);
-  var mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
+  var mTpTableColumn = handleSelectColumn(initialTableColumn, parProps);
   var initialTableSearchForm = [{
     name: 'qp-skuCode-like',
     label: 'SKU编码'
@@ -9718,7 +9771,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
   var modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
+    modalTableTitle: '选择商品',
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
@@ -9797,190 +9850,12 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     dataIndex: 'count'
   }];
   var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
-  var initialTableColumn = [{
-    title: 'SKC编码',
-    width: 150,
-    dataIndex: 'code'
-  }, {
-    title: 'SKC名称',
-    width: 200,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'name'
-  }, {
-    title: '商品名称',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    dataIndex: 'itemName',
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    }
-  }, {
-    title: '颜色',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'colorName'
-  }, {
-    title: '类目',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'categoryName'
-  }, {
-    title: '品类',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'className'
-  }, {
-    title: '品牌',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'brandName'
-  }];
-  var mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
-  var initialTableSearchForm = [{
-    name: 'qp-code-like',
-    label: 'SKC编码'
-  }, {
-    name: 'qp-skcName-like',
-    label: 'SKC名称'
-  }, {
-    name: 'qp-itemName-like',
-    label: '商品名称'
-  }, {
-    name: 'qp-colorName-in',
-    type: 'select',
-    label: '颜色',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
-  }, {
-    name: 'qp-categoryId-in',
-    type: 'treeSelect',
-    label: '类目',
-    field: {
-      type: 'treeSelect',
-      props: {
-        treeData: [],
-        treeCheckable: true,
-        showSearch: true,
-        allowClear: true,
-        showArrow: true,
-        treeNodeFilterProp: 'title',
-        treeDefaultExpandAll: true,
-        maxTagCount: 1,
-        placeholder: '请选择',
-        style: {
-          width: '100%'
-        },
-        dropdownStyle: {
-          maxHeight: 400,
-          maxWidth: 100,
-          overflow: 'auto'
-        }
-      }
-    }
-  }, {
-    name: 'qp-classId-in',
-    type: 'select',
-    label: '品类',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
-  }, {
-    name: 'qp-brandId-in',
-    type: 'select',
-    label: '品牌',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
-  }];
-  var mTpTableSearchForm = handleSearchForm(initialTableSearchForm, parProps);
-  var initialPromiseLoadList = [{
-    url: "/items/item/propertyValue/sizeBySkcConfig",
-    params: {
-      pageSize: 10000,
-      currentPage: 1,
-      type: 2 // 类型：1尺码；2颜色
+  var initialPromiseLoadList = [{
+    url: "/items/item/propertyValue/sizeBySkcConfig",
+    params: {
+      pageSize: 10000,
+      currentPage: 1,
+      type: 2 // 类型：1尺码；2颜色
     },
     resType: 'list',
     resPosition: 3,
@@ -10013,7 +9888,6 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     resPosition: 6,
     resKeyValue: ['id', 'name']
   }];
-  var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -10040,11 +9914,185 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     isAllowRepeatedSelect: (parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) !== undefined ? !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) : true // 默认开启一行选多次
   };
   var modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
-    tableSearchForm: mTpTableSearchForm,
-    tableColumns: mTpTableColumn,
+    modalTableTitle: '选择商品',
+    tableSearchForm: [{
+      name: 'qp-code-like',
+      label: 'SKC编码'
+    }, {
+      name: 'qp-skcName-like',
+      label: 'SKC名称'
+    }, {
+      name: 'qp-itemName-like',
+      label: '商品名称'
+    }, {
+      name: 'qp-colorName-in',
+      type: 'select',
+      label: '颜色',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }],
+    tableColumns: [{
+      title: 'SKC编码',
+      width: 150,
+      dataIndex: 'code'
+    }, {
+      title: 'SKC名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'name'
+    }, {
+      title: '商品名称',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'itemName',
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '颜色',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'colorName'
+    }, {
+      title: '类目',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'categoryName'
+    }, {
+      title: '品类',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'className'
+    }, {
+      title: '品牌',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'brandName'
+    }],
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: initialPromiseLoadList
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -10097,199 +10145,37 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     dataIndex: 'name'
   }, {
     title: '颜色',
-    dataIndex: 'colorName',
-    width: 200,
-    isSelectItem: true,
-    dataSourceCode: 'colorValues',
-    dataSourceMapping: ['value', 'value']
-  }, {
-    title: '配码',
-    dataIndex: 'selectPropertyGroupCode',
-    width: 160,
-    isSelectItem: true,
-    dataSource: propertyList,
-    filterDataSourceCode: 'matchingCodes'
-  }, {
-    title: '数量',
-    width: 100,
-    isInputItem: true,
-    dataIndex: 'count'
-  }, {
-    title: '所属组织',
-    dataIndex: 'ownOrgSignName'
-  }, {
-    title: '品牌',
-    dataIndex: 'brandName'
-  }, {
-    title: '类目',
-    dataIndex: 'categoryText'
-  }, {
-    title: '品类',
-    dataIndex: 'className'
-  }];
-  var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
-  var initialTableColumn = [{
-    title: '商品编码',
-    width: 150,
-    dataIndex: 'itemCode'
-  }, {
-    title: '商品名称',
-    width: 200,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'name'
-  }, {
-    title: '所属组织',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'ownOrgSignName'
-  }, {
-    title: '品牌',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'brandName'
-  }, {
-    title: '类目',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'categoryName'
-  }, {
-    title: '品类',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    },
-    dataIndex: 'className'
-  }];
-  var mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
-  var initialTableSearchForm = [{
-    name: 'qp-itemCode-like',
-    label: '商品编码'
-  }, {
-    name: 'qp-name-like',
-    label: '商品名称'
-  }, {
-    name: 'qp-ownOrgSign-in',
-    type: 'select',
-    label: '所属组织',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
-  }, {
-    name: 'qp-brandId-in',
-    type: 'select',
-    label: '品牌',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
-  }, {
-    name: 'qp-categoryId-in',
-    type: 'treeSelect',
-    label: '类目',
-    field: {
-      type: 'treeSelect',
-      props: {
-        treeData: [],
-        treeCheckable: true,
-        showSearch: true,
-        allowClear: true,
-        showArrow: true,
-        treeNodeFilterProp: 'title',
-        treeDefaultExpandAll: true,
-        maxTagCount: 1,
-        placeholder: '请选择',
-        style: {
-          width: '100%'
-        },
-        dropdownStyle: {
-          maxHeight: 400,
-          maxWidth: 100,
-          overflow: 'auto'
-        }
-      }
-    }
+    dataIndex: 'colorName',
+    width: 200,
+    isSelectItem: true,
+    dataSourceCode: 'colorValues',
+    dataSourceMapping: ['value', 'value']
   }, {
-    name: 'qp-classId-in',
-    type: 'select',
-    label: '品类',
-    field: {
-      type: 'select',
-      props: {
-        mode: 'multiple',
-        notFoundContent: '暂无数据',
-        allowClear: true,
-        showSearch: true,
-        showArrow: true,
-        maxTagCount: 1,
-        optionFilterProp: 'children',
-        filterOption: function filterOption(input, option) {
-          return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }
-      }
-    }
+    title: '配码',
+    dataIndex: 'selectPropertyGroupCode',
+    width: 160,
+    isSelectItem: true,
+    dataSource: propertyList,
+    filterDataSourceCode: 'matchingCodes'
+  }, {
+    title: '数量',
+    width: 100,
+    isInputItem: true,
+    dataIndex: 'count'
+  }, {
+    title: '所属组织',
+    dataIndex: 'ownOrgSignName'
+  }, {
+    title: '品牌',
+    dataIndex: 'brandName'
+  }, {
+    title: '类目',
+    dataIndex: 'categoryText'
+  }, {
+    title: '品类',
+    dataIndex: 'className'
   }];
-  var mTpTableSearchForm = handleSearchForm(initialTableSearchForm, parProps);
+  var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var initialPromiseLoadList = [{
     url: "/user/orgViewNode/listNoPage",
     params: {
@@ -10328,7 +10214,6 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     resPosition: 5,
     resKeyValue: ['id', 'name']
   }];
-  var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -10357,11 +10242,169 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
   var modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
-    tableSearchForm: mTpTableSearchForm,
-    tableColumns: mTpTableColumn,
+    modalTableTitle: '选择商品',
+    tableSearchForm: [{
+      name: 'qp-itemCode-like',
+      label: '商品编码'
+    }, {
+      name: 'qp-name-like',
+      label: '商品名称'
+    }, {
+      name: 'qp-ownOrgSign-in',
+      type: 'select',
+      label: '所属组织',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }],
+    tableColumns: [{
+      title: '商品编码',
+      width: 150,
+      dataIndex: 'itemCode'
+    }, {
+      title: '商品名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'name'
+    }, {
+      title: '所属组织',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'ownOrgSignName'
+    }, {
+      title: '品牌',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'brandName'
+    }, {
+      title: '类目',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'categoryName'
+    }, {
+      title: '品类',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'className'
+    }],
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: initialPromiseLoadList
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -10437,7 +10480,7 @@ var CommodityEntry = function CommodityEntry(props) {
     onCancel: handleCancel,
     destroyOnClose: true,
     zIndex: 15
-  }, otherModalProps), /*#__PURE__*/React__default['default'].createElement(DataValidation, _objectSpread2(_objectSpread2({}, props), {}, {
+  }, otherModalProps), /*#__PURE__*/React__default['default'].createElement(DataValidation, {
     onRef: function onRef(ref) {
       dataValidationRef = ref;
     },
@@ -10445,7 +10488,7 @@ var CommodityEntry = function CommodityEntry(props) {
     validDataUrl: validDataUrl,
     isBrandAuth: isBrandAuth,
     isCheckStockNum: isCheckStockNum
-  })))) || '');
+  }))) || '');
 };
 
 /*
@@ -12469,7 +12512,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   var renderPageActionList = function renderPageActionList(actionLists) {
     var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
     var visibleActions = actionLists.filter(function (action) {
-      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (!shouldUseAuth() || judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
+      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
         return item === action.code;
       }));
     });
@@ -13980,6 +14023,14 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
 };
 var BsSulaQueryTable = (function (props) {
   var bsTableCode = (props === null || props === void 0 ? void 0 : props.tableCode) || window.location.hash; //设置列字段的唯一标识
+  // 获取 table columns中所有的 key  防止有的地方是 dataindex
+  var checkedList = React$1.useMemo(function () {
+    return 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;
+    });
+  }, [props.columns]);
   var getConfigFromlocalstorage = function getConfigFromlocalstorage(type) {
     var config = localStorage.getItem(type) || '[]';
     var configArray = JSON.parse(config);
@@ -13991,66 +14042,97 @@ var BsSulaQueryTable = (function (props) {
     }
     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);
+  /**
+  * 根据保存的配置和原始配置，获取设置的字段或列。
+  * @param savedConfig 保存的配置数组，可能包含字段或列的配置。
+  * @param originConfig 原始配置数组，包含完整的字段或列信息。
+  * @param type 字段或列的类型，用于确定配置的属性。
+  * @returns 返回根据保存的配置处理后的字段或列数组，如果未保存任何配置，则返回原始配置。
+  */
+  var getSettingFieldOrColumn = function getSettingFieldOrColumn(savedConfig, originConfig, type) {
+    /**
+     * 判断值是否为字符串数组。
+     * @param value 待判断的值。
+     * @returns 如果值是字符串数组，则返回true，否则返回false。
+     */
+    var isStringArray = function isStringArray(value) {
+      return Array.isArray(value) && value.every(function (v) {
+        return typeof v === 'string';
+      });
+    };
+    /**
+     * 根据配置项和类型，获取配置项的键。
+     * @param config 配置项，可以是字段或列。
+     * @param type 配置项的类型。
+     * @returns 返回配置项的键，如果无法获取，则返回空字符串。
+     */
+    var getItemKey = function getItemKey(config, type) {
+      try {
+        if (type === 'columns') {
+          return isStringArray(config.key) ? JSON.stringify(config.key) : isStringArray(config.dataIndex) ? JSON.stringify(config.dataIndex) : config.key || config.dataIndex || '';
+        }
+        return isStringArray(config.name) ? JSON.stringify(config.name) : config.name || '';
+      } catch (e) {}
+      return '';
+    };
+    var newConfig = [];
+    if (savedConfig.length) {
+      var hash = originConfig.reduce(function (prev, inneritem) {
+        prev[getItemKey(inneritem, type)] = inneritem;
+        return prev;
+      }, {});
+      savedConfig.forEach(function (config, index) {
+        var inner = hash[getItemKey(config, type)];
+        inner && newConfig.push(_objectSpread2(_objectSpread2({}, inner), config));
+      });
+    }
+    if (newConfig.length) return newConfig;
+    if (type === 'columns') {
+      return originConfig.filter(function (column) {
+        var columnKey = getItemKey(column, type);
+        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
+      });
+    }
+    return _toConsumableArray(originConfig);
   };
   var refs = React$1.useRef(null);
   var _useState = React$1.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     pagePath = _useState2[0],
     setPagePath = _useState2[1];
-  // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  var _useState3 = React$1.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 _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname;
-  var _useState5 = React$1.useState(Number(Math.random().toString().substr(2, 0) + Date.now()).toString(36)),
-    _useState6 = _slicedToArray(_useState5, 1),
-    id = _useState6[0];
-  var _useState7 = React$1.useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    isFullScreen = _useState8[0],
-    setIsFnllScreen = _useState8[1];
+  var _useState3 = React$1.useState(Number(Math.random().toString().substr(2, 0) + Date.now()).toString(36)),
+    _useState4 = _slicedToArray(_useState3, 1),
+    id = _useState4[0];
+  var _useState5 = React$1.useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isFullScreen = _useState6[0],
+    setIsFnllScreen = _useState6[1];
   // @ts-nocheck
-  var _useState9 = React$1.useState(props),
+  var _useState7 = React$1.useState(props),
+    _useState8 = _slicedToArray(_useState7, 2),
+    value = _useState8[0],
+    setValue = _useState8[1];
+  var _props$fields = props.fields,
+    fields = _props$fields === void 0 ? [] : _props$fields;
+  var _useState9 = React$1.useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    value = _useState10[0],
-    setValue = _useState10[1];
-  var _useState11 = React$1.useState([]),
+    showColumn = _useState10[0],
+    setShowColumns = _useState10[1]; // 列字段
+  var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
+  var _useState11 = React$1.useState(originSearchFields),
     _useState12 = _slicedToArray(_useState11, 2),
-    showColumn = _useState12[0],
-    setShowColumns = _useState12[1]; // 列字段
-  var originSearchFields = getInitialSearchFieldsInfo();
-  var _useState13 = React$1.useState(originSearchFields),
-    _useState14 = _slicedToArray(_useState13, 2),
-    showSearchFields = _useState14[0],
-    setShowSearchFields = _useState14[1]; //搜索项字段
+    showSearchFields = _useState12[0],
+    setShowSearchFields = _useState12[1]; //搜索项字段
   var _props$isPage = props.isPage,
     pagination = props.pagination,
     tableCode = props.tableCode,
     appRequestConfig = props.appRequestConfig;
-  var _useState15 = React$1.useState('100vh'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    height = _useState16[0],
-    setHeight = _useState16[1];
+  var _useState13 = React$1.useState('100vh'),
+    _useState14 = _slicedToArray(_useState13, 2),
+    height = _useState14[0],
+    setHeight = _useState14[1];
   var sortTableRef = React$1.useRef(null);
   var searchTableRef = React$1.useRef(null);
   // 获取table高度
@@ -14111,7 +14193,7 @@ var BsSulaQueryTable = (function (props) {
         if (Number(item.slice(-1)) >= 1) {
           Item = item.substr(0, item.length - 1);
         }
-        if (shouldUseAuth() && !authButton.filter(function (itemInner) {
+        if (!authButton.filter(function (itemInner) {
           return Item === itemInner;
         }).length) {
           resourceCodeArray[item].visible = false;
@@ -14123,17 +14205,7 @@ var BsSulaQueryTable = (function (props) {
     }));
     var columns = props.columns;
     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 = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -14547,7 +14619,7 @@ var setMenuTreeData = function setMenuTreeData(routesData) {
         routesData.splice(i, 1);
         return 0; // continue
       }
-      if (shouldUseAuth() && routesData[i].code && authButton.every(function (item) {
+      if (routesData[i].code && authButton.every(function (item) {
         return routesData[i].code != item;
       })) {
         routesData.splice(i, 1);
@@ -15190,7 +15262,9 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
             deep(item.routes);
           } else if (!item.hideInMenu && (name ? umi.formatMessage({
             id: "menu.".concat(item.name)
-          }).indexOf(name) !== -1 : true)) {
+          }).indexOf(name) !== -1 : true) && btnAuth.find(function (d) {
+            return d === item.code;
+          })) {
             resultList.push(_objectSpread2(_objectSpread2({}, item), {}, {
               fullPathName: getFullPathName(item.name)
             }));
@@ -16477,70 +16551,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);
 
-/*
- * @Date: 2022-04-01 15:42:51
- * @LastEditors: 追随
- * @LastEditTime: 2022-09-16 20:53:23
- */
-var NoFoundPage = function NoFoundPage(props) {
-  return /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      height: 'calc(100vh - 88px)',
-      background: '#fff',
-      display: 'flex',
-      justifyContent: 'center',
-      alignItems: 'center'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Result, {
-    status: "404",
-    title: "404",
-    subTitle: /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u62B1\u6B49\uFF0C\u65E0\u6CD5\u8BBF\u95EE\u8BE5\u9875\u9762\uFF01"), /*#__PURE__*/React__default['default'].createElement("div", null, "\u8BF7\u5173\u95ED\u5F53\u524D\u9875\u7B7E"))
-  }));
-};
-
 var _excluded$g = ["route"];
 var TabPane = antd.Tabs.TabPane;
-var getId = function getId(str) {
-  // 找到最后一个 / 的位置
-  var lastSlashIndex = str.lastIndexOf("/");
-  // 如果找到了 /，则返回它后面的部分
-  if (lastSlashIndex !== -1) {
-    return str.substring(lastSlashIndex + 1);
-  } else {
-    // 如果没有找到 /，则返回整个字符串
-    return null;
-  }
-};
-// 获取权限菜单path&通用单据id
-var getAuthMenuPathAndDocsId = function getAuthMenuPathAndDocsId(pathToRegexp) {
-  var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
-  var menuKeys = [];
-  var docsId = [];
-  var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
-    data.forEach(function (item) {
-      if (item.children && item.children.length > 0) {
-        getLimitedMenuKeys(item.children);
-      } else {
-        var originPath = item.path.replace(/^\/\w+\//, '/');
-        menuKeys.push(originPath);
-        if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
-          getId(originPath) && docsId.push(getId(originPath));
-        }
-      }
-    });
-  };
-  try {
-    getLimitedMenuKeys(limitedMenuData);
-  } catch (e) {}
-  return {
-    menuKeys: menuKeys,
-    docsId: docsId
-  };
-};
 var UN_LISTTEN_DRP;
 var routerArray = [];
-var authMenuPathList = [];
-var docsId = [];
 var lastTwoRouterArray = [1, 2];
 var type = 'DraggableTabNode';
 var DraggableTabNode = function DraggableTabNode(_ref) {
@@ -16733,7 +16747,6 @@ var ItemMenu = function ItemMenu(props) {
 };
 var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
   function BasicLayout(props) {
-    var _getAuthMenuPathAndDo, _getAuthMenuPathAndDo2;
     var _this;
     _classCallCheck(this, BasicLayout);
     _this = _callSuper(this, BasicLayout, [props]);
@@ -16750,41 +16763,14 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return queryString;
     };
     _this.updateTree = function (Tree) {
-      var authMenuKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var treeData = Tree;
       var treeList = [];
-      // 是否为权限菜单路径
-      var getLimitedMenuPath = function getLimitedMenuPath(node) {
-        return authMenuKeys.some(function (item) {
-          return (node.path || '').includes(item);
-        });
-      };
-      // 是否为通用单据菜单路径
-      var getGenerateDocs = function getGenerateDocs(node) {
-        return (node.path || '').includes('all-general-documents');
-      };
       // 递归获取树列表
       var getTreeList = function getTreeList(data) {
         data.forEach(function (node) {
           if (node.routes && node.routes.length > 0) {
             getTreeList(node.routes);
-            return;
-          }
-          // todo:暂时处理非wujie环境不做404管控
-          if (!window.__POWERED_BY_WUJIE__) {
-            treeList.push({
-              tab: node.locale,
-              key: node.path,
-              locale: node.locale,
-              closable: true,
-              content: node.component,
-              name: node.name,
-              hideInMenu: node.hideInMenu,
-              isOnlyOnePage: node.isOnlyOnePage
-            });
-            return;
-          }
-          if (node.path === '/' || getLimitedMenuPath(node) || getGenerateDocs(node)) {
+          } else {
             treeList.push({
               tab: node.locale,
               key: node.path,
@@ -16851,6 +16837,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return moment__default['default'](timeStr).add(8, 'hours').format(format) || '- -';
     };
     _this.onChange = function (key) {
+      // console.log('onChange');
       if (key !== _this.state.activeKey) {
         _this.setState({
           activeKey: key
@@ -17136,9 +17123,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         });
       }
     };
-    authMenuPathList = ((_getAuthMenuPathAndDo = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo === void 0 ? void 0 : _getAuthMenuPathAndDo.menuKeys) || [];
-    docsId = ((_getAuthMenuPathAndDo2 = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo2 === void 0 ? void 0 : _getAuthMenuPathAndDo2.docsId) || [];
-    routerArray = _this.updateTree(props.route.routes, authMenuPathList);
+    routerArray = _this.updateTree(props.route.routes);
     var homeRouter = routerArray.filter(function (itemroute) {
       return itemroute.key === '/';
     })[0];
@@ -17238,28 +17223,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           hideMenuArray = _this2$state.hideMenuArray;
         var newListenRouterState = _toConsumableArray(listenRouterState);
         var newListenRouterKey = _toConsumableArray(listenRouterKey);
-        /**
-        * 根据给定的路由数组和当前路由信息，筛选出与当前路由匹配的路由项。
-        *
-        * @param routerArray 路由数组，包含多个路由项，每个路由项有一个键（key）。
-        * @param route 当前的路由信息，包含路径（pathname）等信息。
-        * @param docsId 通用单据ID的数组，用于进一步筛选路由。
-        * @returns 返回与当前路由匹配的第一个路由项，如果没有匹配项则返回undefined。
-        */
         var replaceRouter = routerArray.filter(function (itemRoute) {
-          var _route$pathname, _route$pathname2;
-          // 单独处理通用单据预览
-          if (window.top !== window && !window.__POWERED_BY_WUJIE__ && ((_route$pathname = route.pathname) === null || _route$pathname === void 0 ? void 0 : _route$pathname.includes('all-general-documents'))) {
-            return pathToRegexp(itemRoute.key || '').test(route.pathname);
-          }
-          // 当路由路径包含'all-general-documents'时，按通用单据处理
-          if (((_route$pathname2 = route.pathname) === null || _route$pathname2 === void 0 ? void 0 : _route$pathname2.includes('all-general-documents')) && shouldUseAuth()) {
-            // 检查路由路径是否匹配路由项的键，并且路径中包含至少一个通用单据ID
-            return pathToRegexp(itemRoute.key || '').test(route.pathname) && docsId.some(function (item) {
-              return route.pathname.includes(item);
-            });
-          }
-          // 对于不包含'all-general-documents'的路径，只检查路由路径是否匹配路由项的键
           return pathToRegexp(itemRoute.key || '').test(route.pathname);
         })[0];
         var currentKey = '';
@@ -17283,15 +17247,20 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         }
         if (!listenRouterKey.includes(currentKey)) {
           if (!replaceRouter) {
-            replaceRouter = {
-              content: currentKey,
-              key: currentKey,
-              name: '404',
-              tab: '404',
-              isNotFound: true
-            };
-            newListenRouterState = [].concat(_toConsumableArray(newListenRouterState), [_objectSpread2({}, replaceRouter)]);
-            newListenRouterKey = [].concat(_toConsumableArray(listenRouterKey), [currentKey]);
+            var _routerArray$filter;
+            replaceRouter = (_routerArray$filter = routerArray.filter(function (itemroute) {
+              return itemroute.key === '/404';
+            })) === null || _routerArray$filter === void 0 ? void 0 : _routerArray$filter[0];
+            _this2.setState({
+              listenRouterState: [].concat(_toConsumableArray(listenRouterState), [_objectSpread2(_objectSpread2({}, replaceRouter), {}, {
+                key: currentKey,
+                tab: '404'
+              })]),
+              activeKey: currentKey,
+              listenRouterKey: [].concat(_toConsumableArray(listenRouterKey), [currentKey])
+            }, function () {
+              _this2.checkisNavSlide();
+            });
           } else {
             var match = matchPath(route.pathname, {
               path: replaceRouter.key
@@ -17809,7 +17778,8 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
         getDictionaryTextByValue = _this$props4.getDictionaryTextByValue,
         timeFormat = _this$props4.timeFormat,
         transparentProps = _this$props4.transparentProps;
-      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, item.isNotFound ? ( /*#__PURE__*/React__default['default'].createElement(NoFoundPage, null)) : /*#__PURE__*/React__default['default'].createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
+      console.log('child wrapper conpent', this.props);
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
         getDictionarySource: getDictionarySource,
         getDictionaryTextByValue: getDictionaryTextByValue,
         timeFormat: timeFormat
@@ -27080,16 +27050,6 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
   }, "setting"));
 });
 
-var AuthButton = function AuthButton(props) {
-  var code = props.code,
-    children = props.children;
-  return /*#__PURE__*/React__default['default'].createElement("span", {
-    style: {
-      display: authFunc(code) ? 'inline-block' : 'none'
-    }
-  }, children);
-};
-
 var EllipsisTooltip = /*#__PURE__*/function (_React$Component) {
   function EllipsisTooltip() {
     var _this;
@@ -32788,7 +32748,6 @@ exports.AddSelect = AddSelect;
 exports.AddSkcSelect = AddSkcSelect;
 exports.AddSkuSelect = AddSkuSelect;
 exports.AddSpuSelect = AddSpuSelect;
-exports.AuthButton = AuthButton;
 exports.BillEntry = BillEntry;
 exports.BsCascader = BsCascader;
 exports.BsLayout = index$5;
@@ -32853,5 +32812,4 @@ exports.removeTenantList = removeTenantList;
 exports.saveCurrentTenantId = saveCurrentTenantId;
 exports.saveTenantList = saveTenantList;
 exports.setConfigTableColumns = setConfigTableColumns;
-exports.shouldUseAuth = shouldUseAuth;
 exports.uuid = uuid;