update 0.0.17

Author: xlorne

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingapi/ui-framework",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A UI Framework built with React and Typescript",
   "keywords": [
     "ui",

src/Form/content.ts

@@ -3,5 +3,4 @@ export * from './antd';
 export * from './instance';
 export * from './listener';
 export * from './utils';
-export * from './validate';
-export * from './content';
+export * from './validate';

src/Form/index.ts

@@ -5,26 +5,53 @@ import React from "react";
 import {AntdForm, AntdFormInstance} from "./antd";
 
 export class FormInstance {
+    // 校验上下文
     private readonly validateContext: FormValidateContext;
+    // 重新加载上下文
     private readonly reloadContext: FormFieldReloadListenerContext;
+    // 选项重新加载上下文
     private readonly optionContext: FormFieldOptionListenerContext;
+    // 表单实例
     private readonly formInstance: AntdFormInstance|undefined;
+    // 表单操作对象
     private readonly formAction: FormAction;
+    // 动态表单字段
     private fields: FormField[];
-
+    // 表单字段组件
+    private formFields:  FormField[];
+    // 表单字段更新函数
     private fieldsUpdateDispatch: React.Dispatch<React.SetStateAction<FormField[]>> | undefined;
 
+    /**
+     * 表单字段更新函数
+     * @param fieldsUpdateDispatch
+     */
     public setFieldsUpdateDispatch = (fieldsUpdateDispatch: React.Dispatch<React.SetStateAction<FormField[]>>) => {
         this.fieldsUpdateDispatch = fieldsUpdateDispatch;
     }
 
+    /**
+     * 更新表单字段
+     * @param resetFields
+     */
     private updateFields = (resetFields: (prevState: FormField[]) => FormField[]) => {
         this.fields = resetFields(this.fields);
         if (this.fieldsUpdateDispatch) {
             this.fieldsUpdateDispatch(resetFields);
         }
     }
 
+    /**
+     * 添加表单字段
+     * @param field
+     */
+    public addFormField = (field: FormField) => {
+        const formFieldNames = this.formFields.map((item) => item.props.name);
+        if (formFieldNames.indexOf(field.props.name) === -1) {
+            this.formFields.push(field);
+        }
+    }
+
     private namePathEqual = (name1: NamePath, name2: NamePath) => {
         if (Array.isArray(name1) && Array.isArray(name2)) {
             if (name1.length !== name2.length) {
@@ -216,6 +243,24 @@ export class FormInstance {
         return this.formInstance?.getFieldsValue();
     }
 
+
+    /**
+     * 获取Form表单字段
+     * @param name
+     */
+    public getFormFieldProps = (name: NamePath) => {
+        for (const field of this.formFields) {
+            if (field.props.name && this.namePathEqual(field.props.name, name)) {
+                return field;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取动态表单字段
+     * @param name
+     */
     public getFieldProps = (name: NamePath) => {
         for (const field of this.fields) {
             if (field.props.name && this.namePathEqual(field.props.name, name)) {
@@ -262,6 +307,7 @@ export class FormInstance {
         this.optionContext = new FormFieldOptionListenerContext();
         this.formInstance = AntdForm.getInstance().useForm();
         this.fields = [];
+        this.formFields = [];
         this.formAction = {
             submit: this.submit,
             reset: this.reset,

src/Form/instance.ts

@@ -9,13 +9,20 @@ export class ValidateUtils {
      */
     static validateNotEmpty = async (content: FormValidateContent, message?: string) => {
         const field = content.getFieldProps();
-        const errorMessage = message ? message : field?.props.label + '不能为空' || '不能为空';
+        let errorMessage = message;
+        if (!errorMessage) {
+            if (field) {
+                errorMessage = field.props?.label + '不能为空';
+            } else {
+                errorMessage = '不能为空';
+            }
+        }
         const value = content.value;
         if (value) {
             if (Array.isArray(value)) {
                 if (value.length === 0) {
                     return [errorMessage];
-                }else {
+                } else {
                     return [];
                 }
             } else {

src/Form/utils.ts

@@ -15,7 +15,7 @@ export class FormValidateContent {
     }
 
     getFieldProps = () => {
-        return this.form.getFieldProps(this.name);
+        return this.form.getFieldProps(this.name) || this.form.getFormFieldProps(this.name);
     }
 }