@bit-sun/business-component 2.3.10 → 2.3.11-alpha.2

package/dist/index.js

@@ -1005,32 +1005,35 @@ function handleCommonTimeRender(text, format) {
 }
 //设置queryTable默认列宽
 var getItemDefaultWidth = function getItemDefaultWidth(item) {
+  var _ref;
   var defaultWidth = 200;
-  var lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
-  switch (true) {
-    case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
-      defaultWidth = 60;
-      break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
-      defaultWidth = 90;
-      break;
-    case lowerCaseKey.indexOf('no') > -1:
-      defaultWidth = 200;
-      break;
-    case lowerCaseKey.indexOf('code') > -1:
-      defaultWidth = 170;
-      break;
-    case lowerCaseKey.indexOf('time') > -1:
-      defaultWidth = 130;
-      break;
-    case lowerCaseKey.indexOf('status') > -1:
-      defaultWidth = 100;
-      break;
-    case lowerCaseKey.indexOf('user') > -1:
-      defaultWidth = 130;
-      break;
+  var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
+  if (lowerCaseKey) {
+    switch (true) {
+      case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
+        defaultWidth = 60;
+        break;
+      case lowerCaseKey.indexOf('number') > -1:
+      case lowerCaseKey.indexOf('quantity') > -1:
+      case lowerCaseKey.indexOf('amount') > -1:
+        defaultWidth = 90;
+        break;
+      case lowerCaseKey.indexOf('no') > -1:
+        defaultWidth = 200;
+        break;
+      case lowerCaseKey.indexOf('code') > -1:
+        defaultWidth = 170;
+        break;
+      case lowerCaseKey.indexOf('time') > -1:
+        defaultWidth = 130;
+        break;
+      case lowerCaseKey.indexOf('status') > -1:
+        defaultWidth = 100;
+        break;
+      case lowerCaseKey.indexOf('user') > -1:
+        defaultWidth = 130;
+        break;
+    }
   }
   return defaultWidth;
 };
@@ -2608,7 +2611,8 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent;
+    fieldComponent = props.fieldComponent,
+    selectBusinessType = props.selectBusinessType;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -2626,7 +2630,9 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _ref$init = _ref.init,
     init = _ref$init === void 0 ? true : _ref$init,
     _ref$extralHeaders = _ref.extralHeaders,
-    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders;
+    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders,
+    _ref$specialBracket = _ref.specialBracket,
+    specialBracket = _ref$specialBracket === void 0 ? false : _ref$specialBracket;
   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);
@@ -2728,8 +2734,8 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setSelectedRowKeys = _useState24[1];
   var _useState25 = React.useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    doubleArr = _useState26[0],
-    setDoubleArr = _useState26[1]; // 存放双数组的数组
+    selectedRows = _useState26[0],
+    setSelectedRows = _useState26[1];
   var _useState27 = React.useState(false),
     _useState28 = _slicedToArray(_useState27, 2),
     checkedAll = _useState28[0],
@@ -2785,6 +2791,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   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;
+    var callback = arguments.length > 2 ? arguments[2] : undefined;
     if (!requestConfig) return;
     setFetching(true);
     // 处理dependence参数
@@ -2933,7 +2940,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -2951,7 +2958,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -2959,18 +2966,22 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
         })) : [];
       }
       source = Array.isArray(source) ? source : [];
-      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));
+      if (callback) {
+        callback(source);
       } 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)
