vxe-pc-ui 3.19.6 → 3.19.7

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.6");
+var uiVersion = "ui v".concat("3.19.7");
 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.6";
+var ui_version = "3.19.7";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -30447,6 +30447,9 @@ var es_array_fill = __webpack_require__(3771);
 
 
 
+
+var col_createComponentLog = createComponentLog('col'),
+  col_errLog = col_createComponentLog.errLog;
 /* harmony default export */ var col = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCol',
   mixins: [globalMixins.sizeMixin],
@@ -30495,33 +30498,40 @@ var es_array_fill = __webpack_require__(3771);
     computeColStyle: function computeColStyle() {
       var $xeCol = this;
       var props = $xeCol;
+      var $xeRow = $xeCol.$xeRow;
       var width = props.width;
       var rowGutter = $xeCol.computeRowGutter;
       var rowVertical = $xeCol.computeRowVertical;
+      var gridLayout = false;
+      if ($xeRow) {
+        gridLayout = !!$xeRow.gridLayout;
+      }
       var style = {};
-      if (rowGutter) {
-        var _ref = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowGutter) ? rowGutter : [rowGutter],
-          _ref2 = _slicedToArray(_ref, 2),
-          lrGutter = _ref2[0],
-          tbGutter = _ref2[1];
-        if (rowVertical) {
-          tbGutter = lrGutter;
-          lrGutter = '';
-        }
-        if (lrGutter) {
-          var padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : "calc(".concat(toCssUnit(lrGutter), " / 2)");
-          style.paddingLeft = padding;
-          style.paddingRight = padding;
+      if (!gridLayout) {
+        if (rowGutter) {
+          var _ref = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowGutter) ? rowGutter : [rowGutter],
+            _ref2 = _slicedToArray(_ref, 2),
+            lrGutter = _ref2[0],
+            tbGutter = _ref2[1];
+          if (rowVertical) {
+            tbGutter = lrGutter;
+            lrGutter = '';
+          }
+          if (lrGutter) {
+            var padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : "calc(".concat(toCssUnit(lrGutter), " / 2)");
+            style.paddingLeft = padding;
+            style.paddingRight = padding;
+          }
+          if (tbGutter) {
+            var _padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : "calc(".concat(toCssUnit(tbGutter), " / 2)");
+            style.paddingTop = _padding;
+            style.paddingBottom = _padding;
+          }
         }
-        if (tbGutter) {
-          var _padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : "calc(".concat(toCssUnit(tbGutter), " / 2)");
-          style.paddingTop = _padding;
-          style.paddingBottom = _padding;
+        if (width) {
+          style.width = toCssUnit(width);
         }
       }
-      if (width) {
-        style.width = toCssUnit(width);
-      }
       return style;
     }
   }),
@@ -30563,6 +30573,23 @@ var es_array_fill = __webpack_require__(3771);
       }, defaultSlot ? defaultSlot({}) : [])]);
     }
   },
