form-driver 0.4.18 → 0.4.20

package/lib/m3.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('antd/dist/antd.css');
-require('antd-mobile/dist/antd-mobile.css');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var antd = require('antd');
 var React = require('react');
@@ -13,7 +12,7 @@ var _inheritsLoose = require('@babel/runtime/helpers/inheritsLoose');
 var _construct = require('@babel/runtime/helpers/construct');
 var moment = require('moment');
 var antdMobile = require('antd-mobile');
-var zhCN = require('antd/lib/date-picker/locale/zh_CN');
+var zhCN = require('antd/es/locale/zh_CN');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var icons = require('@ant-design/icons');
 var TextArea = require('antd/lib/input/TextArea');
@@ -22,8 +21,10 @@ var adapter = require('@atlaskit/pragmatic-drag-and-drop/element/adapter');
 var clsx = require('clsx');
 var Button = require('antd/lib/button');
 var _objectWithoutPropertiesLoose = require('@babel/runtime/helpers/objectWithoutPropertiesLoose');
+var zhCN$1 = require('antd/lib/date-picker/locale/zh_CN');
 var ReactDOM = require('react-dom');
 var debounce = require('lodash/debounce');
+require('moment/locale/zh-cn');
 var _extends = require('@babel/runtime/helpers/extends');
 var OSS = require('ali-oss');
 
@@ -42,6 +43,7 @@ var Select__default = /*#__PURE__*/_interopDefaultLegacy(Select);
 var clsx__default = /*#__PURE__*/_interopDefaultLegacy(clsx);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var _objectWithoutPropertiesLoose__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutPropertiesLoose);
+var zhCN__default$1 = /*#__PURE__*/_interopDefaultLegacy(zhCN$1);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
@@ -15127,7 +15129,7 @@ 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;
+    var _dataFormat, _dataFormat2, _dataFormat3, _dataFormat4, _dataFormat5, _dataFormat6, _dataFormat7, _dataFormat8;
 
     var dataFormat = schema.dataFormat;
     var readableFormat;
