@bit-sun/business-component 4.0.13-alpha.33 → 4.0.13-alpha.35

package/dist/components/Functional/DataValidation/index.d.ts

@@ -5,16 +5,22 @@ declare class DataValidation extends React.Component {
     onDragEnd(result: any): void;
     getCount: () => {
         total: any;
+        totalQuantity: any;
+        totalSuccessQuantity: any;
+        totalErrorQuantity: any;
         error: any;
+        success: any;
     };
     setConfig: (data: any) => {
         container: string;
-        showtoolbar: boolean;
         hook: {
             columnTitleCellRenderBefore: (columnAbc: any, postion: any, ctx: any) => void;
             cellRenderBefore: (cell: any, postion: any, sheetFile: any, ctx: any) => void;
             cellAllRenderBefore: (data: any, sheetFile: any, ctx: any) => void;
         };
+        showtoolbarConfig: {
+            sortAndFilter: boolean;
+        };
         data: {
             name: string;
             color: string;
@@ -132,6 +138,9 @@ declare class DataValidation extends React.Component {
         failData: any;
     };
     getData: () => any;
+    naturalCompare: (a: any, b: any) => any;
+    customSort: (a: any, b: any) => any;
+    sortData: (sorterKey: string) => void;
     resetData: () => void;
     filterData: (type: string) => void;
     toggleData: () => void;
@@ -139,6 +148,7 @@ declare class DataValidation extends React.Component {
     errorChange: (e: any) => void;
     menuList: React.JSX.Element;
     leftMenu: React.JSX.Element;
+    getSortList: () => React.JSX.Element;
     getSheetMap: () => {};
     importExcelToLuckySheet: (resultData: any) => void;
     render(): React.JSX.Element;

package/dist/index.esm.js

@@ -2696,11 +2696,34 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     _this = _callSuper(this, DataValidation, [props]);
     // this.props.onRef(this);
     _this.getCount = function () {
-      var resultData = _this.state.resultData;
+      var _this$state$resultDat = _this.state.resultData,
+        resultData = _this$state$resultDat === void 0 ? [] : _this$state$resultDat;
+      var totalQuantity = resultData.reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
+      var totalSuccessQuantity = resultData.filter(function (item) {
+        return item.flag;
+      }).reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
+      var totalErrorQuantity = resultData.filter(function (item) {
+        return !item.flag;
+      }).reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
       return {
         total: resultData.length,
+        totalQuantity: totalQuantity,
+        totalSuccessQuantity: totalSuccessQuantity,
+        totalErrorQuantity: totalErrorQuantity,
         error: resultData.filter(function (item) {
           return !item.flag;
+        }).length,
+        success: resultData.filter(function (item) {
+          return item.flag;
         }).length
       };
     };
@@ -2709,7 +2732,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var notValid = _this.props.notValid;
       return {
         container: 'luckysheet',
-        showtoolbar: false,
+        // showtoolbar: false,
         hook: {
           columnTitleCellRenderBefore: function columnTitleCellRenderBefore(columnAbc, postion, ctx) {
             if (columnAbc.name) {
@@ -2746,17 +2769,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             // console.info(data,sheetFile,ctx)
           }
         },
-        // showtoolbarConfig: {
-        //   undoRedo: true, //撤销重做，注意撤消重做是两个按钮，由这一个配置决定显示还是隐藏
-        //   paintFormat: false, //格式刷
-        //   currencyFormat: false, //货币格式
-        //   percentageFormat: false, //百分比格式
-        //   numberDecrease: false, // '减少小数位数'
-        //   numberIncrease: false, // '增加小数位数
-        //   moreFormats: false, // '更多格式'
-        //   font: true, // '字体'
-        //   fontSize: true, // '字号大小'
-        // },
+        showtoolbarConfig: {
+          sortAndFilter: true
+        },
         data: [_defineProperty(_defineProperty({
           name: 'Cell',
           color: '',
@@ -2880,7 +2895,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         showsheetbar: false,
         optionstate: false,
         showstatisticBarConfig: {
-          count: false,
+          count: true,
           view: false,
           zoom: false // 缩放
         },
@@ -2935,6 +2950,44 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         return _.compact(Object.values(d)).length;
       });
     };
+    _this.naturalCompare = function (a, b) {
+      var checkNumber = function checkNumber(value) {
+        return /^[-+]?(\d+\.?\d*|\.\d+)([eE][-+]?\d+)?$/.test(value.trim());
+      };
+      if (checkNumber(a) && checkNumber(b)) {
+        return Number(a) - Number(b);
+      }
+      // 优先处理 "通过" 的情况
+      if (a === "通过" && b !== "通过") return -1;
+      if (b === "通过" && a !== "通过") return 1;
+      return a.localeCompare(b);
+    };
+    _this.customSort = function (a, b) {
+      // 处理空值
+      var aEmpty = !a;
+      var bEmpty = !b;
+      if (aEmpty && bEmpty) return 0;
+      if (aEmpty) return 1; // a空，排后面
+      if (bEmpty) return -1; // b空，a排前面
+      return _this.naturalCompare(a, b);
+    };
+    _this.sortData = function (sorterKey) {
+      var sheetData = luckysheet.getSheetData();
+      var newData = JSON.parse(JSON.stringify(sheetData)).sort(function (cur, prev) {
+        var _cur$cellIndex, _prev$cellIndex;
+        var cellIndex = itemsTemp.findIndex(function (item) {
+          return item.code === sorterKey;
+        });
+        if (sorterKey === 'checkresult') {
+          cellIndex = itemsTemp.length;
+        }
+        return _this.customSort((_cur$cellIndex = cur[cellIndex]) === null || _cur$cellIndex === void 0 ? void 0 : _cur$cellIndex.v, (_prev$cellIndex = prev[cellIndex]) === null || _prev$cellIndex === void 0 ? void 0 : _prev$cellIndex.v);
+      });
+      luckysheet.create(_this.setConfig(luckysheet.transToCellData(newData)));
+      _this.setState({
+        data: luckysheet.transToCellData(newData)
+      });
+    };
     _this.resetData = function () {
       var _customerColumnsMappi;
       var _this$props = _this.props,
@@ -3117,10 +3170,43 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         });
       }), provided.placeholder);
     }))));
