@bit-sun/business-component 3.1.0 → 3.1.1

package/dist/index.esm.js

@@ -2700,6 +2700,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       return data;
     };
     _this.resetData = function () {
+      var _customerColumnsMappi;
       var _this$props = _this.props,
         validDataUrl = _this$props.validDataUrl,
         validDataParams = _this$props.validDataParams,
@@ -2707,10 +2708,16 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         columns = _this$props.columns,
         isBrandAuth = _this$props.isBrandAuth,
         _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt;
+        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
+        customerColumnsMapping = _this$props.customerColumnsMapping;
       var resultData = _this.getData().filter(function (d) {
         return _.compact(Object.values(d)).length;
       });
+      var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
+        return !(c === null || c === void 0 ? void 0 : c.name);
+      })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
+        return c.name;
+      }) : columns;
       // 处理业务参数
       var otherParams = {};
       if (isBrandAuth) {
@@ -2719,7 +2726,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         };
       }
       requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })).then(function (result) {
@@ -2734,12 +2741,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         var sheetData = luckysheet.getSheetData();
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
-          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+          var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
             return i === 'skuCode';
           });
-          if (_this.props.columns.find(function (i) {
+          if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
             return i === 'skuCode';
-          }) && item[changeVMIndex].v !== res[index].skuCode) {
+          })) && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }
@@ -2994,7 +3001,7 @@ var luckysheet$1;
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]);
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级'], ['stockBizTypeCode', ' 库存类型']]);
 // a little function to help us with reordering the result
 var reorder$1 = function reorder(list, startIndex, endIndex) {
   var result = Array.from(list);
@@ -3287,6 +3294,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       return data;
     };
     _this.resetData = function () {
+      var _customerColumnsMappi;
       var _this$props = _this.props,
         validDataUrl = _this$props.validDataUrl,
         validDataParams = _this$props.validDataParams,
@@ -3294,10 +3302,16 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         columns = _this$props.columns,
         isBrandAuth = _this$props.isBrandAuth,
         _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt;
+        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
+        customerColumnsMapping = _this$props.customerColumnsMapping;
       var resultData = _this.getData().filter(function (d) {
         return _.compact(Object.values(d)).length;
       });
+      var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
+        return !(c === null || c === void 0 ? void 0 : c.name);
+      })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
+        return c.name;
+      }) : columns;
       // 处理业务参数
       var otherParams = {};
       if (isBrandAuth) {
@@ -3306,7 +3320,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         };
       }
       requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })).then(function (result) {
@@ -3321,12 +3335,12 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         var sheetData = luckysheet$1.getSheetData();
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
-          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+          var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
             return i === 'skuCode';
           });
-          if (_this.props.columns.find(function (i) {
+          if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
             return i === 'skuCode';
-          }) && item[changeVMIndex].v !== res[index].skuCode) {
+          })) && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }
@@ -4548,26 +4562,40 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
     }
   };
+  var getShowLabelTextStr = function getShowLabelTextStr(kongValue) {
+    if (selectMode) {
+      var _value$map;
+      return (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
+        return item.label || item.text || '';
+      })) === null || _value$map === void 0 ? void 0 : _value$map.join(',')) || kongValue;
+    }
+    return (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.text) || kongValue;
+  };
   var getSelectValueText = function getSelectValueText(v) {
     var _filter, _filter$;
     return ((_filter = (items || []).filter(function (item) {
       return item.value === v;
     })) === null || _filter === void 0 ? void 0 : (_filter$ = _filter[0]) === null || _filter$ === void 0 ? void 0 : _filter$.text) || v || '';
   };
+  var getShowValueStr = function getShowValueStr(kongValue) {
+    if (selectMode) {
+      var _value$map2;
+      return (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
+        return getSelectValueText(item);
+      })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',')) || kongValue;
+    }
+    return getSelectValueText(value) || kongValue;
+  };
   var getShowStr = function getShowStr() {
-    var _value$map2;
+    var kongValue = '无';
     // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
     // 再判断是单选还是多选，数据类型不同取值方式也不同
     if (labelInValue) {
-      var _value$map;
-      return selectMode ? value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
-        return item.label || item.text;
-      })) === null || _value$map === void 0 ? void 0 : _value$map.join(',') : (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.text);
+      return getShowLabelTextStr(kongValue);
     }
-    return selectMode ? value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
-      return getSelectValueText(item);
-    })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',') : getSelectValueText(value);
+    return getShowValueStr(kongValue);
   };