-        }));
+        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);
@@ -3017,6 +3028,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   React.useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
+  React.useEffect(function () {
+    if (init) {
+      setItems([]);
+      setItemsTotal(0);
+      run('init');
+    }
+  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -3029,6 +3047,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
         setSelectedRowKeys(labelInValue ? value.map(function (i) {
           return i.key;
         }) : value);
+        setSelectedRows(labelInValue ? value.map(function (i) {
+          var _ref4;
+          return _ref4 = {}, _defineProperty(_ref4, mappingValueField, i.key), _defineProperty(_ref4, "value", i.key), _defineProperty(_ref4, "text", i.label), _ref4;
+        }) : value.map(function (i) {
+          var _ref5;
+          return _ref5 = {}, _defineProperty(_ref5, mappingValueField, i), _defineProperty(_ref5, "value", i), _ref5;
+        }));
         setPopValue(labelInValue ? value.map(function (i) {
           return {
             value: i.key,
@@ -3041,12 +3066,10 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(itemsTotal && value.length === itemsTotal);
-        // 需清空数据
-        if (!value.length) {
-          setDoubleArr([]);
-        }
       } else {
+        var _ref6, _ref7;
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
+        setSelectedRows(labelInValue ? [(_ref6 = {}, _defineProperty(_ref6, mappingValueField, value.key), _defineProperty(_ref6, "value", value.key), _defineProperty(_ref6, "text", value.label), _ref6)] : [(_ref7 = {}, _defineProperty(_ref7, mappingValueField, value), _defineProperty(_ref7, "value", value), _ref7)]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
@@ -3096,7 +3119,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setTableData([]);
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
-    setDoubleArr([]);
+    setSelectedRows([]);
     setCheckedAll(false);
     setIndeterminate(false);
   };
@@ -3159,25 +3182,39 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       currentPage: pagination.current
     }), 2);
   };
+  var onCheckAllData = function onCheckAllData(pSize) {
+    getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
+      pageSize: pSize,
+      currentPage: 1
+    }), 2, function (source) {
+      var currentItemsData = JSON.parse(JSON.stringify(source));
+      setSelectedRowKeys(currentItemsData.map(function (i) {
+        return i.value;
+      }));
+      setPopValue(currentItemsData);
+      setSelectedRows(currentItemsData);
+    });
+  };
   var onChangeCheckAll = function onChangeCheckAll(e) {
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      var currentItemsData = JSON.parse(JSON.stringify(items));
-      var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
-      for (var i = 0; i <= totalPage - 1; i++) {
-        doubleArr[i] = currentItemsData.slice((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * i, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * (i + 1));
+      if (items.length < itemsTotal) {
+        var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+        var allPageSize = totalPage * (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize);
+        onCheckAllData(allPageSize);
+      } else {
+        var currentItemsData = JSON.parse(JSON.stringify(items));
+        setSelectedRowKeys(currentItemsData.map(function (i) {
+          return i.value;
+        }));
+        setPopValue(currentItemsData);
+        setSelectedRows(currentItemsData);
       }
-      setDoubleArr(doubleArr);
-      setSelectedRowKeys(currentItemsData.map(function (i) {
-        return i.value;
-      }));
-      setPopValue(currentItemsData);
-      if (items.length < itemsTotal) ;
     } else {
       setSelectedRowKeys([]);
       setPopValue([]);
-      setDoubleArr([]);
+      setSelectedRows([]);
     }
     setIndeterminate(false);
     setCheckedAll(e.target.checked);
@@ -3185,13 +3222,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var LightHeightOption = function LightHeightOption(props) {
     var filterTxt = props.filterTxt,
       text = props.text;
-    var heightLightTxt = function heightLightTxt(txt, heightTxt) {
+    var heightLightTxt = function heightLightTxt(text, heightTxt) {
       if (heightTxt === '') {
-        return txt;
+        return text;
       }
       // 前面filterOption 不区分大小写，这里用i
       var regexp = new RegExp(heightTxt, 'gi');
-      return txt.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
+      return text.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
     return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
       title: text
@@ -3203,54 +3240,21 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }));
   };
-  // 扁平化二维数组的方法
-  var mapRows = function mapRows(params) {
-    var res = [];
-    for (var i = 0; i < params.length; i++) {
-      if (Array.isArray(params[i])) {
-        // 去重
-        res = ___default['default'].uniqBy(res.concat(mapRows(params[i])), 'value');
-      } else {
-        res.push(params[i]);
-        // 去重
-        res = ___default['default'].uniqBy(res, 'value');
-      }
-    }
-    return res.filter(Boolean); //去掉undefined的情况
-  };
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
-    var nowPage = tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.current;
-    var filterRows = []; // 存放拼接后的一维数组的变量
-    var sksResult = [];
-    if (selectMode) {
-      // 处理多选分页累计选中
-      // 勾选生成二维数组
-      doubleArr[nowPage ? nowPage - 1 : 0] = selectRows;
-      // console.log(doubleArr)
-      setDoubleArr(doubleArr);
-      // 这块扁平化成为一位数组
-      filterRows = mapRows(doubleArr);
-      // console.log(filterRows)
-      sksResult = filterRows.map(function (i) {
-        return i.value;
-      });
-    } else {
-      // 处理单选
-      filterRows = selectRows;
-      sksResult = selectRows.map(function (i) {
-        return i.value;
-      });
-      // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
-      if (!(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
-        handleSelectOver(filterRows);
-        handleCancel();
-      }
+    var sksResult = selectRows.map(function (i) {
+      return i.value;
+    });
+    // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
+    if (!selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
+      handleSelectOver(selectRows);
+      handleCancel();
     }
     setSelectedRowKeys(sksResult);
-    setPopValue(filterRows);
-    setIndeterminate(!!filterRows.length && filterRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
-    setCheckedAll(filterRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
+    setSelectedRows(selectRows);
+    setPopValue(selectRows);
+    setIndeterminate(!!selectRows.length && selectRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
+    setCheckedAll(selectRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
   };
   // 生成唯一值
   var makeUniqueValue = function makeUniqueValue() {
@@ -3261,8 +3265,21 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var rowSelection = {
     type: selectMode ? 'checkbox' : 'radio',
     selectedRowKeys: selectedRowKeys,
+    preserveSelectedRowKeys: true,
     onChange: function onChange(sks, srs) {
-      onChangeSelectedKeys(sks, srs);
+      // 处理翻页后，之前存储的selectedRows变为undefined
+      // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
+      var tmpSelectedRows = selectedRows.concat(srs).filter(function (item) {
+        return item != undefined;
+      });
+      var totalSelectedRows = sks.map(function (key) {
+        return tmpSelectedRows.filter(function (item) {
+          return item[mappingValueField] == key;
+        })[0];
+      }).filter(function (item) {
+        return item != undefined;
+      });
+      onChangeSelectedKeys(sks, totalSelectedRows);
     },
     getCheckboxProps: function getCheckboxProps() {
       return {
@@ -3397,6 +3414,10 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       })
     }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
+  var handleSelectOptionsShowValue = function handleSelectOptionsShowValue(specialBracket, item) {
+    var showText = Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText;
+    return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
+  };
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'search_select'
   }, fieldComponent ? /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3466,7 +3487,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.textShowKey, "       ").concat(Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText),
+      text: handleSelectOptionsShowValue(specialBracket, item),
       filterTxt: searchValue
     }));
   })), needModalTable && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -4225,32 +4246,35 @@ var noEmptyArray = function noEmptyArray(arr) {
 };
 //设置queryTable默认列宽
 var getItemDefaultWidth$1 = function getItemDefaultWidth(item) {
+  var _ref;
   var defaultWidth = 200;
-  var lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
-  switch (true) {
-    case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
-      defaultWidth = 60;
-      break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
-      defaultWidth = 90;
-      break;
-    case lowerCaseKey.indexOf('no') > -1:
-      defaultWidth = 200;
-      break;
-    case lowerCaseKey.indexOf('code') > -1:
-      defaultWidth = 170;
-      break;
-    case lowerCaseKey.indexOf('time') > -1:
-      defaultWidth = 130;
-      break;
-    case lowerCaseKey.indexOf('status') > -1:
-      defaultWidth = 100;
-      break;
-    case lowerCaseKey.indexOf('user') > -1:
-      defaultWidth = 130;
-      break;
+  var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
+  if (lowerCaseKey) {
+    switch (true) {
+      case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
+        defaultWidth = 60;
+        break;
+      case lowerCaseKey.indexOf('number') > -1:
+      case lowerCaseKey.indexOf('quantity') > -1:
+      case lowerCaseKey.indexOf('amount') > -1:
+        defaultWidth = 90;
+        break;
+      case lowerCaseKey.indexOf('no') > -1:
+        defaultWidth = 200;
+        break;
+      case lowerCaseKey.indexOf('code') > -1:
+        defaultWidth = 170;
+        break;
+      case lowerCaseKey.indexOf('time') > -1:
+        defaultWidth = 130;
+        break;
+      case lowerCaseKey.indexOf('status') > -1:
+        defaultWidth = 100;
+        break;
+      case lowerCaseKey.indexOf('user') > -1:
+        defaultWidth = 130;
+        break;
+    }
   }
   return defaultWidth;
 };
@@ -4395,7 +4419,9 @@ var AddSelect = function AddSelect(props) {
     _props$businessType = props.businessType,
     businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
     _props$isAllowRepeate = props.isAllowRepeatedSelect,
-    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate,
+    _props$noUseItemEanco = props.noUseItemEancode,
+    noUseItemEancode = _props$noUseItemEanco === void 0 ? true : _props$noUseItemEanco;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -5072,8 +5098,10 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 3, tableSearchForm);
+        var searchPosition1 = noUseItemEancode ? 3 : 2;
+        var searchPosition2 = noUseItemEancode ? 4 : 3;
+        formatSource(x, 0, searchPosition1, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, searchPosition2, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -6618,6 +6646,13 @@ var shopFile2Type = [{
   text: "自营B2C",
   value: 'B2C'
 }];
+var shopFile2Status = [{
+  text: "启用",
+  value: 10
+}, {
+  text: "禁用",
+  value: 20
+}];
 var arrivalPaySupportList = [{
   text: "支持",
   value: 1
@@ -6632,6 +6667,13 @@ var sharingType = [{
   text: "私有",
   value: '20'
 }];
+var employeeType = [{
+  text: "外部员工",
+  value: '10'
+}, {
+  text: "内部员工",
+  value: '20'
+}];
 
 var getDicData = function getDicData(dicCode) {
   var dicData = {};
@@ -7573,10 +7615,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'physicalWarehouseName',
       mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7609,7 +7652,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
@@ -7632,10 +7680,16 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00002', text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []), [{
         title: '所属公司',
         dataIndex: 'companyName'
-      }]
+      }])
     }, modalTableBusProps);
   }
   if (type === 'realWarehouse') {
@@ -7645,10 +7699,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'realWarehouseName',
       mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7662,7 +7717,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择逻辑仓',
       tableSearchForm: tableSearchForm,
@@ -7678,7 +7738,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00004', text);
         }
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   if (type === 'ownerWarehouse') {
@@ -7688,10 +7754,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'operationWarehouseCode',
       mappingValueField: 'operationWarehouseCode',
-      otherParams: {
-        'qp-status-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-status-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7719,7 +7786,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-status-eq',
+      type: 'select',
+      label: '运营仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
     })]).then(function (x) {
@@ -7737,7 +7809,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '运营组',
         dataIndex: 'groupName'
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -8156,6 +8234,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
+    }, {
+      name: 'qp-status-in',
+      type: 'select',
+      label: '商店状态',
+      initialSource: shopFile2Status
     }, {
       name: 'qp-orgCode-in',
       type: 'select',
@@ -8181,7 +8264,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
     })]).then(function (x) {
-      formatSource(x, 0, 3, tableSearchForm);
+      formatSource(x, 0, 4, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -8201,6 +8284,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
             return i.value === text;
           })) === null || _shopFile2Type$find === void 0 ? void 0 : _shopFile2Type$find.text;
         }