+    _this.getSortList = function () {
+      var _this$props2, _this$props2$customer;
+      var sortList = [];
+      if ((_this$props2 = _this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$customer = _this$props2.customerColumnsMapping) === null || _this$props2$customer === void 0 ? void 0 : _this$props2$customer.length) {
+        var _this$props3, _this$props3$customer;
+        sortList = ((_this$props3 = _this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$customer = _this$props3.customerColumnsMapping) === null || _this$props3$customer === void 0 ? void 0 : _this$props3$customer.map(function (item, index) {
+          return createItem('item-0', index, item.title, item.name, _this.format);
+        })) || [];
+      } else {
+        var _this$props4, _this$props4$columns;
+        sortList = ((_this$props4 = _this.props) === null || _this$props4 === void 0 ? void 0 : (_this$props4$columns = _this$props4.columns) === null || _this$props4$columns === void 0 ? void 0 : _this$props4$columns.map(function (item, index) {
+          if (!mapping.get(item)) throw Error("".concat(item, " is not in DataValidation component, please fix this error"));
+          return createItem('item-0', index, mapping.get(item), item, _this.format);
+        })) || [];
+      }
+      return /*#__PURE__*/React$1.createElement(Menu, null, (sortList || []).map(function (item, index) {
+        return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(Menu.Item, {
+          key: index,
+          className: "sheet_table-menu_item_text"
+        }, /*#__PURE__*/React$1.createElement("a", {
+          onClick: function onClick() {
+            return _this.sortData(item.code);
+          }
+        }, item.content)), /*#__PURE__*/React$1.createElement(Menu.Divider, null));
+      }), /*#__PURE__*/React$1.createElement(Menu.Item, {
+        key: "checkresult",
+        className: "sheet_table-menu_item_text"
+      }, /*#__PURE__*/React$1.createElement("a", {
+        onClick: function onClick() {
+          return _this.sortData('checkresult');
+        }
+      }, "\u6821\u9A8C\u7ED3\u679C")));
+    };
     _this.getSheetMap = function () {
-      var _this$props2 = _this.props,
-        customerColumnsMapping = _this$props2.customerColumnsMapping,
-        columns = _this$props2.columns;
+      var _this$props5 = _this.props,
+        customerColumnsMapping = _this$props5.customerColumnsMapping,
+        columns = _this$props5.columns;
       var sheetData = customerColumnsMapping || columns.map(function (s) {
         return {
           title: mapping.get(s),
@@ -3211,12 +3297,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var errorListCheck = this.state.errorListCheck;
-      var _this$props3 = this.props,
-        title = _this$props3.title,
-        notValid = _this$props3.notValid,
-        notExcelImport = _this$props3.notExcelImport,
-        excelImportConfig = _this$props3.excelImportConfig,
-        getTemplate = _this$props3.getTemplate;
+      var _this$props6 = this.props,
+        title = _this$props6.title,
+        notValid = _this$props6.notValid,
+        notExcelImport = _this$props6.notExcelImport,
+        excelImportConfig = _this$props6.excelImportConfig,
+        getTemplate = _this$props6.getTemplate;
       var _ref5 = excelImportConfig || {},
         size = _ref5.size,
         accept = _ref5.accept,
@@ -3272,6 +3358,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
+      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React$1.createElement(Dropdown, {
@@ -3290,7 +3377,11 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         trigger: ['click'],
         overlay: this.menuList,
         placement: "bottomRight"
-      }, /*#__PURE__*/React$1.createElement(Button, null, "\u6E05\u7A7A", /*#__PURE__*/React$1.createElement(DownOutlined, null))), !notValid && /*#__PURE__*/React$1.createElement(Button, {
+      }, /*#__PURE__*/React$1.createElement(Button, null, "\u6E05\u7A7A", /*#__PURE__*/React$1.createElement(DownOutlined, null))), /*#__PURE__*/React$1.createElement(Dropdown, {
+        trigger: ['click'],
+        overlay: this.getSortList(),
+        placement: "bottomRight"
+      }, /*#__PURE__*/React$1.createElement(Button, null, "\u6392\u5E8F", /*#__PURE__*/React$1.createElement(DownOutlined, null))), !notValid && /*#__PURE__*/React$1.createElement(Button, {
         type: "primary",
         onClick: this.resetData
       }, "\u8BC6\u522B"))), /*#__PURE__*/React$1.createElement("div", {
@@ -3301,11 +3392,31 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React$1.createElement("div", {
         id: "luckysheet",
         style: luckyCss
-      })), !this.props.notValid && /*#__PURE__*/React$1.createElement("div", {
+      })), !this.props.notValid && !!totalSummary.total && /*#__PURE__*/React$1.createElement("div", {
         className: "sheet_table_footer"
       }, /*#__PURE__*/React$1.createElement("span", {
         className: "sheet_table_footer_l"
-      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E", !notValid && ", \u5176\u4E2D\u9519\u8BEF ".concat(totalSummary.error, " \u9879")), !notValid && /*#__PURE__*/React$1.createElement(Space, {
+      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E\uFF1A", /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          color: 'green',
+          marginLeft: '5px'
+        }
+      }, " \u6210\u529F\u6761\u6570\uFF1A"), totalSummary.success, /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          color: 'green',
+          marginLeft: '5px'
+        }
+      }, " \u6210\u529F\u6570\u91CF\uFF1A"), totalSummary.totalSuccessQuantity || 0, /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          color: 'red',
+          marginLeft: '5px'
+        }
+      }, " \u5931\u8D25\u6761\u6570\uFF1A"), totalSummary.error || 0, /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          color: 'red',
+          marginLeft: '5px'
+        }
+      }, " \u5931\u8D25\u6570\u91CF\uFF1A"), totalSummary.totalErrorQuantity || 0), !notValid && /*#__PURE__*/React$1.createElement(Space, {
         className: "sheet_table_footer_r"
       }, /*#__PURE__*/React$1.createElement(Checkbox, {
         checked: errorListCheck,
@@ -4267,13 +4378,16 @@ var handleParams = function handleParams(params) {
         });
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
+        var _ref3, _ref3$trim, _key$split, _value, _value$trim;
         var name = '',
-          value = element['value'];
+          value = (_ref3 = (element === null || element === void 0 ? void 0 : element['value']) || element) === null || _ref3 === void 0 ? void 0 : (_ref3$trim = _ref3.trim) === null || _ref3$trim === void 0 ? void 0 : _ref3$trim.call(_ref3);
+        var searchKey = (element === null || element === void 0 ? void 0 : element['name']) || (key === null || key === void 0 ? void 0 : (_key$split = key.split('*multiInput')) === null || _key$split === void 0 ? void 0 : _key$split[0]);
         if (value.indexOf(',') >= 0) {
-          name = "qp-".concat(element['name'], "-in");
+          name = "qp-".concat(searchKey, "-in");
         } else {
-          name = "qp-".concat(element['name'], "-like");
+          name = "qp-".concat(searchKey, "-like");
         }
+        value = (_value = value) === null || _value === void 0 ? void 0 : (_value$trim = _value.trim) === null || _value$trim === void 0 ? void 0 : _value$trim.call(_value);
         params[name] = value;
         delete params[key];
       } else if (element && key.indexOf('*') >= 0) {
@@ -4462,11 +4576,11 @@ var LightHeightOption = function LightHeightOption(props) {
     title: text
   }, renderContent);
 };
