vxe-pc-ui 3.6.2 → 3.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/es/date-panel/src/date-panel.js +16 -3
  2. package/es/date-picker/src/date-picker.js +7 -4
  3. package/es/date-range-picker/src/date-range-picker.js +7 -6
  4. package/es/form/src/form.js +9 -4
  5. package/es/icon/style.css +1 -1
  6. package/es/print/src/print.js +2 -2
  7. package/es/print/src/util.js +72 -40
  8. package/es/style.css +1 -1
  9. package/es/style.min.css +1 -1
  10. package/es/ui/index.js +1 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/lib/date-panel/src/date-panel.js +15 -3
  13. package/lib/date-panel/src/date-panel.min.js +1 -1
  14. package/lib/date-picker/src/date-picker.js +8 -4
  15. package/lib/date-picker/src/date-picker.min.js +1 -1
  16. package/lib/date-range-picker/src/date-range-picker.js +7 -6
  17. package/lib/date-range-picker/src/date-range-picker.min.js +1 -1
  18. package/lib/form/src/form.js +11 -4
  19. package/lib/form/src/form.min.js +1 -1
  20. package/lib/icon/style/style.css +1 -1
  21. package/lib/icon/style/style.min.css +1 -1
  22. package/lib/index.umd.js +99 -58
  23. package/lib/index.umd.min.js +1 -1
  24. package/lib/print/src/print.js +1 -1
  25. package/lib/print/src/print.min.js +1 -1
  26. package/lib/print/src/util.js +54 -38
  27. package/lib/print/src/util.min.js +1 -1
  28. package/lib/style.css +1 -1
  29. package/lib/style.min.css +1 -1
  30. package/lib/ui/index.js +1 -1
  31. package/lib/ui/index.min.js +1 -1
  32. package/lib/ui/src/log.js +1 -1
  33. package/lib/ui/src/log.min.js +1 -1
  34. package/package.json +1 -1
  35. package/packages/date-panel/src/date-panel.ts +14 -3
  36. package/packages/date-picker/src/date-picker.ts +8 -5
  37. package/packages/date-range-picker/src/date-range-picker.ts +7 -6
  38. package/packages/form/src/form.ts +9 -4
  39. package/packages/print/src/print.ts +2 -2
  40. package/packages/print/src/util.ts +73 -39
  41. package/packages/ui/src/dom.ts +1 -1
  42. package/types/components/date-panel.d.ts +3 -1
  43. package/types/components/date-picker.d.ts +2 -0
  44. package/types/components/date-range-picker.d.ts +2 -0
  45. package/types/components/print.d.ts +21 -0
  46. /package/es/icon/{iconfont.1746880475850.ttf → iconfont.1747024951601.ttf} +0 -0
  47. /package/es/icon/{iconfont.1746880475850.woff → iconfont.1747024951601.woff} +0 -0
  48. /package/es/icon/{iconfont.1746880475850.woff2 → iconfont.1747024951601.woff2} +0 -0
  49. /package/es/{iconfont.1746880475850.ttf → iconfont.1747024951601.ttf} +0 -0
  50. /package/es/{iconfont.1746880475850.woff → iconfont.1747024951601.woff} +0 -0
  51. /package/es/{iconfont.1746880475850.woff2 → iconfont.1747024951601.woff2} +0 -0
  52. /package/lib/icon/style/{iconfont.1746880475850.ttf → iconfont.1747024951601.ttf} +0 -0
  53. /package/lib/icon/style/{iconfont.1746880475850.woff → iconfont.1747024951601.woff} +0 -0
  54. /package/lib/icon/style/{iconfont.1746880475850.woff2 → iconfont.1747024951601.woff2} +0 -0
  55. /package/lib/{iconfont.1746880475850.ttf → iconfont.1747024951601.ttf} +0 -0
  56. /package/lib/{iconfont.1746880475850.woff → iconfont.1747024951601.woff} +0 -0
  57. /package/lib/{iconfont.1746880475850.woff2 → iconfont.1747024951601.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -13036,14 +13036,14 @@ var defineVxeComponent = function defineVxeComponent(options) {
13036
13036
  };
13037
13037
  ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
13038
13038
 
13039
- var log_version = "ui v".concat("3.6.2");
13039
+ var log_version = "ui v".concat("3.6.4");
13040
13040
  var warnLog = log.create('warn', log_version);
13041
13041
  var errLog = log.create('error', log_version);
13042
13042
  ;// CONCATENATED MODULE: ./packages/ui/index.ts
13043
13043
 
13044
13044
 
13045
13045
 
13046
- var ui_version = "3.6.2";
13046
+ var ui_version = "3.6.4";
13047
13047
  index_esm_VxeUI.uiVersion = ui_version;
13048
13048
  index_esm_VxeUI.dynamicApp = dynamicApp;
13049
13049
  function config(options) {
@@ -24672,6 +24672,7 @@ var Countdown = VxeCountdown;
24672
24672
  return getConfig().datePanel.endDate;
24673
24673
  }
24674
24674
  },
