form-driver 0.4.19 → 0.4.21

package/lib/m3.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('antd/dist/antd.css');
-require('antd-mobile/dist/antd-mobile.css');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var antd = require('antd');
 var React = require('react');
@@ -13,7 +12,7 @@ var _inheritsLoose = require('@babel/runtime/helpers/inheritsLoose');
 var _construct = require('@babel/runtime/helpers/construct');
 var moment = require('moment');
 var antdMobile = require('antd-mobile');
-var zhCN = require('antd/lib/date-picker/locale/zh_CN');
+var zhCN = require('antd/es/locale/zh_CN');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var icons = require('@ant-design/icons');
 var TextArea = require('antd/lib/input/TextArea');
@@ -22,8 +21,10 @@ var adapter = require('@atlaskit/pragmatic-drag-and-drop/element/adapter');
 var clsx = require('clsx');
 var Button = require('antd/lib/button');
 var _objectWithoutPropertiesLoose = require('@babel/runtime/helpers/objectWithoutPropertiesLoose');
+var zhCN$1 = require('antd/lib/date-picker/locale/zh_CN');
 var ReactDOM = require('react-dom');
 var debounce = require('lodash/debounce');
+require('moment/locale/zh-cn');
 var _extends = require('@babel/runtime/helpers/extends');
 var OSS = require('ali-oss');
 
@@ -42,6 +43,7 @@ var Select__default = /*#__PURE__*/_interopDefaultLegacy(Select);
 var clsx__default = /*#__PURE__*/_interopDefaultLegacy(clsx);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var _objectWithoutPropertiesLoose__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutPropertiesLoose);
