vxe-pc-ui 4.6.2 → 4.6.4

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.2"}`;
+const log_version = `ui v${"4.6.4"}`;
 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.2";
+const ui_version = "4.6.4";
 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));
           }
@@ -20285,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,
@@ -20299,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 [];
@@ -20319,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({
@@ -20331,7 +20352,12 @@ 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)));
             }
           }
         });
@@ -46054,7 +46080,10 @@ const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd
 // 打印
 let printFrame;
 // 默认导出或打印的 HTML 样式
-const defaultHtmlStyle = 'body{margin:0;padding:0;color:#000000;font-size:14px;font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table:not(.is--print){table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{border-color:#D0D0D0;border-style:solid;border-width:0}.vxe-table.is--print{width:100%}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
+const defaultHtmlStyle = 'body{padding:0;font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table:not(.is--print){table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{border-color:#D0D0D0;border-style:solid;border-width:0}.vxe-table.is--print{width:100%}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
+function trimHtml(html) {
+  return `${html}`.replace(/(<!---->)/, '');
+}
 function createPrintFrame() {
   const frame = document.createElement('iframe');
   frame.className = 'vxe-table--print-frame';
@@ -46085,44 +46114,51 @@ function getExportBlobByString(str, type) {
   });
 }
 const defaultPrintMargin = 50;
