@bit-sun/business-component 4.0.13-alpha.34 → 4.0.13-alpha.36

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

@@ -2658,11 +2658,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
       };
     };
@@ -2671,7 +2694,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) {
@@ -2708,17 +2731,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: '',
@@ -2842,7 +2857,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         showsheetbar: false,
         optionstate: false,
         showstatisticBarConfig: {
-          count: false,
+          count: true,
           view: false,
           zoom: false // 缩放
         },
@@ -2897,6 +2912,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,
@@ -3079,10 +3132,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),
@@ -3173,12 +3259,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,
@@ -3234,6 +3320,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, {
@@ -3252,7 +3339,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", {
@@ -3263,11 +3354,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,
@@ -4151,11 +4262,11 @@ var getRealStr = function getRealStr(oldSelect, newSelect, record) {
 var getCurrentSRKs = function getCurrentSRKs(selectMode, labelInValue, value) {
   return selectMode ? labelInValue ? value === null || value === void 0 ? void 0 : value.map(function (s) {
     return (s === null || s === void 0 ? void 0 : s.value) || s;
-  }) : value : labelInValue ? (value === null || value === void 0 ? void 0 : value.value) && [value === null || value === void 0 ? void 0 : value.value] || [] : value && [value] || [];
+  }) : value || [] : labelInValue ? (value === null || value === void 0 ? void 0 : value.value) && [value === null || value === void 0 ? void 0 : value.value] || [] : value && [value] || [];
 };
 var getRenderSource = function getRenderSource(currentSRKs, items) {
   // 判空处理
-  if (!(currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.length)) return items || [];
+  if (!currentSRKs || !(currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.length)) return items || [];
   // 创建映射对象 用于记录原始选中顺序
   var orderMap = new Map();
   currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.forEach(function (value, index) {
@@ -5337,7 +5448,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     noNeedSplit = _ref$noNeedSplit === void 0 ? false : _ref$noNeedSplit,
     noOperate = _ref.noOperate,
     viewShowValueStr = _ref.viewShowValueStr,
-    searchStartLength = _ref.searchStartLength;
+    searchStartLength = _ref.searchStartLength,
+    _ref$isQuery = _ref.isQuery,
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5404,7 +5517,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       return item;
     }).length > 0;
   };
-  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue();
+  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue() && !isQuery;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],

package/dist/index.js

@@ -2681,11 +2681,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
       };
     };
@@ -2694,7 +2717,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) {
@@ -2731,17 +2754,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: '',
@@ -2865,7 +2880,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         showsheetbar: false,
         optionstate: false,
         showstatisticBarConfig: {
-          count: false,
+          count: true,
           view: false,
           zoom: false // 缩放
         },
@@ -2920,6 +2935,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,
@@ -3102,10 +3155,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),
@@ -3196,12 +3282,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,
@@ -3257,6 +3343,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, {
@@ -3275,7 +3362,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", {
@@ -3286,11 +3377,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,
@@ -4174,11 +4285,11 @@ var getRealStr = function getRealStr(oldSelect, newSelect, record) {
 var getCurrentSRKs = function getCurrentSRKs(selectMode, labelInValue, value) {
   return selectMode ? labelInValue ? value === null || value === void 0 ? void 0 : value.map(function (s) {
     return (s === null || s === void 0 ? void 0 : s.value) || s;
-  }) : value : labelInValue ? (value === null || value === void 0 ? void 0 : value.value) && [value === null || value === void 0 ? void 0 : value.value] || [] : value && [value] || [];
+  }) : value || [] : labelInValue ? (value === null || value === void 0 ? void 0 : value.value) && [value === null || value === void 0 ? void 0 : value.value] || [] : value && [value] || [];
 };
 var getRenderSource = function getRenderSource(currentSRKs, items) {
   // 判空处理
-  if (!(currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.length)) return items || [];
+  if (!currentSRKs || !(currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.length)) return items || [];
   // 创建映射对象 用于记录原始选中顺序
   var orderMap = new Map();
   currentSRKs === null || currentSRKs === void 0 ? void 0 : currentSRKs.forEach(function (value, index) {
@@ -5360,7 +5471,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     noNeedSplit = _ref$noNeedSplit === void 0 ? false : _ref$noNeedSplit,
     noOperate = _ref.noOperate,
     viewShowValueStr = _ref.viewShowValueStr,
-    searchStartLength = _ref.searchStartLength;
+    searchStartLength = _ref.searchStartLength,
+    _ref$isQuery = _ref.isQuery,
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5427,7 +5540,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       return item;
     }).length > 0;
   };
-  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue();
+  var sDisabled = disabled || isHaveDependency && !!!isHaveDValue() && !isQuery;
   var _useState = React$1.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],

package/package.json

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

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/index.tsx

@@ -53,6 +53,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     noOperate, // 级联禁用按钮设置字段
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
+    isQuery = false, // 是否是查询条件
   } = rCTemp || {};
   const requestConfig = {url,method,otherParams,isMap,fixedparameter,fieldValToParam,fixedparamsDisabled,mappingTextField,mappingTextShowKeyField,mappingValueField,mappingTextShowTextField,init,extralHeaders,specialBracket,noNeedSplit,noOperate,viewShowValueStr,searchStartLength,...rCTemp};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
@@ -93,7 +94,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     });
     return formValueList.filter((item: any) => item).length > 0
   }
-  const sDisabled = disabled || (isHaveDependency && !!!isHaveDValue());
+  const sDisabled = disabled || (isHaveDependency && !!!isHaveDValue() && !isQuery);
 
   const [items, setItems] = useState([]);
   const [selectOpen, setSelectOpen] = useState(false);

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

@@ -61,11 +61,11 @@ export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
   return oldSelect?.length ? oldSelect.some((o: any) => o.value == record?.value) ? oldSelect.filter((s: any) => s.value != record?.value) : [...oldSelect,...newSelect] : newSelect;
 }
 export const getCurrentSRKs = (selectMode: any,labelInValue:boolean,value: any) => {
-  return selectMode ? (labelInValue ? value?.map((s: any)=> (s?.value||s)) : value) : (labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[])
+  return selectMode ? (labelInValue ? value?.map((s: any)=> (s?.value||s)) : (value||[])) : (labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[])
 }
 export const getRenderSource = (currentSRKs: any, items: any) => {
   // 判空处理
-  if(!currentSRKs?.length) return items||[];
+  if(!currentSRKs || !currentSRKs?.length) return items||[];
 
   // 创建映射对象 用于记录原始选中顺序
   const orderMap = new Map<number, number>();