vxe-pc-ui 3.6.0 → 3.6.2

package/lib/index.umd.js

@@ -10909,7 +10909,7 @@ var es_function_name = __webpack_require__(2010);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__(9085);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.1.2";
+var coreVersion = "3.1.3";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -11614,7 +11614,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.1.2";
+var version = "3.1.3";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -12501,6 +12501,9 @@ setTheme();
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -13033,14 +13036,14 @@ var defineVxeComponent = function defineVxeComponent(options) {
 };
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.6.0");
+var log_version = "ui v".concat("3.6.2");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-var ui_version = "3.6.0";
+var ui_version = "3.6.2";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -28239,11 +28242,11 @@ var DatePicker = VxeDatePicker;
       var $xeDateRangePicker = this;
       var reactData = $xeDateRangePicker.reactData;
       var internalData = $xeDateRangePicker.internalData;
-      var endValue = reactData.endValue;
       var selectStatus = internalData.selectStatus;
       var value = params.value,
         $event = params.$event;
-      $xeDateRangePicker.handleChange(value, selectStatus ? endValue : '', $event);
+      var endValue = selectStatus ? reactData.endValue : '';
+      $xeDateRangePicker.handleChange(value, endValue, $event);
       $xeDateRangePicker.handleSelectClose();
       if (!selectStatus) {
         internalData.selectStatus = true;
@@ -28263,11 +28266,11 @@ var DatePicker = VxeDatePicker;
       var $xeDateRangePicker = this;
       var reactData = $xeDateRangePicker.reactData;
       var internalData = $xeDateRangePicker.internalData;
-      var startValue = reactData.startValue;
       var selectStatus = internalData.selectStatus;
       var value = params.value,
         $event = params.$event;
-      $xeDateRangePicker.handleChange(selectStatus ? startValue : '', value, $event);
+      var startValue = selectStatus ? reactData.startValue : '';
+      $xeDateRangePicker.handleChange(startValue, value, $event);
       $xeDateRangePicker.handleSelectClose();
       if (!selectStatus) {
         internalData.selectStatus = true;
@@ -29869,9 +29872,25 @@ var empty_empty = Vxeempty;
 
 
 
+
+
 var ItemInfo = /*#__PURE__*/function () {
   function ItemInfo($xeForm, item) {
     _classCallCheck(this, ItemInfo);
+    var formatter = item.formatter;
+    if (formatter) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        var gFormatOpts = formats.get(formatter);
+        if (!gFormatOpts || !gFormatOpts.formItemFormatMethod) {
+          errLog('vxe.error.notFormats', [formatter]);
+        }
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        var _gFormatOpts = formats.get(formatter[0]);
+        if (!_gFormatOpts || !_gFormatOpts.formItemFormatMethod) {
+          errLog('vxe.error.notFormats', [formatter[0]]);
+        }
+      }
+    }
     Object.assign(this, {
       id: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('item_'),
       title: item.title,
@@ -29904,6 +29923,7 @@ var ItemInfo = /*#__PURE__*/function () {
       titleStyle: item.titleStyle,
       itemRender: item.itemRender,
       rules: item.rules,
+      formatter: item.formatter,
       // 渲染属性
       showError: false,
       errRule: null,
@@ -30098,6 +30118,9 @@ function destroyItem($xeForm, formItem) {
 
 
 
+
+
+
 function renderPrefixIcon(h, titlePrefix) {
   return h('span', {
     class: 'vxe-form--item-title-prefix'
@@ -30323,21 +30346,25 @@ function renderTitle(h, $xeForm, item, isGroup) {
 var renderItemContent = function renderItemContent(h, $xeForm, item) {
   var formProps = $xeForm;
   var formReactData = $xeForm.reactData;
+  var formInternalData = $xeForm.internalData;
   var $xeGrid = $xeForm.$xeGrid;
   var data = formProps.data,
     readonly = formProps.readonly,
     disabled = formProps.disabled;
+  var itemFormatCache = formInternalData.itemFormatCache;
   var collapseAll = formReactData.collapseAll;
   var slots = item.slots,
     field = item.field,
     itemRender = item.itemRender,
     collapseNode = item.collapseNode,
-    errRule = item.errRule;
+    errRule = item.errRule,
+    formatter = item.formatter;
   var defaultSlot = slots ? slots.default : null;
   var validSlot = slots ? slots.valid : null;
   var validOpts = $xeForm.computeValidOpts;
   var collapseOpts = $xeForm.computeCollapseOpts;
   var compConf = isEnableConf(itemRender) ? renderer.get(itemRender.name) : null;
+  var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
   var params = {
     data: data,
     disabled: disabled,
@@ -30345,6 +30372,7 @@ var renderItemContent = function renderItemContent(h, $xeForm, item) {
     field: field,
     property: field,
     item: item,
+    itemValue: itemValue,
     $form: $xeForm,
     $grid: $xeGrid
   };
@@ -30355,8 +30383,43 @@ var renderItemContent = function renderItemContent(h, $xeForm, item) {
   } else if (rftContent) {
     contentVNs = getSlotVNs(rftContent.call($xeForm, h, itemRender, params));
   } else if (field) {
-    var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
-    contentVNs = [eqEmptyValue(itemValue) ? '' : "".concat(itemValue)];
+    var itemLabel = itemValue;
+    if (formatter) {
+      var formatData;
+      if (field) {
+        var itemRest = itemFormatCache[field];
+        if (itemRest) {
+          formatData = itemRest.formatData;
+          if (formatData) {
+            if (formatData.value === itemValue) {
+              return formatData.label;
+            }
+          } else {
+            formatData = itemRest.formatData = {};
+          }
+        } else {
+          itemFormatCache[field] = {
+            field: field
+          };
+        }
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        var gFormatOpts = formats.get(formatter);
+        var fiFormatMethod = gFormatOpts ? gFormatOpts.formItemFormatMethod : null;
+        itemLabel = fiFormatMethod ? fiFormatMethod(params) : '';
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        var _gFormatOpts = formats.get(formatter[0]);
+        var _fiFormatMethod = _gFormatOpts ? _gFormatOpts.formItemFormatMethod : null;
+        itemLabel = _fiFormatMethod ? _fiFormatMethod.apply(void 0, [params].concat(_toConsumableArray(formatter.slice(1)))) : '';
+      } else {
+        itemLabel = formatter(params);
+      }
+      if (formatData) {
+        formatData.value = itemValue;
+        formatData.label = itemLabel;
+      }
+    }
+    contentVNs = [eqEmptyValue(itemLabel) ? '' : "".concat(itemLabel)];
   }
   if (collapseNode) {
     contentVNs.push(h('div', {
@@ -30701,7 +30764,8 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
       tooltipStore: {
         item: null,
         visible: false
-      }
+      },
+      itemFormatCache: {}
     };
     return {
       xID: xID,
@@ -30753,6 +30817,7 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
       var $xeForm = this;
       var slots = $xeForm.$scopedSlots;
       var reactData = $xeForm.reactData;
+      var internalData = $xeForm.internalData;
       if (list.length) {
         list.forEach(function (item) {
           if (item.slots) {
@@ -30771,6 +30836,7 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
       }, {
         children: 'children'
       });
+      internalData.itemFormatCache = {};
       return $xeForm.$nextTick();
     },
     getItems: function getItems() {
@@ -30877,6 +30943,7 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
       var $xeForm = this;
       var props = $xeForm;
       var $xeGrid = $xeForm.$xeGrid;
+      var internalData = $xeForm.internalData;
       var data = props.data;
       var itemList = $xeForm.getItems();
       if (data) {
@@ -30901,6 +30968,7 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
           }
         });
       }
+      internalData.itemFormatCache = {};
       return $xeForm.clearValidate();
     },
     resetEvent: function resetEvent(evnt) {
@@ -31486,17 +31554,18 @@ function getElementOns(renderOpts, params, modelFunc, changeFunc) {
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
+function getComponentOns(renderOpts, params, eFns, eventOns) {
   var events = renderOpts.events;
+  var _ref3 = eFns || {},
+    modelFunc = _ref3.model,
+    changeFunc = _ref3.change;
   var modelEvent = getModelEvent(renderOpts.name);
   var changeEvent = getChangeEvent(renderOpts.name);
   var ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, function (func, key) {
     ons[getOnName(key)] = function () {
-      if (true) {
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
-          errLog('vxe.error.errFunc', [func]);
-        }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
+        errLog('vxe.error.errFunc', [func]);
       }
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
@@ -31523,18 +31592,21 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
       }
     };
   }
-  return ons;
+  return eventOns ? Object.assign(ons, eventOns) : ons;
 }
 function getItemOns(renderOpts, params) {
   var $form = params.$form,
     data = params.data,
     field = params.field;
-  return getComponentOns(renderOpts, params, function (value) {
-    // 处理 model 值双向绑定
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
-  }, function () {
-    // 处理 change 事件相关逻辑
-    $form.updateStatus(params);
+  return getComponentOns(renderOpts, params, {
+    model: function model(value) {
+      // 处理 model 值双向绑定
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
+    },
+    change: function change() {
+      // 处理 change 事件相关逻辑
+      $form.updateStatus(params);
+    }
   });
 }
 function getNativeItemOns(renderOpts, params) {
@@ -31765,6 +31837,46 @@ renderer.mixin({
     formItemAutoFocus: 'input',
     renderFormItemContent: defaultItemRender
   },
+  VxeDateRangePicker: {
+    formItemAutoFocus: 'input',
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
+      var startField = renderOpts.startField,
+        endField = renderOpts.endField;
+      var $form = params.$form,
+        data = params.data,
+        field = params.field;
+      var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+      var seProps = {};
+      var seOs = {};
+      if (startField && endField) {
+        seProps.startValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, startField);
+        seProps.endValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, endField);
+        seOs['update:startValue'] = function (value) {
+          if (startField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, startField, value);
+          }
+        };
+        seOs['update:endValue'] = function (value) {
+          if (endField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, endField, value);
+          }
+        };
+      }
+      return [h(getDefaultComponent(renderOpts), {
+        props: getComponentFormItemProps(renderOpts, params, itemValue, seProps),
+        on: getComponentOns(renderOpts, params, {
+          model: function model(value) {
+            // 处理 model 值双向绑定
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
+          },
+          change: function change() {
+            // 处理 change 事件相关逻辑
+            $form.updateStatus(params);
+          }
+        }, seOs)
+      })];
+    }
+  },
   VxeButton: {
     renderFormItemContent: defaultFormItemRender
   },
@@ -32045,6 +32157,7 @@ var formItemProps = {
     type: Boolean,
     default: null
   },
+  formatter: [String, Function],
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],