@cqsjjb/jjb-react-admin-component 3.3.9 → 3.3.10

package/PageLayout/index.less

@@ -22,7 +22,7 @@
   .@{com-prefix-cls}-layout-container-tools {
     margin-top: 0;
     margin-bottom: 0;
-    padding: 0 20px 0 20px;
+    padding: 0 20px 16px 20px;
   }
 
   .@{com-prefix-cls}-layout-container-content {
@@ -44,4 +44,4 @@
     padding: 20px;
     border-top: 1px #f0f0f0 solid;
   }
-}
+}

package/SearchForm/index.d.ts

@@ -11,6 +11,8 @@ export interface SearchFormProps {
   expand?: boolean;
   // 内部默认展开状态，仅在 expand 未传入时生效 默认-false
   defaultExpand?: boolean;
+  // 列数 默认-3
+  colSize?: number;
   // 查询 loading 状态 默认-false
   loading?: boolean;
   // 表单行节点数组 默认-[]
@@ -29,4 +31,4 @@ export interface SearchFormProps {
 
 declare const SearchForm: React.FC<SearchFormProps>;
 
-export default SearchForm;
+export default SearchForm;

package/SearchForm/index.js

@@ -1,4 +1,3 @@
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import React, { useState, useRef, useEffect } from 'react';
 import { Form, Button, Space, Row, Col } from 'antd';
 import { SearchOutlined, DoubleRightOutlined, UndoOutlined } from '@ant-design/icons';
@@ -9,6 +8,7 @@ const SearchForm = ({
   // 受控
   defaultExpand = false,
   // 内部默认展开
+  colSize = 3,
   loading = false,
   formLine = [],
   initialValues = {},
@@ -17,45 +17,14 @@ const SearchForm = ({
   onFinish = () => {},
   onExpand
 }) => {
-  // 如果外部没有传入 form，使用 Form.useForm() 创建实例
-  const [internalFormInstance] = Form.useForm();
-  const internalFormRef = useRef(internalFormInstance);
-
-  // 判断外部传入的是 ref 还是 form 实例
-  // ref 对象有 current 属性，form 实例没有
-  const isExternalRef = externalForm && 'current' in externalForm;
-
-  // 警告：ref 用法将在后续版本中移除
-  useEffect(() => {
-    if (isExternalRef) {
-      console.warn('[SearchForm] 警告：通过 ref 传入 form 的方式已废弃，将在后续版本中移除。' + '请使用 Form.useForm() 创建 form 实例并直接传入，例如：\n' + '  const [form] = Form.useForm();\n' + '  <SearchForm form={form} />');
-    }
-  }, [isExternalRef]);
-
-  // 获取实际的 form 实例（兼容 ref 和直接传入实例两种情况）
-  const getFormInstance = () => {
-    if (externalForm) {
-      return isExternalRef ? externalForm.current : externalForm;
-    }
-    return internalFormInstance;
-  };
-
-  // 兼容性处理：用于 form.current 访问方式的 ref
-  const formRef = externalForm && isExternalRef ? externalForm : internalFormRef;
-
-  // 更新内部 ref，确保 formRef.current 始终指向正确的实例
-  useEffect(() => {
-    if (!isExternalRef && externalForm) {
-      // 如果外部传入的是实例，将其赋值给内部 ref 的 current
-      internalFormRef.current = externalForm;
-    }
-  }, [externalForm, isExternalRef]);
+  const internalForm = useRef();
+  const form = externalForm || internalForm;
   const [internalOpen, setInternalOpen] = useState(defaultExpand);
   useEffect(() => {
     if (onRef) {
-      onRef(formRef);
+      onRef(form);
     }
-  }, [formRef, onRef]);
+  }, [form, onRef]);
   const isControlled = expand !== undefined;
   const isOpen = isControlled ? expand : internalOpen;
   const handleToggle = () => {
@@ -78,11 +47,10 @@ const SearchForm = ({
     icon: /*#__PURE__*/React.createElement(UndoOutlined, null),
     loading: loading,
     onClick: () => {
-      const formInstance = getFormInstance();
-      formInstance.resetFields();
-      onReset(formInstance.getFieldsValue());
+      form.current.resetFields();
+      onReset(form.current.getFieldsValue());
     }
-  }, "\u91CD\u7F6E"), formLine.length > 2 && /*#__PURE__*/React.createElement(Button, {
+  }, "\u91CD\u7F6E"), formLine.length / colSize > 1 && /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DoubleRightOutlined, {
       style: {
         transform: isOpen ? 'rotate(-90deg)' : 'rotate(90deg)'
@@ -90,70 +58,38 @@ const SearchForm = ({
     }),
     onClick: handleToggle
   }, isOpen ? '收起' : '展开'));
-
-  /**
-   * 处理 formLine，确保所有 Form.Item 都有 noStyle 属性
-   * @param {ReactNode[]} nodes - 表单节点数组
-   * @returns {ReactNode[]} - 处理后的节点数组
-   */
-  const processFormLine = nodes => {
-    return nodes.map(node => {
-      // 检查是否是 Form.Item 组件
-      if (/*#__PURE__*/React.isValidElement(node) && node.type === Form.Item) {
-        // 如果没有 noStyle 属性，则克隆并添加
-        if (!node.props.noStyle) {
-          return /*#__PURE__*/React.cloneElement(node, {
-            noStyle: true
-          });
-        }
-      }
-      return node;
-    });
-  };
   const groupsList = () => {
-    // 先处理 formLine，确保所有 Form.Item 都有 noStyle
-    const processedFormLine = processFormLine(formLine);
-    const arr = processedFormLine.map(node => ({
+    const arr = formLine.map(node => ({
       show: true,
       node
     }));
-    if (isOpen || arr.length <= 2) {
+    if (isOpen || arr.length <= 3) {
       return arr;
     }
-    return arr.map((item, index) => index > 1 ? {
+    return arr.map((item, index) => index > 2 ? {
       ...item,
       show: false
     } : item);
   };
   const formItemList = groupsList();
   if (formItemList.length === 0) return null;
-  return /*#__PURE__*/React.createElement(Form, _extends({}, externalForm && isExternalRef ? {
-    ref: externalForm
-  } : {
-    form: externalForm || internalFormInstance
-  }, {
+  return /*#__PURE__*/React.createElement(Form, {
+    ref: form,
     style: style,
     initialValues: initialValues,
     onFinish: values => onFinish(values)
-  }), /*#__PURE__*/React.createElement(Row, {
+  }, /*#__PURE__*/React.createElement(Row, {
     gutter: [16, 16]
   }, formItemList.map((item, index) => /*#__PURE__*/React.createElement(Col, {
     key: index,
-    span: 8,
+    span: 24 / colSize,
     style: {
       display: item.show ? 'block' : 'none'
     }
   }, item.node)), /*#__PURE__*/React.createElement(Col, {
-    span: 8,
-    style: {
-      display: 'flex',
-      alignItems: 'flex-start'
-    }
+    span: 24 / colSize
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    noStyle: true,
-    style: {
-      marginBottom: 0
-    }
+    noStyle: true
   }, getButtons()))));
 };
 export default SearchForm;

package/Table/README.md

@@ -33,4 +33,4 @@ function App() {
 | disabledResizer | 是否禁用内容区滚动，设置true自动将适配内容区滚动高度                                 | `boolean` | false |
 | storeIndex      | 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖 | `number`  |     - |
 
-其他属性参考 https://ant-design.antgroup.com/components/table-cn#api
+其他属性参考 https://ant-design.antgroup.com/components/table-cn#api

package/Table/index.d.ts

@@ -1,64 +1,17 @@
-// @ts-ignore
-import * as React from 'react';
-// @ts-ignore
-import type { TableProps } from 'antd';
-
-/**
- * 列设置配置项
- */
-export interface SettingOptionType {
-  /** 是否可拖拽排序 */
-  draggable?: boolean;
-  /** 是否显示复选框 */
-  checkable?: boolean;
-  /** 是否显示列表项选项 */
-  showListItemOption?: boolean;
-  /** 重置时是否恢复选中状态 */
-  checkedReset?: boolean;
-  /** 列表高度 */
-  listsHeight?: number;
-  /** 额外内容 */
-  extra?: React.ReactNode;
-  /** 子元素 */
-  children?: React.ReactNode;
-  /** 自定义设置图标 */
-  settingIcon?: React.ReactNode;
-}
-
-/**
- * ProTable options 配置项
- */
-export interface OptionConfig {
-  /** 是否显示密度切换 */
-  density?: boolean;
-  /** 是否显示全屏按钮，或自定义函数 */
-  fullScreen?: boolean | ((e: React.MouseEvent<HTMLSpanElement>, action?: any) => void);
-  /** 是否显示刷新按钮，或自定义函数 */
-  reload?: boolean | ((e: React.MouseEvent<HTMLSpanElement>, action?: any) => void);
-  /** 列设置配置 */
-  setting?: boolean | SettingOptionType;
-  /** 搜索配置 */
-  search?: boolean | {
-    name?: string;
-    [key: string]: any;
-  };
-  /** 自定义刷新图标 */
-  reloadIcon?: React.ReactNode;
-  /** 自定义密度图标 */
-  densityIcon?: React.ReactNode;
-}
-
-export interface OverTableProps extends TableProps {
-  // 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖
-  storeIndex?: string;
-  // 是否启用自动计算滚动高度，默认-true
-  enableAutoScrollY?: boolean;
-  // ProTable options 配置项
-  options?: OptionConfig | false;
-}
-
-interface TableFc extends React.FC<OverTableProps> {
-}
-
-declare const Table: TableFc;
-export default Table;
+// @ts-ignore
+import * as React from 'react';
+// @ts-ignore
+import type { TableProps } from 'antd';
+
+export interface OverTableProps extends TableProps {
+  // 是否禁用内容区滚动，默认-false
+  disabledResizer?: boolean;
+  // 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖
+  storeIndex?: string;
+}
+
+interface TableFc extends React.FC<OverTableProps> {
+}
+
+declare const Table: TableFc;
+export default Table;

package/Table/index.js

@@ -1,99 +1,118 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React, { useRef, useEffect, useState, useCallback } from 'react';
+import React from 'react';
+import { tools } from '@cqsjjb/jjb-common-lib';
 import { ProTable } from '@ant-design/pro-components';
+import { useAntdResizableHeader } from 'use-antd-resizable-header';
+import { antPrefix, setTableSize, getTableSize, getPersistenceKey } from './utils';
 import './index.less';
-import { antPrefix } from './utils';
+require('use-antd-resizable-header/dist/style.css');
 export default function TablePro(props) {
   const prefix = antPrefix || 'ant';
   const baseCls = `.${prefix}-table`;
-  const ref = useRef(null);
+  const tableCls = `${baseCls}-wrapper`;
   const tableBodyCls = `${baseCls}-body`;
-  const tablePaginationCls = `${baseCls}-pagination`;
-  const tableFooterCls = `${baseCls}-footer`;
   const {
-    enableAutoScrollY = true,
-    options = {
-      reload: false,
-      density: true,
-      fullScreen: true,
-      setting: {
-        checkedReset: true,
-        draggable: false,
-        checkable: true
-      }
-    },
-    ...restProps
+    storeIndex
   } = props;
-  const [scrollY, setScrollY] = useState(undefined);
-  const timerRef = useRef(null);
-  const calcTableScrollY = () => {
-    const tableBody = ref.current?.querySelector?.(tableBodyCls);
-    const tableBodyRect = tableBody?.getBoundingClientRect();
-    const tableFooter = ref.current?.querySelector?.(tableFooterCls);
-    const tableFooterRect = tableFooter?.getBoundingClientRect();
-    const tablePagination = ref.current?.querySelector?.(tablePaginationCls);
-    const tablePaginationRect = tablePagination?.getBoundingClientRect();
-    const tableFooterHeight = tableFooterRect?.height || 0;
-    const tablePaginationMargin = 16;
-    const tablePaginationHeight = tablePaginationRect?.height || 0;
-    const border = 2;
-    const margin = 20;
-    const scrollY = window.innerHeight - tableBodyRect.top - tableFooterHeight - tablePaginationHeight - tablePaginationMargin - border - margin;
-    return scrollY;
-  };
-  const debouncedCalcScrollY = useCallback(() => {
-    if (timerRef.current) {
-      clearTimeout(timerRef.current);
-    }
-    timerRef.current = setTimeout(() => {
-      const height = calcTableScrollY();
-      if (height) {
-        setScrollY(height);
-      }
-    }, 150);
-  }, []);
-  useEffect(() => {
-    if (!ref.current || !enableAutoScrollY) return;
+  const [size, setSize] = React.useState(getTableSize(storeIndex) || 'default');
+  const [tableHeight, setTableHeight] = React.useState(0);
+  const persistenceKey = getPersistenceKey(storeIndex);
+  const enabledResizer = tools.isUndefined(props.disabledResizer);
+  React.useEffect(() => {
+    let mutationObserver, resizeObserver;
+    if (enabledResizer) {
+      // 监听-DOM树
+      mutationObserver = new MutationObserver(mutations => mutations.forEach(() => calcTableHeight()));
+      // 监听-缩放
+      resizeObserver = new ResizeObserver(entries => entries.forEach(() => calcTableHeight()));
 
-    // 创建 ResizeObserver 监听元素尺寸变化
-    const resizeObserver = new ResizeObserver(() => {
-      // 等待 table-pagination 元素生成后再计算
-      debouncedCalcScrollY();
-    });
-    const mutationObserver = new MutationObserver(() => {
-      debouncedCalcScrollY();
-    });
-    mutationObserver.observe(ref.current, {
-      childList: true,
-      subtree: true,
-      attributes: true
-    });
+      // 初始化首次计算
+      setTimeout(() => calcTableHeight(), 500);
 
-    // 开始观察 ref.current 的尺寸变化
-    resizeObserver.observe(ref.current);
+      // 执行-监听-缩放
+      resizeObserver.observe(document.body);
+      // 执行-监听-DOM树是否发生变化
+      mutationObserver.observe(document.body, {
+        subtree: true,
+        childList: true
+      });
+    }
     return () => {
-      if (timerRef.current) {
-        clearTimeout(timerRef.current);
+      if (mutationObserver && resizeObserver && enabledResizer) {
+        resizeObserver.unobserve(document.body);
+        mutationObserver.disconnect(document.body);
       }
-      resizeObserver.disconnect();
-      mutationObserver.disconnect();
     };
-  }, [ref, enableAutoScrollY, debouncedCalcScrollY]);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    style: {
-      height: '100%'
+  }, []);
+  React.useEffect(() => {
+    setTableSize(size, storeIndex);
+  }, [size]);
+
+  // 计算高度
+  const calcTableHeight = () => {
+    try {
+      // table元素
+      const tableEl = document.querySelector(tableCls);
+      // table-body元素
+      const tableBodyEl = document.querySelector(tableBodyCls);
+      if (tableBodyEl && tableEl) {
+        // 获取table元素的矩形数据
+        const tableRect = tableEl.getBoundingClientRect();
+        // 获取table-body元素的矩形数据
+        const tableBodyRect = tableBodyEl.getBoundingClientRect();
+        // 获取底部的高度差
+        const bottomHeight = tableRect.bottom - tableBodyRect.bottom;
+        // 计算最终值
+        setTableHeight(innerHeight - tableBodyRect.top - bottomHeight - (window.__IN_BASE__ ? 38 : 22));
+      }
+    } catch (e) {
+      window.console['error'](e);
+    }
+  };
+  const {
+    components,
+    resizableColumns,
+    tableWidth,
+    resetColumns
+    // refresh
+  } = useAntdResizableHeader({
+    columns: props.columns,
+    columnsState: {
+      persistenceKey: persistenceKey.resizable,
+      persistenceType: 'localStorage'
     }
-  }, /*#__PURE__*/React.createElement(ProTable, _extends({
+  });
+  const scroll = {
+    x: tableWidth
+  };
+  if (enabledResizer) {
+    scroll.y = tableHeight;
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProTable, _extends({
     ghost: true,
     columnEmptyText: true,
+    size: size,
     search: false,
-    scroll: enableAutoScrollY ? {
-      y: scrollY || 0
-    } : undefined,
+    scroll: scroll,
     className: `${antPrefix}-gbs-pro-table`,
-    options: options
-  }, restProps, {
-    columns: restProps.columns
+    options: {
+      reload: false,
+      fullScreen: true,
+      setting: {
+        checkedReset: true,
+        extra: /*#__PURE__*/React.createElement("a", {
+          className: `${antPrefix}-pro-table-column-setting-action-rest-button`,
+          onClick: resetColumns
+        }, "\u91CD\u7F6E\u5217\u5BBD")
+      }
+    },
+    components: components,
+    columnsState: {
+      persistenceKey: persistenceKey.columnState,
+      persistenceType: 'localStorage'
+    },
+    onSizeChange: setSize
+  }, props, {
+    columns: resizableColumns
   })));
 }

package/Table/index.less

@@ -1,15 +1,13 @@
-@com-prefix-cls: if(isdefined(@ant-prefix), @ant-prefix, ant);
-
-.@{com-prefix-cls} {
+.@{ant-prefix} {
   &-gbs-pro-table {
-    .@{com-prefix-cls}-pro-card {
+    .@{ant-prefix}-pro-card {
       &-body {
-        .@{com-prefix-cls}-pro-table-list-toolbar {
+        .@{ant-prefix}-pro-table-list-toolbar {
           &-container {
-            padding-block: 0;
+            padding-top: 0;
           }
         }
       }
     }
   }
-}
+}

package/TableAction/index.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { tools } from '@cqsjjb/jjb-common-lib';
+import { MoreOutlined } from '@ant-design/icons';
 import { Dropdown, Space } from 'antd';
 export default function TableAction({
   maximum = 3,
   children,
   space,
+  icon: Icon = MoreOutlined,
   placement = 'bottomRight',
   // 下拉菜单位置，默认 bottomRight
   trigger = ['hover'] // 下拉触发方式，默认 hover
@@ -24,5 +26,5 @@ export default function TableAction({
     },
     placement: placement,
     trigger: trigger
-  }, /*#__PURE__*/React.createElement("a", null, "\u66F4\u591A")));
+  }, /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(Icon, null))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",