@pisell/materials 2.2.108 → 2.2.110

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

@@ -0,0 +1,100 @@
+import React from 'react';
+import { DataSourceTableProps } from '../type';
+import { OperationItem } from '../type';
+interface UseTablePropsProps {
+    data: any;
+    originProps: DataSourceTableProps;
+    openDrawer: (type: OperationItem) => void;
+    closeDrawer: () => void;
+    refreshData: () => void;
+    handleFilterChange: (changedFields: any, allFields: any) => void;
+    tableRef: any;
+    getInitialValues: () => Record<string, any>;
+}
+/**
+ * 处理table的props
+ * 转换title
+ * @param props
+ * @returns
+ */
+declare const useTableProps: (props: UseTablePropsProps) => {
+    currentComponentId: any;
+    title: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    pagination: {
+        total: number;
+        current: number;
+        pageSize: number;
+        size: string;
+        showSizeChanger: boolean;
+    };
+    columns: import("./useColumns").Column[];
+    subTitle: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    buttons: any[] | 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;
+        items: OperationItem[];
+    } | undefined;
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    } | undefined;
+    operation?: {
+        show: boolean;
+        title: string;
+        width: number;
+        align: "center" | "left" | "right";
+        fixed: false | "left" | "right";
+        type: "link" | "button";
+        items: OperationItem[];
+    } | undefined;
+    operationContent?: {
+        [key: string]: React.ReactNode;
+    } | undefined;
+    dataSource: import("../../provider/dataSource/DataSourceContext").DataSourceType;
+    search?: {
+        show: boolean;
+        placeholder: string;
+    } | undefined;
+    __designMode: string;
+    componentId: string;
+    clickToDetail?: {
+        show: boolean;
+        useCustomAction: boolean;
+        actionType: string;
+        openMode: "modal" | "drawer";
+        openContentSize: "small" | "large" | "middle";
+        openTitle: string;
+        key: string;
+    } | undefined;
+    filterBy?: Record<string, any> | undefined;
+    sortBy: string;
+    tabs?: {
+        show: boolean;
+        type: string;
+        items: {
+            name: string;
+            filterBy: Record<string, any>;
+            sortBy: string;
+        }[];
+    } | undefined;
+    onValuesChange?: ((changedValues: any, values: any) => void) | undefined;
+    extraParams?: {
+        list?: Record<string, any> | undefined;
+        get?: Record<string, any> | undefined;
+        update?: Record<string, any> | undefined;
+        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

@@ -11,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;
@@ -28,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;

package/es/components/dataSourceComponents/dataSourceTable/type.d.ts

@@ -0,0 +1,84 @@
+/// <reference types="react" />
+import { ColumnType } from 'antd/es/table';
+import { LocalSettingsType } from '../../table/types';
+import { DataSourceType } from '../provider/dataSource/DataSourceContext';
+export declare type OperationItem = {
+    label?: string;
+    openMode: 'modal' | 'drawer' | 'custom';
+    openContentSize: 'small' | 'middle' | 'large';
+    openTitle: string;
+    actionType: 'detail' | 'edit' | 'delete' | 'custom';
+    key: string;
+    buttonProps?: any;
+    onClick?: (record: any) => void;
+    afterClose?: () => void;
+};
+export interface DataSourceTableProps {
+    __id?: string;
+    currentComponentId?: string;
+    currentSettingKey?: string;
+    title?: string | React.ReactNode | (() => React.ReactNode);
+    subTitle?: string | React.ReactNode | (() => React.ReactNode);
+    titleButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
+    buttons?: any[];
+    operation?: {
+        show: boolean;
+        title: string;
+        width: number;
+        align: 'left' | 'center' | 'right';
+        fixed: 'left' | 'right' | false;
+        type: 'link' | 'button';
+        items: OperationItem[];
+    };
+    operationContent?: {
+        [key: string]: React.ReactNode;
+    };
+    dataSource: DataSourceType;
+    columns: ColumnType<any>[];
+    filter: any;
+    search?: {
+        show: boolean;
+        placeholder: string;
+    };
+    __designMode: string;
+    componentId: string;
+    clickToDetail?: {
+        show: boolean;
+        useCustomAction: boolean;
+        actionType: string;
+        openMode: 'modal' | 'drawer';
+        openContentSize: 'small' | 'middle' | 'large';
+        openTitle: string;
+        key: string;
+    };
+    onRow?: any;
+    filterBy?: Record<string, any>;
+    sortBy: string;
+    tabs?: {
+        show: boolean;
+        type: string;
+        items: {
+            name: string;
+            filterBy: Record<string, any>;
+            sortBy: string;
+        }[];
+    };
+    onValuesChange?: (changedValues: any, values: any) => void;
+    extraParams?: {
+        list?: Record<string, any>;
+        get?: Record<string, any>;
+        update?: Record<string, any>;
+        create?: Record<string, any>;
+        destroy?: Record<string, any>;
+    };
+    localSettings?: LocalSettingsType;
+}

package/es/components/dataSourceComponents/fields/Input.Mobile/WithMode.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { InputProps } from 'antd';
+import { ModeType } from "../../dataSourceForm/type";
+export interface PhoneInputProps extends Omit<InputProps, 'value' | 'onChange'> {
+    renderMode: ModeType;
+    value?: string;
+    onChange?: (value: string) => void;
+}
+declare const MobileNumberInputWithMode: React.FC<PhoneInputProps & import("../../dataSourceForm/utils").WithModeProps>;
+export default MobileNumberInputWithMode;

package/es/components/dataSourceComponents/fields/Input.Phone/WithMode.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { InputProps } from 'antd';
+import { ModeType } from "../../dataSourceForm/type";
+export interface PhoneInputProps extends Omit<InputProps, 'value' | 'onChange'> {
+    renderMode: ModeType;
+    value?: string;
+    onChange?: (value: string) => void;
+}
+declare const PhoneNumberInputWithMode: React.FC<PhoneInputProps & import("../../dataSourceForm/utils").WithModeProps>;
+export default PhoneNumberInputWithMode;

package/es/components/dataSourceComponents/fields/Input.Phone/serve.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 获取nocobase数据列表
+ */
+export declare const getCountryDataList: () => Promise<any>;
+export interface Country {
+    id: number;
+    name: {
+        en: string;
+        "zh-CN": string;
+        "zh-HK": string;
+        original: string;
+    };
+    code: string;
+    calling_code: string;
+    currency_code: string;
+    sort: number;
+    status: string;
+    created_at: string;
+    updated_at: string;
+    prefix: string;
+}
+export declare const useCountries: () => {
+    data: Country[];
+};

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" | "xzero" | "saas";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

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

@@ -1,6 +1,7 @@
+/// <reference types="react" />
 declare const SelectWithDataSource: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "custom" | "default" | "api" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/fields/Upload/BaseUpload.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { UploadProps } from './type';
+import './index.less';
+declare const BaseUpload: React.FC<UploadProps>;
+export default BaseUpload;