@cqsjjb/jjb-react-admin-component 3.3.6 → 3.3.8

package/ListDataContainer/index.d.ts

@@ -92,7 +92,7 @@ export interface ListDataContainerProps<T extends boolean = false> {
     /**
      * 搜索表单配置数组
      * 描述：由 SearchFormItemConfig 类型的配置项组成，组件内部会根据该数组自动生成搜索表单，
-     * 不传递则不显示搜索表单
+      * 不传递则不显示搜索表单
      * @type {SearchFormItemConfig[]}
      * @optional
      */
@@ -143,6 +143,14 @@ export interface ListDataContainerProps<T extends boolean = false> {
     ? OverTableProps  // ProTable 专属属性（如 search、toolBar 等）
     : TableProps<any>;    //    antd 原生 Table 属性（如 bordered、scroll 等）
 
+    /**
+     * 搜索表单的自定义属性
+     * 描述：传递给SearchForm组件的属性
+     * @type {Object}
+     * @optional
+     */
+    searchFormProps?: Object;
+
     /**
      * 表格类型切换开关
      * 描述：控制组件内部使用「项目自定义 ProTable」还是「antd 原生 Table」，

package/ListDataContainer/index.js

@@ -1,48 +1,49 @@
 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, useEffect, useCallback, useImperativeHandle, forwardRef } from 'react';
+import React, { useState, useEffect, useCallback, useImperativeHandle, forwardRef, useRef } from 'react';
 import { Table, Row, Col, Form } from 'antd';
 import { isEqual } from 'lodash';
 import SearchForm from '@cqsjjb/jjb-react-admin-component/SearchForm';
 import ProTable from '@cqsjjb/jjb-react-admin-component/Table';
 
-/**
- * @component ListDataContainer
- * @description 通用列表数据容器组件，提供搜索表单、数据表格、分页等功能的完整列表页面解决方案
- * 
- * @props {Array} columns - 表格列配置，遵循Ant Design Table组件的columns规范
- * @props {Function} fetchDataApi - 数据获取API函数，接收分页和搜索参数，返回包含list和total的对象
- * @props {Array} searchFormConfig - 搜索表单配置数组
- *   @param {React.Component} searchFormConfig[].field - 表单项组件(如ControlWrapper.Select)
- *   @param {string} searchFormConfig[].name - 表单项字段名
- *   @param {string} searchFormConfig[].label - 表单项标签
- *   @param {Object} searchFormConfig[].fieldProps - 传递给字段组件的属性
- *   @param {Object} searchFormConfig[].itemProps - 传递给Form.Item的属性
- *   @param {React.ReactNode} searchFormConfig[].content - 字段组件的子元素(如Select.Option列表)
- *   @param {boolean} searchFormConfig[].required - 是否必填
- * @props {string} rowKey - 表格行键值，默认为'id'
- * @props {Object} initialPagination - 初始分页配置，包含current、pageSize等分页属性
- * @props {Object} tableProps - 传递给Table组件的属性
- * @props {boolean} proTable - 是否使用ProTable组件，默认为false
- * @example
- * // 基础用法
- * <ListDataContainer
- *   columns={tableColumns}
- *   fetchDataApi={getCourseList}
- *   searchFormConfig={[
- *     {
- *       field: Select,
- *       name: 'status',
- *       label: '状态',
- *     }
- *     {
- *       field: Input,
- *       name: 'name',
- *       label: '名称',
- *       required: true,
- *     }
- *   ]}
- * />
- * 
+/**
+ * @component ListDataContainer
+ * @description 通用列表数据容器组件，提供搜索表单、数据表格、分页等功能的完整列表页面解决方案
+ * 
+ * @props {Array} columns - 表格列配置，遵循Ant Design Table组件的columns规范
+ * @props {Function} fetchDataApi - 数据获取API函数，接收分页和搜索参数，返回包含list和total的对象
+ * @props {Array} searchFormConfig - 搜索表单配置数组
+ *   @param {React.Component} searchFormConfig[].field - 表单项组件(如ControlWrapper.Select)
+ *   @param {string} searchFormConfig[].name - 表单项字段名
+ *   @param {string} searchFormConfig[].label - 表单项标签
+ *   @param {Object} searchFormConfig[].fieldProps - 传递给字段组件的属性
+ *   @param {Object} searchFormConfig[].itemProps - 传递给Form.Item的属性
+ *   @param {React.ReactNode} searchFormConfig[].content - 字段组件的子元素(如Select.Option列表)
+ *   @param {boolean} searchFormConfig[].required - 是否必填
+ * @props {string} rowKey - 表格行键值，默认为'id'
+ * @props {Object} initialPagination - 初始分页配置，包含current、pageSize等分页属性
+ * @props {Object} tableProps - 传递给Table组件的属性
+ * @props {Object} searchFormProps - 传递给SearchForm组件的属性
+ * @props {boolean} proTable - 是否使用ProTable组件，默认为false
+ * @example
+ * // 基础用法
+ * <ListDataContainer
+ *   columns={tableColumns}
+ *   fetchDataApi={getCourseList}
+ *   searchFormConfig={[
+ *     {
+ *       field: Select,
+ *       name: 'status',
+ *       label: '状态',
+ *     }
+ *     {
+ *       field: Input,
+ *       name: 'name',
+ *       label: '名称',
+ *       required: true,
+ *     }
+ *   ]}
+ * />
+ * 
  */
 
 const SELECT_COMPONENTS = ['Select', 'TreeSelect', 'Cascader', 'DatePicker', 'TimePicker', 'Checkbox', 'Radio', 'Switch', 'Slider', 'Upload'];
@@ -59,29 +60,42 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
     showQuickJumper: true
   },
   tableProps = {},
+  searchFormProps = {},
   proTable = false,
   onRest = () => {}
 }, ref) => {
-  const [form] = Form.useForm();
   const [tableData, setTableData] = useState([]);
   const [loading, setLoading] = useState(false);
   const [pagination, setPagination] = useState(initialPagination);
   const [totalCount, setTotalCount] = useState(0);
+  const [tableScrollY, setTableScrollY] = useState(undefined);
+  const form = useRef(null);
+  const searchFormRef = useRef(null);
+  const containerRef = useRef(null);
   const getComponentName = Component => {
     return Component.displayName || Component.constructor.name;
   };
 
-  /**
-   * 数据加载与刷新方法
-   * @param {Object} [overrideParams={}] - 可选，用于覆盖内部参数的键值对
-   *   若传入，会覆盖同名的表单参数和分页参数（如page、pageSize或搜索字段）
+  /**
+   * 数据加载与刷新方法
+   * @param {Object} [overrideParams={}] - 可选，用于覆盖内部参数的键值对
+   *   若传入，会覆盖同名的表单参数和分页参数（如page、pageSize或搜索字段）
    */
   const loadDataSource = useCallback(async (overrideParams = {}) => {
     if (!fetchDataApi) return;
     setLoading(true);
     try {
+      if (overrideParams.pageIndex && overrideParams.pageSize) {
+        setPagination(prev => ({
+          ...prev,
+          pageIndex: overrideParams.pageIndex,
+          pageSize: overrideParams.pageSize
+        }));
+      }
+
       // 1. 获取组件内部的表单参数
-      const formValues = await form.validateFields();
+      const formValues = await form.current.validateFields();
+      console.warn("formValues", formValues);
 
       // 2. 构造基础参数：分页参数 + 表单参数
       const baseParams = {
@@ -107,7 +121,7 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
     } finally {
       setLoading(false);
     }
-  }, [fetchDataApi, pagination, form]);
+  }, [fetchDataApi, pagination, form, searchFormConfig]);
 
   // 暴露刷新方法给父组件
   useImperativeHandle(ref, () => ({
@@ -127,11 +141,11 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
   };
   const handleReset = () => {
     // 清空表单
-    form.setFieldsValue(searchFormConfig.reduce((obj, item) => {
+    form.current.setFieldsValue(searchFormConfig.reduce((obj, item) => {
       obj[item.name] = undefined;
       return obj;
     }, {}));
-    onRest && onRest(form);
+    onRest && onRest(form.current);
     // 重置分页并使用内部默认参数查询
     setPagination(initialPagination);
     loadDataSource();
@@ -150,6 +164,59 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
   useEffect(() => {
     loadDataSource();
   }, []);
+
+  // 动态计算表格滚动高度
+  useEffect(() => {
+    const calculateScrollY = () => {
+      if (!containerRef.current || !searchFormRef.current) return;
+      const containerHeight = containerRef.current.clientHeight;
+      const searchFormHeight = searchFormRef.current.offsetHeight;
+      const gap = 16; // gap between searchForm and table
+      const paginationHeight = 64; // 分页器高度（包含margin）
+
+      // 计算表格可用高度 = 容器高度 - 搜索表单高度 - gap - 分页器高度 - 间隔
+      const availableHeight = containerHeight - searchFormHeight - gap - paginationHeight - 12;
+
+      // 确保最小高度为 100px
+      if (availableHeight > 100) {
+        setTableScrollY(availableHeight);
+      } else {
+        setTableScrollY(100);
+      }
+    };
+
+    // 延迟计算，确保 DOM 渲染完成
+    const timer = setTimeout(() => {
+      calculateScrollY();
+    }, 100);
+
+    // 使用 ResizeObserver 监听搜索表单高度变化
+    let resizeObserver = null;
+    if (typeof ResizeObserver !== 'undefined') {
+      resizeObserver = new ResizeObserver(() => {
+        // 使用 requestAnimationFrame 确保在下一帧计算
+        requestAnimationFrame(() => {
+          calculateScrollY();
+        });
+      });
+      if (searchFormRef.current) {
+        resizeObserver.observe(searchFormRef.current);
+      }
+      if (containerRef.current) {
+        resizeObserver.observe(containerRef.current);
+      }
+    }
+
+    // 监听窗口大小变化
+    window.addEventListener('resize', calculateScrollY);
+    return () => {
+      clearTimeout(timer);
+      if (resizeObserver) {
+        resizeObserver.disconnect();
+      }
+      window.removeEventListener('resize', calculateScrollY);
+    };
+  }, [searchFormConfig]);
   const generateFormItems = () => {
     return searchFormConfig.map((item, index) => {
       const {
@@ -172,26 +239,40 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
           required: true,
           message: `${SELECT_COMPONENTS.includes(getComponentName(FieldComponent)) ? '请选择' : '请输入'}${label}`
         }]
-      } : {}, itemProps, restProps), /*#__PURE__*/React.createElement(FieldComponent, _extends({
+      } : {}, {
+        style: {
+          marginBottom: 0
+        }
+      }, itemProps, restProps), /*#__PURE__*/React.createElement(FieldComponent, _extends({
         allowClear: true,
         placeholder: `${SELECT_COMPONENTS.includes(getComponentName(FieldComponent)) ? '请选择' : '请输入'}${label}`
       }, fieldProps), content || null));
     }).filter(Boolean);
   };
   const TableComponent = proTable ? ProTable : Table;
-  return /*#__PURE__*/React.createElement(Row, {
-    gutter: [16, 24]
-  }, /*#__PURE__*/React.createElement(Col, {
-    span: 24
-  }, /*#__PURE__*/React.createElement(SearchForm, {
-    expand: true,
+  return /*#__PURE__*/React.createElement("div", {
+    ref: containerRef,
+    style: {
+      display: 'flex',
+      flexDirection: 'column',
+      gap: 16,
+      height: '100%',
+      overflow: 'hidden'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: searchFormRef
+  }, /*#__PURE__*/React.createElement(SearchForm, _extends({
+    defaultExpand: true,
     form: form,
     loading: loading,
     formLine: generateFormItems(),
     onReset: handleReset,
     onFinish: handleFinish
-  })), /*#__PURE__*/React.createElement(Col, {
-    span: 24
+  }, searchFormProps))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      overflow: 'hidden'
+    }
   }, /*#__PURE__*/React.createElement(TableComponent, _extends({
     columns: columns,
     dataSource: tableData,
@@ -203,10 +284,16 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
       total: totalCount
     },
     onChange: handlePaginationChange,
-    scroll: {
-      x: 'max-content'
+    scroll: tableProps?.scroll ? tableProps.scroll : {
+      y: tableScrollY !== undefined ? tableScrollY : tableProps.scroll?.y || undefined
     },
     bordered: true
-  }, tableProps))));
+  }, (() => {
+    const {
+      scroll,
+      ...restTableProps
+    } = tableProps;
+    return restTableProps;
+  })()))));
 });
 export default ListDataContainer;

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/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.6",
+  "version": "3.3.8",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",