form-driver 0.4.1 → 0.4.2

package/src/types/MWeightType.ts

@@ -0,0 +1,113 @@
+import { MUtil } from "../framework/MUtil";
+import { MFieldSchemaAnonymity, MValidationResult } from "../framework/Schema";
+import { MType } from "./MType";
+
+import { validateRequired } from "../framework/Validator";
+import { assembly, Assembly } from "../framework/Assembly";
+import _ from "lodash";
+
+// 验证比重值的合法性
+function validateWeightValue(
+  a: Assembly,
+  schema: any,
+  value: any,
+  path: string
+): MValidationResult {
+  if (_.isNil(value)) {
+    return undefined;
+  }
+
+  if (!_.isObject(value)) {
+    return { message: "比重值格式错误", path };
+  }
+
+  const fs = MUtil.option(schema) as any;
+  const totalWeight = schema.weight ?? 100; // 默认总比重为100
+  let currentTotal = 0;
+
+  // 计算当前已分配比重
+  if (Array.isArray(value)) {
+    currentTotal = value?.reduce?.((acc, val) => acc + val.value, 0);
+  }
+
+  // 比重题的校验文案都是固定显示在表单上，所以返回的 message 都是空的
+  // 验证总比重是否小于目标值
+  if (schema.weight && currentTotal < schema.weight && currentTotal !== 0) {
+    return {
+      message: `已分配比重不得小于总比重`,
+      path,
+    };
+  }
+
+  // 验证总比重是否超过最大值
+  if (schema.weight !== undefined && currentTotal > schema.weight) {
+    return {
+      message: ``,
+      path,
+    };
+  }
+  console.log("验证参数", value, currentTotal, schema.weight);
+
+  return undefined;
+}
+
+export const MWeightType: MType = {
+  validators: [validateRequired, validateWeightValue],
+
+  toReadable: (
+    assembly: Assembly,
+    s: MFieldSchemaAnonymity,
+    vs: any
+  ): string => {
+    const fs = MUtil.option(s) as any;
+    if (_.isNil(vs)) {
+      return assembly.theme.READABLE_BLANK;
+    } else if (!_.isObject(vs)) {
+      return assembly.theme.READABLE_ERROR;
+    }
+
+    const parts: string[] = [];
+    for (let f of fs) {
+      const weight = vs[f.value];
+      if (!_.isNil(weight) && weight !== 0) {
+        parts.push(`${f.label}: ${weight}`);
+      }
+    }
+
+    return parts.length > 0 ? parts.join(", ") : assembly.theme.READABLE_BLANK;
+  },
+
+  standardValue: (a: Assembly, s: any, vs: any, strict: boolean): any => {
+    if (!_.isObject(vs)) {
+      return s.defaultValue;
+    }
+    if (!strict) {
+      return vs;
+    }
+
+    const fs = MUtil.option(s) as any;
+    const result: any = {};
+
+    for (let f of fs) {
+      const weight = vs[f.value];
+      if (!_.isNil(weight) && _.isNumber(weight) && weight >= 0) {
+        // 如果要求整数，则转换为整数
+        if (s.requireInteger) {
+          result[f.value] = Math.round(weight);
+        } else {
+          result[f.value] = weight;
+        }
+      }
+    }
+
+    return result;
+  },
+
+  createDefaultValue: (assembly: Assembly, s: MFieldSchemaAnonymity): any => {
+    if (s.defaultValue) {
+      return _.clone(s.defaultValue);
+    } else {
+      return {}; // 默认为空对象
+    }
+  },
+};

package/src/ui/BaseViewer.tsx

@@ -1,8 +1,8 @@
 import React, { ReactNode } from "react";
 import { MProp } from "../framework/Schema";
 import _ from "lodash";