+  mounted: function mounted() {
+    var $xeCol = this;
+    var props = $xeCol;
+    var $xeRow = $xeCol.$xeRow;
+    var width = props.width,
+      fill = props.fill;
+    if ($xeRow) {
+      if ($xeRow.gridLayout) {
+        if (width) {
+          col_errLog('vxe.error.notSupportProp', ['grid-layout', "width=".concat(width), 'width=null']);
+        }
+        if (fill) {
+          col_errLog('vxe.error.notSupportProp', ['grid-layout', "fill=".concat(fill), 'fill=false']);
+        }
+      }
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }
@@ -47682,6 +47709,7 @@ var scrollbar_getConfig = VxeUI.getConfig,
   scrollbar_createEvent = VxeUI.createEvent,
   scrollbar_domUtils = VxeUI.domUtils,
   scrollbar_globalResize = VxeUI.globalResize,
+  scrollbar_globalEvents = VxeUI.globalEvents,
   scrollbar_renderEmptyElement = VxeUI.renderEmptyElement;
 function scrollbar_createReactData() {
   return {
@@ -48323,6 +48351,9 @@ function scrollbar_createInternalData() {
       internalData.resizeObserver = resizeObserver;
     }
     $xeScrollbar.reFlag++;
+    scrollbar_globalEvents.on($xeScrollbar, 'resize', function () {
+      $xeScrollbar.reFlag++;
+    });
   },
   beforeDestroy: function beforeDestroy() {
     var $xeScrollbar = this;
@@ -48331,6 +48362,7 @@ function scrollbar_createInternalData() {
     if (resizeObserver) {
       resizeObserver.disconnect();
     }
+    scrollbar_globalEvents.off($xeScrollbar, 'resize');
   },
   destroyed: function destroyed() {
     var $xeScrollbar = this;
@@ -58447,10 +58479,19 @@ var Result = VxeResult;
 
 
 
+
+var row_createComponentLog = createComponentLog('row'),
+  row_warnLog = row_createComponentLog.warnLog;
 /* harmony default export */ var row = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeRow',
   mixins: [globalMixins.sizeMixin],
   props: {
+    gridLayout: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().row.gridLayout;
+      }
+    },
     gutter: [Number, String, Array],
     wrap: {
       type: Boolean,
@@ -58483,7 +58524,8 @@ var Result = VxeResult;
     computeRowStyle: function computeRowStyle() {
       var $xeRow = this;
       var props = $xeRow;
-      var gutter = props.gutter,
+      var gridLayout = props.gridLayout,
+        gutter = props.gutter,
         vertical = props.vertical;
       var style = {};
       if (gutter) {
@@ -58491,19 +58533,24 @@ var Result = VxeResult;
           _ref2 = _slicedToArray(_ref, 2),
           lrGutter = _ref2[0],
           tbGutter = _ref2[1];
-        if (vertical) {
-          tbGutter = lrGutter;
-          lrGutter = '';
-        }
-        if (lrGutter) {
-          var offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : "calc(".concat(toCssUnit(lrGutter), " / 2 * -1)");
-          style.marginLeft = offsetSize;
-          style.marginRight = offsetSize;
-        }
-        if (tbGutter) {
-          var _offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : "calc(".concat(toCssUnit(tbGutter), " / 2 * -1)");
-          style.marginTop = _offsetSize;
-          style.marginBottom = _offsetSize;
+        if (gridLayout) {
+          style.columnGap = toCssUnit(lrGutter);
+          style.rowGap = toCssUnit(tbGutter || lrGutter);
+        } else {
+          if (vertical) {
+            tbGutter = lrGutter;
+            lrGutter = '';
+          }
+          if (lrGutter) {
+            var offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : "calc(".concat(toCssUnit(lrGutter), " / 2 * -1)");
+            style.marginLeft = offsetSize;
+            style.marginRight = offsetSize;
+          }
+          if (tbGutter) {
+            var _offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : "calc(".concat(toCssUnit(tbGutter), " / 2 * -1)");
+            style.marginTop = _offsetSize;
+            style.marginBottom = _offsetSize;
+          }
         }
       }
       return style;
@@ -58530,13 +58577,14 @@ var Result = VxeResult;
       var $xeRow = this;
       var props = $xeRow;
       var slots = $xeRow.$scopedSlots;
-      var vertical = props.vertical,
+      var gridLayout = props.gridLayout,
+        vertical = props.vertical,
         wrap = props.wrap;
       var rowStyle = $xeRow.computeRowStyle;
       var defaultSlot = slots.default;
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-row', {
+        class: ['vxe-row', gridLayout ? 'grid--layout' : 'def--layout', {
           'is--vertical': vertical,
           'is--wrap': wrap
         }],
@@ -58547,6 +58595,15 @@ var Result = VxeResult;
       }, defaultSlot ? defaultSlot({}) : []);
     }
   },
+  mounted: function mounted() {
+    var $xeRow = this;
+    var props = $xeRow;
+    var gridLayout = props.gridLayout,
+      wrap = props.wrap;
+    if (gridLayout && !wrap) {
+      row_warnLog('vxe.error.notSupportProp', ['grid-layout', 'wrap=false', 'wrap=true']);
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }