form-driver 0.4.20 → 0.4.21

package/lib/m3.js

@@ -202,6 +202,571 @@ 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 defaultTheme = {
+  READABLE_UNKNOWN: "?",
+  READABLE_BLANK: "-",
+  READABLE_INVALID: "❓",
+  READABLE_ERROR: "❗",
+  themeName: "antMiddle"
+};
+/**
+ * 注册viewer，type，morph（viewer和type之间的关联）
+ */
+
+var Assembly = /*#__PURE__*/function () {
+  var _proto = Assembly.prototype;
+
+  /** 根据定义返回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);
+
+      if (___default["default"].isString(viewer)) {
+        return ___default["default"].get(this.viewers, viewer);
+      } else {
+        return viewer;
+      }
+    }
+  };
+
+  _proto.validate = function validate(s, v, path) {
+    if (path === void 0) {
+      path = "";
+    }
+
+    var result = undefined;
+
+    for (var _iterator = _createForOfIteratorHelperLoose$e(this.types[s.type].validators), _step; !(_step = _iterator()).done;) {
+      var validator = _step.value;
+      result = validator(this, s, v, path);
+
+      if (result === "pass" && s.type !== "weight") {
+        return undefined;
+      } else if (typeof result === "object") {
+        MUtil.debug("校验", path, result.message);
+        return result;
+      }
+    }
+
+    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;
+    }
+  }
+  /**
+   * 增加一种数据类型
+   * 例：
+   *  const hpOrg = {name: "hpOrg", type: {validators: ..., toReadable: ...}, editor: HPOrgEditor, readable: "DivViewer"}
+   *  addType(hpOrg)
+   * @param typeParam 类型的描述对象
+   */
+  ;
+
+  _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;
+
+    ___default["default"].set(this.morph, "editor." + name, editor);
+
+    ___default["default"].set(this.morph, "readable." + name, readable);
+  };
+
+  function Assembly() {
+    var _this = this;
+
+    this.types = {};
+    this.viewers = {};
+    this.editors = {};
+    this.morph = {};
+    this.theme = defaultTheme;
+
+    this.toReadable = function (s, v, parent) {
+      var t = _this.types[s.type];
+
+      if (t) {
+        var _r;
+
+        var r;
+
+        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);
+        }
+
+        r = (_r = r) != null ? _r : t.toReadable(_this, s, v);
+
+        if (s.postfix) {
+          r += s.postfix;
+        }
+
+        return r;
+      } else {
+        return s.type + "类型无效";
+      }
+    }; // 校验types是否使用了无效的编辑器名字
+
+
+    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");
+        }
+
+        var viewerName = this.morph[morphName][typeName];
+
+        if (!this.viewers[viewerName]) {
+          throw SyntaxError("\u89C6\u56FE" + viewerName + "\u672A\u5B9A\u4E49");
+        }
+      }
+    }
+  }
+
+  return Assembly;
+}();
+var assembly = new Assembly();
+
+/**
+ * 非空校验，数据不能是null/undefined/""/NaN/[]
+ * 要在其他条件之前，以便required=false时短路掉nil的数据，否则后面的校验全都得处理nil
+ * @param a
+ * @param schema
+ * @param value
+ * @param path
+ * @returns
+ */
+
+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
+      };
+    } // 凡是总有例外
+
+
+    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";
+    }
+  }
+
+  return undefined;
+}
+/** 和validateRequired相同，但不短路 */
+
+function validateRequiredNS(a, schema, value, path) {
+  var v = validateRequired$1(a, schema, value, path);
+
+  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
+      };
+    }
+  }
+
+  if (schema.max) {
+    if (!value || value > schema.max) {
+      return {
+        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u524D\u7684\u65F6\u95F4",
+        path: path
+      };
+    }
+  }
+
+  return undefined;
+}
+/**
+ * 数组项数不超过[min, max]
+ * @param schema
+ * @param value 应该是个数组
+ */
+
+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
+      };
+    }
+  }
+
+  if (schema.max) {
+    if (!value || value.length > schema.max) {
+      return {
+        message: "\u6700\u591A\u9009\u62E9" + schema.max + "\u9879",
+        path: path
+      };
+    }
+  }
+
+  return undefined;
+}
+/**
+ * 字符串长度不超过[min, max]
+ * @param schema
+ * @param value 应该是个字符串
+ */
+
+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
+      };
+    }
+  }
+
+  if (schema.max) {
+    if (value && value.length > schema.max) {
+      return {
+        message: "\u6700\u591A" + schema.max + "\u4E2A\u5B57",
+        path: path
+      };
+    }
+  }
+
+  return undefined;
+}
+/**
+ * 数字不超过[min, max]
+ * @param schema
+ * @param value 应该是个数字
+ */
+
+function validateNumberMinMax(a, schema, value, path) {
+  var temp = Number(value);
+
+  if (!___default["default"].isNil(schema.max)) {
+    if (!___default["default"].isFinite(temp) || temp > schema.max) {
+      return {
+        message: "\u6700\u591A" + schema.max,
+        path: path
+      };
+    }
+  }
+
+  if (!___default["default"].isNil(schema.min)) {
+    if (!___default["default"].isFinite(temp) || temp < schema.min) {
+      return {
+        message: "\u6700\u5C11" + schema.min,
+        path: path
+      };
+    }
+  }
+
+  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
+      };
+    }
+
+    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
+ */
+
+function generateJsPrototypeValidate(expectType, mismatchMsg) {
+  if (mismatchMsg === void 0) {
+    mismatchMsg = "数据有误，请重填此项";
+  }
+
+  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 (!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
+};
+
+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 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;
+
+    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 "date":
+        switch (schema.datePrecision) {
+          case "year":
+            mode = "year";
+            dataFormat = (_dataFormat5 = dataFormat) != null ? _dataFormat5 : "YYYY";
+            readableFormat = "YYYY";
+            break;
+
+          case "month":
+            mode = "month";
+            dataFormat = (_dataFormat6 = dataFormat) != null ? _dataFormat6 : "YYYYMM";
+            readableFormat = "YYYY.MM";
+            break;
+
+          case "minute":
+            mode = undefined;
+            dataFormat = (_dataFormat7 = dataFormat) != null ? _dataFormat7 : "x";
+            readableFormat = "YYYY.MM.DD HH:mm";
+            showTime = true;
+            break;
+
+          default:
+            // "day" 或未指定
+            mode = "date";
+            dataFormat = (_dataFormat8 = dataFormat) != null ? _dataFormat8 : "YYYYMMDD";
+            readableFormat = "YYYY.MM.DD";
+            break;
+        }
+
+        break;
+      // case "yearAndQuarter":
+      // case "yearAndWeek":
+      //   return MUtil.error(`移动端不支持${this.props.schema.type}`, this.props.schema);
+
+      default:
+        return undefined;
+    }
+
+    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;
+    }
+
+    var c = MDateTimeType.antConf(schema);
+
+    if (!c) {
+      return assembly.theme.READABLE_INVALID;
+    }
+
+    var asMoment = moment__default["default"](v, c.dataFormat);
+    return asMoment.format(c.readableFormat);
+  }
+});
+
+/** 根据 precision 获取可读格式 */
+
+function getReadableFormat(precision, showTime) {
+  switch (precision) {
+    case "year":
+      return "YYYY";
+
+    case "month":
+      return "YYYY.MM";
+
+    case "minute":
+      return "YYYY.MM.DD HH:mm";
+
+    default:
+      return showTime ? "YYYY.MM.DD HH:mm:ss" : "YYYY.MM.DD";
+  }
+}
+
+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;
+    }
+
+    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);
+  },
+
+  /**
+   * 同toReadable，但数据无效时返回nil
+   */
+  toReadableN: function toReadableN(assembly, s, vs) {
+    if (!___default["default"].isNil(vs) && ___default["default"].isArray(vs)) {
+      var _s$dateRange2;
+
+      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);
+    }
+
+    return undefined;
+  }
+});
+
+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."); }
+
+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); }
+
+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;
 