+      }, {
+        title: '启用状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          var _shopFile2Status$find;
+          return (_shopFile2Status$find = shopFile2Status.find(function (i) {
+            return i.value === text;
+          })) === null || _shopFile2Status$find === void 0 ? void 0 : _shopFile2Status$find.text;
+        }
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName'
@@ -8335,12 +8427,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
-      otherParams: {
+      otherParams: _objectSpread2(_objectSpread2({
         'qp-enable-eq': 10,
-        'qp-employmentType-eq': 20,
-        'qp-orgViewIds-like': 'administrative-organization-view',
+        'qp-orgViewIds-like': 'administrative-organization-view'
+      }, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? {} : {
+        'qp-employmentType-eq': 20
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'employeeNumber'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -8379,13 +8473,18 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }, {
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+      name: 'qp-employmentType-eq',
+      type: 'select',
+      label: '员工类型',
+      initialSource: employeeType
+    }] : []), [{
       name: 'qp-email-like',
       label: '邮箱'
     }, {
       name: 'qp-officeTelephone-like',
       label: '手机号'
-    }];
+    }]);
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
     })]).then(function (x) {
@@ -8415,13 +8514,22 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return handleTextOverflow(text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+        title: '员工类型',
+        dataIndex: 'employmentType',
+        render: function render(text) {
+          var _employeeType$find;
+          return (_employeeType$find = employeeType.find(function (i) {
+            return i.value === text;
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text;
+        }
+      }] : []), [{
         title: '邮箱',
         dataIndex: 'email'
       }, {
         title: '手机号',
         dataIndex: 'officeTelephone'
-      }]
+      }])
     }, modalTableBusProps);
   }
   // 配送方式选择器
@@ -8625,7 +8733,7 @@ var BusinessSearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
   React.useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -8647,9 +8755,13 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
+  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
+    return false;
+  }
   return true;
 });
 
+// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -8661,7 +8773,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加
+  // 追加(最好不用这个，当组件不固定时候会有影响)
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -8674,6 +8786,7 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
+  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -8681,12 +8794,26 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var isNoUseItemBarcode = (parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode) !== undefined ? parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode : true; // 默认不加商品条码，兼容老项目
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
+  }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+    title: '商品条码',
+    width: 100,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemEancode',
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }]), [{
     title: 'SKU名称',
     width: 200,
     ellipsis: {
@@ -8762,7 +8889,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       }, text);
     },
     dataIndex: 'propertyNameAndValue'
-  }];
+  }]);
   var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
@@ -8773,11 +8900,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -8789,7 +8916,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
-    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect),
+    noUseItemEancode: isNoUseItemBarcode
   };
   var modalTableProps = {
     modalTableTitle: '选择商品',
@@ -8799,7 +8927,14 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      name: 'qp-code-in',
+      label: '商品条码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
+      }
+    }]), [{
       name: 'qp-brandId-in',
       type: 'select',
       label: '品牌',
@@ -8844,7 +8979,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           }
         }
       }
-    }],
+    }]),
     tableColumns: [{
       title: 'SKU编码',
       width: 150,
@@ -8878,20 +9013,20 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           height: 20
         }));
       }
-    }, {
-      title: '国际条码',
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      title: '商品条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'barCode',
+      dataIndex: 'itemEancode',
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
           placement: "topLeft",
           title: text
         }, text);
       }
-    }, {
+    }]), [{
       title: '所属SPU名称',
       width: 100,
       ellipsis: {
@@ -8982,7 +9117,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }, text);
       },
       dataIndex: 'brandName'
-    }],
+    }]),
     selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -8990,6 +9125,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
+  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9067,9 +9203,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-skcStatus-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -9269,6 +9405,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
+  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9355,11 +9492,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),
@@ -9668,7 +9805,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
-var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
+var _excluded$5 = ["ctx", "value", "valueName", "onChange", "onChangeName", "placeholder", "remoteSource", "initialValue", "treeCheckable", "showSearch", "maxTagCount", "multiple", "isChoose", "rootDisabled", "mode", "getPopupContainer", "labelInValue", "showArrow", "allowClear", "showCheckedStrategy", "style", "getTreeData", "disabled"];
 var TreeSearchSelect = function TreeSearchSelect(props) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -9692,6 +9829,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     multiple = _props$multiple === void 0 ? false : _props$multiple,
     _props$isChoose = props.isChoose,
     isChoose = _props$isChoose === void 0 ? false : _props$isChoose,