-var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
-  var selectProps = _ref3.selectProps,
-    onChange = _ref3.onChange,
-    value = _ref3.value,
-    setIsMaxTagsOpen = _ref3.setIsMaxTagsOpen;
+var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
+  var selectProps = _ref4.selectProps,
+    onChange = _ref4.onChange,
+    value = _ref4.value,
+    setIsMaxTagsOpen = _ref4.setIsMaxTagsOpen;
   var labelInValue = selectProps.labelInValue;
   var _onClose = function onClose(e, item) {
     e.preventDefault();
@@ -4520,11 +4634,11 @@ var handleTableColumns = function handleTableColumns(tableColumns) {
 };
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
-var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
-  var kongValue = _ref4.kongValue,
-    selectMode = _ref4.selectMode,
-    value = _ref4.value,
-    items = _ref4.items;
+var getShowLabelTextStr = function getShowLabelTextStr(_ref5) {
+  var kongValue = _ref5.kongValue,
+    selectMode = _ref5.selectMode,
+    value = _ref5.value,
+    items = _ref5.items;
   if (selectMode) {
     var _value$map;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
@@ -4539,11 +4653,11 @@ var getSelectValueText = function getSelectValueText(v, items) {
     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(_ref5) {
-  var kongValue = _ref5.kongValue,
-    selectMode = _ref5.selectMode,
-    value = _ref5.value,
-    items = _ref5.items;
+var getShowValueStr = function getShowValueStr(_ref6) {
+  var kongValue = _ref6.kongValue,
+    selectMode = _ref6.selectMode,
+    value = _ref6.value,
+    items = _ref6.items;
   if (selectMode) {
     var _value$map2;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
@@ -4552,12 +4666,12 @@ var getShowValueStr = function getShowValueStr(_ref5) {
   }
   return getSelectValueText(value, items) || kongValue;
 };
-var getShowStr = function getShowStr(_ref6) {
-  var viewShowValueStr = _ref6.viewShowValueStr,
-    labelInValue = _ref6.labelInValue,
-    selectMode = _ref6.selectMode,
-    value = _ref6.value,
-    items = _ref6.items;
+var getShowStr = function getShowStr(_ref7) {
+  var viewShowValueStr = _ref7.viewShowValueStr,
+    labelInValue = _ref7.labelInValue,
+    selectMode = _ref7.selectMode,
+    value = _ref7.value,
+    items = _ref7.items;
   // 优先使用业务使用传入的展示
   if (viewShowValueStr) return viewShowValueStr;
   var kongValue = '无';
@@ -10801,11 +10915,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-physicalWarehouseName-like',
-      label: '物理仓名称'
+      name: 'physicalWarehouseName*multiInput',
+      label: '物理仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-physicalWarehouseCode-like',
-      label: '物理仓编码'
+      name: 'physicalWarehouseCode*multiInput',
+      label: '物理仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-physicalWarehouseType-eq',
       type: 'select',
@@ -10904,11 +11020,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-realWarehouseName-like',
-      label: '逻辑仓名称'
+      name: 'realWarehouseName*multiInput',
+      label: '逻辑仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-realWarehouseCode-like',
-      label: '逻辑仓编码'
+      name: 'realWarehouseCode*multiInput',
+      label: '逻辑仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-realWarehouseType-eq',
       type: 'select',
@@ -10989,11 +11107,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '运营仓名称'
+      name: 'name*multiInput',
+      label: '运营仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-operationWarehouseCode-like',
-      label: '运营仓编码'
+      name: 'operationWarehouseCode*multiInput',
+      label: '运营仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-groupCode-in',
       type: 'select',
@@ -11574,11 +11694,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-in',
+      name: 'name*multiInput',
       label: '商店名称',
       type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-in',
+      name: 'code*multiInput',
       label: '商店编码',
       type: 'multipleQueryInput'
     }, {

package/dist/index.js

@@ -2719,11 +2719,34 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     _this = _callSuper(this, DataValidation, [props]);
     // this.props.onRef(this);
     _this.getCount = function () {
-      var resultData = _this.state.resultData;
+      var _this$state$resultDat = _this.state.resultData,
+        resultData = _this$state$resultDat === void 0 ? [] : _this$state$resultDat;
+      var totalQuantity = resultData.reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
+      var totalSuccessQuantity = resultData.filter(function (item) {
+        return item.flag;
+      }).reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
+      var totalErrorQuantity = resultData.filter(function (item) {
+        return !item.flag;
+      }).reduce(function (total, item) {
+        total += Number(item.quantity || 0);
+        return total;
+      }, 0);
       return {
         total: resultData.length,
+        totalQuantity: totalQuantity,
+        totalSuccessQuantity: totalSuccessQuantity,
+        totalErrorQuantity: totalErrorQuantity,
         error: resultData.filter(function (item) {
           return !item.flag;
+        }).length,
+        success: resultData.filter(function (item) {
+          return item.flag;
         }).length
       };
     };
@@ -2732,7 +2755,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var notValid = _this.props.notValid;
       return {
         container: 'luckysheet',
-        showtoolbar: false,
+        // showtoolbar: false,
         hook: {
           columnTitleCellRenderBefore: function columnTitleCellRenderBefore(columnAbc, postion, ctx) {
             if (columnAbc.name) {
@@ -2769,17 +2792,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             // console.info(data,sheetFile,ctx)
           }
         },
-        // showtoolbarConfig: {
-        //   undoRedo: true, //撤销重做，注意撤消重做是两个按钮，由这一个配置决定显示还是隐藏
-        //   paintFormat: false, //格式刷
-        //   currencyFormat: false, //货币格式
-        //   percentageFormat: false, //百分比格式
-        //   numberDecrease: false, // '减少小数位数'
-        //   numberIncrease: false, // '增加小数位数
-        //   moreFormats: false, // '更多格式'
-        //   font: true, // '字体'
-        //   fontSize: true, // '字号大小'
-        // },
+        showtoolbarConfig: {
+          sortAndFilter: true
+        },
         data: [_defineProperty(_defineProperty({
           name: 'Cell',
           color: '',
@@ -2903,7 +2918,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         showsheetbar: false,
         optionstate: false,
         showstatisticBarConfig: {
-          count: false,
+          count: true,
           view: false,
           zoom: false // 缩放
         },
@@ -2958,6 +2973,44 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         return ___default['default'].compact(Object.values(d)).length;
       });
     };
+    _this.naturalCompare = function (a, b) {
+      var checkNumber = function checkNumber(value) {
+        return /^[-+]?(\d+\.?\d*|\.\d+)([eE][-+]?\d+)?$/.test(value.trim());
+      };
+      if (checkNumber(a) && checkNumber(b)) {
+        return Number(a) - Number(b);
+      }
+      // 优先处理 "通过" 的情况
+      if (a === "通过" && b !== "通过") return -1;
+      if (b === "通过" && a !== "通过") return 1;
+      return a.localeCompare(b);
+    };
+    _this.customSort = function (a, b) {
+      // 处理空值
+      var aEmpty = !a;
+      var bEmpty = !b;
+      if (aEmpty && bEmpty) return 0;
+      if (aEmpty) return 1; // a空，排后面
+      if (bEmpty) return -1; // b空，a排前面
+      return _this.naturalCompare(a, b);
+    };
+    _this.sortData = function (sorterKey) {
+      var sheetData = luckysheet.getSheetData();
+      var newData = JSON.parse(JSON.stringify(sheetData)).sort(function (cur, prev) {
+        var _cur$cellIndex, _prev$cellIndex;
+        var cellIndex = itemsTemp.findIndex(function (item) {
+          return item.code === sorterKey;
+        });
+        if (sorterKey === 'checkresult') {
+          cellIndex = itemsTemp.length;
+        }
+        return _this.customSort((_cur$cellIndex = cur[cellIndex]) === null || _cur$cellIndex === void 0 ? void 0 : _cur$cellIndex.v, (_prev$cellIndex = prev[cellIndex]) === null || _prev$cellIndex === void 0 ? void 0 : _prev$cellIndex.v);
+      });
+      luckysheet.create(_this.setConfig(luckysheet.transToCellData(newData)));
+      _this.setState({
+        data: luckysheet.transToCellData(newData)
+      });
+    };
     _this.resetData = function () {
       var _customerColumnsMappi;
       var _this$props = _this.props,
@@ -3140,10 +3193,43 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         });
       }), provided.placeholder);
     }))));
+    _this.getSortList = function () {
+      var _this$props2, _this$props2$customer;
+      var sortList = [];
+      if ((_this$props2 = _this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$customer = _this$props2.customerColumnsMapping) === null || _this$props2$customer === void 0 ? void 0 : _this$props2$customer.length) {
+        var _this$props3, _this$props3$customer;
+        sortList = ((_this$props3 = _this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$customer = _this$props3.customerColumnsMapping) === null || _this$props3$customer === void 0 ? void 0 : _this$props3$customer.map(function (item, index) {
+          return createItem('item-0', index, item.title, item.name, _this.format);
+        })) || [];
+      } else {
+        var _this$props4, _this$props4$columns;
+        sortList = ((_this$props4 = _this.props) === null || _this$props4 === void 0 ? void 0 : (_this$props4$columns = _this$props4.columns) === null || _this$props4$columns === void 0 ? void 0 : _this$props4$columns.map(function (item, index) {
+          if (!mapping.get(item)) throw Error("".concat(item, " is not in DataValidation component, please fix this error"));
+          return createItem('item-0', index, mapping.get(item), item, _this.format);
+        })) || [];
+      }
+      return /*#__PURE__*/React__default['default'].createElement(antd.Menu, null, (sortList || []).map(function (item, index) {
+        return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, {
+          key: index,
+          className: "sheet_table-menu_item_text"
+        }, /*#__PURE__*/React__default['default'].createElement("a", {
+          onClick: function onClick() {
+            return _this.sortData(item.code);
+          }
+        }, item.content)), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Divider, null));
+      }), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, {
+        key: "checkresult",
+        className: "sheet_table-menu_item_text"
+      }, /*#__PURE__*/React__default['default'].createElement("a", {
+        onClick: function onClick() {
+          return _this.sortData('checkresult');
+        }
+      }, "\u6821\u9A8C\u7ED3\u679C")));
+    };
     _this.getSheetMap = function () {
-      var _this$props2 = _this.props,
-        customerColumnsMapping = _this$props2.customerColumnsMapping,
-        columns = _this$props2.columns;
+      var _this$props5 = _this.props,
+        customerColumnsMapping = _this$props5.customerColumnsMapping,
+        columns = _this$props5.columns;
       var sheetData = customerColumnsMapping || columns.map(function (s) {
         return {
           title: mapping.get(s),
@@ -3234,12 +3320,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var errorListCheck = this.state.errorListCheck;
-      var _this$props3 = this.props,
-        title = _this$props3.title,
-        notValid = _this$props3.notValid,
-        notExcelImport = _this$props3.notExcelImport,
-        excelImportConfig = _this$props3.excelImportConfig,
-        getTemplate = _this$props3.getTemplate;
+      var _this$props6 = this.props,
+        title = _this$props6.title,
+        notValid = _this$props6.notValid,
+        notExcelImport = _this$props6.notExcelImport,
+        excelImportConfig = _this$props6.excelImportConfig,
+        getTemplate = _this$props6.getTemplate;
       var _ref5 = excelImportConfig || {},
         size = _ref5.size,
         accept = _ref5.accept,
@@ -3295,6 +3381,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
+      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
@@ -3313,7 +3400,11 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         trigger: ['click'],
         overlay: this.menuList,
         placement: "bottomRight"
-      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u6E05\u7A7A", /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null))), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u6E05\u7A7A", /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null))), /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
+        trigger: ['click'],
+        overlay: this.getSortList(),
+        placement: "bottomRight"
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u6392\u5E8F", /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null))), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
         type: "primary",
         onClick: this.resetData
       }, "\u8BC6\u522B"))), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3324,11 +3415,31 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         id: "luckysheet",
         style: luckyCss