24675
+ defaultDate: [String, Number, Date],
24675
24676
  minDate: [String, Number, Date],
24676
24677
  maxDate: [String, Number, Date],
24677
24678
  startDay: {
@@ -25820,8 +25821,10 @@ var Countdown = VxeCountdown;
25820
25821
  var $xeDatePanel = this;
25821
25822
  var props = $xeDatePanel;
25822
25823
  var reactData = $xeDatePanel.reactData;
25823
- var type = props.type;
25824
+ var type = props.type,
25825
+ defaultDate = props.defaultDate;
25824
25826
  var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
25827
+ var dateValueFormat = $xeDatePanel.computeDateValueFormat;
25825
25828
  var dateValue = $xeDatePanel.computeDateValue;
25826
25829
  if (['year', 'quarter', 'month', 'week'].indexOf(type) > -1) {
25827
25830
  reactData.datePanelType = type;
@@ -25833,7 +25836,16 @@ var Countdown = VxeCountdown;
25833
25836
  $xeDatePanel.dateMonthHandle(dateValue, 0);
25834
25837
  $xeDatePanel.dateParseValue(dateValue);
25835
25838
  } else {
25836
- $xeDatePanel.dateNowHandle();
25839
+ if (defaultDate) {
25840
+ var defDate = $xeDatePanel.parseDate(defaultDate, dateValueFormat);
25841
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isValidDate(defDate)) {
25842
+ $xeDatePanel.dateMonthHandle(defDate, 0);
25843
+ } else {
25844
+ $xeDatePanel.dateNowHandle();
25845
+ }
25846
+ } else {
25847
+ $xeDatePanel.dateNowHandle();
25848
+ }
25837
25849
  }
25838
25850
  if (isDateTimeType) {
25839
25851
  reactData.datetimePanelValue = reactData.datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
@@ -25845,7 +25857,7 @@ var Countdown = VxeCountdown;
25845
25857
  });
25846
25858
  }
25847
25859
  },
25848
- getValue: function getValue() {
25860
+ getModelValue: function getModelValue() {
25849
25861
  var $xeDatePanel = this;
25850
25862
  var reactData = $xeDatePanel.reactData;
25851
25863
  return reactData.inputValue;
@@ -26551,6 +26563,7 @@ var DatePanel = VxeDatePanel;
26551
26563
  return getConfig().datePicker.endDate;
26552
26564
  }
26553
26565
  },
26566
+ defaultDate: [String, Number, Date],
26554
26567
  minDate: [String, Number, Date],
26555
26568
  maxDate: [String, Number, Date],
26556
26569
  startDay: {
@@ -26995,13 +27008,16 @@ var DatePanel = VxeDatePanel;
26995
27008
  panelChangeEvent: function panelChangeEvent(params) {
26996
27009
  var $xeDatePicker = this;
26997
27010
  var props = $xeDatePicker;
26998
- var multiple = props.multiple;
27011
+ var multiple = props.multiple,
27012
+ autoClose = props.autoClose;
26999
27013
  var value = params.value,
27000
27014
  $event = params.$event;
27001
27015
  var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
27002
27016
  $xeDatePicker.handleChange(value, $event);
27003
27017
  if (!multiple && !isDateTimeType) {
27004
- $xeDatePicker.hidePanel();
27018
+ if (autoClose) {
27019
+ $xeDatePicker.hidePanel();
27020
+ }
27005
27021
  }
27006
27022
  },
27007
27023
  // 全局事件
@@ -27373,6 +27389,7 @@ var DatePanel = VxeDatePanel;
27373
27389
  startDate: props.startDate,
27374
27390
  endDate: props.endDate,
27375
27391
  minDate: props.minDate,
27392
+ defaultDate: props.defaultDate,
27376
27393
  maxDate: props.maxDate,
27377
27394
  startDay: props.startDay,
27378
27395
  labelFormat: props.labelFormat,
@@ -27382,8 +27399,7 @@ var DatePanel = VxeDatePanel;
27382
27399
  selectDay: props.selectDay
27383
27400
  },