-import { assembly } from '../framework/Assembly';
-import { MContext } from '../framework/MContext';
+import { assembly } from "../framework/Assembly";
+import { MContext } from "../framework/MContext";
 import { MUtil } from "../framework/MUtil";
 
 export interface ViewerState {
@@ -16,24 +16,27 @@ export interface ViewerState {
  * 每一个Viewer，都用来表达（展示readable/编辑editor）json上的一个值 / 或者不会改变数据的装饰物
  * 这个类负责展示校验错误，提供数据存取api
  */
-export abstract class Viewer<S extends ViewerState> extends React.Component<MProp, S> {
+export abstract class Viewer<S extends ViewerState> extends React.Component<
+  MProp,
+  S
+> {
   /**
    * 获取此字段在database中的值
    */
-  getValue(){
+  getValue() {
     return MUtil.get(this.props.database, this.props.path);
   }
 
   /**
    * 修复全局 Scheme
    */
-  changeSchema(v){
+  changeSchema(v) {
     if (this.props.changeSchema) {
-     this.props.changeSchema(v) 
+      this.props.changeSchema(v);
     }
   }
 
-  getParentValue(){
+  getParentValue() {
     return MUtil.get(this.props.database, MUtil.parentPath(this.props.path));
   }
 
@@ -44,76 +47,95 @@ export abstract class Viewer<S extends ViewerState> extends React.Component<MPro
    * @param updateCtrlVersion - 子类可以用state.ctrlVersion作为key的一部分，在数据变化时用changeValue(value, true)改变输入框的内容
    * @param final - 参考AFTER_CHANGE_CALLBACK
    */
-  changeValueEx(v:any, updateCtrlVersion:boolean, final:boolean) {
+  changeValueEx(v: any, updateCtrlVersion: boolean, final: boolean) {
     // 字段校验状态是否变化
     MUtil.set(this.props.database, this.props.path, v);
     this.props.afterChange?.(this.props.path, v, final);
-    this.setState((p) =>{
-      return {ctrlVersion: updateCtrlVersion? (p.ctrlVersion ?? 0 )+1 : (p.ctrlVersion ?? 0)}
+    this.setState((p) => {
+      return {
+        ctrlVersion: updateCtrlVersion
+          ? (p.ctrlVersion ?? 0) + 1
+          : p.ctrlVersion ?? 0,
+      };
     });
   }
 
   /**
    * changeValueEx(v, false, true)的快捷方式
-   * @param v 
+   * @param v
    */
-  changeValue(v:any) {
+  changeValue(v: any) {
     this.changeValueEx(v, false, true);
   }
 
   /**
    * 子类实现编辑器元素的渲染，render根据这个元素再加上校验
    */
-  protected abstract element(ctx?: any):ReactNode;
+  protected abstract element(ctx?: any): ReactNode;
 
   render() {
-    return <MContext.Consumer>{
-      ctx =>{
-        // const isShow = MUtil.isShow(this.props.database, ctx.rootProps.schema?.objectFields, this.props.schema.showIf)
-        // // 隐藏的字段不展示
-        // if (!isShow) return null
-        const childElement = this.element(ctx);
-        if(this.props.morph === "readable" || this.state?.noValidate){
-          return childElement;
-        } else {
-          // 加上校验错误提示
-          if(!ctx?.forceValid) {
+    return (
+      <MContext.Consumer>
+        {(ctx) => {
+          // const isShow = MUtil.isShow(this.props.database, ctx.rootProps.schema?.objectFields, this.props.schema.showIf)
+          // // 隐藏的字段不展示
+          // if (!isShow) return null
+          const childElement = this.element(ctx);
+          if (this.props.morph === "readable" || this.state?.noValidate) {
             return childElement;
+          } else {
+            // 加上校验错误提示
+            if (!ctx?.forceValid) {
+              return childElement;
+            }
+            const v = assembly.validate(
+              this.props.schema,
+              this.getValue(),
+              this.props.path
+            );
+            return [
+              childElement,
+              v?.message ? (
+                <div
+                  key="错误提示"
+                  className="ant-form-item-explain ant-form-item-explain-error"
+                >
+                  {v.message}
+                </div>
+              ) : undefined,
+            ];
           }
-          const v = assembly.validate(this.props.schema, this.getValue(), this.props.path);
-          return [
-            childElement,
-            v?.message ? <div key="错误提示" className="ant-form-item-explain ant-form-item-explain-error">{v.message}</div> : undefined
-          ];
-        }
-      }
-    }</MContext.Consumer>
+        }}
+      </MContext.Consumer>
+    );
   }
 
-  getPlaceholder(index:number = 0): string|undefined {
+  getPlaceholder(index: number = 0): string | undefined {
     let p = this.props.schema.placeholder;
-    if(_.isString(p)){
+    if (_.isString(p)) {
       return p;
-    } else if(p) {
+    } else if (p) {
       return p[index];
     } else {
       return undefined;
     }
   }
 
-  antProp(useVersionCtrl:boolean = false){
+  antProp(useVersionCtrl: boolean = false) {
     return {
-      key: useVersionCtrl ? this.props.path + "/" + this.state.ctrlVersion : this.props.path,
+      key: useVersionCtrl
+        ? this.props.path + "/" + this.state.ctrlVersion
+        : this.props.path,
       placeholder: this.getPlaceholder(),
       bordered: !this.props.hideBorder,
-      disabled: this.props.disable
-    }
+      disabled: this.props.disable,
+    };
   }
 }
 
 export abstract class BaseViewer extends Viewer<ViewerState> {
-  constructor(p:MProp){
+  constructor(p: MProp) {
     super(p);
-    this.state = {ctrlVersion: 1, noValidate: false};
+    this.state = { ctrlVersion: 1, noValidate: false };
   }
-};
+}

package/src/ui/editor/basic/AIntBox.tsx

@@ -13,27 +13,30 @@ export class AIntBox extends BaseViewer {
     const props = {
       ...super.antProp(),
       bordered: undefined,
-      style: {border: this.props.hideBorder ? "none" : undefined, ...this.props.style},
+      style: {
+        border: this.props.hideBorder ? "none" : undefined,
+        ...this.props.style,
+      },
       min: this.props.schema.min,
       max: this.props.schema.max,
       // type: "number",
       pattern: "\\d*",
       defaultValue: super.getValue(),
-      onChange: (v)=>{
-        let n: number | undefined = Number(v)
-        if(_.isNaN(n)){
+      onChange: (v) => {
+        let n: number | undefined = Number(v);
+        if (_.isNaN(n)) {
           n = undefined;
         }
-        if (p.onChange) p.onChange(n)
-        console.log(n)
+        if (p.onChange) p.onChange(n);
+        console.log(n);
         this.changeValueEx(n, false, false);
       },
-      onBlur: () =>{
-        if (p.onBlur) p.onBlur()
+      onBlur: () => {
+        if (p.onBlur) p.onBlur();
         this.changeValueEx(super.getValue(), false, true);
       },
       ...p,
-    }
-    return <InputNumber {...props}></InputNumber>
+    };
+    return <InputNumber {...props}></InputNumber>;
   }
 }