form-driver 0.1.6 → 0.1.8

package/es/m3.js

@@ -1503,10 +1503,10 @@ var MEnumType = {
       return assembly.theme.READABLE_BLANK;
     }
   },
-  standardValue: function standardValue(assembly, s, v, strict) {
+  standardValue: function standardValue(assembly, s, value, strict) {
     if (!strict) {
       // value的类型各种可能都有，如果不要求严格，就不用处理了
-      return v;
+      return value;
     }
 
     var fs = MUtil.option(s);
@@ -1514,13 +1514,14 @@ var MEnumType = {
     for (var _iterator3 = _createForOfIteratorHelperLoose$b(fs), _step3; !(_step3 = _iterator3()).done;) {
       var f = _step3.value;
 
-      if (MUtil.isEquals(f.value, v, s.tolerate)) {
-        return v;
+      // @ts-ignore
+      if (MUtil.isEquals(f.value, _.isObject(value) ? value == null ? void 0 : value.value : value, s.tolerate)) {
+        return value;
       }
     }
 
     if (s.openOption || s.enumOpen) {
-      return v;
+      return value;
     } else {
       return undefined;
     }
@@ -18420,8 +18421,15 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
       var options = this._enums.map(function (m, index) {
         var _m$label;
 
-        if (value === m.value) {
-          initIndex = index;
+        if (_.isObject(value)) {
+          // @ts-ignore
+          if (value.value === m.value) {
+            initIndex = index;
+          }
+        } else {
+          if (value === m.value) {
+            initIndex = index;
+          }
         }
 
         return /*#__PURE__*/React.createElement(Select$1.Option, {
@@ -18491,7 +18499,7 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
           width: "100%"
         },
         onChange: function onChange(vv) {
-          return _BaseViewer.prototype.changeValue.call(_this2, p != null && p.labelInValue ? vv : _this2._enums[vv].value);
+          _BaseViewer.prototype.changeValue.call(_this2, p != null && p.labelInValue ? _this2._enums[vv.value] : _this2._enums[vv].value);
         }
       }, p), options);
     }

package/lib/m3.js

@@ -1523,10 +1523,10 @@ var MEnumType = {
       return assembly.theme.READABLE_BLANK;
     }
   },
-  standardValue: function standardValue(assembly, s, v, strict) {
+  standardValue: function standardValue(assembly, s, value, strict) {
     if (!strict) {
       // value的类型各种可能都有，如果不要求严格，就不用处理了
-      return v;
+      return value;
     }
 
     var fs = MUtil.option(s);
@@ -1534,13 +1534,14 @@ var MEnumType = {
     for (var _iterator3 = _createForOfIteratorHelperLoose$b(fs), _step3; !(_step3 = _iterator3()).done;) {
       var f = _step3.value;
 
-      if (MUtil.isEquals(f.value, v, s.tolerate)) {
-        return v;
+      // @ts-ignore
+      if (MUtil.isEquals(f.value, ___default["default"].isObject(value) ? value == null ? void 0 : value.value : value, s.tolerate)) {
+        return value;
       }
     }
 
     if (s.openOption || s.enumOpen) {
-      return v;
+      return value;
     } else {
       return undefined;
     }
@@ -18440,8 +18441,15 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
       var options = this._enums.map(function (m, index) {
         var _m$label;
 
-        if (value === m.value) {
-          initIndex = index;
+        if (___default["default"].isObject(value)) {
+          // @ts-ignore
+          if (value.value === m.value) {
+            initIndex = index;
+          }
+        } else {
+          if (value === m.value) {
+            initIndex = index;
+          }
         }
 
         return /*#__PURE__*/React__default["default"].createElement(Select__default["default"].Option, {
@@ -18511,7 +18519,7 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
           width: "100%"
         },
         onChange: function onChange(vv) {
-          return _BaseViewer.prototype.changeValue.call(_this2, p != null && p.labelInValue ? vv : _this2._enums[vv].value);
+          _BaseViewer.prototype.changeValue.call(_this2, p != null && p.labelInValue ? _this2._enums[vv.value] : _this2._enums[vv].value);
         }
       }, p), options);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-driver",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [
@@ -14,7 +14,7 @@
     "b": "npm run clean && npm run build",
     "i": "yarn",
     "ri": "rm -rf node_modules && npm run i",
-    "pub": "npm run b && npm version patch && npm publish && git push",
+    "pub": "git add . && git commit -m 'update' & npm run b && npm version patch && npm publish && git push",
     "patch": "npm version patch && npm publish && git push",
     "submodule": "git submodule update --init",
     "ut-pull": "cd ./demo/src/ut_autoTest/ut_case && git pull",

package/src/types/MEnumType.ts

@@ -1,65 +1,66 @@
 import { MUtil } from "../framework/MUtil";
-import {MValidationResult, MFieldSchemaAnonymity} from '../framework/Schema';
-import { MType} from "./MType";
+import { MValidationResult, MFieldSchemaAnonymity } from '../framework/Schema';
+import { MType } from "./MType";
 import { validateRequired } from "../framework/Validator";
 import { Assembly, assembly } from '../framework/Assembly';
 import _ from "lodash";
 
 // 选项是否合法、开放选项是否合法
-function validateCandidate(a:Assembly, schema:MFieldSchemaAnonymity, value:any, path:string): MValidationResult {
+function validateCandidate(a: Assembly, schema: MFieldSchemaAnonymity, value: any, path: string): MValidationResult {
   let fs = MUtil.option(schema);
   console.log('validateCandidate', value)
-  for(let f of fs){
+  for (let f of fs) {
     // @ts-ignore
-    if(MUtil.isEquals(f.value, _.isObject(value) ? value?.value : value, schema.tolerate)){
+    if (MUtil.isEquals(f.value, _.isObject(value) ? value?.value : value, schema.tolerate)) {
       return undefined;
     }
   }
   const openOption = _.clone(schema.openOption ?? schema.enumOpen)
-  if(openOption){
+  if (openOption) {
     openOption.required = true; // 既然勾上了开放选项，就必须填， TODO 把开放选项标注成必填，可以在schema预处理做
     return assembly.validate(openOption, value, "")
   }
-  return {message:'请选择一个选项', path}
+  return { message: '请选择一个选项', path }
 }
 
 export const MEnumType: MType = {
   validators: [validateRequired, validateCandidate],
 
-  createDefaultValue: (assembly:Assembly, s:MFieldSchemaAnonymity):any =>{
-    if(s.defaultValue){
+  createDefaultValue: (assembly: Assembly, s: MFieldSchemaAnonymity): any => {
+    if (s.defaultValue) {
       return _.clone(s.defaultValue);
     } else {
       return undefined;
     }
   },
 
-  toReadable: (assembly:Assembly, s:MFieldSchemaAnonymity, v:any):string => {
+  toReadable: (assembly: Assembly, s: MFieldSchemaAnonymity, v: any): string => {
     const fs = MUtil.option(s);
-    for(let f of fs) {
-      if(f.value === v){
+    for (let f of fs) {
+      if (f.value === v) {
         return f.label ?? v;
       }
     }
-    if(s.openOption){
+    if (s.openOption) {
       return v;
     } else {
       return assembly.theme.READABLE_BLANK;
     }
   },
 
-  standardValue: (assembly:Assembly, s:MFieldSchemaAnonymity, v:any, strict:boolean):any => {
-    if(!strict) { // value的类型各种可能都有，如果不要求严格，就不用处理了
-      return v;
+  standardValue: (assembly: Assembly, s: MFieldSchemaAnonymity, value: any, strict: boolean): any => {
+    if (!strict) { // value的类型各种可能都有，如果不要求严格，就不用处理了
+      return value;
     }
     const fs = MUtil.option(s);
-    for(let f of fs){
-      if(MUtil.isEquals(f.value, v, s.tolerate)){
-        return v;
+    for (let f of fs) {
+      // @ts-ignore
+      if (MUtil.isEquals(f.value, _.isObject(value) ? value?.value : value, s.tolerate)) {
+        return value;
       }
     }
-    if(s.openOption || s.enumOpen) {
-      return v;
+    if (s.openOption || s.enumOpen) {
+      return value;
     } else {
       return undefined;
     }

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

@@ -43,8 +43,15 @@ export class ASelector extends BaseViewer {
     } else {
       let initIndex = undefined;
       const options = this._enums.map((m, index) => {
-        if (value === m.value) {
-          initIndex = index;
+        if (_.isObject(value)) {
+          // @ts-ignore
+          if (value.value === m.value) {
+            initIndex = index;
+          }
+        } else {
+          if (value === m.value) {
+            initIndex = index;
+          }
         }
         return <Select.Option key={index} value={index}>{m.label ?? m.value}</Select.Option>
       });
@@ -78,7 +85,9 @@ export class ASelector extends BaseViewer {
             : menu
         }}
         style={{ width: "100%" }}
-        onChange={(vv: any) => super.changeValue(p?.labelInValue ? vv : this._enums[vv].value)}
+        onChange={(vv: any) => {
+          super.changeValue(p?.labelInValue ? this._enums[vv.value] : this._enums[vv].value)
+        }}
         {...p}
       >
         {options}