vxe-pc-ui 4.6.0 → 4.6.2

package/lib/index.umd.js

@@ -2354,7 +2354,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.1.2";
+const coreVersion = "4.1.3";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -2925,7 +2925,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.1.2";
+const version = "4.1.3";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -3702,6 +3702,9 @@ setTheme();
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -4210,14 +4213,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.6.0"}`;
+const log_version = `ui v${"4.6.2"}`;
 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.0";
+const ui_version = "4.6.2";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -19317,8 +19320,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,
@@ -19351,6 +19372,7 @@ class ItemInfo {
       titleStyle: item.titleStyle,
       itemRender: item.itemRender,
       rules: item.rules,
+      formatter,
       // 渲染属性
       showError: false,
       errRule: null,
@@ -19779,11 +19801,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,
@@ -19797,13 +19823,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,
@@ -19811,6 +19839,7 @@ const renderItemContent = ($xeForm, item) => {
     field,
     property: field,
     item,
+    itemValue,
     $form: $xeForm,
     $grid: $xeGrid
   };
@@ -19821,8 +19850,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', {
@@ -20092,7 +20156,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)();
@@ -20120,6 +20185,7 @@ const validErrorRuleValue = (rule, val) => {
       props,
       context,
       reactData,
+      internalData,
       xeGrid: $xeGrid,
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps
@@ -20152,6 +20218,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 = () => {
@@ -20269,6 +20336,7 @@ const validErrorRuleValue = (rule, val) => {
           }
         });
       }
+      internalData.itemFormatCache = {};
       return clearValidate();
     };
     const resetEvent = evnt => {
@@ -20871,10 +20939,14 @@ function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
+function getComponentOns(renderOpts, params, eFns, eventOns) {
   const {
     events
   } = renderOpts;
+  const {
+    model: modelFunc,
+    change: changeFunc
+  } = eFns || {};
   const modelEvent = getModelEvent(renderOpts.name);
   const changeEvent = getChangeEvent(renderOpts.name);
   const ons = {};
@@ -20904,7 +20976,7 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
       }
     };
   }
-  return ons;
+  return eventOns ? Object.assign(ons, eventOns) : ons;
 }
 function getItemOns(renderOpts, params) {
   const {
@@ -20912,12 +20984,15 @@ function getItemOns(renderOpts, params) {
     data,
     field
   } = params;
-  return getComponentOns(renderOpts, params, value => {
-    // 处理 model 值双向绑定
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
-  }, () => {
-    // 处理 change 事件相关逻辑
-    $form.updateStatus(params);
+  return getComponentOns(renderOpts, params, {
+    model(value) {
+      // 处理 model 值双向绑定
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
+    },
+    change(params) {
+      // 处理 change 事件相关逻辑
+      $form.updateStatus(params);
+    }
   });
 }
 function getNativeItemOns(renderOpts, params) {
@@ -21159,6 +21234,50 @@ renderer.mixin({
     formItemAutoFocus: 'input',
     renderFormItemContent: defaultItemRender
   },
+  VxeDateRangePicker: {
+    formItemAutoFocus: 'input',
+    renderFormItemContent(renderOpts, params) {
+      const {
+        startField,
+        endField
+      } = renderOpts;
+      const {
+        $form,
+        data,
+        field
+      } = params;
+      const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+      const seProps = {};
+      const 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['onUpdate:startValue'] = value => {
+          if (startField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, startField, value);
+          }
+        };
+        seOs['onUpdate:endValue'] = value => {
+          if (endField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, endField, value);
+          }
+        };
+      }
+      return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(getDefaultComponent(renderOpts), {
+        ...getComponentFormItemProps(renderOpts, params, itemValue, seProps),
+        ...getComponentOns(renderOpts, params, {
+          model(value) {
+            // 处理 model 值双向绑定
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, value);
+          },
+          change() {
+            // 处理 change 事件相关逻辑
+            $form.updateStatus(params);
+          }
+        }, seOs)
+      })];
+    }
+  },
   VxeButton: {
     renderFormItemContent: defaultFormItemRender
   },
@@ -22955,6 +23074,7 @@ const formItemProps = {
     type: Boolean,
     default: null
   },
+  formatter: [String, Function],
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],