vxe-pc-ui 4.18.5 → 4.18.7

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 (39) hide show
  1. package/dist/all.esm.js +32 -14
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/icon/style.css +1 -1
  5. package/es/modal/index.js +8 -4
  6. package/es/modal/src/modal.js +22 -8
  7. package/es/style.css +1 -1
  8. package/es/style.min.css +1 -1
  9. package/es/ui/index.js +1 -1
  10. package/es/ui/src/log.js +1 -1
  11. package/lib/icon/style/style.css +1 -1
  12. package/lib/icon/style/style.min.css +1 -1
  13. package/lib/index.umd.js +41 -14
  14. package/lib/index.umd.min.js +1 -1
  15. package/lib/modal/index.js +8 -4
  16. package/lib/modal/index.min.js +1 -1
  17. package/lib/modal/src/modal.js +31 -8
  18. package/lib/modal/src/modal.min.js +1 -1
  19. package/lib/style.css +1 -1
  20. package/lib/style.min.css +1 -1
  21. package/lib/ui/index.js +1 -1
  22. package/lib/ui/index.min.js +1 -1
  23. package/lib/ui/src/log.js +1 -1
  24. package/lib/ui/src/log.min.js +1 -1
  25. package/package.json +1 -1
  26. package/packages/modal/index.ts +8 -4
  27. package/packages/modal/src/modal.ts +23 -8
  28. /package/es/icon/{iconfont.1788857098184.ttf → iconfont.1788921152771.ttf} +0 -0
  29. /package/es/icon/{iconfont.1788857098184.woff → iconfont.1788921152771.woff} +0 -0
  30. /package/es/icon/{iconfont.1788857098184.woff2 → iconfont.1788921152771.woff2} +0 -0
  31. /package/es/{iconfont.1788857098184.ttf → iconfont.1788921152771.ttf} +0 -0
  32. /package/es/{iconfont.1788857098184.woff → iconfont.1788921152771.woff} +0 -0
  33. /package/es/{iconfont.1788857098184.woff2 → iconfont.1788921152771.woff2} +0 -0
  34. /package/lib/icon/style/{iconfont.1788857098184.ttf → iconfont.1788921152771.ttf} +0 -0
  35. /package/lib/icon/style/{iconfont.1788857098184.woff → iconfont.1788921152771.woff} +0 -0
  36. /package/lib/icon/style/{iconfont.1788857098184.woff2 → iconfont.1788921152771.woff2} +0 -0
  37. /package/lib/{iconfont.1788857098184.ttf → iconfont.1788921152771.ttf} +0 -0
  38. /package/lib/{iconfont.1788857098184.woff → iconfont.1788921152771.woff} +0 -0
  39. /package/lib/{iconfont.1788857098184.woff2 → iconfont.1788921152771.woff2} +0 -0
package/dist/all.esm.js CHANGED
@@ -101,7 +101,7 @@ function checkDynamic() {
101
101
  }
102
102
 
103
103
  const { log } = VxeUI;