+  var isShouldShowStr = props.disabled && ctx;
   return /*#__PURE__*/React$1.createElement("div", {
     className: 'search_select'
   }, fieldComponent ? ( /*#__PURE__*/React$1.createElement("div", {
@@ -4576,7 +4604,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       (_fieldComponent$props = fieldComponent.props) === null || _fieldComponent$props === void 0 ? void 0 : (_fieldComponent$props2 = _fieldComponent$props.onClick) === null || _fieldComponent$props2 === void 0 ? void 0 : _fieldComponent$props2.call(_fieldComponent$props);
       showModal();
     }
-  }, fieldComponent)) : props.disabled && ctx ? ( /*#__PURE__*/React$1.createElement("div", {
+  }, fieldComponent)) : isShouldShowStr ? ( /*#__PURE__*/React$1.createElement("div", {
     title: getShowStr(),
     style: {
       overflow: 'hidden',
@@ -11783,9 +11811,30 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       })
     }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
+  var getShowStr = function getShowStr() {
+    var isMultiple = multiple || treeCheckable;
+    var kongValue = '无';
+    var parallelTreeData = parallelData(treeData, []);
+    var currentItem = getSelectItem(parallelTreeData, value); // 得到选中的数据项
+    if (isMultiple) {
+      return (currentItem === null || currentItem === void 0 ? void 0 : currentItem.map(function (i) {
+        return i === null || i === void 0 ? void 0 : i['title'];
+      }).join(',')) || kongValue;
+    }
+    return valueName || (currentItem === null || currentItem === void 0 ? void 0 : currentItem['title']) || kongValue;
+  };
+  var isShouldShowStr = (disabled || mode === 'view' || (ctx === null || ctx === void 0 ? void 0 : ctx.mode) === 'view') && ctx;
   return /*#__PURE__*/React$1.createElement("div", {
     className: 'tree_search_select'
-  }, /*#__PURE__*/React$1.createElement(TreeSelect, _objectSpread2(_objectSpread2({}, restProps), {}, {
+  }, isShouldShowStr ? ( /*#__PURE__*/React$1.createElement("div", {
+    title: getShowStr(),
+    style: {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap'
+    },
+    className: 'search_select_show'
+  }, getShowStr())) : ( /*#__PURE__*/React$1.createElement(TreeSelect, _objectSpread2(_objectSpread2({}, restProps), {}, {
     treeCheckable: treeCheckable,
     maxTagCount: maxTagCount,
     showSearch: showSearch,
@@ -11811,7 +11860,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return _getPopupContainer && _getPopupContainer(triggerNode) || document.body;
     }
-  })));
+  }))));
 };
 
 var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