+var zhCN__default$1 = /*#__PURE__*/_interopDefaultLegacy(zhCN$1);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
@@ -200,1279 +202,1658 @@ function _createForOfIteratorHelperLoose$e(o, allowArrayLike) { var it = typeof
 function _unsupportedIterableToArray$e(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$e(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$e(o, minLen); }
 
 function _arrayLikeToArray$e(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-var next = Date.now() - 1617265950471; // /** 用来测量字符串长度 */
-// let _messurer: HTMLCanvasElement|undefined;
-
-var MUtil = {
-  /**
-   * 每次调用，返回不一样的数字
-   * @returns
-   */
-  unique: function unique() {
-    return next++;
-  },
-
-  /**
-   * 枚举字段可以写成空格分隔的字符串，也能写成MEnumField[]，这个函数将两种形式转换成统一的MEnumField[]
-   * @deprecated 改成用MUtils.option
-   */
-  standardFields: function standardFields(fs) {
-    if (typeof fs === "string") {
-      return fs.split(" ").map(function (aEnum) {
-        var _kv$;
-
-        var kv = aEnum.split("=");
-        return {
-          label: kv[0],
-          value: (_kv$ = kv[1]) != null ? _kv$ : kv[0]
-        };
-      });
-    } else if (fs) {
-      return fs;
-    } else {
-      return [];
-    }
-  },
-
-  /**
-   * 获取enumFields或者setFields，返回标准的MEnumField[]
-   * @param f 如果f是nil，返回[]
-   */
-  option: function option(f) {
-    var _result;
-
-    var result;
+var defaultTheme = {
+  READABLE_UNKNOWN: "?",
+  READABLE_BLANK: "-",
+  READABLE_INVALID: "❓",
+  READABLE_ERROR: "❗",
+  themeName: "antMiddle"
+};
+/**
+ * 注册viewer，type，morph（viewer和type之间的关联）
+ */
 
-    if (___default["default"].isArray(f.option)) {
-      result = f.option;
-    } else {
-      var ori;
+var Assembly = /*#__PURE__*/function () {
+  var _proto = Assembly.prototype;
 
-      if (f.type == "set") {
-        ori = f.setFields;
-      } else if (f.type == "enum") {
-        ori = f.enumFields;
+  /** 根据定义返回View，返回nil表示没有可用的View */
+  _proto.getViewerOf = function getViewerOf(f, morph) {
+    if (f.editor && morph === "editor") {
+      if (___default["default"].isString(f.editor)) {
+        return ___default["default"].get(this.viewers, f.editor);
       } else {
-        var _ref, _f$option;
-
-        ori = (_ref = (_f$option = f.option) != null ? _f$option : f.setFields) != null ? _ref : f.enumFields; // 只是为了保险
+        return f.editor;
       }
+    } else if (f.readable && morph === "readable") {
+      if (___default["default"].isString(f.readable)) {
+        return ___default["default"].get(this.viewers, f.readable);
+      } else {
+        return f.readable;
+      }
+    } else {
+      var viewer = ___default["default"].get(this.morph, morph + "." + f.type);
 
-      if (typeof ori === "string") {
-        f.option = result = ori.split(" ").map(function (aEnum) {
-          var _kv$2;
-
-          var kv = aEnum.split("=");
-          return {
-            label: kv[0],
-            value: (_kv$2 = kv[1]) != null ? _kv$2 : kv[0]
-          };
-        });
+      if (___default["default"].isString(viewer)) {
+        return ___default["default"].get(this.viewers, viewer);
       } else {
-        f.option = result = ori; // TODO children 可能有递归的，还是得靠预处理解决
+        return viewer;
       }
     }
+  };
 
-    return (_result = result) != null ? _result : [];
-  },
-
-  /** 如果出错了，返回这么个元素，可能用在BaseEditor子类或者其他的东西上 */
-  error: function error(msg, schema) {
-    return jsxRuntime.jsxs("div", {
-      style: {
-        color: "white",
-        border: "1px solid darkgrey",
-        background: "red",
-        textAlign: "center",
-        borderRadius: "5px"
-      },
-      children: [msg, schema ? jsxRuntime.jsx("pre", {
-        style: {
-          whiteSpace: "pre-wrap",
-          textAlign: "left"
-        },
-        children: JSON.stringify(schema)
-      }) : undefined]
-    }, Date.now());
-  },
-  sign: function sign(v) {
-    if (___default["default"].isNil(v)) {
-      return null;
+  _proto.validate = function validate(s, v, path) {
+    if (path === void 0) {
+      path = "";
     }
 
-    return Math.sign(v);
-  },
+    var result = undefined;
 
-  /**
-   * 当前设备是不是个手机（或者类似手机的设备，比如ipad上运行iphone app中的webview）
-   */
-  phoneLike: function phoneLike() {
-    // eslint-disable-next-line no-restricted-globals
-    return screen.height / screen.width > 1.5;
-  },
-  // /**
-  //  * 计算文字的宽度
-  //  * @param text 文字
-  //  * @param font 字体
-  //  * @returns 宽度，单位是px
-  //  */
-  // getTextWidth(text:string, font?:string) {
-  //   var canvas = _messurer ?? (_messurer = document.createElement("canvas"));
-  //   var context = canvas.getContext("2d");
-  //   if(!context) {
-  //     console.error('神奇的事情发生了：canvas.getContext("2d")居然能返回null');
-  //     return text.length * 10; // 总比出不来好
-  //   }
-  //   if(font){
-  //     context.font = font;
-  //   }
-  //   var metrics = context.measureText(text);
-  //   return metrics.width;
-  // }
+    for (var _iterator = _createForOfIteratorHelperLoose$e(this.types[s.type].validators), _step; !(_step = _iterator()).done;) {
+      var validator = _step.value;
+      result = validator(this, s, v, path);
 
-  /**
-   * 计算文字的宽度
-   * @param text
-   */
-  antdTextWidth: function antdTextWidth(text) {
-    if (!text) {
-      return 0;
+      if (result === "pass" && s.type !== "weight") {
+        return undefined;
+      } else if (typeof result === "object") {
+        MUtil.debug("校验", path, result.message);
+        return result;
+      }
     }
 
-    return text.length * 16;
-  },
+    return undefined;
+  };
+
+  _proto.addViewer = function addViewer(name, v) {
+    if (this.viewers[name]) {
+      console.error("addViewer: \u5DF2\u7ECF\u5B58\u5728\u540D\u4E3A " + name + " \u7684 Viewer\uFF0C\u65E0\u6CD5\u518D\u6B21\u6DFB\u52A0\uFF01");
+      return;
+    } else {
+      this.viewers[name] = v;
+    }
+  };
 
+  _proto.addEditor = function addEditor(name, v) {
+    if (this.editors[name]) {
+      console.error("addEditor: \u5DF2\u7ECF\u5B58\u5728\u540D\u4E3A " + name + " \u7684 Editor\uFF0C\u65E0\u6CD5\u518D\u6B21\u6DFB\u52A0\uFF01");
+      return;
+    } else {
+      this.editors[name] = v;
+    }
+  }
   /**
-   * 从数组中删掉一个元素
-   * @param a 这个数组会被改变的
-   * @param element 要删的元素
-   * @returns 修改后的数组（如果它不是nil）
+   * 增加一种数据类型
+   * 例：
+   *  const hpOrg = {name: "hpOrg", type: {validators: ..., toReadable: ...}, editor: HPOrgEditor, readable: "DivViewer"}
+   *  addType(hpOrg)
+   * @param typeParam 类型的描述对象
    */
-  arrayRemove: function arrayRemove(a, element) {
-    if (a) {
-      var idx = a.indexOf(element);
+  ;
 
-      if (idx >= 0) {
-        a.splice(idx, 1);
-      }
+  _proto.addType = function addType(typeParam) {
+    var name = typeParam.name,
+        type = typeParam.type,
+        editor = typeParam.editor,
+        _typeParam$readable = typeParam.readable,
+        readable = _typeParam$readable === void 0 ? "DivViewer" : _typeParam$readable;
+    this.types[name] = type;
 
-      return a;
-    } else {
-      return a;
-    }
-  },
-  fieldOfLayout: function fieldOfLayout(fields, spec) {
-    var objectFieldMap = ___default["default"].chain(fields).keyBy("name").value();
+    ___default["default"].set(this.morph, "editor." + name, editor);
 
-    var r = {};
+    ___default["default"].set(this.morph, "readable." + name, readable);
+  };
 
-    for (var _iterator = _createForOfIteratorHelperLoose$e((_spec$segments = spec.segments) != null ? _spec$segments : []), _step; !(_step = _iterator()).done;) {
-      var _spec$segments;
+  function Assembly() {
+    var _this = this;
 
-      var s = _step.value;
+    this.types = {};
+    this.viewers = {};
+    this.editors = {};
+    this.morph = {};
+    this.theme = defaultTheme;
 
-      for (var _iterator2 = _createForOfIteratorHelperLoose$e((_s$fields = s.fields) != null ? _s$fields : []), _step2; !(_step2 = _iterator2()).done;) {
-        var _s$fields;
+    this.toReadable = function (s, v, parent) {
+      var t = _this.types[s.type];
 
-        var f = _step2.value;
+      if (t) {
+        var _r;
 
-        if (___default["default"].isString(f)) {
-          var def = objectFieldMap[f];
+        var r;
 
-          if (def) {
-            r[f] = def;
-          }
+        if (___default["default"].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)(___default["default"], v, _this.theme);
+        } else if (___default["default"].isFunction(s.toReadable)) {
+          r = s.toReadable(v, parent, _this);
         }
-      }
-    }
 
-    return ___default["default"].values(r);
-  },
+        r = (_r = r) != null ? _r : t.toReadable(_this, s, v);
 
-  /**
-   * 跟lodash的get一样，除了：
-   * 1. path是nil时返回undefined
-   * 2. path是""时返回原始对象
-   * @param a
-   * @param path
-   */
-  get: function get(a, path) {
-    if (___default["default"].isNil(a) || ___default["default"].isNil(path)) {
-      return undefined;
-    } else if (path === "") {
-      return a;
-    }
-
-    return ___default["default"].get(a, path);
-  },
-
-  /**
-   * a : database
-   * v : newValue
-   * 跟lodash的set一样，除了path是""时等效于_.assign(a, v)
-   */
-  set: function set(a, path, v) {
-    if (path === "") {
-      // 如果 database 是数组，需要特殊处理
-      if (___default["default"].isArray(a)) a.length = v.length;
-
-      ___default["default"].assign(a, v);
-    } else {
-      ___default["default"].set(a, path, v);
-    }
-  },
-  debug: function debug(d) {
-    for (var _len = arguments.length, optionalParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      optionalParams[_key - 1] = arguments[_key];
-    }
+        if (s.postfix) {
+          r += s.postfix;
+        }
 
-    console.log(d, optionalParams);
-  },
+        return r;
+      } else {
+        return s.type + "类型无效";
+      }
+    }; // 校验types是否使用了无效的编辑器名字
 
-  /**
-   * 填入默认值
-   * @param schema 你懂得
-   * @param database 数据库，会被修改的
-   * @param path 路径
-   */
-  applyDefaultValue: function applyDefaultValue(schema, database, path) {
-    // FIXME 多测试下，type是object或其他简单类型的情况
-    if (schema.type === "object") {
-      for (var _iterator3 = _createForOfIteratorHelperLoose$e((_schema$objectFields = schema.objectFields) != null ? _schema$objectFields : []), _step3; !(_step3 = _iterator3()).done;) {
-        var _schema$objectFields;
 
-        var f = _step3.value;
-        this.applyDefaultValue(f, database, (path ? path + "." : "") + f.name);
-      }
-    } else {
-      if (!___default["default"].isNil(schema.defaultValue) && ___default["default"].isNil(___default["default"].get(database, path))) {
-        ___default["default"].set(database, path, schema.defaultValue);
-      }
-    }
-  },
-  filterHide: function filterHide(schema, database) {
-    var _schema$objectFields2;
+    for (var morphName in this.morph) {
+      for (var typeName in this.morph[morphName]) {
+        if (!this.types[typeName]) {
+          throw SyntaxError("\u7C7B\u578B" + typeName + "\u672A\u5B9A\u4E49");
+        }
 
-    // TODO 要改成递归的
-    var hm = MUtil.hideMap(database, (_schema$objectFields2 = schema.objectFields) != null ? _schema$objectFields2 : [], schema.uispec);
-    var finalData = ___default["default"].isArray(database) ? [] : {};
+        var viewerName = this.morph[morphName][typeName];
 
-    for (var k in database) {
-      if (!hm[k]) {
-        finalData[k] = database[k];
+        if (!this.viewers[viewerName]) {
+          throw SyntaxError("\u89C6\u56FE" + viewerName + "\u672A\u5B9A\u4E49");
+        }
       }
     }
+  }
 
-    return finalData;
-  },
+  return Assembly;
+}();
+var assembly = new Assembly();
 
-  /**
-   * 计算哪些field、segment需要隐藏
-   * 支持ShowIfFunc里的函数
-   * TODO 如果segment隐藏，里面的字段全都要隐藏
-   * @returns 示例：
-   * let {name,role,gender,alias,birthday,company,position,tel,email,citizenship,politicsCode,companyArch,address,work,edu,assistant,student,mib} = data;
-   * return {politicsCode: !(citizenship=='中国大陆'),"segment:学员信息": !(_.intersection(role, ['校友']).length > 0))}
-   * @param objectFields
-   * @param uispec 用来计算segment是不是要展示，不填就不计算
-   */
-  hideMap: function hideMap(database, objectFields, uispec) {
-    // 构造字段依赖计算的脚本，类似这样：
-    // let {name,role,gender,alias,tel,email,citizenship,student} = {"name":"aaa","alias":"bbb","tel":"1"};citizenship=='中国大陆'
-    var l1fields = ___default["default"].uniq( // 名字要唯一
-    objectFields.filter(function (e) {
-      return !!e.name;
-    }) // 过滤掉没有名字的字段
-    .map(function (e) {
-      return ___default["default"].first(e.name.split("."));
-    }) // 对于objectFields里类似student.no/student.state的字段，这里只要拼一个student就可以了
-    );
+/**
+ * 非空校验，数据不能是null/undefined/""/NaN/[]
+ * 要在其他条件之前，以便required=false时短路掉nil的数据，否则后面的校验全都得处理nil
+ * @param a
+ * @param schema
+ * @param value
+ * @param path
+ * @returns
+ */
 
-    var showIfScript = "let {" + l1fields.join(",") + "} = data || {};\nlet hide = {";
+function validateRequired$1(a, schema, value, path) {
+  if (schema.required) {
+    if (___default["default"].isNil(value) || value === "" || ___default["default"].isNaN(value) || ___default["default"].isArray(value) && value.length == 0) {
+      return {
+        message: "您还没有填完这一项",
+        path: path
+      };
+    } // 凡是总有例外
 
-    for (var _iterator4 = _createForOfIteratorHelperLoose$e(objectFields), _step4; !(_step4 = _iterator4()).done;) {
-      var f = _step4.value;
 
-      if (f.showIf) {
-        showIfScript += "'" + f.name + "': !(" + f.showIf + "),";
+    if (schema.type === "set" && schema.openOption) {
+      if (value.length === 1 && !value[0]) {
+        return {
+          message: "您还没有填完这一项",
+          path: path
+        }; // 开放set，只勾了开放选项，没有填内容，也要算空
       }
     }
+  } else {
+    if (___default["default"].isNil(value)) {
+      return "pass";
+    }
+  }
 
-    for (var _iterator5 = _createForOfIteratorHelperLoose$e((_uispec$segments = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments : []), _step5; !(_step5 = _iterator5()).done;) {
-      var _uispec$segments;
+  return undefined;
+}
+/** 和validateRequired相同，但不短路 */
 
-      var s = _step5.value;
+function validateRequiredNS(a, schema, value, path) {
+  var v = validateRequired$1(a, schema, value, path);
 
-      if (s.showIf) {
-        showIfScript += "\"segment:" + s.label + "\": !(" + s.showIf + "),";
-      }
+  if (v === "pass") {
+    return undefined;
+  }
+}
+function validateDateMinMax(a, schema, value, path) {
+  if (schema.min) {
+    if (!value || value < schema.min) {
+      return {
+        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u540E\u7684\u65F6\u95F4",
+        path: path
+      };
     }
+  }
 
-    showIfScript += "}\n"; // 如果一个segment里的所有字段都隐藏，segment就要隐藏
-
-    for (var _iterator6 = _createForOfIteratorHelperLoose$e((_uispec$segments2 = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments2 : []), _step6; !(_step6 = _iterator6()).done;) {
-      var _uispec$segments2;
-
-      var _s = _step6.value;
+  if (schema.max) {
+    if (!value || value > schema.max) {
+      return {
+        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u524D\u7684\u65F6\u95F4",
+        path: path
+      };
+    }
+  }
 
-      var cond = _s.fields.map(function (f) {
-        return "(hide['" + f + "'])";
-      }).join(" && ");
+  return undefined;
+}
+/**
+ * 数组项数不超过[min, max]
+ * @param schema
+ * @param value 应该是个数组
+ */
 
-      showIfScript += "if(" + cond + ") { hide[\"segment:" + _s.label + "\"] = true }\n";
+function validateArrayItemMinMax(a, schema, value, path) {
+  if (schema.min) {
+    if (!value || value.length < schema.min) {
+      return {
+        message: "\u81F3\u5C11\u9009\u62E9" + schema.min + "\u9879",
+        path: path
+      };
     }
+  }
 
-    showIfScript += "return hide;\n"; // eslint-disable-next-line no-new-func
-
-    try {
-      var fn = Object.keys(SchemaFunc);
-      var fv = Object.values(SchemaFunc);
+  if (schema.max) {
+    if (!value || value.length > schema.max) {
+      return {
+        message: "\u6700\u591A\u9009\u62E9" + schema.max + "\u9879",
+        path: path
+      };
+    }
+  }
 
-      var hideMap = _construct__default["default"](Function, ["_", "data"].concat(fn, [showIfScript])).apply(void 0, [___default["default"], database].concat(fv));
+  return undefined;
+}
+/**
+ * 字符串长度不超过[min, max]
+ * @param schema
+ * @param value 应该是个字符串
+ */
 
-      return hideMap;
-    } catch (e) {
-      console.error("Calc hideMap failed: " + e.message, "function(_,data){" + showIfScript + "}", database);
-      return {};
+function validateStringMinMax$1(a, schema, value, path) {
+  if (schema.min) {
+    if (!value || value.length < schema.min) {
+      return {
+        message: "\u81F3\u5C11" + schema.min + "\u4E2A\u5B57",
+        path: path
+      };
     }
-  },
+  }
 
-  /**
-   * 计算 showIf 的值
-   * @returns Boolean
-   * @param database
-   * @param objectFields
-   */
-  isShow: function isShow(database, objectFields, showIfExpr) {
-    if (!showIfExpr) return true;
+  if (schema.max) {
+    if (value && value.length > schema.max) {
+      return {
+        message: "\u6700\u591A" + schema.max + "\u4E2A\u5B57",
+        path: path
+      };
+    }
+  }
 
-    var l1fields = ___default["default"].uniq(objectFields.filter(function (e) {
-      return !!e.name;
-    }).map(function (e) {
-      return ___default["default"].first(e.name.split("."));
-    }));
+  return undefined;
+}
+/**
+ * 数字不超过[min, max]
+ * @param schema
+ * @param value 应该是个数字
+ */
 
-    var showIfScript = "let {" + l1fields.join(",") + "} = data || {};\n return " + showIfExpr;
+function validateNumberMinMax(a, schema, value, path) {
+  var temp = Number(value);
 
-    try {
-      var fn = Object.keys(SchemaFunc);
-      var fv = Object.values(SchemaFunc);
+  if (!___default["default"].isNil(schema.max)) {
+    if (!___default["default"].isFinite(temp) || temp > schema.max) {
+      return {
+        message: "\u6700\u591A" + schema.max,
+        path: path
+      };
+    }
+  }
 
-      var res = _construct__default["default"](Function, ["_", "data"].concat(fn, [showIfScript])).apply(void 0, [___default["default"], database].concat(fv));
+  if (!___default["default"].isNil(schema.min)) {
+    if (!___default["default"].isFinite(temp) || temp < schema.min) {
+      return {
+        message: "\u6700\u5C11" + schema.min,
+        path: path
+      };
+    }
+  }
 
-      return res;
-    } catch (e) {
-      console.error("Calc isShow failed: " + e.message, "function(_,data){" + showIfScript + "}", database);
-      return true;
+  return undefined;
+}
+function generateRegexValidate$1(regex, mismatchMsg) {
+  return function (a, schema, value, path) {
+    var asstr = ___default["default"].toString(value);
+
+    if (!regex.test(asstr)) {
+      return {
+        message: mismatchMsg,
+        path: path
+      };
     }
-  },
-  scoreOf: function scoreOf(f, database) {
-    var v = ___default["default"].get(database, f.name);
 
-    if (f.type == "enum") {
-      var _MUtil$standardFields, _MUtil$standardFields2;
+    return undefined;
+  };
+}
+/**
+ * 数据用Object.prototype.toString.call返回的类型是预期的
+ * 可以用Object.prototype.toString.call(<预期的类型>)来查看你想要的数据类型的expectType
+ * @param expectType 预期类型，例如："[object Object]" "[object Null]" "[object Number]" "[object Date]" "[object Array]"
+ * @param mismatchMsg 如果不匹配，提示的错误信息
+ * @returns
+ */
 
-      return ___default["default"].toNumber((_MUtil$standardFields = MUtil.standardFields(f.enumFields)) == null ? void 0 : (_MUtil$standardFields2 = _MUtil$standardFields.find(function (e) {
-        return e.value == v;
-      })) == null ? void 0 : _MUtil$standardFields2.score);
-    } else if (f.type == "set") {
-      var score = 0;
-      var opts = MUtil.standardFields(f.setFields);
+function generateJsPrototypeValidate(expectType, mismatchMsg) {
+  if (mismatchMsg === void 0) {
+    mismatchMsg = "数据有误，请重填此项";
+  }
 
-      for (var _iterator7 = _createForOfIteratorHelperLoose$e(opts), _step7; !(_step7 = _iterator7()).done;) {
-        var s = _step7.value;
+  return function (a, schema, value, path) {
+    if (Object.prototype.toString.call(value) == expectType) {
+      return undefined;
+    } else {
+      return {
+        message: mismatchMsg,
+        path: path
+      };
+    }
+  };
+}
+function generateSchemaValidate(valueSchema, mismatchMsg) {
+  return function (a, schema, value, path) {
+    var r = assembly.validate(valueSchema, value, "");
 
-        if (___default["default"].find(opts, {
-          value: v
-        })) {
-          score += ___default["default"].toNumber(s.score);
-        }
-      }
+    if (!r) {
+      return r;
+    } else {
+      return {
+        message: mismatchMsg != null ? mismatchMsg : r.message,
+        path: path
+      };
+    }
+  };
+}
+var Validator = {
+  validateRequired: validateRequired$1,
+  validateRequiredNS: validateRequiredNS,
+  validateDateMinMax: validateDateMinMax,
+  validateStringMinMax: validateStringMinMax$1,
+  validateNumberMinMax: validateNumberMinMax,
+  generateRegexValidate: generateRegexValidate$1
+};
 
-      return score;
+var EmtpyType = {
+  validators: [],
+  createDefaultValue: function createDefaultValue(assembly, s) {
+    if (s.defaultValue) {
+      return ___default["default"].clone(s.defaultValue);
     } else {
-      return 0;
+      return undefined;
     }
   },
+  standardValue: function standardValue(assembly, s, v, strict) {
+    return v;
+  },
+  toReadable: function toReadable(assembly, s, vs) {
+    if (___default["default"].isNil(vs)) {
+      return assembly.theme.READABLE_BLANK;
+    }
 
-  /**
-   * 查找fs依赖（通过showIf）的所有字段
-   * @param fs
-   * @param all
-   * @returns fs依赖的所有字段，包含fs。这个数组中下标小的元素，依赖下标大的元素
-   */
-  dependency: function dependency(fs, all) {
-    // 先建个索引
-    var allFieldsIdx = ___default["default"].keyBy(all, "name"); // 构造未被依赖的集合
-
+    return vs;
+  }
+};
+function createDefaultValue(assembly, s) {
+  if (s.defaultValue) {
+    return ___default["default"].clone(s.defaultValue);
+  } else {
+    return undefined;
+  }
+}
 
-    var ndep = ___default["default"].keyBy(all, "name"); // 全体
+var MDateTimeType = ___default["default"].assign({}, EmtpyType, {
+  validators: [validateRequired$1, validateDateMinMax],
+  antConf: function antConf(schema) {
+    var _dataFormat, _dataFormat2, _dataFormat3, _dataFormat4, _dataFormat5, _dataFormat6, _dataFormat7, _dataFormat8;
 
+    var dataFormat = schema.dataFormat;
+    var readableFormat;
+    var mode;
+    var showTime = false;
 
-    ndep = ___default["default"].omit(ndep, fs.map(function (f) {
-      return f.name;
-    })); // 去掉fs
-    // 构造被依赖的集合
+    switch (schema.type) {
+      case "year":
+        mode = "year";
+        dataFormat = (_dataFormat = dataFormat) != null ? _dataFormat : "YYYY";
+        readableFormat = "YYYY";
+        break;
 
-    var dep = new Map();
-    fs.forEach(function (f) {
-      return dep[f.name] = f;
-    }); // 循环从ndep里把被依赖的字段放到dep中，直到dep不再增加
-    // 算法有点粗暴，将就用吧
+      case "yearMonth":
+        mode = "month";
+        dataFormat = (_dataFormat2 = dataFormat) != null ? _dataFormat2 : "YYYYMM";
+        readableFormat = "YYYY.MM";
+        break;
 
-    for (var i = 0; i < all.length; i++) {
-      //  轮数最多all.length，防止卡死
-      var newDepNames = [];
+      case "yearMonthDay":
+        mode = "date";
+        dataFormat = (_dataFormat3 = dataFormat) != null ? _dataFormat3 : "YYYYMMDD";
+        readableFormat = "YYYY.MM.DD";
+        break;
 
-      for (var dn in dep) {
-        var _dep$dn$showIf;
+      case "datetime":
+        mode = undefined;
+        dataFormat = (_dataFormat4 = dataFormat) != null ? _dataFormat4 : "x";
+        readableFormat = "YYYY.MM.DD HH:mm";
+        showTime = true;
+        break;
 
-        var _i = ___default["default"].intersection((_dep$dn$showIf = dep[dn].showIf) == null ? void 0 : _dep$dn$showIf.split(/[^a-zA-Z0-9_$]/), Object.keys(ndep));
+      case "date":
+        switch (schema.datePrecision) {
+          case "year":
+            mode = "year";
+            dataFormat = (_dataFormat5 = dataFormat) != null ? _dataFormat5 : "YYYY";
+            readableFormat = "YYYY";
+            break;
 
-        newDepNames = newDepNames.concat(_i);
-      }
+          case "month":
+            mode = "month";
+            dataFormat = (_dataFormat6 = dataFormat) != null ? _dataFormat6 : "YYYYMM";
+            readableFormat = "YYYY.MM";
+            break;
 
-      var prevSize = Object.keys(dep).length;
+          case "minute":
+            mode = undefined;
+            dataFormat = (_dataFormat7 = dataFormat) != null ? _dataFormat7 : "x";
+            readableFormat = "YYYY.MM.DD HH:mm";
+            showTime = true;
+            break;
 
-      for (var _iterator8 = _createForOfIteratorHelperLoose$e(newDepNames), _step8; !(_step8 = _iterator8()).done;) {
-        var n = _step8.value;
-        dep[n] = allFieldsIdx[n];
-        delete ndep[n];
-      }
+          default:
+            // "day" 或未指定
+            mode = "date";
+            dataFormat = (_dataFormat8 = dataFormat) != null ? _dataFormat8 : "YYYYMMDD";
+            readableFormat = "YYYY.MM.DD";
+            break;
+        }
 
-      var afterSize = Object.keys(dep).length;
+        break;
+      // case "yearAndQuarter":
+      // case "yearAndWeek":
+      //   return MUtil.error(`移动端不支持${this.props.schema.type}`, this.props.schema);
 
-      if (prevSize == afterSize) {
-        break; // 如果找不到更多依赖，就可以结束了
-      }
+      default:
+        return undefined;
     }
 
-    return Object.values(dep);
+    return {
+      dataFormat: dataFormat,
+      readableFormat: readableFormat,
+      mode: mode,
+      showTime: showTime
+    };
   },
-
-  /**
-   * 用moment格式化
-   * @param s 原始数据，参见moment
-   * @param srcFormat 原始数据的格式，默认x(时间戳)
-   * @param dstFormat 转换成的数据格式，默认YYYY年MM月DD日
-   * @param fallback 如果原始数据是nil，返回fallback
-   */
-  momentFormat: function momentFormat(s, srcFormat, dstFormat, fallback) {
-    if (srcFormat === void 0) {
-      srcFormat = "x";
+  toReadable: function toReadable(assembly, schema, v) {
+    if (___default["default"].isNil(v)) {
+      return assembly.theme.READABLE_BLANK;
     }
 
-    if (dstFormat === void 0) {
-      dstFormat = "YYYY年MM月DD日";
-    }
+    var c = MDateTimeType.antConf(schema);
 
-    if (fallback === void 0) {
-      fallback = "不详";
+    if (!c) {
+      return assembly.theme.READABLE_INVALID;
     }
 
-    if (___default["default"].isNil(s)) {
-      return fallback;
-    }
+    var asMoment = moment__default["default"](v, c.dataFormat);
+    return asMoment.format(c.readableFormat);
+  }
+});
 
-    return moment__default["default"](s, srcFormat).format(dstFormat);
-  },
+/** 根据 precision 获取可读格式 */
 
-  /**
-   * 将标准的json schema转换成m3的schema
-   * @param e json schema
-   * @param base 如果填了一个对象，转换出的属性会放在这个对象上
-   * @param template 如果有子结构，创建子结构的模板
-   */
-  jsonSchema2MFieldSchema: function jsonSchema2MFieldSchema(e, base, template) {
-    if (base === void 0) {
-      base = {
-        name: "",
-        type: "string"
-      };
-    }
+function getReadableFormat(precision, showTime) {
+  switch (precision) {
+    case "year":
+      return "YYYY";
 
-    if (template === void 0) {
-      template = {};
-    }
+    case "month":
+      return "YYYY.MM";
 
-    switch (e.type) {
-      case "string":
-        if (e.enum) {
-          var _base$enumFields;
+    case "minute":
+      return "YYYY.MM.DD HH:mm";
 
-          base.type = "enum";
-          base.enumFields = (_base$enumFields = base.enumFields) != null ? _base$enumFields : e.enum.map(function (v) {
-            return {
-              value: (v != null ? v : "").toString()
-            };
-          });
-        } else {
-          base.type = "string";
-          base.max = e.maxLength;
-        }
-
-        break;
-
-      case "number":
-      case "integer":
-        base.type = "int";
-        break;
-
-      case "object":
-        base.type = "object";
-        base.objectFields = [];
-        base.uispec = {
-          type: "flowForm",
-          layout: MUtil.phoneLike() ? "vertical" : "horizontal",
-          comma: "："
-        };
-
-        for (var key in e.properties) {
-          var jsmField = e.properties[key];
-
-          var m3Field = ___default["default"].assign({}, template, {
-            name: key,
-            label: key,
-            type: "object"
-          });
+    default:
+      return showTime ? "YYYY.MM.DD HH:mm:ss" : "YYYY.MM.DD";
+  }
+}
 
-          if (!___default["default"].isBoolean(jsmField)) {
-            var _jsmField$title;
+function timeExpr(assembly, v, tillNow, readableFormat) {
+  if (tillNow) {
+    return "至今";
+  }
 
-            m3Field.label = (_jsmField$title = jsmField.title) != null ? _jsmField$title : key;
-            this.jsonSchema2MFieldSchema(jsmField, m3Field, template);
-            base.objectFields.push(m3Field);
-          } else {
-            m3Field.type = "不支持的json schema：object.properties的value是boolean";
-            base.objectFields.push();
-          }
-        }
+  if (!v) {
+    return assembly.theme.READABLE_UNKNOWN;
+  }
 
-        break;
+  return moment__default["default"](v, "x").format(readableFormat);
+}
 
-      case "array":
-        base.type = "array";
-        base.arrayMember = {
-          label: "",
-          type: "array"
-        };
+function timeRangeExpr(assembly, from, to, tillNow, readableFormat) {
+  if (readableFormat === void 0) {
+    readableFormat = "YYYY.MM.DD";
+  }
 
-        if (___default["default"].isArray(e.items)) {
-          base.arrayMember.type = "不支持的json schema：array.items是数组";
-        } else if (___default["default"].isBoolean(e.items)) {
-          base.arrayMember.type = "不支持的json schema：array.items是boolean";
-        } else if (e.items) {
-          this.jsonSchema2MFieldSchema(e.items, base, template);
-        } else {
-          base.arrayMember.type = "不支持的json schema：array.items是undefined";
-        }
+  return timeExpr(assembly, from, false, readableFormat) + " - " + timeExpr(assembly, to, tillNow, readableFormat);
+}
+var MDateRangeType = ___default["default"].assign({}, EmtpyType, {
+  validators: [validateRequired$1],
+  toReadable: function toReadable(assembly, s, vs) {
+    var _s$dateRange;
 
-        break;
+    if (___default["default"].isNil(vs)) {
+      return assembly.theme.READABLE_BLANK;
+    }
 
-      case "null":
-      case "any":
-      case "boolean":
-      default:
-        base.type = "不支持的json schema：array.items是" + e.type;
-        break;
+    if (!___default["default"].isArray(vs)) {
+      return assembly.theme.READABLE_INVALID;
     }
 
-    return base;
+    var fmt = getReadableFormat(s.dateRangePrecision, (_s$dateRange = s.dateRange) == null ? void 0 : _s$dateRange.showTime);
+    return timeRangeExpr(assembly, vs[0], vs[1], vs[2], fmt);
   },
 
   /**
-   * 修改一个对象里的key
-   * @param object 要修改的对象，
-   * @param renameTo
-   * @param removeNotExistKey 是否在结果里面去除renameTo里不存在的key
-   * @returns 返回一个改过key名字的新对象
+   * 同toReadable，但数据无效时返回nil
    */
-  renameKey: function renameKey(object, renameTo, removeNotExistKey) {
-    if (removeNotExistKey === void 0) {
-      removeNotExistKey = false;
-    }
-
-    var result = {};
+  toReadableN: function toReadableN(assembly, s, vs) {
+    if (!___default["default"].isNil(vs) && ___default["default"].isArray(vs)) {
+      var _s$dateRange2;
 
-    for (var oldKey in object) {
-      var newKey = renameTo[oldKey];
+      var fmt = getReadableFormat(s.dateRangePrecision, (_s$dateRange2 = s.dateRange) == null ? void 0 : _s$dateRange2.showTime);
+      return timeRangeExpr(assembly, vs[0], vs[1], vs[2], fmt);
+    }
 
-      if (!newKey) {
-        if (removeNotExistKey) {
-          continue;
-        } else {
-          newKey = oldKey;
-        }
-      }
+    return undefined;
+  }
+});
 
-      result[newKey] = object[oldKey];
-    }
+function _createForOfIteratorHelperLoose$d(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray$d(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-    return result;
-  },
+function _unsupportedIterableToArray$d(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$d(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$d(o, minLen); }
 
-  /** 啥也不干的空回调 */
-  doNothing: function doNothing() {},
+function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+var next = Date.now() - 1617265950471; // /** 用来测量字符串长度 */
+// let _messurer: HTMLCanvasElement|undefined;
 
+var MUtil = {
   /**
-   * 去掉arr中的undefined和null，拼出来一个json path
+   * 每次调用，返回不一样的数字
+   * @returns
    */
-  jsonPath: function jsonPath() {
-    for (var _len2 = arguments.length, arr = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      arr[_key2] = arguments[_key2];
-    }
-
-    return ___default["default"].compact(arr).join(".");
+  unique: function unique() {
+    return next++;
   },
 
   /**
-   * 获取一个json path的父path。
-   * @param path 如果path是空的返回也是空的
+   * 枚举字段可以写成空格分隔的字符串，也能写成MEnumField[]，这个函数将两种形式转换成统一的MEnumField[]
+   * @deprecated 改成用MUtils.option
    */
-  parentPath: function parentPath(path) {
-    var split = path.replace(/]/g, "").split(/[.\\[]/);
-    split.splice(-1, 1);
-    return split.join(".");
+  standardFields: function standardFields(fs) {
+    if (typeof fs === "string") {
+      return fs.split(" ").map(function (aEnum) {
+        var _kv$;
+
+        var kv = aEnum.split("=");
+        return {
+          label: kv[0],
+          value: (_kv$ = kv[1]) != null ? _kv$ : kv[0]
+        };
+      });
+    } else if (fs) {
+      return fs;
+    } else {
+      return [];
+    }
   },
 
   /**
-   * 校验一个schema
-   * @param s 要校验的schema
-   * @returns 空数组表示校验通过，否则返回校验错误信息
+   * 获取enumFields或者setFields，返回标准的MEnumField[]
+   * @param f 如果f是nil，返回[]
    */
-  validateSchema: function validateSchema(s, parentPath) {
-    var result = [];
-
-    var error = function error(msg) {
-      return result.push({
-        message: msg,
-        path: MUtil.jsonPath(parentPath, s.name)
-      });
-    };
+  option: function option(f) {
+    var _result;
 
-    var checkDup = function checkDup(a, msgIfFail) {
-      if (___default["default"].uniq(a).length !== a.length) {
-        error(msgIfFail);
-      }
-    };
+    var result;
 
-    var checkVL = function checkVL(fs) {
-      checkDup(fs.map(function (f) {
-        return f.value;
-      }), s.name + "值有重复");
-      checkDup(fs.map(function (f) {
-        return f.label;
-      }).filter(function (l) {
-        return l;
-      }), s.name + "文案有重复");
-    };
+    if (___default["default"].isArray(f.option)) {
+      result = f.option;
+    } else {
+      var ori;
 
-    var stringOnlyEnum = function stringOnlyEnum(candidate) {
-      var ns = MUtil.standardFields(candidate).find(function (f) {
-        return !___default["default"].isString(f.value);
-      });
+      if (f.type == "set") {
+        ori = f.setFields;
+      } else if (f.type == "enum") {
+        ori = f.enumFields;
+      } else {
+        var _ref, _f$option;
 
-      if (ns) {
-        error("暂不支持的选项数据类型：" + JSON.stringify(ns) + ": " + typeof ns);
+        ori = (_ref = (_f$option = f.option) != null ? _f$option : f.setFields) != null ? _ref : f.enumFields; // 只是为了保险
       }
-    };
 
-    if (s.type === "decoration") {
-      return [];
-    } else if (s.type === "enum") {
-      checkVL(MUtil.standardFields(s.enumFields));
-    } else if (s.type === "set") {
-      checkVL(MUtil.standardFields(s.setFields));
-    } else if (s.type === "matrix") {
-      stringOnlyEnum(s.matrix.x);
-      stringOnlyEnum(s.matrix.y);
-    } else if (s.type === "object") {
-      if (!s.objectFields) {
-        error("object类型未定义成员");
-      } else {
-        var _s$uispec;
+      if (typeof ori === "string") {
+        f.option = result = ori.split(" ").map(function (aEnum) {
+          var _kv$2;
 
-        checkDup(s.objectFields.filter(function (f) {
-          return f.type !== "decoration";
-        }).map(function (f) {
-          return f.name;
-        }), "字段名有重复");
+          var kv = aEnum.split("=");
+          return {
+            label: kv[0],
+            value: (_kv$2 = kv[1]) != null ? _kv$2 : kv[0]
+          };
+        });
+      } else {
+        f.option = result = ori; // TODO children 可能有递归的，还是得靠预处理解决
+      }
+    }
 
-        for (var _iterator9 = _createForOfIteratorHelperLoose$e(s.objectFields), _step9; !(_step9 = _iterator9()).done;) {
-          var f = _step9.value;
-          result = ___default["default"].concat(result, MUtil.validateSchema(f, MUtil.jsonPath(parentPath, s.name)));
-        }
+    return (_result = result) != null ? _result : [];
+  },
 
-        if (((_s$uispec = s.uispec) == null ? void 0 : _s$uispec.type) === "segmentForm") {
-          if (!s.uispec.segments) {
-            error("分段未定义");
-          } else {
-            checkDup(s.uispec.segments.map(function (f) {
-              return f.label;
-            }), "分段文案有重复");
-
-            var fieldsInSegments = ___default["default"].flatten(s.uispec.segments.map(function (f) {
-              return f.fields;
-            }));
-
-            checkDup(fieldsInSegments, "分段字段有重复");
-            var fields = s.objectFields.map(function (f) {
-              return f.name;
-            });
-            checkDup(fields, "字段名有重复");
-
-            var notInSegment = ___default["default"].difference(fields, fieldsInSegments);
-
-            if (notInSegment.length > 0) {
-              error("字段" + notInSegment.join(",") + "未体现在分段中");
-            }
-
-            var fieldNotExist = ___default["default"].difference(fieldsInSegments, fields);
-
-            if (fieldNotExist.length > 0) {
-              error("分段字段名无效：" + notInSegment.join(","));
-            }
-          }
-        }
-      }
+  /** 如果出错了，返回这么个元素，可能用在BaseEditor子类或者其他的东西上 */
+  error: function error(msg, schema) {
+    return jsxRuntime.jsxs("div", {
+      style: {
+        color: "white",
+        border: "1px solid darkgrey",
+        background: "red",
+        textAlign: "center",
+        borderRadius: "5px"
+      },
+      children: [msg, schema ? jsxRuntime.jsx("pre", {
+        style: {
+          whiteSpace: "pre-wrap",
+          textAlign: "left"
+        },
+        children: JSON.stringify(schema)
+      }) : undefined]
+    }, Date.now());
+  },
+  sign: function sign(v) {
+    if (___default["default"].isNil(v)) {
+      return null;
     }
 
-    return result;
+    return Math.sign(v);
   },
 
   /**
-   * 参考https://stackoverflow.com/questions/3362471/how-can-i-call-a-javascript-constructor-using-call-or-apply
-   * 示例： var d = applyToConstructor(Date, [2008, 10, 8, 00, 16, 34, 254]);
-   * @param constructor
-   * @param argArray
+   * 当前设备是不是个手机（或者类似手机的设备，比如ipad上运行iphone app中的webview）
    */
-  applyToConstructor: function applyToConstructor(constructor, argArray) {
-    var args = [null].concat(argArray);
-    var factoryFunction = constructor.bind.apply(constructor, args);
-    return new factoryFunction();
+  phoneLike: function phoneLike() {
+    // eslint-disable-next-line no-restricted-globals
+    return screen.height / screen.width > 1.5;
   },
+  // /**
+  //  * 计算文字的宽度
+  //  * @param text 文字
+  //  * @param font 字体
+  //  * @returns 宽度，单位是px
+  //  */
+  // getTextWidth(text:string, font?:string) {
+  //   var canvas = _messurer ?? (_messurer = document.createElement("canvas"));
+  //   var context = canvas.getContext("2d");
+  //   if(!context) {
+  //     console.error('神奇的事情发生了：canvas.getContext("2d")居然能返回null');
+  //     return text.length * 10; // 总比出不来好
+  //   }
+  //   if(font){
+  //     context.font = font;
+  //   }
+  //   var metrics = context.measureText(text);
+  //   return metrics.width;
+  // }
 
   /**
-   * 执行表达式或者回调函数
-   * @param exprOrFunction 表达式或者回调函数
-   * @param paramName 参数名字
-   * @param paramValue 参数值
-   * @param fallback 如果exprOrFunction无效，返回fallback
-   * @param _this this指针
+   * 计算文字的宽度
+   * @param text
    */
-  evalExprOrFunction: function evalExprOrFunction(exprOrFunction, paramName, paramValue, fallback, _this) {
-    if (fallback === void 0) {
-      fallback = undefined;
+  antdTextWidth: function antdTextWidth(text) {
+    if (!text) {
+      return 0;
     }
 
-    if (_this === void 0) {
-      _this = undefined;
-    }
+    return text.length * 16;
+  },
 
-    if (___default["default"].isFunction(exprOrFunction)) {
-      return exprOrFunction.apply(_this, paramValue);
-    } else if (___default["default"].isString(exprOrFunction)) {
-      //return new Function("_", "value", "parent", "return (" + labelExpr + ");")(_, value, parent);
-      var func = MUtil.applyToConstructor(Function, [].concat(paramName, ["return (" + exprOrFunction + ")"]));
-      return func.apply(_this, paramValue);
+  /**
+   * 从数组中删掉一个元素
+   * @param a 这个数组会被改变的
+   * @param element 要删的元素
+   * @returns 修改后的数组（如果它不是nil）
+   */
+  arrayRemove: function arrayRemove(a, element) {
+    if (a) {
+      var idx = a.indexOf(element);
+
+      if (idx >= 0) {
+        a.splice(idx, 1);
+      }
+
+      return a;
     } else {
-      return fallback;
+      return a;
     }
   },
+  fieldOfLayout: function fieldOfLayout(fields, spec) {
+    var objectFieldMap = ___default["default"].chain(fields).keyBy("name").value();
 
-  /**
-   * 读取url参数，转换成map
-   * @param hashPrefix nil表示不读取hash里的参数，字符串表示读取hash里的参数，并加上这个前缀返回。默认是返回，但前缀是空字符串
-   */
-  getQuery: function getQuery(hashPrefix) {
+    var r = {};
 
-    var arrs = [].concat(window.location.search.split(/[?&]/), window.location.hash.split(/[#?&]/));
-    var result = {};
-    arrs.forEach(function (item) {
-      var kv = item.split(/=/);
+    for (var _iterator = _createForOfIteratorHelperLoose$d((_spec$segments = spec.segments) != null ? _spec$segments : []), _step; !(_step = _iterator()).done;) {
+      var _spec$segments;
 
-      if (kv.length <= 2 && kv[0]) {
-        result[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+      var s = _step.value;
+
+      for (var _iterator2 = _createForOfIteratorHelperLoose$d((_s$fields = s.fields) != null ? _s$fields : []), _step2; !(_step2 = _iterator2()).done;) {
+        var _s$fields;
+
+        var f = _step2.value;
+
+        if (___default["default"].isString(f)) {
+          var def = objectFieldMap[f];
+
+          if (def) {
+            r[f] = def;
+          }
+        }
       }
-    });
-    return result;
+    }
+
+    return ___default["default"].values(r);
   },
 
   /**
-   * 动态创建一个CSS样式
-   * @param css css内容，会被写进style标签里
-   * @param id <style>的id，可以没有。如果已经存在，会被覆盖掉。
+   * 跟lodash的get一样，除了：
+   * 1. path是nil时返回undefined
+   * 2. path是""时返回原始对象
+   * @param a
+   * @param path
    */
-  setCss: function setCss(css, id) {
-    var _document$getElementB;
+  get: function get(a, path) {
+    if (___default["default"].isNil(a) || ___default["default"].isNil(path)) {
+      return undefined;
+    } else if (path === "") {
+      return a;
+    }
 
-    var s = (_document$getElementB = document.getElementById(id)) != null ? _document$getElementB : document.createElement("style");
-    s.id = id;
-    s.type = "text/css";
-    s.innerHTML = css;
-    document.getElementsByTagName("head")[0].appendChild(s);
+    return ___default["default"].get(a, path);
   },
 
   /**
-   * escape数值
-   * @param str - 字符串
-   * @returns 会带上引号，类似"abc"，str=nil时会返回""
+   * a : database
+   * v : newValue
+   * 跟lodash的set一样，除了path是""时等效于_.assign(a, v)
    */
-  escapeCsv: function escapeCsv(str) {
-    if (!___default["default"].isString(str)) {
-      str = ___default["default"].toString(str);
+  set: function set(a, path, v) {
+    if (path === "") {
+      // 如果 database 是数组，需要特殊处理
+      if (___default["default"].isArray(a)) a.length = v.length;
+
+      ___default["default"].assign(a, v);
+    } else {
+      ___default["default"].set(a, path, v);
+    }
+  },
+  debug: function debug(d) {
+    for (var _len = arguments.length, optionalParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      optionalParams[_key - 1] = arguments[_key];
     }
 
-    return '"' + str.replace(/["]/g, '""') + '"';
+    console.log(d, optionalParams);
   },
 
   /**
-   * 判断两个值是否相同
-   * @param v1 一个值
-   * @param v2 另一个值
-   * @param tolerate true用==判断，false用===判断
+   * 填入默认值
+   * @param schema 你懂得
+   * @param database 数据库，会被修改的
+   * @param path 路径
    */
-  isEquals: function isEquals(v1, v2, tolerate) {
-    if (tolerate) {
-      return v1 == v2;
-    } else {
-      return v1 === v2;
-    }
-  }
-};
-var CompactArray = {
-  indexOf: function indexOf(ca, d) {
-    if (___default["default"].isNil(d) || ___default["default"].isNil(ca)) {
-      return -1;
-    }
+  applyDefaultValue: function applyDefaultValue(schema, database, path) {
+    // FIXME 多测试下，type是object或其他简单类型的情况
+    if (schema.type === "object") {
+      for (var _iterator3 = _createForOfIteratorHelperLoose$d((_schema$objectFields = schema.objectFields) != null ? _schema$objectFields : []), _step3; !(_step3 = _iterator3()).done;) {
+        var _schema$objectFields;
 
-    if (___default["default"].isArray(ca)) {
-      return ca.indexOf(d);
+        var f = _step3.value;
+        this.applyDefaultValue(f, database, (path ? path + "." : "") + f.name);
+      }
     } else {
-      return ca === d ? 0 : -1;
+      if (!___default["default"].isNil(schema.defaultValue) && ___default["default"].isNil(___default["default"].get(database, path))) {
+        ___default["default"].set(database, path, schema.defaultValue);
+      }
     }
-  }
-};
+  },
+  filterHide: function filterHide(schema, database) {
+    var _schema$objectFields2;
 
-function _createForOfIteratorHelperLoose$d(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray$d(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+    // TODO 要改成递归的
+    var hm = MUtil.hideMap(database, (_schema$objectFields2 = schema.objectFields) != null ? _schema$objectFields2 : [], schema.uispec);
+    var finalData = ___default["default"].isArray(database) ? [] : {};
 
-function _unsupportedIterableToArray$d(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$d(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$d(o, minLen); }
+    for (var k in database) {
+      if (!hm[k]) {
+        finalData[k] = database[k];
+      }
+    }
 
-function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-var defaultTheme = {
-  READABLE_UNKNOWN: "?",
-  READABLE_BLANK: "-",
-  READABLE_INVALID: "❓",
-  READABLE_ERROR: "❗",
-  themeName: "antMiddle"
-};
-/**
- * 注册viewer，type，morph（viewer和type之间的关联）
- */
+    return finalData;
+  },
 
-var Assembly = /*#__PURE__*/function () {
-  var _proto = Assembly.prototype;
+  /**
+   * 计算哪些field、segment需要隐藏
+   * 支持ShowIfFunc里的函数
+   * TODO 如果segment隐藏，里面的字段全都要隐藏
+   * @returns 示例：
+   * let {name,role,gender,alias,birthday,company,position,tel,email,citizenship,politicsCode,companyArch,address,work,edu,assistant,student,mib} = data;
+   * return {politicsCode: !(citizenship=='中国大陆'),"segment:学员信息": !(_.intersection(role, ['校友']).length > 0))}
+   * @param objectFields
+   * @param uispec 用来计算segment是不是要展示，不填就不计算
+   */
+  hideMap: function hideMap(database, objectFields, uispec) {
+    // 构造字段依赖计算的脚本，类似这样：
+    // let {name,role,gender,alias,tel,email,citizenship,student} = {"name":"aaa","alias":"bbb","tel":"1"};citizenship=='中国大陆'
+    var l1fields = ___default["default"].uniq( // 名字要唯一
+    objectFields.filter(function (e) {
+      return !!e.name;
+    }) // 过滤掉没有名字的字段
+    .map(function (e) {
+      return ___default["default"].first(e.name.split("."));
+    }) // 对于objectFields里类似student.no/student.state的字段，这里只要拼一个student就可以了
+    );
 
-  /** 根据定义返回View，返回nil表示没有可用的View */
-  _proto.getViewerOf = function getViewerOf(f, morph) {
-    if (f.editor && morph === "editor") {
-      if (___default["default"].isString(f.editor)) {
-        return ___default["default"].get(this.viewers, f.editor);
-      } else {
-        return f.editor;
-      }
-    } else if (f.readable && morph === "readable") {
-      if (___default["default"].isString(f.readable)) {
-        return ___default["default"].get(this.viewers, f.readable);
-      } else {
-        return f.readable;
-      }
-    } else {
-      var viewer = ___default["default"].get(this.morph, morph + "." + f.type);
+    var showIfScript = "let {" + l1fields.join(",") + "} = data || {};\nlet hide = {";
 
-      if (___default["default"].isString(viewer)) {
-        return ___default["default"].get(this.viewers, viewer);
-      } else {
-        return viewer;
-      }
-    }
-  };
+    for (var _iterator4 = _createForOfIteratorHelperLoose$d(objectFields), _step4; !(_step4 = _iterator4()).done;) {
+      var f = _step4.value;
 
-  _proto.validate = function validate(s, v, path) {
-    if (path === void 0) {
-      path = "";
+      if (f.showIf) {
+        showIfScript += "'" + f.name + "': !(" + f.showIf + "),";
+      }
     }
 
-    var result = undefined;
+    for (var _iterator5 = _createForOfIteratorHelperLoose$d((_uispec$segments = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments : []), _step5; !(_step5 = _iterator5()).done;) {
+      var _uispec$segments;
 
-    for (var _iterator = _createForOfIteratorHelperLoose$d(this.types[s.type].validators), _step; !(_step = _iterator()).done;) {
-      var validator = _step.value;
-      result = validator(this, s, v, path);
+      var s = _step5.value;
 
-      if (result === "pass" && s.type !== "weight") {
-        return undefined;
-      } else if (typeof result === "object") {
-        MUtil.debug("校验", path, result.message);
-        return result;
+      if (s.showIf) {
+        showIfScript += "\"segment:" + s.label + "\": !(" + s.showIf + "),";
       }
     }
 
-    return undefined;
-  };
+    showIfScript += "}\n"; // 如果一个segment里的所有字段都隐藏，segment就要隐藏
 
-  _proto.addViewer = function addViewer(name, v) {
-    if (this.viewers[name]) {
-      console.error("addViewer: \u5DF2\u7ECF\u5B58\u5728\u540D\u4E3A " + name + " \u7684 Viewer\uFF0C\u65E0\u6CD5\u518D\u6B21\u6DFB\u52A0\uFF01");
-      return;
-    } else {
-      this.viewers[name] = v;
-    }
-  };
+    for (var _iterator6 = _createForOfIteratorHelperLoose$d((_uispec$segments2 = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments2 : []), _step6; !(_step6 = _iterator6()).done;) {
+      var _uispec$segments2;
 
-  _proto.addEditor = function addEditor(name, v) {
-    if (this.editors[name]) {
-      console.error("addEditor: \u5DF2\u7ECF\u5B58\u5728\u540D\u4E3A " + name + " \u7684 Editor\uFF0C\u65E0\u6CD5\u518D\u6B21\u6DFB\u52A0\uFF01");
-      return;
-    } else {
-      this.editors[name] = v;
-    }
-  }
-  /**
-   * 增加一种数据类型
-   * 例：
-   *  const hpOrg = {name: "hpOrg", type: {validators: ..., toReadable: ...}, editor: HPOrgEditor, readable: "DivViewer"}
-   *  addType(hpOrg)
-   * @param typeParam 类型的描述对象
-   */
-  ;
+      var _s = _step6.value;
 
-  _proto.addType = function addType(typeParam) {
-    var name = typeParam.name,
-        type = typeParam.type,
-        editor = typeParam.editor,
-        _typeParam$readable = typeParam.readable,
-        readable = _typeParam$readable === void 0 ? "DivViewer" : _typeParam$readable;
-    this.types[name] = type;
+      var cond = _s.fields.map(function (f) {
+        return "(hide['" + f + "'])";
+      }).join(" && ");
 
-    ___default["default"].set(this.morph, "editor." + name, editor);
+      showIfScript += "if(" + cond + ") { hide[\"segment:" + _s.label + "\"] = true }\n";
+    }
 
-    ___default["default"].set(this.morph, "readable." + name, readable);
-  };
+    showIfScript += "return hide;\n"; // eslint-disable-next-line no-new-func
 
-  function Assembly() {
-    var _this = this;
+    try {
+      var fn = Object.keys(SchemaFunc);
+      var fv = Object.values(SchemaFunc);
 
-    this.types = {};
-    this.viewers = {};
-    this.editors = {};
-    this.morph = {};
-    this.theme = defaultTheme;
+      var hideMap = _construct__default["default"](Function, ["_", "data"].concat(fn, [showIfScript])).apply(void 0, [___default["default"], database].concat(fv));
 
-    this.toReadable = function (s, v, parent) {
-      var t = _this.types[s.type];
+      return hideMap;
+    } catch (e) {
+      console.error("Calc hideMap failed: " + e.message, "function(_,data){" + showIfScript + "}", database);
+      return {};
+    }
+  },
 
-      if (t) {
-        var _r;
+  /**
+   * 计算 showIf 的值
+   * @returns Boolean
+   * @param database
+   * @param objectFields
+   */
+  isShow: function isShow(database, objectFields, showIfExpr) {
+    if (!showIfExpr) return true;
 
-        var r;
+    var l1fields = ___default["default"].uniq(objectFields.filter(function (e) {
+      return !!e.name;
+    }).map(function (e) {
+      return ___default["default"].first(e.name.split("."));
+    }));
 
-        if (___default["default"].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)(___default["default"], v, _this.theme);
-        } else if (___default["default"].isFunction(s.toReadable)) {
-          r = s.toReadable(v, parent, _this);
-        }
+    var showIfScript = "let {" + l1fields.join(",") + "} = data || {};\n return " + showIfExpr;
 
-        r = (_r = r) != null ? _r : t.toReadable(_this, s, v);
+    try {
+      var fn = Object.keys(SchemaFunc);
+      var fv = Object.values(SchemaFunc);
 
-        if (s.postfix) {
-          r += s.postfix;
-        }
+      var res = _construct__default["default"](Function, ["_", "data"].concat(fn, [showIfScript])).apply(void 0, [___default["default"], database].concat(fv));
 
-        return r;
-      } else {
-        return s.type + "类型无效";
-      }
-    }; // 校验types是否使用了无效的编辑器名字
+      return res;
+    } catch (e) {
+      console.error("Calc isShow failed: " + e.message, "function(_,data){" + showIfScript + "}", database);
+      return true;
+    }
+  },
+  scoreOf: function scoreOf(f, database) {
+    var v = ___default["default"].get(database, f.name);
 
+    if (f.type == "enum") {
+      var _MUtil$standardFields, _MUtil$standardFields2;
 
-    for (var morphName in this.morph) {
-      for (var typeName in this.morph[morphName]) {
-        if (!this.types[typeName]) {
-          throw SyntaxError("\u7C7B\u578B" + typeName + "\u672A\u5B9A\u4E49");
-        }
+      return ___default["default"].toNumber((_MUtil$standardFields = MUtil.standardFields(f.enumFields)) == null ? void 0 : (_MUtil$standardFields2 = _MUtil$standardFields.find(function (e) {
+        return e.value == v;
+      })) == null ? void 0 : _MUtil$standardFields2.score);
+    } else if (f.type == "set") {
+      var score = 0;
+      var opts = MUtil.standardFields(f.setFields);
 
-        var viewerName = this.morph[morphName][typeName];
+      for (var _iterator7 = _createForOfIteratorHelperLoose$d(opts), _step7; !(_step7 = _iterator7()).done;) {
+        var s = _step7.value;
 
-        if (!this.viewers[viewerName]) {
-          throw SyntaxError("\u89C6\u56FE" + viewerName + "\u672A\u5B9A\u4E49");
+        if (___default["default"].find(opts, {
+          value: v
+        })) {
+          score += ___default["default"].toNumber(s.score);
         }
       }
+
+      return score;
+    } else {
+      return 0;
     }
-  }
+  },
 
-  return Assembly;
-}();
-var assembly = new Assembly();
+  /**
+   * 查找fs依赖（通过showIf）的所有字段
+   * @param fs
+   * @param all
+   * @returns fs依赖的所有字段，包含fs。这个数组中下标小的元素，依赖下标大的元素
+   */
+  dependency: function dependency(fs, all) {
+    // 先建个索引
+    var allFieldsIdx = ___default["default"].keyBy(all, "name"); // 构造未被依赖的集合
 
-var MContext = /*#__PURE__*/React__default["default"].createContext(undefined);
 
-function ownKeys$x(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+    var ndep = ___default["default"].keyBy(all, "name"); // 全体
 
-function _objectSpread$x(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$x(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$x(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-/**
- * 一个字段的视图
- */
 
-var MFieldViewer = /*#__PURE__*/function (_React$Component) {
-  _inheritsLoose__default["default"](MFieldViewer, _React$Component);
+    ndep = ___default["default"].omit(ndep, fs.map(function (f) {
+      return f.name;
+    })); // 去掉fs
+    // 构造被依赖的集合
 
-  function MFieldViewer() {
-    return _React$Component.apply(this, arguments) || this;
-  }
+    var dep = new Map();
+    fs.forEach(function (f) {
+      return dep[f.name] = f;
+    }); // 循环从ndep里把被依赖的字段放到dep中，直到dep不再增加
+    // 算法有点粗暴，将就用吧
 
-  var _proto = MFieldViewer.prototype;
+    for (var i = 0; i < all.length; i++) {
+      //  轮数最多all.length，防止卡死
+      var newDepNames = [];
 
-  _proto.render = function render() {
-    var _this = this;
+      for (var dn in dep) {
+        var _dep$dn$showIf;
 
-    var viewer = assembly.getViewerOf(this.props.schema, this.props.morph); // console.log('MFieldViewer.viewer', viewer);
+        var _i = ___default["default"].intersection((_dep$dn$showIf = dep[dn].showIf) == null ? void 0 : _dep$dn$showIf.split(/[^a-zA-Z0-9_$]/), Object.keys(ndep));
 
-    if (!viewer) {
-      return MUtil.error("\u5B57\u6BB5\u7684\u89C6\u56FE\u5C1A\u672A\u5B9E\u73B0", this.props.schema);
-    }
+        newDepNames = newDepNames.concat(_i);
+      }
 
-    var props = _objectSpread$x({
-      afterChange: function afterChange() {},
-      changeSchema: function changeSchema() {},
-      changeDatabase: function changeDatabase() {},
-      name: this.props.path
-    }, this.props);
+      var prevSize = Object.keys(dep).length;
 
-    var ele = /*#__PURE__*/React__default["default"].createElement(viewer, props, null);
-    return jsxRuntime.jsx(MContext.Consumer, {
-      children: function children(ctx) {
-        if (ctx.rootProps.wrapper && _this.props.schema.type !== 'object' && _this.props.schema.type !== 'array') {
-          return ctx.rootProps.wrapper(ele, _this.props.schema);
-        } else {
-          return ele;
-        }
+      for (var _iterator8 = _createForOfIteratorHelperLoose$d(newDepNames), _step8; !(_step8 = _iterator8()).done;) {
+        var n = _step8.value;
+        dep[n] = allFieldsIdx[n];
+        delete ndep[n];
       }
-    });
-  };
 
-  return MFieldViewer;
-}(React__default["default"].Component);
+      var afterSize = Object.keys(dep).length;
 
-/**
- * 非空校验，数据不能是null/undefined/""/NaN/[]
- * 要在其他条件之前，以便required=false时短路掉nil的数据，否则后面的校验全都得处理nil
- * @param a
- * @param schema
- * @param value
- * @param path
- * @returns
- */
+      if (prevSize == afterSize) {
+        break; // 如果找不到更多依赖，就可以结束了
+      }
+    }
 
-function validateRequired$1(a, schema, value, path) {
-  if (schema.required) {
-    if (___default["default"].isNil(value) || value === "" || ___default["default"].isNaN(value) || ___default["default"].isArray(value) && value.length == 0) {
-      return {
-        message: "您还没有填完这一项",
-        path: path
-      };
-    } // 凡是总有例外
+    return Object.values(dep);
+  },
 
+  /**
+   * 用moment格式化
+   * @param s 原始数据，参见moment
+   * @param srcFormat 原始数据的格式，默认x(时间戳)
+   * @param dstFormat 转换成的数据格式，默认YYYY年MM月DD日
+   * @param fallback 如果原始数据是nil，返回fallback
+   */
+  momentFormat: function momentFormat(s, srcFormat, dstFormat, fallback) {
+    if (srcFormat === void 0) {
+      srcFormat = "x";
+    }
 
-    if (schema.type === "set" && schema.openOption) {
-      if (value.length === 1 && !value[0]) {
-        return {
-          message: "您还没有填完这一项",
-          path: path
-        }; // 开放set，只勾了开放选项，没有填内容，也要算空
-      }
+    if (dstFormat === void 0) {
+      dstFormat = "YYYY年MM月DD日";
     }
-  } else {
-    if (___default["default"].isNil(value)) {
-      return "pass";
+
+    if (fallback === void 0) {
+      fallback = "不详";
     }
-  }
 
-  return undefined;
-}
-/** 和validateRequired相同，但不短路 */
+    if (___default["default"].isNil(s)) {
+      return fallback;
+    }
 
-function validateRequiredNS(a, schema, value, path) {
-  var v = validateRequired$1(a, schema, value, path);
+    return moment__default["default"](s, srcFormat).format(dstFormat);
+  },
 
-  if (v === "pass") {
-    return undefined;
-  }
-}
-function validateDateMinMax(a, schema, value, path) {
-  if (schema.min) {
-    if (!value || value < schema.min) {
-      return {
-        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u540E\u7684\u65F6\u95F4",
-        path: path
+  /**
+   * 将标准的json schema转换成m3的schema
+   * @param e json schema
+   * @param base 如果填了一个对象，转换出的属性会放在这个对象上
+   * @param template 如果有子结构，创建子结构的模板
+   */
+  jsonSchema2MFieldSchema: function jsonSchema2MFieldSchema(e, base, template) {
+    if (base === void 0) {
+      base = {
+        name: "",
+        type: "string"
       };
     }
-  }
 
-  if (schema.max) {
-    if (!value || value > schema.max) {
-      return {
-        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u524D\u7684\u65F6\u95F4",
-        path: path
-      };
+    if (template === void 0) {
+      template = {};
     }
-  }
 
-  return undefined;
-}
-/**
- * 数组项数不超过[min, max]
- * @param schema
- * @param value 应该是个数组
- */
+    switch (e.type) {
+      case "string":
+        if (e.enum) {
+          var _base$enumFields;
 
-function validateArrayItemMinMax(a, schema, value, path) {
-  if (schema.min) {
-    if (!value || value.length < schema.min) {
-      return {
-        message: "\u81F3\u5C11\u9009\u62E9" + schema.min + "\u9879",
-        path: path
-      };
+          base.type = "enum";
+          base.enumFields = (_base$enumFields = base.enumFields) != null ? _base$enumFields : e.enum.map(function (v) {
+            return {
+              value: (v != null ? v : "").toString()
+            };
+          });
+        } else {
+          base.type = "string";
+          base.max = e.maxLength;
+        }
+
+        break;
+
+      case "number":
+      case "integer":
+        base.type = "int";
+        break;
+
+      case "object":
+        base.type = "object";
+        base.objectFields = [];
+        base.uispec = {
+          type: "flowForm",
+          layout: MUtil.phoneLike() ? "vertical" : "horizontal",
+          comma: "："
+        };
+
+        for (var key in e.properties) {
+          var jsmField = e.properties[key];
+
+          var m3Field = ___default["default"].assign({}, template, {
+            name: key,
+            label: key,
+            type: "object"
+          });
+
+          if (!___default["default"].isBoolean(jsmField)) {
+            var _jsmField$title;
+
+            m3Field.label = (_jsmField$title = jsmField.title) != null ? _jsmField$title : key;
+            this.jsonSchema2MFieldSchema(jsmField, m3Field, template);
+            base.objectFields.push(m3Field);
+          } else {
+            m3Field.type = "不支持的json schema：object.properties的value是boolean";
+            base.objectFields.push();
+          }
+        }
+
+        break;
+
+      case "array":
+        base.type = "array";
+        base.arrayMember = {
+          label: "",
+          type: "array"
+        };
+
+        if (___default["default"].isArray(e.items)) {
+          base.arrayMember.type = "不支持的json schema：array.items是数组";
+        } else if (___default["default"].isBoolean(e.items)) {
+          base.arrayMember.type = "不支持的json schema：array.items是boolean";
+        } else if (e.items) {
+          this.jsonSchema2MFieldSchema(e.items, base, template);
+        } else {
+          base.arrayMember.type = "不支持的json schema：array.items是undefined";
+        }
+
+        break;
+
+      case "null":
+      case "any":
+      case "boolean":
+      default:
+        base.type = "不支持的json schema：array.items是" + e.type;
+        break;
     }
-  }
 
-  if (schema.max) {
-    if (!value || value.length > schema.max) {
-      return {
-        message: "\u6700\u591A\u9009\u62E9" + schema.max + "\u9879",
-        path: path
-      };
+    return base;
+  },
+
+  /**
+   * 修改一个对象里的key
+   * @param object 要修改的对象，
+   * @param renameTo
+   * @param removeNotExistKey 是否在结果里面去除renameTo里不存在的key
+   * @returns 返回一个改过key名字的新对象
+   */
+  renameKey: function renameKey(object, renameTo, removeNotExistKey) {
+    if (removeNotExistKey === void 0) {
+      removeNotExistKey = false;
+    }
+
+    var result = {};
+
+    for (var oldKey in object) {
+      var newKey = renameTo[oldKey];
+
+      if (!newKey) {
+        if (removeNotExistKey) {
+          continue;
+        } else {
+          newKey = oldKey;
+        }
+      }
+
+      result[newKey] = object[oldKey];
+    }
+
+    return result;
+  },
+
+  /**
+   * 提交时将时间字段转换为可读格式
+   * @param schema 表单 schema（type 为 object 的根 schema）
+   * @param database 表单数据
+   * @returns 深拷贝后转换过的数据
+   */
+  formatForExport: function formatForExport(schema, database) {
+    if (___default["default"].isNil(database)) {
+      return database;
+    }
+
+    var result = ___default["default"].cloneDeep(database);
+
+    var fields = schema.objectFields;
+
+    if (!fields) {
+      return result;
+    }
+
+    var _loop = function _loop() {
+      var field = _step9.value;
+      var value = result[field.name];
+
+      if (___default["default"].isNil(value)) {
+        return "continue";
+      }
+
+      var type = field.type; // 时间选择器
+
+      if (type === "year" || type === "yearMonth" || type === "yearMonthDay" || type === "datetime" || type === "date") {
+        var antConf = MDateTimeType.antConf(field);
+
+        if (antConf) {
+          var m = moment__default["default"](value, antConf.dataFormat);
+
+          if (m.isValid()) {
+            result[field.name] = m.format(antConf.readableFormat);
+          }
+        }
+      } // 时间范围选择器
+      else if (type === "dateRange") {
+        if (___default["default"].isArray(value)) {
+          var _field$dateRange, _field$dataFormat;
+
+          var start = value[0],
+              end = value[1],
+              tillNow = value[2];
+          var fmt = getReadableFormat(field.dateRangePrecision, (_field$dateRange = field.dateRange) == null ? void 0 : _field$dateRange.showTime);
+          var dataFormat = (_field$dataFormat = field.dataFormat) != null ? _field$dataFormat : "x";
+          var startStr = "";
+          var endStr = "";
+
+          if (!___default["default"].isNil(start)) {
+            var _m = moment__default["default"](start, dataFormat);
+
+            startStr = _m.isValid() ? _m.format(fmt) : "";
+          }
+
+          if (tillNow) {
+            endStr = "至今";
+          } else if (!___default["default"].isNil(end)) {
+            var _m2 = moment__default["default"](end, dataFormat);
+
+            endStr = _m2.isValid() ? _m2.format(fmt) : "";
+          }
+
+          result[field.name] = startStr + " - " + endStr;
+        }
+      } // 嵌套 object
+      else if (type === "object" && field.objectFields) {
+        result[field.name] = MUtil.formatForExport(field, value);
+      } // 嵌套 array
+      else if (type === "array" && field.arrayMember && ___default["default"].isArray(value)) {
+        if (field.arrayMember.objectFields) {
+          result[field.name] = value.map(function (item) {
+            return MUtil.formatForExport(field.arrayMember, item);
+          });
+        }
+      }
+    };
+
+    for (var _iterator9 = _createForOfIteratorHelperLoose$d(fields), _step9; !(_step9 = _iterator9()).done;) {
+      var _ret = _loop();
+
+      if (_ret === "continue") continue;
+    }
+
+    return result;
+  },
+
+  /**
+   * 回填时将可读格式的时间字段反解析为内部格式
+   * @param schema 表单 schema（type 为 object 的根 schema）
+   * @param database 可读格式的数据
+   * @returns 深拷贝后反解析过的数据
+   */
+  parseFromExport: function parseFromExport(schema, database) {
+    if (___default["default"].isNil(database)) {
+      return database;
+    }
+
+    var result = ___default["default"].cloneDeep(database);
+
+    var fields = schema.objectFields;
+
+    if (!fields) {
+      return result;
+    }
+
+    var _loop2 = function _loop2() {
+      var field = _step10.value;
+      var value = result[field.name];
+
+      if (___default["default"].isNil(value)) {
+        return "continue";
+      }
+
+      var type = field.type; // 时间选择器
+
+      if (type === "year" || type === "yearMonth" || type === "yearMonthDay" || type === "datetime" || type === "date") {
+        var antConf = MDateTimeType.antConf(field);
+
+        if (antConf && ___default["default"].isString(value)) {
+          var m = moment__default["default"](value, antConf.readableFormat);
+
+          if (m.isValid()) {
+            result[field.name] = m.format(antConf.dataFormat);
+          }
+        }
+      } // 时间范围选择器
+      else if (type === "dateRange") {
+        if (___default["default"].isString(value)) {
+          var _field$dateRange2, _field$dataFormat2, _parts$, _parts$2;
+
+          var fmt = getReadableFormat(field.dateRangePrecision, (_field$dateRange2 = field.dateRange) == null ? void 0 : _field$dateRange2.showTime);
+          var dataFormat = (_field$dataFormat2 = field.dataFormat) != null ? _field$dataFormat2 : "x";
+          var parts = value.split(" - ");
+          var startStr = (_parts$ = parts[0]) == null ? void 0 : _parts$.trim();
+          var endStr = (_parts$2 = parts[1]) == null ? void 0 : _parts$2.trim();
+          var start = null;
+          var end = null;
+          var tillNow = false;
+
+          if (startStr) {
+            var _m3 = moment__default["default"](startStr, fmt);
+
+            if (_m3.isValid()) {
+              start = _m3.format(dataFormat);
+            }
+          }
+
+          if (endStr === "至今") {
+            tillNow = true;
+          } else if (endStr) {
+            var _m4 = moment__default["default"](endStr, fmt);
+
+            if (_m4.isValid()) {
+              end = _m4.format(dataFormat);
+            }
+          }
+
+          result[field.name] = [start, end, tillNow];
+        }
+      } // 嵌套 object
+      else if (type === "object" && field.objectFields) {
+        result[field.name] = MUtil.parseFromExport(field, value);
+      } // 嵌套 array
+      else if (type === "array" && field.arrayMember && ___default["default"].isArray(value)) {
+        if (field.arrayMember.objectFields) {
+          result[field.name] = value.map(function (item) {
+            return MUtil.parseFromExport(field.arrayMember, item);
+          });
+        }
+      }
+    };
+
+    for (var _iterator10 = _createForOfIteratorHelperLoose$d(fields), _step10; !(_step10 = _iterator10()).done;) {
+      var _ret2 = _loop2();
+
+      if (_ret2 === "continue") continue;
+    }
+
+    return result;
+  },
+
+  /** 啥也不干的空回调 */
+  doNothing: function doNothing() {},
+
+  /**
+   * 去掉arr中的undefined和null，拼出来一个json path
+   */
+  jsonPath: function jsonPath() {
+    for (var _len2 = arguments.length, arr = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      arr[_key2] = arguments[_key2];
+    }
+
+    return ___default["default"].compact(arr).join(".");
+  },
+
+  /**
+   * 获取一个json path的父path。
+   * @param path 如果path是空的返回也是空的
+   */
+  parentPath: function parentPath(path) {
+    var split = path.replace(/]/g, "").split(/[.\\[]/);
+    split.splice(-1, 1);
+    return split.join(".");
+  },
+
+  /**
+   * 校验一个schema
+   * @param s 要校验的schema
+   * @returns 空数组表示校验通过，否则返回校验错误信息
+   */
+  validateSchema: function validateSchema(s, parentPath) {
+    var result = [];
+
+    var error = function error(msg) {
+      return result.push({
+        message: msg,
+        path: MUtil.jsonPath(parentPath, s.name)
+      });
+    };
+
+    var checkDup = function checkDup(a, msgIfFail) {
+      if (___default["default"].uniq(a).length !== a.length) {
+        error(msgIfFail);
+      }
+    };
+
+    var checkVL = function checkVL(fs) {
+      checkDup(fs.map(function (f) {
+        return f.value;
+      }), s.name + "值有重复");
+      checkDup(fs.map(function (f) {
+        return f.label;
+      }).filter(function (l) {
+        return l;
+      }), s.name + "文案有重复");
+    };
+
+    var stringOnlyEnum = function stringOnlyEnum(candidate) {
+      var ns = MUtil.standardFields(candidate).find(function (f) {
+        return !___default["default"].isString(f.value);
+      });
+
+      if (ns) {
+        error("暂不支持的选项数据类型：" + JSON.stringify(ns) + ": " + typeof ns);
+      }
+    };
+
+    if (s.type === "decoration") {
+      return [];
+    } else if (s.type === "enum") {
+      checkVL(MUtil.standardFields(s.enumFields));
+    } else if (s.type === "set") {
+      checkVL(MUtil.standardFields(s.setFields));
+    } else if (s.type === "matrix") {
+      stringOnlyEnum(s.matrix.x);
+      stringOnlyEnum(s.matrix.y);
+    } else if (s.type === "object") {
+      if (!s.objectFields) {
+        error("object类型未定义成员");
+      } else {
+        var _s$uispec;
+
+        checkDup(s.objectFields.filter(function (f) {
+          return f.type !== "decoration";
+        }).map(function (f) {
+          return f.name;
+        }), "字段名有重复");
+
+        for (var _iterator11 = _createForOfIteratorHelperLoose$d(s.objectFields), _step11; !(_step11 = _iterator11()).done;) {
+          var f = _step11.value;
+          result = ___default["default"].concat(result, MUtil.validateSchema(f, MUtil.jsonPath(parentPath, s.name)));
+        }
+
+        if (((_s$uispec = s.uispec) == null ? void 0 : _s$uispec.type) === "segmentForm") {
+          if (!s.uispec.segments) {
+            error("分段未定义");
+          } else {
+            checkDup(s.uispec.segments.map(function (f) {
+              return f.label;
+            }), "分段文案有重复");
+
+            var fieldsInSegments = ___default["default"].flatten(s.uispec.segments.map(function (f) {
+              return f.fields;
+            }));
+
+            checkDup(fieldsInSegments, "分段字段有重复");
+            var fields = s.objectFields.map(function (f) {
+              return f.name;
+            });
+            checkDup(fields, "字段名有重复");
+
+            var notInSegment = ___default["default"].difference(fields, fieldsInSegments);
+
+            if (notInSegment.length > 0) {
+              error("字段" + notInSegment.join(",") + "未体现在分段中");
+            }
+
+            var fieldNotExist = ___default["default"].difference(fieldsInSegments, fields);
+
+            if (fieldNotExist.length > 0) {
+              error("分段字段名无效：" + notInSegment.join(","));
+            }
+          }
+        }
+      }
+    }
+
+    return result;
+  },
+
+  /**
+   * 参考https://stackoverflow.com/questions/3362471/how-can-i-call-a-javascript-constructor-using-call-or-apply
+   * 示例： var d = applyToConstructor(Date, [2008, 10, 8, 00, 16, 34, 254]);
+   * @param constructor
+   * @param argArray
+   */
+  applyToConstructor: function applyToConstructor(constructor, argArray) {
+    var args = [null].concat(argArray);
+    var factoryFunction = constructor.bind.apply(constructor, args);
+    return new factoryFunction();
+  },
+
+  /**
+   * 执行表达式或者回调函数
+   * @param exprOrFunction 表达式或者回调函数
+   * @param paramName 参数名字
+   * @param paramValue 参数值
+   * @param fallback 如果exprOrFunction无效，返回fallback
+   * @param _this this指针
+   */
+  evalExprOrFunction: function evalExprOrFunction(exprOrFunction, paramName, paramValue, fallback, _this) {
+    if (fallback === void 0) {
+      fallback = undefined;
+    }
+
+    if (_this === void 0) {
+      _this = undefined;
+    }
+
+    if (___default["default"].isFunction(exprOrFunction)) {
+      return exprOrFunction.apply(_this, paramValue);
+    } else if (___default["default"].isString(exprOrFunction)) {
+      //return new Function("_", "value", "parent", "return (" + labelExpr + ");")(_, value, parent);
+      var func = MUtil.applyToConstructor(Function, [].concat(paramName, ["return (" + exprOrFunction + ")"]));
+      return func.apply(_this, paramValue);
+    } else {
+      return fallback;
+    }
+  },
+
+  /**
+   * 读取url参数，转换成map
+   * @param hashPrefix nil表示不读取hash里的参数，字符串表示读取hash里的参数，并加上这个前缀返回。默认是返回，但前缀是空字符串
+   */
+  getQuery: function getQuery(hashPrefix) {
+
+    var arrs = [].concat(window.location.search.split(/[?&]/), window.location.hash.split(/[#?&]/));
+    var result = {};
+    arrs.forEach(function (item) {
+      var kv = item.split(/=/);
+
+      if (kv.length <= 2 && kv[0]) {
+        result[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+      }
+    });
+    return result;
+  },
+
+  /**
+   * 动态创建一个CSS样式
+   * @param css css内容，会被写进style标签里
+   * @param id <style>的id，可以没有。如果已经存在，会被覆盖掉。
+   */
+  setCss: function setCss(css, id) {
+    var _document$getElementB;
+
+    var s = (_document$getElementB = document.getElementById(id)) != null ? _document$getElementB : document.createElement("style");
+    s.id = id;
+    s.type = "text/css";
+    s.innerHTML = css;
+    document.getElementsByTagName("head")[0].appendChild(s);
+  },
+
+  /**
+   * escape数值
+   * @param str - 字符串
+   * @returns 会带上引号，类似"abc"，str=nil时会返回""
+   */
+  escapeCsv: function escapeCsv(str) {
+    if (!___default["default"].isString(str)) {
+      str = ___default["default"].toString(str);
     }
-  }
 
-  return undefined;
-}
-/**
- * 字符串长度不超过[min, max]
- * @param schema
- * @param value 应该是个字符串
- */
+    return '"' + str.replace(/["]/g, '""') + '"';
+  },
 
-function validateStringMinMax$1(a, schema, value, path) {
-  if (schema.min) {
-    if (!value || value.length < schema.min) {
-      return {
-        message: "\u81F3\u5C11" + schema.min + "\u4E2A\u5B57",
-        path: path
-      };
+  /**
+   * 判断两个值是否相同
+   * @param v1 一个值
+   * @param v2 另一个值
+   * @param tolerate true用==判断，false用===判断
+   */
+  isEquals: function isEquals(v1, v2, tolerate) {
+    if (tolerate) {
+      return v1 == v2;
+    } else {
+      return v1 === v2;
     }
   }
+};
+var CompactArray = {
+  indexOf: function indexOf(ca, d) {
+    if (___default["default"].isNil(d) || ___default["default"].isNil(ca)) {
+      return -1;
+    }
 
-  if (schema.max) {
-    if (value && value.length > schema.max) {
-      return {
-        message: "\u6700\u591A" + schema.max + "\u4E2A\u5B57",
-        path: path
-      };
+    if (___default["default"].isArray(ca)) {
+      return ca.indexOf(d);
+    } else {
+      return ca === d ? 0 : -1;
     }
   }
+};
 
-  return undefined;
-}
+var MContext = /*#__PURE__*/React__default["default"].createContext(undefined);
+
+function ownKeys$x(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$x(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$x(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$x(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
- * 数字不超过[min, max]
- * @param schema
- * @param value 应该是个数字
+ * 一个字段的视图
  */
 
-function validateNumberMinMax(a, schema, value, path) {
-  var temp = Number(value);
+var MFieldViewer = /*#__PURE__*/function (_React$Component) {
+  _inheritsLoose__default["default"](MFieldViewer, _React$Component);
 
-  if (!___default["default"].isNil(schema.max)) {
-    if (!___default["default"].isFinite(temp) || temp > schema.max) {
-      return {
-        message: "\u6700\u591A" + schema.max,
-        path: path
-      };
-    }
+  function MFieldViewer() {
+    return _React$Component.apply(this, arguments) || this;
   }
 
-  if (!___default["default"].isNil(schema.min)) {
-    if (!___default["default"].isFinite(temp) || temp < schema.min) {
-      return {
-        message: "\u6700\u5C11" + schema.min,
-        path: path
-      };
-    }
-  }
+  var _proto = MFieldViewer.prototype;
 
-  return undefined;
-}
-function generateRegexValidate$1(regex, mismatchMsg) {
-  return function (a, schema, value, path) {
-    var asstr = ___default["default"].toString(value);
+  _proto.render = function render() {
+    var _this = this;
 
-    if (!regex.test(asstr)) {
-      return {
-        message: mismatchMsg,
-        path: path
-      };
-    }
+    var viewer = assembly.getViewerOf(this.props.schema, this.props.morph); // console.log('MFieldViewer.viewer', viewer);
 
-    return undefined;
-  };
-}
-/**
- * 数据用Object.prototype.toString.call返回的类型是预期的
- * 可以用Object.prototype.toString.call(<预期的类型>)来查看你想要的数据类型的expectType
- * @param expectType 预期类型，例如："[object Object]" "[object Null]" "[object Number]" "[object Date]" "[object Array]"
- * @param mismatchMsg 如果不匹配，提示的错误信息
- * @returns
- */
+    if (!viewer) {
+      return MUtil.error("\u5B57\u6BB5\u7684\u89C6\u56FE\u5C1A\u672A\u5B9E\u73B0", this.props.schema);
+    }
 
-function generateJsPrototypeValidate(expectType, mismatchMsg) {
-  if (mismatchMsg === void 0) {
-    mismatchMsg = "数据有误，请重填此项";
-  }
+    var props = _objectSpread$x({
+      afterChange: function afterChange() {},
+      changeSchema: function changeSchema() {},
+      changeDatabase: function changeDatabase() {},
+      name: this.props.path
+    }, this.props);
 
-  return function (a, schema, value, path) {
-    if (Object.prototype.toString.call(value) == expectType) {
-      return undefined;
-    } else {
-      return {
-        message: mismatchMsg,
-        path: path
-      };
-    }
+    var ele = /*#__PURE__*/React__default["default"].createElement(viewer, props, null);
+    return jsxRuntime.jsx(MContext.Consumer, {
+      children: function children(ctx) {
+        if (ctx.rootProps.wrapper && _this.props.schema.type !== 'object' && _this.props.schema.type !== 'array') {
+          return ctx.rootProps.wrapper(ele, _this.props.schema);
+        } else {
+          return ele;
+        }
+      }
+    });
   };
-}
-function generateSchemaValidate(valueSchema, mismatchMsg) {
-  return function (a, schema, value, path) {
-    var r = assembly.validate(valueSchema, value, "");
 
-    if (!r) {
-      return r;
-    } else {
-      return {
-        message: mismatchMsg != null ? mismatchMsg : r.message,
-        path: path
-      };
-    }
-  };
-}
-var Validator = {
-  validateRequired: validateRequired$1,
-  validateRequiredNS: validateRequiredNS,
-  validateDateMinMax: validateDateMinMax,
-  validateStringMinMax: validateStringMinMax$1,
-  validateNumberMinMax: validateNumberMinMax,
-  generateRegexValidate: generateRegexValidate$1
-};
+  return MFieldViewer;
+}(React__default["default"].Component);
 
 function _createForOfIteratorHelperLoose$c(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray$c(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
@@ -1559,34 +1940,6 @@ var MEnumType = {
   }
 };
 
-var EmtpyType = {
-  validators: [],
-  createDefaultValue: function createDefaultValue(assembly, s) {
-    if (s.defaultValue) {
-      return ___default["default"].clone(s.defaultValue);
-    } else {
-      return undefined;
-    }
-  },
-  standardValue: function standardValue(assembly, s, v, strict) {
-    return v;
-  },
-  toReadable: function toReadable(assembly, s, vs) {
-    if (___default["default"].isNil(vs)) {
-      return assembly.theme.READABLE_BLANK;
-    }
-
-    return vs;
-  }
-};
-function createDefaultValue(assembly, s) {
-  if (s.defaultValue) {
-    return ___default["default"].clone(s.defaultValue);
-  } else {
-    return undefined;
-  }
-}
-
 var gb2260 = [
 	{
 		value: "110000",
@@ -15091,102 +15444,36 @@ var MGB2260Type = ___default["default"].assign({}, EmtpyType, {
         }
 
         for (var _iterator2 = _createForOfIteratorHelperLoose$b(prv.children), _step2; !(_step2 = _iterator2()).done;) {
-          var city = _step2.value;
-          // @ts-ignore city.value全是数字，ts并不知道
-          var cdiff = code - city.value; // @ts-ignore
-
-          if (cdiff === 0) {
-            return {
-              label: [prv.label, city.label],
-              code: [prv.value, city.value]
-            };
-          } else if (cdiff > 0 && cdiff < 100) {
-            // @ts-ignore
-            for (var _iterator3 = _createForOfIteratorHelperLoose$b((_city$children = city.children) != null ? _city$children : []), _step3; !(_step3 = _iterator3()).done;) {
-              var _city$children;
-
-              var dst = _step3.value;
-
-              // eslint-disable-next-line eqeqeq
-              if (dst.value == code) {
-                return {
-                  label: [prv.label, city.label, dst.label],
-                  code: [prv.value, city.value, dst.value]
-                };
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return undefined;
-  }
-});
-
-var MDateTimeType = ___default["default"].assign({}, EmtpyType, {
-  validators: [validateRequired$1, validateDateMinMax],
-  antConf: function antConf(schema) {
-    var _dataFormat, _dataFormat2, _dataFormat3, _dataFormat4;
-
-    var dataFormat = schema.dataFormat;
-    var readableFormat;
-    var mode;
-    var showTime = false;
-
-    switch (schema.type) {
-      case "year":
-        mode = "year";
-        dataFormat = (_dataFormat = dataFormat) != null ? _dataFormat : 'YYYY';
-        readableFormat = 'YYYY';
-        break;
-
-      case "yearMonth":
-        mode = "month";
-        dataFormat = (_dataFormat2 = dataFormat) != null ? _dataFormat2 : 'YYYYMM';
-        readableFormat = 'YYYY-MM';
-        break;
-
-      case "yearMonthDay":
-        mode = "date";
-        dataFormat = (_dataFormat3 = dataFormat) != null ? _dataFormat3 : 'YYYYMMDD';
-        readableFormat = 'YYYY-MM-DD';
-        break;
-
-      case "datetime":
-        mode = undefined;
-        dataFormat = (_dataFormat4 = dataFormat) != null ? _dataFormat4 : 'x';
-        readableFormat = 'YYYY-MM-DD HH:mm';
-        showTime = true;
-        break;
-      // case "yearAndQuarter":
-      // case "yearAndWeek":
-      //   return MUtil.error(`移动端不支持${this.props.schema.type}`, this.props.schema);
-
-      default:
-        return undefined;
-    }
+          var city = _step2.value;
+          // @ts-ignore city.value全是数字，ts并不知道
+          var cdiff = code - city.value; // @ts-ignore
 
-    return {
-      dataFormat: dataFormat,
-      readableFormat: readableFormat,
-      mode: mode,
-      showTime: showTime
-    };
-  },
-  toReadable: function toReadable(assembly, schema, v) {
-    if (___default["default"].isNil(v)) {
-      return assembly.theme.READABLE_BLANK;
-    }
+          if (cdiff === 0) {
+            return {
+              label: [prv.label, city.label],
+              code: [prv.value, city.value]
+            };
+          } else if (cdiff > 0 && cdiff < 100) {
+            // @ts-ignore
+            for (var _iterator3 = _createForOfIteratorHelperLoose$b((_city$children = city.children) != null ? _city$children : []), _step3; !(_step3 = _iterator3()).done;) {
+              var _city$children;
 
-    var c = MDateTimeType.antConf(schema);
+              var dst = _step3.value;
 
-    if (!c) {
-      return assembly.theme.READABLE_INVALID;
+              // eslint-disable-next-line eqeqeq
+              if (dst.value == code) {
+                return {
+                  label: [prv.label, city.label, dst.label],
+                  code: [prv.value, city.value, dst.value]
+                };
+              }
+            }
+          }
+        }
+      }
     }
 
-    var asMoment = moment__default["default"](v, c.dataFormat);
-    return asMoment.format(c.readableFormat);
+    return undefined;
   }
 });
 
@@ -15841,59 +16128,6 @@ var MObjectType = {
   }
 };
 
-function timeExpr(assembly, v, tillNow, readableFormat) {
-  if (tillNow) {
-    return "至今";
-  }
-
-  if (!v) {
-    return assembly.theme.READABLE_UNKNOWN;
-  }
-
-  return moment__default["default"](v, "x").format(readableFormat);
-}
-
-function timeRangeExpr(assembly, from, to, tillNow, readableFormat) {
-  if (readableFormat === void 0) {
-    readableFormat = "YYYY年MM月DD日";
-  }
-
-  return timeExpr(assembly, from, false, readableFormat) + " ~ " + timeExpr(assembly, to, tillNow, readableFormat);
-}
-var MDateRangeType = ___default["default"].assign({}, EmtpyType, {
-  validators: [validateRequired$1],
-  toReadable: function toReadable(assembly, s, vs) {
-    var _s$dateRange;
-
-    if (___default["default"].isNil(vs)) {
-      return assembly.theme.READABLE_BLANK;
-    }
-
-    if (!___default["default"].isArray(vs)) {
-      return assembly.theme.READABLE_INVALID;
-    }
-
-    return timeRangeExpr(assembly, vs[0], vs[1], vs[2], (_s$dateRange = s.dateRange) != null && _s$dateRange.showTime ? "YYYY年MM月DD日 HH:mm:ss" : "YYYY年MM月DD日");
-  },
-
-  /**
-   * 同toReadable，但数据无效时返回nil
-   * @param assembly
-   * @param s
-   * @param vs
-   * @returns
-   */
-  toReadableN: function toReadableN(assembly, s, vs) {
-    if (!___default["default"].isNil(vs) && ___default["default"].isArray(vs)) {
-      var _s$dateRange2;
-
-      return timeRangeExpr(assembly, vs[0], vs[1], vs[2], (_s$dateRange2 = s.dateRange) != null && _s$dateRange2.showTime ? "YYYY年MM月DD日 HH:mm:ss" : "YYYY年MM月DD日");
-    }
-
-    return undefined;
-  }
-});
-
 function _createForOfIteratorHelperLoose$6(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray$6(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
 function _unsupportedIterableToArray$6(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$6(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$6(o, minLen); }
@@ -16413,6 +16647,23 @@ var ArrayViewer = /*#__PURE__*/function (_BaseViewer) {
 function ownKeys$v(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$v(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$v(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$v(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function toPrecision(mode) {
+  switch (mode) {
+    case "year":
+      return "year";
+
+    case "month":
+      return "month";
+
+    case "date":
+      return "day";
+
+    default:
+      return "minute";
+    // datetime 场景
+  }
+}
 /**
  * 日期选择框
  * 配置示例：
@@ -16424,17 +16675,22 @@ function _objectSpread$v(target) { for (var i = 1; i < arguments.length; i++) {
  * 类型是dateTime时，dataFormat默认是x，例如1608897466955
  */
 
+
 var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](ADatetimePicker, _BaseViewer);
 
-  function ADatetimePicker() {
-    return _BaseViewer.apply(this, arguments) || this;
+  function ADatetimePicker(props) {
+    var _this;
+
+    _this = _BaseViewer.call(this, props) || this;
+    _this.state.pickerVisible = false;
+    return _this;
   }
 
   var _proto = ADatetimePicker.prototype;
 
   _proto.element = function element() {
-    var _this = this,
+    var _this2 = this,
         _this$props$schema$pr;
 
     var antConf = MDateTimeType.antConf(this.props.schema);
@@ -16451,9 +16707,9 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
       if (vv) {
         var vvAsM = ___default["default"].isDate(vv) ? moment__default["default"](vv) : vv;
 
-        _BaseViewer.prototype.changeValue.call(_this, vvAsM.format(antConf.dataFormat));
+        _BaseViewer.prototype.changeValue.call(_this2, vvAsM.format(antConf.dataFormat));
       } else {
-        _BaseViewer.prototype.changeValue.call(_this, undefined);
+        _BaseViewer.prototype.changeValue.call(_this2, undefined);
       }
     };
 
@@ -16461,36 +16717,60 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
 
     if (MUtil.phoneLike()) {
       // 手机
-      return jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$v(_objectSpread$v({
-        disabled: this.props.disable,
-        value: dataAsDate,
-        minDate: this.props.schema.min ? moment__default["default"](this.props.schema.min, antConf.dataFormat).toDate() : undefined,
-        maxDate: this.props.schema.max ? moment__default["default"](this.props.schema.max, antConf.dataFormat).toDate() : undefined,
-        mode: antConf.mode,
-        onChange: onChange
-      }, p), {}, {
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: "backfill",
+          onClick: function onClick() {
+            if (!_this2.props.disable) _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: dataAsDate ? moment__default["default"](dataAsDate).format(antConf.readableFormat) : "请点击选择"
-        })
-      }), this.props.path);
+        }), jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$v({
+          visible: this.state.pickerVisible,
+          value: dataAsDate,
+          min: this.props.schema.min ? moment__default["default"](this.props.schema.min, antConf.dataFormat).toDate() : undefined,
+          max: this.props.schema.max ? moment__default["default"](this.props.schema.max, antConf.dataFormat).toDate() : undefined,
+          precision: toPrecision(antConf.mode),
+          onConfirm: function onConfirm(val) {
+            onChange(val);
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
+      var _antConf$mode;
+
       // 大屏
-      return jsxRuntime.jsx(antd.DatePicker, _objectSpread$v({
-        disabled: this.props.disable,
-        bordered: this.props.hideBorder ? false : true,
-        disabledDate: function disabledDate(m) {
-          var d = _this.props.schema.min && moment__default["default"](_this.props.schema.min, antConf.dataFormat).isAfter(m) || _this.props.schema.max && moment__default["default"](_this.props.schema.max, antConf.dataFormat).isBefore(m);
-          return !!d;
-        },
-        format: antConf.readableFormat,
-        style: this.props.style,
+      // key 中加入 mode 信息，确保精度切换时组件重新挂载
+      var pickerKey = this.props.path + "_" + ((_antConf$mode = antConf.mode) != null ? _antConf$mode : "datetime");
+      return jsxRuntime.jsx(antd.ConfigProvider, {
         locale: zhCN__default["default"],
-        defaultValue: dataAsMoment,
-        showTime: antConf.showTime,
-        picker: antConf.mode,
-        onChange: onChange
-      }, p), this.props.path);
+        children: jsxRuntime.jsx(antd.DatePicker, _objectSpread$v({
+          disabled: this.props.disable,
+          bordered: this.props.hideBorder ? false : true,
+          disabledDate: function disabledDate(m) {
+            var d = _this2.props.schema.min && moment__default["default"](_this2.props.schema.min, antConf.dataFormat).isAfter(m) || _this2.props.schema.max && moment__default["default"](_this2.props.schema.max, antConf.dataFormat).isBefore(m);
+            return !!d;
+          },
+          format: antConf.readableFormat,
+          style: {
+            width: "300px"
+          },
+          defaultValue: dataAsMoment,
+          showTime: antConf.showTime,
+          picker: antConf.mode,
+          onChange: onChange
+        }, p), pickerKey)
+      });
     }
   };
 
@@ -16509,8 +16789,12 @@ function _objectSpread$u(target) { for (var i = 1; i < arguments.length; i++) {
 var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](AGB2260, _BaseViewer);
 
-  function AGB2260() {
-    return _BaseViewer.apply(this, arguments) || this;
+  function AGB2260(props) {
+    var _this;
+
+    _this = _BaseViewer.call(this, props) || this;
+    _this.state.pickerVisible = false;
+    return _this;
   }
 
   var _proto = AGB2260.prototype;
@@ -16518,7 +16802,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
   _proto.element = function element() {
     var _MGB2260Type$lookup,
         _this$props$schema$pr,
-        _this = this;
+        _this2 = this;
 
     var v = _BaseViewer.prototype.getValue.call(this);
 
@@ -16533,26 +16817,34 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
       var _looked$label;
 
       // 手机  
-      return jsxRuntime.jsx(antdMobile.Picker, _objectSpread$u(_objectSpread$u({
-        extra: _BaseViewer.prototype.getPlaceholder.call(this),
-        disabled: this.props.disable,
-        className: "AGB2260",
-        data: MGB2260Type.gb2260,
-        value: looked.code,
-        title: this.props.schema.label,
-        onDismiss: function onDismiss() {
-          return console.log('dismiss');
-        },
-        onOk: function onOk(e) {
-          return _BaseViewer.prototype.changeValue.call(_this, ___default["default"].last(e));
-        }
-      }, p), {}, {
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: "backfill",
           style: this.props.style,
+          onClick: function onClick() {
+            if (!_this2.props.disable) _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: looked == null ? void 0 : (_looked$label = looked.label) == null ? void 0 : _looked$label.join("/")
-        })
-      }), this.props.path);
+        }), jsxRuntime.jsx(antdMobile.Picker, _objectSpread$u({
+          columns: MGB2260Type.gb2260,
+          value: looked.code,
+          visible: this.state.pickerVisible,
+          onConfirm: function onConfirm(e) {
+            _BaseViewer.prototype.changeValue.call(_this2, ___default["default"].last(e));
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
       // PC
       return jsxRuntime.jsx(antd.Cascader, _objectSpread$u({
@@ -16564,7 +16856,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
         style: this.props.style,
         defaultValue: looked.code,
         onChange: function onChange(vv) {
-          _BaseViewer.prototype.changeValue.call(_this, ___default["default"].last(vv));
+          _BaseViewer.prototype.changeValue.call(_this2, ___default["default"].last(vv));
         }
       }, p), this.props.path);
     }
@@ -17393,39 +17685,58 @@ var UnderlineInputBox = /*#__PURE__*/function (_React$Component) {
 var SelectBox = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose__default["default"](SelectBox, _React$Component);
 
-  function SelectBox() {
-    return _React$Component.apply(this, arguments) || this;
+  function SelectBox(props) {
+    var _this;
+
+    _this = _React$Component.call(this, props) || this;
+    _this.state = {
+      pickerVisible: false
+    };
+    return _this;
   }
 
   var _proto = SelectBox.prototype;
 
   _proto.render = function render() {
-    var _this = this;
+    var _this2 = this;
 
     if (MUtil.phoneLike()) {
       var _looked$label;
 
       var looked = this.props.options.find(function (o) {
-        return o.value === _this.props.data;
+        return o.value === _this2.props.data;
       });
       var backfillClass = looked ? "backfill" : "backfill_empty";
-      return jsxRuntime.jsx(antdMobile.Picker, {
-        extra: "\u8BF7\u9009\u62E9(\u53EF\u9009)",
-        cols: 1,
-        data: this.props.options,
-        value: [this.props.data],
-        onOk: function onOk(e) {
-          return _this.props.onChange(___default["default"].last(e));
-        },
-        onDismiss: function onDismiss() {
-          if (_this.props.onBlur) {
-            _this.props.onBlur();
-          }
-        },
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: backfillClass,
+          onClick: function onClick() {
+            return _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: (_looked$label = looked == null ? void 0 : looked.label) != null ? _looked$label : "点击选择"
-        })
+        }), jsxRuntime.jsx(antdMobile.Picker, {
+          columns: [this.props.options],
+          value: [this.props.data],
+          visible: this.state.pickerVisible,
+          onConfirm: function onConfirm(e) {
+            _this2.props.onChange(___default["default"].last(e));
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+
+            if (_this2.props.onBlur) {
+              _this2.props.onBlur();
+            }
+          }
+        })]
       });
     } else {
       return jsxRuntime.jsx(antd.Select, {
@@ -22659,10 +22970,13 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
 
     _this = _Viewer.call(this, p) || this;
     _this._pickerRef = /*#__PURE__*/React__default["default"].createRef();
+    _this._startConfirmed = false; // 标记开始日期是否已确认，用于区分 onClose 是取消还是确认后的自动触发
+
     _this.state = {
       ctrlVersion: 1,
       noValidate: false,
-      mobileDlg: false
+      mobileDlg: false,
+      mobileStep: 'start'
     };
     return _this;
   }
@@ -22725,57 +23039,142 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
         _this$getValue,
         _this2 = this;
 
-    var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
+    (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
     var rangePickerData = this._data2rangePicker((_this$getValue = this.getValue()) != null ? _this$getValue : []);
 
     if (MUtil.phoneLike()) {
-      var _this$props$schema$da3;
+      var _this$props$schema$da3, _this$props$schema$da4;
 
-      var show = MDateRangeType.toReadableN(assembly, this.props.schema, _Viewer.prototype.getValue.call(this));
+      var show = MDateRangeType.toReadableN(assembly, this.props.schema, _Viewer.prototype.getValue.call(this)); // 根据 precision 配置确定移动端 DatePicker 精度（使用扁平化属性 dateRangePrecision）
+
+      var mobilePrecision = this.props.schema.dateRangePrecision || 'day';
       return jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [jsxRuntime.jsxs("div", {
           className: "backfill",
           onClick: function onClick() {
             return _this2.setState({
-              mobileDlg: true
+              mobileDlg: true,
+              mobileStep: 'start'
             });
           },
           children: [" ", show != null ? show : '请点击选择', " "]
-        }), jsxRuntime.jsx(antdMobile.Calendar, _objectSpread$8({
-          visible: this.state.mobileDlg,
-          pickTime: (_this$props$schema$da3 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da3.showTime,
-          minDate: this.props.schema.min ? new Date(this.props.schema.min) : undefined,
-          maxDate: this.props.schema.min ? new Date(this.props.schema.max) : undefined,
-          onCancel: function onCancel() {
-            return _this2.setState({
-              mobileDlg: false
+        }), jsxRuntime.jsx(antdMobile.DatePicker, {
+          visible: this.state.mobileDlg && this.state.mobileStep === 'start',
+          precision: mobilePrecision,
+          title: "\u9009\u62E9\u5F00\u59CB\u65E5\u671F",
+          min: this.props.schema.min ? new Date(this.props.schema.min) : undefined,
+          max: this.props.schema.max ? new Date(this.props.schema.max) : undefined,
+          onConfirm: function onConfirm(val) {
+            _this2._startConfirmed = true;
+
+            _this2.setState({
+              mobileStartDate: val,
+              mobileStep: 'end'
             });
           },
-          onConfirm: function onConfirm(start, end) {
-            _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](start), moment__default["default"](end)], false), true, true);
+          onClose: function onClose() {
+            // antd-mobile v5 确认时会同时触发 onConfirm 和 onClose
+            // 用实例变量同步判断：确认后的 onClose 应忽略，仅用户主动取消时才关闭
+            if (_this2._startConfirmed) {
+              _this2._startConfirmed = false;
+              return;
+            }
 
             _this2.setState({
               mobileDlg: false
             });
           }
-        }, p))]
+        }, "start_" + mobilePrecision), jsxRuntime.jsx(antdMobile.DatePicker, {
+          visible: this.state.mobileDlg && this.state.mobileStep === 'end',
+          precision: mobilePrecision,
+          title: // 如果允许"至今"且开始时间不在未来，在标题区域展示"至今"按钮
+          !((_this$props$schema$da3 = this.props.schema.dateRange) != null && _this$props$schema$da3.hideTillNow) && !((_this$props$schema$da4 = this.props.schema.dateRange) != null && _this$props$schema$da4.showTime) && !(this.state.mobileStartDate && this.state.mobileStartDate > new Date()) ? jsxRuntime.jsxs("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              gap: 12
+            },
+            children: [jsxRuntime.jsx("span", {
+              children: "\u9009\u62E9\u7ED3\u675F\u65E5\u671F"
+            }), jsxRuntime.jsx(antd.Button, {
+              size: "small",
+              type: "primary",
+              onClick: function onClick() {
+                var startDate = _this2.state.mobileStartDate;
+
+                if (startDate) {
+                  _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"]()], true), true, true);
+                }
+
+                _this2.setState({
+                  mobileDlg: false
+                });
+              },
+              children: "\u81F3\u4ECA"
+            })]
+          }) : "选择结束日期",
+          min: this.state.mobileStartDate || (this.props.schema.min ? new Date(this.props.schema.min) : undefined),
+          max: this.props.schema.max ? new Date(this.props.schema.max) : undefined,
+          onConfirm: function onConfirm(val) {
+            var startDate = _this2.state.mobileStartDate;
+
+            if (startDate) {
+              // 防御：结束日期不能早于开始日期
+              var finalEnd = val < startDate ? startDate : val;
+
+              _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"](finalEnd)], false), true, true);
+            }
+
+            _this2.setState({
+              mobileDlg: false
+            });
+          },
+          onClose: function onClose() {
+            // 回退到第一步，让用户可以重新选择开始日期
+            _this2.setState({
+              mobileStep: 'start'
+            });
+          }
+        }, "end_" + mobilePrecision)]
       });
     } else {
-      var _this$props$schema$da4, _this$props$schema$da5, _this$props$schema$da6;
+      var _this$props$schema$da5, _this$props$schema$da6, _this$props$schema$da7;
+
+      // 根据 precision 配置确定 PC 端 picker 模式和 showTime（使用扁平化属性 dateRangePrecision）
+      var precision = this.props.schema.dateRangePrecision;
+      var pcShowTime = precision === 'minute' || ((_this$props$schema$da5 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da5.showTime);
+      var hideFooter = ((_this$props$schema$da6 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da6.hideTillNow) || pcShowTime; // 动态构建额外属性，避免 showTime 和 picker 同时传入导致类型冲突
+
+      var extraProps = {};
+
+      if (precision === 'year') {
+        extraProps.picker = 'year';
+      } else if (precision === 'month') {
+        extraProps.picker = 'month';
+      } else if (pcShowTime) {
+        extraProps.showTime = true;
+      } // 构造元素
 
-      // 构造元素
-      return jsxRuntime.jsx(antd.DatePicker.RangePicker, {
+
+      return jsxRuntime.jsx(antd.DatePicker.RangePicker, _objectSpread$8({
         ref: this._pickerRef,
-        showTime: (_this$props$schema$da4 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da4.showTime,
-        renderExtraFooter: (_this$props$schema$da5 = this.props.schema.dateRange) != null && _this$props$schema$da5.hideTillNow || (_this$props$schema$da6 = this.props.schema.dateRange) != null && _this$props$schema$da6.showTime // TODO 显示时间时，“至今”无法支持
-        ? undefined : function (mode) {
-          return jsxRuntime.jsx("div", _objectSpread$8(_objectSpread$8({
+        renderExtraFooter: hideFooter ? undefined : function (mode) {
+          var _this2$_onCalendarCha;
+
+          // 如果开始时间超过当前时间（未来时间），不展示"至今"按钮
+          var startMoment = (_this2$_onCalendarCha = _this2._onCalendarChangeValue) == null ? void 0 : _this2$_onCalendarCha[0];
+
+          if (startMoment && startMoment.isAfter(moment__default["default"]())) {
+            return null;
+          }
+
+          return jsxRuntime.jsx("div", {
             style: {
               textAlign: "right"
-            }
-          }, p), {}, {
-            children: jsxRuntime.jsx(antdMobile.Button, {
+            },
+            children: jsxRuntime.jsx(antd.Button, {
               size: "small",
               style: {
                 width: "100px",
@@ -22787,13 +23186,13 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
               },
               children: "\u81F3\u4ECA"
             })
-          }));
+          });
         },
         bordered: this.props.hideBorder ? false : true,
         style: {
-          minWidth: "240px"
+          width: "300px"
         },
-        locale: zhCN__default["default"],
+        locale: zhCN__default$1["default"],
         defaultValue: rangePickerData,
         onCalendarChange: function onCalendarChange(d) {
           _this2._onCalendarChangeValue = d;
@@ -22801,7 +23200,7 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
         onChange: function onChange(vv) {
           _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data(vv, false), true, true);
         }
-      }, this.state.ctrlVersion);
+      }, extraProps), this.state.ctrlVersion + "_" + ((_this$props$schema$da7 = this.props.schema.dateRangePrecision) != null ? _this$props$schema$da7 : 'day'));
     }
   };
 
@@ -23866,7 +24265,50 @@ var ACascadePicker = /*#__PURE__*/function (_BaseViewer) {
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
     if (MUtil.phoneLike()) {
-      return jsxRuntime.jsx(jsxRuntime.Fragment, {});
+      var _this$state;
+
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
+          className: "backfill",
+          onClick: function onClick() {
+            return _this.setState({
+              cascadeVisible: true
+            });
+          },
+          children: show.length > 0 ? show.map(function (item) {
+            return item.label || item.value || item;
+          }).join('-') : '请点击选择'
+        }), jsxRuntime.jsx(antdMobile.CascadePicker, _objectSpread$4({
+          options: candidate,
+          value: show.map(function (item) {
+            return item.value || item;
+          }),
+          visible: (_this$state = this.state) == null ? void 0 : _this$state.cascadeVisible,
+          onConfirm: function onConfirm(v) {
+            var vLabel = [];
+            v.forEach(function (item) {
+              candidate.forEach(function (dataItem) {
+                var findItem = findById(dataItem, item, "label", "value", "children");
+
+                if (findItem !== -1) {
+                  vLabel.push(findItem);
+                }
+              });
+            });
+
+            _BaseViewer.prototype.changeValue.call(_this, vLabel);
+
+            _this.setState({
+              cascadeVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this.setState({
+              cascadeVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
       return jsxRuntime.jsx(antd.Cascader, _objectSpread$4({
         options: candidate,
@@ -24514,9 +24956,11 @@ function ensureM3() {
   }
 
   init = true;
+  moment__default["default"].locale('zh-cn');
   assembly.types = ___default["default"].merge(assembly.types, {
     enum: MEnumType,
     gb2260: MGB2260Type,
+    date: MDateTimeType,
     datetime: MDateTimeType,
     year: MDateTimeType,
     yearMonth: MDateTimeType,
@@ -24582,6 +25026,7 @@ function ensureM3() {
     editor: {
       enum: "ASelector",
       gb2260: "AGB2260",
+      date: "ADatetimePicker",
       datetime: "ADatetimePicker",
       year: "ADatetimePicker",
       yearMonth: "ADatetimePicker",
@@ -24610,6 +25055,7 @@ function ensureM3() {
     readable: {
       enum: "DivViewer",
       gb2260: "DivViewer",
+      date: "DivViewer",
       datetime: "DivViewer",
       year: "DivViewer",
       yearMonth: "DivViewer",