add hiddenFields requiredFields

Author: xlorne

apps/app-mobile/src/pages/home.tsx

@@ -1,6 +1,7 @@
 import {createFormInstance, FormView} from "@coding-form/form-view";
 import type {FormMeta} from "@coding-form/form-view";
 import {Button, Space} from "antd-mobile";
+import {FormInstance} from "@coding-form/form-view";
 
 const HomePage = () => {
 
@@ -32,7 +33,7 @@ const HomePage = () => {
                 validators={[
                     {
                         target:'name',
-                        validator:(value,instance)=>{
+                        validator:(instance:FormInstance,value:any)=>{
                             if(value){
                                 return true;
                             }

apps/app-pc/src/pages/home.tsx

@@ -1,6 +1,7 @@
 import {createFormInstance, FormView} from "@coding-form/form-view";
 import type {FormMeta} from "@coding-form/form-view";
 import {Button, Space} from "antd";
+import {FormInstance} from "@coding-form/form-view";
 
 const HomePage = () => {
 
@@ -9,7 +10,16 @@ const HomePage = () => {
         code: "leave",
         fields: [
             {
-                id: "1",
+                id: "id",
+                name: 'id',
+                code: 'id',
+                type: "string",
+                dataType: 'STRING',
+                hidden: true,
+                required: false,
+            },
+            {
+                id: "name",
                 name: '姓名',
                 code: 'name',
                 type: "string",
@@ -31,7 +41,7 @@ const HomePage = () => {
                 validators={[
                     {
                         target:'name',
-                        validator:(value,instance)=>{
+                        validator:(instance:FormInstance,value:any)=>{
                             if(value){
                                 return true;
                             }
@@ -43,8 +53,9 @@ const HomePage = () => {
                     {
                         type: 'change',
                         target:'name',
-                        event:(value)=>{
-                            console.log('value',value)
+                        event:(instance:FormInstance,value:any)=>{
+                            console.log('value',value);
+                            instance.setFieldValue('id',value);
                         }
                     }
                 ]}

packages/form-view/src/context/form-context.tsx

@@ -39,6 +39,10 @@ export class FormContextScope {
         return this.instance.getFormControl(formCode);
     }
 
+    public getFormInstance(){
+        return this.instance;
+    }
+
     public getPresenter() {
         return this.presenter;
     }

packages/form-view/src/event/event-context.ts

@@ -1,4 +1,5 @@
 import {FieldKey, FormEvent} from "@/types";
+import {FormInstance} from "@/instance";
 
 export class EventContext {
 
@@ -8,21 +9,21 @@ export class EventContext {
         this.events = events;
     }
 
-    public handlerOnChange(target: FieldKey, value: any) {
+    public handlerOnChange(formInstance:FormInstance,target: FieldKey, value: any) {
         const events = this.getEvents('change', target);
         if (events && events.length > 0) {
             for (const event of events) {
-                event.event(value);
+                event.event(formInstance,value);
             }
         }
     }
 
 
-    public handlerOnBlur(target: FieldKey,value:any) {
+    public handlerOnBlur(formInstance:FormInstance,target: FieldKey,value:any) {
         const events = this.getEvents('blur', target);
         if (events && events.length > 0) {
             for (const event of events) {
-                event.event(value);
+                event.event(formInstance,value);
             }
         }
     }

packages/form-view/src/factory/index.tsx

@@ -40,19 +40,21 @@ export class FormItemFactory {
 
         const eventContext = context.getEventContext();
 
+        const instance = context.getFormInstance();
+
         const fieldKey = {
             formCode,
             fieldCode:formField.code,
         }
 
         const handlerOnChange = (value:any)=>{
             formItemProps.onChange?.(value);
-            eventContext.handlerOnChange(fieldKey, value);
+            eventContext.handlerOnChange(instance,fieldKey, value);
         }
 
         const handlerOnBlur = (value:any) => {
             formItemProps.onBlur?.(value);
-            eventContext.handlerOnBlur(fieldKey,value);
+            eventContext.handlerOnBlur(instance,fieldKey,value);
         }
 
         if (FormItem) {

packages/form-view/src/form/sub-view.tsx

@@ -31,13 +31,15 @@ export const FormSubView: React.FC<FormSubViewProps> = (props) => {
 
     const formControl = context.getFormControl(formCode);
 
+    const formInstance = context.getFormInstance();
+
     const formTarget = formControl?.getProxyTarget();
 
     React.useEffect(() => {
         const events = context.getEventContext().getLoadEvents();
         if (events && events.length > 0) {
             for (const event of events) {
-                event.event();
+                event.event(formInstance);
             }
         }
     }, []);

packages/form-view/src/instance/index.ts

@@ -84,7 +84,7 @@ export class FormInstance {
         this.getFormControl(formCode)?.setFieldsValue(values);
     }
 
-    public setFieldValue(name: string, value: any, formCode: string) {
+    public setFieldValue(name: string, value: any, formCode?: string) {
         this.getFormControl(formCode)?.setFieldValue(name, value);
     }
 

packages/form-view/src/types/event.ts

@@ -1,4 +1,5 @@
 import {FieldKey} from "@/types";
+import {FormInstance} from "@/instance";
 
 /**
  * 表单事件
@@ -12,7 +13,7 @@ export interface FormEvent {
     target?:FieldKey;
 
     // 事件触发
-    event:(value?:any)=>void;
+    event:(instance:FormInstance,value?:any)=>void;
 
 }
 

packages/form-view/src/types/validate.ts

@@ -10,6 +10,6 @@ export interface FormFieldValidator {
     target: FieldKey;
 
     /** 校验函数 **/
-    validator: (value: any, instance: FormInstance) => string | true;
+    validator: (instance: FormInstance,value: any) => string | true;
 
 }

packages/form-view/src/types/view.ts

@@ -70,13 +70,21 @@ export interface FieldCode{
     fieldCode:string;
 }
 
+/**
+ * 布局控制
+ */
+export interface FormLayout{
+
+}
+
 
 /**
  *  字段唯一标识
  */
 export type FieldKey = string|FieldCode;
 
 
+
 /**
  * 表单视图属性
  */
@@ -93,4 +101,6 @@ export interface FormViewProps {
     validators?:FormFieldValidator[];
     /** 事件定义 **/
     events?: FormEvent[];
+    /** 布局控制 **/
+    layout?:FormLayout
 }