-      })), !this.props.notValid && /*#__PURE__*/React__default['default'].createElement("div", {
+      })), !this.props.notValid && !!totalSummary.total && /*#__PURE__*/React__default['default'].createElement("div", {
         className: "sheet_table_footer"
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         className: "sheet_table_footer_l"
-      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E", !notValid && ", \u5176\u4E2D\u9519\u8BEF ".concat(totalSummary.error, " \u9879")), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+      }, "\u5171 ", totalSummary.total, " \u6761\u6570\u636E\uFF1A", /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          color: 'green',
+          marginLeft: '5px'
+        }
+      }, " \u6210\u529F\u6761\u6570\uFF1A"), totalSummary.success, /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          color: 'green',
+          marginLeft: '5px'
+        }
+      }, " \u6210\u529F\u6570\u91CF\uFF1A"), totalSummary.totalSuccessQuantity || 0, /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          color: 'red',
+          marginLeft: '5px'
+        }
+      }, " \u5931\u8D25\u6761\u6570\uFF1A"), totalSummary.error || 0, /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          color: 'red',
+          marginLeft: '5px'
+        }
+      }, " \u5931\u8D25\u6570\u91CF\uFF1A"), totalSummary.totalErrorQuantity || 0), !notValid && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
         className: "sheet_table_footer_r"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
         checked: errorListCheck,
