update version

xlorne · xlorne · commit 50e742195a1a · 2026-03-26T11:12:22.000+08:00
diff --git a/apps/app-mobile/package.json b/apps/app-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@form-example/app-mobile",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/app-pc/package.json b/apps/app-pc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@form-example/app-pc",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/app-pc/src/pages/home.tsx b/apps/app-pc/src/pages/home.tsx
@@ -48,6 +48,9 @@ const HomePage = () => {
             <FormView
                 meta={meta}
                 form={form}
+                onFinish={(values, formCode)=>{
+                    console.log(values, formCode);
+                }}
                 validators={[
                     {
                         target:'name',
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coding-form/root",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/form-engine/package.json b/packages/form-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coding-form/form-engine",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "form-engine components",
   "keywords": [
     "coding-flow",
diff --git a/packages/form-engine/src/form/index.tsx b/packages/form-engine/src/form/index.tsx
@@ -28,22 +28,30 @@ export const FormViewContent: React.FC<FormViewContentProps> = (props) => {
 
     const review = props.review || false;
 
+    const handleOnSubmit = (values:any,formCode:string) => {
+        props.onFinish?.(values,formCode);
+    }
+
     return (
         <FormContext.Provider value={context}>
+            {props.header}
             <FormSubView
                 Form={Form}
                 formCode={meta.code}
                 review={review}
+                onFinish={handleOnSubmit}
             />
             {subFormList && subFormList.map(item=>{
                 return (
                     <FormSubView
                         Form={Form}
                         formCode={item.code}
                         review={review}
+                        onFinish={handleOnSubmit}
                     />
                 )
             })}
+            {props.footer}
         </FormContext.Provider>
     )
 }
diff --git a/packages/form-engine/src/form/sub-view.tsx b/packages/form-engine/src/form/sub-view.tsx
@@ -5,6 +5,7 @@ interface FormSubViewProps {
     formCode: string;
     Form: React.ComponentType<any>;
     review: boolean;
+    onFinish: (values:any,formCode:string) => void;
 }
 
 export const FormSubView: React.FC<FormSubViewProps> = (props) => {
@@ -50,6 +51,9 @@ export const FormSubView: React.FC<FormSubViewProps> = (props) => {
     return (
         <Form
             form={formTarget}
+            onFinish={(values:any)=>{
+                props.onFinish(values,props.formCode);
+            }}
         >
             {layoutContext.render(props.formCode, fields, review, context)}
         </Form>
diff --git a/packages/form-engine/src/instance/control.ts b/packages/form-engine/src/instance/control.ts
@@ -1,3 +1,5 @@
+import { NamePath } from "@/types";
+
 export class FormControl {
 
     // 控制对象的表单编码
@@ -19,31 +21,31 @@ export class FormControl {
         return this.proxyTarget;
     }
 
-    public getFieldValue(name: string) {
+    public getFieldValue(name: NamePath) {
         return this.proxyTarget.getFieldValue(name);
     }
 
     public getFieldsValue() {
         return this.proxyTarget.getFieldsValue();
     }
 
-    public resetFields(nameList?: string[]) {
+    public resetFields(nameList?: NamePath[]|NamePath) {
         this.proxyTarget.resetFields(nameList);
     }
 
     public setFieldsValue(values: any) {
         this.proxyTarget.setFieldsValue(values);
     }
 
-    public setFieldValue(name: string, value: any) {
+    public setFieldValue(name: NamePath, value: any) {
         this.proxyTarget.setFieldValue(name, value);
     }
 
     public submit() {
         this.proxyTarget.submit();
     }
 
-    public validateFields(nameList?: string[]) {
+    public validateFields(nameList?: NamePath[]|NamePath) {
         return new Promise<any>((resolve, reject) => {
             this.proxyTarget
                 .validateFields(nameList)
diff --git a/packages/form-engine/src/instance/index.ts b/packages/form-engine/src/instance/index.ts
@@ -1,15 +1,15 @@
-import {FormMeta} from "@/types";
+import {FormInstanceInterface, FormMeta, NamePath} from "@/types";
 import {FormRegistry} from "@/register";
 import {FormControl} from "./control";
 import {FormPresenter} from "@/presenters";
 
-export class FormInstance {
+export class FormInstance implements FormInstanceInterface {
 
     private readonly instanceList: FormControl[];
 
     private readonly meta: FormMeta;
 
-    private presenter: FormPresenter|undefined;
+    private presenter: FormPresenter | undefined;
 
     constructor(meta: FormMeta) {
         this.meta = meta;
@@ -67,31 +67,31 @@ export class FormInstance {
         return this.getFormControl(formCode)?.getProxyTarget();
     }
 
-    public getFieldValue(name: string, formCode?: string) {
+    public getFieldValue(name: NamePath, formCode?: string) {
         this.getFormControl(formCode)?.getFieldValue(name);
     }
 
     public getFieldsValue(formCode?: string) {
         return this.getFormControl(formCode)?.getFieldsValue();
     }
 
-    public resetFields(nameList?: string[], formCode?: string) {
+    public resetFields(nameList?: NamePath[] | NamePath, formCode?: string) {
         this.getFormControl(formCode)?.resetFields(nameList);
     }
 
     public setFieldsValue(values: any, formCode?: string) {
         this.getFormControl(formCode)?.setFieldsValue(values);
     }
 
-    public setFieldValue(name: string, value: any, formCode?: string) {
+    public setFieldValue(name: NamePath, value: any, formCode?: string) {
         this.getFormControl(formCode)?.setFieldValue(name, value);
     }
 
     public submit(formCode?: string) {
         this.getFormControl(formCode)?.submit();
     }
 
-    public validateFields(nameList?: string[], formCode?: string) {
+    public validateFields(nameList?: NamePath[] | NamePath, formCode?: string) {
         const formControl = this.getFormControl(formCode);
         if (formControl) {
             return formControl.validateFields(nameList);
@@ -103,15 +103,15 @@ export class FormInstance {
         });
     }
 
-    public hiddenFields(hidden: boolean, nameList: string[]|string, formCode?: string) {
+    public hiddenFields(hidden: boolean, nameList: NamePath[] | NamePath, formCode?: string) {
         this.presenter?.hiddenFields(hidden, nameList, formCode);
     }
 
-    public requiredFields(required: boolean, nameList: string[]|string, formCode?: string) {
+    public requiredFields(required: boolean, nameList: NamePath[] | NamePath, formCode?: string) {
         this.presenter?.requiredFields(required, nameList, formCode);
     }
 
-    public refreshFields(nameList: string[]|string, formCode?: string) {
+    public refreshFields(nameList: NamePath[] | NamePath, formCode?: string) {
         this.presenter?.refreshFields(nameList, formCode);
     }
 
diff --git a/packages/form-engine/src/presenters/form-presenter.ts b/packages/form-engine/src/presenters/form-presenter.ts
@@ -1,4 +1,4 @@
-import {Dispatch, FormMeta, FormState, StateField} from "@/types";
+import {Dispatch, FormMeta, FormState, NamePath, StateField} from "@/types";
 
 export class FormPresenter {
     private state: FormState;
@@ -19,7 +19,7 @@ export class FormPresenter {
     }
 
 
-    public hiddenFields(hidden: boolean, nameList: string[]|string, formCode?: string) {
+    public hiddenFields(hidden: boolean, nameList: NamePath[]|NamePath, formCode?: string) {
         this.dispatch(prevState => {
             const subFormList = prevState.subForms || [];
             return {
@@ -52,7 +52,7 @@ export class FormPresenter {
     }
 
 
-    public refreshFields(nameList: string[]|string, formCode?: string){
+    public refreshFields(nameList: NamePath[]|NamePath, formCode?: string){
         this.dispatch(prevState => {
             const subFormList = prevState.subForms || [];
             return {
@@ -84,7 +84,7 @@ export class FormPresenter {
         })
     }
 
-    public requiredFields(required: boolean, nameList: string[]|string, formCode?: string) {
+    public requiredFields(required: boolean, nameList: NamePath[]|NamePath, formCode?: string) {
         this.dispatch(prevState => {
             const subFormList = prevState.subForms || [];
             return {
@@ -117,7 +117,7 @@ export class FormPresenter {
     }
 
 
-    private hiddenMapFields(hidden: boolean,field:StateField,nameList: string[]|string) {
+    private hiddenMapFields(hidden: boolean,field:StateField,nameList: NamePath[]|NamePath) {
         if(typeof nameList === 'string'){
             if(field.code ===nameList){
                 return {
@@ -137,7 +137,7 @@ export class FormPresenter {
     }
 
 
-    private refreshMapFields(field:StateField,nameList: string[]|string) {
+    private refreshMapFields(field:StateField,nameList: NamePath[]|NamePath) {
         if(typeof nameList === 'string'){
             if(field.code ===nameList){
                 const version = field.version?field.version:0;
@@ -158,7 +158,7 @@ export class FormPresenter {
         return field;
     }
 
-    private requiredMapFields(required: boolean,field:StateField,nameList: string[]|string) {
+    private requiredMapFields(required: boolean,field:StateField,nameList: NamePath[]|NamePath) {
         if(typeof nameList === 'string'){
             if(field.code ===nameList){
                 return {
diff --git a/packages/form-engine/src/types/index.ts b/packages/form-engine/src/types/index.ts
@@ -5,4 +5,5 @@ export * from "./view";
 export * from "./validate";
 export * from "./event";
 export * from "./dispatch";
-export * from "./layout";
+export * from "./layout";
+export * from "./instance";
diff --git a/packages/form-engine/src/types/instance.ts b/packages/form-engine/src/types/instance.ts
@@ -0,0 +1,27 @@
+export type NamePath = string | string[];
+
+/**
+ *  表单实例对象能力
+ */
+export interface FormInstanceInterface {
+    /** 获取表某个单值 **/
+    getFieldValue: (name: NamePath, formCode?: string) => any;
+    /** 获取表所有值 **/
+    getFieldsValue: (formCode?: string) => any;
+    /** 重置表单值 **/
+    resetFields: (fields?: NamePath[] | NamePath, formCode?: string) => void;
+    /** 设置表单所有值 **/
+    setFieldsValue: (values: any, formCode?: string) => void;
+    /** 设置表单值 **/
+    setFieldValue: (name: NamePath, value: any, formCode?: string) => void;
+    /** 表单提交 **/
+    submit: (formCode?: string) => void;
+    /** 校验字段 **/
+    validateFields: (nameList?: NamePath[] | NamePath, formCode?: string) => Promise<any>;
+    /** 隐藏字段控制 **/
+    hiddenFields: (hidden: boolean, nameList: NamePath[] | NamePath, formCode?: string) => void;
+    /** 必填字段控制 **/
+    requiredFields: (required: boolean, nameList: NamePath[] | NamePath, formCode?: string) => void;
+    /** 刷新字段控制 **/
+    refreshFields: (nameList: NamePath[] | NamePath, formCode?: string) => void;
+}
diff --git a/packages/form-engine/src/types/view.tsx b/packages/form-engine/src/types/view.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import {DataType} from "./types";
 import {FormInstance} from "@/instance";
 import {FormEvent, FormFieldValidator} from "@/types";
@@ -97,12 +98,18 @@ export interface FormViewProps {
     form?: FormInstance;
     /** 表单数据更新事件 */
     onValuesChange?: (values: any) => void;
+    /** 表单提交数据 **/
+    onFinish?: (values:any,formCode?:string) => void;
+    /** 表单头内容 **/
+    header?:React.ReactNode;
+    /** 表单底部内容 **/
+    footer?:React.ReactNode;
     /** 是否预览模式 */
     review?: boolean;
     /** 字段校验逻辑 */
     validators?: FormFieldValidator[];
     /** 事件定义 **/
     events?: FormEvent[];
     /** 布局控制 **/
-    layouts?: FormLayout[]
+    layouts?: FormLayout[];
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@form-example/app-mobile",`
`3`		`- "version": "0.0.3",`
	`3`	`+ "version": "0.0.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@form-example/app-pc",`
`3`		`- "version": "0.0.3",`
	`3`	`+ "version": "0.0.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@coding-form/root",`
`3`		`- "version": "0.0.3",`
	`3`	`+ "version": "0.0.4",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@coding-form/form-engine",`
`3`		`- "version": "0.0.3",`
	`3`	`+ "version": "0.0.4",`
`4`	`4`	`"description": "form-engine components",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"coding-flow",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import { NamePath } from "@/types";`
	`2`	`+`
`1`	`3`	`export class FormControl {`
`2`	`4`
`3`	`5`	`// 控制对象的表单编码`
`@@ -19,31 +21,31 @@ export class FormControl {`
`19`	`21`	`return this.proxyTarget;`
`20`	`22`	`}`
`21`	`23`
`22`		`- public getFieldValue(name: string) {`
	`24`	`+ public getFieldValue(name: NamePath) {`
`23`	`25`	`return this.proxyTarget.getFieldValue(name);`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public getFieldsValue() {`
`27`	`29`	`return this.proxyTarget.getFieldsValue();`
`28`	`30`	`}`
`29`	`31`
`30`		`- public resetFields(nameList?: string[]) {`
	`32`	`+ public resetFields(nameList?: NamePath[]\|NamePath) {`
`31`	`33`	`this.proxyTarget.resetFields(nameList);`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`public setFieldsValue(values: any) {`
`35`	`37`	`this.proxyTarget.setFieldsValue(values);`
`36`	`38`	`}`
`37`	`39`
`38`		`- public setFieldValue(name: string, value: any) {`
	`40`	`+ public setFieldValue(name: NamePath, value: any) {`
`39`	`41`	`this.proxyTarget.setFieldValue(name, value);`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public submit() {`
`43`	`45`	`this.proxyTarget.submit();`
`44`	`46`	`}`
`45`	`47`
`46`		`- public validateFields(nameList?: string[]) {`
	`48`	`+ public validateFields(nameList?: NamePath[]\|NamePath) {`
`47`	`49`	`return new Promise<any>((resolve, reject) => {`
`48`	`50`	`this.proxyTarget`
`49`	`51`	`.validateFields(nameList)`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`		`-import {FormMeta} from "@/types";`
	`1`	`+import {FormInstanceInterface, FormMeta, NamePath} from "@/types";`
`2`	`2`	`import {FormRegistry} from "@/register";`
`3`	`3`	`import {FormControl} from "./control";`
`4`	`4`	`import {FormPresenter} from "@/presenters";`
`5`	`5`
`6`		`-export class FormInstance {`
	`6`	`+export class FormInstance implements FormInstanceInterface {`
`7`	`7`
`8`	`8`	`private readonly instanceList: FormControl[];`
`9`	`9`
`10`	`10`	`private readonly meta: FormMeta;`
`11`	`11`
`12`		`- private presenter: FormPresenter\|undefined;`
	`12`	`+ private presenter: FormPresenter \| undefined;`
`13`	`13`
`14`	`14`	`constructor(meta: FormMeta) {`
`15`	`15`	`this.meta = meta;`
`@@ -67,31 +67,31 @@ export class FormInstance {`
`67`	`67`	`return this.getFormControl(formCode)?.getProxyTarget();`
`68`	`68`	`}`
`69`	`69`
`70`		`- public getFieldValue(name: string, formCode?: string) {`
	`70`	`+ public getFieldValue(name: NamePath, formCode?: string) {`
`71`	`71`	`this.getFormControl(formCode)?.getFieldValue(name);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public getFieldsValue(formCode?: string) {`
`75`	`75`	`return this.getFormControl(formCode)?.getFieldsValue();`
`76`	`76`	`}`
`77`	`77`
`78`		`- public resetFields(nameList?: string[], formCode?: string) {`
	`78`	`+ public resetFields(nameList?: NamePath[] \| NamePath, formCode?: string) {`
`79`	`79`	`this.getFormControl(formCode)?.resetFields(nameList);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public setFieldsValue(values: any, formCode?: string) {`
`83`	`83`	`this.getFormControl(formCode)?.setFieldsValue(values);`
`84`	`84`	`}`
`85`	`85`
`86`		`- public setFieldValue(name: string, value: any, formCode?: string) {`
	`86`	`+ public setFieldValue(name: NamePath, value: any, formCode?: string) {`
`87`	`87`	`this.getFormControl(formCode)?.setFieldValue(name, value);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public submit(formCode?: string) {`
`91`	`91`	`this.getFormControl(formCode)?.submit();`
`92`	`92`	`}`
`93`	`93`
`94`		`- public validateFields(nameList?: string[], formCode?: string) {`
	`94`	`+ public validateFields(nameList?: NamePath[] \| NamePath, formCode?: string) {`
`95`	`95`	`const formControl = this.getFormControl(formCode);`
`96`	`96`	`if (formControl) {`
`97`	`97`	`return formControl.validateFields(nameList);`
`@@ -103,15 +103,15 @@ export class FormInstance {`
`103`	`103`	`});`
`104`	`104`	`}`
`105`	`105`
`106`		`- public hiddenFields(hidden: boolean, nameList: string[]\|string, formCode?: string) {`
	`106`	`+ public hiddenFields(hidden: boolean, nameList: NamePath[] \| NamePath, formCode?: string) {`
`107`	`107`	`this.presenter?.hiddenFields(hidden, nameList, formCode);`
`108`	`108`	`}`
`109`	`109`
`110`		`- public requiredFields(required: boolean, nameList: string[]\|string, formCode?: string) {`
	`110`	`+ public requiredFields(required: boolean, nameList: NamePath[] \| NamePath, formCode?: string) {`
`111`	`111`	`this.presenter?.requiredFields(required, nameList, formCode);`
`112`	`112`	`}`
`113`	`113`
`114`		`- public refreshFields(nameList: string[]\|string, formCode?: string) {`
	`114`	`+ public refreshFields(nameList: NamePath[] \| NamePath, formCode?: string) {`
`115`	`115`	`this.presenter?.refreshFields(nameList, formCode);`
`116`	`116`	`}`
`117`	`117`