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

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