@zat-design/sisyphus-react 3.11.14 → 3.12.0-beta.2

package/es/ProStep/utils/index.js

@@ -1,5 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { debounce, pick } from 'lodash';
+/**
+ * 处理滚动到指定元素位置
+ * @param id 目标元素的ID
+ * @param options 滚动选项
+ */
 export var handleScroll = function handleScroll(id, options) {
   var _ref = options || {},
     _ref$targetOffset = _ref.targetOffset,
@@ -16,10 +21,14 @@ export var handleScroll = function handleScroll(id, options) {
     }, 100), 0);
   }
 };
-/** 获取加载模块数据信息 */
+/**
+ * 获取加载模块数据信息
+ * @param registerMap 注册映射对象
+ * @returns 模块加载状态列表
+ */
 export var getLoadedMap = function getLoadedMap(registerMap) {
   if (!(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current)) {
-    return undefined;
+    return [];
   }
   var stepList = Object.values(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current).map(function (item) {
     return _objectSpread(_objectSpread({}, pick(item, ['id', 'order', 'title'])), {}, {

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -2,9 +2,9 @@
  * 调整点：
  */
 import React from 'react';
-import { ProTableColumn } from '../../propsType';
+import type { ProTableColumnType } from '../../propsType';
 export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
-    column: ProTableColumn;
+    column: ProTableColumnType;
     originalObj: any;
     rowKey: any;
     wrapToolTipProps?: any;

package/es/ProTable/components/FormatColumn/index.js

@@ -62,8 +62,7 @@ export var formatColumn = function formatColumn(_ref2) {
     valueType = column.valueType,
     _column$format = column.format,
     format = _column$format === void 0 ? 'YYYY-MM-DD HH:mm:ss' : _column$format,
-    _column$precision = column.precision,
-    precision = _column$precision === void 0 ? 0 : _column$precision,
+    precision = column.precision,
     ellipsis = column.ellipsis,
     code = column.code,
     copyable = column.copyable,
@@ -114,9 +113,6 @@ export var formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    // if (!originalObj && Object.keys(originalObj ?? {}).length === 0 && !onDiff) {
-    //   return;
-    // }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
@@ -214,9 +210,10 @@ export var formatColumn = function formatColumn(_ref2) {
   if (ellipsis) {
     column.ellipsis = false;
   }
-  var valueTypePrecision = precision;
+  var valueTypePrecision = precision !== null && precision !== void 0 ? precision : 0;
+  // 千分位、千分位带CNY前缀, 百分比、千分比保留小数点2位
   if (['percentage', 'permillage', 'thousandth', 'thousandthCNY'].includes(valueType)) {
-    valueTypePrecision = precision || 2;
+    valueTypePrecision = precision !== null && precision !== void 0 ? precision : 2;
   }
   // 百分比、千分比
   if (['percentage', 'permillage'].includes(valueType)) {
@@ -264,7 +261,7 @@ export var formatColumn = function formatColumn(_ref2) {
     // 千分位, 千分位带CNY前缀
   } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
+      var valueStr = valueTypePrecision || valueTypePrecision === 0 ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var isChanged = originalResult.isChanged,

package/es/ProTable/components/RenderTabs/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ProTableTabsType } from '../../propsType';
+declare const _default: import("react").MemoExoticComponent<(props: ProTableTabsType) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

package/es/ProTable/components/RenderTabs/index.js

@@ -0,0 +1,78 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/tabs/style";
+import _Tabs from "antd/es/tabs";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo, useState, useEffect, memo } from 'react';
+import useEnum from '../../../ProEnum/hooks/useEnum';
+var RenderTabs = function RenderTabs(props) {
+  var code = props.code,
+    _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+    transformResponse = props.transformResponse,
+    tabsProps = props.tabsProps,
+    name = props.name,
+    formTableProps = props.formTableProps;
+  var _ref = formTableProps || {},
+    form = _ref.form,
+    onSearch = _ref.onSearch;
+  var _useState = useState(props.activeKey),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  var _useEnum = useEnum(code),
+    _useEnum2 = _slicedToArray(_useEnum, 1),
+    options = _useEnum2[0];
+  var fieldValue = _Form.useWatch(name, form);
+  // 使用useMemo计算派生状态
+  var tabItems = useMemo(function () {
+    var defaultItems = [].concat(_toConsumableArray(dataSource), _toConsumableArray(options || []));
+    // 合并数据源并转换格式
+    var mergedData = defaultItems.map(function (item) {
+      return {
+        key: item.value,
+        label: item.label
+      };
+    });
+    if (transformResponse && typeof transformResponse === 'function') {
+      mergedData = transformResponse(defaultItems, formTableProps);
+      return mergedData.map(function (item) {
+        return {
+          key: String(item.value),
+          label: item.label
+        };
+      });
+    }
+    return mergedData.map(function (item) {
+      return {
+        key: String(item.key),
+        label: item.label
+      };
+    });
+  }, [dataSource, options, transformResponse]);
+  useEffect(function () {
+    var _tabItems$;
+    setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 ? void 0 : (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
+  }, [fieldValue]);
+  if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
+    return null;
+  }
+  return _jsx(_Tabs, _objectSpread(_objectSpread({
+    className: "pro-table-tabs",
+    onChange: function onChange(key) {
+      var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+      setActiveKey(key);
+      form.setFieldValue(name, key);
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(_objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key)));
+    },
+    type: "card"
+  }, tabsProps), {}, {
+    items: tabItems,
+    activeKey: activeKey
+  }));
+};
+export default /*#__PURE__*/memo(RenderTabs);

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

@@ -1,5 +1,30 @@
+/**
+ * 表格可伸缩列组件
+ * @description 实现表格列宽可调整功能
+ */
 export { default as TableResizable } from './TableResizable';
+/**
+ * 表格空数据渲染组件
+ * @description 当表格数据为空时的显示内容
+ */
 export { default as RenderEmptyText } from './RenderEmptyText';
+/**
+ * 表格汇总行组件
+ * @description 用于渲染表格底部的汇总信息
+ */
 export { default as RenderSummary } from './RenderSummary';
+/**
+ * 表格头部渲染组件
+ * @description 自定义表格头部区域，支持自定义内容和操作按钮
+ */
 export { default as RenderTableHeader } from './RenderTableHeader';
+/**
+ * 表格底部渲染组件
+ * @description 自定义表格底部区域，支持添加额外操作按钮
+ */
 export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格标签页组件
+ * @description 实现表格顶部的标签页切换功能，用于数据分类展示
+ */
+export { default as RenderTabs } from './RenderTabs';

package/es/ProTable/components/index.js

@@ -1,5 +1,30 @@
+/**
+ * 表格可伸缩列组件
+ * @description 实现表格列宽可调整功能
+ */
 export { default as TableResizable } from './TableResizable';
+/**
+ * 表格空数据渲染组件
+ * @description 当表格数据为空时的显示内容
+ */
 export { default as RenderEmptyText } from './RenderEmptyText';
+/**
+ * 表格汇总行组件
+ * @description 用于渲染表格底部的汇总信息
+ */
 export { default as RenderSummary } from './RenderSummary';
+/**
+ * 表格头部渲染组件
+ * @description 自定义表格头部区域，支持自定义内容和操作按钮
+ */
 export { default as RenderTableHeader } from './RenderTableHeader';
-export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格底部渲染组件
+ * @description 自定义表格底部区域，支持添加额外操作按钮
+ */
+export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格标签页组件
+ * @description 实现表格顶部的标签页切换功能，用于数据分类展示
+ */
+export { default as RenderTabs } from './RenderTabs';

package/es/ProTable/hooks/useAntdTable.d.ts

@@ -1,95 +1,4 @@
-import { Key } from 'react';
 import { useRequest } from 'ahooks';
-import { RequestOptions, Service } from '../propsType';
-declare function useAntdTable<I, R extends Record<string, any>, S extends Service<I, R>>(service: S, options?: RequestOptions<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): {
-    data: R[];
-    params: any;
-    rowSelection: {
-        fixed: boolean;
-        type: import("antd/es/table/interface").RowSelectionType;
-        columnWidth: number;
-        selectedRowKeys: Key[];
-        onChange(rowKeys: Key[], rows: any[]): void;
-        onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: (record?: any) => {
-            className: string;
-        };
-        selections: boolean | ({
-            key: string;
-            text: string;
-            onSelect: (changeableRowKeys: Key[]) => void;
-        } | {
-            key: string;
-            text: any;
-            onSelect: () => Promise<void>;
-        })[];
-    };
-    searchValues: I;
-    allSelected: boolean;
-    selectedTip: string;
-    selectedRowKeys: Key[];
-    selectedRecords: R[];
-    clearSelected: () => void;
-    setSelectedRowKeys: (selectedRowKeys: Key[]) => void;
-    setSelectedRecords: (selectedRecords: R[]) => void;
-    pagination: {
-        current: number;
-        pageSize: number;
-        showSizeChanger: boolean;
-        showQuickJumper: boolean;
-        onPaginationChange: boolean;
-        total: number;
-        showTotal: (total: any) => string;
-        onShowSizeChange: (current: number, pageSize: number) => void;
-        onChange: (current: number, pageSize: number) => void;
-    };
-    onReset: () => void;
-    onSearch: (values: any) => void;
-    refresh: () => Promise<void>;
-    tableProps: {
-        rowKey: string | import("rc-table/lib/interface").GetRowKey<R>;
-        loading: boolean;
-        dataSource: R[];
-        rowSelection: {
-            fixed: boolean;
-            type: import("antd/es/table/interface").RowSelectionType;
-            columnWidth: number;
-            selectedRowKeys: Key[];
-            onChange(rowKeys: Key[], rows: any[]): void;
-            onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: (record?: any) => {
-                className: string;
-            };
-            selections: boolean | ({
-                key: string;
-                text: string;
-                onSelect: (changeableRowKeys: Key[]) => void;
-            } | {
-                key: string;
-                text: any;
-                onSelect: () => Promise<void>;
-            })[];
-        };
-        pagination: {
-            current: number;
-            pageSize: number;
-            showSizeChanger: boolean;
-            showQuickJumper: boolean;
-            onPaginationChange: boolean;
-            total: number;
-            showTotal: (total: any) => string;
-            onShowSizeChange: (current: number, pageSize: number) => void;
-            onChange: (current: number, pageSize: number) => void;
-        };
-        onChange: (pagination: any, filters: any, sorter: any, extra: any) => void;
-    };
-    handleSetStateCallback: (values: any) => void;
-    loading: boolean;
-    error?: Error;
-    cancel: () => void;
-    refreshAsync: () => Promise<unknown>;
-    run: (...params: any[]) => void;
-    runAsync: (...params: any[]) => Promise<unknown>;
-    mutate: (data?: unknown) => void;
-};
+import type { ProTableRequestOptionsType, ProTableServiceType } from '../propsType';
+declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): any;
 export default useAntdTable;

package/es/ProTable/hooks/useAntdTable.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
-import { pickBy, isObject, merge, set, isEqual } from 'lodash';
+import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
 import { defaultPage } from '../index';
 import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
 import locale, { formatMessage } from '../../locale';
@@ -475,7 +475,7 @@ function useAntdTable(service, options, useRequestOptions) {
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange
   };
-  return _objectSpread(_objectSpread({}, result), {}, {
+  var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
     data: data,
     params: params,
     rowSelection: rowSelection,
@@ -509,5 +509,9 @@ function useAntdTable(service, options, useRequestOptions) {
     },
     handleSetStateCallback: handleSetStateCallback
   });
+  useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, omit(useAntdTableProps, 'tableProps')), {}, {
+    form: form
+  });
+  return useAntdTableProps;
 }
 export default useAntdTable;