@@ -368,12 +933,12 @@ var MUtil = {
 
     var r = {};
 
-    for (var _iterator = _createForOfIteratorHelperLoose$e((_spec$segments = spec.segments) != null ? _spec$segments : []), _step; !(_step = _iterator()).done;) {
+    for (var _iterator = _createForOfIteratorHelperLoose$d((_spec$segments = spec.segments) != null ? _spec$segments : []), _step; !(_step = _iterator()).done;) {
       var _spec$segments;
 
       var s = _step.value;
 
-      for (var _iterator2 = _createForOfIteratorHelperLoose$e((_s$fields = s.fields) != null ? _s$fields : []), _step2; !(_step2 = _iterator2()).done;) {
+      for (var _iterator2 = _createForOfIteratorHelperLoose$d((_s$fields = s.fields) != null ? _s$fields : []), _step2; !(_step2 = _iterator2()).done;) {
         var _s$fields;
 
         var f = _step2.value;
@@ -440,7 +1005,7 @@ var MUtil = {
   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;) {
+      for (var _iterator3 = _createForOfIteratorHelperLoose$d((_schema$objectFields = schema.objectFields) != null ? _schema$objectFields : []), _step3; !(_step3 = _iterator3()).done;) {
         var _schema$objectFields;
 
         var f = _step3.value;
@@ -492,7 +1057,7 @@ var MUtil = {
 
     var showIfScript = "let {" + l1fields.join(",") + "} = data || {};\nlet hide = {";
 
-    for (var _iterator4 = _createForOfIteratorHelperLoose$e(objectFields), _step4; !(_step4 = _iterator4()).done;) {
+    for (var _iterator4 = _createForOfIteratorHelperLoose$d(objectFields), _step4; !(_step4 = _iterator4()).done;) {
       var f = _step4.value;
 
       if (f.showIf) {
@@ -500,7 +1065,7 @@ var MUtil = {
       }
     }
 
-    for (var _iterator5 = _createForOfIteratorHelperLoose$e((_uispec$segments = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments : []), _step5; !(_step5 = _iterator5()).done;) {
+    for (var _iterator5 = _createForOfIteratorHelperLoose$d((_uispec$segments = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments : []), _step5; !(_step5 = _iterator5()).done;) {
       var _uispec$segments;
 
       var s = _step5.value;
@@ -512,7 +1077,7 @@ var MUtil = {
 
     showIfScript += "}\n"; // 如果一个segment里的所有字段都隐藏，segment就要隐藏
 
-    for (var _iterator6 = _createForOfIteratorHelperLoose$e((_uispec$segments2 = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments2 : []), _step6; !(_step6 = _iterator6()).done;) {
+    for (var _iterator6 = _createForOfIteratorHelperLoose$d((_uispec$segments2 = uispec == null ? void 0 : uispec.segments) != null ? _uispec$segments2 : []), _step6; !(_step6 = _iterator6()).done;) {
       var _uispec$segments2;
 
       var _s = _step6.value;
@@ -581,7 +1146,7 @@ var MUtil = {
       var score = 0;
       var opts = MUtil.standardFields(f.setFields);
 
-      for (var _iterator7 = _createForOfIteratorHelperLoose$e(opts), _step7; !(_step7 = _iterator7()).done;) {
+      for (var _iterator7 = _createForOfIteratorHelperLoose$d(opts), _step7; !(_step7 = _iterator7()).done;) {
         var s = _step7.value;
 
         if (___default["default"].find(opts, {
@@ -636,7 +1201,7 @@ var MUtil = {
 
       var prevSize = Object.keys(dep).length;
 
-      for (var _iterator8 = _createForOfIteratorHelperLoose$e(newDepNames), _step8; !(_step8 = _iterator8()).done;) {
+      for (var _iterator8 = _createForOfIteratorHelperLoose$d(newDepNames), _step8; !(_step8 = _iterator8()).done;) {
         var n = _step8.value;
         dep[n] = allFieldsIdx[n];
         delete ndep[n];
@@ -693,788 +1258,602 @@ var MUtil = {
       };
     }
 
-    if (template === void 0) {
-      template = {};
-    }
-
-    switch (e.type) {
-      case "string":
-        if (e.enum) {
-          var _base$enumFields;
-
-          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;
-    }
-
-    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;
-  },
-
-  /** 啥也不干的空回调 */
-  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;
-        }), "字段名有重复");
+    if (template === void 0) {
+      template = {};
+    }
 
-        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)));
+    switch (e.type) {
+      case "string":
+        if (e.enum) {
+          var _base$enumFields;
+
+          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;
         }
 
-        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;
-            }), "分段文案有重复");
+        break;
 
-            var fieldsInSegments = ___default["default"].flatten(s.uispec.segments.map(function (f) {
-              return f.fields;
-            }));
+      case "number":
+      case "integer":
+        base.type = "int";
+        break;
 
-            checkDup(fieldsInSegments, "分段字段有重复");
-            var fields = s.objectFields.map(function (f) {
-              return f.name;
-            });
-            checkDup(fields, "字段名有重复");
+      case "object":
+        base.type = "object";
+        base.objectFields = [];
+        base.uispec = {
+          type: "flowForm",
+          layout: MUtil.phoneLike() ? "vertical" : "horizontal",
+          comma: "："
+        };
 
-            var notInSegment = ___default["default"].difference(fields, fieldsInSegments);
+        for (var key in e.properties) {
+          var jsmField = e.properties[key];
 
-            if (notInSegment.length > 0) {
-              error("字段" + notInSegment.join(",") + "未体现在分段中");
-            }
+          var m3Field = ___default["default"].assign({}, template, {
+            name: key,
+            label: key,
+            type: "object"
+          });
 
-            var fieldNotExist = ___default["default"].difference(fieldsInSegments, fields);
+          if (!___default["default"].isBoolean(jsmField)) {
+            var _jsmField$title;
 
-            if (fieldNotExist.length > 0) {
-              error("分段字段名无效：" + notInSegment.join(","));
-            }
+            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();
           }
         }
-      }
-    }
 
-    return result;
-  },
+        break;
 
-  /**
-   * 参考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();
-  },
+      case "array":
+        base.type = "array";
+        base.arrayMember = {
+          label: "",
+          type: "array"
+        };
 
-  /**
-   * 执行表达式或者回调函数
-   * @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 (___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";
+        }
 
-    if (_this === void 0) {
-      _this = undefined;
-    }
+        break;
 
-    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;
+      case "null":
+      case "any":
+      case "boolean":
+      default:
+        base.type = "不支持的json schema：array.items是" + e.type;
+        break;
     }
+
+    return base;
   },
 
   /**
-   * 读取url参数，转换成map
-   * @param hashPrefix nil表示不读取hash里的参数，字符串表示读取hash里的参数，并加上这个前缀返回。默认是返回，但前缀是空字符串
+   * 修改一个对象里的key
+   * @param object 要修改的对象，
+   * @param renameTo
+   * @param removeNotExistKey 是否在结果里面去除renameTo里不存在的key
+   * @returns 返回一个改过key名字的新对象
    */
-  getQuery: function getQuery(hashPrefix) {
+  renameKey: function renameKey(object, renameTo, removeNotExistKey) {
+    if (removeNotExistKey === void 0) {
+      removeNotExistKey = false;
+    }
 
-    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;
+    for (var oldKey in object) {
+      var newKey = renameTo[oldKey];
 
-    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);
-  },
+      if (!newKey) {
+        if (removeNotExistKey) {
+          continue;
+        } else {
+          newKey = oldKey;
+        }
+      }
 
-  /**
-   * escape数值
-   * @param str - 字符串
-   * @returns 会带上引号，类似"abc"，str=nil时会返回""
-   */
-  escapeCsv: function escapeCsv(str) {
-    if (!___default["default"].isString(str)) {
-      str = ___default["default"].toString(str);
+      result[newKey] = object[oldKey];
     }
 
-    return '"' + str.replace(/["]/g, '""') + '"';
+    return result;
   },
 
   /**
-   * 判断两个值是否相同
-   * @param v1 一个值
-   * @param v2 另一个值
-   * @param tolerate true用==判断，false用===判断
+   * 提交时将时间字段转换为可读格式
+   * @param schema 表单 schema（type 为 object 的根 schema）
+   * @param database 表单数据
+   * @returns 深拷贝后转换过的数据
    */
-  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 (___default["default"].isArray(ca)) {
-      return ca.indexOf(d);
-    } else {
-      return ca === d ? 0 : -1;
+  formatForExport: function formatForExport(schema, database) {
+    if (___default["default"].isNil(database)) {
+      return database;
     }
-  }
-};
-
-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."); }
-
-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); }
 
-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之间的关联）
- */
+    var result = ___default["default"].cloneDeep(database);
 
-var Assembly = /*#__PURE__*/function () {
-  var _proto = Assembly.prototype;
+    var fields = schema.objectFields;
 
-  /** 根据定义返回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);
+    if (!fields) {
+      return result;
+    }
 
-      if (___default["default"].isString(viewer)) {
-        return ___default["default"].get(this.viewers, viewer);
-      } else {
-        return viewer;
+    var _loop = function _loop() {
+      var field = _step9.value;
+      var value = result[field.name];
+
+      if (___default["default"].isNil(value)) {
+        return "continue";
       }
-    }
-  };
 
-  _proto.validate = function validate(s, v, path) {
-    if (path === void 0) {
-      path = "";
-    }
+      var type = field.type; // 时间选择器
 
-    var result = undefined;
+      if (type === "year" || type === "yearMonth" || type === "yearMonthDay" || type === "datetime" || type === "date") {
+        var antConf = MDateTimeType.antConf(field);
 
-    for (var _iterator = _createForOfIteratorHelperLoose$d(this.types[s.type].validators), _step; !(_step = _iterator()).done;) {
-      var validator = _step.value;
-      result = validator(this, s, v, path);
+        if (antConf) {
+          var m = moment__default["default"](value, antConf.dataFormat);
 
-      if (result === "pass" && s.type !== "weight") {
-        return undefined;
-      } else if (typeof result === "object") {
-        MUtil.debug("校验", path, result.message);
-        return result;
+          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);
+          });
+        }
       }
-    }
+    };
 
-    return undefined;
-  };
+    for (var _iterator9 = _createForOfIteratorHelperLoose$d(fields), _step9; !(_step9 = _iterator9()).done;) {
+      var _ret = _loop();
 
-  _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;
+      if (_ret === "continue") continue;
     }
-  };
 
-  _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;
-    }
-  }
+    return result;
+  },
+
   /**
-   * 增加一种数据类型
-   * 例：
-   *  const hpOrg = {name: "hpOrg", type: {validators: ..., toReadable: ...}, editor: HPOrgEditor, readable: "DivViewer"}
-   *  addType(hpOrg)
-   * @param typeParam 类型的描述对象
+   * 回填时将可读格式的时间字段反解析为内部格式
+   * @param schema 表单 schema（type 为 object 的根 schema）
+   * @param database 可读格式的数据
+   * @returns 深拷贝后反解析过的数据
    */
-  ;
+  parseFromExport: function parseFromExport(schema, database) {
+    if (___default["default"].isNil(database)) {
+      return database;
+    }
 
-  _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 result = ___default["default"].cloneDeep(database);
 
-    ___default["default"].set(this.morph, "editor." + name, editor);
+    var fields = schema.objectFields;
 
-    ___default["default"].set(this.morph, "readable." + name, readable);
-  };
+    if (!fields) {
+      return result;
+    }
 
-  function Assembly() {
-    var _this = this;
+    var _loop2 = function _loop2() {
+      var field = _step10.value;
+      var value = result[field.name];
 
-    this.types = {};
-    this.viewers = {};
-    this.editors = {};
-    this.morph = {};
-    this.theme = defaultTheme;
+      if (___default["default"].isNil(value)) {
+        return "continue";
+      }
 
-    this.toReadable = function (s, v, parent) {
-      var t = _this.types[s.type];
+      var type = field.type; // 时间选择器
 
-      if (t) {
-        var _r;
+      if (type === "year" || type === "yearMonth" || type === "yearMonthDay" || type === "datetime" || type === "date") {
+        var antConf = MDateTimeType.antConf(field);
 
-        var r;
+        if (antConf && ___default["default"].isString(value)) {
+          var m = moment__default["default"](value, antConf.readableFormat);
 
-        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);
+          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);
+            }
+          }
 
-        r = (_r = r) != null ? _r : t.toReadable(_this, s, v);
+          if (endStr === "至今") {
+            tillNow = true;
+          } else if (endStr) {
+            var _m4 = moment__default["default"](endStr, fmt);
 
-        if (s.postfix) {
-          r += s.postfix;
-        }
+            if (_m4.isValid()) {
+              end = _m4.format(dataFormat);
+            }
+          }
 
-        return r;
-      } else {
-        return s.type + "类型无效";
+          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);
+          });
+        }
       }
-    }; // 校验types是否使用了无效的编辑器名字
+    };
 
+    for (var _iterator10 = _createForOfIteratorHelperLoose$d(fields), _step10; !(_step10 = _iterator10()).done;) {
+      var _ret2 = _loop2();
 
-    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");
-        }
+      if (_ret2 === "continue") continue;
+    }
 
-        var viewerName = this.morph[morphName][typeName];
+    return result;
+  },
 
-        if (!this.viewers[viewerName]) {
-          throw SyntaxError("\u89C6\u56FE" + viewerName + "\u672A\u5B9A\u4E49");
-        }
-      }
-    }
-  }
+  /** 啥也不干的空回调 */
+  doNothing: function doNothing() {},
 
-  return Assembly;
-}();
-var assembly = new Assembly();
+  /**
+   * 去掉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];
+    }
 
-var MContext = /*#__PURE__*/React__default["default"].createContext(undefined);
+    return ___default["default"].compact(arr).join(".");
+  },
 
-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; }
+  /**
+   * 获取一个json path的父path。
+   * @param path 如果path是空的返回也是空的
+   */
+  parentPath: function parentPath(path) {
+    var split = path.replace(/]/g, "").split(/[.\\[]/);
+    split.splice(-1, 1);
+    return split.join(".");
+  },
 
-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; }
-/**
- * 一个字段的视图
- */
+  /**
+   * 校验一个schema
+   * @param s 要校验的schema
+   * @returns 空数组表示校验通过，否则返回校验错误信息
+   */
+  validateSchema: function validateSchema(s, parentPath) {
+    var result = [];
 
-var MFieldViewer = /*#__PURE__*/function (_React$Component) {
-  _inheritsLoose__default["default"](MFieldViewer, _React$Component);
+    var error = function error(msg) {
+      return result.push({
+        message: msg,
+        path: MUtil.jsonPath(parentPath, s.name)
+      });
+    };
 
-  function MFieldViewer() {
-    return _React$Component.apply(this, arguments) || this;
-  }
+    var checkDup = function checkDup(a, msgIfFail) {
+      if (___default["default"].uniq(a).length !== a.length) {
+        error(msgIfFail);
+      }
+    };
 
-  var _proto = MFieldViewer.prototype;
+    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 + "文案有重复");
+    };
 
-  _proto.render = function render() {
-    var _this = this;
+    var stringOnlyEnum = function stringOnlyEnum(candidate) {
+      var ns = MUtil.standardFields(candidate).find(function (f) {
+        return !___default["default"].isString(f.value);
+      });
 
-    var viewer = assembly.getViewerOf(this.props.schema, this.props.morph); // console.log('MFieldViewer.viewer', viewer);
+      if (ns) {
+        error("暂不支持的选项数据类型：" + JSON.stringify(ns) + ": " + typeof ns);
+      }
+    };
 
-    if (!viewer) {
-      return MUtil.error("\u5B57\u6BB5\u7684\u89C6\u56FE\u5C1A\u672A\u5B9E\u73B0", this.props.schema);
-    }
+    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;
 
-    var props = _objectSpread$x({
-      afterChange: function afterChange() {},
-      changeSchema: function changeSchema() {},
-      changeDatabase: function changeDatabase() {},
-      name: this.props.path
-    }, this.props);
+        checkDup(s.objectFields.filter(function (f) {
+          return f.type !== "decoration";
+        }).map(function (f) {
+          return f.name;
+        }), "字段名有重复");
 
-    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 _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)));
         }