@@ -15074,6 +15123,14 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
 var BsSulaQueryTable = (function (props) {
   var _props$expandable, _value$exportConfig7;
   var bsTableCode = (props === null || props === void 0 ? void 0 : props.tableCode) || window.location.hash; //设置列字段的唯一标识
+  // 获取 table columns中所有的 key  防止有的地方是 dataindex
+  var checkedList = 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 tableCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : bsTableCode;
     var config = localStorage.getItem(type) || '[]';
@@ -15086,34 +15143,64 @@ 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 = useRef(null);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     pagePath = _useState2[0],
     setPagePath = _useState2[1];
-  // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  var checkedList = 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 _useLocation = useLocation(),
     pathname = _useLocation.pathname,
     _useLocation$state = _useLocation.state,
@@ -15124,11 +15211,13 @@ var BsSulaQueryTable = (function (props) {
     setIsFnllScreen = _useState4[1];
   // @ts-nocheck
   var value = props;
+  var _props$fields = props.fields,
+    fields = _props$fields === void 0 ? [] : _props$fields;
   var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     showColumn = _useState6[0],
     setShowColumns = _useState6[1]; // 列字段
-  var originSearchFields = getInitialSearchFieldsInfo();
+  var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
   var _useState7 = useState(originSearchFields),
     _useState8 = _slicedToArray(_useState7, 2),
     showSearchFields = _useState8[0],
@@ -15221,44 +15310,11 @@ var BsSulaQueryTable = (function (props) {
     }
     var columns = props.columns;
     var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    var isStringArray = function isStringArray(value) {
-      return Array.isArray(value) && value.every(function (v) {
-        return typeof v === 'string';
-      });
-    };
-    var getColumnKey = function getColumnKey(column) {
-      if (isStringArray(column.key)) {
-        return JSON.stringify(column.key);
-      } else if (isStringArray(column.dataIndex)) {
-        return JSON.stringify(column.dataIndex);
-      } else {
-        return column.key || column.dataIndex || '';
-      }
-    };
     var parseWidth = function parseWidth(widthStr) {
       var parsedWidth = parseInt(widthStr.replace('px', ''));
       return isNaN(parsedWidth) ? 0 : parsedWidth;
     };
-    // 优化column key发生改变与原key不一致时产生的bug
-    var getShowColumns = function getShowColumns(columnConfig) {
-      var cols = [];
-      if (columnConfig.length) {
-        columnConfig.forEach(function (config, index) {
-          var hash = columns.reduce(function (prev, inneritem) {
-            prev[getColumnKey(inneritem)] = inneritem;
-            return prev;
-          }, {});
-          var inner = hash[getColumnKey(config)];
-          inner && cols.push(_objectSpread2(_objectSpread2({}, inner), config));
-        });
-      }
-      if (cols.length) return cols;
-      return columns.filter(function (column) {
-        var columnKey = getColumnKey(column);
-        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
-      });
-    };
-    var showColumns = getShowColumns(columnConfig);
+    var showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -15271,7 +15327,7 @@ var BsSulaQueryTable = (function (props) {
     });
     setShowColumns(_toConsumableArray(showColumns));
     var exportColumnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION, bsTableCodeExport);
-    var showExportColumns = getShowColumns(exportColumnConfig);
+    var showExportColumns = getSettingFieldOrColumn(exportColumnConfig, columns, 'columns');
     showExportColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -15289,14 +15345,7 @@ var BsSulaQueryTable = (function (props) {
     var _props$fields2 = props.fields,
       fields = _props$fields2 === void 0 ? [] : _props$fields2;
     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;
+    var showSearchFields = getSettingFieldOrColumn(searchFieldsConfig, fields, 'searchFields');
     setShowSearchFields(_toConsumableArray(showSearchFields));
   };
   //组件初始挂载

package/dist/index.js

@@ -2723,6 +2723,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       return data;
     };
     _this.resetData = function () {
+      var _customerColumnsMappi;
       var _this$props = _this.props,
         validDataUrl = _this$props.validDataUrl,
         validDataParams = _this$props.validDataParams,
@@ -2730,10 +2731,16 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         columns = _this$props.columns,
         isBrandAuth = _this$props.isBrandAuth,
         _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt;
+        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
+        customerColumnsMapping = _this$props.customerColumnsMapping;
       var resultData = _this.getData().filter(function (d) {
         return ___default['default'].compact(Object.values(d)).length;
       });
+      var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
+        return !(c === null || c === void 0 ? void 0 : c.name);
+      })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
+        return c.name;
+      }) : columns;
       // 处理业务参数
       var otherParams = {};
       if (isBrandAuth) {
@@ -2742,7 +2749,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         };
       }
       requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })).then(function (result) {
@@ -2757,12 +2764,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         var sheetData = luckysheet.getSheetData();
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
-          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+          var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
             return i === 'skuCode';
           });
-          if (_this.props.columns.find(function (i) {
+          if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
             return i === 'skuCode';
-          }) && item[changeVMIndex].v !== res[index].skuCode) {
+          })) && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }
@@ -3017,7 +3024,7 @@ var luckysheet$1;
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]);
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级'], ['stockBizTypeCode', ' 库存类型']]);
 // a little function to help us with reordering the result
 var reorder$1 = function reorder(list, startIndex, endIndex) {
   var result = Array.from(list);
@@ -3310,6 +3317,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       return data;
     };
     _this.resetData = function () {
+      var _customerColumnsMappi;
       var _this$props = _this.props,
         validDataUrl = _this$props.validDataUrl,
         validDataParams = _this$props.validDataParams,
@@ -3317,10 +3325,16 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         columns = _this$props.columns,
         isBrandAuth = _this$props.isBrandAuth,
         _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt;
+        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
+        customerColumnsMapping = _this$props.customerColumnsMapping;
       var resultData = _this.getData().filter(function (d) {
         return ___default['default'].compact(Object.values(d)).length;
       });
+      var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
+        return !(c === null || c === void 0 ? void 0 : c.name);
+      })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
+        return c.name;
+      }) : columns;
       // 处理业务参数
       var otherParams = {};
       if (isBrandAuth) {
@@ -3329,7 +3343,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         };
       }
       requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })).then(function (result) {
@@ -3344,12 +3358,12 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         var sheetData = luckysheet$1.getSheetData();
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
-          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+          var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
             return i === 'skuCode';
           });
-          if (_this.props.columns.find(function (i) {
+          if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
             return i === 'skuCode';
-          }) && item[changeVMIndex].v !== res[index].skuCode) {
+          })) && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }
@@ -4571,26 +4585,40 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
     }
   };
