zy-react-library 1.0.169 → 1.0.171

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -4,14 +4,7 @@ import type { FormListFieldData } from "antd/es/form/FormList";
 import type { Gutter } from "antd/es/grid/row";
 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 type FormItemRenderType
-  = | (typeof FORM_ITEM_RENDER_ENUM)[keyof typeof FORM_ITEM_RENDER_ENUM]
-    | ReactNode;
+import type { FORM_ITEM_RENDER_TYPE_MAP } from "../../enum/formItemRender";
 
 /**
  * 选项项数据类型
@@ -62,7 +55,7 @@ export interface FormListUniqueProps {
 /**
  * 表单配置项
  */
-export interface FormOption {
+export interface FormOption<T extends keyof FORM_ITEM_RENDER_TYPE_MAP = keyof FORM_ITEM_RENDER_TYPE_MAP> {
   /** React 需要的 key，如果传递了唯一的 name，则不需要 */
   key?: string;
   /** 表单项字段名 */
@@ -70,7 +63,7 @@ export interface FormOption {
   /** 表单项标签 */
   label?: ReactNode;
   /** 渲染类型 */
-  render?: FormItemRenderType;
+  render?: T | ReactNode;
   /** 占据栅格列数，默认 12 */
   span?: number | string;
   /** 是否必填，默认 true，支持函数动态计算 */
@@ -92,7 +85,7 @@ export interface FormOption {
   /** 字段键配置 */
   itemsField?: itemsFieldConfig;
   /** 传递给表单控件的属性，支持函数动态计算 */
-  componentProps?: Record<string, any> | ((formValues: FormValues) => Record<string, any>);
+  componentProps?: FORM_ITEM_RENDER_TYPE_MAP[T] | ((formValues: FormValues) => FORM_ITEM_RENDER_TYPE_MAP[T]);
   /** 传递给 Form.Item 的属性，支持函数动态计算 */
   formItemProps?: FormItemProps | ((formValues: FormValues) => FormItemProps);
   /** label 栅格配置，默认直接使用外层的 labelCol，如果 span 等于 24，是外层的 labelCol.span 一半 */

package/components/FormBuilder/FormItemsRenderer.js

@@ -408,6 +408,8 @@ const FormItemsRenderer = ({
 
   // 渲染特殊类型的表单项
   const renderOtherTypeItem = ({ option, style, col, index }) => {
+    const componentProps = getComponentProps(option);
+
     // 如果是 customizeRender 类型，完全交给外部控制渲染
     if (option.customizeRender) {
       return (
@@ -435,7 +437,7 @@ const FormItemsRenderer = ({
     if (option.render === FORM_ITEM_RENDER_ENUM.DIVIDER) {
       return (
         <Col key={getKey(option) || index} span={col.span} style={style}>
-          <Divider orientation="left">{option.label}</Divider>
+          <Divider orientation="left" {...componentProps}>{option.label}</Divider>
         </Col>
       );
     }
@@ -446,9 +448,11 @@ const FormItemsRenderer = ({
   // 渲染 Form.List
   const renderFormList = (option, index, col, style) => {
     const formListUniqueProps = getFormListUniqueProps(option);
+    const componentProps = getComponentProps(option);
+
     return (
       <Col key={getKey(option) || index} span={col.span} style={style}>
-        <Form.List name={option.name}>
+        <Form.List name={option.name} {...componentProps}>
           {(fields, { add, remove }) => (
             <>
               {fields.map((field, fieldIndex) => {

package/components/ImportFile/index.d.ts

@@ -12,13 +12,17 @@ export interface ImportFileProps extends Omit<FormProps, "form"> {
   /** 弹窗标题 */
   title?: string;
   /** 模板文件地址 */
-  templateUrl: string;
+  templateUrl?: string;
   /** 子组件 */
   children?: ReactNode | ((props: { form: FormInstance }) => ReactNode);
   /** 确认回调 */
   onConfirm: (values: FormValues) => void;
   /** 取消回调 */
   onCancel: () => void;
+  /** 导出模板按钮文字，默认 “导出模板” */
+  exportTemplateButtonText?: ReactNode;
+  /** 额外按钮 */
+  extraButtons?: ReactNode;
 }
 
 /**

package/components/ImportFile/index.js

@@ -14,6 +14,8 @@ const ImportFile = (props) => {
     templateUrl,
     labelCol = { span: 4 },
     children,
+    exportTemplateButtonText = "导出模板",
+    extraButtons,
     ...restProps
   } = props;
 
@@ -55,9 +57,10 @@ const ImportFile = (props) => {
       footer={[
         templateUrl && (
           <Button key="export" onClick={handleExportTemplate}>
-            导出模板
+            {exportTemplateButtonText}
           </Button>
         ),
+        {extraButtons},
         <Button key="cancel" onClick={handleClose}>
           取消
         </Button>,

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

@@ -13,6 +13,16 @@ export interface Params {
   departmentId?: string;
 }
 
+/**
+ * 额外请求参数
+ */
+export interface ExtraParams {
+  /** 返回值是否存在主账号 */
+  noMain: 1 | "";
+  /** 入职状态 */
+  eqEmploymentFlag: number;
+}
+
 /**
  * 组件属性
  */
@@ -27,8 +37,8 @@ export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "p
   isNeedPostId?: boolean;
   /** 是否需要部门id，默认 true */
   isNeedDepartmentId?: boolean;
-  /** 返回值是否存在主账号 */
-  noMain?: 1 | "";
+  /** 额外请求参数 */
+  extraParams?: ExtraParams;
 }
 
 /**

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

@@ -12,7 +12,10 @@ function PersonnelSelect(props) {
     isNeedCorpInfoId = false,
     isNeedDepartmentId = true,
     isNeedPostId = false,
-    noMain = "",
+    extraParams= {
+      noMain: "",
+      eqEmploymentFlag: 1,
+    },
     ...restProps
   } = props;
 
@@ -28,13 +31,13 @@ function PersonnelSelect(props) {
     if (isNeedPostId && !params.postId)
       return;
 
-    const { data } = await request("/basicInfo/user/listAll", "get", { ...params, noMain });
+    const { data } = await request("/basicInfo/user/listAll", "get", { ...params, ...extraParams });
     setData(data);
   };
 
   useEffect(() => {
     getData();
-  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId, noMain]);
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId, JSON.stringify(extraParams)]);
 
   return (
     <BasicSelect data={data} placeholder={placeholder} {...restProps} />

package/components/Table/index.less

@@ -7,3 +7,7 @@
     padding: 0;
   }
 }
+
+.@{ant-prefix}-pro-table-list-toolbar-container {
+  padding-block: 16px !important;
+}

package/enum/formItemRender/index.d.ts

@@ -1,37 +1,65 @@
-/**
- * 表单项类型枚举
- */
-export declare const FORM_ITEM_RENDER_ENUM: {
-  /** 映射为 antd Input */
-  INPUT: "input";
-  /** 映射为 antd Input.TextArea */
-  TEXTAREA: "textarea";
-  /** 映射为 antd InputNumber */
-  INPUT_NUMBER: "inputNumber";
-  /** 映射为 antd InputNumber */
-  NUMBER: "number";
-  /** 映射为 antd Select */
-  SELECT: "select";
-  /** 映射为 antd Radio.Group */
-  RADIO: "radio";
-  /** 映射为 antd Checkbox.Group */
-  CHECKBOX: "checkbox";
-  /** 映射为 antd DatePicker，日期格式为YYYY-MM-DD */
-  DATE: "date";
-  /** 映射为 antd DatePicker.MonthPicker，日期格式为YYYY-MM */
-  DATE_MONTH: "dateMonth";
-  /** 映射为 antd DatePicker.YearPicker，日期格式为YYYY */
-  DATE_YEAR: "dateYear";
-  /** 映射为 antd DatePicker.WeekPicker，日期格式为YYYY-wo */
-  DATE_WEEK: "dateWeek";
-  /** 映射为 antd DatePicker.RangePicker，日期格式为YYYY-MM-DD */
-  DATE_RANGE: "dateRange";
-  /** 映射为 antd DatePicker，日期格式为YYYY-MM-DD HH:mm:ss */
-  DATETIME: "datetime";
-  /** 映射为 antd DatePicker.RangePicker，日期格式为YYYY-MM-DD HH:mm:ss */
-  DATETIME_RANGE: "datetimeRange";
-  /** 映射为 antd Divider */
-  DIVIDER: "divider";
-  /** 映射为 antd FormList */
-  FORM_LIST: "formList",
-};
+import type { CheckboxProps } from "antd/es/checkbox";
+import type { DatePickerProps } from "antd/es/date-picker";
+import type { DividerProps } from "antd/es/divider";
+import type { FormListProps } from "antd/es/form";
+import type { InputProps, TextAreaProps } from "antd/es/input";
+import type { InputNumberProps } from "antd/es/input-number";
+import type { RadioProps } from "antd/es/radio";
+import type { SelectProps } from "antd/es/select";
+
+/**
+ * 表单项类型枚举
+ */
+export declare const FORM_ITEM_RENDER_ENUM: {
+  /** 映射为 antd Input */
+  INPUT: "input";
+  /** 映射为 antd Input.TextArea */
+  TEXTAREA: "textarea";
+  /** 映射为 antd InputNumber */
+  INPUT_NUMBER: "inputNumber";
+  /** 映射为 antd InputNumber */
+  NUMBER: "number";
+  /** 映射为 antd Select */
+  SELECT: "select";
+  /** 映射为 antd Radio.Group */
+  RADIO: "radio";
+  /** 映射为 antd Checkbox.Group */
+  CHECKBOX: "checkbox";
+  /** 映射为 antd DatePicker，日期格式为YYYY-MM-DD */
+  DATE: "date";
+  /** 映射为 antd DatePicker.MonthPicker，日期格式为YYYY-MM */
+  DATE_MONTH: "dateMonth";
+  /** 映射为 antd DatePicker.YearPicker，日期格式为YYYY */
+  DATE_YEAR: "dateYear";
+  /** 映射为 antd DatePicker.WeekPicker，日期格式为YYYY-wo */
+  DATE_WEEK: "dateWeek";
+  /** 映射为 antd DatePicker.RangePicker，日期格式为YYYY-MM-DD */
+  DATE_RANGE: "dateRange";
+  /** 映射为 antd DatePicker，日期格式为YYYY-MM-DD HH:mm:ss */
+  DATETIME: "datetime";
+  /** 映射为 antd DatePicker.RangePicker，日期格式为YYYY-MM-DD HH:mm:ss */
+  DATETIME_RANGE: "datetimeRange";
+  /** 映射为 antd Divider */
+  DIVIDER: "divider";
+  /** 映射为 antd FormList */
+  FORM_LIST: "formList";
+};
+
+export interface FORM_ITEM_RENDER_TYPE_MAP {
+  input: InputProps;
+  textarea: TextAreaProps;
+  inputNumber: InputNumberProps;
+  number: InputNumberProps;
+  select: SelectProps;
+  radio: RadioProps;
+  checkbox: CheckboxProps;
+  date: DatePickerProps;
+  dateMonth: DatePickerProps;
+  dateYear: DatePickerProps;
+  dateWeek: DatePickerProps;
+  dateRange: DatePickerProps;
+  datetime: DatePickerProps;
+  datetimeRange: DatePickerProps;
+  divider: DividerProps;
+  formList: FormListProps;
+}

package/package.json

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