form-driver 0.4.0 → 0.4.2

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "form-driver",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [
+    "曹志贤 <1546158360@qq.com>",
     "龙湖 <59775976@qq.com>",
     "云开 <2313303800@qq.com>"
   ],
@@ -136,4 +137,4 @@
   "engines": {
     "node": ">=v14.15.4"
   }
-}
+}

package/src/framework/Assembly.tsx

@@ -1,12 +1,17 @@
 import React, { ClassType } from "react";
-import { MValidationResult, MFieldSchemaAnonymity, MProp, MValidationFail } from './Schema';
+import {
+  MValidationResult,
+  MFieldSchemaAnonymity,
+  MProp,
+  MValidationFail,
+} from "./Schema";
 import { CHANGE_SCHEMA_CALLBACK } from "../framework/Schema";
 import _ from "lodash";
-import { MUtil } from './MUtil';
+import { MUtil } from "./MUtil";
 import { MType, PluginType } from "../types/MType";
 
 export type MORPH = "readable" | "editor";
-export type VIEWER = ClassType<MProp, any, any>
+export type VIEWER = ClassType<MProp, any, any>;
 
 /** 统一的视觉样式 */
 export interface MTheme {
@@ -39,8 +44,8 @@ const defaultTheme: MTheme = {
   READABLE_INVALID: "❓",
   READABLE_ERROR: "❗",
 
-  themeName: "antMiddle"
-}
+  themeName: "antMiddle",
+};
 
 /**
  * 注册viewer，type，morph（viewer和type之间的关联）
@@ -49,7 +54,13 @@ export class Assembly {
   types: { [name: string]: MType } = {};
   viewers: { [name: string]: VIEWER } = {};
   editors: { [name: string]: EDITOR } = {};
-  morph: { [name: /*MORPH*/ string]: { [typeName: string]: string | ClassType<MProp, any, any> /* viewer name or viewer */ } } = {}
+  morph: {
+    [name: /*MORPH*/ string]: {
+      [typeName: string]:
+        | string
+        | ClassType<MProp, any, any> /* viewer name or viewer */;
+    };
+  } = {};
 
   theme: MTheme = defaultTheme;
 
@@ -59,8 +70,13 @@ export class Assembly {
       let r;
       if (_.isString(s.toReadable)) {
         // eslint-disable-next-line no-new-func
-        r = new Function("_", "value", "theme",
-          "const {READABLE_UNKNOWN, READABLE_BLANK, READABLE_INVALID, READABLE_ERROR} = theme; return " + s.toReadable)(_, v, this.theme);
+        r = new Function(
+          "_",
+          "value",
+          "theme",
+          "const {READABLE_UNKNOWN, READABLE_BLANK, READABLE_INVALID, READABLE_ERROR} = theme; return " +
+            s.toReadable
+        )(_, v, this.theme);
       } else if (_.isFunction(s.toReadable)) {
         r = s.toReadable(v, parent, this);
       }
@@ -71,12 +87,15 @@ export class Assembly {
       }
       return r;
     } else {
-      return s.type + "类型无效"
+      return s.type + "类型无效";
     }
-  }
+  };
 
   /** 根据定义返回View，返回nil表示没有可用的View */