-      }
-    });
-  };
 
-  return MFieldViewer;
-}(React__default["default"].Component);
+        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;
+            }), "分段文案有重复");
 
-/**
- * 非空校验，数据不能是null/undefined/""/NaN/[]
- * 要在其他条件之前，以便required=false时短路掉nil的数据，否则后面的校验全都得处理nil
- * @param a
- * @param schema
- * @param value
- * @param path
- * @returns
- */
+            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, "字段名有重复");
 
-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
-      };
-    } // 凡是总有例外
+            var notInSegment = ___default["default"].difference(fields, fieldsInSegments);
 
+            if (notInSegment.length > 0) {
+              error("字段" + notInSegment.join(",") + "未体现在分段中");
+            }
 
-    if (schema.type === "set" && schema.openOption) {
-      if (value.length === 1 && !value[0]) {
-        return {
-          message: "您还没有填完这一项",
-          path: path
-        }; // 开放set，只勾了开放选项，没有填内容，也要算空
+            var fieldNotExist = ___default["default"].difference(fieldsInSegments, fields);
+
+            if (fieldNotExist.length > 0) {
+              error("分段字段名无效：" + notInSegment.join(","));
+            }
+          }
+        }
       }
     }
-  } else {
-    if (___default["default"].isNil(value)) {
-      return "pass";
-    }
-  }
 