+    _props$rootDisabled = props.rootDisabled,
+    rootDisabled = _props$rootDisabled === void 0 ? false : _props$rootDisabled,
     mode = props.mode,
     _getPopupContainer = props.getPopupContainer,
     _props$labelInValue = props.labelInValue,
@@ -9718,7 +9857,8 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
@@ -9726,17 +9866,20 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
+      disabled: isDisabled(haveChildren, isRoot),
       children: haveChildren ? treeDataItem.children.map(function (i) {
         return mapSearchTree(i);
       }) : []
     };
   };
-  var isDisabled = function isDisabled(children) {
+  var isDisabled = function isDisabled(isParent, isRoot) {
     if (isChoose) {
+      if (rootDisabled && isRoot) {
+        return rootDisabled;
+      }
       return false;
     }
-    return children;
+    return isParent;
   };
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
   var handleSearch = function handleSearch(q) {
@@ -9811,10 +9954,53 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       return _formatResult;
     }
   };
+  var parallelData = function parallelData(data, result) {
+    data.forEach(function (i) {
+      result.push(i);
+      if (i.children) {
+        parallelData(i.children, result);
+      }
+    });
+    return result;
+  };
+  var getSelectItem = function getSelectItem(tData, selectValue) {
+    var handleList = tData || [];
+    var result = [];
+    if (labelInValue) {
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i.value;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i.value;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == (selectValue === null || selectValue === void 0 ? void 0 : selectValue.value);
+      })) || {};
+    } else {
+      var cValue = ___default['default'].get(selectValue === null || selectValue === void 0 ? void 0 : selectValue[0], 'value', selectValue);
+      result = multiple || treeCheckable ? (selectValue === null || selectValue === void 0 ? void 0 : selectValue.map(function (i) {
+        if (handleList.some(function (s) {
+          return s.key == i;
+        })) {
+          return handleList.find(function (s) {
+            return s.key == i;
+          });
+        }
+      })) || [] : (handleList === null || handleList === void 0 ? void 0 : handleList.find(function (s) {
+        return s.key == cValue;
+      })) || {};
+    }
+    return result;
+  };
   var handleChange = function handleChange(data, dataName) {
     var _ctx$form2;
     var handleData = formatData(data);
-    onChange(handleData, data);
+    // 获取选中树节点当条数据，并返回给调用业务
+    var parallelTreeData = parallelData(treeData, []);
+    var currentItem = getSelectItem(parallelTreeData, data);
+    onChange(handleData, data, currentItem, parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldValue(ctx.name, handleData);
@@ -12994,7 +13180,8 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
       }))))), /*#__PURE__*/React__default['default'].createElement("div", {
         onClick: this.showModal,
         style: {
-          fontSize: 14
+          fontSize: 14,
+          textAlign: 'center'
         }
       }, "\u641C\u7D22\u9879\u8BBE\u7F6E"));
     }