+  var getShowLabelTextStr = function getShowLabelTextStr(kongValue) {
+    if (selectMode) {
+      var _value$map;
+      return (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
+        return item.label || item.text || '';
+      })) === null || _value$map === void 0 ? void 0 : _value$map.join(',')) || kongValue;
+    }
+    return (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.text) || kongValue;
+  };
   var getSelectValueText = function getSelectValueText(v) {
     var _filter, _filter$;
     return ((_filter = (items || []).filter(function (item) {
       return item.value === v;
     })) === null || _filter === void 0 ? void 0 : (_filter$ = _filter[0]) === null || _filter$ === void 0 ? void 0 : _filter$.text) || v || '';
   };
+  var getShowValueStr = function getShowValueStr(kongValue) {
+    if (selectMode) {
+      var _value$map2;
+      return (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
+        return getSelectValueText(item);
+      })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',')) || kongValue;
+    }
+    return getSelectValueText(value) || kongValue;
+  };
   var getShowStr = function getShowStr() {
-    var _value$map2;
+    var kongValue = '无';
     // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
     // 再判断是单选还是多选，数据类型不同取值方式也不同
     if (labelInValue) {
-      var _value$map;
-      return selectMode ? value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
-        return item.label || item.text;
-      })) === null || _value$map === void 0 ? void 0 : _value$map.join(',') : (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.text);
+      return getShowLabelTextStr(kongValue);
     }
-    return selectMode ? value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
-      return getSelectValueText(item);
-    })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',') : getSelectValueText(value);
+    return getShowValueStr(kongValue);
   };
+  var isShouldShowStr = props.disabled && ctx;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'search_select'
   }, fieldComponent ? ( /*#__PURE__*/React__default['default'].createElement("div", {
@@ -4599,7 +4627,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       (_fieldComponent$props = fieldComponent.props) === null || _fieldComponent$props === void 0 ? void 0 : (_fieldComponent$props2 = _fieldComponent$props.onClick) === null || _fieldComponent$props2 === void 0 ? void 0 : _fieldComponent$props2.call(_fieldComponent$props);
       showModal();
     }
-  }, fieldComponent)) : props.disabled && ctx ? ( /*#__PURE__*/React__default['default'].createElement("div", {
+  }, fieldComponent)) : isShouldShowStr ? ( /*#__PURE__*/React__default['default'].createElement("div", {
     title: getShowStr(),
     style: {
       overflow: 'hidden',
@@ -11806,9 +11834,30 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
       })
     }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
+  var getShowStr = function getShowStr() {
+    var isMultiple = multiple || treeCheckable;
+    var kongValue = '无';
+    var parallelTreeData = parallelData(treeData, []);
+    var currentItem = getSelectItem(parallelTreeData, value); // 得到选中的数据项
+    if (isMultiple) {
+      return (currentItem === null || currentItem === void 0 ? void 0 : currentItem.map(function (i) {
+        return i === null || i === void 0 ? void 0 : i['title'];
+      }).join(',')) || kongValue;
+    }
+    return valueName || (currentItem === null || currentItem === void 0 ? void 0 : currentItem['title']) || kongValue;
+  };
+  var isShouldShowStr = (disabled || mode === 'view' || (ctx === null || ctx === void 0 ? void 0 : ctx.mode) === 'view') && ctx;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'tree_search_select'
-  }, /*#__PURE__*/React__default['default'].createElement(antd.TreeSelect, _objectSpread2(_objectSpread2({}, restProps), {}, {
+  }, isShouldShowStr ? ( /*#__PURE__*/React__default['default'].createElement("div", {
+    title: getShowStr(),
+    style: {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap'
+    },
+    className: 'search_select_show'
+  }, getShowStr())) : ( /*#__PURE__*/React__default['default'].createElement(antd.TreeSelect, _objectSpread2(_objectSpread2({}, restProps), {}, {
     treeCheckable: treeCheckable,
     maxTagCount: maxTagCount,
     showSearch: showSearch,
@@ -11834,7 +11883,7 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return _getPopupContainer && _getPopupContainer(triggerNode) || document.body;
     }
-  })));
+  }))));
 };
 
 var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