27384
27401
  on: {
27385
- change: $xeDatePicker.panelChangeEvent,
27386
- dateToday: $xeDatePicker.hidePanel
27402
+ change: $xeDatePicker.panelChangeEvent
27387
27403
  }
27388
27404
  })]), h('div', {
27389
27405
  class: 'vxe-date-picker--layout-footer-wrapper'
@@ -27655,6 +27671,7 @@ var DatePicker = VxeDatePicker;
27655
27671
  },
27656
27672
  minDate: [String, Number, Date],
27657
27673
  maxDate: [String, Number, Date],
27674
+ defaultDate: [String, Number, Date],
27658
27675
  startDay: {
27659
27676
  type: [String, Number],
27660
27677
  default: function _default() {
@@ -28143,8 +28160,8 @@ var DatePicker = VxeDatePicker;
28143
28160
  var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
28144
28161
  var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
28145
28162
  if ($startDatePanel && $endDatePanel) {
28146
- var startValue = $startDatePanel.getValue();
28147
- var endValue = $endDatePanel.getValue();
28163
+ var startValue = $startDatePanel.getModelValue();
28164
+ var endValue = $endDatePanel.getModelValue();
28148
28165
  if (!startValue || !endValue) {
28149
28166
  $xeDateRangePicker.handleChange('', '', {
28150
28167
  type: 'check'
@@ -28227,8 +28244,8 @@ var DatePicker = VxeDatePicker;
28227
28244
  var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
28228
28245
  var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
28229
28246
  if ($startDatePanel && $endDatePanel) {
28230
- var startValue = $startDatePanel.getValue();
28231
- var endValue = $endDatePanel.getValue();
28247
+ var startValue = $startDatePanel.getModelValue();
28248
+ var endValue = $endDatePanel.getModelValue();
28232
28249
  if (startValue && endValue) {
28233
28250
  $startDatePanel.confirmByEvent(evnt);
28234
28251
  $endDatePanel.confirmByEvent(evnt);
@@ -28255,7 +28272,7 @@ var DatePicker = VxeDatePicker;
28255
28272
  var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
28256
28273
  var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
28257
28274
  if ($startDatePanel && $endDatePanel) {
28258
- var startValue = $startDatePanel.getValue();
28275
+ var startValue = $startDatePanel.getModelValue();
28259
28276
  if (!endValue && startValue) {
28260
28277
  $endDatePanel.setPanelDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(startValue));
28261
28278
  }
@@ -28279,7 +28296,7 @@ var DatePicker = VxeDatePicker;
28279
28296
  var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
28280
28297
  var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
28281
28298
  if ($startDatePanel && $endDatePanel) {
28282
- var endValue = $endDatePanel.getValue();
28299
+ var endValue = $endDatePanel.getModelValue();
28283
28300
  if (!startValue && endValue) {
28284
28301
  $startDatePanel.setPanelDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(endValue));
28285
28302
  }
@@ -30917,12 +30934,11 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
30917
30934
  }
30918
30935
  return $xeForm.$nextTick();
30919
30936
  },
30920
- getResetValue: function getResetValue(item, data) {
30937
+ getResetValue: function getResetValue(item, data, itemValue) {
30921
30938
  var $xeForm = this;
30922
30939
  var $xeGrid = $xeForm.$xeGrid;
30923
30940
  var field = item.field,
30924
30941
  resetValue = item.resetValue;
30925
- var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
30926
30942
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resetValue)) {
30927
30943
  return resetValue({
30928
30944
  field: field,
@@ -30951,7 +30967,10 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
30951
30967
  var field = item.field,
30952
30968
  itemRender = item.itemRender;
30953
30969
  if (isEnableConf(itemRender)) {
30954
- var compConf = renderer.get(itemRender.name);
30970
+ var name = itemRender.name,
30971
+ startField = itemRender.startField,
30972
+ endField = itemRender.endField;
30973
+ var compConf = renderer.get(name);
30955
30974
  var fiResetMethod = compConf ? compConf.formItemResetMethod || compConf.itemResetMethod : null;
30956
30975
  if (compConf && fiResetMethod) {
30957
30976
  fiResetMethod({
@@ -30963,7 +30982,12 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
30963
30982
  $grid: $xeGrid
30964
30983
  });
30965
30984
  } else if (field) {
30966
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, $xeForm.getResetValue(item, data));
30985
+ var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
30986
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, $xeForm.getResetValue(item, data, itemValue));
30987
+ }
30988
+ if (startField && endField) {
30989
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, startField, $xeForm.getResetValue(item, data, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, startField)));
30990
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, endField, $xeForm.getResetValue(item, data, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, endField)));
30967
30991
  }
30968
30992
  }
30969
30993
  });
@@ -42244,13 +42268,18 @@ var web_url_search_params_size = __webpack_require__(8721);
42244
42268
 
42245
42269
 
42246
42270
 
42271
+
42272
+
42247
42273
 
42248
42274
 
42249
42275
  var util_browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
42250
42276
  // 打印
42251
42277
  var printFrame;
42252
42278
  // 默认导出或打印的 HTML 样式
42253
- var 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}';
42279
+ var 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}';
42280
+ function trimHtml(html) {
42281
+ return "".concat(html).replace(/(<!---->)/, '');
42282
+ }
42254
42283
  function createPrintFrame() {
42255
42284
  var frame = document.createElement('iframe');
42256
42285
  frame.className = 'vxe-table--print-frame';
@@ -42281,51 +42310,63 @@ function getExportBlobByString(str, type) {
42281
42310
  });