@@ -13326,7 +13513,8 @@ var BsSulaQueryTable = (function (props) {
           overlay: /*#__PURE__*/React__default['default'].createElement(antd.Menu, null, /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement("div", {
             onClick: sortTableRef === null || sortTableRef === void 0 ? void 0 : (_sortTableRef$current = sortTableRef.current) === null || _sortTableRef$current === void 0 ? void 0 : _sortTableRef$current.showModal,
             style: {
-              fontSize: 14
+              fontSize: 14,
+              textAlign: 'center'
             }
           }, "\u5217\u8BBE\u7F6E")), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement(SearchItemTable, {
             ref: searchTableRef,
@@ -15711,10 +15899,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
     _this.allFunc = /*#__PURE__*/React.createRef('');
     _this.customerMenuRef = /*#__PURE__*/React.createRef('');
     _this.actionRef = /*#__PURE__*/React.createRef();
-    _this.handleBeforeUnload = function () {
-      // 储存当前router信息
-      sessionStorage.setItem('@listenRouterState', JSON.stringify(_this.state.listenRouterState));
-    };
     _this.parseQueryString = function (queryString) {
       if (!queryString) {
         return '';
@@ -16118,49 +16302,15 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       },
       currentSubMenuData: [],
       showSubMenu: false,
-      isSlider: false,
-      _routerArray: routerArray
+      isSlider: false
     };
     return _this;
   }
   _createClass(BasicLayout, [{
-    key: "componentWillMount",
-    value: function componentWillMount() {
-      var _this2 = this;
-      // 检查页面是否为刷新之后的
-      if (sessionStorage.getItem('@listenRouterState')) {
-        var lastListenRouterState = JSON.parse(sessionStorage.getItem('@listenRouterState')),
-          showListenRouterState = [],
-          nowItem = {};
-        if (lastListenRouterState.length === 1) {
-          sessionStorage.removeItem('@listenRouterState');
-          return;
-        }
-        lastListenRouterState.forEach(function (item) {
-          var _this2$state;
-          nowItem = _this2 === null || _this2 === void 0 ? void 0 : (_this2$state = _this2.state) === null || _this2$state === void 0 ? void 0 : _this2$state._routerArray.find(function (i) {
-            var _item$match;
-            return item.key === i.key || (item === null || item === void 0 ? void 0 : item.match) && (item === null || item === void 0 ? void 0 : (_item$match = item.match) === null || _item$match === void 0 ? void 0 : _item$match.path) === i.key;
-          });
-          // 详情页保留问题尚未解决
-          if (nowItem) {
-            showListenRouterState.push(_objectSpread2(_objectSpread2({}, item), {}, {
-              content: nowItem.content,
-              tab: item.tab || _this2.getPageTitle(nowItem.key)
-            }));
-          }
-        });
-        this.setState({
-          listenRouterState: [].concat(showListenRouterState)
-        });
-        sessionStorage.removeItem('@listenRouterState');
-      }
-    }
-  }, {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _window$$wujie,
-        _this3 = this,
+        _this2 = this,
         _localStorage$getItem,
         _localStorage$getItem2;
       var _this$props = this.props,
@@ -16210,11 +16360,11 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         //   if (window.location.href.indexOf(`/${itemPath}`) === -1) return;
         // }
         if (route.pathname.startsWith("/".concat(itemPath, "/"))) return;
-        var _this3$state = _this3.state,
-          listenRouterState = _this3$state.listenRouterState,
-          listenRouterKey = _this3$state.listenRouterKey,
-          customerMatchs = _this3$state.customerMatchs,
-          hideMenuArray = _this3$state.hideMenuArray;
+        var _this2$state = _this2.state,
+          listenRouterState = _this2$state.listenRouterState,
+          listenRouterKey = _this2$state.listenRouterKey,
+          customerMatchs = _this2$state.customerMatchs,
+          hideMenuArray = _this2$state.hideMenuArray;
         var newListenRouterState = _toConsumableArray(listenRouterState);
         var newListenRouterKey = _toConsumableArray(listenRouterKey);
         var replaceRouter = routerArray.filter(function (itemRoute) {
@@ -16225,7 +16375,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           // 处理中英文和特殊字符
           currentKey = decodeURIComponent(route.pathname);
         } else {
-          currentKey = decodeURIComponent(route.pathname + _this3.parseQueryString(route.search));
+          currentKey = decodeURIComponent(route.pathname + _this2.parseQueryString(route.search));
         }
         if (!istParent) {
           var _window$$wujie2;
@@ -16245,7 +16395,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             replaceRouter = (_routerArray$filter = routerArray.filter(function (itemroute) {
               return itemroute.key === '/404';
             })) === null || _routerArray$filter === void 0 ? void 0 : _routerArray$filter[0];
-            _this3.setState({
+            _this2.setState({
               listenRouterState: [].concat(_toConsumableArray(listenRouterState), [_objectSpread2(_objectSpread2({}, replaceRouter), {}, {
                 key: currentKey,
                 tab: '404'
@@ -16253,7 +16403,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
               activeKey: currentKey,
               listenRouterKey: [].concat(_toConsumableArray(listenRouterKey), [currentKey])
             }, function () {
-              _this3.checkisNavSlide();
+              _this2.checkisNavSlide();
             });
           } else {
             var match = matchPath(route.pathname, {
@@ -16263,7 +16413,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
               query: route.query,
               match: match,
               key: currentKey,
-              tab: _this3.getPageTitle(route.pathname) + ''
+              tab: _this2.getPageTitle(route.pathname) + ''
             })]);
             newListenRouterKey = [].concat(_toConsumableArray(listenRouterKey), [currentKey]);
           }
@@ -16301,13 +16451,13 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             localStorage.removeItem('isMenuClick');
           }, 0);
         }
-        _this3.setState({
+        _this2.setState({
           //路由监听函数最后执行setState，避免处理hideMenu类型页面自动关闭的逻辑块内获取不到最新state的listenRouterState和listenRouterKey
           activeKey: currentKey,
           listenRouterState: newListenRouterState,
           listenRouterKey: newListenRouterKey
         }, function () {
-          _this3.checkisNavSlide();
+          _this2.checkisNavSlide();
         });
         istParent = 0;
       });
@@ -16322,35 +16472,17 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       } else {
         history.push(location);
       }
-      try {
-        window.addEventListener('beforeunload', this.handleBeforeUnload);
-      } catch (error) {
-        console.log("\uD83D\uDE80 => componentDidMount => error:", error);
-      }
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      window.removeEventListener('beforeunload', this.handleBeforeUnload);
       // eslint-disable-next-line no-unused-expressions
       UN_LISTTEN_DRP && UN_LISTTEN_DRP();
     }
-  }, {
-    key: "getWelcomePage",
-    value: function getWelcomePage() {
-      var homeRouter = routerArray.filter(function (itemroute) {
-        return itemroute.key === '/';
-      })[0];
-      return _objectSpread2(_objectSpread2({}, homeRouter), {}, {
-        key: '/',
-        tab: '欢迎',
-        closable: false
-      });
-    }
   }, {
     key: "render",
     value: function render() {
-      var _this4 = this;
+      var _this3 = this;
       var _this$state4 = this.state,
         listenRouterState = _this$state4.listenRouterState,
         activeKey = _this$state4.activeKey,
@@ -16374,7 +16506,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           className: "tab_title_content"
         }, item.tab, item.key !== '/' && /*#__PURE__*/React__default['default'].createElement(ItemMenu, {
           info: item,
-          operateFun: _this4.operateFun,
+          operateFun: _this3.operateFun,
           listenRouterState: listenRouterState
         }));
       };
@@ -16408,7 +16540,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       }, /*#__PURE__*/React__default['default'].createElement("a", {
         onClick: function onClick() {
           // 关闭全部
-          _this4.updateState([_objectSpread2(_objectSpread2({}, _this4.state.homeRouter), {}, {
+          _this3.updateState([_objectSpread2(_objectSpread2({}, _this3.state.homeRouter), {}, {
             key: '/',
             tab: '欢迎',
             closable: false
@@ -16434,7 +16566,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           } else {
             newActiveKey = listenRouterState[1].key;
           }
-          _this4.updateState(listenRouterState.filter(function (d) {
+          _this3.updateState(listenRouterState.filter(function (d) {
             return d.key !== activeKey;
           }), listenRouterKey.filter(function (d) {
             return d !== activeKey;
@@ -16461,7 +16593,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           //   message.warning('首页不可关闭。');
           //   return;
           // }
-          _this4.updateState(listenRouterState.filter(function (d, i) {
+          _this3.updateState(listenRouterState.filter(function (d, i) {
             return i >= index || d.key === '/';
           }), listenRouterKey.filter(function (d, i) {
             return i >= index || d === '/';
@@ -16478,7 +16610,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           var index = listenRouterState.findIndex(function (item) {
             return item.key === activeKey;
           });
-          _this4.updateState(listenRouterState.filter(function (d, i) {
+          _this3.updateState(listenRouterState.filter(function (d, i) {
             return i <= index || d.key === '/';
           }), listenRouterKey.filter(function (d, i) {
             return i <= index || d === '/';
@@ -16521,7 +16653,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             opacity: this.state.isSlider ? 1 : 0.5
           },
           onClick: function onClick() {
-            _this4.setTabNavTransLate(-100);
+            _this3.setTabNavTransLate(-100);
           }
         }, /*#__PURE__*/React__default['default'].createElement(icons.DoubleLeftOutlined, null))),
         right: /*#__PURE__*/React__default['default'].createElement("div", {
@@ -16530,7 +16662,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           },
           className: 'tab_right_operate',
           onClick: function onClick() {
-            _this4.setTabNavTransLate(100);
+            _this3.setTabNavTransLate(100);
           }
         }, /*#__PURE__*/React__default['default'].createElement(icons.DoubleRightOutlined, null))
       };
@@ -16544,7 +16676,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           return /*#__PURE__*/React__default['default'].createElement(CustomerMenuHeader, {
             originRoutes: originRoutes,
             itemPath: itemPath,
-            handleClose: _this4.handleClose,
+            handleClose: _this3.handleClose,
             collapsed: collapse
           });
         },
@@ -16553,10 +16685,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(CustomerMenu, {
               originRoutes: originRoutes,
               itemPath: itemPath,
-              ref: _this4.customerMenuRef,
-              actionRef: _this4.actionRef,
-              handleClose: _this4.handleClose,
-              isCollapse: _this4.state.collapse
+              ref: _this3.customerMenuRef,
+              actionRef: _this3.actionRef,
+              handleClose: _this3.handleClose,
+              isCollapse: _this3.state.collapse
             }));
           }
           return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -16564,7 +16696,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           }, /*#__PURE__*/React__default['default'].createElement("span", {
             className: "collapse_icon",
             onClick: function onClick() {
-              _this4.setState({
+              _this3.setState({
                 collapse: !collapse
               });
             }
@@ -16577,7 +16709,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         },
         collapsed: collapse,
         onCollapse: function onCollapse(boo) {
-          _this4.setState({
+          _this3.setState({
             collapse: boo
           });
         },
@@ -16613,14 +16745,14 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
             },
             onMouseEnter: function onMouseEnter() {
               if (menuItemProps.pro_layout_parentKeys && menuItemProps.pro_layout_parentKeys.length) return;
-              _this4.setState({
+              _this3.setState({
                 currentSubMenuData: menuItemProps.children,
                 currentSubPath: menuItemProps.path
               });
-              _this4.setShowMenu(true);
+              _this3.setShowMenu(true);
             },
             onMouseLeave: function onMouseLeave() {
-              _this4.setShowMenu(false);
+              _this3.setShowMenu(false);
             }
           }, defaultDom, showSubMenu && currentSubPath === menuItemProps.path && !collapse && /*#__PURE__*/React__default['default'].createElement(icons.CaretLeftOutlined, {
             style: {
@@ -16639,7 +16771,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           }, '');
         },
         postMenuData: function postMenuData(menus) {
-          return _toConsumableArray(filterByMenuDate(menus || [], _this4.state.keyWord));
+          return _toConsumableArray(filterByMenuDate(menus || [], _this3.state.keyWord));
         },
         links: [!this.state.collapse ? /*#__PURE__*/React__default['default'].createElement(AllFunc$1, {
           ref: this.allFunc,
@@ -16713,7 +16845,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           tab: /*#__PURE__*/React__default['default'].createElement(TabTitle, {
             item: item,
             index: index,
-            updateState: _this4.updateState
+            updateState: _this3.updateState
           }),
           style: {
             marginTop: isWeiqianduan ? 0 : 30
@@ -16725,10 +16857,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           })
         }, /*#__PURE__*/React__default['default'].createElement(WrapperComponent, {
           item: item,
-          routerProps: _this4.props,
-          getDictionarySource: _this4.getDictionarySource,
-          getDictionaryTextByValue: _this4.getDictionaryTextByValue,
-          timeFormat: _this4.timeFormat,
+          routerProps: _this3.props,
+          getDictionarySource: _this3.getDictionarySource,
+          getDictionaryTextByValue: _this3.getDictionaryTextByValue,
+          timeFormat: _this3.timeFormat,
           transparentProps: transparentProps
         }));
       })), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -16753,10 +16885,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         itemPath: itemPath
       }, drawerLeftParams)), /*#__PURE__*/React__default['default'].createElement("div", {
         onMouseEnter: function onMouseEnter() {
-          _this4.setShowMenu(true);
+          _this3.setShowMenu(true);
         },
         onMouseLeave: function onMouseLeave() {
-          _this4.setShowMenu(false);
+          _this3.setShowMenu(false);
         },
         className: 'sub_menu_content',
         style: {
@@ -17011,6 +17143,7 @@ var FixedScrollBar = function FixedScrollBar(_ref, ref) {
     }
   };
   React.useEffect(function () {
+    onContainerScroll();
     var onscroll = _.throttle(onContainerScroll, 50);
     container.addEventListener('scroll', onscroll);
     return function () {
@@ -29457,7 +29590,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }
       var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
-        return i.key === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
+        var _i$key;
+        return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
       });
       var dataChoiceBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataChoiceBusinessType;
       var dataInputBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataInputBusinessType;
@@ -29662,17 +29796,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"))));
     };
-    _this.handleEditExtraInfoResponse = function (code, val, parentDetail) {
+    _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
       parentDetail.extraInfo.response[code] = val;
+      ruleClassData[classDataIndex].extraInfo.response[code] = val;
       _this.setState({
         ruleClassData: ruleClassData
       }, function () {
         callBack(ruleClassData);
       });
     };
-    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, disabled, boxStyle) {
+    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
       var isRightText = ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : (_ruleReturnConfig$rig = ruleReturnConfig.rightText) === null || _ruleReturnConfig$rig === void 0 ? void 0 : _ruleReturnConfig$rig.length;
@@ -29688,7 +29823,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         var value = val;
         if (isObj(code)) {
           Object.keys(code).forEach(function (ite) {
-            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail);
+            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail, classDataIndex);
           });
           return;
         }
@@ -29701,7 +29836,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           var _val$PCDCode;
           value = val.value || ((_val$PCDCode = val.PCDCode) === null || _val$PCDCode === void 0 ? void 0 : _val$PCDCode.join('/'));
         }
-        _this.handleEditExtraInfoResponse('value', value, parentDetail);
+        _this.handleEditExtraInfoResponse('value', value, parentDetail, classDataIndex);
       };
       return isShowResponse && /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
@@ -29710,7 +29845,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
-          _this.handleEditExtraInfoResponse('enable', false, parentDetail);
+          _this.handleEditExtraInfoResponse('enable', false, parentDetail, classDataIndex);
         },
         style: {
           color: 'gray',
@@ -30321,12 +30456,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         type: "link",
         onClick: function onClick() {
           if (isHaveRuleReturnConfig) {
-            _this.handleEditExtraInfoResponse('enable', true, parentDetail);
+            _this.handleEditExtraInfoResponse('enable', true, parentDetail, classDataIndex);
           } else {
             antd.message.warn('未配置返回');
           }
         }
-      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
+      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
     };
     _this.addPeerRule = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;