@@ -15097,6 +15146,14 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
 var BsSulaQueryTable = (function (props) {
   var _props$expandable, _value$exportConfig7;
   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 tableCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : bsTableCode;
     var config = localStorage.getItem(type) || '[]';
@@ -15109,34 +15166,64 @@ 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 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 _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname,
     _useLocation$state = _useLocation.state,
@@ -15147,11 +15234,13 @@ var BsSulaQueryTable = (function (props) {
     setIsFnllScreen = _useState4[1];
   // @ts-nocheck
   var value = props;
+  var _props$fields = props.fields,
+    fields = _props$fields === void 0 ? [] : _props$fields;
   var _useState5 = React$1.useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     showColumn = _useState6[0],
     setShowColumns = _useState6[1]; // 列字段
-  var originSearchFields = getInitialSearchFieldsInfo();
+  var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
   var _useState7 = React$1.useState(originSearchFields),
     _useState8 = _slicedToArray(_useState7, 2),
     showSearchFields = _useState8[0],
@@ -15244,44 +15333,11 @@ var BsSulaQueryTable = (function (props) {
     }
     var columns = props.columns;
     var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    var isStringArray = function isStringArray(value) {
-      return Array.isArray(value) && value.every(function (v) {
-        return typeof v === 'string';
-      });
-    };
-    var getColumnKey = function getColumnKey(column) {
-      if (isStringArray(column.key)) {
-        return JSON.stringify(column.key);
-      } else if (isStringArray(column.dataIndex)) {
-        return JSON.stringify(column.dataIndex);
-      } else {
-        return column.key || column.dataIndex || '';
-      }
-    };
     var parseWidth = function parseWidth(widthStr) {
       var parsedWidth = parseInt(widthStr.replace('px', ''));
       return isNaN(parsedWidth) ? 0 : parsedWidth;
     };
-    // 优化column key发生改变与原key不一致时产生的bug
-    var getShowColumns = function getShowColumns(columnConfig) {
-      var cols = [];
-      if (columnConfig.length) {
-        columnConfig.forEach(function (config, index) {
-          var hash = columns.reduce(function (prev, inneritem) {
-            prev[getColumnKey(inneritem)] = inneritem;
-            return prev;
-          }, {});
-          var inner = hash[getColumnKey(config)];
-          inner && cols.push(_objectSpread2(_objectSpread2({}, inner), config));
-        });
-      }
-      if (cols.length) return cols;
-      return columns.filter(function (column) {
-        var columnKey = getColumnKey(column);
-        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
-      });
-    };
-    var showColumns = getShowColumns(columnConfig);
+    var showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -15294,7 +15350,7 @@ var BsSulaQueryTable = (function (props) {
     });
     setShowColumns(_toConsumableArray(showColumns));
     var exportColumnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION, bsTableCodeExport);
-    var showExportColumns = getShowColumns(exportColumnConfig);
+    var showExportColumns = getSettingFieldOrColumn(exportColumnConfig, columns, 'columns');
     showExportColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
       handleBssulaColumnsSpecialParams(item);
@@ -15312,14 +15368,7 @@ var BsSulaQueryTable = (function (props) {
     var _props$fields2 = props.fields,
       fields = _props$fields2 === void 0 ? [] : _props$fields2;
     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;
+    var showSearchFields = getSettingFieldOrColumn(searchFieldsConfig, fields, 'searchFields');
     setShowSearchFields(_toConsumableArray(showSearchFields));
   };
   //组件初始挂载

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -32,6 +32,12 @@ interface Column {
   onHeaderCell?: (column: Column) => any; // 仅作示例，具体类型根据实际情况定义
 }
 
+interface Field {
+  name: string;
+  label: string;
+  field: any;
+}
+
 const MemoQueryTable = React.memo(QueryTable);
 const { Text } = Typography;
 
@@ -55,6 +61,20 @@ const ResizeableTitle = (props) => {
 
 export default (props: any) => {
   const bsTableCode = props?.tableCode || window.location.hash; //设置列字段的唯一标识
+
+   // 获取 table columns中所有的 key  防止有的地方是 dataindex
+   const checkedList = useMemo(
+    () =>
+      props.columns
+        .filter((col: any) => !col.hidden)
+        .map((d: any) =>
+          Array.isArray(d.key || d.dataIndex)
+            ? JSON.stringify(d.key || d.dataIndex)
+            : d.key || d.dataIndex,
+        ),
+    [props.columns],
+  );
+  
   const getConfigFromlocalstorage = (type: string, tableCode:string = bsTableCode) => {
     let config = localStorage.getItem(type) || '[]';
     let configArray = JSON.parse(config);
@@ -67,47 +87,75 @@ export default (props: any) => {
     }
     return [];
   };
-  const getInitialSearchFieldsInfo = () => {
-    //获取搜索字段的缓存配置
-    const { fields = [] } = props;
-    let searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
-    let showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map((item) => {
-      let inner = fields.filter(
-        (inneritem) => {
-          let innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-          let itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-          return innerKey && innerKey === itemKey;
-        }
-      )[0];
 
-      return {
-        ...inner,
-        ...item,
-      };
-    }) : fields;
-    return [...showSearchFields]
+  /**
+ * 根据保存的配置和原始配置，获取设置的字段或列。
+ * @param savedConfig 保存的配置数组，可能包含字段或列的配置。
+ * @param originConfig 原始配置数组，包含完整的字段或列信息。
+ * @param type 字段或列的类型，用于确定配置的属性。
+ * @returns 返回根据保存的配置处理后的字段或列数组，如果未保存任何配置，则返回原始配置。
+ */
+const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
+  /**
+   * 判断值是否为字符串数组。
+   * @param value 待判断的值。
+   * @returns 如果值是字符串数组，则返回true，否则返回false。
+   */
+  const isStringArray = (value: any): value is string[] => {
+    return Array.isArray(value) && value.every(v => typeof v === 'string');
+  }
+
+  /**
+   * 根据配置项和类型，获取配置项的键。
+   * @param config 配置项，可以是字段或列。
+   * @param type 配置项的类型。
+   * @returns 返回配置项的键，如果无法获取，则返回空字符串。
+   */
+  const getItemKey = (config: Column | Field, type: string): string => {
+    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 '';
+  }
+
+  const newConfig = [];
+
+  if (savedConfig.length) {
+    const hash = originConfig.reduce((prev, inneritem) => {
+      prev[getItemKey(inneritem, type)] = inneritem;
+      return prev;
+    }, {} as { [key: string]: Column | Field });
+
+    savedConfig.forEach((config, index) => {
+      let inner = hash[getItemKey(config, type)];
+      inner && newConfig.push({ ...inner, ...config });
+    })
   }
+
+  if (newConfig.length) return newConfig;
+
+  if (type === 'columns') {
+    return originConfig.filter(column => {
+      const columnKey = getItemKey(column, type);
+      return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
+    });
+  }
+
+  return [...originConfig];
+}
   const refs = useRef(null);
   const [pagePath, setPagePath] = useState('');
-  // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  const checkedList = useMemo(
-    () =>
-      props.columns
-        .filter((col: any) => !col.hidden)
-        .map((d: any) =>
-          Array.isArray(d.key || d.dataIndex)
-            ? JSON.stringify(d.key || d.dataIndex)
-            : d.key || d.dataIndex,
-        ),
-    [props.columns],
-  );
 
   const { pathname, state = {} } = useLocation();
   const [isFullScreen, setIsFnllScreen]: any = useState(false);
   // @ts-nocheck
   const value = props;
+  const { fields = [] } = props;
   const [showColumn, setShowColumns] = useState([]); // 列字段
-  const originSearchFields = getInitialSearchFieldsInfo();
+  const originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
   const [showSearchFields, setShowSearchFields] = useState(originSearchFields); //搜索项字段
   const [showExportColumn, setShowExportColumns] = useState([]); // 导出列字段
 
@@ -117,6 +165,7 @@ export default (props: any) => {
   const exportTableRef = useRef<any>(null);
 
   const bsTableCodeExport = `${bsTableCode}___Export`; //设置导出列字段的唯一标识
+
   // 获取table高度
   const getTableHeight = () => {
     setTimeout(() => {
@@ -217,49 +266,12 @@ export default (props: any) => {
     let columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
 
 
-    const isStringArray = (value: any): value is string[] => {
-      return Array.isArray(value) && value.every(v => typeof v === 'string');
-    }
-
-    const getColumnKey = (column: Column): string => {
-      if (isStringArray(column.key)) {
-        return JSON.stringify(column.key);
-      } else if (isStringArray(column.dataIndex)) {
-        return JSON.stringify(column.dataIndex);
-      } else {
-        return column.key || column.dataIndex || '';
-      }
-    }
-
     const parseWidth = (widthStr: string): number => {
       const parsedWidth = parseInt(widthStr.replace('px', ''));
       return isNaN(parsedWidth) ? 0 : parsedWidth;
     }
 
-    // 优化column key发生改变与原key不一致时产生的bug
-    const getShowColumns = (columnConfig: Array<Column>) => {
-      const cols = [];
-      if (columnConfig.length) {
-        columnConfig.forEach((config, index) => {
-          const hash = columns.reduce((prev, inneritem) => {
-            prev[getColumnKey(inneritem)] = inneritem;
-            return prev;
-          }, {} as { [key: string]: Column });
-  
-          let inner = hash[getColumnKey(config)];
-          inner && cols.push({ ...inner, ...config });
-        })
-      }
-
-      if (cols.length) return cols;
-
-      return columns.filter(column => {
-        const columnKey = getColumnKey(column);
-        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
-      });
-    }
-
-    let showColumns = getShowColumns(columnConfig);
+    let showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
@@ -278,7 +290,7 @@ export default (props: any) => {
       ENUM.BROWSER_CACHE.COLUMN_CONDITION,
       bsTableCodeExport,
     );
-    let showExportColumns = getShowColumns(exportColumnConfig);
+    let showExportColumns = getSettingFieldOrColumn(exportColumnConfig, columns, 'columns');
 
     showExportColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
@@ -301,24 +313,7 @@ export default (props: any) => {
     let searchFieldsConfig = getConfigFromlocalstorage(
       ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION,
     );
-    let showSearchFields = searchFieldsConfig.length
-      ? searchFieldsConfig.map((item) => {
-          let inner = fields.filter((inneritem) => {
-            let innerKey = Array.isArray(inneritem.name)
-              ? JSON.stringify(inneritem.name)
-              : inneritem.name;
-            let itemKey = Array.isArray(item.name)
-              ? JSON.stringify(item.name)
-              : item.name;
-            return innerKey && innerKey === itemKey;
-          })[0];
-
-          return {
-            ...inner,
-            ...item,
-          };
-        })
-      : fields;
+    const showSearchFields = getSettingFieldOrColumn(searchFieldsConfig, fields, 'searchFields');
     setShowSearchFields([...showSearchFields]);
   };
 

package/src/components/Business/TreeSearchSelect/index.md

@@ -133,6 +133,27 @@ import React, { useState } from 'react';
 import { BusinessTreeSearchSelect } from '../../../index';
 
 export default () => {
+  // 'LJCaxiao01', ['LJCaxiao01', 'Store061201'],
+  //   {
+  //     "label": "上海七宝万科安正家居体验店",
+  //     "value": "Store061201",
+  //     "disabled": false,
+  //     "key": "Store061201"
+  // },
+  // [
+  //     {
+  //         "label": "阿宵的逻辑仓02",
+  //         "value": "LJCaxiao01",
+  //         "disabled": false,
+  //         "key": "LJCaxiao01"
+  //     },
+  //     {
+  //         "label": "上海七宝万科安正家居体验店",
+  //         "value": "Store061201",
+  //         "disabled": false,
+  //         "key": "Store061201"
+  //     }
+  // ]
 
   const [value, setValue] = useState();
   
@@ -140,7 +161,12 @@ export default () => {
     mode: 'create',
     value,
     isChoose: false, // 控制是否父节点可选中，默认不可选中
+    // ctx: {},
+    // disabled: true,
+    // treeCheckable: true,
+    // labelInValue: true,
     onChange: (v) => {
+      // console.log(v,'----v')
       setValue(v)
     },
     businessType: 'settle-organization'

package/src/components/Functional/DataImport/index.tsx

@@ -65,6 +65,7 @@ const mapping = new Map([
   ['assignQuantity', '按指定数量'],
   ['retainQuantity', ' 按保留数量'],
   ['priority', ' 优先级'],
+  ['stockBizTypeCode', ' 库存类型'],
 ]);
 
 // for dnd
@@ -420,12 +421,12 @@ class DataImport extends React.Component {
   };
 
   resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
+    const resultColumns = customerColumnsMapping?.length? customerColumnsMapping?.filter((c: any) => !c?.name)?.map((c: any) => c.name) : columns
 
-    
     // 处理业务参数
     let otherParams={}
     if(isBrandAuth){
@@ -436,7 +437,7 @@ class DataImport extends React.Component {
       .post(validDataUrl, {
         ...otherParams,
         ...validDataParams,
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })
@@ -455,8 +456,8 @@ class DataImport extends React.Component {
         sheetData.map((item, index) => {
           if (!res[index]) return item;
 
-          const changeVMIndex = this.props.columns.findIndex(i => i === 'skuCode');
-          if(this.props.columns.find(i => i === 'skuCode') && item[changeVMIndex].v !== res[index].skuCode) {
+          const changeVMIndex = resultColumns?.findIndex(i => i === 'skuCode');
+          if(resultColumns?.find(i => i === 'skuCode') && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }

package/src/components/Functional/DataValidation/index.tsx

@@ -421,10 +421,11 @@ class DataValidation extends React.Component {
   };
 
   resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
+    const resultColumns = customerColumnsMapping?.length? customerColumnsMapping?.filter((c: any) => !c?.name)?.map((c: any) => c.name) : columns
 
     // 处理业务参数
     let otherParams={}
@@ -436,7 +437,7 @@ class DataValidation extends React.Component {
       .post(validDataUrl, {
         ...otherParams,
         ...validDataParams,
-        columns: columns,
+        columns: resultColumns,
         data: resultData,
         checkStockNum: isCheckStockNum
       })
@@ -455,8 +456,8 @@ class DataValidation extends React.Component {
         sheetData.map((item, index) => {
           if (!res[index]) return item;
 
-          const changeVMIndex = this.props.columns.findIndex(i => i === 'skuCode');
-          if(this.props.columns.find(i => i === 'skuCode') && item[changeVMIndex].v !== res[index].skuCode) {
+          const changeVMIndex = resultColumns?.findIndex(i => i === 'skuCode');
+          if(resultColumns?.find(i => i === 'skuCode') && item[changeVMIndex].v !== res[index].skuCode) {
             item[changeVMIndex].v = res[index].skuCode;
             item[changeVMIndex].m = res[index].skuCode;
           }

package/src/components/Functional/SearchSelect/index.tsx

@@ -776,18 +776,32 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     }
   };
 
+  const getShowLabelTextStr = (kongValue): string => {
+    if (selectMode) {
+      return value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
+    }
+    return (value?.label || value?.text || kongValue) as string;
+  };
   const getSelectValueText = (v: any) => {
     return (items || []).filter(item => item.value === v)?.[0]?.text || v || '';
   }
+  const getShowValueStr = (kongValue): string => {
+    if (selectMode) {
+      return value?.map(item => getSelectValueText(item))?.join(',') || kongValue;
+    }
+    return (getSelectValueText(value) || kongValue) as string;
+  }
   const getShowStr = () => {
+    const kongValue = '无'
     // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
     // 再判断是单选还是多选，数据类型不同取值方式也不同
-    if(labelInValue) {
-      return selectMode ? value?.map(item => item.label || item.text)?.join(',') : (value?.label|| value?.text)
+    if (labelInValue) {
+      return getShowLabelTextStr(kongValue);
     }
-    return selectMode ? value?.map(item => getSelectValueText(item))?.join(',') : getSelectValueText(value);
+    return getShowValueStr(kongValue);
   }
 
+  const isShouldShowStr = props.disabled && ctx
   return (
     <div className={'search_select'}>
       {fieldComponent ? (
@@ -800,7 +814,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           {fieldComponent}
         </div>
       ) : (
-        props.disabled && ctx ?
+        isShouldShowStr ?
         (<div title={getShowStr()} style={{overflow:'hidden',textOverflow:'ellipsis',whiteSpace:'nowrap'}} className={'search_select_show'}>
           {getShowStr()}
         </div>) :

package/src/components/Functional/TreeSearchSelect/index.tsx

@@ -174,31 +174,49 @@ const TreeSearchSelect = (props: any) => {
     )
   }
 
+  const getShowStr = () => {
+    const isMultiple = multiple || treeCheckable 
+    const kongValue = '无';
+    const parallelTreeData = parallelData(treeData,[])
+    const currentItem = getSelectItem(parallelTreeData,value); // 得到选中的数据项
+    if(isMultiple) {
+      return currentItem?.map((i: any) => i?.['title']).join(',') || kongValue
+    }
+    return valueName || currentItem?.['title'] || kongValue
+  }
+
+  const isShouldShowStr = (disabled || mode==='view' || ctx?.mode === 'view') && ctx
   return (
     <div className={'tree_search_select'}>
-      <TreeSelect
-        {...restProps}
-        treeCheckable={treeCheckable}
-        maxTagCount={maxTagCount}
-        showSearch={showSearch}
-        style={style}
-        value={value}
-        dropdownStyle={{ maxHeight: 400, maxWidth: 100, overflow: 'auto' }}
-        treeData={treeData}
-        placeholder={placeholder}
-        allowClear={allowClear}
-        labelInValue={labelInValue}
-        showArrow={showArrow}
-        showCheckedStrategy={showCheckedStrategy}
-        treeNodeFilterProp={'title'}
-        treeDefaultExpandAll
-        multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
-        maxTagPlaceholder={maxTagPlaceholder}
-        onChange={handleChange}
-        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
-        getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || document.body}
-      >
-      </TreeSelect>
+      {isShouldShowStr ? (
+        <div title={getShowStr()} style={{overflow:'hidden',textOverflow:'ellipsis',whiteSpace:'nowrap'}} className={'search_select_show'}>
+          {getShowStr()}
+        </div>
+      ): (
+        <TreeSelect
+          {...restProps}
+          treeCheckable={treeCheckable}
+          maxTagCount={maxTagCount}
+          showSearch={showSearch}
+          style={style}
+          value={value}
+          dropdownStyle={{ maxHeight: 400, maxWidth: 100, overflow: 'auto' }}
+          treeData={treeData}
+          placeholder={placeholder}
+          allowClear={allowClear}
+          labelInValue={labelInValue}
+          showArrow={showArrow}
+          showCheckedStrategy={showCheckedStrategy}
+          treeNodeFilterProp={'title'}
+          treeDefaultExpandAll
+          multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
+          maxTagPlaceholder={maxTagPlaceholder}
+          onChange={handleChange}
+          disabled={disabled || mode==='view' || ctx?.mode === 'view'}
+          getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || document.body}
+        >
+        </TreeSelect>
+      )}
     </div>
   );
 };