zy-react-library 1.0.50 → 1.0.52

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -4,26 +4,12 @@ import type { NamePath } from "rc-field-form/lib/interface";
 import type { FC, ReactNode } from "react";
 import type { FORM_ITEM_RENDER_ENUM } from "../../enum/formItemRender";
 
-/**
- * 自定义渲染组件的属性
- */
-export interface CustomRenderProps {
-  /** 表单当前值 */
-  formValues: FormValues;
-  /** 字段值 */
-  value?: any;
-  /** 值变化回调 */
-  onChange?: (value: any) => void;
-  /** 其他属性 */
-  [key: string]: any;
-}
-
 /**
  * 表单项渲染类型
  */
 export type FormItemRenderType
   = | (typeof FORM_ITEM_RENDER_ENUM)[keyof typeof FORM_ITEM_RENDER_ENUM]
-    | ((props: CustomRenderProps) => ReactNode);
+    | ReactNode;
 
 /**
  * 选项项数据类型
@@ -55,6 +41,8 @@ export type FormValues = Record<string, any>;
  * 表单配置项
  */
 export interface FormOption {
+  /** React 需要的 key，如果传递了唯一的 name，则不需要 */
+  key?: string;
   /** 表单项字段名 */
   name?: string | string[];
   /** 表单项标签 */

package/components/FormBuilder/FormItemsRenderer.js

@@ -133,6 +133,11 @@ const FormItemsRenderer = ({
     return option.rules ? (Array.isArray(option.rules) ? option.rules : [option.rules]) : [];
   };
 
+  // 获取key
+  const getKey = (option) => {
+    return option.key || option.name
+  }
+
   // 渲染表单控件
   const renderFormControl = (option) => {
     const componentProps = getComponentProps(option);
@@ -245,15 +250,7 @@ const FormItemsRenderer = ({
         return null;
 
       default:
-        // 支持传入自定义组件
-        if (typeof render === "function" || typeof render === "object") {
-          const CustomComponent = render;
-          if (typeof render === "function")
-            return <CustomComponent {...componentProps} formValues={getFormValues()} />;
-          if (typeof render === "object")
-            return <CustomComponent {...componentProps} />;
-        }
-        return <Input placeholder={placeholder} {...componentProps} />;
+        return render;
     }
   };
 
@@ -286,7 +283,7 @@ const FormItemsRenderer = ({
         // 如果是分割线
         if (option.render === FORM_ITEM_RENDER_ENUM.DIVIDER) {
           return (
-            <Col key={option.name || index} span={itemSpan} style={style}>
+            <Col key={getKey(option) || index} span={itemSpan} style={style}>
               <Divider orientation="left">{option.label}</Divider>
             </Col>
           );
@@ -299,7 +296,7 @@ const FormItemsRenderer = ({
               ? (renderFormControl(option))
               : (
                   <Form.Item
-                    key={option.name || index}
+                    key={getKey(option) || index}
                     noStyle
                     preserve={false}
                     shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
@@ -315,7 +312,7 @@ const FormItemsRenderer = ({
                         return null;
 
                       return (
-                        <Col key={option.name || index} span={itemSpan} style={style}>
+                        <Col key={getKey(option) || index} span={itemSpan} style={style}>
                           <Form.Item
                             name={option.name}
                             label={renderLabel(option)}
@@ -345,7 +342,7 @@ const FormItemsRenderer = ({
           return null;
 
         return (
-          <Col key={option.name || index} span={itemSpan} style={style}>
+          <Col key={getKey(option) || index} span={itemSpan} style={style}>
             {
               option.customizeRender
                 ? (renderFormControl(option))

package/components/LeftTree/Department/Gwj/index.d.ts

@@ -1,12 +1,14 @@
 import type { FC } from "react";
 import type { BasicLeftTreeProps } from "../../Basic";
 
+/**
+ * 请求参数
+ */
 export interface Params {
   /** 企业id */
   eqCorpinfoId?: string;
   /** 父级部门id */
   eqParentId?: string;
-  [key: string]: any;
 }
 
 /**

package/components/LeftTree/Department/Gwj/index.js

@@ -1,32 +1,32 @@
-import { request } from "@cqsjjb/jjb-common-lib/http";
-import { useEffect, useState } from "react";
-import BasicLeftTree from "../../Basic";
-
-/**
- * 部门左侧树组件（港务局版本）
- */
-function DepartmentLeftTree(props) {
-  const {
-    params = {},
-    ...restProps
-  } = props;
-
-  const [treeData, setTreeData] = useState([]);
-
-  const getData = async () => {
-    const { data } = await request("/basic-info/department/listTree", "post", params);
-    setTreeData(data);
-  };
-
-  useEffect(() => {
-    getData();
-  }, []);
-
-  return (
-    <BasicLeftTree treeData={treeData} {...restProps} />
-  );
-}
-
-DepartmentLeftTree.displayName = "DepartmentLeftTree";
-
-export default DepartmentLeftTree;
+import { request } from "@cqsjjb/jjb-common-lib/http";
+import { useEffect, useState } from "react";
+import BasicLeftTree from "../../Basic";
+
+/**
+ * 部门左侧树组件（港务局版本）
+ */
+function DepartmentLeftTree(props) {
+  const {
+    params = {},
+    ...restProps
+  } = props;
+
+  const [treeData, setTreeData] = useState([]);
+
+  const getData = async () => {
+    const { data } = await request("/basic-info/department/listTree", "post", params);
+    setTreeData(data);
+  };
+
+  useEffect(() => {
+    getData();
+  }, []);
+
+  return (
+    <BasicLeftTree treeData={treeData} {...restProps} />
+  );
+}
+
+DepartmentLeftTree.displayName = "DepartmentLeftTree";
+
+export default DepartmentLeftTree;

package/components/Map/index.js

@@ -38,7 +38,7 @@ const Map = (props) => {
           </Form.Item>
         </Col>
         <Col span={12}>
-          <Form.Item label="纬度" required={required} rules={[{ required, message: "请选择纬度" }]}>
+          <Form.Item label="纬度" required={required}>
             <div style={{ display: "flex", gap: 10 }}>
               <Form.Item name={latitudeProps} noStyle rules={[{ required, message: "请选择纬度" }]}>
                 <Input disabled />

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

@@ -0,0 +1,23 @@
+import type { SelectProps } from "antd/es/select";
+import type { FC } from "react";
+
+/**
+ * 组件属性
+ */
+export interface BasicSelectProps extends SelectProps {
+  /** 数据源 */
+  data: Record<string, any>[];
+  /** 数据 label 字段，默认 name */
+  nameKey?: string;
+  /** 数据 value 字段，默认 id */
+  idKey?: string;
+  /** 占位符 */
+  placeholder?: string;
+}
+
+/**
+ * 基础下拉组件（不建议直接使用此组件，二次继承使用）
+ */
+declare const BasicSelectTree: FC<BasicSelectProps>;
+
+export default BasicSelectTree;

package/components/Select/Basic/index.js

@@ -0,0 +1,32 @@
+import { Select } from "antd";
+
+/**
+ * 基础下拉组件（不建议直接使用此组件，二次继承使用）
+ */
+function BasicSelect(props) {
+  const {
+    placeholder = "",
+    data = [],
+    nameKey = "name",
+    idKey = "id",
+    ...restProps
+  } = props;
+
+  return (
+    <Select placeholder={`请选择${placeholder}`} showSearch allowClear {...restProps}>
+      {data.map((item) => {
+        const value = item[idKey];
+        const label = item[nameKey];
+        return (
+          <Select.Option key={value} value={value}>
+            {label}
+          </Select.Option>
+        );
+      })}
+    </Select>
+  );
+}
+
+BasicSelect.displayName = "BasicSelect";
+
+export default BasicSelect;

package/components/Select/Personnel/Gwj/index.d.ts

@@ -0,0 +1,37 @@
+import type { FC } from "react";
+import type { BasicSelectProps } from "../../Basic";
+
+/**
+ * 请求参数
+ */
+export interface Params {
+  /** 企业id */
+  corpinfoId?: string;
+  /** 岗位id */
+  postId?: string;
+  /** 部门id */
+  departmentId?: string;
+}
+
+/**
+ * 组件属性
+ */
+export interface DepartmentSelectProps extends Omit<BasicSelectProps, "data"> {
+  /** 请求参数 */
+  params?: Params;
+  /** 占位符，默认"人员" */
+  placeholder?: string;
+  /** 是否需要企业id，默认 false */
+  isNeedCorpInfoId?: boolean;
+  /** 是否需要岗位id，默认 false */
+  isNeedPostId?: boolean;
+  /** 是否需要部门id，默认 true */
+  isNeedDepartmentId?: boolean;
+}
+
+/**
+ * 基础下拉组件（港务局版本）
+ */
+declare const DepartmentSelect: FC<DepartmentSelectProps>;
+
+export default DepartmentSelect;

package/components/Select/Personnel/Gwj/index.js

@@ -0,0 +1,45 @@
+import { request } from "@cqsjjb/jjb-common-lib/http";
+import { useEffect, useState } from "react";
+import BasicSelect from "~/components/Select/Basic";
+
+/**
+ * 基础下拉组件（港务局版本）
+ */
+function PersonnelSelect(props) {
+  const {
+    params = {},
+    placeholder = "人员",
+    isNeedCorpInfoId = false,
+    isNeedDepartmentId = true,
+    isNeedPostId = false,
+    ...restProps
+  } = props;
+
+  const [data, setData] = useState([]);
+
+  const getData = async () => {
+    setData([]);
+    // 根据参数决定是否发送请求
+    if (isNeedCorpInfoId && !params.corpinfoId)
+      return;
+    if (isNeedDepartmentId && !params.departmentId)
+      return;
+    if (isNeedPostId && !params.postId)
+      return;
+
+    const { data } = await request("/basic-info/user/listAll", "get", params);
+    setData(data);
+  };
+
+  useEffect(() => {
+    getData();
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId]);
+
+  return (
+    <BasicSelect data={data} placeholder={placeholder} {...restProps} />
+  );
+}
+
+PersonnelSelect.displayName = "PersonnelSelect";
+
+export default PersonnelSelect;

package/components/SelectCreate/index.js

@@ -11,7 +11,6 @@ function SelectCreate(props) {
     label = "",
     maxCount = 1,
     onDelete,
-    formValues,
     ...restProps
   } = props;
 

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

@@ -15,6 +15,8 @@ export interface BasicSelectTreeProps extends TreeSelectProps {
   onGetNodePathsIsIncludeOneself?: boolean;
   /** 获取父级节点 */
   onGetNodePaths?: (nodes: Record<string, any>[]) => void;
+  /** 占位符 */
+  placeholder?: string;
 }
 
 /**

package/components/SelectTree/Basic/index.js

@@ -11,7 +11,6 @@ function BasicSelectTree(props) {
     nameKey = "name",
     idKey = "id",
     childrenKey = "childrenList",
-    formValues,
     ...restProps
   } = props;
 

package/components/SelectTree/Department/Gwj/index.d.ts

@@ -5,13 +5,19 @@ import { Params } from "../../../LeftTree/Department/Gwj";
 /**
  * 组件属性
  */
-export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder"> {
+export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData"> {
   /** 请求参数 */
   params?: Params;
+  /** 占位符，默认"部门“ */
+  placeholder?: string;
+  /** 是否需要企业id，默认 false */
+  isNeedCorpInfoId?: boolean;
+  /** 是否需要父级部门id，默认 false */
+  isNeedParentId?: boolean;
 }
 
 /**
- * 部门下拉树组件（港务局版本）
+ * 基础下拉树组件（港务局版本）
  */
 declare const DepartmentSelectTree: FC<DepartmentSelectTreeProps>;
 

package/components/SelectTree/Department/Gwj/index.js

@@ -3,27 +3,38 @@ import { useEffect, useState } from "react";
 import BasicLeftTree from "../../Basic";
 
 /**
- * 部门左侧树组件（港务局版本）
+ * 基础下拉树组件（港务局版本）
  */
 function DepartmentSelectTree(props) {
   const {
     params = {},
+    placeholder = "部门",
+    isNeedCorpInfoId = false,
+    isNeedParentId = false,
     ...restProps
   } = props;
 
   const [treeData, setTreeData] = useState([]);
 
   const getData = async () => {
+    setTreeData([]);
+
+    // 根据参数决定是否发送请求
+    if (isNeedCorpInfoId && !params.eqCorpinfoId)
+      return;
+    if (isNeedParentId && !params.eqParentId)
+      return;
+
     const { data } = await request("/basic-info/department/listTree", "post", params);
     setTreeData(data);
   };
 
   useEffect(() => {
     getData();
-  }, []);
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedParentId]);
 
   return (
-    <BasicLeftTree treeData={treeData} placeholder="部门" {...restProps} />
+    <BasicLeftTree treeData={treeData} placeholder={placeholder} {...restProps} />
   );
 }
 

package/components/Upload/index.js

@@ -20,7 +20,6 @@ const Upload = (props) => {
     tipContent,
     uploadButtonText: externalUploadButtonText,
     fileType: externalFileType,
-    formValues,
     ...restProps
   } = props;
 

package/package.json

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