form-driver 0.4.4 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-driver",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [

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

@@ -1,32 +1,31 @@
-
 import React from "react";
-import { Ajax } from '../../../framework/Ajax';
+import { Ajax } from "../../../framework/Ajax";
 import _ from "lodash";
-import { MUtil } from '../../../framework/MUtil';
-import { Cascader } from 'antd';
-import { MFieldSchema } from '../../../framework/Schema';
-import { Picker } from 'antd-mobile';
+import { MUtil } from "../../../framework/MUtil";
+import { Cascader } from "antd";
+import { MFieldSchema } from "../../../framework/Schema";
+import { Picker } from "antd-mobile";
 import { BaseViewer } from "../../..";
 
-
 export function labelExpr(d: any, remote: MFieldSchema["remote"]) {
-  let script = "const {" + _.keys(d).join(',') + "} = d; return " + remote.labelExpr;
+  let script =
+    "const {" + _.keys(d).join(",") + "} = d; return " + remote.labelExpr;
   return new Function("d", "_", script)(d, _);
 }
 
 export function convert(node = {}, dataPath, valuePath, childPath) {
   var newNode = {};
-  newNode['value'] = node[valuePath];
-  newNode['label'] = node[dataPath];
+  newNode["value"] = node[valuePath];
+  newNode["label"] = node[dataPath];
 
   if (node[childPath] && node[childPath].length > 0) {
     let child = [];
     node[childPath].map((item) => {
-      child.push(convert(item, dataPath, valuePath, childPath))
-    })
-    newNode['children'] = child
+      child.push(convert(item, dataPath, valuePath, childPath));
+    });
+    newNode["children"] = child;
   }
-  return newNode
+  return newNode;
 }
 
 /* 树的查找 如该数据格式下查找id为3的元素
@@ -36,19 +35,25 @@ export function findById(node, id, labelPath, valuePath, childPath) {
   if (node[valuePath] == id) {
     let res = {
       label: node[labelPath],
-      value: id
-    }
+      value: id,
+    };
     return res;
   }
   if (node[childPath] && node[childPath].length > 0) {
     for (var i = 0; i < node[childPath].length; i++) {
-      let findItem = findById(node[childPath][i], id, labelPath, valuePath, childPath);
+      let findItem = findById(
+        node[childPath][i],
+        id,
+        labelPath,
+        valuePath,
+        childPath
+      );
       if (findItem !== -1) {
-        return findItem
+        return findItem;
       }
     }
   }
-  return -1
+  return -1;
 }
 
 export class ACascadePicker extends BaseViewer {
@@ -68,8 +73,9 @@ export class ACascadePicker extends BaseViewer {
     const p = this.props.schema.props ?? {};
 
     if (MUtil.phoneLike()) {
-      return <>
-        {/* <Picker
+      return (
+        <>
+          {/* <Picker
             data={this.props.schema.option}
             extra="请选择(可选)"
             cols={2}
@@ -86,29 +92,41 @@ export class ACascadePicker extends BaseViewer {
             >
                 <div className="backfill"> {show.length > 0 ? show.join('-') : '请点击选择' } </div>
         </Picker> */}
-      </>
+        </>
+      );
     } else {
-      return <Cascader
-        key="v"
-        options={candidate}
-        defaultValue={show.map((item) => item.value)}
-        changeOnSelect
-        placeholder={super.getPlaceholder()}
-        onChange={v => {
-          const vLabel = [];
-          v.map((item) => {
-            let findItem;
-            candidate.map((dataItem) => {
-              findItem = findById(dataItem, item, 'label', 'value', 'children');
-              if (findItem != -1) {
-                vLabel.push(findItem)
-              }
-            })
-          })
-          super.changeValue(vLabel);
-        }}
-        {...p}
-      />
+      return (
+        <Cascader
+          key="v"
+          options={candidate}
+          defaultValue={show.map((item) => item.value)}
+          changeOnSelect
+          placeholder={super.getPlaceholder()}
+          onClear={() => {
+            super.changeValue([]);
+          }}
+          onChange={(v) => {
+            const vLabel = [];
+            v.map((item) => {
+              let findItem;
+              candidate.map((dataItem) => {
+                findItem = findById(
+                  dataItem,
+                  item,
+                  "label",
+                  "value",
+                  "children"
+                );
+                if (findItem != -1) {
+                  vLabel.push(findItem);
+                }
+              });
+            });
+            super.changeValue(vLabel);
+          }}
+          {...p}
+        />
+      );
     }
   }
 }

package/src/ui/editor/complex/AWeight.tsx

@@ -95,21 +95,20 @@ export class AWeight extends Viewer<AWeightState> {
   private totalWeight: any = 0;
   private allValues: any = [];
   constructor(props: MProp) {
-    console.log("AWeight props", props);
     super(props);
     const { schema } = props;
     this._enumFields = MUtil.option(this.props.schema);
-    console.log("this._enumFields", this._enumFields);
     this.totalWeight = (schema as any).weight;
     this.allValues =
       this._enumFields?.map((i) => {
         const values = super.getValue();
-        return values?.find((v) => i.value === v.label)?.value;
+        return values?.find((v) => i.value === v.label)?.value ?? 0;
       }) ?? new Array(this._enumFields.length).fill(0);
     this.state = {
       allSliderValues: this.allValues,
       ctrlVersion: 1,
     };
+    console.log("this.state", this.state);
   }
 
   componentDidMount(): void {