zy-react-library 1.0.78 → 1.0.80

package/components/FormBuilder/FormBuilder.js

@@ -57,7 +57,7 @@ const FormBuilder = (props) => {
                     </Button>
                   )}
                   {showCancelButton && (
-                    <Button onClick={handleCancel} style={{ marginRight: 8 }}>
+                    <Button onClick={handleCancel}>
                       {cancelButtonText}
                     </Button>
                   )}

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -61,7 +61,7 @@ export interface FormOption {
   tip?: ReactNode;
   /** 是否隐藏，默认 false，支持函数动态计算 */
   hidden?: boolean | ((formValues: FormValues) => boolean);
-  /** 是否自定义渲染，默认 false，将不生成 Form.Item */
+  /** 是否自定义渲染，完全交给外部控制渲染，默认 false */
   customizeRender?: boolean;
   /** 选项数据（用于 select、radio、checkbox） */
   items?: OptionItem[];

package/components/FormBuilder/FormItemsRenderer.js

@@ -135,8 +135,8 @@ const FormItemsRenderer = ({
 
   // 获取key
   const getKey = (option) => {
-    return option.key || option.name
-  }
+    return option.key || option.name;
+  };
 
   // 渲染表单控件
   const renderFormControl = (option) => {
@@ -272,6 +272,23 @@ const FormItemsRenderer = ({
   return (
     <>
       {options.map((option, index) => {
+        // 列数
+        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 };
+
+        // 使用 style 控制显示/隐藏
+        const style = collapse && index >= 3 ? { display: "none" } : undefined;
+
+        // 如果是 customizeRender 类型，完全交给外部控制渲染
+        if (option.customizeRender) {
+          return (
+            <Col key={getKey(option) || index} span={itemSpan} style={style}>
+              {option.render}
+            </Col>
+          );
+        }
+
         // 如果是 onlyForLabel 类型，不渲染任何UI，只在表单中保存数据
         if (option.onlyForLabel) {
           return (
@@ -286,14 +303,6 @@ const FormItemsRenderer = ({
           );
         }
 
-        // 列数
-        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 };
-
-        // 使用 style 控制显示/隐藏
-        const style = collapse && index >= 3 ? { display: "none" } : undefined;
-
         // 如果是分割线
         if (option.render === FORM_ITEM_RENDER_ENUM.DIVIDER) {
           return (
@@ -306,43 +315,39 @@ const FormItemsRenderer = ({
         // 如果配置了 shouldUpdate 或 dependencies，使用 Form.Item 的联动机制
         if ((option.shouldUpdate ?? option.dependencies) || (option?.componentProps?.shouldUpdate ?? option?.componentProps?.dependencies)) {
           return (
-            option.customizeRender
-              ? (renderFormControl(option))
-              : (
-                  <Form.Item
-                    key={getKey(option) || index}
-                    noStyle
-                    preserve={false}
-                    shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
-                    dependencies={option.dependencies || option?.componentProps?.dependencies}
-                  >
-                    {() => {
-                    // 支持动态计算 hidden
-                      const hidden = typeof option.hidden === "function"
-                        ? option.hidden(getFormValues())
-                        : (option.hidden ?? false);
-
-                      if (hidden)
-                        return null;
-
-                      return (
-                        <Col key={getKey(option) || index} span={itemSpan} style={style}>
-                          <Form.Item
-                            name={option.name}
-                            label={renderLabel(option)}
-                            rules={getRules(option)}
-                            labelCol={itemLabelCol}
-                            wrapperCol={itemWrapperCol}
-                            preserve={false}
-                            {...getFormItemProps(option)}
-                          >
-                            {renderFormControl(option)}
-                          </Form.Item>
-                        </Col>
-                      );
-                    }}
-                  </Form.Item>
-                )
+            <Form.Item
+              key={getKey(option) || index}
+              noStyle
+              preserve={false}
+              shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
+              dependencies={option.dependencies || option?.componentProps?.dependencies}
+            >
+              {() => {
+                // 支持动态计算 hidden
+                const hidden = typeof option.hidden === "function"
+                  ? option.hidden(getFormValues())
+                  : (option.hidden ?? false);
+
+                if (hidden)
+                  return null;
+
+                return (
+                  <Col key={getKey(option) || index} span={itemSpan} style={style}>
+                    <Form.Item
+                      name={option.name}
+                      label={renderLabel(option)}
+                      rules={getRules(option)}
+                      labelCol={itemLabelCol}
+                      wrapperCol={itemWrapperCol}
+                      preserve={false}
+                      {...getFormItemProps(option)}
+                    >
+                      {renderFormControl(option)}
+                    </Form.Item>
+                  </Col>
+                );
+              }}
+            </Form.Item>
           );
         }
 
@@ -357,23 +362,17 @@ const FormItemsRenderer = ({
 
         return (
           <Col key={getKey(option) || index} span={itemSpan} style={style}>
-            {
-              option.customizeRender
-                ? (renderFormControl(option))
-                : (
-                    <Form.Item
-                      name={option.name}
-                      label={renderLabel(option)}
-                      rules={getRules(option)}
-                      labelCol={itemLabelCol}
-                      wrapperCol={itemWrapperCol}
-                      preserve={false}
-                      {...getFormItemProps(option)}
-                    >
-                      {renderFormControl(option)}
-                    </Form.Item>
-                  )
-            }
+            <Form.Item
+              name={option.name}
+              label={renderLabel(option)}
+              rules={getRules(option)}
+              labelCol={itemLabelCol}
+              wrapperCol={itemWrapperCol}
+              preserve={false}
+              {...getFormItemProps(option)}
+            >
+              {renderFormControl(option)}
+            </Form.Item>
           </Col>
         );
       })}

package/components/HiddenInfo/gwj/index.js

@@ -90,15 +90,17 @@ function HiddenInfo(props) {
               { label: "隐患状态", children: getLabelName({ list: HIDDEN_STATE_ENUM, status: info.state }) },
               { label: "隐患描述", children: info.hiddenDesc },
               { label: "隐患部位", children: info.hiddenPart },
-              ...(info.source === 2 || info.source === 3
+              ...(
+                (info.source === 2 || info.source === 3) && (info.hiddenCheckListCO && Object.keys(info.hiddenCheckListCO).length > 0)
                 ? [
-                    { label: "风险点（单元）", children: "todo" },
-                    { label: "辨识部位", children: "todo" },
-                    { label: "存在风险", children: "todo" },
-                    { label: "风险分级", children: "todo" },
-                    { label: "隐患清单", children: "todo" },
+                    { label: "风险点（单元）", children: info.hiddenCheckListCO.listRiskPoints },
+                    { label: "辨识部位", children: info.hiddenCheckListCO.identifiedLocations },
+                    { label: "存在风险", children: info.hiddenCheckListCO.existingRisks },
+                    { label: "风险分级", children: info.hiddenCheckListCO.riskLevel },
+                    { label: "隐患清单", children: info.hiddenCheckListCO.listName },
                   ]
-                : []),
+                : []
+              ),
               {
                 label: "隐患上报位置（经纬度）",
                 children: [info.longitude && `经度:${info.longitude}`, info.latitude && `纬度:${info.latitude}`].filter(Boolean).join(" "),

package/components/SelectTree/Basic/index.d.ts

@@ -23,6 +23,8 @@ export interface BasicSelectTreeProps extends Omit<TreeSelectProps, "fieldNames"
   onGetLabel?: (label: string) => void;
   /** 获取数据 */
   onGetData?: (data: Record<string, any>[], processedData: Record<string, any>[]) => void;
+  /** 是否只允许选择最后一级，默认 false */
+  onlyLastLevel?: boolean;
 }
 
 /**

package/components/SelectTree/Basic/index.js

@@ -1,6 +1,6 @@
 import { TreeSelect } from "antd";
 import { useEffect } from "react";
-import { getTreeNodePaths, processTreeDataByLevel } from "../../../utils";
+import { getTreeNodePaths, processTreeDataByLevel, processTreeDataForOnlyLastLevel } from "../../../utils";
 
 /**
  * 基础下拉树组件（不建议直接使用此组件，二次继承使用）
@@ -18,11 +18,12 @@ function BasicSelectTree(props) {
     idKey = "id",
     childrenKey = "children",
     level,
+    onlyLastLevel = false,
     ...restProps
   } = props;
 
   // 根据 level 处理树数据
-  const processedTreeData = level
+  let processedTreeData = level
     ? processTreeDataByLevel({
         data: treeData,
         level,
@@ -31,6 +32,9 @@ function BasicSelectTree(props) {
       })
     : treeData;
 
+  // 根据 onlyLastLevel 处理树数据
+  processedTreeData = processTreeDataForOnlyLastLevel({ data: processedTreeData, childrenKey, onlyLastLevel });
+
   const handleChange = (value, label, extra) => {
     if (value) {
       const parentNodes = getTreeNodePaths({

package/hooks/useTable/index.js

@@ -115,7 +115,7 @@ function useTable(service, options) {
     usePagination = true,
     defaultType = "advance",
     defaultCurrent = 1,
-    defaultPageSize = 10,
+    defaultPageSize = 20,
     defaultPagination = { current: defaultCurrent, pageSize: defaultPageSize },
     ...restRestOptions
   } = restOptions;

package/package.json

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

package/utils/index.d.ts

@@ -301,3 +301,22 @@ export function processTreeDataByLevel(
   /** 子节点 */
   [key: string]: any;
 }[];
+
+/**
+ * 根据 onlyLastLevel 属性处理树数据，添加 selectable 属性控制节点是否可选择
+ */
+export function processTreeDataForOnlyLastLevel(
+  options: {
+    /** 树形数据 */
+    data: any[];
+    /** 子节点字段名 */
+    childrenKey: string;
+    /** 是否只允许选择最后一级 */
+    onlyLastLevel?: boolean;
+  },
+): {
+  /** 是否允许选择 */
+  selectable: boolean;
+  /** 子节点 */
+  [key: string]: any;
+}[];

package/utils/index.js

@@ -462,6 +462,33 @@ export const processTreeDataByLevel = (options) => {
   });
 };
 
+/**
+ * 根据 onlyLastLevel 属性处理树数据，添加 selectable 属性控制节点是否可选择
+ */
+export const processTreeDataForOnlyLastLevel = (options) => {
+  const { data, childrenKey, onlyLastLevel = false } = options;
+  if (!onlyLastLevel)
+    return data;
+
+  return data.map((item) => {
+    // 检查是否有子节点
+    const hasChildren = item[childrenKey] && item[childrenKey].length > 0;
+
+    // 如果有子节点，则不可选择
+    const processedItem = {
+      ...item,
+      selectable: !hasChildren,
+    };
+
+    // 递归处理子节点
+    if (hasChildren) {
+      processedItem[childrenKey] = processTreeDataForOnlyLastLevel({ data: item[childrenKey], childrenKey, onlyLastLevel });
+    }
+
+    return processedItem;
+  });
+};
+
 /**
  * 获取文件url
  */