@pisell/materials 6.3.6 → 6.3.8

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

@@ -5,8 +5,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useMemo } from "react";
-import { getSettingKeyArrByMode, getTableSettingByCurrentViewMode, getTableSettingFromLocalStorage, mergeColumnSetting, mergeFilterSetting, setFormValuesToLocalStorage } from "../Table/utils";
+import { getSettingKeyArrByMode, getTableSettingByCurrentViewMode, getTableSettingFromLocalStorage, mergeColumnSetting, mergeFilterSetting, setTableSettingToLocalStorage, setFormValuesToLocalStorage } from "../Table/utils";
 import { useMemoizedFn } from "ahooks";
+import React from "react";
 var useTableSetting = function useTableSetting(params) {
   var tableId = params.tableId,
     filter = params.filter,
@@ -18,7 +19,8 @@ var useTableSetting = function useTableSetting(params) {
     propsColumns = params.columns,
     gallery = params.gallery,
     currentSettingHash = params.currentSettingHash,
-    exportImport = params.exportImport;
+    exportImport = params.exportImport,
+    localSettings = params.localSettings;
   var columnsMap = useMemo(function () {
     return new Map(propsColumns.map(function (item) {
       return [item.key, item];
@@ -60,7 +62,8 @@ var useTableSetting = function useTableSetting(params) {
    * 获取需要本地存储的 keyArr
    */
   var localStorageSettingKeyArr = useMemo(function () {
-    return getSettingKeyArrByMode({
+    var _localSettings$scope;
+    var keys = getSettingKeyArrByMode({
       filter: filter,
       columnSetting: columnSetting,
       dataSourceGroup: dataSourceGroup,
@@ -68,6 +71,13 @@ var useTableSetting = function useTableSetting(params) {
       mode: "localStorage",
       currentViewMode: currentViewMode
     });
+    // 本地记忆：filters 范围 -> 存储到 filter 字段
+    if (localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope = localSettings.scope) !== null && _localSettings$scope !== void 0 && _localSettings$scope.includes("filters")) {
+      if (!keys.includes("filters")) {
+        keys.push("filters");
+      }
+    }
+    return keys;
   }, [tableId, filter, columnSetting, dataSourceGroup, sort, currentViewMode]);
   var defaultKeyArr = useMemo(function () {
     return getSettingKeyArrByMode({
@@ -117,6 +127,8 @@ var useTableSetting = function useTableSetting(params) {
           compactMode: (mergedSetting === null || mergedSetting === void 0 || (_mergedSetting$item3 = mergedSetting[item]) === null || _mergedSetting$item3 === void 0 ? void 0 : _mergedSetting$item3.compactMode) || defaultGalleryCoverSetting.compactMode,
           isShowLabel: (_mergedSetting$item$i = mergedSetting === null || mergedSetting === void 0 || (_mergedSetting$item4 = mergedSetting[item]) === null || _mergedSetting$item4 === void 0 ? void 0 : _mergedSetting$item4.isShowLabel) !== null && _mergedSetting$item$i !== void 0 ? _mergedSetting$item$i : defaultGalleryCoverSetting.isShowLabel
         });
+      } else if (item === "filters") {
+        setting[item] = (mergedSetting === null || mergedSetting === void 0 ? void 0 : mergedSetting[item]) || {};
       } else {
         setting[item] = mergedSetting === null || mergedSetting === void 0 ? void 0 : mergedSetting[item];
       }
@@ -158,17 +170,113 @@ var useTableSetting = function useTableSetting(params) {
    * @param values
    */
   var setTableSetting = useMemoizedFn(function (values) {
+    var _localSettings$scope2;
+    // 计算需要存储的 filter 值（仅当开启本地记忆且包含 filters 时）
+    var valuesForSave = values;
+    if (localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope2 = localSettings.scope) !== null && _localSettings$scope2 !== void 0 && _localSettings$scope2.includes("filters")) {
+      var excluded = new Set((localSettings === null || localSettings === void 0 ? void 0 : localSettings.excludedFilterFields) || []);
+      var filterValue = {};
+      ((filter === null || filter === void 0 ? void 0 : filter.list) || []).forEach(function (item) {
+        var rawName = item === null || item === void 0 ? void 0 : item.name;
+        if (!rawName) return;
+        var key = Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+        if (excluded.has(key)) return;
+        if (values.hasOwnProperty(key)) {
+          filterValue[key] = values[key];
+        }
+      });
+      valuesForSave = _objectSpread(_objectSpread({}, values), {}, {
+        filters: filterValue
+      });
+    }
     setFormValuesToLocalStorage({
       tableId: tableId,
-      allValues: values,
+      allValues: valuesForSave,
       keys: localStorageSettingKeyArr,
       currentViewMode: currentViewMode,
       currentSettingHash: currentSettingHash
     });
   });
   var tableSetting = useMemo(function () {
-    return _objectSpread(_objectSpread({}, tableLocalSetting), defaultTableSetting);
+    var _localSettings$scope3;
+    var merged = _objectSpread(_objectSpread({}, tableLocalSetting), defaultTableSetting);
+    // 将本地记忆的 filter 扁平化注入初始表单值（不改变存储结构）
+    if (localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope3 = localSettings.scope) !== null && _localSettings$scope3 !== void 0 && _localSettings$scope3.includes("filters")) {
+      var persistedFilter = tableLocalSetting === null || tableLocalSetting === void 0 ? void 0 : tableLocalSetting.filters;
+      if (persistedFilter && _typeof(persistedFilter) === "object") {
+        return _objectSpread(_objectSpread({}, merged), persistedFilter);
+      }
+    }
+    return merged;
   }, [tableLocalSetting, defaultTableSetting]);
+
+  /**
+   * 当刷新后获得新的 localSettings（scope 或 excludedFilterFields 变化）时，
+   * 根据最新规则调整已存储的 filters
+   */
+  // 对本地已存储 filters 做一次对齐（仅在必要时写回）
+  useMemo(function () {
+    try {
+      var _localSettings$scope4;
+      if (!tableId) return;
+      var current = getTableSettingByCurrentViewMode(tableId, currentViewMode) || {};
+      var persistedFilters = (current === null || current === void 0 ? void 0 : current.filters) || {};
+      var nextFilters = _objectSpread({}, persistedFilters);
+      var shouldUpdate = false;
+      var enableFiltersMemory = !!(localSettings !== null && localSettings !== void 0 && localSettings.enable && (_localSettings$scope4 = localSettings.scope) !== null && _localSettings$scope4 !== void 0 && _localSettings$scope4.includes("filters"));
+      if (!enableFiltersMemory) {
+        if (Object.keys(persistedFilters || {}).length > 0) {
+          nextFilters = {};
+          shouldUpdate = true;
+        }
+      } else {
+        var names = new Set();
+        if ( /*#__PURE__*/React.isValidElement(filter) || /*#__PURE__*/React.isValidElement(filter === null || filter === void 0 ? void 0 : filter.dom)) {
+          names = new Set(((filter === null || filter === void 0 ? void 0 : filter.items) || []).filter(function (item) {
+            return !item.isHidden;
+          }).map(function (item) {
+            var rawName = item === null || item === void 0 ? void 0 : item.value;
+            if (!rawName) return undefined;
+            return Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+          }));
+        } else {
+          names = new Set(((filter === null || filter === void 0 ? void 0 : filter.list) || []).map(function (item) {
+            var rawName = item === null || item === void 0 ? void 0 : item.name;
+            if (!rawName) return undefined;
+            return Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+          }).filter(Boolean));
+        }
+        var excluded = new Set((localSettings === null || localSettings === void 0 ? void 0 : localSettings.excludedFilterFields) || []);
+        var allowed = new Set(Array.from(names).filter(function (k) {
+          return !excluded.has(k);
+        }));
+        var filtered = {};
+        Object.keys(persistedFilters || {}).forEach(function (k) {
+          if (allowed.has(k)) {
+            filtered[k] = persistedFilters[k];
+          } else {
+            shouldUpdate = true;
+          }
+        });
+        if (Object.keys(filtered).length !== Object.keys(persistedFilters || {}).length) {
+          shouldUpdate = true;
+        }
+        nextFilters = filtered;
+      }
+      if (shouldUpdate) {
+        setTableSettingToLocalStorage({
+          tableId: tableId,
+          tableSettingObj: {
+            filters: nextFilters
+          },
+          currentViewMode: currentViewMode,
+          currentSettingHash: currentSettingHash
+        });
+      }
+    } catch (e) {
+      // ignore
+    }
+  }, []);
   return {
     setTableSetting: setTableSetting,
     tableSetting: tableSetting

package/es/components/table/index.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 = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "showTitle", "subTitle", "showSubTitle", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "currentSettingKey", "exportImport", "currentComponentId", "tabs"];
+var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "showTitle", "subTitle", "showSubTitle", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "localSettings", "view", "gallery", "currentSettingKey", "exportImport", "currentComponentId", "tabs"];
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -24,7 +24,7 @@ import useEngineContext from "../../hooks/useEngineContext";
 import Actions from "./Actions";
 import Header from "./Header";
 import Summary from "./Summary";
-import { clearTableSettingToLocalStorage, getCurrentViewModeFromLocalStorage, getHash, getTableSettingFromLocalStorage, mergeColumnSetting, omit, stringify } from "./Table/utils";
+import { clearTableSettingToLocalStorage, getCurrentViewModeFromLocalStorage, getTableSettingByCurrentViewMode, getHash, getTableSettingFromLocalStorage, mergeColumnSetting, omit, stringify } from "./Table/utils";
 import View from "./View";
 import useTableSetting from "./hooks/useTableSetting";
 import useTransDataSourceGroupSetting from "./hooks/useTransDataSourceGroupSetting";
@@ -58,6 +58,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     _onValuesChange = props.onValuesChange,
     columnSetting = props.columnSetting,
     propsDataSourceGroup = props.dataSourceGroup,
+    _localSettings = props.localSettings,
     _props$view = props.view,
     view = _props$view === void 0 ? defaultView : _props$view,
     gallery = props.gallery,
@@ -162,7 +163,8 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       view: view,
       currentViewMode: currentViewMode,
       gallery: gallery,
-      currentSettingHash: currentSettingHash
+      currentSettingHash: currentSettingHash,
+      localSettings: _localSettings
     }),
     setTableSetting = _useTableSetting.setTableSetting,
     tableSetting = _useTableSetting.tableSetting;
@@ -246,6 +248,15 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     if (wrapRef.current) {
       wrapRef.current.formInstance = form;
+      wrapRef.current.getCachedFilters = function () {
+        try {
+          if (!tableId) return {};
+          var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
+          return (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+        } catch (e) {
+          return {};
+        }
+      };
     }
     // forwardRef 后需要返回元素才能选中
     return wrapRef.current;

package/es/components/table/types.d.ts

@@ -191,6 +191,21 @@ export declare type ExportImportType = {
     apiUrl?: ApiProps;
     otherParams?: any;
 };
+/**
+ * 设置记忆范围
+ */
+export declare type LocalSettingsScope = "filters" | "sorting" | "columns";
+/**
+ * 本地记忆设置
+ */
+export declare type LocalSettingsType = {
+    /** 启用设置记忆 */
+    enable: boolean;
+    /** 记忆范围 */
+    scope: LocalSettingsScope[];
+    /** 不需要记忆的筛选字段（当 scope 包含 filters 时生效） */
+    excludedFilterFields?: string[];
+};
 export declare type GridViewProps = {
     columns: any;
     dataSource: any[];
@@ -247,5 +262,7 @@ export declare type GridViewProps = {
             sortBy?: string;
         }[];
     };
+    /** 本地记忆设置 */
+    localSettings?: LocalSettingsType;
 };
 export {};

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 import './index.less';
 export interface Version {

package/es/components/virtual-keyboard/BaseNumberKeyboard/Presets.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./Presets.less";
 export declare type PresetsItem = {
     label: string;

package/es/components/virtual-keyboard/Time/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const formatStringToTime: (value: string) => {
     valueArray: string[];
     valueString: string;

package/es/components/walletCard/Guest/index.d.ts

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

package/es/components/walletCard/Guide/index.d.ts

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

package/es/locales/en-US.d.ts

@@ -276,5 +276,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/es/locales/en-US.js

@@ -340,5 +340,17 @@ export default {
   'pisell2.text.goodpass.product-vouchers': 'Promotions & Vouchers',
   'pisell2.text.goodpass.last-settlement': '(Last payment)',
   'pisell2.text.goodpass.view-more': 'View More',
-  'pisell2.text.goodpass.save': 'Save'
+  'pisell2.text.goodpass.save': 'Save',
+  // 相机组件
+  'pisell-camera-no-camera-accessible': 'No camera accessible',
+  'pisell-camera-permission-denied': 'Permission denied',
+  'pisell-camera-switch-camera': 'Switch camera',
+  'pisell-camera-canvas': 'Canvas not supported',
+  'pisell-camera-checking': 'Detecting camera...',
+  'pisell-camera-no-camera-desc': 'Please check if your device has a camera or grant browser permission to access camera',
+  // 拍照组件
+  'pisell-upload-camera-local-files': 'Local Files',
+  'pisell-upload-camera-capture': 'Capture',
+  'pisell-upload-camera-retake': 'Retake',
+  'pisell-upload-camera-use': 'Use photo'
 };

package/es/locales/zh-CN.d.ts

@@ -271,5 +271,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/es/locales/zh-CN.js

@@ -331,5 +331,17 @@ export default {
   'pisell2.text.goodpass.product-vouchers': '优惠促销',
   'pisell2.text.goodpass.last-settlement': '(上次结算)',
   'pisell2.text.goodpass.view-more': '查看更多',
-  'pisell2.text.goodpass.save': '节省'
+  'pisell2.text.goodpass.save': '节省',
+  // 相机组件
+  'pisell-camera-no-camera-accessible': '没有找到摄像头',
+  'pisell-camera-permission-denied': '没有权限使用摄像头',
+  'pisell-camera-switch-camera': '切换摄像头',
+  'pisell-camera-canvas': 'canvas不支持',
+  'pisell-camera-checking': '正在检测摄像头...',
+  'pisell-camera-no-camera-desc': '请检查设备是否连接摄像头或授权浏览器访问摄像头',
+  // 拍照组件
+  'pisell-upload-camera-local-files': '本地文件',
+  'pisell-upload-camera-capture': '拍摄/拍照',
+  'pisell-upload-camera-retake': '重拍',
+  'pisell-upload-camera-use': '使用照片'
 };

package/es/locales/zh-TW.d.ts

@@ -271,5 +271,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/es/locales/zh-TW.js

@@ -332,5 +332,17 @@ export default {
   'pisell2.text.goodpass.product-vouchers': '優惠促銷',
   'pisell2.text.goodpass.last-settlement': '(上次結算)',
   'pisell2.text.goodpass.view-more': '查看更多',
-  'pisell2.text.goodpass.save': '節省'
+  'pisell2.text.goodpass.save': '節省',
+  // 相机组件
+  'pisell-camera-no-camera-accessible': '沒有找到攝像頭',
+  'pisell-camera-permission-denied': '沒有權限使用攝像頭',
+  'pisell-camera-switch-camera': '切換攝像頭',
+  'pisell-camera-canvas': 'canvas不支持',
+  'pisell-camera-checking': '正在檢測攝像頭...',
+  'pisell-camera-no-camera-desc': '請檢查設備是否連接攝像頭或授權瀏覽器訪問攝像頭',
+  // 拍照组件
+  'pisell-upload-camera-local-files': '本地文件',
+  'pisell-upload-camera-capture': '拍攝/拍照',
+  'pisell-upload-camera-retake': '重拍',
+  'pisell-upload-camera-use': '使用照片'
 };

package/es/utils/platform.d.ts

@@ -1 +1 @@
-export declare const isMobile: () => any;
+export declare const isMobile: () => boolean;

package/lib/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/lib/components/auto-complete-number/index.d.ts

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

package/lib/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/lib/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/lib/components/batch-editor/index.d.ts

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

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

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

package/lib/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/lib/components/checkbox/index.d.ts

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

package/lib/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/lib/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/lib/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/lib/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/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -186,8 +186,26 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           break;
         case "phone":
           rules.push({
-            validator: (_, value) => {
+            validator: (_, originValue) => {
+              var _a2;
+              let value = "";
+              if ((0, import_utils.isString)(originValue)) {
+                value = originValue;
+              } else if (originValue && "phone" in originValue) {
+                value = `${(originValue == null ? void 0 : originValue.countryCallingCode) || ""}${originValue.phone || ""}`;
+              }
               if (!(value == null ? void 0 : value.trim())) {
+                if ((requiredobj == null ? void 0 : requiredobj.required) === false) {
+                  return Promise.resolve();
+                } else if (typeof originValue == "object") {
+                  return Promise.reject(
+                    new Error(
+                      requiredobj.message || (0, import_locales.getText)("pisell-data-source-form-required-message")
+                    )
+                  );
+                }
+              }
+              if (typeof originValue !== "string" && (requiredobj == null ? void 0 : requiredobj.required) === false && ((_a2 = originValue == null ? void 0 : originValue.phone) == null ? void 0 : _a2.trim()) === "") {
                 return Promise.resolve();
               }
               try {
@@ -213,7 +231,13 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           break;
         case "mobile":
           rules.push({
-            validator: (_, value) => {
+            validator: (_, originValue) => {
+              let value = "";
+              if ((0, import_utils.isString)(originValue)) {
+                value = originValue;
+              } else if (originValue && "phone" in originValue) {
+                value = `${(originValue == null ? void 0 : originValue.countryCallingCode) || ""}${originValue.phone || ""}`;
+              }
               if (!(value == null ? void 0 : value.trim())) {
                 return Promise.resolve();
               }
@@ -422,7 +446,7 @@ var withFormItem = (WrappedComponent, overlayProps) => {
           rules
         });
       }
-      return { ...otherProps || {}, ...(overlayProps == null ? void 0 : overlayProps.otherFormItemProps) || {} };
+      return { ...otherProps || {}, ...(overlayProps == null ? void 0 : overlayProps.otherFormItemProps) || {}, onChange: void 0 };
     }, [overlayProps == null ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /* @__PURE__ */ import_react.default.createElement(
       import_form.default.Item,

package/lib/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/lib/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/lib/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -56,6 +56,7 @@ var BaseTable = (props, ref) => {
     columns: propsColumns,
     dataSource,
     operationContent,
+    currentSettingKey,
     ...others
   } = props;
   const tableRef = (0, import_react.useRef)(null);
@@ -70,6 +71,9 @@ var BaseTable = (props, ref) => {
     }
     return originData;
   }, [originData, __designMode]);
+  const formatCurrentSettingKey = (0, import_react.useMemo)(() => {
+    return currentSettingKey || props.__id || "";
+  }, [currentSettingKey]);
   const { dataSourceKey, dataSourceKeyRef } = (0, import_useDataSourceKey.default)();
   const beforeClose = (0, import_react.useRef)();
   const setBeforeClose = (0, import_react.useCallback)((fn) => {
@@ -84,7 +88,7 @@ var BaseTable = (props, ref) => {
     Container,
     drawerContent
   } = (0, import_useDrawerState.default)(operationContent);
-  const { queryPageConfig, handleValuesChange, refreshData, handleFilterChange, refreshCurrentPage } = (0, import_useTableQuery.default)(props);
+  const { queryPageConfig, handleValuesChange, refreshData, handleFilterChange, refreshCurrentPage, getInitialValues } = (0, import_useTableQuery.default)(props, formatCurrentSettingKey);
   const handleAllValuesChange = (changedValues, values) => {
     var _a;
     (_a = props == null ? void 0 : props.onValuesChange) == null ? void 0 : _a.call(props, changedValues, values);
@@ -130,7 +134,8 @@ var BaseTable = (props, ref) => {
     closeDrawer,
     refreshData,
     handleFilterChange,
-    tableRef
+    tableRef,
+    getInitialValues
   });
   (0, import_react.useImperativeHandle)(ref, () => {
     if (tableRef.current) {
@@ -147,6 +152,7 @@ var BaseTable = (props, ref) => {
       ref: tableRef,
       ...others,
       ...transformProps,
+      currentSettingKey: formatCurrentSettingKey,
       dataSource: (data == null ? void 0 : data.data) || [],
       loading: list == null ? void 0 : list.loading,
       onValuesChange: handleAllValuesChange

package/lib/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/lib/components/dataSourceComponents/dataSourceTable/filter/index.js

@@ -52,7 +52,8 @@ var Filter = (props) => {
     handleValuesChange,
     search,
     filterBy,
-    show
+    show,
+    getInitialValues
   } = props;
   const [form] = import_antd.Form.useForm();
   const { dataSource } = (0, import_useDataSource.default)();
@@ -155,6 +156,9 @@ var Filter = (props) => {
       }
     ) : null;
   }, [search]);
+  const initialValues = (0, import_react.useMemo)(() => {
+    return getInitialValues == null ? void 0 : getInitialValues();
+  }, [search, filterBy]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Form,
     {
@@ -163,7 +167,8 @@ var Filter = (props) => {
       size: "large",
       layout: "inline",
       className: "filter-form-wrapper",
-      onValuesChange
+      onValuesChange,
+      initialValues
     },
     searchDom,
     filterDom,

package/lib/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/lib/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?: {