vxe-pc-ui 3.19.3 → 3.19.5

package/lib/index.umd.js

@@ -13347,7 +13347,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.19.3");
+var uiVersion = "ui v".concat("3.19.5");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13367,7 +13367,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.19.3";
+var ui_version = "3.19.5";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -44765,7 +44765,7 @@ function form_createInternalData() {
       var fullItemList = internalData.fullItemList;
       $xeForm.clearValidate();
       if (readonly) {
-        return $xeForm.$nextTick();
+        return Promise.resolve();
       }
       return $xeForm.beginValidate(fullItemList, '', callback).then(function (params) {
         $xeForm.recalculate();
@@ -44777,7 +44777,7 @@ function form_createInternalData() {
       var props = $xeForm;
       var readonly = props.readonly;
       if (readonly) {
-        return $xeForm.$nextTick();
+        return Promise.resolve();
       }
       var fields = [];
       if (fieldOrItem) {
@@ -47717,6 +47717,12 @@ function scrollbar_createInternalData() {
         return scrollbar_getConfig().scrollbar.native;
       }
     },
+    padding: {
+      type: Boolean,
+      default: function _default() {
+        return scrollbar_getConfig().scrollbar.padding;
+      }
+    },
     xConfig: Object,
     yConfig: Object,
     className: {
@@ -47804,12 +47810,16 @@ function scrollbar_createInternalData() {
       var props = $xeScrollbar;
       var reactData = $xeScrollbar.reactData;
       var native = props.native,
-        className = props.className;
+        className = props.className,
+        padding = props.padding;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
       var xOpts = $xeScrollbar.computeXOpts;
       var yOpts = $xeScrollbar.computeYOpts;
-      return scrollbar_domUtils.buildClass(['vxe-scrollbar', "ov-x--".concat(xOpts.visible || 'visible'), "ov-y--".concat(yOpts.visible || 'visible'), native ? 'is--native' : 'is--virtual', className], {
+      var xToTop = $xeScrollbar.computeXToTop;
+      var yToLeft = $xeScrollbar.computeYToLeft;
+      return scrollbar_domUtils.buildClass(['vxe-scrollbar', "ov-x--".concat(xOpts.visible || 'visible'), "ov-y--".concat(yOpts.visible || 'visible'), "sx-pos--".concat(xToTop ? 'top' : 'bottom'), "sy-pos--".concat(yToLeft ? 'left' : 'right'), native ? 'is--native' : 'is--virtual', className], {
+        'is--padding': padding,
         'ov-x--auto-hide': xOpts.autoHide,
         'ov-y--auto-hide': yOpts.autoHide,
         'overflow-y': yThumbHeight,
@@ -47837,6 +47847,16 @@ function scrollbar_createInternalData() {
       var $xeScrollbar = this;
       var props = $xeScrollbar;
       return Object.assign({}, scrollbar_getConfig().scrollbar.yConfig, props.yConfig);
+    },
+    computeXToTop: function computeXToTop() {
+      var $xeScrollbar = this;
+      var xOpts = $xeScrollbar.computeXOpts;
+      return xOpts.position === 'top';
+    },
+    computeYToLeft: function computeYToLeft() {
+      var $xeScrollbar = this;
+      var yOpts = $xeScrollbar.computeYOpts;
+      return yOpts.position === 'left';
     }
   },
   methods: {
@@ -50542,8 +50562,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       if (boxElem) {
         boxElem.style.width = width ? toCssUnit(width) : '';
         boxElem.style.height = height ? toCssUnit(height) : '';
-        boxElem.style.minWidth = !isMsg && !isMinimizeStatus && minWidth ? toCssUnit(minWidth) : '';
-        boxElem.style.minHeight = !isMsg && !isMinimizeStatus && minHeight ? toCssUnit(minHeight) : '';
+        boxElem.style.minWidth = !isMsg && !isMinimizeStatus && minWidth ? isScale(minWidth) ? minWidth : toCssUnit(minWidth) : '';
+        boxElem.style.minHeight = !isMsg && !isMinimizeStatus && minHeight ? isScale(minHeight) ? minHeight : toCssUnit(minHeight) : '';
       }
       return $xeModal.$nextTick();
     },
@@ -51343,7 +51363,9 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var props = $xeModal;
       var reactData = $xeModal.reactData;
       evnt.preventDefault();
-      var storage = props.storage,
+      var minWidth = props.minWidth,
+        minHeight = props.minHeight,
+        storage = props.storage,
         isWithinAppendTo = props.isWithinAppendTo;
       var el = $xeModal.$refs.refElem;
       var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
@@ -51355,8 +51377,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
       var targetElem = evnt.target;
       var type = targetElem.getAttribute('data-type');
-      var minWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.minWidth);
-      var minHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.minHeight);
+      var dragMinWidth = isScale(minWidth) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(minWidth) * visibleWidth / 100 : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(minWidth);
+      var dragMinHeight = isScale(minHeight) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(minHeight) * visibleHeight / 100 : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(minHeight);
       var maxWidth = visibleWidth;
       var maxHeight = visibleHeight;
       var boxElem = $xeModal.getBox();
@@ -51380,7 +51402,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             dragLeft = disX - evnt.clientX;
             width = dragLeft + clientWidth;
             if (offsetLeft - dragLeft > marginSize) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
                 boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
               }
@@ -51392,13 +51414,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             width = dragLeft + clientWidth;
             height = dragTop + clientHeight;
             if (offsetLeft - dragLeft > marginSize) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
                 boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
               }
             }
             if (offsetTop - dragTop > marginSize) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
                 boxElem.style.top = "".concat(offsetTop - dragTop, "px");
               }
@@ -51410,13 +51432,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             width = dragLeft + clientWidth;
             height = dragTop + clientHeight;
             if (offsetLeft - dragLeft > marginSize) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
                 boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
               }
             }
             if (offsetTop + height + marginSize < visibleHeight) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
               }
             }
@@ -51425,7 +51447,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             dragTop = disY - evnt.clientY;
             height = clientHeight + dragTop;
             if (offsetTop - dragTop > marginSize) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
                 boxElem.style.top = "".concat(offsetTop - dragTop, "px");
               }
@@ -51435,7 +51457,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             dragLeft = evnt.clientX - disX;
             width = dragLeft + clientWidth;
             if (offsetLeft + width + marginSize < visibleWidth) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
               }
             }
@@ -51446,12 +51468,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             width = dragLeft + clientWidth;
             height = dragTop + clientHeight;
             if (offsetLeft + width + marginSize < visibleWidth) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
               }
             }
             if (offsetTop - dragTop > marginSize) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
                 boxElem.style.top = "".concat(offsetTop - dragTop, "px");
               }
@@ -51463,12 +51485,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             width = dragLeft + clientWidth;
             height = dragTop + clientHeight;
             if (offsetLeft + width + marginSize < visibleWidth) {
-              if (width > minWidth) {
+              if (width > dragMinWidth) {
                 boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
               }
             }
             if (offsetTop + height + marginSize < visibleHeight) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
               }
             }
@@ -51477,7 +51499,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             dragTop = evnt.clientY - disY;
             height = dragTop + clientHeight;
             if (offsetTop + height + marginSize < visibleHeight) {
-              if (height > minHeight) {
+              if (height > dragMinHeight) {
                 boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
               }
             }