@@ -15137,28 +15139,59 @@ var MDateTimeType = ___default["default"].assign({}, EmtpyType, {
     switch (schema.type) {
       case "year":
         mode = "year";
-        dataFormat = (_dataFormat = dataFormat) != null ? _dataFormat : 'YYYY';
-        readableFormat = 'YYYY';
+        dataFormat = (_dataFormat = dataFormat) != null ? _dataFormat : "YYYY";
+        readableFormat = "YYYY";
         break;
 
       case "yearMonth":
         mode = "month";
-        dataFormat = (_dataFormat2 = dataFormat) != null ? _dataFormat2 : 'YYYYMM';
-        readableFormat = 'YYYY-MM';
+        dataFormat = (_dataFormat2 = dataFormat) != null ? _dataFormat2 : "YYYYMM";
+        readableFormat = "YYYY-MM";
         break;
 
       case "yearMonthDay":
         mode = "date";
-        dataFormat = (_dataFormat3 = dataFormat) != null ? _dataFormat3 : 'YYYYMMDD';
-        readableFormat = 'YYYY-MM-DD';
+        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';
+        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);
@@ -15841,6 +15874,24 @@ 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 "至今";
@@ -15873,21 +15924,19 @@ var MDateRangeType = ___default["default"].assign({}, EmtpyType, {
       return assembly.theme.READABLE_INVALID;
     }
 
-    return timeRangeExpr(assembly, vs[0], vs[1], vs[2], (_s$dateRange = s.dateRange) != null && _s$dateRange.showTime ? "YYYY年MM月DD日 HH:mm:ss" : "YYYY年MM月DD日");
+    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
-   * @param assembly
-   * @param s
-   * @param vs
-   * @returns
    */
   toReadableN: function toReadableN(assembly, s, vs) {
     if (!___default["default"].isNil(vs) && ___default["default"].isArray(vs)) {
       var _s$dateRange2;
 
-      return timeRangeExpr(assembly, vs[0], vs[1], vs[2], (_s$dateRange2 = s.dateRange) != null && _s$dateRange2.showTime ? "YYYY年MM月DD日 HH:mm:ss" : "YYYY年MM月DD日");
+      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;
@@ -16413,6 +16462,23 @@ var ArrayViewer = /*#__PURE__*/function (_BaseViewer) {
 function ownKeys$v(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$v(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$v(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$v(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function toPrecision(mode) {
+  switch (mode) {
+    case "year":
+      return "year";
+
+    case "month":
+      return "month";
+
+    case "date":
+      return "day";
+
+    default:
+      return "minute";
+    // datetime 场景
+  }
+}
 /**
  * 日期选择框
  * 配置示例：
@@ -16424,17 +16490,22 @@ function _objectSpread$v(target) { for (var i = 1; i < arguments.length; i++) {
  * 类型是dateTime时，dataFormat默认是x，例如1608897466955
  */
 
+
 var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](ADatetimePicker, _BaseViewer);
 
-  function ADatetimePicker() {
-    return _BaseViewer.apply(this, arguments) || this;
+  function ADatetimePicker(props) {
+    var _this;
+
+    _this = _BaseViewer.call(this, props) || this;
+    _this.state.pickerVisible = false;
+    return _this;
   }
 
   var _proto = ADatetimePicker.prototype;
 
   _proto.element = function element() {
-    var _this = this,
+    var _this2 = this,
         _this$props$schema$pr;
 
     var antConf = MDateTimeType.antConf(this.props.schema);
@@ -16451,9 +16522,9 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
       if (vv) {
         var vvAsM = ___default["default"].isDate(vv) ? moment__default["default"](vv) : vv;
 
-        _BaseViewer.prototype.changeValue.call(_this, vvAsM.format(antConf.dataFormat));
+        _BaseViewer.prototype.changeValue.call(_this2, vvAsM.format(antConf.dataFormat));
       } else {
-        _BaseViewer.prototype.changeValue.call(_this, undefined);
+        _BaseViewer.prototype.changeValue.call(_this2, undefined);
       }
     };
 
@@ -16461,36 +16532,60 @@ var ADatetimePicker = /*#__PURE__*/function (_BaseViewer) {
 
     if (MUtil.phoneLike()) {
       // 手机
-      return jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$v(_objectSpread$v({
-        disabled: this.props.disable,
-        value: dataAsDate,
-        minDate: this.props.schema.min ? moment__default["default"](this.props.schema.min, antConf.dataFormat).toDate() : undefined,
-        maxDate: this.props.schema.max ? moment__default["default"](this.props.schema.max, antConf.dataFormat).toDate() : undefined,
-        mode: antConf.mode,
-        onChange: onChange
-      }, p), {}, {
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: "backfill",
+          onClick: function onClick() {
+            if (!_this2.props.disable) _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: dataAsDate ? moment__default["default"](dataAsDate).format(antConf.readableFormat) : "请点击选择"
-        })
-      }), this.props.path);
+        }), jsxRuntime.jsx(antdMobile.DatePicker, _objectSpread$v({
+          visible: this.state.pickerVisible,
+          value: dataAsDate,
+          min: this.props.schema.min ? moment__default["default"](this.props.schema.min, antConf.dataFormat).toDate() : undefined,
+          max: this.props.schema.max ? moment__default["default"](this.props.schema.max, antConf.dataFormat).toDate() : undefined,
+          precision: toPrecision(antConf.mode),
+          onConfirm: function onConfirm(val) {
+            onChange(val);
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
+      var _antConf$mode;
+
       // 大屏
-      return jsxRuntime.jsx(antd.DatePicker, _objectSpread$v({
-        disabled: this.props.disable,
-        bordered: this.props.hideBorder ? false : true,
-        disabledDate: function disabledDate(m) {
-          var d = _this.props.schema.min && moment__default["default"](_this.props.schema.min, antConf.dataFormat).isAfter(m) || _this.props.schema.max && moment__default["default"](_this.props.schema.max, antConf.dataFormat).isBefore(m);
-          return !!d;
-        },
-        format: antConf.readableFormat,
-        style: this.props.style,
+      // key 中加入 mode 信息，确保精度切换时组件重新挂载
+      var pickerKey = this.props.path + "_" + ((_antConf$mode = antConf.mode) != null ? _antConf$mode : "datetime");
+      return jsxRuntime.jsx(antd.ConfigProvider, {
         locale: zhCN__default["default"],
-        defaultValue: dataAsMoment,
-        showTime: antConf.showTime,
-        picker: antConf.mode,
-        onChange: onChange
-      }, p), this.props.path);
+        children: jsxRuntime.jsx(antd.DatePicker, _objectSpread$v({
+          disabled: this.props.disable,
+          bordered: this.props.hideBorder ? false : true,
+          disabledDate: function disabledDate(m) {
+            var d = _this2.props.schema.min && moment__default["default"](_this2.props.schema.min, antConf.dataFormat).isAfter(m) || _this2.props.schema.max && moment__default["default"](_this2.props.schema.max, antConf.dataFormat).isBefore(m);
+            return !!d;
+          },
+          format: antConf.readableFormat,
+          style: {
+            width: "300px"
+          },
+          defaultValue: dataAsMoment,
+          showTime: antConf.showTime,
+          picker: antConf.mode,
+          onChange: onChange
+        }, p), pickerKey)
+      });
     }
   };
 
@@ -16509,8 +16604,12 @@ function _objectSpread$u(target) { for (var i = 1; i < arguments.length; i++) {
 var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](AGB2260, _BaseViewer);
 
-  function AGB2260() {
-    return _BaseViewer.apply(this, arguments) || this;
+  function AGB2260(props) {
+    var _this;
+
+    _this = _BaseViewer.call(this, props) || this;
+    _this.state.pickerVisible = false;
+    return _this;
   }
 
   var _proto = AGB2260.prototype;
@@ -16518,7 +16617,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
   _proto.element = function element() {
     var _MGB2260Type$lookup,
         _this$props$schema$pr,
-        _this = this;
+        _this2 = this;
 
     var v = _BaseViewer.prototype.getValue.call(this);
 
@@ -16533,26 +16632,34 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
       var _looked$label;
 
       // 手机  
-      return jsxRuntime.jsx(antdMobile.Picker, _objectSpread$u(_objectSpread$u({
-        extra: _BaseViewer.prototype.getPlaceholder.call(this),
-        disabled: this.props.disable,
-        className: "AGB2260",
-        data: MGB2260Type.gb2260,
-        value: looked.code,
-        title: this.props.schema.label,
-        onDismiss: function onDismiss() {
-          return console.log('dismiss');
-        },
-        onOk: function onOk(e) {
-          return _BaseViewer.prototype.changeValue.call(_this, ___default["default"].last(e));
-        }
-      }, p), {}, {
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: "backfill",
           style: this.props.style,
+          onClick: function onClick() {
+            if (!_this2.props.disable) _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: looked == null ? void 0 : (_looked$label = looked.label) == null ? void 0 : _looked$label.join("/")
-        })
-      }), this.props.path);
+        }), jsxRuntime.jsx(antdMobile.Picker, _objectSpread$u({
+          columns: MGB2260Type.gb2260,
+          value: looked.code,
+          visible: this.state.pickerVisible,
+          onConfirm: function onConfirm(e) {
+            _BaseViewer.prototype.changeValue.call(_this2, ___default["default"].last(e));
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
       // PC
       return jsxRuntime.jsx(antd.Cascader, _objectSpread$u({
@@ -16564,7 +16671,7 @@ var AGB2260 = /*#__PURE__*/function (_BaseViewer) {
         style: this.props.style,
         defaultValue: looked.code,
         onChange: function onChange(vv) {
-          _BaseViewer.prototype.changeValue.call(_this, ___default["default"].last(vv));
+          _BaseViewer.prototype.changeValue.call(_this2, ___default["default"].last(vv));
         }
       }, p), this.props.path);
     }
@@ -17393,39 +17500,58 @@ var UnderlineInputBox = /*#__PURE__*/function (_React$Component) {
 var SelectBox = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose__default["default"](SelectBox, _React$Component);
 
-  function SelectBox() {
-    return _React$Component.apply(this, arguments) || this;
+  function SelectBox(props) {
+    var _this;
+
+    _this = _React$Component.call(this, props) || this;
+    _this.state = {
+      pickerVisible: false
+    };
+    return _this;
   }
 
   var _proto = SelectBox.prototype;
 
   _proto.render = function render() {
-    var _this = this;
+    var _this2 = this;
 
     if (MUtil.phoneLike()) {
       var _looked$label;
 
       var looked = this.props.options.find(function (o) {
-        return o.value === _this.props.data;
+        return o.value === _this2.props.data;
       });
       var backfillClass = looked ? "backfill" : "backfill_empty";
-      return jsxRuntime.jsx(antdMobile.Picker, {
-        extra: "\u8BF7\u9009\u62E9(\u53EF\u9009)",
-        cols: 1,
-        data: this.props.options,
-        value: [this.props.data],
-        onOk: function onOk(e) {
-          return _this.props.onChange(___default["default"].last(e));
-        },
-        onDismiss: function onDismiss() {
-          if (_this.props.onBlur) {
-            _this.props.onBlur();
-          }
-        },
-        children: jsxRuntime.jsx("div", {
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
           className: backfillClass,
+          onClick: function onClick() {
+            return _this2.setState({
+              pickerVisible: true
+            });
+          },
           children: (_looked$label = looked == null ? void 0 : looked.label) != null ? _looked$label : "点击选择"
-        })
+        }), jsxRuntime.jsx(antdMobile.Picker, {
+          columns: [this.props.options],
+          value: [this.props.data],
+          visible: this.state.pickerVisible,
+          onConfirm: function onConfirm(e) {
+            _this2.props.onChange(___default["default"].last(e));
+
+            _this2.setState({
+              pickerVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this2.setState({
+              pickerVisible: false
+            });
+
+            if (_this2.props.onBlur) {
+              _this2.props.onBlur();
+            }
+          }
+        })]
       });
     } else {
       return jsxRuntime.jsx(antd.Select, {
@@ -22659,10 +22785,13 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
 
     _this = _Viewer.call(this, p) || this;
     _this._pickerRef = /*#__PURE__*/React__default["default"].createRef();
+    _this._startConfirmed = false; // 标记开始日期是否已确认，用于区分 onClose 是取消还是确认后的自动触发
+
     _this.state = {
       ctrlVersion: 1,
       noValidate: false,
-      mobileDlg: false
+      mobileDlg: false,
+      mobileStep: 'start'
     };
     return _this;
   }
@@ -22725,57 +22854,115 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
         _this$getValue,
         _this2 = this;
 
-    var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
+    (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
     var rangePickerData = this._data2rangePicker((_this$getValue = this.getValue()) != null ? _this$getValue : []);
 
     if (MUtil.phoneLike()) {
-      var _this$props$schema$da3;
+      var _this$props$schema$da3, _this$props$schema$da4;
+
+      var show = MDateRangeType.toReadableN(assembly, this.props.schema, _Viewer.prototype.getValue.call(this)); // 根据 precision 配置确定移动端 DatePicker 精度（使用扁平化属性 dateRangePrecision）
 
-      var show = MDateRangeType.toReadableN(assembly, this.props.schema, _Viewer.prototype.getValue.call(this));
+      var mobilePrecision = this.props.schema.dateRangePrecision || 'day';
       return jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [jsxRuntime.jsxs("div", {
           className: "backfill",
           onClick: function onClick() {
             return _this2.setState({
-              mobileDlg: true
+              mobileDlg: true,
+              mobileStep: 'start'
             });
           },
           children: [" ", show != null ? show : '请点击选择', " "]
-        }), jsxRuntime.jsx(antdMobile.Calendar, _objectSpread$8({
-          visible: this.state.mobileDlg,
-          pickTime: (_this$props$schema$da3 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da3.showTime,
-          minDate: this.props.schema.min ? new Date(this.props.schema.min) : undefined,
-          maxDate: this.props.schema.min ? new Date(this.props.schema.max) : undefined,
-          onCancel: function onCancel() {
-            return _this2.setState({
-              mobileDlg: false
+        }), jsxRuntime.jsx(antdMobile.DatePicker, {
+          visible: this.state.mobileDlg && this.state.mobileStep === 'start',
+          precision: mobilePrecision,
+          title: "\u9009\u62E9\u5F00\u59CB\u65E5\u671F",
+          min: this.props.schema.min ? new Date(this.props.schema.min) : undefined,
+          max: this.props.schema.max ? new Date(this.props.schema.max) : undefined,
+          onConfirm: function onConfirm(val) {
+            _this2._startConfirmed = true;
+
+            _this2.setState({
+              mobileStartDate: val,
+              mobileStep: 'end'
             });
           },
-          onConfirm: function onConfirm(start, end) {
-            _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](start), moment__default["default"](end)], false), true, true);
+          onClose: function onClose() {
+            // antd-mobile v5 确认时会同时触发 onConfirm 和 onClose
+            // 用实例变量同步判断：确认后的 onClose 应忽略，仅用户主动取消时才关闭
+            if (_this2._startConfirmed) {
+              _this2._startConfirmed = false;
+              return;
+            }
 
             _this2.setState({
               mobileDlg: false
             });
           }
-        }, p))]
+        }, "start_" + mobilePrecision), jsxRuntime.jsx(antdMobile.DatePicker, {
+          visible: this.state.mobileDlg && this.state.mobileStep === 'end',
+          precision: mobilePrecision,
+          title: "\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),
+          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;
+
+                _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data([moment__default["default"](startDate), moment__default["default"](finalEnd)], false), true, true);
+              }
+            }
+
+            _this2.setState({
+              mobileDlg: false
+            });
+          },
+          onClose: function onClose() {
+            // 回退到第一步，让用户可以重新选择开始日期
+            _this2.setState({
+              mobileStep: 'start'
+            });
+          }
+        }, "end_" + mobilePrecision)]
       });
     } else {
-      var _this$props$schema$da4, _this$props$schema$da5, _this$props$schema$da6;
+      var _this$props$schema$da5, _this$props$schema$da6, _this$props$schema$da7;
+
+      // 根据 precision 配置确定 PC 端 picker 模式和 showTime（使用扁平化属性 dateRangePrecision）
+      var precision = this.props.schema.dateRangePrecision;
+      var pcShowTime = precision === 'minute' || ((_this$props$schema$da5 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da5.showTime);
+      var hideFooter = ((_this$props$schema$da6 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da6.hideTillNow) || pcShowTime; // 动态构建额外属性，避免 showTime 和 picker 同时传入导致类型冲突
+
+      var extraProps = {};
 
-      // 构造元素
-      return jsxRuntime.jsx(antd.DatePicker.RangePicker, {
+      if (precision === 'year') {
+        extraProps.picker = 'year';
+      } else if (precision === 'month') {
+        extraProps.picker = 'month';
+      } else if (pcShowTime) {
+        extraProps.showTime = true;
+      } // 构造元素
+
+
+      return jsxRuntime.jsx(antd.DatePicker.RangePicker, _objectSpread$8({
         ref: this._pickerRef,
-        showTime: (_this$props$schema$da4 = this.props.schema.dateRange) == null ? void 0 : _this$props$schema$da4.showTime,
-        renderExtraFooter: (_this$props$schema$da5 = this.props.schema.dateRange) != null && _this$props$schema$da5.hideTillNow || (_this$props$schema$da6 = this.props.schema.dateRange) != null && _this$props$schema$da6.showTime // TODO 显示时间时，“至今”无法支持
-        ? undefined : function (mode) {
-          return jsxRuntime.jsx("div", _objectSpread$8(_objectSpread$8({
+        renderExtraFooter: hideFooter ? undefined : function (mode) {
+          return jsxRuntime.jsx("div", {
             style: {
               textAlign: "right"
-            }
-          }, p), {}, {
-            children: jsxRuntime.jsx(antdMobile.Button, {
+            },
+            children: jsxRuntime.jsx(antd.Button, {
               size: "small",
               style: {
                 width: "100px",
@@ -22787,13 +22974,13 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
               },
               children: "\u81F3\u4ECA"
             })
-          }));
+          });
         },
         bordered: this.props.hideBorder ? false : true,
         style: {
-          minWidth: "240px"
+          width: "300px"
         },
-        locale: zhCN__default["default"],
+        locale: zhCN__default$1["default"],
         defaultValue: rangePickerData,
         onCalendarChange: function onCalendarChange(d) {
           _this2._onCalendarChangeValue = d;
@@ -22801,7 +22988,7 @@ var ARangePicker = /*#__PURE__*/function (_Viewer) {
         onChange: function onChange(vv) {
           _Viewer.prototype.changeValueEx.call(_this2, _this2._rangePicker2Data(vv, false), true, true);
         }
-      }, this.state.ctrlVersion);
+      }, extraProps), this.state.ctrlVersion + "_" + ((_this$props$schema$da7 = this.props.schema.dateRangePrecision) != null ? _this$props$schema$da7 : 'day'));
     }
   };
 
@@ -23866,7 +24053,50 @@ var ACascadePicker = /*#__PURE__*/function (_BaseViewer) {
     var p = (_this$props$schema$pr = this.props.schema.props) != null ? _this$props$schema$pr : {};
 
     if (MUtil.phoneLike()) {
-      return jsxRuntime.jsx(jsxRuntime.Fragment, {});
+      var _this$state;
+
+      return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [jsxRuntime.jsx("div", {
+          className: "backfill",
+          onClick: function onClick() {
+            return _this.setState({
+              cascadeVisible: true
+            });
+          },
+          children: show.length > 0 ? show.map(function (item) {
+            return item.label || item.value || item;
+          }).join('-') : '请点击选择'
+        }), jsxRuntime.jsx(antdMobile.CascadePicker, _objectSpread$4({
+          options: candidate,
+          value: show.map(function (item) {
+            return item.value || item;
+          }),
+          visible: (_this$state = this.state) == null ? void 0 : _this$state.cascadeVisible,
+          onConfirm: function onConfirm(v) {
+            var vLabel = [];
+            v.forEach(function (item) {
+              candidate.forEach(function (dataItem) {
+                var findItem = findById(dataItem, item, "label", "value", "children");
+
+                if (findItem !== -1) {
+                  vLabel.push(findItem);
+                }
+              });
+            });
+
+            _BaseViewer.prototype.changeValue.call(_this, vLabel);
+
+            _this.setState({
+              cascadeVisible: false
+            });
+          },
+          onClose: function onClose() {
+            _this.setState({
+              cascadeVisible: false
+            });
+          }
+        }, p))]
+      });
     } else {
       return jsxRuntime.jsx(antd.Cascader, _objectSpread$4({
         options: candidate,
@@ -24514,9 +24744,11 @@ function ensureM3() {
   }
 
   init = true;
+  moment__default["default"].locale('zh-cn');
   assembly.types = ___default["default"].merge(assembly.types, {
     enum: MEnumType,
     gb2260: MGB2260Type,
+    date: MDateTimeType,
     datetime: MDateTimeType,
     year: MDateTimeType,
     yearMonth: MDateTimeType,
@@ -24582,6 +24814,7 @@ function ensureM3() {
     editor: {
       enum: "ASelector",
       gb2260: "AGB2260",
+      date: "ADatetimePicker",
       datetime: "ADatetimePicker",
       year: "ADatetimePicker",
       yearMonth: "ADatetimePicker",
@@ -24610,6 +24843,7 @@ function ensureM3() {
     readable: {
       enum: "DivViewer",
       gb2260: "DivViewer",
+      date: "DivViewer",
       datetime: "DivViewer",
       year: "DivViewer",
       yearMonth: "DivViewer",