104
- const uiVersion = `ui v${"4.18.5"}`;
104
+ const uiVersion = `ui v${"4.18.7"}`;
105
105
  function createComponentLog(name) {
106
106
  const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
107
107
  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -115,7 +115,7 @@ function createComponentLog(name) {
115
115
  const warnLog$i = log.create('warn', uiVersion);
116
116
  log.create('error', uiVersion);
117
117
 
118
- const version = "4.18.5";
118
+ const version = "4.18.7";
119
119
  VxeUI.uiVersion = version;
120
120
  VxeUI.dynamicApp = dynamicApp;
121
121
  function config(options) {
@@ -30134,7 +30134,10 @@ var VxeModalComponent = defineVxeComponent({
30134
30134
  type: [Number, String],
30135
30135
  default: () => getConfig$3().modal.marginSize
30136
30136
  },
30137
- fullscreen: Boolean,
30137
+ fullscreen: {
30138
+ type: Boolean,
30139
+ default: () => getConfig$3().modal.fullscreen
30140
+ },
30138
30141
  draggable: {
30139
30142
  type: Boolean,
30140
30143
  default: () => getConfig$3().modal.draggable
@@ -30239,7 +30242,11 @@ var VxeModalComponent = defineVxeComponent({
30239
30242
  return transfer;
30240
30243
  });
30241
30244
  const computeIsMsg = computed(() => {
30242
- return props.type === 'message' || props.type === 'notification';
30245
+ const { type } = props;
30246
+ return type === 'message' || type === 'notification';
30247
+ });
30248
+ const computeIsModal = computed(() => {
30249
+ return props.type === 'modal';
30243
30250
  });
30244
30251
  const computeIsMinimizeStatus = computed(() => {
30245
30252
  return reactData.zoomStatus === 'minimize';
@@ -30690,9 +30697,10 @@ var VxeModalComponent = defineVxeComponent({
30690
30697
  }
30691
30698
  };
30692
30699
  const openModal = () => {
30693
- const { remember, showFooter } = props;
30700
+ const { remember, showFooter, fullscreen } = props;
30694
30701
  const { initialized, visible } = reactData;
30695
30702
  const isMsg = computeIsMsg.value;
30703
+ const isModal = computeIsModal.value;
30696
30704
  if (!initialized) {
30697
30705
  reactData.initialized = true;
30698
30706
  }
@@ -30706,7 +30714,7 @@ var VxeModalComponent = defineVxeComponent({
30706
30714
  setTimeout(() => {
30707
30715
  reactData.contentVisible = true;
30708
30716
  nextTick(() => {
30709
- if (!props.fullscreen) {
30717
+ if (!(isModal && fullscreen)) {
30710
30718
  recalculate();
30711
30719
  }
30712
30720
  if (showFooter) {
@@ -30740,7 +30748,7 @@ var VxeModalComponent = defineVxeComponent({
30740
30748
  restorePosStorage();
30741
30749
  }
30742
30750
  else {
30743
- if (props.fullscreen) {
30751
+ if (isModal && fullscreen) {
30744
30752
  nextTick(() => handleMaximize());
30745
30753
  }
30746
30754
  else {
@@ -31157,7 +31165,9 @@ var VxeModalComponent = defineVxeComponent({
31157
31165
  return handleZoom();
31158
31166
  },
31159
31167
  minimize() {
31160
- if (!reactData.visible) {
31168
+ const { visible } = reactData;
31169
+ const isModal = computeIsModal.value;
31170
+ if (!isModal || !visible) {
31161
31171
  return Promise.resolve({
31162
31172
  status: false
31163
31173
  });
@@ -31165,7 +31175,9 @@ var VxeModalComponent = defineVxeComponent({
31165
31175
  return handleMinimize();
31166
31176
  },
31167
31177
  maximize() {
31168
- if (!reactData.visible) {
31178
+ const { visible } = reactData;
31179
+ const isModal = computeIsModal.value;
31180
+ if (!isModal || !visible) {
31169
31181
  return Promise.resolve({
31170
31182
  status: false
31171
31183
  });
@@ -31173,7 +31185,9 @@ var VxeModalComponent = defineVxeComponent({
31173
31185
  return handleMaximize();
31174
31186
  },
31175
31187
  revert() {
31176
- if (!reactData.visible) {
31188
+ const { visible } = reactData;
31189
+ const isModal = computeIsModal.value;
31190
+ if (!isModal || !visible) {
31177
31191
  return Promise.resolve({
31178
31192
  status: false
31179
31193
  });
@@ -31548,7 +31562,8 @@ function openAlert(content, title, options) {
31548
31562
  type: 'alert',
31549
31563
  lockScroll: true,
31550
31564
  showHeader: true,
31551
- showFooter: true
31565
+ showFooter: true,
31566
+ fullscreen: false
31552
31567
  }, content, title, options);
31553
31568
  }
31554
31569
  function openConfirm(content, title, options) {
@@ -31557,7 +31572,8 @@ function openConfirm(content, title, options) {
31557
31572
  status: 'question',
31558
31573
  lockScroll: true,
31559
31574
  showHeader: true,
31560
- showFooter: true
31575
+ showFooter: true,
31576
+ fullscreen: false
31561
31577
  }, content, title, options);
31562
31578
  }
31563
31579
  function openMessage(content, options) {
@@ -31566,7 +31582,8 @@ function openMessage(content, options) {
31566
31582
  mask: false,
31567
31583
  lockView: false,
31568
31584
  lockScroll: false,
31569
- showHeader: false
31585
+ showHeader: false,
31586
+ fullscreen: false
31570
31587
  }, content, '', options);
31571
31588
  }
31572
31589
  function openNotification(content, title, options) {
@@ -31578,7 +31595,8 @@ function openNotification(content, title, options) {
31578
31595
  showHeader: true,
31579
31596
  draggable: false,
31580
31597
  position: 'top-right',
31581
- width: 320
31598
+ width: 320,
31599
+ fullscreen: false
31582
31600
  }, content, title, options);
31583
31601
  }
31584
31602
  const ModalController = {