@pisell/materials 1.0.227 → 1.0.229

package/es/components/auto-complete/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare const AutoComplete: (props: any) => import("react").JSX.Element;
+declare const AutoComplete: any;
 export default AutoComplete;

package/es/components/auto-complete/index.js

@@ -1,4 +1,3 @@
 import { AutoComplete as OriginalAutoComplete } from 'antd';
-import { withWrap } from "../../utils/hoc";
-var AutoComplete = withWrap(OriginalAutoComplete);
+var AutoComplete = OriginalAutoComplete;
 export default AutoComplete;

package/es/components/input/index.js

@@ -1,12 +1,11 @@
 import { Input as OriginalInput } from "antd";
-import { withWrap } from "../../utils/hoc";
 var OriginalGroup = OriginalInput.Group,
   OriginalTextArea = OriginalInput.TextArea,
   OriginalPassword = OriginalInput.Password,
   OriginalSearch = OriginalInput.Search;
-var Input = withWrap(OriginalInput);
+var Input = OriginalInput;
 Input.Group = OriginalGroup;
-Input.TextArea = withWrap(OriginalTextArea);
-Input.Password = withWrap(OriginalPassword);
-Input.Search = withWrap(OriginalSearch);
+Input.TextArea = OriginalTextArea;
+Input.Password = OriginalPassword;
+Input.Search = OriginalSearch;
 export default Input;

package/es/components/page/index.js

@@ -88,8 +88,18 @@ var theme = {
       colorTextQuaternary: "#D0D5DD",
       colorBgContainerDisabled: "#F9FAFB",
       colorTextDisabled: "#98A2B3"
+    },
+    "Input": {
+      "fontSizeIcon": 16
+      // "lineHeight": 1
+    },
+
+    "Select": {
+      "fontSizeIcon": 16
+      // "lineHeight": 1
     }
   },
+
   token: {
     colorPrimary: "#7F56D9",
     colorPrimaryBg: "#F9F5FF",

package/es/components/picker-view/index.d.ts

@@ -0,0 +1,2 @@
+import PickerView from 'antd-mobile/es/components/picker-view';
+export default PickerView;

package/es/components/picker-view/index.js

@@ -0,0 +1,2 @@
+import PickerView from 'antd-mobile/es/components/picker-view';
+export default PickerView;

package/es/components/select/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import "./index.less";
-declare const Select: (props: any) => import("react").JSX.Element;
+declare const Select: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
 export default Select;

package/es/components/select/index.js

@@ -6,13 +6,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Checkbox, Divider, Select as OriginalSelect } from "antd";
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo, forwardRef } from "react";
 import { getText } from "../../locales";
-import { withWrap } from "../../utils/hoc";
 import { useControllableValue, useMemoizedFn } from "ahooks";
 import "./index.less";
 var prefix = "pisell-lowcode-";
-var SelectBase = function SelectBase(props) {
+var SelectBase = /*#__PURE__*/forwardRef(function (props, ref) {
   var isShowDropdown = props.isShowDropdown,
     selectAll = props.selectAll,
     mode = props.mode,
@@ -51,12 +50,13 @@ var SelectBase = function SelectBase(props) {
     }, getText("select-dropdown-render-select-all")))));
   }, [isShowDropdown, isShowSelectAll, checkboxChecked, propsDropdownRender]);
   return /*#__PURE__*/React.createElement(OriginalSelect, _extends({}, props, {
+    ref: ref,
     value: state,
     onChange: function onChange(value, option) {
       return setState(value, option);
     },
     dropdownRender: dropdownRender
   }));
-};
-var Select = withWrap(SelectBase);
+});
+var Select = SelectBase;
 export default Select;

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

@@ -1,6 +1,7 @@
 import { GroupValue } from "../Actions/component/Group/PopoverContent";
 import { FilterItemProps, FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, GallerySettingValueType, ModeType, SortType } from "../types";
