vxe-pc-ui 4.6.1 → 4.6.3

package/lib/index.umd.js

@@ -4213,14 +4213,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.6.1"}`;
+const log_version = `ui v${"4.6.3"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.6.1";
+const ui_version = "4.6.3";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -14635,6 +14635,7 @@ const Countdown = VxeCountdown;
       type: [String, Number, Date],
       default: () => getConfig().datePanel.endDate
     },
+    defaultDate: [String, Number, Date],
     minDate: [String, Number, Date],
     maxDate: [String, Number, Date],
     startDay: {
@@ -15708,9 +15709,11 @@ const Countdown = VxeCountdown;
     };
     const dateOpenPanel = () => {
       const {
-        type
+        type,
+        defaultDate
       } = props;
       const isDateTimeType = computeIsDateTimeType.value;
+      const dateValueFormat = computeDateValueFormat.value;
       const dateValue = computeDateValue.value;
       if (['year', 'quarter', 'month', 'week'].indexOf(type) > -1) {
         reactData.datePanelType = type;
@@ -15722,7 +15725,16 @@ const Countdown = VxeCountdown;
         dateMonthHandle(dateValue, 0);
         dateParseValue(dateValue);
       } else {
-        dateNowHandle();
+        if (defaultDate) {
+          const defDate = parseDate(defaultDate, dateValueFormat);
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isValidDate(defDate)) {
+            dateMonthHandle(defDate, 0);
+          } else {
+            dateNowHandle();
+          }
+        } else {
+          dateNowHandle();
+        }
       }
       if (isDateTimeType) {
         reactData.datetimePanelValue = reactData.datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
@@ -15741,7 +15753,7 @@ const Countdown = VxeCountdown;
     };
     const datePanelMethods = {
       dispatchEvent,
-      getValue() {
+      getModelValue() {
         return reactData.inputValue;
       },
       setPanelDate(date) {
@@ -16339,6 +16351,7 @@ const DatePanel = VxeDatePanel;
       type: [String, Number, Date],
       default: () => getConfig().datePicker.endDate
     },
+    defaultDate: [String, Number, Date],
     minDate: [String, Number, Date],
     maxDate: [String, Number, Date],
     startDay: {
@@ -16719,7 +16732,8 @@ const DatePanel = VxeDatePanel;
     };
     const panelChangeEvent = params => {
       const {
-        multiple
+        multiple,
+        autoClose
       } = props;
       const {
         value,
@@ -16728,7 +16742,9 @@ const DatePanel = VxeDatePanel;
       const isDateTimeType = computeIsDateTimeType.value;
       handleChange(value, $event);
       if (!multiple && !isDateTimeType) {
-        hidePanel();
+        if (autoClose) {
+          hidePanel();
+        }
       }
     };
     // 全局事件
@@ -17106,6 +17122,7 @@ const DatePanel = VxeDatePanel;
         startDate: props.startDate,
         endDate: props.endDate,
         minDate: props.minDate,
+        defaultDate: props.defaultDate,
         maxDate: props.maxDate,
         startDay: props.startDay,
         labelFormat: props.labelFormat,
@@ -17113,8 +17130,7 @@ const DatePanel = VxeDatePanel;
         festivalMethod: props.festivalMethod,
         disabledMethod: props.disabledMethod,
         selectDay: props.selectDay,
-        onChange: panelChangeEvent,
-        onDateToday: hidePanel
+        onChange: panelChangeEvent
       })]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--layout-footer-wrapper'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -17338,6 +17354,7 @@ const DatePicker = VxeDatePicker;
     },
     minDate: [String, Number, Date],
     maxDate: [String, Number, Date],
+    defaultDate: [String, Number, Date],
     startDay: {
       type: [String, Number],
       default: () => getConfig().dateRangePicker.startDay
@@ -17767,8 +17784,8 @@ const DatePicker = VxeDatePicker;
       const $startDatePanel = refStartDatePanel.value;
       const $endDatePanel = refEndDatePanel.value;
       if ($startDatePanel && $endDatePanel) {
-        const startValue = $startDatePanel.getValue();
-        const endValue = $endDatePanel.getValue();
+        const startValue = $startDatePanel.getModelValue();
+        const endValue = $endDatePanel.getModelValue();
         if (!startValue || !endValue) {
           handleChange('', '', {
             type: 'check'
@@ -17848,8 +17865,8 @@ const DatePicker = VxeDatePicker;
       const $startDatePanel = refStartDatePanel.value;
       const $endDatePanel = refEndDatePanel.value;
       if ($startDatePanel && $endDatePanel) {
-        const startValue = $startDatePanel.getValue();
-        const endValue = $endDatePanel.getValue();
+        const startValue = $startDatePanel.getModelValue();
+        const endValue = $endDatePanel.getModelValue();
         if (startValue && endValue) {
           $startDatePanel.confirmByEvent(evnt);
           $endDatePanel.confirmByEvent(evnt);
@@ -17877,7 +17894,7 @@ const DatePicker = VxeDatePicker;
         const $startDatePanel = refStartDatePanel.value;
         const $endDatePanel = refEndDatePanel.value;
         if ($startDatePanel && $endDatePanel) {
-          const startValue = $startDatePanel.getValue();
+          const startValue = $startDatePanel.getModelValue();
           if (!endValue && startValue) {
             $endDatePanel.setPanelDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(startValue));
           }
@@ -17902,7 +17919,7 @@ const DatePicker = VxeDatePicker;
         const $startDatePanel = refStartDatePanel.value;
         const $endDatePanel = refEndDatePanel.value;
         if ($startDatePanel && $endDatePanel) {
-          const endValue = $endDatePanel.getValue();
+          const endValue = $endDatePanel.getModelValue();
           if (!startValue && endValue) {
             $startDatePanel.setPanelDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(endValue));
           }
@@ -19320,8 +19337,26 @@ const Empty = VxeEmpty;
 /* harmony default export */ var packages_empty = (VxeEmpty);
 ;// CONCATENATED MODULE: ./packages/form/src/itemInfo.ts
 
+
+
 class ItemInfo {
   constructor($xeForm, item) {
+    const {
+      formatter
+    } = item;
+    if (formatter) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        const 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)) {
+        const 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,
@@ -19354,6 +19389,7 @@ class ItemInfo {
       titleStyle: item.titleStyle,
       itemRender: item.itemRender,
       rules: item.rules,
+      formatter,
       // 渲染属性
       showError: false,
       errRule: null,
@@ -19782,11 +19818,15 @@ function renderTitle($xeForm, item, isGroup) {
 const renderItemContent = ($xeForm, item) => {
   const formProps = $xeForm.props;
   const formReactData = $xeForm.reactData;
+  const formInternalData = $xeForm.internalData;
   const $xeGrid = $xeForm.xeGrid;
   const {
     computeCollapseOpts,
     computeValidOpts
   } = $xeForm.getComputeMaps();
+  const {
+    itemFormatCache
+  } = formInternalData;
   const {
     data,
     readonly,
@@ -19800,13 +19840,15 @@ const renderItemContent = ($xeForm, item) => {
     field,
     itemRender,
     collapseNode,
-    errRule
+    errRule,
+    formatter
   } = item;
   const defaultSlot = slots ? slots.default : null;
   const validSlot = slots ? slots.valid : null;
   const collapseOpts = computeCollapseOpts.value;
   const validOpts = computeValidOpts.value;
   const compConf = isEnableConf(itemRender) ? renderer.get(itemRender.name) : null;
+  const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
   const params = {
     data,
     disabled,
@@ -19814,6 +19856,7 @@ const renderItemContent = ($xeForm, item) => {
     field,
     property: field,
     item,
+    itemValue,
     $form: $xeForm,
     $grid: $xeGrid
   };
@@ -19824,8 +19867,43 @@ const renderItemContent = ($xeForm, item) => {
   } else if (rftContent) {
     contentVNs = getSlotVNs(rftContent(itemRender, params));
   } else if (field) {
-    const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
-    contentVNs = [eqEmptyValue(itemValue) ? '' : `${itemValue}`];
+    let itemLabel = itemValue;
+    if (formatter) {
+      let formatData;
+      if (field) {
+        const 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
+          };
+        }
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        const gFormatOpts = formats.get(formatter);
+        const 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)) {
+        const gFormatOpts = formats.get(formatter[0]);
+        const fiFormatMethod = gFormatOpts ? gFormatOpts.formItemFormatMethod : null;
+        itemLabel = fiFormatMethod ? fiFormatMethod(params, ...formatter.slice(1)) : '';
+      } else {
+        itemLabel = formatter(params);
+      }
+      if (formatData) {
+        formatData.value = itemValue;
+        formatData.label = itemLabel;
+      }
+    }
+    contentVNs = [eqEmptyValue(itemLabel) ? '' : `${itemLabel}`];
   }
   if (collapseNode) {
     contentVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -20095,7 +20173,8 @@ const validErrorRuleValue = (rule, val) => {
       tooltipStore: {
         item: null,
         visible: false
-      }
+      },
+      itemFormatCache: {}
     });
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refTooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -20123,6 +20202,7 @@ const validErrorRuleValue = (rule, val) => {
       props,
       context,
       reactData,
+      internalData,
       xeGrid: $xeGrid,
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps
@@ -20155,6 +20235,7 @@ const validErrorRuleValue = (rule, val) => {
       reactData.staticItems = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(list, item => createItem($xeForm, item), {
         children: 'children'
       });
+      internalData.itemFormatCache = {};
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
     const getItems = () => {
@@ -20221,12 +20302,11 @@ const validErrorRuleValue = (rule, val) => {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
-    const getResetValue = (item, data) => {
+    const getResetValue = (item, data, itemValue) => {
       const {
         field,
         resetValue
       } = item;
-      const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resetValue)) {
         return resetValue({
           field,
@@ -20235,7 +20315,7 @@ const validErrorRuleValue = (rule, val) => {
           $form: $xeForm,
           $grid: $xeGrid
         });
-      } else if (resetValue === null) {
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(resetValue)) {
         // 默认
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue)) {
           return [];
@@ -20255,7 +20335,12 @@ const validErrorRuleValue = (rule, val) => {
             itemRender
           } = item;
           if (isEnableConf(itemRender)) {
-            const compConf = renderer.get(itemRender.name);
+            const {
+              name,
+              startField,
+              endField
+            } = itemRender;
+            const compConf = renderer.get(name);
             const fiResetMethod = compConf ? compConf.formItemResetMethod || compConf.itemResetMethod : null;
             if (compConf && fiResetMethod) {
               fiResetMethod({
@@ -20267,11 +20352,17 @@ const validErrorRuleValue = (rule, val) => {
                 $grid: $xeGrid
               });
             } else if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, getResetValue(item, data));
+              const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, getResetValue(item, data, itemValue));
+            }
+            if (startField && endField) {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, startField, getResetValue(item, data, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, startField)));
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, endField, getResetValue(item, data, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, endField)));
             }
           }
         });
       }
+      internalData.itemFormatCache = {};
       return clearValidate();
     };
     const resetEvent = evnt => {
@@ -23009,6 +23100,7 @@ const formItemProps = {
     type: Boolean,
     default: null
   },
+  formatter: [String, Function],
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],