-function parseMargin(val) {
+const defaultFontColor = '#000000';
+function parsePageStyle(val) {
+  const styOpts = Object.assign({}, val);
+  const headStyOpts = Object.assign({}, styOpts.header);
+  const titStyOpts = Object.assign({}, styOpts.title);
+  const footStyOpts = Object.assign({}, styOpts.footer);
+  const pnStyOpts = Object.assign({}, styOpts.pageNumber);
   let mVal = defaultPrintMargin;
-  let top = mVal;
-  let bottom = mVal;
-  let left = mVal;
-  let right = mVal;
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val)) {
-    mVal = val;
-    top = mVal;
-    bottom = mVal;
-    left = mVal;
-    right = mVal;
-  } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(val)) {
-    if (val.margin) {
-      mVal = val.margin;
-      top = mVal;
-      bottom = mVal;
-      left = mVal;
-      right = mVal;
-    }
-    if (val.marginTop) {
-      top = val.marginTop;
-    }
-    if (val.marginBottom) {
-      bottom = val.marginBottom;
-    }
-    if (val.marginLeft) {
-      left = val.marginLeft;
-    }
-    if (val.marginRight) {
-      right = val.marginRight;
-    }
+  let marginTop = mVal;
+  let marginBottom = mVal;
+  let marginLeft = mVal;
+  let marginRight = mVal;
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(styOpts.margin) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(styOpts.margin)) {
+    mVal = styOpts.margin;
+    marginTop = mVal;
+    marginBottom = mVal;
+    marginLeft = mVal;
+    marginRight = mVal;
   }
   return {
-    top: toCssUnit(top),
-    bottom: toCssUnit(bottom),
-    left: toCssUnit(left),
-    right: toCssUnit(right)
+    marginTop: toCssUnit(styOpts.marginTop || marginTop),
+    marginBottom: toCssUnit(styOpts.marginBottom || marginBottom),
+    marginLeft: toCssUnit(styOpts.marginLeft || marginLeft),
+    marginRight: toCssUnit(styOpts.marginRight || marginRight),
+    fontSize: toCssUnit(styOpts.fontSize),
+    color: styOpts.color,
+    textAlign: styOpts.textAlign,
+    header: {
+      height: toCssUnit(headStyOpts.height),
+      textAlign: headStyOpts.textAlign
+    },
+    title: {
+      color: titStyOpts.color,
+      fontSize: toCssUnit(titStyOpts.fontSize),
+      textAlign: titStyOpts.textAlign
+    },
+    footer: {
+      height: toCssUnit(footStyOpts.height),
+      textAlign: footStyOpts.textAlign
+    },
+    pageNumber: {
+      color: pnStyOpts.color,
+      fontSize: toCssUnit(pnStyOpts.fontSize),
+      textAlign: pnStyOpts.textAlign
+    }
   };
 }
 function createHtmlPage(opts, printHtml) {
@@ -46130,8 +46166,13 @@ function createHtmlPage(opts, printHtml) {
     pageStyle,
     customStyle
   } = opts;
-  const marginObj = parseMargin(pageStyle);
-  return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', `<title>${opts.title || ''}</title>`, opts._pageBreaks || opts.pageBreaks && opts.pageBreaks.length ? '<style media="print">@page {size: auto;margin: 0mm;}</style>' : '', `<style>.vxe-print-slots{display: none;}.vxe-print-page-break.align--center{text-align:center;}.vxe-print-page-break.align--left{text-align:left;}.vxe-print-page-break.align--right{text-align:right;}.vxe-print-page-break--header-title{font-size:1.8em;line-height:${marginObj.top || 'normal'};text-align:center;}.vxe-print-page-break{page-break-before:always;display:flex;flex-direction:column;height:100vh;overflow:hidden;}.vxe-print-page-break--body{display:flex;flex-direction:row;flex-grow:1;overflow: hidden;}.vxe-print-page-break--left,.vxe-print-page-break--right{flex-shrink:0;height:100%;}.vxe-print-page-break--left{width:${marginObj.left};}.vxe-print-page-break--right{width:${marginObj.right};}.vxe-print-page-break--header,.vxe-print-page-break--footer{flex-shrink:0;width:100%;}.vxe-print-page-break--header{height:${marginObj.top};}.vxe-print-page-break--footer{height:${marginObj.bottom};}.vxe-print-page-break--content{flex-grow: 1;overflow: hidden;}.vxe-print-page-break--footer-page-number{line-height:${marginObj.bottom || 'normal'};text-align:center;}</style>`, '<style>.vxe-table{white-space:pre;}</style>', `<style>${defaultHtmlStyle}</style>`, customStyle ? `<style>${customStyle}</style>` : '', '</head>', '<body>', `${printHtml}`, '</body>', '</html>'].join('');
+  const pageStyObj = parsePageStyle(pageStyle);
+  const headStyOpts = pageStyObj.header;
+  const titStyOpts = pageStyObj.title;
+  const footStyOpts = pageStyObj.header;
+  const pnStyOpts = pageStyObj.pageNumber;
+  const isPbMode = opts._pageBreaks || opts.pageBreaks && opts.pageBreaks.length;
+  return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', `<title>${opts.title || ''}</title>`, '<style media="print">@page{size:auto;margin: 0mm;}</style>', `<style>body{font-size:${pageStyObj.fontSize || '14px'};color:${pageStyObj.color || defaultFontColor};text-align:${pageStyObj.textAlign || 'left'};}</style>`, '<style>', '.vxe-print-slots{display:none;}', '.vxe-print-page-break.align--center{text-align:center;}', '.vxe-print-page-break.align--left{text-align:left;}', '.vxe-print-page-break.align--right{text-align:right;}', '.vxe-print-page-break{break-before:always;page-break-before:always;display:flex;flex-direction:column;height:100vh;overflow:hidden;}', '.vxe-print-page-break--body{display:flex;flex-direction:row;flex-grow:1;overflow:hidden;}', '.vxe-print-page-break--left,.vxe-print-page-break--right{flex-shrink:0;height:100%;}', `.vxe-print-page-break--left{width:${pageStyObj.marginLeft};}`, `.vxe-print-page-break--right{width:${pageStyObj.marginRight};}`, '.vxe-print-page-break--header,.vxe-print-page-break--footer{display:flex;justify-content:center;flex-direction:column;flex-shrink:0;width:100%;}', `.vxe-print-page-break--header{height:${headStyOpts.height || pageStyObj.marginTop};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${headStyOpts.textAlign || 'left'};}`, `.vxe-print-page-break--header-title{font-size:${titStyOpts.fontSize || '1.6em'};color:${titStyOpts.color || defaultFontColor};text-align:${opts.headerAlign || pnStyOpts.textAlign || 'center'};}`, `.vxe-print-page-break--footer{height:${footStyOpts.height || pageStyObj.marginBottom};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${footStyOpts.textAlign || 'left'};}`, '.vxe-print-page-break--content{flex-grow:1;overflow:hidden;}', `.vxe-print-page-break--footer-page-number{font-size:${pnStyOpts.fontSize || '1.2em'};color:${pnStyOpts.color || defaultFontColor};text-align:${opts.footerAlign || pnStyOpts.textAlign || 'center'};}`, '</style>', '<style>.vxe-table{white-space:pre;}</style>', `<style>${defaultHtmlStyle}</style>`, isPbMode ? '<style>body{margin:0;}</style>' : `<style>body{margin:${pageStyObj.marginTop} ${pageStyObj.marginRight} ${pageStyObj.marginBottom} ${pageStyObj.marginLeft};}</style>`, customStyle ? `<style>${customStyle}</style>` : '', '</head>', '<body>', `${printHtml}`, '</body>', '</html>'].join('');
 }
 function handlePrint(opts, printHtml = '') {
   const {
@@ -46405,7 +46446,7 @@ const PrintPageBreak = VxePrintPageBreak;
         const elem = refElem.value;
         return printHtml(Object.assign({}, props, {
           _pageBreaks: !!reactData.staticPageBreaks.length,
-          html: (elem ? elem.outerHTML : '') || props.html || props.content || ''
+          html: trimHtml(elem ? elem.outerHTML : '') || props.html || props.content || ''
         }));
       }
     };