@pisell/materials 1.0.276 → 1.0.278

package/es/components/filter/components/FilterButton/index.js

@@ -46,7 +46,7 @@ var Filter = function Filter(_ref) {
     getPopupContainer: function getPopupContainer() {
       return ref.current;
     },
-    mouseEnterDelay: 0,
+    mouseEnterDelay: 0.1,
     transitionName: "test"
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(FilterLines, null),

package/es/components/table/Table/utils.d.ts

@@ -146,7 +146,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/hooks/useTriggerValuesChange.js

@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useRef } from "react";
 import { getSettingKeyArrByMode } from "../Table/utils";
 /**
  * 判断是否触发值变化
@@ -17,6 +17,7 @@ var useTriggerValuesChange = function useTriggerValuesChange(params) {
   var _ref2 = sort || {},
     sortList = _ref2.list,
     sortShow = _ref2.show;
+  var lastIsRemoteSort = useRef(false);
   var getIsTriggerValuesChange = useCallback(function (changedValues, values) {
     var keys = getSettingKeyArrByMode({
       filter: filter,
@@ -48,7 +49,17 @@ var useTriggerValuesChange = function useTriggerValuesChange(params) {
           var _item$name;
           return (_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toString();
         });
-        return remoteSortKeys.includes(sortField);
+        var result = remoteSortKeys.includes(sortField);
+        // sort值清空时 如果上次更新是远程排序 那么触发onValuesChange
+        if (sortField === "" && lastIsRemoteSort.current) {
+          lastIsRemoteSort.current = false;
+          return true;
+        }
+        // sortField有值时 存入当前是否远程状态
+        if (sortField !== "") {
+          lastIsRemoteSort.current = result;
+        }
+        return result;
       }
     }
 

package/lib/components/filter/components/FilterButton/index.js

@@ -73,7 +73,7 @@ var Filter = ({
       content,
       arrow: false,
       getPopupContainer: () => ref.current,
-      mouseEnterDelay: 0,
+      mouseEnterDelay: 0.1,
       transitionName: "test"
     },
     /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { icon: /* @__PURE__ */ import_react.default.createElement(import_FilterLines.default, null), size: "large" }, isMobileBool ? null : (0, import_locales.getText)("table-action-filter-button"))

package/lib/components/table/Table/utils.d.ts

@@ -146,7 +146,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/hooks/useTriggerValuesChange.js

@@ -28,6 +28,7 @@ var useTriggerValuesChange = (params) => {
   const { filter, columnSetting, dataSourceGroup, sort, currentViewMode } = params;
   const { list, show } = filter || {};
   const { list: sortList, show: sortShow } = sort || {};
+  const lastIsRemoteSort = (0, import_react.useRef)(false);
   const getIsTriggerValuesChange = (0, import_react.useCallback)(
     (changedValues, values) => {
       var _a, _b, _c;
@@ -54,7 +55,15 @@ var useTriggerValuesChange = (params) => {
             var _a2;
             return (_a2 = item.name) == null ? void 0 : _a2.toString();
           });
-          return remoteSortKeys.includes(sortField);
+          const result = remoteSortKeys.includes(sortField);
+          if (sortField === "" && lastIsRemoteSort.current) {
+            lastIsRemoteSort.current = false;
+            return true;
+          }
+          if (sortField !== "") {
+            lastIsRemoteSort.current = result;
+          }
+          return result;
         }
       }
       if (changedKey === "filters") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.276",
+  "version": "1.0.278",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@pisell/utils": "1.0.25",
-    "@pisell/icon": "0.0.8",
-    "@pisell/date-picker": "1.0.72"
+    "@pisell/date-picker": "1.0.72",
+    "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",