@@ -4290,13 +4401,16 @@ var handleParams = function handleParams(params) {
         });
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
+        var _ref3, _ref3$trim, _key$split, _value, _value$trim;
         var name = '',
-          value = element['value'];
+          value = (_ref3 = (element === null || element === void 0 ? void 0 : element['value']) || element) === null || _ref3 === void 0 ? void 0 : (_ref3$trim = _ref3.trim) === null || _ref3$trim === void 0 ? void 0 : _ref3$trim.call(_ref3);
+        var searchKey = (element === null || element === void 0 ? void 0 : element['name']) || (key === null || key === void 0 ? void 0 : (_key$split = key.split('*multiInput')) === null || _key$split === void 0 ? void 0 : _key$split[0]);
         if (value.indexOf(',') >= 0) {
-          name = "qp-".concat(element['name'], "-in");
+          name = "qp-".concat(searchKey, "-in");
         } else {
-          name = "qp-".concat(element['name'], "-like");
+          name = "qp-".concat(searchKey, "-like");
         }
+        value = (_value = value) === null || _value === void 0 ? void 0 : (_value$trim = _value.trim) === null || _value$trim === void 0 ? void 0 : _value$trim.call(_value);
         params[name] = value;
         delete params[key];
       } else if (element && key.indexOf('*') >= 0) {
@@ -4485,11 +4599,11 @@ var LightHeightOption = function LightHeightOption(props) {
     title: text
   }, renderContent);
 };
