@pisell/materials 1.0.237 → 1.0.239

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

@@ -148,4 +148,5 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     currentViewMode: ModeType;
 }) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 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/Table/utils.js

@@ -503,4 +503,12 @@ export var omit = function omit(obj, keys) {
     delete shallowCopy[key];
   }
   return shallowCopy;
+};
+export var stringify = function stringify(obj) {
+  return JSON.stringify(obj, function (key, value) {
+    if (isFunction(value)) {
+      return value.toString();
+    }
+    return value;
+  });
 };

package/es/components/table/index.js

@@ -25,7 +25,7 @@ import { Provider, Context, formatColumn } from "./model";
 import useEngineContext from "../../hooks/useEngineContext";
 import useTableSetting from "./hooks/useTableSetting";
 import useTriggerValuesChange from "./hooks/useTriggerValuesChange";
-import { clearTableSettingToLocalStorage, getCurrentViewModeFromLocalStorage, getHash, getTableSettingFromLocalStorage, mergeColumnSetting, omit } from "./Table/utils";
+import { clearTableSettingToLocalStorage, getCurrentViewModeFromLocalStorage, getHash, getTableSettingFromLocalStorage, mergeColumnSetting, omit, stringify } from "./Table/utils";
 import useTransSortSetting from "./hooks/useTransSortSetting";
 import useTransFilterSetting from "./hooks/useTransFilterSetting";
 import useTransDataSourceGroupSetting from "./hooks/useTransDataSourceGroupSetting";
@@ -180,7 +180,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     setTimeout(function () {
       document.body.id = "body";
     }, 200);
-  }, [filter]);
+  }, []);
   var filterDefaultValues = useMemo(function () {
     var _other$pagination3, _other$pagination4;
     var defaultValues = ((filter === null || filter === void 0 ? void 0 : filter.list) || []).reduce(function (p, c) {
@@ -211,8 +211,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   }, [currentViewMode]);
   useEffect(function () {
     // 虚拟表columns由接口获取 columns变更时只重新设置tableSetting
-    form.setFieldsValue(tableSettingRef.current);
-  }, [JSON.stringify(columns)]);
+    // 直接设置column_setting对象时useWatch监听数据有误，先设置{}后再设置useWatch可以监听到变更数据
+    form.setFieldValue("column_setting", {});
+    form.setFieldValue("column_setting", tableSettingRef.current.column_setting);
+    // JSON.stringify会丢失 render函数变更的监听 使用自定义stringify处理
+  }, [stringify(columns)]);
   useEffect(function () {
     form.setFieldsValue(initialValuesRef.current);
     // ArraySetter在面板state变更时指针改变

package/es/utils/platform.js

@@ -2,7 +2,7 @@ import { isMobile as isMobileUtils } from "@pisell/utils";
 import { isBrowser } from "./index";
 export var isMobile = function isMobile() {
   if (isBrowser) {
-    return window.innerWidth <= 768 || isMobileUtils();
+    return window.innerWidth <= 768 && isMobileUtils();
   }
   return isMobileUtils();
 };

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

@@ -148,4 +148,5 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     currentViewMode: ModeType;
 }) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 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/Table/utils.js

@@ -44,7 +44,8 @@ __export(utils_exports, {
   omit: () => omit,
   setFormValuesToLocalStorage: () => setFormValuesToLocalStorage,
   setTableSettingToLocalStorage: () => setTableSettingToLocalStorage,
-  sortDataSource: () => sortDataSource
+  sortDataSource: () => sortDataSource,
+  stringify: () => stringify
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -439,6 +440,14 @@ var omit = (obj, keys) => {
   }
   return shallowCopy;
 };
+var stringify = (obj) => {
+  return JSON.stringify(obj, (key, value) => {
+    if ((0, import_utils.isFunction)(value)) {
+      return value.toString();
+    }
+    return value;
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcFilterSort,
@@ -456,5 +465,6 @@ var omit = (obj, keys) => {
   omit,
   setFormValuesToLocalStorage,
   setTableSettingToLocalStorage,
-  sortDataSource
+  sortDataSource,
+  stringify
 });

package/lib/components/table/index.js

@@ -187,7 +187,7 @@ var GridView = (0, import_model.Provider)(
       setTimeout(() => {
         document.body.id = "body";
       }, 200);
-    }, [filter]);
+    }, []);
     const filterDefaultValues = (0, import_react.useMemo)(() => {
       var _a2, _b2;
       const defaultValues = ((filter == null ? void 0 : filter.list) || []).reduce(
@@ -227,8 +227,9 @@ var GridView = (0, import_model.Provider)(
       form.setFieldsValue(initialValuesRef.current);
     }, [currentViewMode]);
     (0, import_react.useEffect)(() => {
-      form.setFieldsValue(tableSettingRef.current);
-    }, [JSON.stringify(columns)]);
+      form.setFieldValue("column_setting", {});
+      form.setFieldValue("column_setting", tableSettingRef.current.column_setting);
+    }, [(0, import_utils.stringify)(columns)]);
     (0, import_react.useEffect)(() => {
       form.setFieldsValue(initialValuesRef.current);
     }, [JSON.stringify(propsFilter)]);

package/lib/utils/platform.js

@@ -26,7 +26,7 @@ var import_utils = require("@pisell/utils");
 var import_index = require("./index");
 var isMobile = () => {
   if (import_index.isBrowser) {
-    return window.innerWidth <= 768 || (0, import_utils.isMobile)();
+    return window.innerWidth <= 768 && (0, import_utils.isMobile)();
   }
   return (0, import_utils.isMobile)();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.237",
+  "version": "1.0.239",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",