42282
42311
  }
42283
42312
  var defaultPrintMargin = 50;
42284
- function parseMargin(val) {
42313
+ var defaultFontColor = '#000000';
42314
+ function parsePageStyle(val) {
42315
+ var styOpts = Object.assign({}, val);
42316
+ var headStyOpts = Object.assign({}, styOpts.header);
42317
+ var titStyOpts = Object.assign({}, styOpts.title);
42318
+ var footStyOpts = Object.assign({}, styOpts.footer);
42319
+ var pnStyOpts = Object.assign({}, styOpts.pageNumber);
42285
42320
  var mVal = defaultPrintMargin;
42286
- var top = mVal;
42287
- var bottom = mVal;
42288
- var left = mVal;
42289
- var right = mVal;
42290
- 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)) {
42291
- mVal = val;
42292
- top = mVal;
42293
- bottom = mVal;
42294
- left = mVal;
42295
- right = mVal;
42296
- } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(val)) {
42297
- if (val.margin) {
42298
- mVal = val.margin;
42299
- top = mVal;
42300
- bottom = mVal;
42301
- left = mVal;
42302
- right = mVal;
42303
- }
42304
- if (val.marginTop) {
42305
- top = val.marginTop;
42306
- }
42307
- if (val.marginBottom) {
42308
- bottom = val.marginBottom;
42309
- }
42310
- if (val.marginLeft) {
42311
- left = val.marginLeft;
42312
- }
42313
- if (val.marginRight) {
42314
- right = val.marginRight;
42315
- }
42321
+ var marginTop = mVal;
42322
+ var marginBottom = mVal;
42323
+ var marginLeft = mVal;
42324
+ var marginRight = mVal;
42325
+ 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)) {
42326
+ mVal = styOpts.margin;
42327
+ marginTop = mVal;
42328
+ marginBottom = mVal;
42329
+ marginLeft = mVal;
42330
+ marginRight = mVal;
42316
42331
  }
42317
42332
  return {
42318
- top: toCssUnit(top),
42319
- bottom: toCssUnit(bottom),
42320
- left: toCssUnit(left),
42321
- right: toCssUnit(right)
42333
+ marginTop: toCssUnit(styOpts.marginTop || marginTop),
42334
+ marginBottom: toCssUnit(styOpts.marginBottom || marginBottom),
42335
+ marginLeft: toCssUnit(styOpts.marginLeft || marginLeft),
42336
+ marginRight: toCssUnit(styOpts.marginRight || marginRight),
42337
+ fontSize: toCssUnit(styOpts.fontSize),
42338
+ color: styOpts.color,
42339
+ textAlign: styOpts.textAlign,
42340
+ header: {
42341
+ height: toCssUnit(headStyOpts.height),
42342
+ textAlign: headStyOpts.textAlign
42343
+ },
42344
+ title: {
42345
+ color: titStyOpts.color,
42346
+ fontSize: toCssUnit(titStyOpts.fontSize),
42347
+ textAlign: titStyOpts.textAlign
42348
+ },
42349
+ footer: {
42350
+ height: toCssUnit(footStyOpts.height),
42351
+ textAlign: footStyOpts.textAlign
42352
+ },
42353
+ pageNumber: {
42354
+ color: pnStyOpts.color,
42355
+ fontSize: toCssUnit(pnStyOpts.fontSize),
42356
+ textAlign: pnStyOpts.textAlign
42357
+ }
42322
42358
  };
