@pisell/materials 6.3.6 → 6.3.8

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { AppVersionControlProps } from './types';
 import './index.less';
 declare const AppVersionControl: (props: AppVersionControlProps) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { AutoCompleteProps, InputNumberProps } from "antd";
 interface AutoCompleteNumberProps {
     autoCompleteProps: AutoCompleteProps;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { BadgeProps as OriginalBadgeprops } from 'antd';
 import './index.less';
 export interface Badgeprops extends OriginalBadgeprops {

package/es/components/batch-editor/fields/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: {
     price: import("react").FC<import("./Price").PriceProps>;
     image: (props: import("./Image").ImageProps) => JSX.Element | null;

package/es/components/batch-editor/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface BatchEditorProps {
     columns: any[];

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ColorPickerProps } from 'antd';
 declare const ColorPicker: (props: ColorPickerProps) => JSX.Element;
 export default ColorPicker;

package/es/components/config-provider/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ConfigProviderProps as OriginalConfigProviderProps } from "antd/es/config-provider";
 import "dayjs/locale/zh-cn";
 export interface ConfigProviderProps extends OriginalConfigProviderProps {

package/es/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -43,7 +43,7 @@ export declare const withDataSource: <P extends unknown>(WrappedComponent: React
 }) => JSX.Element;
 export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     options?: any;
-    optionSourceType?: "default" | "custom" | "api" | undefined;
+    optionSourceType?: "custom" | "default" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -1,7 +1,7 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["renderMode", "value", "onChange"],
   _excluded2 = ["name", "label", "mode", "renderMode", "tooltip", "noStyle", "extra", "required", "requiredobj", "minLengthobj", "maxLengthobj", "typeobj", "maxobj", "minobj", "normalize", "getValueProps", "validator", "style", "validateTrigger", "__designMode", "labelCol", "hideLabel", "innerStyle"];
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -172,9 +172,27 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           break;
         case 'phone':
           rules.push({
-            validator: function validator(_, value) {
+            validator: function validator(_, originValue) {
+              var _value, _phone;
+              var value = "";
+              if (isString(originValue)) {
+                value = originValue;
+              } else if (originValue && 'phone' in originValue) {
+                value = "".concat((originValue === null || originValue === void 0 ? void 0 : originValue.countryCallingCode) || "").concat(originValue.phone || "");
+              }
+
               // 如果值为空或者只有空格，直接返回成功，不进行校验
-              if (!(value !== null && value !== void 0 && value.trim())) {
+              if (!((_value = value) !== null && _value !== void 0 && _value.trim())) {
+                if ((requiredobj === null || requiredobj === void 0 ? void 0 : requiredobj.required) === false) {
+                  return Promise.resolve();
+                } else if (_typeof(originValue) == 'object') {
+                  // 如果是object，存在phone和contryCallingCode都为空的场景，需要拦截
+                  return Promise.reject(new Error(requiredobj.message || getText('pisell-data-source-form-required-message')));
+                }
+              }
+
+              // 如果是object返回格式，非必填且phone为空，不进行校验
+              if (typeof originValue !== 'string' && (requiredobj === null || requiredobj === void 0 ? void 0 : requiredobj.required) === false && (originValue === null || originValue === void 0 || (_phone = originValue.phone) === null || _phone === void 0 ? void 0 : _phone.trim()) === '') {
                 return Promise.resolve();
               }
               try {
@@ -194,9 +212,17 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           break;
         case 'mobile':
           rules.push({
-            validator: function validator(_, value) {
+            validator: function validator(_, originValue) {
+              var _value2;
+              var value = "";
+              if (isString(originValue)) {
+                value = originValue;
+              } else if (originValue && 'phone' in originValue) {
+                value = "".concat((originValue === null || originValue === void 0 ? void 0 : originValue.countryCallingCode) || "").concat(originValue.phone || "");
+              }
+
               // 如果值为空或者只有空格，直接返回成功，不进行校验
-              if (!(value !== null && value !== void 0 && value.trim())) {
+              if (!((_value2 = value) !== null && _value2 !== void 0 && _value2.trim())) {
                 return Promise.resolve();
               }
               try {
@@ -363,7 +389,9 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           rules: rules
         });
       }
-      return _objectSpread(_objectSpread({}, otherProps || {}), (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {}) || {};
+      return _objectSpread(_objectSpread(_objectSpread({}, otherProps || {}), (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {}), {}, {
+        onChange: undefined
+      });
     }, [overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /*#__PURE__*/React.createElement(Form.Item, _extends({
       required: required,

package/es/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.d.ts

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

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

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

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["columns", "dataSource", "operationContent"];
+var _excluded = ["columns", "dataSource", "operationContent", "currentSettingKey"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -29,6 +29,7 @@ var BaseTable = function BaseTable(props, ref) {
   var propsColumns = props.columns,
     dataSource = props.dataSource,
     operationContent = props.operationContent,
+    currentSettingKey = props.currentSettingKey,
     others = _objectWithoutProperties(props, _excluded);
   var tableRef = useRef(null);
   var componentId = useComponentId(props);
@@ -45,6 +46,9 @@ var BaseTable = function BaseTable(props, ref) {
     }
     return originData;
   }, [originData, __designMode]);
+  var formatCurrentSettingKey = useMemo(function () {
+    return currentSettingKey || props.__id || "";
+  }, [currentSettingKey]);
   var _useDataSourceKey = useDataSourceKey(),
     dataSourceKey = _useDataSourceKey.dataSourceKey,
     dataSourceKeyRef = _useDataSourceKey.dataSourceKeyRef;
@@ -60,12 +64,13 @@ var BaseTable = function BaseTable(props, ref) {
     containerProps = _useDrawerState.containerProps,
     Container = _useDrawerState.Container,
     drawerContent = _useDrawerState.drawerContent;
-  var _useTableQuery = useTableQuery(props),
+  var _useTableQuery = useTableQuery(props, formatCurrentSettingKey),
     queryPageConfig = _useTableQuery.queryPageConfig,
     handleValuesChange = _useTableQuery.handleValuesChange,
     refreshData = _useTableQuery.refreshData,
     handleFilterChange = _useTableQuery.handleFilterChange,
-    refreshCurrentPage = _useTableQuery.refreshCurrentPage;
+    refreshCurrentPage = _useTableQuery.refreshCurrentPage,
+    getInitialValues = _useTableQuery.getInitialValues;
   var handleAllValuesChange = function handleAllValuesChange(changedValues, values) {
     var _props$onValuesChange;
     props === null || props === void 0 || (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 || _props$onValuesChange.call(props, changedValues, values);
@@ -137,7 +142,8 @@ var BaseTable = function BaseTable(props, ref) {
     closeDrawer: closeDrawer,
     refreshData: refreshData,
     handleFilterChange: handleFilterChange,
-    tableRef: tableRef
+    tableRef: tableRef,
+    getInitialValues: getInitialValues
   });
   useImperativeHandle(ref, function () {
     if (tableRef.current) {
@@ -151,6 +157,7 @@ var BaseTable = function BaseTable(props, ref) {
   return /*#__PURE__*/React.createElement(TableSettingProvider, null, /*#__PURE__*/React.createElement(Table, _extends({
     ref: tableRef
   }, others, transformProps, {
+    currentSettingKey: formatCurrentSettingKey,
     dataSource: (data === null || data === void 0 ? void 0 : data.data) || [],
     loading: list === null || list === void 0 ? void 0 : list.loading,
     onValuesChange: handleAllValuesChange

package/es/components/dataSourceComponents/dataSourceTable/filter/index.d.ts

@@ -22,6 +22,7 @@ interface FilterProps {
         placeholder: string;
         key: string;
     };
+    getInitialValues?: () => Record<string, any>;
 }
 declare const Filter: (props: FilterProps) => JSX.Element;
 export default Filter;

package/es/components/dataSourceComponents/dataSourceTable/filter/index.js

@@ -37,7 +37,8 @@ var Filter = function Filter(props) {
     handleValuesChange = props.handleValuesChange,
     search = props.search,
     filterBy = props.filterBy,
-    show = props.show;
+    show = props.show,
+    getInitialValues = props.getInitialValues;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -149,6 +150,9 @@ var Filter = function Filter(props) {
       allowClear: true
     }) : null;
   }, [search]);
+  var initialValues = useMemo(function () {
+    return getInitialValues === null || getInitialValues === void 0 ? void 0 : getInitialValues();
+  }, [search, filterBy]);
   return /*#__PURE__*/React.createElement(Form, {
     labelCol: {
       span: 0
@@ -157,7 +161,8 @@ var Filter = function Filter(props) {
     size: "large",
     layout: "inline",
     className: "filter-form-wrapper",
-    onValuesChange: onValuesChange
+    onValuesChange: onValuesChange,
+    initialValues: initialValues
   }, searchDom, filterDom, show && sortButtonShow && /*#__PURE__*/React.createElement(FilterButton, {
     value: list,
     quickFilterMaxLength: quickFilterMaxLength,

package/es/components/dataSourceComponents/dataSourceTable/filter/utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterItemProps } from '../../../filter/types';
 import { DataSourceType, Field } from '../../provider/dataSource/DataSourceContext';
 export declare const genGetField: (dataSource?: DataSourceType) => (key: string) => Field;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDrawerState.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Drawer } from 'antd';
 import { OperationItem } from '../type';
 declare const useDrawerState: (operationContent?: {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -9,6 +9,7 @@ interface UseTablePropsProps {
     refreshData: () => void;
     handleFilterChange: (changedFields: any, allFields: any) => void;
     tableRef: any;
+    getInitialValues: () => Record<string, any>;
 }
 /**
  * 处理table的props
@@ -17,7 +18,8 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
+    currentComponentId: any;
+    title: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,11 +28,16 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
-    filter: JSX.Element | null;
+    filter: {
+        dom: any;
+        items: any;
+    } | null;
     onRow: (record: any) => any;
     actionButtons: any[] | null;
+    __id?: string | undefined;
+    currentSettingKey?: string | undefined;
     titleButtons?: {
         show: boolean;
         maxCount: number;
@@ -42,12 +49,6 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         items: OperationItem[];
     } | undefined;
     operation?: {
-        /**
-         * 处理table的props
-         * 转换title
-         * @param props
-         * @returns
-         */
         show: boolean;
         title: string;
         width: number;
@@ -94,5 +95,6 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         create?: Record<string, any> | undefined;
         destroy?: Record<string, any> | undefined;
     } | undefined;
+    localSettings?: import("../../../table/types").LocalSettingsType | undefined;
 };
 export default useTableProps;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -35,7 +35,8 @@ var useTableProps = function useTableProps(props) {
     closeDrawer = props.closeDrawer,
     refreshData = props.refreshData,
     handleFilterChange = props.handleFilterChange,
-    tableRef = props.tableRef;
+    tableRef = props.tableRef,
+    getInitialValues = props.getInitialValues;
   var propsTitle = originProps.title,
     propsSubTitle = originProps.subTitle,
     titleButtons = originProps.titleButtons,
@@ -45,7 +46,9 @@ var useTableProps = function useTableProps(props) {
     search = originProps.search,
     clickToDetail = originProps.clickToDetail,
     propsOnRow = originProps.onRow,
-    filterBy = originProps.filterBy;
+    filterBy = originProps.filterBy,
+    currentSettingKey = originProps.currentSettingKey,
+    __id = originProps.__id;
   var _ref = operation || {},
     items = _ref.items,
     show = _ref.show,
@@ -109,7 +112,7 @@ var useTableProps = function useTableProps(props) {
 
   // 删除记录
   var handleDelete = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, softDelete) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, softDelete, customDeleteAction) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -122,27 +125,38 @@ var useTableProps = function useTableProps(props) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
+                      if (!customDeleteAction) {
+                        _context.next = 5;
+                        break;
+                      }
+                      _context.next = 3;
+                      return customDeleteAction(record);
+                    case 3:
+                      _context.next = 13;
+                      break;
+                    case 5:
                       if (!softDelete) {
-                        _context.next = 6;
+                        _context.next = 11;
                         break;
                       }
+                      // 软删除
                       deleteTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-                      _context.next = 4;
+                      _context.next = 9;
                       return update === null || update === void 0 ? void 0 : update.runAsync(_objectSpread(_objectSpread({}, record), {}, {
                         deleted_at: deleteTime
                       }));
-                    case 4:
-                      _context.next = 8;
+                    case 9:
+                      _context.next = 13;
                       break;
-                    case 6:
-                      _context.next = 8;
+                    case 11:
+                      _context.next = 13;
                       return destroy === null || destroy === void 0 ? void 0 : destroy.runAsync(record.id);
-                    case 8:
+                    case 13:
                       refreshData();
                       PisellToast({
                         content: getText('pisell-action-delete-success')
                       });
-                    case 10:
+                    case 15:
                     case "end":
                       return _context.stop();
                   }
@@ -160,7 +174,7 @@ var useTableProps = function useTableProps(props) {
         }
       }, _callee2);
     }));
-    return function (_x, _x2) {
+    return function (_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }());
@@ -192,7 +206,7 @@ var useTableProps = function useTableProps(props) {
                 okText: getText('pisell-delete-confirm-ok'),
                 cancelText: getText('pisell-delete-confirm-cancel'),
                 onOk: function onOk() {
-                  handleDelete(record, item === null || item === void 0 ? void 0 : item.softDelete);
+                  handleDelete(record, item === null || item === void 0 ? void 0 : item.softDelete, item === null || item === void 0 ? void 0 : item.customDeleteAction);
                 }
               });
               return;
@@ -279,12 +293,17 @@ var useTableProps = function useTableProps(props) {
     if (!(propsFilter !== null && propsFilter !== void 0 && propsFilter.show) && !(search !== null && search !== void 0 && search.show)) {
       return null;
     }
-    return /*#__PURE__*/React.createElement(Filter, _extends({}, propsFilter, {
+    var dom = /*#__PURE__*/React.createElement(Filter, _extends({}, propsFilter, {
       componentId: componentId,
       search: search,
       handleValuesChange: handleFilterChange,
-      filterBy: filterBy
+      filterBy: filterBy,
+      getInitialValues: getInitialValues
     }));
+    return {
+      dom: dom,
+      items: propsFilter === null || propsFilter === void 0 ? void 0 : propsFilter.items
+    };
   }, [propsFilter, search]);
   var onRow = useMemoizedFn(function (record) {
     if (!(clickToDetail !== null && clickToDetail !== void 0 && clickToDetail.show)) {
@@ -315,6 +334,7 @@ var useTableProps = function useTableProps(props) {
     });
   });
   return _objectSpread(_objectSpread({}, originProps), {}, {
+    currentComponentId: componentId,
     title: title,
     pagination: pagination,
     columns: columns,

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSourceTableProps } from '../type';
 declare type Params = {
     pagination?: {
@@ -12,7 +11,7 @@ declare type Params = {
         sortBy: string;
     };
 };
-declare const useTableQuery: (props: DataSourceTableProps) => {
+declare const useTableQuery: (props: DataSourceTableProps, currentSettingHash: string) => {
     queryPageConfig: {
         page: number;
         pageSize: number;
@@ -29,5 +28,6 @@ declare const useTableQuery: (props: DataSourceTableProps) => {
     refreshData: () => void;
     handleFilterChange: (changedFields: any, allFields: any) => void;
     refreshCurrentPage: () => void;
+    getInitialValues: () => Record<string, any>;
 };
 export default useTableQuery;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.js

@@ -10,13 +10,24 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
-var useTableQuery = function useTableQuery(props) {
+import { getCurrentViewModeFromLocalStorage, getTableSettingByCurrentViewMode, setTableSettingToLocalStorage } from "../../../table/Table/utils";
+var useTableQuery = function useTableQuery(props, currentSettingHash) {
   var _tabs$items, _tabs$items2;
   var filterBy = props.filterBy,
     sortBy = props.sortBy,
-    tabs = props.tabs;
+    tabs = props.tabs,
+    localSettings = props.localSettings;
+  var tableId = useMemo(function () {
+    if (props.__designMode === 'design') {
+      return 'designMode-mock-table-id';
+    }
+    return (props === null || props === void 0 ? void 0 : props.currentComponentId) || props.__id;
+  }, [props.__id, props.__designMode, props === null || props === void 0 ? void 0 : props.currentComponentId]);
+  var currentViewMode = useMemo(function () {
+    return getCurrentViewModeFromLocalStorage(tableId) || 'grid';
+  }, [tableId]);
 
   // 分页配置
   var _useState = useState({
@@ -28,19 +39,50 @@ var useTableQuery = function useTableQuery(props) {
     _useState2 = _slicedToArray(_useState, 2),
     queryPageConfig = _useState2[0],
     setQueryPageConfig = _useState2[1];
+  var getInitialValues = useMemoizedFn(function () {
+    try {
+      if (!tableId) return {};
+      var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
+      console.log('setting22', setting);
+      return (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+    } catch (e) {
+      return {};
+    }
+  });
+
+  // 初始读取本地 filters（若开启本地记忆且 scope 包含 filters）
+  useEffect(function () {
+    var _localSettings$scope;
+    if (!tableId) return;
+    var enable = !!(localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope = localSettings.scope) !== null && _localSettings$scope !== void 0 && _localSettings$scope.includes('filters'));
+    if (!enable) return;
+    var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
+    var persisted = (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+    if (persisted && Object.keys(persisted).length > 0) {
+      setQueryPageConfig(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          filter: _objectSpread(_objectSpread({}, prev.filter), persisted)
+        });
+      });
+    }
+  }, [tableId, currentViewMode, JSON.stringify(localSettings)]);
 
   // 分页变化
   var handleValuesChange = useMemoizedFn(function (params, allParams) {
+    var _localSettings$scope2;
     var _ref = params.pagination || {},
       page = _ref.page,
       size = _ref.size;
+    var nextFilterForSave = null;
     setQueryPageConfig(function (prev) {
       var sort = prev.sort || sortBy;
       var filter = prev.filter;
       if ("tabs" in params) {
         var _params$tabs, _params$tabs2;
         sort = ((_params$tabs = params.tabs) === null || _params$tabs === void 0 ? void 0 : _params$tabs.sortBy) || sortBy || "";
-        filter = _objectSpread(_objectSpread({}, prev.filter), ((_params$tabs2 = params.tabs) === null || _params$tabs2 === void 0 ? void 0 : _params$tabs2.filterBy) || {});
+        var tabsFilter = ((_params$tabs2 = params.tabs) === null || _params$tabs2 === void 0 ? void 0 : _params$tabs2.filterBy) || {};
+        filter = _objectSpread(_objectSpread({}, prev.filter), tabsFilter);
+        nextFilterForSave = filter;
       }
       if ("order_by" in params) {
         var _allParams$tabs;
@@ -53,14 +95,57 @@ var useTableQuery = function useTableQuery(props) {
         filter: filter
       });
     });
+
+    // 当 tabs 变化导致 filter 变更时，同步写入本地（遵循 localSettings）
+    var enable = !!(localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope2 = localSettings.scope) !== null && _localSettings$scope2 !== void 0 && _localSettings$scope2.includes('filters'));
+    if (enable && tableId && nextFilterForSave) {
+      var excluded = new Set((localSettings === null || localSettings === void 0 ? void 0 : localSettings.excludedFilterFields) || []);
+      var filtered = {};
+      Object.keys(nextFilterForSave).forEach(function (k) {
+        if (!excluded.has(k)) {
+          filtered[k] = nextFilterForSave[k];
+        }
+      });
+      setTableSettingToLocalStorage({
+        tableId: tableId,
+        tableSettingObj: {
+          filters: filtered
+        },
+        currentViewMode: currentViewMode,
+        currentSettingHash: currentSettingHash
+      });
+    }
   });
   var handleFilterChange = useMemoizedFn(function (changedFields, allFields) {
+    var _localSettings$scope3;
+    var nextFilter = _objectSpread({}, allFields);
     setQueryPageConfig(function (prev) {
       return _objectSpread(_objectSpread({}, prev), {}, {
         page: 1,
-        filter: _objectSpread(_objectSpread(_objectSpread({}, prev.filter), allFields), filterBy || {})
+        filter: _objectSpread(_objectSpread(_objectSpread({}, prev.filter), nextFilter), filterBy || {})
       });
     });
+
+    // 写入本地（仅当开启本地记忆且 scope 包含 filters）
+    var enable = !!(localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope3 = localSettings.scope) !== null && _localSettings$scope3 !== void 0 && _localSettings$scope3.includes('filters'));
+    if (enable && tableId) {
+      // 按 excludedFilterFields 过滤写入
+      var excluded = new Set((localSettings === null || localSettings === void 0 ? void 0 : localSettings.excludedFilterFields) || []);
+      var filtered = {};
+      Object.keys(nextFilter || {}).forEach(function (k) {
+        if (!excluded.has(k)) {
+          filtered[k] = nextFilter[k];
+        }
+      });
+      setTableSettingToLocalStorage({
+        tableId: tableId,
+        tableSettingObj: {
+          filters: filtered
+        },
+        currentViewMode: currentViewMode,
+        currentSettingHash: currentSettingHash
+      });
+    }
   });
   var refreshData = useMemoizedFn(function () {
     setQueryPageConfig(function (prev) {
@@ -80,7 +165,8 @@ var useTableQuery = function useTableQuery(props) {
     handleValuesChange: handleValuesChange,
     refreshData: refreshData,
     handleFilterChange: handleFilterChange,
-    refreshCurrentPage: refreshCurrentPage
+    refreshCurrentPage: refreshCurrentPage,
+    getInitialValues: getInitialValues
   };
 };
 export default useTableQuery;