-  getViewerOf(f: MFieldSchemaAnonymity, morph: MORPH): ClassType<any, any, any> {
+  getViewerOf(
+    f: MFieldSchemaAnonymity,
+    morph: MORPH
+  ): ClassType<any, any, any> {
     if (f.editor && morph === "editor") {
       if (_.isString(f.editor)) {
         return _.get(this.viewers, f.editor);
@@ -90,22 +109,30 @@ export class Assembly {
         return f.readable;
       }
     } else {
-      const viewer: string | ClassType<MProp, any, any>  = _.get(this.morph, morph + "." + f.type);
+      const viewer: string | ClassType<MProp, any, any> = _.get(
+        this.morph,
+        morph + "." + f.type
+      );
       if (_.isString(viewer)) {
         return _.get(this.viewers, viewer);
       } else {
-        return viewer
+        return viewer;
       }
     }
   }
 
-  validate(s: MFieldSchemaAnonymity, v: any, path: string = ""): MValidationFail | undefined {
+  validate(
+    s: MFieldSchemaAnonymity,
+    v: any,
+    path: string = ""
+  ): MValidationFail | undefined {
     let result: MValidationResult = undefined;
     for (let validator of this.types[s.type].validators) {
       result = validator(this, s, v, path);
-      if (result === "pass") {
+
+      if (result === "pass" && s.type !== "weight") {
         return undefined;
-      } else if (result) {
+      } else if (typeof result === "object") {
         MUtil.debug("校验", path, result.message);
         return result;
       }
@@ -115,8 +142,10 @@ export class Assembly {
 
   addViewer(name: string, v: VIEWER) {
     if (this.viewers[name]) {
-      console.error(`addViewer: 已经存在名为 ${name} 的 Viewer，无法再次添加！`)
-      return
+      console.error(
+        `addViewer: 已经存在名为 ${name} 的 Viewer，无法再次添加！`
+      );
+      return;
     } else {
       this.viewers[name] = v;
     }
@@ -124,8 +153,10 @@ export class Assembly {
 
   addEditor(name: string, v: EDITOR) {
     if (this.editors[name]) {
-      console.error(`addEditor: 已经存在名为 ${name} 的 Editor，无法再次添加！`)
-      return
+      console.error(
+        `addEditor: 已经存在名为 ${name} 的 Editor，无法再次添加！`
+      );
+      return;
     } else {
       this.editors[name] = v;
     }
@@ -139,12 +170,11 @@ export class Assembly {
    * @param typeParam 类型的描述对象
    */
   addType(typeParam: PluginType) {
-    const { name, type, editor, readable = "DivViewer" } = typeParam
+    const { name, type, editor, readable = "DivViewer" } = typeParam;
     this.types[name] = type;
-    
+
     _.set(this.morph, "editor." + name, editor);
     _.set(this.morph, "readable." + name, readable);
-
   }
 
   constructor() {

package/src/framework/Init.tsx

@@ -34,6 +34,7 @@ import { AExperience } from "../ui/editor/complex/AExperience";
 import { ACnAddress } from "../ui/editor/complex/ACnAddress";
 import { AArray } from "../ui/editor/complex/AArray";
 import { ACheckDrag } from "../ui/editor/complex/ACheckDrag";
+import { AWeight } from "../ui/editor/complex/AWeight";
 import { AArrayGrid } from "../ui/editor/complex/AArrayGrid";
 import { ARangePicker } from "../ui/editor/basic/ARangePicker";
 import { AIntDiff } from "../ui/editor/complex/AIntDiff";
@@ -48,6 +49,7 @@ import { A } from "../ui/readable/A";
 import { ADialogForm } from "../ui/editor/complex/ADialogForm";
 import { MVLPairType } from "../types/MVLPairType";
 import { MKvSetType } from "../types/MKvSetType";
+import { MWeightType } from "../types/MWeightType";
 import { AKvSet } from "../ui/editor/basic/AKvSet";
 import { ACascadePicker } from "../ui/editor/basic/ACascadePicker";
 import { MCascadeType } from "../types/MCascadeType";
@@ -74,6 +76,7 @@ export function ensureM3() {
     yearMonth: MDateTimeType,
     yearMonthDay: MDateTimeType,
     set: MSetType,
+    weight: MWeightType,
     array: MArrayType,
     string: MStringType,
     intDiff: MIntDiffType,
@@ -127,6 +130,7 @@ export function ensureM3() {
     ADialogForm: ADialogForm,
     AKvSet: AKvSet,
     ACascadePicker: ACascadePicker,
+    AWeight: AWeight,
   });
 
   assembly.morph = _.merge(assembly.morph, {

package/src/framework/M3.tsx

@@ -102,7 +102,7 @@ const M3 = (props: React.PropsWithChildren<M3Prop & { debug?: boolean }>) => {
 
   return debug ? (
     <MViewerDebug
-      key={k}
+      // key={k}
       {...props}
       database={database}
       schema={schema}
@@ -111,7 +111,7 @@ const M3 = (props: React.PropsWithChildren<M3Prop & { debug?: boolean }>) => {
     />
   ) : (
     <MViewer
-      key={k}
+      // key={k}
       {...props}
       database={database}
       schema={schema}

package/src/framework/MViewer.tsx

@@ -68,14 +68,14 @@ interface State {
  * 一个完整的表单
  */
 export class MViewer extends React.Component<MViewerProp, State> {
-  database: any;
-
+  database: any = {};
   constructor(p: MViewerProp) {
     super(p);
     this.state = {
       forceValid: false,
       ctrlVersion: 1,
     };
+    console.log("执行 constructor");
 
     ensureM3();
 
@@ -95,6 +95,32 @@ export class MViewer extends React.Component<MViewerProp, State> {
     this.recover();
   }
 
+  // ⚠️ 新增：监听 props 变化
+  componentDidUpdate(prevProps: MViewerProp) {
+    console.log("MViewer: componentDidUpdate");
+    // 检查 schema 是否变化
+    if (!_.isEqual(prevProps.schema, this.props.schema)) {
+      console.log("MViewer: schema changed", {
+        prevSchema: prevProps.schema,
+        nextSchema: this.props.schema,
+      });
+
+      // 重新初始化 database
+      this.database = assembly.types[this.props.schema.type]?.standardValue(
+        assembly,
+        this.props.schema,
+        this.props.database,
+        false
+      );
+
+      // 填入默认值
+      MUtil.applyDefaultValue(this.props.schema, this.props.database, "");
+
+      // 触发重新渲染
+      this.setState({ ctrlVersion: this.state.ctrlVersion + 1 });
+    }
+  }
+
   recover() {
     const { ctrlVersion } = this.state;
     const { persistant } = this.props;
@@ -109,11 +135,13 @@ export class MViewer extends React.Component<MViewerProp, State> {
     const props = this.props;
     const database = this.database;
     const { ctrlVersion, forceValid } = this.state;
-
     return (
       <MContext.Provider
         value={{
-          rootProps: props,
+          rootProps: {
+            ...props,
+            database,
+          },
           forceValid,
           setForceValid: (b) => {
             this.setState({ forceValid: true });
@@ -191,10 +219,6 @@ export function SubmitBar(props: {
             ctx.rootProps.schema,
             ctx.rootProps.database
           );
-          // console.log("当前数据格式", {
-          //   schema: ctx.rootProps.schema,
-          //   database: ctx.rootProps.database,
-          // });
           const submit = props.onSubmit ?? ctx.rootProps.onSubmit;
           ctx.setForceValid(true);
           if (r) {

package/src/framework/Validator.ts

@@ -1,32 +1,46 @@
 import _ from "lodash";
-import { Assembly, assembly } from './Assembly';
-import { MFieldSchemaAnonymity, MValidationResult} from './Schema';
+import { Assembly, assembly } from "./Assembly";
+import { MFieldSchemaAnonymity, MValidationResult } from "./Schema";
 
-export type VALIDATOR = (a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string)=> MValidationResult;
+export type VALIDATOR = (
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+) => MValidationResult;
 
 /**
  * 非空校验，数据不能是null/undefined/""/NaN/[]
  * 要在其他条件之前，以便required=false时短路掉nil的数据，否则后面的校验全都得处理nil
- * @param a 
- * @param schema 
- * @param value 
- * @param path 
- * @returns 
+ * @param a
+ * @param schema
+ * @param value
+ * @param path
+ * @returns
  */
-export function validateRequired(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-  if(schema.required){
-    console.log('validateRequired-value', path, value)
-    if(_.isNil(value) || value === "" || _.isNaN(value) || (_.isArray(value) && value.length == 0)) {
-      return {message:'您还没有填完这一项', path};
+export function validateRequired(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
+  if (schema.required) {
+    if (
+      _.isNil(value) ||
+      value === "" ||
+      _.isNaN(value) ||
+      (_.isArray(value) && value.length == 0)
+    ) {
+      return { message: "您还没有填完这一项", path };
     }
     // 凡是总有例外
-    if(schema.type === "set" && schema.openOption) {
-      if(value.length === 1 && !value[0]){
-        return {message:'您还没有填完这一项', path}; // 开放set，只勾了开放选项，没有填内容，也要算空
+    if (schema.type === "set" && schema.openOption) {
+      if (value.length === 1 && !value[0]) {
+        return { message: "您还没有填完这一项", path }; // 开放set，只勾了开放选项，没有填内容，也要算空
       }
     }
   } else {
-    if(_.isNil(value)) {
+    if (_.isNil(value)) {
       return "pass";
     }
   }
@@ -34,22 +48,32 @@ export function validateRequired(a:Assembly, schema:MFieldSchemaAnonymity, value
 }
 
 /** 和validateRequired相同，但不短路 */
-export function validateRequiredNS(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
+export function validateRequiredNS(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
   const v = validateRequired(a, schema, value, path);
-  if(v === "pass"){
+  if (v === "pass") {
     return undefined;
   }
 }
 
-export function validateDateMinMax(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-  if(schema.min){
-    if(!value || value < schema.min) {
-      return {message: `请选择${schema.min}之后的时间`, path};
+export function validateDateMinMax(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
+  if (schema.min) {
+    if (!value || value < schema.min) {
+      return { message: `请选择${schema.min}之后的时间`, path };
     }
   }
-  if(schema.max){
-    if(!value || value > schema.max) {
-      return {message: `请选择${schema.min}之前的时间`, path};
+  if (schema.max) {
+    if (!value || value > schema.max) {
+      return { message: `请选择${schema.min}之前的时间`, path };
     }
   }
   return undefined;
@@ -60,15 +84,20 @@ export function validateDateMinMax(a:Assembly, schema:MFieldSchemaAnonymity, val
  * @param schema
  * @param value 应该是个数组
  */
-export function validateArrayItemMinMax(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-  if(schema.min){
-    if(!value || value.length < schema.min) {
-      return {message: `至少选择${schema.min}项`, path};
+export function validateArrayItemMinMax(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
+  if (schema.min) {
+    if (!value || value.length < schema.min) {
+      return { message: `至少选择${schema.min}项`, path };
     }
   }
-  if(schema.max){
-    if(!value || value.length > schema.max) {
-      return {message: `最多选择${schema.max}项`, path};
+  if (schema.max) {
+    if (!value || value.length > schema.max) {
+      return { message: `最多选择${schema.max}项`, path };
     }
   }
   return undefined;
@@ -79,15 +108,20 @@ export function validateArrayItemMinMax(a:Assembly, schema:MFieldSchemaAnonymity
  * @param schema
  * @param value 应该是个字符串
  */
-export function validateStringMinMax(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-  if(schema.min){
-    if(!value || value.length < schema.min) {
-      return {message: `至少${schema.min}个字`, path};
+export function validateStringMinMax(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
+  if (schema.min) {
+    if (!value || value.length < schema.min) {
+      return { message: `至少${schema.min}个字`, path };
     }
   }
-  if(schema.max){
-    if(value && value.length > schema.max) {
-      return {message: `最多${schema.max}个字`, path};
+  if (schema.max) {
+    if (value && value.length > schema.max) {
+      return { message: `最多${schema.max}个字`, path };
     }
   }
   return undefined;
@@ -98,29 +132,42 @@ export function validateStringMinMax(a:Assembly, schema:MFieldSchemaAnonymity, v
  * @param schema
  * @param value 应该是个数字
  */
-export function validateNumberMinMax(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-  const temp = Number(value)
-  if(!_.isNil(schema.max)){
-    if(!_.isFinite(temp) || temp > schema.max) {
-      return {message: `最多${schema.max}`, path};
+export function validateNumberMinMax(
+  a: Assembly,
+  schema: MFieldSchemaAnonymity,
+  value: any,
+  path: string
+): MValidationResult {
+  const temp = Number(value);
+  if (!_.isNil(schema.max)) {
+    if (!_.isFinite(temp) || temp > schema.max) {
+      return { message: `最多${schema.max}`, path };
     }
   }
-  if(!_.isNil(schema.min)){
-    if(!_.isFinite(temp) || temp < schema.min) {
-      return {message: `最少${schema.min}`, path};
+  if (!_.isNil(schema.min)) {
+    if (!_.isFinite(temp) || temp < schema.min) {
+      return { message: `最少${schema.min}`, path };
     }
   }
   return undefined;
 }
 
-export function generateRegexValidate(regex:RegExp, mismatchMsg:string):VALIDATOR {
-  return function (a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
+export function generateRegexValidate(
+  regex: RegExp,
+  mismatchMsg: string
+): VALIDATOR {
+  return function (
+    a: Assembly,
+    schema: MFieldSchemaAnonymity,
+    value: any,
+    path: string
+  ): MValidationResult {
     const asstr = _.toString(value);
-    if( !regex.test(asstr) ){
-      return {message: mismatchMsg, path};
+    if (!regex.test(asstr)) {
+      return { message: mismatchMsg, path };
     }
     return undefined;
-  }
+  };
 }
 
 /**
@@ -128,27 +175,43 @@ export function generateRegexValidate(regex:RegExp, mismatchMsg:string):VALIDATO
  * 可以用Object.prototype.toString.call(<预期的类型>)来查看你想要的数据类型的expectType
  * @param expectType 预期类型，例如："[object Object]" "[object Null]" "[object Number]" "[object Date]" "[object Array]"
  * @param mismatchMsg 如果不匹配，提示的错误信息
- * @returns 
+ * @returns
  */
-export function generateJsPrototypeValidate(expectType:string, mismatchMsg:string = "数据有误，请重填此项"):VALIDATOR {
-  return function (a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-    if(Object.prototype.toString.call(value) == expectType){
-      return undefined
+export function generateJsPrototypeValidate(
+  expectType: string,
+  mismatchMsg: string = "数据有误，请重填此项"
+): VALIDATOR {
+  return function (
+    a: Assembly,
+    schema: MFieldSchemaAnonymity,
+    value: any,
+    path: string
+  ): MValidationResult {
+    if (Object.prototype.toString.call(value) == expectType) {
+      return undefined;
     } else {
-      return {message: mismatchMsg, path};
+      return { message: mismatchMsg, path };
     }
-  }
+  };
 }
 
-export function generateSchemaValidate(valueSchema:MFieldSchemaAnonymity, mismatchMsg?:string):VALIDATOR {
-  return function (a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
-    const r = assembly.validate(valueSchema,value, "");
-    if(!r){
+export function generateSchemaValidate(
+  valueSchema: MFieldSchemaAnonymity,
+  mismatchMsg?: string
+): VALIDATOR {
+  return function (
+    a: Assembly,
+    schema: MFieldSchemaAnonymity,
+    value: any,
+    path: string
+  ): MValidationResult {
+    const r = assembly.validate(valueSchema, value, "");
+    if (!r) {
       return r;
     } else {
-      return {message: mismatchMsg ?? r.message, path};
+      return { message: mismatchMsg ?? r.message, path };
     }
-  }
+  };
 }
 
 export default {
@@ -157,5 +220,5 @@ export default {
   validateDateMinMax,
   validateStringMinMax,
   validateNumberMinMax,
-  generateRegexValidate
-}
+  generateRegexValidate,
+};

package/src/types/MSetType.ts

@@ -18,7 +18,7 @@ function validateCandidate(
 ): MValidationResult {
   let fs = MUtil.option(schema);
   const openOption = _.clone(schema.openOption ?? schema.setOpen);
-
+  if (!value) return undefined;
   for (let v of value) {
     let vIsOk = false;
     for (let f of fs) {