42323
42359
  }
42324
42360
  function createHtmlPage(opts, printHtml) {
42325
42361
  var pageStyle = opts.pageStyle,
42326
42362
  customStyle = opts.customStyle;
42327
- var marginObj = parseMargin(pageStyle);
42328
- 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>".concat(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:".concat(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:").concat(marginObj.left, ";}.vxe-print-page-break--right{width:").concat(marginObj.right, ";}.vxe-print-page-break--header,.vxe-print-page-break--footer{flex-shrink:0;width:100%;}.vxe-print-page-break--header{height:").concat(marginObj.top, ";}.vxe-print-page-break--footer{height:").concat(marginObj.bottom, ";}.vxe-print-page-break--content{flex-grow: 1;overflow: hidden;}.vxe-print-page-break--footer-page-number{line-height:").concat(marginObj.bottom || 'normal', ";text-align:center;}</style>"), '<style>.vxe-table{white-space:pre;}</style>', "<style>".concat(defaultHtmlStyle, "</style>"), customStyle ? "<style>".concat(customStyle, "</style>") : '', '</head>', '<body>', "".concat(printHtml), '</body>', '</html>'].join('');
42363
+ var pageStyObj = parsePageStyle(pageStyle);
42364
+ var headStyOpts = pageStyObj.header;
42365
+ var titStyOpts = pageStyObj.title;
42366
+ var footStyOpts = pageStyObj.header;
42367
+ var pnStyOpts = pageStyObj.pageNumber;
42368
+ var isPbMode = opts._pageBreaks || opts.pageBreaks && opts.pageBreaks.length;
42369
+ 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>".concat(opts.title || '', "</title>"), '<style media="print">@page{size:auto;margin: 0mm;}</style>', "<style>body{font-size:".concat(pageStyObj.fontSize || '14px', ";color:").concat(pageStyObj.color || defaultFontColor, ";text-align:").concat(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:".concat(pageStyObj.marginLeft, ";}"), ".vxe-print-page-break--right{width:".concat(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:".concat(headStyOpts.height || pageStyObj.marginTop, ";padding:0 ").concat(pageStyObj.marginLeft, " 0 ").concat(pageStyObj.marginRight, ";text-align:").concat(headStyOpts.textAlign || 'left', ";}"), ".vxe-print-page-break--header-title{font-size:".concat(titStyOpts.fontSize || '1.6em', ";color:").concat(titStyOpts.color || defaultFontColor, ";text-align:").concat(opts.headerAlign || pnStyOpts.textAlign || 'center', ";}"), ".vxe-print-page-break--footer{height:".concat(footStyOpts.height || pageStyObj.marginBottom, ";padding:0 ").concat(pageStyObj.marginLeft, " 0 ").concat(pageStyObj.marginRight, ";text-align:").concat(footStyOpts.textAlign || 'left', ";}"), '.vxe-print-page-break--content{flex-grow:1;overflow:hidden;}', ".vxe-print-page-break--footer-page-number{font-size:".concat(pnStyOpts.fontSize || '1.2em', ";color:").concat(pnStyOpts.color || defaultFontColor, ";text-align:").concat(opts.footerAlign || pnStyOpts.textAlign || 'center', ";}"), '</style>', '<style>.vxe-table{white-space:pre;}</style>', "<style>".concat(defaultHtmlStyle, "</style>"), isPbMode ? '<style>body{margin:0;}</style>' : "<style>body{margin:".concat(pageStyObj.marginTop, " ").concat(pageStyObj.marginRight, " ").concat(pageStyObj.marginBottom, " ").concat(pageStyObj.marginLeft, ";}</style>"), customStyle ? "<style>".concat(customStyle, "</style>") : '', '</head>', '<body>', "".concat(printHtml), '</body>', '</html>'].join('');
42329
42370
  }
42330
42371
  function handlePrint(opts) {
42331
42372
  var printHtml = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -42610,7 +42651,7 @@ var PrintPageBreak = VxePrintPageBreak;
42610
42651
  var elem = $xePrint.$refs.refElem;
42611
42652
  return printHtml(Object.assign({}, props, {
42612
42653
  _pageBreaks: !!reactData.staticPageBreaks.length,
42613
- html: (elem ? elem.outerHTML : '') || props.html || props.content || ''
42654
+ html: trimHtml(elem ? elem.outerHTML : '') || props.html || props.content || ''
42614
42655
  }));
42615
42656
  },
42616
42657
  //