form-driver 0.4.20 → 0.4.22

package/lib/m3.js

@@ -17,7 +17,9 @@ var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitializ
 var icons = require('@ant-design/icons');
 var TextArea = require('antd/lib/input/TextArea');
 var Select = require('antd/lib/select');
-var adapter = require('@atlaskit/pragmatic-drag-and-drop/element/adapter');
+var core = require('@dnd-kit/core');
+var sortable = require('@dnd-kit/sortable');
+var utilities = require('@dnd-kit/utilities');
 var clsx = require('clsx');
 var Button = require('antd/lib/button');
 var _objectWithoutPropertiesLoose = require('@babel/runtime/helpers/objectWithoutPropertiesLoose');
@@ -49,9 +51,9 @@ var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
 var OSS__default = /*#__PURE__*/_interopDefaultLegacy(OSS);
 
-function ownKeys$y(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 ownKeys$z(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$y(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$y(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$y(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$z(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$z(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$z(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function generateQueryStr(obj) {
   if (obj === void 0) {
@@ -85,7 +87,7 @@ var Ajax = {
     var args = {
       method: method,
       body: JSON.stringify(body),
-      headers: _objectSpread$y({
+      headers: _objectSpread$z({
         'Content-Type': 'application/json'
       }, headers)
     };
@@ -202,197 +204,762 @@ 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一样，除了：
+        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;
+
+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;
+
+    if (___default["default"].isArray(f.option)) {
+      result = f.option;
+    } else {
+      var ori;
+
+      if (f.type == "set") {
+        ori = f.setFields;
+      } else if (f.type == "enum") {
+        ori = f.enumFields;
+      } else {
+        var _ref, _f$option;
+
+        ori = (_ref = (_f$option = f.option) != null ? _f$option : f.setFields) != null ? _ref : f.enumFields; // 只是为了保险
+      }
+
+      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]
+          };
+        });
+      } else {
+        f.option = result = ori; // TODO children 可能有递归的，还是得靠预处理解决
+      }
+    }
+
+    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;
+    }
+
+    return Math.sign(v);
+  },
+
+  /**
+   * 当前设备是不是个手机（或者类似手机的设备，比如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;
+  // }
+
+  /**
+   * 计算文字的宽度
+   * @param text
+   */
+  antdTextWidth: function antdTextWidth(text) {
+    if (!text) {
+      return 0;
+    }
+
+    return text.length * 16;
+  },
+
+  /**
+   * 从数组中删掉一个元素
+   * @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 a;
+    }
+  },
+  fieldOfLayout: function fieldOfLayout(fields, spec) {
+    var objectFieldMap = ___default["default"].chain(fields).keyBy("name").value();
+
+    var r = {};
+
+    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$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 ___default["default"].values(r);
+  },
+
+  /**
+   * 跟lodash的get一样，除了：
    * 1. path是nil时返回undefined
    * 2. path是""时返回原始对象
    * @param a
@@ -440,7 +1007,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 +1059,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 +1067,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 +1079,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 +1148,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 +1203,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];
@@ -813,6 +1380,191 @@ var MUtil = {
     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() {},
 
@@ -900,8 +1652,8 @@ var MUtil = {
           return f.name;
         }), "字段名有重复");
 
-        for (var _iterator9 = _createForOfIteratorHelperLoose$e(s.objectFields), _step9; !(_step9 = _iterator9()).done;) {
-          var f = _step9.value;
+        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)));
         }
 
@@ -1019,209 +1771,48 @@ var MUtil = {
    * escape数值
    * @param str - 字符串
    * @returns 会带上引号，类似"abc"，str=nil时会返回""
-   */
-  escapeCsv: function escapeCsv(str) {
-    if (!___default["default"].isString(str)) {
-      str = ___default["default"].toString(str);
-    }
-
-    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"].isArray(ca)) {
-      return ca.indexOf(d);
-    } else {
-      return ca === d ? 0 : -1;
-    }
-  }
-};
-
-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 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$d(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");
-        }
+   */
+  escapeCsv: function escapeCsv(str) {
+    if (!___default["default"].isString(str)) {
+      str = ___default["default"].toString(str);
+    }
 
-        var viewerName = this.morph[morphName][typeName];
+    return '"' + str.replace(/["]/g, '""') + '"';
+  },
 
-        if (!this.viewers[viewerName]) {
-          throw SyntaxError("\u89C6\u56FE" + viewerName + "\u672A\u5B9A\u4E49");
-        }
-      }
+  /**
+   * 判断两个值是否相同
+   * @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;
+    }
 
-  return Assembly;
-}();
-var assembly = new Assembly();
+    if (___default["default"].isArray(ca)) {
+      return ca.indexOf(d);
+    } else {
+      return ca === d ? 0 : -1;
+    }
+  }
+};
 
 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 ownKeys$y(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; }
+function _objectSpread$y(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$y(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$y(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 一个字段的视图
  */
@@ -1244,7 +1835,7 @@ var MFieldViewer = /*#__PURE__*/function (_React$Component) {
       return MUtil.error("\u5B57\u6BB5\u7684\u89C6\u56FE\u5C1A\u672A\u5B9E\u73B0", this.props.schema);
     }
 
-    var props = _objectSpread$x({
+    var props = _objectSpread$y({
       afterChange: function afterChange() {},
       changeSchema: function changeSchema() {},
       changeDatabase: function changeDatabase() {},
@@ -1252,229 +1843,19 @@ var MFieldViewer = /*#__PURE__*/function (_React$Component) {
     }, 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;
-        }
-      }
-    });
-  };
-
-  return MFieldViewer;
-}(React__default["default"].Component);
-
-/**
- * 非空校验，数据不能是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
-      };
-    }
+    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 +1942,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 +15479,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 +16130,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); }
@@ -16368,9 +16555,9 @@ var BaseViewer = /*#__PURE__*/function (_Viewer) {
   return BaseViewer;
 }(Viewer);
 
-function ownKeys$w(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 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$w(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$w(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$w(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 ArrayViewer = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](ArrayViewer, _BaseViewer);
 
@@ -16388,35 +16575,35 @@ var ArrayViewer = /*#__PURE__*/function (_BaseViewer) {
 
     if (___default["default"].isNil(vs)) {
       return jsxRuntime.jsx("div", {
-        style: _objectSpread$w({}, s),
+        style: _objectSpread$x({}, s),
         children: assembly.theme.READABLE_BLANK
       });
     } else if (!___default["default"].isArray(vs)) {
       return jsxRuntime.jsx("div", {
-        style: _objectSpread$w({}, s),
+        style: _objectSpread$x({}, s),
         children: assembly.theme.READABLE_INVALID
       });
     } else if (vs.length === 0) {
       return jsxRuntime.jsx("div", {
-        style: _objectSpread$w({}, s),
+        style: _objectSpread$x({}, s),
         children: assembly.theme.READABLE_BLANK
       });
     }
 
     if (this.props.schema.toReadable) {
       return jsxRuntime.jsxs("div", {
-        children: [" style=", _objectSpread$w({}, s), assembly.toReadable(this.props.schema, vs, _BaseViewer.prototype.getParentValue.call(this))]
+        children: [" style=", _objectSpread$x({}, s), assembly.toReadable(this.props.schema, vs, _BaseViewer.prototype.getParentValue.call(this))]
       });
     } else if (this.props.schema.remote) {
       return jsxRuntime.jsxs("div", {
-        style: _objectSpread$w({}, s),
+        style: _objectSpread$x({}, s),
         children: [" ", vs.map(function (v) {
           return v.label;
         }).join(", "), " "]
       });
     } else if (!this.props.schema.arrayMember) {
       return jsxRuntime.jsx("div", {
-        style: _objectSpread$w({}, s),
+        style: _objectSpread$x({}, s),
         children: vs.join(', ')
       });
     } else {
@@ -16459,9 +16646,9 @@ var ArrayViewer = /*#__PURE__*/function (_BaseViewer) {
   return ArrayViewer;
 }(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 ownKeys$w(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 _objectSpread$w(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$w(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$w(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function toPrecision(mode) {
   switch (mode) {
@@ -16541,7 +16728,7 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
             });
           },
           children: dataAsDate ? moment__default["default"](dataAsDate).format(antConf.readableFormat) : "请点击选择"
-        }), jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$v({
+        }), jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$w({
           visible: this.state.pickerVisible,
           value: dataAsDate,
           min: this.props.schema.min ? moment__default["default"](this.props.schema.min, antConf.dataFormat).toDate() : undefined,
@@ -16569,7 +16756,7 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
       var pickerKey = this.props.path + "_" + ((_antConf$mode = antConf.mode) != null ? _antConf$mode : "datetime");
       return jsxRuntime.jsx(antd.ConfigProvider, {
         locale: zhCN__default["default"],
-        children: jsxRuntime.jsx(antd.DatePicker, _objectSpread$v({
+        children: jsxRuntime.jsx(antd.DatePicker, _objectSpread$w({
           disabled: this.props.disable,
           bordered: this.props.hideBorder ? false : true,
           disabledDate: function disabledDate(m) {
@@ -16592,9 +16779,9 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
   return ADatetimePicker;
 }(BaseViewer);
 
-function ownKeys$u(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 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$u(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$u(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$u(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
 /**
  * 选择中国的省市县
  * 示例：{label:"1.5 您目前的居住地",name:"reside", type:"gb2260"},
@@ -16642,7 +16829,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
             });
           },
           children: looked == null ? void 0 : (_looked$label = looked.label) == null ? void 0 : _looked$label.join("/")
-        }), jsxRuntime.jsx(antdMobile.Picker, _objectSpread$u({
+        }), jsxRuntime.jsx(antdMobile.Picker, _objectSpread$v({
           columns: MGB2260Type.gb2260,
           value: looked.code,
           visible: this.state.pickerVisible,
@@ -16662,7 +16849,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
       });
     } else {
       // PC
-      return jsxRuntime.jsx(antd.Cascader, _objectSpread$u({
+      return jsxRuntime.jsx(antd.Cascader, _objectSpread$v({
         options: MGB2260Type.gb2260,
         disabled: this.props.disable,
         placeholder: _BaseViewer.prototype.getPlaceholder.call(this),
@@ -16680,9 +16867,9 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
   return AGB2260;
 }(BaseViewer);
 
-function ownKeys$t(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 ownKeys$u(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$t(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$t(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$t(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$u(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$u(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$u(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var OPEN_ENUM_RADIO_VALUE = -1;
 /**
@@ -16791,7 +16978,7 @@ var ARadio = /*#__PURE__*/function (_BaseViewer) {
     }
 
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
-    return jsxRuntime.jsx(antd.Radio.Group, _objectSpread$t(_objectSpread$t({
+    return jsxRuntime.jsx(antd.Radio.Group, _objectSpread$u(_objectSpread$u({
       defaultValue: initIndex,
       onChange: function onChange(vv) {
         var v = vv.target.value;
@@ -16814,9 +17001,9 @@ var ARadio = /*#__PURE__*/function (_BaseViewer) {
   return ARadio;
 }(BaseViewer);
 
-function ownKeys$s(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 ownKeys$t(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$s(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$s(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$s(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$t(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$t(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$t(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * antd 的评分组件 https://ant.design/components/rate-cn/
  * { editor: 'ARate', name: 'score', label: "评分", required: true, props: {count: 8} }
@@ -16841,7 +17028,7 @@ var ARate = /*#__PURE__*/function (_BaseViewer) {
 
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
-    var props = _objectSpread$s({
+    var props = _objectSpread$t({
       count: this.props.schema.max,
       defaultValue: this.value,
       onChange: function onChange(value, label, extra) {
@@ -16871,7 +17058,7 @@ var ARate = /*#__PURE__*/function (_BaseViewer) {
           className: "m3-nps-tip-right",
           children: p.rightTip
         })]
-      }) : null, jsxRuntime.jsx(antd.Rate, _objectSpread$s({
+      }) : null, jsxRuntime.jsx(antd.Rate, _objectSpread$t({
         className: "m3-nps-rate"
       }, props))]
     });
@@ -16880,9 +17067,9 @@ var ARate = /*#__PURE__*/function (_BaseViewer) {
   return ARate;
 }(BaseViewer);
 
-function ownKeys$r(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 ownKeys$s(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$r(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$r(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$r(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$s(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$s(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$s(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * antd 的上传组件 https://ant.design/components/upload-cn/
  *  {
@@ -16962,7 +17149,7 @@ var AUpload = /*#__PURE__*/function (_BaseViewer) {
       });
     }
 
-    var props = _objectSpread$r(_objectSpread$r({}, a), {}, {
+    var props = _objectSpread$s(_objectSpread$s({}, a), {}, {
       onChange: function onChange(info) {
         if (p.onChange) p.onChange(info);
         console.log(info);
@@ -17024,7 +17211,7 @@ var AUpload = /*#__PURE__*/function (_BaseViewer) {
       }
     }, p);
 
-    return jsxRuntime.jsx(antd.Upload, _objectSpread$r(_objectSpread$r({
+    return jsxRuntime.jsx(antd.Upload, _objectSpread$s(_objectSpread$s({
       disabled: this.loading !== undefined
     }, props), {}, {
       children: jsxRuntime.jsx(antd.Button, {
@@ -17037,9 +17224,9 @@ var AUpload = /*#__PURE__*/function (_BaseViewer) {
   return AUpload;
 }(BaseViewer);
 
-function ownKeys$q(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 ownKeys$r(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$q(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$q(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$q(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$r(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$r(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$r(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * antd 的树型选择控件 https://ant.design/components/tree-select-cn/
  *   {
@@ -17071,7 +17258,7 @@ var ATreeSelect = /*#__PURE__*/function (_BaseViewer) {
 
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
-    var props = _objectSpread$q({
+    var props = _objectSpread$r({
       defaultValue: this.value,
       onChange: function onChange(value, label, extra) {
         if (p.onChange) p.onChange(value, label, extra);
@@ -17085,7 +17272,7 @@ var ATreeSelect = /*#__PURE__*/function (_BaseViewer) {
       }
     }, p);
 
-    return jsxRuntime.jsx(antd.TreeSelect, _objectSpread$q({
+    return jsxRuntime.jsx(antd.TreeSelect, _objectSpread$r({
       style: {
         width: "100%"
       }
@@ -17095,9 +17282,9 @@ var ATreeSelect = /*#__PURE__*/function (_BaseViewer) {
   return ATreeSelect;
 }(BaseViewer);
 
-function ownKeys$p(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 ownKeys$q(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$p(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$p(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$p(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$q(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$q(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$q(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * NPS 打分组件，基于 antd 的评分组件 https://ant.design/components/rate-cn/
  * 定义示例：{ editor: 'NPS', name: 'possibility', label: "您向朋友或同事推荐本堂课程的可能性有多大?", required: true },
@@ -17125,7 +17312,7 @@ var NPS = /*#__PURE__*/function (_BaseViewer) {
 
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
-    var props = _objectSpread$p({
+    var props = _objectSpread$q({
       count: 11,
       character: function character(_ref) {
         var index = _ref.index;
@@ -17158,7 +17345,7 @@ var NPS = /*#__PURE__*/function (_BaseViewer) {
           className: "m3-nps-tip-right",
           children: (_p$rightTip = p.rightTip) != null ? _p$rightTip : '极有可能'
         })]
-      }), jsxRuntime.jsx(antd.Rate, _objectSpread$p({
+      }), jsxRuntime.jsx(antd.Rate, _objectSpread$q({
         className: "m3-nps-rate"
       }, props)), p.remark ? jsxRuntime.jsx("div", {
         className: "m3-nps-remark",
@@ -17170,9 +17357,9 @@ var NPS = /*#__PURE__*/function (_BaseViewer) {
   return NPS;
 }(BaseViewer);
 
-function ownKeys$o(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 ownKeys$p(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$o(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$o(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$o(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$p(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$p(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$p(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 输入整数的输入框
  * 定义示例：{label:"2.3 请问今年以来您平均每月工作多少天?",name:"workdayPerMonth", type:"int"},
@@ -17193,9 +17380,9 @@ var AIntBox = /*#__PURE__*/function (_BaseViewer) {
 
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
-    var props = _objectSpread$o(_objectSpread$o({}, _BaseViewer.prototype.antProp.call(this)), {}, {
+    var props = _objectSpread$p(_objectSpread$p({}, _BaseViewer.prototype.antProp.call(this)), {}, {
       bordered: undefined,
-      style: _objectSpread$o({
+      style: _objectSpread$p({
         border: this.props.hideBorder ? "none" : undefined
       }, this.props.style),
       min: this.props.schema.min,
@@ -17222,7 +17409,7 @@ var AIntBox = /*#__PURE__*/function (_BaseViewer) {
       }
     }, p);
 
-    return jsxRuntime.jsx(antd.InputNumber, _objectSpread$o({}, props));
+    return jsxRuntime.jsx(antd.InputNumber, _objectSpread$p({}, props));
   };
 
   return AIntBox;
@@ -17391,9 +17578,9 @@ var ACheckBox = /*#__PURE__*/function (_BaseViewer) {
   return ACheckBox;
 }(BaseViewer);
 
-function ownKeys$n(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 ownKeys$o(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$n(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$n(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$n(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$o(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$o(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$o(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var AInputBox = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](AInputBox, _BaseViewer);
 
@@ -17415,7 +17602,7 @@ var AInputBox = /*#__PURE__*/function (_BaseViewer) {
     var lines = (_this$props$schema$st = this.props.schema.stringLines) != null ? _this$props$schema$st : 1;
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
-    var commonProps = _objectSpread$n({
+    var commonProps = _objectSpread$o({
       defaultValue: this.getValue(),
       key: this.props.path,
       onChange: function onChange(v) {
@@ -17446,13 +17633,13 @@ var AInputBox = /*#__PURE__*/function (_BaseViewer) {
         });
       }
 
-      var inputProps = _objectSpread$n({
+      var inputProps = _objectSpread$o({
         className: "AInputBox",
         style: this.props.style
       }, commonProps); //if(addon) {
 
 
-      return jsxRuntime.jsx(antd.Input, _objectSpread$n(_objectSpread$n({}, inputProps), {}, {
+      return jsxRuntime.jsx(antd.Input, _objectSpread$o(_objectSpread$o({}, inputProps), {}, {
         addonAfter: addon
       })); // } else {
       //   return <UnderlineInputBox {...inputProps}/>; // 等 UnderlineInputBox 支持addonAfter，上面的就能干掉了
@@ -17467,7 +17654,7 @@ var AInputBox = /*#__PURE__*/function (_BaseViewer) {
         styles.border = "none";
       }
 
-      return jsxRuntime.jsx(TextArea__default["default"], _objectSpread$n({
+      return jsxRuntime.jsx(TextArea__default["default"], _objectSpread$o({
         style: styles
       }, commonProps));
     }
@@ -17476,9 +17663,9 @@ var AInputBox = /*#__PURE__*/function (_BaseViewer) {
   return AInputBox;
 }(BaseViewer);
 
-function ownKeys$m(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 ownKeys$n(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$m(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$m(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$m(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$n(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$n(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$n(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var UnderlineInputBox = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose__default["default"](UnderlineInputBox, _React$Component);
 
@@ -17489,7 +17676,7 @@ var UnderlineInputBox = /*#__PURE__*/function (_React$Component) {
   var _proto = UnderlineInputBox.prototype;
 
   _proto.render = function render() {
-    return jsxRuntime.jsx("input", _objectSpread$m({
+    return jsxRuntime.jsx("input", _objectSpread$n({
       className: assembly.theme.themeName + "InputBox"
     }, this.props));
   };
@@ -19276,9 +19463,9 @@ var AREA_CODE_LIST = [{
   countryCode: "ZW"
 }];
 
-function ownKeys$l(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 ownKeys$m(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$l(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$l(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$l(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$m(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$m(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$m(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 手机号/邮箱等输入框
  * cnPhone/tel/email
@@ -19359,7 +19546,7 @@ var ASpecInputBox = /*#__PURE__*/function (_BaseViewer) {
         },
         disabled: this.props.disable,
         onChange: function onChange(newAreaCode) {
-          var updated = _objectSpread$l(_objectSpread$l({}, _this.getPhoneValue()), {}, {
+          var updated = _objectSpread$m(_objectSpread$m({}, _this.getPhoneValue()), {}, {
             areaCode: newAreaCode
           });
 
@@ -19384,7 +19571,7 @@ var ASpecInputBox = /*#__PURE__*/function (_BaseViewer) {
         defaultValue: phoneValue.phone,
         min: "0",
         onChange: function onChange(value) {
-          var updated = _objectSpread$l(_objectSpread$l({}, _this.getPhoneValue()), {}, {
+          var updated = _objectSpread$m(_objectSpread$m({}, _this.getPhoneValue()), {}, {
             phone: value
           });
 
@@ -19413,7 +19600,7 @@ var ASpecInputBox = /*#__PURE__*/function (_BaseViewer) {
 
     var selfOnChange = p.onChange;
     delete deepCloneP.onChange;
-    return jsxRuntime.jsx(antd.Input, _objectSpread$l(_objectSpread$l({}, _BaseViewer.prototype.antProp.call(this)), {}, {
+    return jsxRuntime.jsx(antd.Input, _objectSpread$m(_objectSpread$m({}, _BaseViewer.prototype.antProp.call(this)), {}, {
       defaultValue: _BaseViewer.prototype.getValue.call(this),
       onBlur: function onBlur() {
         return _this2.changeValueEx(_BaseViewer.prototype.getValue.call(_this2), false, true);
@@ -19429,9 +19616,9 @@ var ASpecInputBox = /*#__PURE__*/function (_BaseViewer) {
   return ASpecInputBox;
 }(BaseViewer);
 
-function ownKeys$k(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 ownKeys$l(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$k(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$k(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$k(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$l(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$l(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$l(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Segment = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose__default["default"](Segment, _React$Component);
 
@@ -19445,7 +19632,7 @@ var Segment = /*#__PURE__*/function (_React$Component) {
     return jsxRuntime.jsxs("div", {
       style: this.props.style,
       className: "AForm_segment",
-      children: [jsxRuntime.jsxs("div", _objectSpread$k(_objectSpread$k({
+      children: [jsxRuntime.jsxs("div", _objectSpread$l(_objectSpread$l({
         className: "AForm_segmentTitleBar"
       }, {
         name: this.props.labelName
@@ -19526,9 +19713,9 @@ function SegmentEditSwitch(props) {
   }
 }
 
-function ownKeys$j(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 ownKeys$k(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$j(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$j(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$j(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$k(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$k(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$k(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 可以折叠的元素，折叠时可带动画效果
  *
@@ -19591,7 +19778,7 @@ var Collapsible = /*#__PURE__*/function (_React$Component) {
 
     if (open) {
       return {
-        css: _objectSpread$j(_objectSpread$j({}, self.props.style), {}, {
+        css: _objectSpread$k(_objectSpread$k({}, self.props.style), {}, {
           maxHeight: changing ? self.height + "px" : undefined,
           visibility: "visible",
           opacity: "1",
@@ -19600,7 +19787,7 @@ var Collapsible = /*#__PURE__*/function (_React$Component) {
       };
     } else {
       var r = {
-        css: _objectSpread$j(_objectSpread$j({}, self.closeStyle), {}, {
+        css: _objectSpread$k(_objectSpread$k({}, self.closeStyle), {}, {
           maxHeight: "0px",
           visibility: "hidden",
           opacity: "0",
@@ -19692,9 +19879,9 @@ function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o
 
 function _arrayLikeToArray$3(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; }
 
-function ownKeys$i(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 ownKeys$j(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$i(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$i(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$i(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$j(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$j(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$j(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function ItemLabel(props) {
   var _props$uispec;
@@ -19871,7 +20058,7 @@ var AForm = /*#__PURE__*/function (_Viewer) {
 
     if (uispec.layout === "vertical") {
       // label在字段上面的分段布局
-      ele = jsxRuntime.jsxs(Collapsible, _objectSpread$i(_objectSpread$i({}, wrapperProp), {}, {
+      ele = jsxRuntime.jsxs(Collapsible, _objectSpread$j(_objectSpread$j({}, wrapperProp), {}, {
         children: [jsxRuntime.jsx(ItemLabel, {
           uispec: uispec,
           schema: f,
@@ -19881,7 +20068,7 @@ var AForm = /*#__PURE__*/function (_Viewer) {
     } else if (uispec.layout === "horizontal") {
       // label在字段左边的分段布局 TODO
       wrapperProp.style.display = "flex";
-      ele = jsxRuntime.jsxs(Collapsible, _objectSpread$i(_objectSpread$i({}, wrapperProp), {}, {
+      ele = jsxRuntime.jsxs(Collapsible, _objectSpread$j(_objectSpread$j({}, wrapperProp), {}, {
         children: [jsxRuntime.jsx(ItemLabel, {
           uispec: uispec,
           schema: f,
@@ -20035,7 +20222,7 @@ var AForm = /*#__PURE__*/function (_Viewer) {
 
       segments.push(jsxRuntime.jsx(Segment, {
         column: column,
-        style: _objectSpread$i(_objectSpread$i({}, segment.style), {}, {
+        style: _objectSpread$j(_objectSpread$j({}, segment.style), {}, {
           display: segHide ? "none" : undefined
         }),
         mainTitle: segment.label,
@@ -20140,9 +20327,9 @@ var AForm = /*#__PURE__*/function (_Viewer) {
   return AForm;
 }(Viewer);
 
-function ownKeys$h(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 ownKeys$i(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$h(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$h(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$h(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$i(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$i(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$i(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var DivViewer = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](DivViewer, _BaseViewer);
 
@@ -20154,7 +20341,7 @@ var DivViewer = /*#__PURE__*/function (_BaseViewer) {
 
   _proto.element = function element() {
     return jsxRuntime.jsx("pre", {
-      style: _objectSpread$h({
+      style: _objectSpread$i({
         marginBottom: 0,
         color: "rgba(0,0,0,0.6)",
         overflow: "initial",
@@ -20168,9 +20355,9 @@ var DivViewer = /*#__PURE__*/function (_BaseViewer) {
   return DivViewer;
 }(BaseViewer);
 
-function ownKeys$g(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 ownKeys$h(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$g(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$g(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$g(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$h(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$h(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$h(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 下拉选择框
  * 定义示例： {label:"1.1 您的性别是",   name:"gendar",          type:"enum",    typeArg: [{label:"男", value:"M"},{label:"女", value:"F"}] },
@@ -20205,7 +20392,7 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
         return MUtil.error("手机上的ASelector还不支持openOption");
       }
 
-      return jsxRuntime.jsx(SelectBox, _objectSpread$g(_objectSpread$g({
+      return jsxRuntime.jsx(SelectBox, _objectSpread$h(_objectSpread$h({
         data: value,
         // @ts-ignore
         options: this._enums.map(function (e) {
@@ -20244,7 +20431,7 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
         }, index);
       });
 
-      return jsxRuntime.jsx(Select__default["default"], _objectSpread$g(_objectSpread$g({
+      return jsxRuntime.jsx(Select__default["default"], _objectSpread$h(_objectSpread$h({
         defaultValue: initIndex,
         placeholder: _BaseViewer.prototype.getPlaceholder.call(this),
         bordered: this.props.hideBorder ? false : true,
@@ -20316,9 +20503,9 @@ var ASelector = /*#__PURE__*/function (_BaseViewer) {
   return ASelector;
 }(BaseViewer);
 
-function ownKeys$f(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 ownKeys$g(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$f(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$f(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$g(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$g(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$g(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * 下拉框多选
  * 示例：{label:"1.13 除爱人/对象之外，目前和您一起生活的家庭成员包括(多选):",name:"familyAccompany",type:"set", editor:"ASetSelector", option: "父亲 母亲 孩子 爱人/对象的父亲 爱人/对象的母亲 兄弟姐妹"},
@@ -20356,7 +20543,7 @@ var ASetSelector = /*#__PURE__*/function (_BaseViewer) {
       return value2Fields[v].index;
     });
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
-    return jsxRuntime.jsx(antd.Select, _objectSpread$f(_objectSpread$f({
+    return jsxRuntime.jsx(antd.Select, _objectSpread$g(_objectSpread$g({
       mode: "multiple",
       placeholder: this.props.schema.placeholder,
       optionFilterProp: "children",
@@ -20400,9 +20587,102 @@ var ASetSelector = /*#__PURE__*/function (_BaseViewer) {
   return ASetSelector;
 }(BaseViewer);
 
-function ownKeys$e(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 ownKeys$f(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$e(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$e(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$f(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$f(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+/**
+ * 可排序的拖拽项子组件
+ */
+
+var SortableEnhancedItem = /*#__PURE__*/React.memo(function (_ref) {
+  var _clsx;
+
+  var item = _ref.item,
+      index = _ref.index,
+      enableAnimation = _ref.enableAnimation,
+      direction = _ref.direction,
+      renderDragHandle = _ref.renderDragHandle,
+      isTableRow = _ref.isTableRow;
+
+  var _useSortable = sortable.useSortable({
+    id: item.id,
+    disabled: !item.isChecked
+  }),
+      attributes = _useSortable.attributes,
+      listeners = _useSortable.listeners,
+      setNodeRef = _useSortable.setNodeRef,
+      transform = _useSortable.transform,
+      transition = _useSortable.transition,
+      isDragging = _useSortable.isDragging;
+
+  var style = {
+    transform: utilities.CSS.Transform.toString(transform),
+    transition: enableAnimation ? transition : undefined
+  };
+
+  var renderDefaultDragHandle = function renderDefaultDragHandle() {
+    return jsxRuntime.jsx("div", {
+      className: "enhanced-dragHandleWrapper",
+      children: jsxRuntime.jsx(icons.HolderOutlined, {
+        className: "enhanced-dragHandleIcon",
+        style: {
+          opacity: isDragging ? 0.5 : 1,
+          transition: enableAnimation ? "opacity 0.2s" : "none"
+        }
+      })
+    });
+  }; // 表格行模式
+
+
+  if (isTableRow) {
+    return jsxRuntime.jsxs("tr", _objectSpread$f(_objectSpread$f({
+      ref: setNodeRef,
+      "data-drag-id": item.id,
+      "data-drag-index": index,
+      style: _objectSpread$f({
+        opacity: isDragging ? 0.5 : 1
+      }, style)
+    }, attributes), {}, {
+      children: [renderDragHandle ? renderDragHandle(item, isDragging, listeners) : jsxRuntime.jsx("td", _objectSpread$f(_objectSpread$f({}, listeners), {}, {
+        style: {
+          cursor: isDragging ? "grabbing" : "grab",
+          textAlign: "center",
+          width: "40px"
+        },
+        children: jsxRuntime.jsx(icons.HolderOutlined, {
+          style: {
+            opacity: isDragging ? 0.5 : 1,
+            transition: enableAnimation ? "opacity 0.2s" : "none"
+          }
+        })
+      })), item.cpn]
+    }), item.id);
+  } // 普通模式
+
+
+  var itemClass = clsx__default["default"]("enhanced-dragItem", (_clsx = {
+    dragging: isDragging,
+    disabled: !item.isChecked
+  }, _clsx["direction-" + direction] = true, _clsx));
+  return jsxRuntime.jsxs("div", _objectSpread$f(_objectSpread$f({
+    className: itemClass,
+    ref: setNodeRef,
+    "data-drag-id": item.id,
+    "data-drag-index": index,
+    style: style
+  }, attributes), {}, {
+    children: [jsxRuntime.jsx("div", {
+      className: "enhanced-dragBody",
+      children: item.cpn
+    }), jsxRuntime.jsx("div", {
+      className: "enhanced-dragHandle",
+      children: item.isChecked && (renderDragHandle ? renderDragHandle(item, isDragging, listeners) : jsxRuntime.jsx("div", _objectSpread$f(_objectSpread$f({}, listeners), {}, {
+        children: renderDefaultDragHandle()
+      })))
+    })]
+  }), item.id);
+});
+SortableEnhancedItem.displayName = "SortableEnhancedItem";
 /**
  * 增强版通用拖拽排序组件
  * 解决原组件的性能问题和功能局限性
@@ -20417,27 +20697,39 @@ var EnhancedSortDrag = /*#__PURE__*/React.memo(function (props) {
       var _props$direction = props.direction,
       direction = _props$direction === void 0 ? "vertical" : _props$direction,
       onDragFail = props.onDragFail,
-      renderDragHandle = props.renderDragHandle;
-      props.renderDragPreview;
-      var _props$isTableRow = props.isTableRow,
-      isTableRow = _props$isTableRow === void 0 ? false : _props$isTableRow; // 使用 useRef 缓存 items 避免不必要的重渲染
+      renderDragHandle = props.renderDragHandle,
+      renderDragPreview = props.renderDragPreview,
+      _props$isTableRow = props.isTableRow,
+      isTableRow = _props$isTableRow === void 0 ? false : _props$isTableRow; // 拖拽状态管理
 
-  var itemsRef = React.useRef(items);
-  itemsRef.current = items; // 拖拽状态管理
+  var _useState = React.useState(null),
+      activeId = _useState[0],
+      setActiveId = _useState[1];
 
-  var _useState = React.useState({
+  var _useState2 = React.useState({
     draggingId: null,
     droppingId: null,
     isAnimating: false
-  }),
-      dragState = _useState[0],
-      setDragState = _useState[1]; // 使用 Map 替代对象，提高查找性能
-
+  });
+      _useState2[0];
+      var setDragState = _useState2[1];
+  /**
+   * 配置传感器
+   */
 
-  var itemRefs = React.useRef(new Map());
-  var dragHandleRefs = React.useRef(new Map()); // 清理函数缓存，避免重复注册
 
-  var cleanupRefs = React.useRef(new Map());
+  var sensors = core.useSensors(core.useSensor(core.TouchSensor, {
+    activationConstraint: {
+      delay: 200,
+      tolerance: 5
+    }
+  }), core.useSensor(core.PointerSensor, {
+    activationConstraint: {
+      distance: 10
+    }
+  }), core.useSensor(core.KeyboardSensor, {
+    coordinateGetter: sortable.sortableKeyboardCoordinates
+  }));
   /**
    * 验证拖拽操作是否有效
    */
@@ -20517,284 +20809,171 @@ var EnhancedSortDrag = /*#__PURE__*/React.memo(function (props) {
     };
   }, []);
   /**
-   * 交换数据逻辑 - 核心拖拽算法
+   * 拖拽开始事件处理
    */
 
-  var swapItems = React.useCallback(function (fromId, toId) {
-    try {
-      var currentItems = [].concat(itemsRef.current); // 验证拖拽操作
-
-      var validation = validateDragOperation(fromId, toId, currentItems);
-
-      if (!validation.isValid) {
-        var _validation$error;
+  var handleDragStart = React.useCallback(function (event) {
+    var active = event.active;
+    setActiveId(active.id);
+    setDragState(function (prev) {
+      return _objectSpread$f(_objectSpread$f({}, prev), {}, {
+        draggingId: active.id,
+        isAnimating: !!enableAnimation
+      });
+    });
+  }, [enableAnimation]);
+  /**
+   * 拖拽结束事件处理
+   */
 
-        throw new Error(((_validation$error = validation.error) == null ? void 0 : _validation$error.message) || "拖拽验证失败");
-      }
+  var handleDragEnd = React.useCallback(function (event) {
+    var active = event.active,
+        over = event.over;
+    setActiveId(null);
+    setDragState(function (prev) {
+      return _objectSpread$f(_objectSpread$f({}, prev), {}, {
+        draggingId: null,
+        droppingId: null,
+        isAnimating: false
+      });
+    });
 
-      var fromIndex = currentItems.findIndex(function (item) {
-        return item.id === fromId;
+    if (over && active.id !== over.id) {
+      var oldIndex = items.findIndex(function (item) {
+        return item.id === active.id;
+      });
+      var newIndex = items.findIndex(function (item) {
+        return item.id === over.id;
       });
-      var toIndex = currentItems.findIndex(function (item) {
-        return item.id === toId;
-      }); // 边界条件检查
 
-      if (fromIndex === -1 || toIndex === -1 || fromIndex === toIndex) {
+      if (oldIndex === -1 || newIndex === -1) {
         return;
       }
 
-      var _currentItems$splice = currentItems.splice(fromIndex, 1),
-          moved = _currentItems$splice[0];
-
-      currentItems.splice(toIndex, 0, moved); // 更新引用
-
-      itemsRef.current = currentItems; // 触发回调
-
-      onChange(currentItems);
-    } catch (error) {
-      console.error("拖拽交换数据失败:", error); // 触发错误回调
-
-      var dragError = {
-        type: "DATA_ERROR",
-        message: error instanceof Error ? error.message : "未知错误",
-        sourceId: fromId,
-        targetId: toId
-      };
-      onDragFail == null ? void 0 : onDragFail(dragError);
-    }
-  }, [onChange, onDragFail, validateDragOperation]);
-  /**
-   * 注册单个项目的拖拽监听器
-   */
-
-  var registerDragListeners = React.useCallback(function (item, index) {
-    var el = itemRefs.current.get(item.id);
-    var dragHandle = dragHandleRefs.current.get(item.id);
-    if (!el) return; // 清理之前的监听器
-
-    var existingCleanup = cleanupRefs.current.get(item.id);
+      try {
+        var validation = validateDragOperation(active.id, over.id, items);
 
-    if (existingCleanup) {
-      existingCleanup();
-    }
+        if (!validation.isValid) {
+          var _validation$error;
 
-    var cleanups = []; // 注册为可拖拽元素
+          throw new Error(((_validation$error = validation.error) == null ? void 0 : _validation$error.message) || "拖拽验证失败");
+        }
 
-    cleanups.push(adapter.draggable({
-      element: el,
-      dragHandle: dragHandle,
-      canDrag: function canDrag() {
-        return item.isChecked;
-      },
-      getInitialData: function getInitialData() {
-        return {
-          id: item.id,
-          index: index,
-          label: item.label
+        var newItems = sortable.arrayMove(items, oldIndex, newIndex);
+        onChange(newItems);
+      } catch (error) {
+        console.error("拖拽交换数据失败:", error);
+        var dragError = {
+          type: "DATA_ERROR",
+          message: error instanceof Error ? error.message : "未知错误",
+          sourceId: active.id,
+          targetId: over.id
         };
-      },
-      onDragStart: function onDragStart() {
-        setDragState(function (prev) {
-          return _objectSpread$e(_objectSpread$e({}, prev), {}, {
-            draggingId: item.id,
-            isAnimating: !!enableAnimation
-          });
-        });
-        console.log("开始拖拽:", item.label);
-      },
-      onDrop: function onDrop() {
-        setDragState(function (prev) {
-          return _objectSpread$e(_objectSpread$e({}, prev), {}, {
-            draggingId: null,
-            droppingId: null,
-            isAnimating: false
-          });
-        });
-      }
-    })); // 注册为拖拽目标
-
-    cleanups.push(adapter.dropTargetForElements({
-      element: el,
-      canDrop: function canDrop() {
-        return item.isChecked;
-      },
-      onDragEnter: function onDragEnter(args) {
-        var sourceId = args.source.data.id;
-        if (sourceId === item.id) return;
-        console.log("拖拽进入:", item.id);
-        setDragState(function (prev) {
-          return _objectSpread$e(_objectSpread$e({}, prev), {}, {
-            droppingId: item.id
-          });
-        });
-      },
-      onDragLeave: function onDragLeave() {
-        setDragState(function (prev) {
-          return _objectSpread$e(_objectSpread$e({}, prev), {}, {
-            droppingId: null
-          });
-        });
-      },
-      onDrop: function onDrop(_ref) {
-        var source = _ref.source;
-        if (!source) return;
-        var sourceId = source.data.id;
-        if (sourceId === item.id) return; // 执行数据交换
-
-        swapItems(sourceId, item.id);
+        onDragFail == null ? void 0 : onDragFail(dragError);
       }
-    })); // 存储清理函数
-
-    var combinedCleanup = function combinedCleanup() {
-      cleanups.forEach(function (fn) {
-        return fn();
-      });
-    };
-
-    cleanupRefs.current.set(item.id, combinedCleanup);
-  }, [swapItems, enableAnimation]);
+    }
+  }, [items, onChange, onDragFail, validateDragOperation]);
   /**
-   * 性能优化：只在必要的时候注册监听器
+   * 获取当前拖拽项
    */
 
-  React.useEffect(function () {
-    // 清理所有旧的监听器
-    cleanupRefs.current.forEach(function (cleanup) {
-      return cleanup();
-    });
-    cleanupRefs.current.clear(); // 注册所有项目的监听器
-
-    items.forEach(function (item, index) {
-      registerDragListeners(item, index);
-    }); // 监听全局拖拽结束
-
-    var monitorCleanup = adapter.monitorForElements({
-      onDrop: function onDrop() {
-        setDragState(function (prev) {
-          return _objectSpread$e(_objectSpread$e({}, prev), {}, {
-            draggingId: null,
-            droppingId: null,
-            isAnimating: false
-          });
-        });
-      }
+  var activeItem = React.useMemo(function () {
+    return items.find(function (item) {
+      return item.id === activeId;
     });
-    cleanupRefs.current.set("monitor", monitorCleanup);
-    return function () {
-      cleanupRefs.current.forEach(function (cleanup) {
-        return cleanup();
-      });
-      cleanupRefs.current.clear();
-    };
-  }, [items.length, registerDragListeners]); // 只在列表长度变化时重新注册
-
+  }, [items, activeId]);
   /**
-   * 渲染默认拖拽句柄
+   * 选择排序策略
    */
 
-  var renderDefaultDragHandle = React.useCallback(function (item, isDragging) {
-    return jsxRuntime.jsx(icons.HolderOutlined, {
-      ref: function ref(el) {
-        if (el) {
-          dragHandleRefs.current.set(item.id, el);
-        }
-      },
-      style: {
-        cursor: isDragging ? "grabbing" : "grab",
-        marginLeft: "8px",
-        opacity: isDragging ? 0.5 : 1,
-        transition: enableAnimation ? "opacity 0.2s" : "none"
-      }
-    });
-  }, [enableAnimation]);
+  var sortingStrategy = React.useMemo(function () {
+    return direction === "vertical" ? sortable.verticalListSortingStrategy : sortable.horizontalListSortingStrategy;
+  }, [direction]);
   /**
-   * 渲染拖拽项
+   * 缓存 item id 列表，避免每次渲染创建新数组引用
    */
 
-  var renderDragItem = React.useCallback(function (item, index) {
-    var _clsx;
-
-    var isDragging = dragState.draggingId === item.id;
-    var isDropping = dragState.droppingId === item.id; // 如果是表格行模式，直接返回组件内容
+  var itemIds = React.useMemo(function () {
+    return items.map(function (item) {
+      return item.id;
+    });
+  }, [items]); // 如果是表格行模式，直接渲染子元素而不是包装div
 
-    if (isTableRow) {
-      // console.log("表格行数据", item);
-      return jsxRuntime.jsxs("tr", {
-        ref: function ref(el) {
-          if (el) {
-            itemRefs.current.set(item.id, el);
-          }
-        },
-        "data-drag-id": item.id,
-        "data-drag-index": index,
-        style: {
-          transition: enableAnimation ? "all 0.3s ease" : "none",
-          opacity: isDragging ? 0.5 : 1,
-          backgroundColor: isDropping ? "#e6f7ff" : "transparent"
-        },
-        children: [renderDragHandle && renderDragHandle(item, isDragging), !renderDragHandle && jsxRuntime.jsx("td", {
-          ref: function ref(el) {
-            if (el) {
-              dragHandleRefs.current.set(item.id, el);
-            }
-          },
-          style: {
-            cursor: isDragging ? "grabbing" : "grab",
-            textAlign: "center",
-            width: "40px"
-          },
-          children: jsxRuntime.jsx(icons.HolderOutlined, {
-            style: {
-              opacity: isDragging ? 0.5 : 1,
-              transition: enableAnimation ? "opacity 0.2s" : "none"
-            }
+  if (isTableRow) {
+    return jsxRuntime.jsxs(core.DndContext, {
+      sensors: sensors,
+      collisionDetection: core.closestCenter,
+      onDragStart: handleDragStart,
+      onDragEnd: handleDragEnd,
+      children: [jsxRuntime.jsx(sortable.SortableContext, {
+        items: itemIds,
+        strategy: sortingStrategy,
+        children: items.map(function (item, index) {
+          return jsxRuntime.jsx(SortableEnhancedItem, {
+            item: item,
+            index: index,
+            enableAnimation: enableAnimation,
+            direction: direction,
+            renderDragHandle: renderDragHandle,
+            isTableRow: isTableRow
+          }, item.id);
+        })
+      }), jsxRuntime.jsx(core.DragOverlay, {
+        dropAnimation: null,
+        children: activeItem ? jsxRuntime.jsx("div", {
+          className: "enhanced-sortDrag-overlay",
+          children: renderDragPreview ? renderDragPreview(activeItem) : jsxRuntime.jsx("div", {
+            className: "enhanced-sortDrag-overlay-row",
+            children: jsxRuntime.jsx("span", {
+              className: "enhanced-sortDrag-overlay-label",
+              children: activeItem.label || activeItem.id || '拖拽中...'
+            })
           })
-        }), item.cpn]
-      }, item.id);
-    }
-
-    var itemClass = clsx__default["default"]("enhanced-dragItem", (_clsx = {
-      dragging: isDragging,
-      dropping: isDropping,
-      disabled: !item.isChecked
-    }, _clsx["direction-" + direction] = true, _clsx));
-    return jsxRuntime.jsxs("div", {
-      className: itemClass,
-      ref: function ref(el) {
-        if (el) {
-          itemRefs.current.set(item.id, el);
-        }
-      },
-      "data-drag-id": item.id,
-      "data-drag-index": index,
-      style: {
-        transition: enableAnimation ? "all 0.3s ease" : "none"
-      },
-      children: [jsxRuntime.jsx("div", {
-        className: "enhanced-dragBody",
-        children: item.cpn
-      }), jsxRuntime.jsx("div", {
-        className: "enhanced-dragHandle",
-        children: item.isChecked && (renderDragHandle ? renderDragHandle(item, isDragging) : renderDefaultDragHandle(item, isDragging))
+        }) : null
       })]
-    }, item.id);
-  }, [dragState, direction, enableAnimation, renderDragHandle, renderDefaultDragHandle, isTableRow]); // 如果是表格行模式，直接渲染子元素而不是包装div
-
-  if (isTableRow) {
-    return jsxRuntime.jsx(jsxRuntime.Fragment, {
-      children: items.map(renderDragItem)
     });
   }
 
-  return jsxRuntime.jsx("div", {
-    className: "enhanced-sortDrag direction-" + direction,
-    children: items.map(renderDragItem)
+  return jsxRuntime.jsxs(core.DndContext, {
+    sensors: sensors,
+    collisionDetection: core.closestCenter,
+    onDragStart: handleDragStart,
+    onDragEnd: handleDragEnd,
+    children: [jsxRuntime.jsx("div", {
+      className: "enhanced-sortDrag direction-" + direction,
+      children: jsxRuntime.jsx(sortable.SortableContext, {
+        items: itemIds,
+        strategy: sortingStrategy,
+        children: items.map(function (item, index) {
+          return jsxRuntime.jsx(SortableEnhancedItem, {
+            item: item,
+            index: index,
+            enableAnimation: enableAnimation,
+            direction: direction,
+            renderDragHandle: renderDragHandle,
+            isTableRow: isTableRow
+          }, item.id);
+        })
+      })
+    }), jsxRuntime.jsx(core.DragOverlay, {
+      dropAnimation: null,
+      children: activeItem ? jsxRuntime.jsx("div", {
+        className: "enhanced-sortDrag-overlay",
+        children: renderDragPreview ? renderDragPreview(activeItem) : jsxRuntime.jsx("div", {
+          className: "enhanced-sortDrag-overlay-content",
+          children: jsxRuntime.jsx("div", {
+            className: "enhanced-sortDrag-overlay-body",
+            children: activeItem.cpn
+          })
+        })
+      }) : null
+    })]
   });
 });
 
-function ownKeys$d(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 ownKeys$e(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$d(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$d(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$d(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$e(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$e(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function uuid(len, radix) {
   if (len === void 0) {
@@ -20859,7 +21038,7 @@ var AArrayGrid = /*#__PURE__*/function (_BaseViewer) {
     }
 
     var members = schema.arrayMember.objectFields || [// 成员是复杂结构
-    _objectSpread$d({
+    _objectSpread$e({
       name: undefined
     }, schema.arrayMember)]; // 成员是简单结构
     // if(!members) {
@@ -20973,7 +21152,7 @@ var AArrayGrid = /*#__PURE__*/function (_BaseViewer) {
           return String(row.uniqueId) === item.id;
         }); // 正常情况下一定能找到对应的行数据，因为我们是基于原始数据创建的拖拽项
 
-        return _objectSpread$d({}, originalRow); // 使用 ! 断言，因为我们确信能找到匹配项
+        return _objectSpread$e({}, originalRow); // 使用 ! 断言，因为我们确信能找到匹配项
       });
 
       _BaseViewer.prototype.changeValueEx.call(_this, newData, true, true);
@@ -21097,9 +21276,9 @@ var AArrayGrid = /*#__PURE__*/function (_BaseViewer) {
   return AArrayGrid;
 }(BaseViewer);
 
-function ownKeys$c(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 ownKeys$d(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$c(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$c(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$d(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$d(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$d(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var RANGE_FNAME = "_range";
 /**
  * 经历，可以用于教育经历、工作经历等
@@ -21124,7 +21303,7 @@ var AExperience = /*#__PURE__*/function (_BaseViewer) {
   _proto._submitData = function _submitData(arrayGridData, sort) {
     // 修改后，把数据转换回来再提交
     var experienceData = arrayGridData.map(function (e) {
-      var item = _objectSpread$c(_objectSpread$c({}, e), {}, {
+      var item = _objectSpread$d(_objectSpread$d({}, e), {}, {
         from: ___default["default"].get(e, RANGE_FNAME + "[0]"),
         to: ___default["default"].get(e, RANGE_FNAME + "[1]"),
         tillNow: ___default["default"].get(e, RANGE_FNAME + "[2]")
@@ -21460,9 +21639,9 @@ var AArray = /*#__PURE__*/function (_BaseViewer) {
 
 var _excluded = ["checkedIcon", "uncheckedIcon", "indeterminateIcon", "children", "iconSize", "iconColor", "className", "style", "checked", "indeterminate", "disabled"];
 
-function ownKeys$b(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 ownKeys$c(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$b(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$b(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$c(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$c(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var DIYCheckbox = function DIYCheckbox(_ref) {
   var _ref$checkedIcon = _ref.checkedIcon,
@@ -21503,7 +21682,7 @@ var DIYCheckbox = function DIYCheckbox(_ref) {
   var currentIcon = getCurrentIcon(); // 如果没有自定义图标，使用默认的 Checkbox
 
   if (!currentIcon) {
-    return jsxRuntime.jsx(antd.Checkbox, _objectSpread$b(_objectSpread$b({
+    return jsxRuntime.jsx(antd.Checkbox, _objectSpread$c(_objectSpread$c({
       className: className,
       style: style,
       checked: checked,
@@ -21552,7 +21731,7 @@ var DIYCheckbox = function DIYCheckbox(_ref) {
     transition: "all 0.3s"
   };
 
-  var wrapperStyle = _objectSpread$b({
+  var wrapperStyle = _objectSpread$c({
     display: "inline-flex",
     alignItems: "center",
     cursor: disabled ? "not-allowed" : "pointer",
@@ -21593,137 +21772,137 @@ var DIYCheckbox = function DIYCheckbox(_ref) {
   });
 };
 
+function ownKeys$b(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$b(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$b(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var SortableItem = /*#__PURE__*/React.memo(function (_ref) {
+  var item = _ref.item;
+
+  var _useSortable = sortable.useSortable({
+    id: item.id,
+    disabled: !item.isChecked
+  }),
+      attributes = _useSortable.attributes,
+      listeners = _useSortable.listeners,
+      setNodeRef = _useSortable.setNodeRef,
+      transform = _useSortable.transform,
+      transition = _useSortable.transition,
+      isDragging = _useSortable.isDragging;
+
+  var style = {
+    transform: utilities.CSS.Transform.toString(transform),
+    transition: transition,
+    opacity: isDragging ? 0 : 1
+  };
+  var itemClass = clsx__default["default"]("dragItem", {
+    dragging: isDragging
+  });
+  return jsxRuntime.jsxs("div", {
+    className: itemClass,
+    ref: setNodeRef,
+    style: style,
+    children: [jsxRuntime.jsx("div", {
+      className: "dragBody",
+      children: item.cpn
+    }), jsxRuntime.jsx("div", {
+      children: item.isChecked ? jsxRuntime.jsx("div", _objectSpread$b(_objectSpread$b(_objectSpread$b({
+        className: "dragHandleWrapper"
+      }, attributes), listeners), {}, {
+        children: jsxRuntime.jsx(icons.HolderOutlined, {
+          className: "dragHandleIcon"
+        })
+      })) : null
+    })]
+  });
+});
+SortableItem.displayName = "SortableItem";
 var SortDrag = /*#__PURE__*/React.memo(function (props) {
   var sortList = props.sortList,
       changeOriginDataSource = props.changeOriginDataSource;
 
   var _useState = React.useState(sortList),
       items = _useState[0],
-      setItems = _useState[1]; // 记录当前拖拽的 item id
-
+      setItems = _useState[1];
 
   var _useState2 = React.useState(null),
-      draggingId = _useState2[0],
-      setDraggingId = _useState2[1]; // 记录当前 hover 的 Id
-
-
-  var _useState3 = React.useState(null),
-      droppingId = _useState3[0],
-      setDroppingId = _useState3[1]; // refs 用于绑定每个 item 的 DOM
-
+      activeId = _useState2[0],
+      setActiveId = _useState2[1]; // 同步外部 sortList 变化到内部状态
 
-  var itemRefs = React.useRef({}); // 修改：为每个 item 单独管理 dragHandle ref
-
-  var dragHandleRefs = React.useRef({}); // 注册拖拽和 drop target
 
   React.useEffect(function () {
-    // 清理函数集合
-    var cleanups = [];
-    items.forEach(function (item, idx) {
-      var el = itemRefs.current[item.id];
-      if (!el) return; // 注册为 draggable
-
-      cleanups.push(adapter.draggable({
-        element: el,
-        dragHandle: dragHandleRefs.current[item.id],
-        canDrag: function canDrag() {
-          return item.isChecked;
-        },
-        getInitialData: function getInitialData() {
-          return {
-            id: item.id,
-            index: idx,
-            label: item.label
-          };
-        },
-        onDragStart: function onDragStart() {
-          return setDraggingId(item.id);
-        },
-        onDrop: function onDrop() {
-          return setDraggingId(null);
-        }
-      })); // 注册为 drop target
+    setItems(sortList);
+  }, [sortList]);
+  var sensors = core.useSensors(core.useSensor(core.TouchSensor, {
+    activationConstraint: {
+      delay: 200,
+      tolerance: 5
+    }
+  }), core.useSensor(core.PointerSensor, {
+    activationConstraint: {
+      distance: 10
+    }
+  }), core.useSensor(core.KeyboardSensor, {
+    coordinateGetter: sortable.sortableKeyboardCoordinates
+  }));
 
-      cleanups.push(adapter.dropTargetForElements({
-        element: el,
-        canDrop: function canDrop() {
-          return item.isChecked;
-        },
-        onDragEnter: function onDragEnter(args) {
-          var fromIdx = items.findIndex(function (i) {
-            return i.id === args.source.data.id;
-          });
-          if (fromIdx === idx) return;
-          console.log("当前hover元素", item.id);
-          console.log("当前拖拽元素", args);
-          setDroppingId(item.id);
-        },
-        onDragLeave: function onDragLeave() {
-          setDroppingId(null);
-        },
-        onDrop: function onDrop(_ref) {
-          var source = _ref.source;
-          // console.log("当前拖拽元素", source);
-          if (!source) return;
-          var fromIdx = items.findIndex(function (i) {
-            return i.id === source.data.id;
-          });
-          var toIdx = idx;
-          if (fromIdx === -1 || fromIdx === toIdx) return;
-          var newItems = [].concat(items);
-
-          var _newItems$splice = newItems.splice(fromIdx, 1),
-              moved = _newItems$splice[0];
-
-          newItems.splice(toIdx, 0, moved);
-          console.log("排序之后的数据", newItems);
-          setItems(newItems);
-          changeOriginDataSource(newItems);
-          setDroppingId(null);
-        }
-      }));
-    }); // 监听全局拖拽，拖拽结束时清理 draggingId
+  var handleDragStart = function handleDragStart(event) {
+    setActiveId(event.active.id);
+  };
 
-    var monitorCleanup = adapter.monitorForElements({
-      onDrop: function onDrop() {
-        return setDraggingId(null);
-      }
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+        over = event.over;
+    setActiveId(null);
+    if (!over || active.id === over.id) return;
+    var oldIndex = items.findIndex(function (item) {
+      return item.id === active.id;
     });
-    cleanups.push(monitorCleanup);
-    return function () {
-      cleanups.forEach(function (fn) {
-        return fn();
-      });
-    };
-  }, [items]);
-  return jsxRuntime.jsx("div", {
-    className: "sortDrag",
-    children: items.map(function (item, index) {
-      var itemClass = clsx__default["default"]("dragItem", {
-        dragging: draggingId === item.id,
-        dropping: droppingId === item.id
-      });
-      return jsxRuntime.jsxs("div", {
-        className: itemClass,
-        ref: function ref(el) {
-          return itemRefs.current[item.id] = el;
-        },
-        children: [jsxRuntime.jsx("div", {
-          className: "dragBody",
-          children: item.cpn
-        }), jsxRuntime.jsx("div", {
-          children: item.isChecked ? jsxRuntime.jsx(icons.HolderOutlined, {
-            ref: function ref(el) {
-              return dragHandleRefs.current[item.id] = el;
-            },
-            style: {
-              cursor: "grab",
-              marginLeft: "8px"
-            }
-          }) : null
-        })]
-      }, item.id);
-    })
+    var newIndex = items.findIndex(function (item) {
+      return item.id === over.id;
+    });
+    if (oldIndex === -1 || newIndex === -1) return;
+    var newItems = sortable.arrayMove(items, oldIndex, newIndex);
+    setItems(newItems);
+    changeOriginDataSource(newItems);
+  };
+
+  var activeItem = items.find(function (item) {
+    return item.id === activeId;
+  });
+  return jsxRuntime.jsxs(core.DndContext, {
+    sensors: sensors,
+    collisionDetection: core.closestCenter,
+    onDragStart: handleDragStart,
+    onDragEnd: handleDragEnd,
+    children: [jsxRuntime.jsx(sortable.SortableContext, {
+      items: items,
+      strategy: sortable.verticalListSortingStrategy,
+      children: jsxRuntime.jsx("div", {
+        className: "sortDrag",
+        children: items.map(function (item) {
+          return jsxRuntime.jsx(SortableItem, {
+            item: item
+          }, item.id);
+        })
+      })
+    }), jsxRuntime.jsx(core.DragOverlay, {
+      dropAnimation: null,
+      children: activeItem ? jsxRuntime.jsx("div", {
+        className: "sortDrag-overlay",
+        children: jsxRuntime.jsxs("div", {
+          className: "sortDrag-overlay-inner",
+          children: [jsxRuntime.jsx("div", {
+            className: "dragBody",
+            children: activeItem.cpn
+          }), jsxRuntime.jsx("div", {
+            className: "sortDrag-overlay-handle",
+            children: jsxRuntime.jsx(icons.HolderOutlined, {
+              className: "sortDrag-overlay-handleIcon"
+            })
+          })]
+        })
+      }) : null
+    })]
   });
 });
 
@@ -22845,8 +23024,10 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
   _proto._data2rangePicker = function _data2rangePicker(d) {
     var _this$props$schema$da2;
 
-    var dataFormat = (_this$props$schema$da2 = this.props.schema.dataFormat) != null ? _this$props$schema$da2 : "x";
-    return [d[0] ? moment__default["default"](d[0], dataFormat) : null, d[1] ? moment__default["default"](d[1], dataFormat) : null];
+    var dataFormat = (_this$props$schema$da2 = this.props.schema.dataFormat) != null ? _this$props$schema$da2 : "x"; // 若 tillNow=true，结束时间传 null，避免 RangePicker 缓存旧结束时间
+
+    var endTime = d[2] === true ? null : d[1] ? moment__default["default"](d[1], dataFormat) : null;
+    return [d[0] ? moment__default["default"](d[0], dataFormat) : null, endTime];
   };
 
   _proto.element = function element() {
@@ -22903,25 +23084,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({
@@ -22951,13 +23150,25 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
       } else if (precision === 'month') {
         extraProps.picker = 'month';
       } else if (pcShowTime) {
-        extraProps.showTime = true;
+        // precision 为 minute 时只展示时分，不展示秒
+        extraProps.showTime = precision === 'minute' ? {
+          format: 'HH:mm'
+        } : true;
       } // 构造元素
 
 
       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"
@@ -22986,7 +23197,20 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
           _this2._onCalendarChangeValue = d;
         },
         onChange: function onChange(vv) {
-          _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data(vv, false), true, true);
+          // 用户清空日期范围时，直接置空
+          if (!vv) {
+            _Viewer.prototype.changeValueEx.call(_this2, undefined, true, true);
+
+            return;
+          }
+
+          var currentData = _Viewer.prototype.getValue.call(_this2);
+
+          var isTillNow = ___default["default"].get(currentData, '[2]') === true; // 若当前是"至今"且用户只改了开始时间（结束时间仍为 null），保留 tillNow
+
+          var newTillNow = isTillNow && vv[1] == null;
+
+          _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data(vv, newTillNow), true, true);
         }
       }, extraProps), this.state.ctrlVersion + "_" + ((_this$props$schema$da7 = this.props.schema.dateRangePrecision) != null ? _this$props$schema$da7 : 'day'));
     }