@pisell/materials 6.8.17 → 6.8.19

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

@@ -54,7 +54,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -72,7 +72,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "middle" | "large";
+        openContentSize: "large" | "middle" | "small";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "saas" | "xzero";
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -19,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "saas" | "xzero";
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -59,13 +59,11 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -78,14 +76,14 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "saas" | "xzero";
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -97,5 +95,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.d.ts

@@ -6,6 +6,7 @@ export declare const COLUMNS_SHARED_STATE_KEYS: {
 };
 export interface ColumnsSettingProps {
     scopeId?: string;
+    __id?: string;
 }
 export interface ColumnSettingItem {
     key: string;
@@ -16,7 +17,12 @@ export interface ColumnSettingItem {
     sortIndex?: number;
     fixed?: 'left' | 'right' | boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+/**
+ * 暴露给父组件的 ref 方法
+ */
+export interface ColumnsSettingRef {
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<ColumnsSettingRef> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 export default _default;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.js

@@ -4,9 +4,10 @@ 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 React, { forwardRef, useState, useEffect } from 'react';
+import React, { forwardRef, useState, useEffect, useImperativeHandle } from 'react';
 import withContainer from "../../utils/withContainer";
 import ColumnsSetting from "../../../table/Actions/component/ColumnsSetting";
+import { saveColumnSettingToLocal } from "./utils";
 export var COLUMNS_SHARED_STATE_KEYS = {
   columnsValue: function columnsValue(instanceId) {
     return "".concat(instanceId, ":columns:value");
@@ -15,14 +16,23 @@ export var COLUMNS_SHARED_STATE_KEYS = {
     return "".concat(instanceId, ":columns:change");
   }
 };
-var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
+
+/**
+ * 暴露给父组件的 ref 方法
+ */
+
+var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props, ref) {
   var refManager = props.refManager,
     _props$scopeId = props.scopeId,
-    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId;
+    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId,
+    __id = props.__id;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {};
+  }, []);
   useEffect(function () {
     var unsubscribe = refManager.subscribeSharedState(COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId), setValue);
     return unsubscribe;
@@ -31,6 +41,23 @@ var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
     var typedValue = newValue;
     setValue(typedValue);
     refManager.setSharedState(COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId), typedValue);
+    if (__id) {
+      saveColumnSettingToLocal({
+        componentId: __id,
+        columnSetting: typedValue.map(function (col, index) {
+          var _col$sortIndex;
+          return {
+            key: col.key,
+            dataIndex: col.dataIndex,
+            title: col.title,
+            titleString: col.titleString,
+            isShow: col.isShow,
+            sortIndex: (_col$sortIndex = col.sortIndex) !== null && _col$sortIndex !== void 0 ? _col$sortIndex : index,
+            fixed: col.fixed
+          };
+        })
+      });
+    }
   };
   return /*#__PURE__*/React.createElement(ColumnsSetting, {
     value: value,

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+export declare const saveColumnSettingToLocal: ({ componentId, columnSetting, }: {
+    componentId: string;
+    columnSetting: Array<{
+        key: string;
+        dataIndex: string;
+        title?: React.ReactNode;
+        titleString?: string;
+        isShow: boolean;
+        sortIndex?: number;
+        fixed?: 'left' | 'right' | boolean;
+    }>;
+}) => void;
+export declare const getColumnSettingFromLocal: (componentId?: string) => any;
+export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
+    columns: Record<string, any>[];
+    componentId?: string | undefined;
+}) => {
+    isShow: any;
+    sortIndex: any;
+}[];
+export declare const clearColumnSettingFromLocal: (componentId?: string) => void;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.js

@@ -0,0 +1,117 @@
+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 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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 { isJson } from '@pisell/utils';
+
+/**
+ * 复制过来的功能
+ */
+var getTableKey = function getTableKey(componentId) {
+  // 兼容非浏览器环境（如SSR/测试）
+  if (typeof window === 'undefined' || typeof window.location === 'undefined') {
+    return "table-setting-".concat(componentId);
+  }
+  var _window$location = window.location,
+    pathname = _window$location.pathname,
+    search = _window$location.search;
+  var appendPath = pathname || '/';
+
+  // 仅用于读取 memory_key，其余查询参数忽略
+  var memoryKey = '';
+  try {
+    var params = new URLSearchParams(search || '');
+    var mk = params.get('memory_key');
+    if (mk && mk.trim() !== '') {
+      memoryKey = mk.trim();
+    }
+  } catch (e) {
+    // 忽略解析异常，降级为仅使用 pathname
+  }
+  var urlPart = memoryKey ? "".concat(appendPath, "#").concat(memoryKey) : appendPath;
+  return "table-setting-".concat(componentId, "-").concat(urlPart);
+};
+export var saveColumnSettingToLocal = function saveColumnSettingToLocal(_ref) {
+  var componentId = _ref.componentId,
+    columnSetting = _ref.columnSetting;
+  if (!componentId) return;
+  var storageKey = getTableKey(componentId);
+  var data = {
+    column_setting: columnSetting,
+    updatedAt: Date.now()
+  };
+  localStorage.setItem(storageKey, JSON.stringify(data));
+};
+export var getColumnSettingFromLocal = function getColumnSettingFromLocal(componentId) {
+  if (!componentId) return null;
+  var storageKey = getTableKey(componentId);
+  var originData = localStorage.getItem(storageKey);
+  if (originData && isJson(originData)) {
+    var data = JSON.parse(originData);
+    return data.column_setting;
+  }
+  return null;
+};
+export var mergeColumnSettingSimple = function mergeColumnSettingSimple(_ref2) {
+  var columns = _ref2.columns,
+    componentId = _ref2.componentId;
+  // 没有 componentId，直接返回默认配置
+  if (!componentId) {
+    return columns.map(function (item, index) {
+      var _item$isShow;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow = item.isShow) !== null && _item$isShow !== void 0 ? _item$isShow : true,
+        sortIndex: index
+      });
+    });
+  }
+
+  // 从本地存储读取
+  var cachedColumns = getColumnSettingFromLocal(componentId);
+  if (!cachedColumns || !Array.isArray(cachedColumns)) {
+    return columns.map(function (item, index) {
+      var _item$isShow2;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow2 = item.isShow) !== null && _item$isShow2 !== void 0 ? _item$isShow2 : true,
+        sortIndex: index
+      });
+    });
+  }
+
+  // 构建本地缓存的 Map（使用 dataIndex 作为 key）
+  var cachedMap = new Map(cachedColumns.map(function (item) {
+    return [item.dataIndex, item];
+  }));
+
+  // 合并配置：本地缓存优先
+  var mergedColumns = columns.map(function (item, index) {
+    var _item$isShow3;
+    var cached = cachedMap.get(item.dataIndex);
+    if (cached) {
+      var _cached$isShow, _cached$sortIndex;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_cached$isShow = cached.isShow) !== null && _cached$isShow !== void 0 ? _cached$isShow : true,
+        sortIndex: (_cached$sortIndex = cached.sortIndex) !== null && _cached$sortIndex !== void 0 ? _cached$sortIndex : index
+        // 注意：fixed 等特殊字段不从缓存中覆盖，保持 props 传入的值
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      isShow: (_item$isShow3 = item.isShow) !== null && _item$isShow3 !== void 0 ? _item$isShow3 : true,
+      sortIndex: index
+    });
+  });
+
+  // 按 sortIndex 排序
+  mergedColumns.sort(function (a, b) {
+    var _a$sortIndex, _b$sortIndex;
+    return ((_a$sortIndex = a.sortIndex) !== null && _a$sortIndex !== void 0 ? _a$sortIndex : 0) - ((_b$sortIndex = b.sortIndex) !== null && _b$sortIndex !== void 0 ? _b$sortIndex : 0);
+  });
+  return mergedColumns;
+};
+export var clearColumnSettingFromLocal = function clearColumnSettingFromLocal(componentId) {
+  if (!componentId) return;
+  var storageKey = getTableKey(componentId);
+  localStorage.removeItem(storageKey);
+};