package/es/ProTable/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ProTableProps } from './propsType';
+import type { ProTableType } from './propsType';
 import useAntdTable from './hooks/useAntdTable';
 export declare const TableContext: import("react").Context<{}>;
 export declare const defaultPage: {
@@ -7,7 +7,7 @@ export declare const defaultPage: {
     pageSize: number;
 };
 declare const ProTable: {
-    (props: ProTableProps): import("react/jsx-runtime").JSX.Element;
+    (props: ProTableType): import("react/jsx-runtime").JSX.Element;
     defaultProps: {
         quickConfig: boolean;
         stripe: boolean;

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd", "tabs"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -13,7 +13,7 @@ import { get, keyBy, assign, isObject, isFunction, isBoolean } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from '../index';
-import { RenderTableHeader, RenderFooter } from './components';
+import { RenderTableHeader, RenderFooter, RenderTabs } from './components';
 import useAntdTable from './hooks/useAntdTable';
 import { BaseTable, DraggableTable } from './components/RcTable';
 import { formatColumn } from './components/FormatColumn';
@@ -55,6 +55,7 @@ var ProTable = function ProTable(props) {
     diffConfig = props.diffConfig,
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
+    tabs = props.tabs,
     restProps = _objectWithoutProperties(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
@@ -393,7 +394,9 @@ var ProTable = function ProTable(props) {
     },
     children: _jsxs("div", {
       className: cls,
-      children: [_jsx(RenderTableHeader, {
+      children: [tabs && _jsx(RenderTabs, _objectSpread(_objectSpread({}, tabs), {}, {
+        formTableProps: restProps === null || restProps === void 0 ? void 0 : restProps.formTableProps
+      })), _jsx(RenderTableHeader, {
         dataSource: {
           headerRender: headerRender,
           columnConfig: columnConfig,