+export declare const getHash: (obj: any) => any;
 export declare const calcFilterSort: ({ dataSource, filter, sort, columns }: any) => any;
 /**
  * 合并列设置
@@ -55,6 +56,7 @@ declare type ViewSetting = {
  */
 declare type TableSettingObjType = {
     view_mode: ModeType;
+    currentSettingHash: string;
 } & {
     [K in ModeType]: ViewSetting;
 };
@@ -63,13 +65,15 @@ declare type TableSettingObjType = {
  * @param tableId 表格id
  * @param tableSettingObj 表格设置对象
  */
-export declare const setTableSettingToLocalStorage: ({ tableId, tableSettingObj, currentViewMode, }: {
+export declare const setTableSettingToLocalStorage: ({ tableId, tableSettingObj, currentViewMode, currentSettingHash, }: {
     tableId: string;
     tableSettingObj: Partial<ViewSetting & {
         view_mode: ModeType;
     }>;
     currentViewMode: ModeType;
+    currentSettingHash: string;
 }) => void;
+export declare const clearTableSettingToLocalStorage: (tableId?: string) => void;
 /**
  * 从本地存储中获取表格设置, 全部配置
  * @param tableId 表格ID
@@ -93,11 +97,12 @@ export declare const getTableSettingByCurrentViewMode: (tableId: string, current
  * @param allValues 表单所有值
  * @param keys 存储的键名
  */
-export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, currentViewMode, }: {
+export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, currentViewMode, currentSettingHash, }: {
     tableId?: string | undefined;
     allValues?: Record<string, any> | undefined;
     keys?: string[] | undefined;
     currentViewMode: ModeType;
+    currentSettingHash: string;
 }) => void;
 /**
  * 合并筛选设置
@@ -141,6 +146,6 @@ 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 {};

package/es/components/table/Table/utils.js

@@ -15,9 +15,18 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import dayjs from "dayjs";
 import { isBoolean, isFunction, isJson, isNumber, isString } from "@pisell/utils";
+// @ts-ignore
+import md5 from "crypto-js/md5";
+// @ts-ignore
+import enc from "crypto-js/enc-hex";
 import { fieldMaps } from "./fields";
 import { getValueByKeys } from "./fields/utils";
 var tableKeyPrefix = "table-setting";
+export var getHash = function getHash(obj) {
+  var jsonString = JSON.stringify(obj);
+  var hash = md5(jsonString);
+  return hash.toString(enc.Hex);
+};
 var transColumnsMap = function transColumnsMap(columns) {
   return columns.reduce(function (p, c) {
     return _objectSpread(_objectSpread({}, p), {}, _defineProperty({}, c.dataIndex, c));
@@ -242,7 +251,8 @@ export var groupDataSource = function groupDataSource(dataSource, group, rowKey)
 export var setTableSettingToLocalStorage = function setTableSettingToLocalStorage(_ref4) {
   var tableId = _ref4.tableId,
     tableSettingObj = _ref4.tableSettingObj,
-    currentViewMode = _ref4.currentViewMode;
+    currentViewMode = _ref4.currentViewMode,
+    currentSettingHash = _ref4.currentSettingHash;
   if (!tableId) return;
   var originData = localStorage.getItem(getTableKey(tableId));
   var newData = {};
@@ -253,10 +263,15 @@ export var setTableSettingToLocalStorage = function setTableSettingToLocalStorag
   var view_mode = tableSettingObj.view_mode,
     itemSetting = _objectWithoutProperties(tableSettingObj, _excluded);
   newData = _objectSpread(_objectSpread({}, newData), {}, _defineProperty({
-    view_mode: view_mode || newData.view_mode
+    view_mode: view_mode || newData.view_mode,
+    currentSettingHash: currentSettingHash
   }, currentViewMode, _objectSpread(_objectSpread({}, newData[currentViewMode] || {}), itemSetting)));
   localStorage.setItem(getTableKey(tableId), JSON.stringify(newData));
 };
+export var clearTableSettingToLocalStorage = function clearTableSettingToLocalStorage(tableId) {
+  if (!tableId) return;
+  localStorage.removeItem(getTableKey(tableId));
+};
 
 /**
  * 从本地存储中获取表格设置, 全部配置
@@ -301,7 +316,8 @@ export var setFormValuesToLocalStorage = function setFormValuesToLocalStorage(_r
   var tableId = _ref5.tableId,
     allValues = _ref5.allValues,
     keys = _ref5.keys,
-    currentViewMode = _ref5.currentViewMode;
+    currentViewMode = _ref5.currentViewMode,
+    currentSettingHash = _ref5.currentSettingHash;
   if (!tableId) return;
   var obj = {};
   keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
@@ -310,7 +326,8 @@ export var setFormValuesToLocalStorage = function setFormValuesToLocalStorage(_r
   setTableSettingToLocalStorage({
     tableId: tableId,
     tableSettingObj: obj,
-    currentViewMode: currentViewMode
+    currentViewMode: currentViewMode,
+    currentSettingHash: currentSettingHash
   });
 };
 

package/es/components/table/hooks/useMergeColumnSetting.d.ts

@@ -9,6 +9,7 @@ declare type Params = {
     storageMode: StorageMode;
     currentViewMode: ModeType;
 };
+/** 已废弃 */
 declare const useMergeColumnSetting: (params: Params) => {
     columns: Record<string, any>[];
     onChange: (newColumns: Record<string, any>[]) => void;

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

@@ -7,6 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useMemo, useState } from "react";
 import { useMemoizedFn } from "ahooks";
 import { setTableSettingToLocalStorage } from "../Table/utils";
+/** 已废弃 */
 var useMergeColumnSetting = function useMergeColumnSetting(params) {
   var tableId = params.tableId,
     defaultColumns = params.defaultColumns,
@@ -24,7 +25,8 @@ var useMergeColumnSetting = function useMergeColumnSetting(params) {
         tableSettingObj: {
           column_setting: newColumns
         },
-        currentViewMode: currentViewMode
+        currentViewMode: currentViewMode,
+        currentSettingHash: ""
       });
     }
     dispatch({

package/es/components/table/hooks/useTableSetting.d.ts

@@ -10,6 +10,7 @@ declare type UseTableSettingProps = {
     view: GridViewType;
     currentViewMode: ModeType;
     gallery?: GallerySettingType;
+    currentSettingHash: string;
 };
 declare const useTableSetting: (params: UseTableSettingProps) => {
     setTableSetting: (values: Record<string, any>) => void;

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

@@ -15,7 +15,8 @@ var useTableSetting = function useTableSetting(params) {
     view = params.view,
     currentViewMode = params.currentViewMode,
     propsColumns = params.columns,
-    gallery = params.gallery;
+    gallery = params.gallery,
+    currentSettingHash = params.currentSettingHash;
   var columnsMap = useMemo(function () {
     return new Map(propsColumns.map(function (item) {
       return [item.key, item];
@@ -159,7 +160,8 @@ var useTableSetting = function useTableSetting(params) {
       tableId: tableId,
       allValues: values,
       keys: localStorageSettingKeyArr,
-      currentViewMode: currentViewMode
+      currentViewMode: currentViewMode,
+      currentSettingHash: currentSettingHash
     });
   };
   var tableSetting = useMemo(function () {

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 { getCurrentViewModeFromLocalStorage, mergeColumnSetting, omit } from "./Table/utils";
+import { clearTableSettingToLocalStorage, getCurrentViewModeFromLocalStorage, getHash, getTableSettingFromLocalStorage, mergeColumnSetting, omit } from "./Table/utils";
 import useTransSortSetting from "./hooks/useTransSortSetting";
 import useTransFilterSetting from "./hooks/useTransFilterSetting";
 import useTransDataSourceGroupSetting from "./hooks/useTransDataSourceGroupSetting";
@@ -101,6 +101,15 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return viewMode || defaultViewMode;
   }, [viewMode, defaultViewMode, multiple]);
+  var currentSettingHash = useMemo(function () {
+    return getHash(columns) || "";
+  }, [JSON.stringify(columns)]);
+  useEffect(function () {
+    var setting = getTableSettingFromLocalStorage(tableId);
+    if (setting.currentSettingHash !== currentSettingHash) {
+      clearTableSettingToLocalStorage(tableId);
+    }
+  }, [currentSettingHash, tableId]);
   var _useTableSetting = useTableSetting({
       tableId: tableId,
       filter: filter,
@@ -110,7 +119,8 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       sort: sort,
       view: view,
       currentViewMode: currentViewMode,
-      gallery: gallery
+      gallery: gallery,
+      currentSettingHash: currentSettingHash
     }),
     setTableSetting = _useTableSetting.setTableSetting,
     tableSetting = _useTableSetting.tableSetting;

package/es/index.d.ts

@@ -72,3 +72,4 @@ export { default as List } from "./components/list";
 export { default as Sort } from "./components/sort";
 export { default as InputNumberRange } from "./components/input-number-range";
 export { default as LowCodePage } from "./components/lowCodePage";
+export { default as PickerView } from "./components/picker-view";

package/es/index.js

@@ -91,4 +91,5 @@ export { default as ClassicLayout } from "./components/classicLayout";
 export { default as List } from "./components/list";
 export { default as Sort } from "./components/sort";
 export { default as InputNumberRange } from "./components/input-number-range";
-export { default as LowCodePage } from "./components/lowCodePage";
+export { default as LowCodePage } from "./components/lowCodePage";
+export { default as PickerView } from "./components/picker-view";

package/lib/components/auto-complete/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare const AutoComplete: (props: any) => import("react").JSX.Element;
+declare const AutoComplete: any;
 export default AutoComplete;

package/lib/components/auto-complete/index.js

@@ -23,6 +23,5 @@ __export(auto_complete_exports, {
 });
 module.exports = __toCommonJS(auto_complete_exports);
 var import_antd = require("antd");
-var import_hoc = require("../../utils/hoc");
-var AutoComplete = (0, import_hoc.withWrap)(import_antd.AutoComplete);
+var AutoComplete = import_antd.AutoComplete;
 var auto_complete_default = AutoComplete;

package/lib/components/input/index.js

@@ -23,16 +23,15 @@ __export(input_exports, {
 });
 module.exports = __toCommonJS(input_exports);
 var import_antd = require("antd");
-var import_hoc = require("../../utils/hoc");
 var {
   Group: OriginalGroup,
   TextArea: OriginalTextArea,
   Password: OriginalPassword,
   Search: OriginalSearch
 } = import_antd.Input;
-var Input = (0, import_hoc.withWrap)(import_antd.Input);
+var Input = import_antd.Input;
 Input.Group = OriginalGroup;
-Input.TextArea = (0, import_hoc.withWrap)(OriginalTextArea);
-Input.Password = (0, import_hoc.withWrap)(OriginalPassword);
-Input.Search = (0, import_hoc.withWrap)(OriginalSearch);
+Input.TextArea = OriginalTextArea;
+Input.Password = OriginalPassword;
+Input.Search = OriginalSearch;
 var input_default = Input;

package/lib/components/page/index.js

@@ -117,6 +117,14 @@ var theme = {
       colorTextQuaternary: "#D0D5DD",
       colorBgContainerDisabled: "#F9FAFB",
       colorTextDisabled: "#98A2B3"
+    },
+    "Input": {
+      "fontSizeIcon": 16
+      // "lineHeight": 1
+    },
+    "Select": {
+      "fontSizeIcon": 16
+      // "lineHeight": 1
     }
   },
   token: {

package/lib/components/picker-view/index.d.ts

@@ -0,0 +1,2 @@
+import PickerView from 'antd-mobile/es/components/picker-view';
+export default PickerView;

package/lib/components/picker-view/index.js

@@ -0,0 +1,36 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/picker-view/index.tsx
+var picker_view_exports = {};
+__export(picker_view_exports, {
+  default: () => picker_view_default
+});
+module.exports = __toCommonJS(picker_view_exports);
+var import_picker_view = __toESM(require("antd-mobile/es/components/picker-view"));
+var picker_view_default = import_picker_view.default;

package/lib/components/select/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import "./index.less";
-declare const Select: (props: any) => import("react").JSX.Element;
+declare const Select: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
 export default Select;

package/lib/components/select/index.js

@@ -25,11 +25,10 @@ module.exports = __toCommonJS(select_exports);
 var import_antd = require("antd");
 var import_react = require("react");
 var import_locales = require("../../locales");
-var import_hoc = require("../../utils/hoc");
 var import_ahooks = require("ahooks");
 var import_index = require("./index.less");
 var prefix = "pisell-lowcode-";
-var SelectBase = (props) => {
+var SelectBase = (0, import_react.forwardRef)((props, ref) => {
   const {
     isShowDropdown,
     selectAll,
@@ -84,11 +83,12 @@ var SelectBase = (props) => {
     import_antd.Select,
     {
       ...props,
+      ref,
       value: state,
       onChange: (value, option) => setState(value, option),
       dropdownRender
     }
   );
-};
-var Select = (0, import_hoc.withWrap)(SelectBase);
+});
+var Select = SelectBase;
 var select_default = Select;

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

@@ -1,6 +1,7 @@
 import { GroupValue } from "../Actions/component/Group/PopoverContent";
 import { FilterItemProps, FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, GallerySettingValueType, ModeType, SortType } from "../types";
+export declare const getHash: (obj: any) => any;
 export declare const calcFilterSort: ({ dataSource, filter, sort, columns }: any) => any;
 /**
  * 合并列设置
@@ -55,6 +56,7 @@ declare type ViewSetting = {
  */
 declare type TableSettingObjType = {
     view_mode: ModeType;
+    currentSettingHash: string;
 } & {
     [K in ModeType]: ViewSetting;
 };
@@ -63,13 +65,15 @@ declare type TableSettingObjType = {
  * @param tableId 表格id
  * @param tableSettingObj 表格设置对象
  */
-export declare const setTableSettingToLocalStorage: ({ tableId, tableSettingObj, currentViewMode, }: {
+export declare const setTableSettingToLocalStorage: ({ tableId, tableSettingObj, currentViewMode, currentSettingHash, }: {
     tableId: string;
     tableSettingObj: Partial<ViewSetting & {
         view_mode: ModeType;
     }>;
     currentViewMode: ModeType;
+    currentSettingHash: string;
 }) => void;
+export declare const clearTableSettingToLocalStorage: (tableId?: string) => void;
 /**
  * 从本地存储中获取表格设置, 全部配置
  * @param tableId 表格ID
@@ -93,11 +97,12 @@ export declare const getTableSettingByCurrentViewMode: (tableId: string, current
  * @param allValues 表单所有值
  * @param keys 存储的键名
  */
-export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, currentViewMode, }: {
+export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, currentViewMode, currentSettingHash, }: {
     tableId?: string | undefined;
     allValues?: Record<string, any> | undefined;
     keys?: string[] | undefined;
     currentViewMode: ModeType;
+    currentSettingHash: string;
 }) => void;
 /**
  * 合并筛选设置
@@ -141,6 +146,6 @@ 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 {};

package/lib/components/table/Table/utils.js

@@ -30,8 +30,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calcFilterSort: () => calcFilterSort,
+  clearTableSettingToLocalStorage: () => clearTableSettingToLocalStorage,
   filterDataSource: () => filterDataSource,
   getCurrentViewModeFromLocalStorage: () => getCurrentViewModeFromLocalStorage,
+  getHash: () => getHash,
   getIdByRowKey: () => getIdByRowKey,
   getSettingKeyArrByMode: () => getSettingKeyArrByMode,
   getTableSettingByCurrentViewMode: () => getTableSettingByCurrentViewMode,
@@ -47,9 +49,16 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
+var import_md5 = __toESM(require("crypto-js/md5"));
+var import_enc_hex = __toESM(require("crypto-js/enc-hex"));
 var import_fields = require("./fields");
 var import_utils2 = require("./fields/utils");
 var tableKeyPrefix = "table-setting";
+var getHash = (obj) => {
+  const jsonString = JSON.stringify(obj);
+  const hash = (0, import_md5.default)(jsonString);
+  return hash.toString(import_enc_hex.default.Hex);
+};
 var transColumnsMap = (columns) => {
   return columns.reduce((p, c) => {
     return {
@@ -233,7 +242,8 @@ var groupDataSource = (dataSource, group, rowKey) => {
 var setTableSettingToLocalStorage = ({
   tableId,
   tableSettingObj,
-  currentViewMode
+  currentViewMode,
+  currentSettingHash
 }) => {
   if (!tableId)
     return;
@@ -249,6 +259,7 @@ var setTableSettingToLocalStorage = ({
   newData = {
     ...newData,
     view_mode: view_mode || newData.view_mode,
+    currentSettingHash,
     [currentViewMode]: {
       ...newData[currentViewMode] || {},
       ...itemSetting
@@ -256,6 +267,11 @@ var setTableSettingToLocalStorage = ({
   };
   localStorage.setItem(getTableKey(tableId), JSON.stringify(newData));
 };
+var clearTableSettingToLocalStorage = (tableId) => {
+  if (!tableId)
+    return;
+  localStorage.removeItem(getTableKey(tableId));
+};
 var getTableSettingFromLocalStorage = (tableId) => {
   if (!tableId)
     return {};
@@ -277,7 +293,8 @@ var setFormValuesToLocalStorage = ({
   tableId,
   allValues,
   keys,
-  currentViewMode
+  currentViewMode,
+  currentSettingHash
 }) => {
   if (!tableId)
     return;
@@ -288,7 +305,8 @@ var setFormValuesToLocalStorage = ({
   setTableSettingToLocalStorage({
     tableId,
     tableSettingObj: obj,
-    currentViewMode
+    currentViewMode,
+    currentSettingHash
   });
 };
 var getTableKey = (tableId) => `${tableKeyPrefix}-${tableId}`;
@@ -424,8 +442,10 @@ var omit = (obj, keys) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcFilterSort,
+  clearTableSettingToLocalStorage,
   filterDataSource,
   getCurrentViewModeFromLocalStorage,
+  getHash,
   getIdByRowKey,
   getSettingKeyArrByMode,
   getTableSettingByCurrentViewMode,

package/lib/components/table/hooks/useMergeColumnSetting.d.ts

@@ -9,6 +9,7 @@ declare type Params = {
     storageMode: StorageMode;
     currentViewMode: ModeType;
 };
+/** 已废弃 */
 declare const useMergeColumnSetting: (params: Params) => {
     columns: Record<string, any>[];
     onChange: (newColumns: Record<string, any>[]) => void;

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

@@ -33,7 +33,8 @@ var useMergeColumnSetting = (params) => {
       (0, import_utils.setTableSettingToLocalStorage)({
         tableId,
         tableSettingObj: { column_setting: newColumns },
-        currentViewMode
+        currentViewMode,
+        currentSettingHash: ""
       });
     }
     dispatch({

package/lib/components/table/hooks/useTableSetting.d.ts

@@ -10,6 +10,7 @@ declare type UseTableSettingProps = {
     view: GridViewType;
     currentViewMode: ModeType;
     gallery?: GallerySettingType;
+    currentSettingHash: string;
 };
 declare const useTableSetting: (params: UseTableSettingProps) => {
     setTableSetting: (values: Record<string, any>) => void;

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

@@ -34,7 +34,8 @@ var useTableSetting = (params) => {
     view,
     currentViewMode,
     columns: propsColumns,
-    gallery
+    gallery,
+    currentSettingHash
   } = params;
   const columnsMap = (0, import_react.useMemo)(() => {
     return new Map(propsColumns.map((item) => [item.key, item]));
@@ -188,7 +189,8 @@ var useTableSetting = (params) => {
       tableId,
       allValues: values,
       keys: localStorageSettingKeyArr,
-      currentViewMode
+      currentViewMode,
+      currentSettingHash
     });
   };
   const tableSetting = (0, import_react.useMemo)(() => {