package/es/components/pisellDataSourceContainer/components/Pagination/index.js

@@ -2,7 +2,7 @@ var _excluded = ["serverActions", "refManager"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 import Pagination from "../../../Pagination";
 import withContainer from "../../utils/withContainer";
 import { getText } from "../../../../locales";
@@ -12,19 +12,23 @@ var WithPagination = /*#__PURE__*/forwardRef(function (props) {
     otherProps = _objectWithoutProperties(props, _excluded);
   var pagination = listAction.pagination,
     data = listAction.data;
+
+  /** 分页配置属性 */
+  var paginationProps = useMemo(function () {
+    return {
+      showTotal: function showTotal(total) {
+        return getText('table-pagination-total')((pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1, Math.ceil(total / ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10)));
+      },
+      total: (data === null || data === void 0 ? void 0 : data.count) || 0,
+      current: (pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1,
+      pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10,
+      onChange: listAction.onPageChange
+    };
+  }, [pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber, pagination === null || pagination === void 0 ? void 0 : pagination.pageSize, data === null || data === void 0 ? void 0 : data.count, listAction.onPageChange]);
   if (!pagination) {
     console.error('分页功能未启用');
     return null;
   }
-  return /*#__PURE__*/React.createElement(Pagination, _extends({
-    showTotal: function showTotal(total) {
-      return getText('table-pagination-total')((pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1, total);
-    }
-  }, otherProps, {
-    total: (data === null || data === void 0 ? void 0 : data.count) || 0,
-    current: (pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1,
-    pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10,
-    onChange: listAction.onPageChange
-  }));
+  return /*#__PURE__*/React.createElement(Pagination, _extends({}, otherProps, paginationProps));
 });
 export default withContainer(WithPagination, 'pagination');

package/es/components/pisellDataSourceContainer/components/Table/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { DataSourceContainerContextType } from '../../type';
 declare const _default: React.ForwardRefExoticComponent<Omit<Partial<import("antd").TableProps<any>> & DataSourceContainerContextType & {
     scopeId?: string | undefined;
+    __id?: string | undefined;
 } & React.RefAttributes<unknown> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;

package/es/components/pisellDataSourceContainer/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 = ["serverActions", "refManager", "columns", "scopeId"];
+var _excluded = ["serverActions", "refManager", "columns", "scopeId", "__id"];
 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; }
@@ -19,14 +19,16 @@ var WithTable = /*#__PURE__*/forwardRef(function (props) {
     columns = props.columns,
     _props$scopeId = props.scopeId,
     scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId,
+    __id = props.__id,
     otherProps = _objectWithoutProperties(props, _excluded);
   var data = listAction.data,
     loading = listAction.loading;
-  // 🔥 使用 useColumns hook 管理列状态
+  // 🔥 使用 useColumns hook 管理列状态（支持本地缓存）
   var _useColumns = useColumns({
       columns: columns || [],
       scopeId: scopeId,
-      refManager: refManager
+      refManager: refManager,
+      __id: __id
     }),
     visibleColumns = _useColumns.visibleColumns;
   return /*#__PURE__*/React.createElement(Table, _extends({}, otherProps, {

package/es/components/pisellDataSourceContainer/components/Table/useColumns.d.ts

@@ -6,6 +6,7 @@ interface UseColumnsParams {
     columns: any[];
     scopeId: string;
     refManager: RefManagerContextType;
+    __id?: string;
 }
 declare const useColumns: (params: UseColumnsParams) => {
     visibleColumns: any[];

package/es/components/pisellDataSourceContainer/components/Table/useColumns.js

@@ -6,6 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useEffect, useMemo } from 'react';
 import { COLUMNS_SHARED_STATE_KEYS } from "../ColumnsSetting";
+import { mergeColumnSettingSimple } from "../ColumnsSetting/utils";
 
 /**
  * useColumns Hook 参数
@@ -14,7 +15,8 @@ import { COLUMNS_SHARED_STATE_KEYS } from "../ColumnsSetting";
 var useColumns = function useColumns(params) {
   var columns = params.columns,
     scopeId = params.scopeId,
-    refManager = params.refManager;
+    refManager = params.refManager,
+    __id = params.__id;
 
   // 本地状态：存储列配置
   var _useState = useState([]),
@@ -23,14 +25,30 @@ var useColumns = function useColumns(params) {
     setColumnSettings = _useState2[1];
   useEffect(function () {
     if (!(columns !== null && columns !== void 0 && columns.length)) return;
-    var settings = columns.map(function (col, index) {
+
+    // 🔄 合并本地缓存和默认配置
+    var mergedColumns = mergeColumnSettingSimple({
+      columns: columns.map(function (col, index) {
+        return {
+          key: col.key || col.dataIndex,
+          dataIndex: col.dataIndex,
+          title: col.title,
+          titleString: typeof col.title === 'string' ? col.title : col.dataIndex,
+          isShow: typeof col.isShow === 'boolean' ? col.isShow : true,
+          sortIndex: index,
+          fixed: col.fixed
+        };
+      }),
+      componentId: __id
+    });
+    var settings = mergedColumns.map(function (col) {
       return {
-        key: col.key || col.dataIndex,
+        key: col.key,
         dataIndex: col.dataIndex,
         title: col.title,
-        titleString: typeof col.title === 'string' ? col.title : col.dataIndex,
-        isShow: typeof col.isShow === 'boolean' ? col.isShow : true,
-        sortIndex: index,
+        titleString: col.titleString,
+        isShow: col.isShow,
+        sortIndex: col.sortIndex,
         fixed: col.fixed
       };
     });
@@ -38,7 +56,7 @@ var useColumns = function useColumns(params) {
     // 写入共享状态（使用统一的 key，供 ColumnsSetting 读取）
     refManager.setSharedState(COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId), settings);
     setColumnSettings(settings);
-  }, [columns, refManager, scopeId]);
+  }, [columns, refManager, scopeId, __id]);
 
   /**
    * 订阅：监听 ColumnsSetting 的修改
@@ -47,22 +65,26 @@ var useColumns = function useColumns(params) {
     var unsubscribe = refManager.subscribeSharedState(COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId), setColumnSettings);
     return unsubscribe;
   }, [refManager, scopeId]);
-  var visibleColumns = useMemo(function () {
-    if (!(columns !== null && columns !== void 0 && columns.length)) return [];
-    if (!(columnSettings !== null && columnSettings !== void 0 && columnSettings.length)) return columns;
+  return useMemo(function () {
+    if (!(columns !== null && columns !== void 0 && columns.length)) return {
+      visibleColumns: []
+    };
+    if (!(columnSettings !== null && columnSettings !== void 0 && columnSettings.length)) return {
+      visibleColumns: columns
+    };
 
     // 创建 dataIndex 到原始 column 的映射
     var columnMap = new Map(columns.map(function (col) {
       return [col.dataIndex, col];
     }));
-    return columnSettings.filter(function (setting) {
+    var visibleColumns = columnSettings.filter(function (setting) {
       return setting.isShow;
     }).map(function (setting) {
       return columnMap.get(setting.dataIndex);
-    }).filter(Boolean); // 过滤掉不存在的 column
+    }).filter(Boolean);
+    return {
+      visibleColumns: visibleColumns
+    };
   }, [columns, columnSettings]);
-  return {
-    visibleColumns: visibleColumns
-  };
 };
 export default useColumns;

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

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

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

@@ -54,7 +54,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -72,7 +72,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "middle" | "large";
+        openContentSize: "large" | "middle" | "small";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "saas" | "xzero";
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -19,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "saas" | "xzero";
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -59,13 +59,11 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -78,14 +76,14 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "saas" | "xzero";
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -97,5 +95,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/lib/components/pisellDataSourceContainer/components/ColumnsSetting/index.d.ts

@@ -6,6 +6,7 @@ export declare const COLUMNS_SHARED_STATE_KEYS: {
 };
 export interface ColumnsSettingProps {
     scopeId?: string;
+    __id?: string;
 }
 export interface ColumnSettingItem {
     key: string;
@@ -16,7 +17,12 @@ export interface ColumnSettingItem {
     sortIndex?: number;
     fixed?: 'left' | 'right' | boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+/**
+ * 暴露给父组件的 ref 方法
+ */
+export interface ColumnsSettingRef {
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<ColumnsSettingRef> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 export default _default;