zmdms-webui 2.4.7 → 2.4.8

package/dist/es/table/hooks.js

@@ -218,7 +218,7 @@ function useScuRfresh() {
  * 如果排序改变了数据源，那么数据没法恢复到初始状态
  */
 function useCustomSort(dataSource, onTableChange, options) {
-    var refreshScuCell = options.refreshScuCell, rowKey = options.rowKey, serviceOrder = options.serviceOrder, isOrderUpdateData = options.isOrderUpdateData;
+    var refreshScuCell = options.refreshScuCell, rowKey = options.rowKey, serviceOrder = options.serviceOrder, isOrderUpdateData = options.isOrderUpdateData, isAutoMerge = options.isAutoMerge;
     // 排序的数据
     var _a = useState(undefined), order = _a[0], setOrder = _a[1];
     var isSelfChange = useRef(false);
@@ -226,6 +226,8 @@ function useCustomSort(dataSource, onTableChange, options) {
     var innerOrderDataSource = useRef();
     var _b = useState(null), sortDataSource = _b[0], setSortDataSource = _b[1];
     var customSortHandle = useCallback(function (info, options) {
+        if (isAutoMerge)
+            return;
         if (Array.isArray(dataSource) && dataSource.length > 1) {
             var field_1 = info.field, order_1 = info.order;
             var sorterHandle = (options || {}).sorterHandle;
@@ -301,6 +303,7 @@ function useCustomSort(dataSource, onTableChange, options) {
         rowKey,
         serviceOrder,
         isOrderUpdateData,
+        isAutoMerge,
     ]);
     /**
      * 表格数据更新的时候 重置下当前排序的数据 以及 排序的方式

package/dist/es/table/table.js

@@ -70,6 +70,7 @@ var Table = function (props) {
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
         isOrderUpdateData: isOrderUpdateData,
+        isAutoMerge: isAutoMerge,
     }), order = _t.order, setOrder = _t.setOrder, customSortHandle = _t.customSortHandle, sortDataSource = _t.sortDataSource;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",