zy-react-library 1.0.157 → 1.0.159

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -71,8 +71,8 @@ export interface FormOption {
   label?: ReactNode;
   /** 渲染类型 */
   render?: FormItemRenderType;
-  /** 占据栅格列数，默认 12，支持函数动态计算 */
-  span?: number | string | ((formValues: FormValues) => number | string);
+  /** 占据栅格列数，默认 12 */
+  span?: number | string;
   /** 是否必填，默认 true，支持函数动态计算 */
   required?: boolean | ((formValues: FormValues) => boolean);
   /** 验证规则 */

package/components/FormBuilder/FormItemsRenderer.js

@@ -206,17 +206,9 @@ const FormItemsRenderer = ({
     return collapse && index >= 3 ? { display: "none" } : undefined;
   };
 
-  // 获取 span
-  const getSpan = (span) => {
-    // 支持动态计算 span
-    return typeof span === "function"
-      ? span(getFormValues())
-      : span;
-  }
-
   // 列数
   const getCol = (option) => {
-    const itemSpan = option.render === FORM_ITEM_RENDER_ENUM.DIVIDER ? 24 : (getSpan(option.span) ?? span);
+    const itemSpan = option.render === FORM_ITEM_RENDER_ENUM.DIVIDER ? 24 : (option.span ?? span);
     const itemLabelCol = option.labelCol ?? (itemSpan === 24 ? { span: labelCol.span / 2 } : labelCol);
     const itemWrapperCol = option.wrapperCol ?? { span: 24 - itemLabelCol.span };
     return { span: itemSpan, labelCol: itemLabelCol, wrapperCol: itemWrapperCol };

package/hooks/useIdle/index.d.ts

@@ -0,0 +1,11 @@
+export interface UseIdleOptions {
+  /** 空闲超时时间（毫秒），默认值 10000 */
+  timeout?: number;
+  /** 监听的事件列表，默认值 ['mousedown', 'mousemove', 'keypress', 'scroll', 'touchstart', 'wheel'] */
+  events?: string[];
+}
+
+/**
+ * 检测用户是否处于空闲状态
+ */
+export default function useIdle(options?: UseIdleOptions): boolean;

package/hooks/useIdle/index.js

@@ -0,0 +1,51 @@
+import { useEffect, useState } from "react";
+
+/**
+ * 检测用户是否处于空闲状态
+ */
+function useIdle(options = {}) {
+  const {
+    timeout = 10000,
+    events = [
+      "mousedown",
+      "mousemove",
+      "keypress",
+      "scroll",
+      "touchstart",
+      "wheel",
+    ],
+  } = options;
+
+  const [isIdle, setIsIdle] = useState(false);
+
+  useEffect(() => {
+    let idleTimer;
+
+    // 重置空闲计时器
+    const resetTimer = () => {
+      setIsIdle(false);
+      clearTimeout(idleTimer);
+      idleTimer = setTimeout(() => setIsIdle(true), timeout);
+    };
+
+    // 初始化计时器
+    resetTimer();
+
+    // 添加事件监听器
+    events.forEach((event) => {
+      window.addEventListener(event, resetTimer, { passive: true });
+    });
+
+    // 清理函数
+    return () => {
+      clearTimeout(idleTimer);
+      events.forEach((event) => {
+        window.removeEventListener(event, resetTimer);
+      });
+    };
+  }, [timeout, events]);
+
+  return isIdle;
+}
+
+export default useIdle;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.157",
+  "version": "1.0.159",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",