-var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
-  var selectProps = _ref3.selectProps,
-    onChange = _ref3.onChange,
-    value = _ref3.value,
-    setIsMaxTagsOpen = _ref3.setIsMaxTagsOpen;
+var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
+  var selectProps = _ref4.selectProps,
+    onChange = _ref4.onChange,
+    value = _ref4.value,
+    setIsMaxTagsOpen = _ref4.setIsMaxTagsOpen;
   var labelInValue = selectProps.labelInValue;
   var _onClose = function onClose(e, item) {
     e.preventDefault();
@@ -4543,11 +4657,11 @@ var handleTableColumns = function handleTableColumns(tableColumns) {
 };
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
-var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
-  var kongValue = _ref4.kongValue,
-    selectMode = _ref4.selectMode,
-    value = _ref4.value,
-    items = _ref4.items;
+var getShowLabelTextStr = function getShowLabelTextStr(_ref5) {
+  var kongValue = _ref5.kongValue,
+    selectMode = _ref5.selectMode,
+    value = _ref5.value,
+    items = _ref5.items;
   if (selectMode) {
     var _value$map;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
@@ -4562,11 +4676,11 @@ var getSelectValueText = function getSelectValueText(v, items) {
     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(_ref5) {
-  var kongValue = _ref5.kongValue,
-    selectMode = _ref5.selectMode,
-    value = _ref5.value,
-    items = _ref5.items;
+var getShowValueStr = function getShowValueStr(_ref6) {
+  var kongValue = _ref6.kongValue,
+    selectMode = _ref6.selectMode,
+    value = _ref6.value,
+    items = _ref6.items;
   if (selectMode) {
     var _value$map2;
     return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
@@ -4575,12 +4689,12 @@ var getShowValueStr = function getShowValueStr(_ref5) {
   }
   return getSelectValueText(value, items) || kongValue;
 };
-var getShowStr = function getShowStr(_ref6) {
-  var viewShowValueStr = _ref6.viewShowValueStr,
-    labelInValue = _ref6.labelInValue,
-    selectMode = _ref6.selectMode,
-    value = _ref6.value,
-    items = _ref6.items;
+var getShowStr = function getShowStr(_ref7) {
+  var viewShowValueStr = _ref7.viewShowValueStr,
+    labelInValue = _ref7.labelInValue,
+    selectMode = _ref7.selectMode,
+    value = _ref7.value,
+    items = _ref7.items;
   // 优先使用业务使用传入的展示
   if (viewShowValueStr) return viewShowValueStr;
   var kongValue = '无';
@@ -10824,11 +10938,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-physicalWarehouseName-like',
-      label: '物理仓名称'
+      name: 'physicalWarehouseName*multiInput',
+      label: '物理仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-physicalWarehouseCode-like',
-      label: '物理仓编码'
+      name: 'physicalWarehouseCode*multiInput',
+      label: '物理仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-physicalWarehouseType-eq',
       type: 'select',
@@ -10927,11 +11043,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-realWarehouseName-like',
-      label: '逻辑仓名称'
+      name: 'realWarehouseName*multiInput',
+      label: '逻辑仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-realWarehouseCode-like',
-      label: '逻辑仓编码'
+      name: 'realWarehouseCode*multiInput',
+      label: '逻辑仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-realWarehouseType-eq',
       type: 'select',
@@ -11012,11 +11130,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '运营仓名称'
+      name: 'name*multiInput',
+      label: '运营仓名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-operationWarehouseCode-like',
-      label: '运营仓编码'
+      name: 'operationWarehouseCode*multiInput',
+      label: '运营仓编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-groupCode-in',
       type: 'select',
@@ -11597,11 +11717,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-in',
+      name: 'name*multiInput',
       label: '商店名称',
       type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-in',
+      name: 'code*multiInput',
       label: '商店编码',
       type: 'multipleQueryInput'
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.13-alpha.33",
+  "version": "4.0.13-alpha.35",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -1069,8 +1069,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
-      { name: 'qp-physicalWarehouseCode-like', label: '物理仓编码' },
+      { name: 'physicalWarehouseName*multiInput', label: '物理仓名称', type: 'multipleQueryInput' },
+      { name: 'physicalWarehouseCode*multiInput', label: '物理仓编码', type: 'multipleQueryInput' },
       { name: 'qp-physicalWarehouseType-eq', type: 'select', label: '物理仓类型', initialSource: getDictionarySource('SC00002')  },
       { name: 'qp-companyCode-eq', type: 'select', label: '所属公司', field: {
           type: 'select',
@@ -1167,8 +1167,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
-      { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
+      { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
+      { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
       { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
@@ -1240,8 +1240,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '运营仓名称' },
-      { name: 'qp-operationWarehouseCode-like', label: '运营仓编码' },
+      { name: 'name*multiInput', label: '运营仓名称', type: 'multipleQueryInput' },
+      { name: 'operationWarehouseCode*multiInput', label: '运营仓编码', type: 'multipleQueryInput' },
       { name: 'qp-groupCode-in', type: 'select', label: '运营组', field: {
           type: 'select',
           props: {
@@ -1818,8 +1818,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-in', label: '商店名称', type: 'multipleQueryInput' },
-      { name: 'qp-code-in', label: '商店编码', type: 'multipleQueryInput' },
+      { name: 'name*multiInput', label: '商店名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '商店编码', type: 'multipleQueryInput' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
       { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {

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

@@ -28,7 +28,7 @@ import {
 } from '@ant-design/icons';
 import request from '@/utils/request';
 import './index.less';
-import _ from "lodash"
+import _, { ceil, isNumber } from "lodash"
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import { readerXlsxToList } from '@/utils/xlsxUtil';
 
@@ -179,10 +179,26 @@ class DataValidation extends React.Component {
   }
 
   getCount = () => {
-    const { resultData } = this.state;
+    const { resultData = [] } = this.state;
+    const totalQuantity = resultData.reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
+    const totalSuccessQuantity = resultData.filter(item => item.flag).reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
+    const totalErrorQuantity = resultData.filter(item => !item.flag).reduce((total, item) => {
+        total += Number(item.quantity || 0);
+      return total;
+    }, 0);
     return {
       total: resultData.length,
+      totalQuantity,
+      totalSuccessQuantity,
+      totalErrorQuantity,
       error: resultData.filter((item) => !item.flag).length,
+      success: resultData.filter((item) => item.flag).length,
     };
   };
 
@@ -191,7 +207,7 @@ class DataValidation extends React.Component {
     const { notValid } = this.props;
     return {
       container: 'luckysheet',
-      showtoolbar: false,
+      // showtoolbar: false,
       hook: {
         columnTitleCellRenderBefore: function (columnAbc, postion, ctx) {
           if (columnAbc.name) {
@@ -233,18 +249,9 @@ class DataValidation extends React.Component {
           // console.info(data,sheetFile,ctx)
         },
       },
-      // showtoolbarConfig: {
-      //   undoRedo: true, //撤销重做，注意撤消重做是两个按钮，由这一个配置决定显示还是隐藏
-      //   paintFormat: false, //格式刷
-      //   currencyFormat: false, //货币格式
-      //   percentageFormat: false, //百分比格式
-      //   numberDecrease: false, // '减少小数位数'
-      //   numberIncrease: false, // '增加小数位数
-      //   moreFormats: false, // '更多格式'
-      //   font: true, // '字体'
-      //   fontSize: true, // '字号大小'
-
-      // },
+      showtoolbarConfig: {
+        sortAndFilter: true,
+      },
       data: [
         {
           name: 'Cell', //工作表名称
@@ -365,7 +372,7 @@ class DataValidation extends React.Component {
       showsheetbar: false,
       optionstate: false,
       showstatisticBarConfig: {
-        count: false, // 计数栏
+        count: true, // 计数栏
         view: false, // 打印视图
         zoom: false, // 缩放
       },
@@ -422,6 +429,54 @@ class DataValidation extends React.Component {
     return data.filter(d => _.compact(Object.values(d)).length);
   };
 
+  naturalCompare = (a, b) => {
+  const checkNumber = (value) => {
+    return /^[-+]?(\d+\.?\d*|\.\d+)([eE][-+]?\d+)?$/.test(value.trim())
+  };
+
+  if (checkNumber(a) && checkNumber(b)) {
+    return Number(a) - Number(b);
+  }
+  // 优先处理 "通过" 的情况
+  if (a === "通过" && b !== "通过") return -1;
+  if (b === "通过" && a !== "通过") return 1;
+  
+  return a.localeCompare(b);
+
+}
+
+customSort = (a, b) => {
+
+  // 处理空值
+  const aEmpty = !a;
+
+  const bEmpty = !b;
+
+  if (aEmpty && bEmpty) return 0;
+
+  if (aEmpty) return 1; // a空，排后面
+
+  if (bEmpty) return -1; // b空，a排前面
+
+  return this.naturalCompare(a, b);
+
+}
+
+  sortData = (sorterKey: string) => {
+    let sheetData = luckysheet.getSheetData();
+    let newData = JSON.parse(JSON.stringify(sheetData)).sort((cur, prev) => {
+      let cellIndex = itemsTemp.findIndex(item => item.code === sorterKey);
+      if (sorterKey === 'checkresult') {
+        cellIndex = itemsTemp.length;
+      }
+      return this.customSort(cur[cellIndex]?.v, prev[cellIndex]?.v);
+    })
+    luckysheet.create(this.setConfig(luckysheet.transToCellData(newData)));
+    this.setState({
+      data: luckysheet.transToCellData(newData),
+    });
+  }
+
   resetData = () => {
     const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
     const resultData = this.getData().filter(d => {
@@ -523,7 +578,6 @@ class DataValidation extends React.Component {
 
   toggleData = () => {
     const { showErrorData, data } = this.state;
-
     if (showErrorData) {
       luckysheet.create(this.setConfig(data));
     } else {
@@ -615,6 +669,44 @@ class DataValidation extends React.Component {
       </div>
     </Menu>
   );
+
+
+  getSortList = () => {
+    let sortList = []
+    if (this.props?.customerColumnsMapping?.length) {
+      sortList = this.props?.customerColumnsMapping?.map((item, index) => {
+        return createItem('item-0', index, item.title, item.name, this.format);
+      })||[]
+    } else {
+      sortList = this.props?.columns?.map((item, index) => {
+        if (!mapping.get(item))
+          throw Error(
+            `${item} is not in DataValidation component, please fix this error`,
+          );
+        return createItem('item-0', index, mapping.get(item), item, this.format);
+      })||[];
+    }
+
+    return (
+      <Menu>
+        {
+          (sortList || []).map((item, index) =>{
+            return  (
+              <>
+                <Menu.Item key={index} className="sheet_table-menu_item_text">
+                  <a onClick={() => this.sortData(item.code)}>{item.content}</a>
+                </Menu.Item>
+                <Menu.Divider />
+              </>
+            )
+          })
+        }
+        <Menu.Item key="checkresult" className="sheet_table-menu_item_text">
+          <a onClick={() => this.sortData('checkresult')}>校验结果</a>
+        </Menu.Item>
+      </Menu>
+    )
+  }
   
   getSheetMap = () => {
     const { customerColumnsMapping, columns } = this.props;
@@ -708,6 +800,8 @@ class DataValidation extends React.Component {
       left: '0px',
       top: '0px',
     };
+
+    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">
@@ -766,6 +860,16 @@ class DataValidation extends React.Component {
                 <DownOutlined />
               </Button>
             </Dropdown>
+            <Dropdown
+              trigger={['click']}
+              overlay={this.getSortList()}
+              placement="bottomRight"
+            >
+              <Button>
+                排序
+                <DownOutlined />
+              </Button>
+            </Dropdown>
 
             {!notValid && <Button type="primary" onClick={this.resetData}>
               识别
@@ -776,9 +880,13 @@ class DataValidation extends React.Component {
         <div style={{ position: 'relative', height: '400px' }}>
           <div id="luckysheet" style={luckyCss}></div>
         </div>
-        {!this.props.notValid && <div className="sheet_table_footer">
+        {!this.props.notValid && !!totalSummary.total && <div className="sheet_table_footer">
           <span className="sheet_table_footer_l">
-            共 {totalSummary.total} 条数据{!notValid && `, 其中错误 ${totalSummary.error} 项`}
+            共 {totalSummary.total} 条数据：
+            <span style={{color: 'green', marginLeft: '5px'}}> 成功条数：</span>{totalSummary.success}
+            <span style={{color: 'green', marginLeft: '5px'}}> 成功数量：</span>{totalSummary.totalSuccessQuantity || 0}
+            <span style={{color: 'red', marginLeft: '5px'}}> 失败条数：</span>{totalSummary.error || 0}
+            <span style={{color: 'red', marginLeft: '5px'}}> 失败数量：</span>{totalSummary.totalErrorQuantity || 0}
           </span>
           {!notValid && <Space className="sheet_table_footer_r">
             <Checkbox

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

@@ -158,12 +158,14 @@ export const handleParams = (params: any) => {
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
       let name = '',
-        value = element['value'];
+        value = (element?.['value']||element)?.trim?.();
+        const searchKey = element?.['name']||key?.split('*multiInput')?.[0]
       if (value.indexOf(',') >= 0) {
-        name = `qp-${element['name']}-in`;
+        name = `qp-${searchKey}-in`;
       } else {
-        name = `qp-${element['name']}-like`;
+        name = `qp-${searchKey}-like`;
       }
+      value = value?.trim?.();
       params[name] = value;
       delete params[key];
     }