-  return undefined;
-}
-/** 和validateRequired相同，但不短路 */
+    return result;
+  },
 
-function validateRequiredNS(a, schema, value, path) {
-  var v = validateRequired$1(a, schema, value, path);
+  /**
+   * 参考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();
+  },
 
-  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
-      };
+  /**
+   * 执行表达式或者回调函数
+   * @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 (schema.max) {
-    if (!value || value > schema.max) {
-      return {
-        message: "\u8BF7\u9009\u62E9" + schema.min + "\u4E4B\u524D\u7684\u65F6\u95F4",
-        path: path
-      };
+    if (_this === void 0) {
+      _this = undefined;
     }
-  }
 
-  return undefined;
-}
-/**
- * 数组项数不超过[min, max]
- * @param schema
- * @param value 应该是个数组
- */
-
-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
-      };
+    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;
     }
-  }
+  },
 
-  if (schema.max) {
-    if (!value || value.length > schema.max) {
-      return {
-        message: "\u6700\u591A\u9009\u62E9" + schema.max + "\u9879",
-        path: path
-      };
-    }
-  }
+  /**
+   * 读取url参数，转换成map
+   * @param hashPrefix nil表示不读取hash里的参数，字符串表示读取hash里的参数，并加上这个前缀返回。默认是返回，但前缀是空字符串
+   */
+  getQuery: function getQuery(hashPrefix) {
 
-  return undefined;
-}
-/**
- * 字符串长度不超过[min, max]
- * @param schema
- * @param value 应该是个字符串
- */
+    var arrs = [].concat(window.location.search.split(/[?&]/), window.location.hash.split(/[#?&]/));
+    var result = {};
+    arrs.forEach(function (item) {
+      var kv = item.split(/=/);
 
-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
-      };
-    }
-  }
+      if (kv.length <= 2 && kv[0]) {
+        result[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+      }
+    });
+    return result;
+  },
 
-  if (schema.max) {
-    if (value && value.length > schema.max) {
-      return {
-        message: "\u6700\u591A" + schema.max + "\u4E2A\u5B57",
-        path: path
-      };
-    }
-  }
+  /**
+   * 动态创建一个CSS样式
+   * @param css css内容，会被写进style标签里
+   * @param id <style>的id，可以没有。如果已经存在，会被覆盖掉。
+   */
+  setCss: function setCss(css, id) {
+    var _document$getElementB;
 
-  return undefined;
-}
-/**
- * 数字不超过[min, max]
- * @param schema
- * @param value 应该是个数字
- */
+    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);
+  },
 
-function validateNumberMinMax(a, schema, value, path) {
-  var temp = Number(value);
+  /**
+   * escape数值
+   * @param str - 字符串
+   * @returns 会带上引号，类似"abc"，str=nil时会返回""
+   */
+  escapeCsv: function escapeCsv(str) {
+    if (!___default["default"].isString(str)) {
+      str = ___default["default"].toString(str);
+    }
 
-  if (!___default["default"].isNil(schema.max)) {
-    if (!___default["default"].isFinite(temp) || temp > schema.max) {
-      return {
-        message: "\u6700\u591A" + schema.max,
-        path: path
-      };
+    return '"' + str.replace(/["]/g, '""') + '"';
+  },
+
+  /**
+   * 判断两个值是否相同
+   * @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 (!___default["default"].isNil(schema.min)) {
-    if (!___default["default"].isFinite(temp) || temp < schema.min) {
-      return {
-        message: "\u6700\u5C11" + schema.min,
-        path: path
-      };
+    if (___default["default"].isArray(ca)) {
+      return ca.indexOf(d);
+    } else {
+      return ca === d ? 0 : -1;
     }
   }
+};
 
-  return undefined;
-}
-function generateRegexValidate$1(regex, mismatchMsg) {
-  return function (a, schema, value, path) {
-    var asstr = ___default["default"].toString(value);
+var MContext = /*#__PURE__*/React__default["default"].createContext(undefined);
 
-    if (!regex.test(asstr)) {
-      return {
-        message: mismatchMsg,
-        path: path
-      };
-    }
+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; }
 
-    return undefined;
-  };
-}
+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; }
 /**
- * 数据用Object.prototype.toString.call返回的类型是预期的
- * 可以用Object.prototype.toString.call(<预期的类型>)来查看你想要的数据类型的expectType
- * @param expectType 预期类型，例如："[object Object]" "[object Null]" "[object Number]" "[object Date]" "[object Array]"
- * @param mismatchMsg 如果不匹配，提示的错误信息
- * @returns
+ * 一个字段的视图
  */
 
-function generateJsPrototypeValidate(expectType, mismatchMsg) {
-  if (mismatchMsg === void 0) {
-    mismatchMsg = "数据有误，请重填此项";
+var MFieldViewer = /*#__PURE__*/function (_React$Component) {
+  _inheritsLoose__default["default"](MFieldViewer, _React$Component);
+
+  function MFieldViewer() {
+    return _React$Component.apply(this, arguments) || this;
   }
 
-  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, "");
+  var _proto = MFieldViewer.prototype;
+
+  _proto.render = function render() {
+    var _this = this;
+
+    var viewer = assembly.getViewerOf(this.props.schema, this.props.morph); // console.log('MFieldViewer.viewer', viewer);
 
-    if (!r) {
-      return r;
-    } else {
-      return {
-        message: mismatchMsg != null ? mismatchMsg : r.message,
-        path: path
-      };
+    if (!viewer) {
+      return MUtil.error("\u5B57\u6BB5\u7684\u89C6\u56FE\u5C1A\u672A\u5B9E\u73B0", this.props.schema);
     }
+
+    var props = _objectSpread$x({
+      afterChange: function afterChange() {},
+      changeSchema: function changeSchema() {},
+      changeDatabase: function changeDatabase() {},
+      name: this.props.path
+    }, this.props);
+
+    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;
+        }
+      }
+    });
   };
-}
-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."); }
 
@@ -1561,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",
@@ -15126,103 +15477,6 @@ var MGB2260Type = ___default["default"].assign({}, EmtpyType, {
   }
 });
 
-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;
-
-    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 "date":
-        switch (schema.datePrecision) {
-          case "year":
-            mode = "year";
-            dataFormat = (_dataFormat5 = dataFormat) != null ? _dataFormat5 : "YYYY";
-            readableFormat = "YYYY";
-            break;
-
-          case "month":
-            mode = "month";
-            dataFormat = (_dataFormat6 = dataFormat) != null ? _dataFormat6 : "YYYYMM";
-            readableFormat = "YYYY-MM";
-            break;
-
-          case "minute":
-            mode = undefined;
-            dataFormat = (_dataFormat7 = dataFormat) != null ? _dataFormat7 : "x";
-            readableFormat = "YYYY-MM-DD HH:mm";
-            showTime = true;
-            break;
-
-          default:
-            // "day" 或未指定
-            mode = "date";
-            dataFormat = (_dataFormat8 = dataFormat) != null ? _dataFormat8 : "YYYYMMDD";
-            readableFormat = "YYYY-MM-DD";
-            break;
-        }
-
-        break;
-      // case "yearAndQuarter":
-      // case "yearAndWeek":
-      //   return MUtil.error(`移动端不支持${this.props.schema.type}`, this.props.schema);
-
-      default:
-        return undefined;
-    }
-
-    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;
-    }
-
-    var c = MDateTimeType.antConf(schema);
-
-    if (!c) {
-      return assembly.theme.READABLE_INVALID;
-    }
-
-    var asMoment = moment__default["default"](v, c.dataFormat);
-    return asMoment.format(c.readableFormat);
-  }
-});
-
 function _createForOfIteratorHelperLoose$a(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$a(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$a(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$a(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$a(o, minLen); }
@@ -15874,75 +16128,6 @@ var MObjectType = {
   }
 };
 
-/** 根据 precision 获取可读格式 */
-
-function getReadableFormat(precision, showTime) {
-  switch (precision) {
-    case "year":
-      return "YYYY年";
-
-    case "month":
-      return "YYYY年MM月";
-
-    case "minute":
-      return "YYYY年MM月DD日 HH:mm";
-
-    default:
-      return showTime ? "YYYY年MM月DD日 HH:mm:ss" : "YYYY年MM月DD日";
-  }
-}
-
-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;
-    }
-
-    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);
-  },
-
-  /**
-   * 同toReadable，但数据无效时返回nil
-   */
-  toReadableN: function toReadableN(assembly, s, vs) {
-    if (!___default["default"].isNil(vs) && ___default["default"].isArray(vs)) {
-      var _s$dateRange2;
-
-      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);
-    }
-
-    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); }
@@ -22903,25 +23088,43 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
         }, "start_" + mobilePrecision), jsxRuntime.jsx(antdMobile.DatePicker, {
           visible: this.state.mobileDlg && this.state.mobileStep === 'end',
           precision: mobilePrecision,
-          title: "\u9009\u62E9\u7ED3\u675F\u65E5\u671F",
-          tillNow: !((_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),
+          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 isTillNow = !!val.tillNow;
-
-              if (isTillNow) {
-                // 用户选择了"至今"
-                _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"]()], true), true, true);
-              } else {
-                // 防御：结束日期不能早于开始日期
-                var finalEnd = val < startDate ? startDate : val;
+              // 防御：结束日期不能早于开始日期
+              var finalEnd = val < startDate ? startDate : val;
 
-                _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"](finalEnd)], false), true, true);
-              }
+              _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"](finalEnd)], false), true, true);
             }
 
             _this2.setState({
@@ -22958,6 +23161,15 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
       return jsxRuntime.jsx(antd.DatePicker.RangePicker, _objectSpread$8({
         ref: this._pickerRef,
         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"