vxe-pc-ui 4.19.6 → 4.19.7

package/lib/index.umd.js

@@ -4745,7 +4745,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.19.6"}`;
+const uiVersion = `ui v${"4.19.7"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -4763,7 +4763,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.19.6";
+const ui_version = "4.19.7";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -20507,6 +20507,10 @@ const CheckboxGroup = VxeCheckboxGroup;
 
 
 
+
+const {
+  errLog: col_errLog
+} = createComponentLog('col');
 /* harmony default export */ var col = (defineVxeComponent({
   name: 'VxeCol',
   props: {
@@ -20552,27 +20556,33 @@ const CheckboxGroup = VxeCheckboxGroup;
       } = props;
       const rowGutter = computeRowGutter.value;
       const rowVertical = computeRowVertical.value;
+      let gridLayout = false;
+      if ($xeRow) {
+        gridLayout = !!$xeRow.props.gridLayout;
+      }
       const style = {};
-      if (rowGutter) {
-        let [lrGutter, tbGutter] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowGutter) ? rowGutter : [rowGutter];
-        if (rowVertical) {
-          tbGutter = lrGutter;
-          lrGutter = '';
-        }
-        if (lrGutter) {
-          const padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : `calc(${toCssUnit(lrGutter)} / 2)`;
-          style.paddingLeft = padding;
-          style.paddingRight = padding;
+      if (!gridLayout) {
+        if (rowGutter) {
+          let [lrGutter, tbGutter] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowGutter) ? rowGutter : [rowGutter];
+          if (rowVertical) {
+            tbGutter = lrGutter;
+            lrGutter = '';
+          }
+          if (lrGutter) {
+            const padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : `calc(${toCssUnit(lrGutter)} / 2)`;
+            style.paddingLeft = padding;
+            style.paddingRight = padding;
+          }
+          if (tbGutter) {
+            const padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : `calc(${toCssUnit(tbGutter)} / 2)`;
+            style.paddingTop = padding;
+            style.paddingBottom = padding;
+          }
         }
-        if (tbGutter) {
-          const padding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : `calc(${toCssUnit(tbGutter)} / 2)`;
-          style.paddingTop = padding;
-          style.paddingBottom = padding;
+        if (width) {
+          style.width = toCssUnit(width);
         }
       }
-      if (width) {
-        style.width = toCssUnit(width);
-      }
       return style;
     });
     const computeMaps = {};
@@ -20617,6 +20627,22 @@ const CheckboxGroup = VxeCheckboxGroup;
         class: 'vxe-col--inner'
       }, defaultSlot ? defaultSlot({}) : [])]);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      const {
+        width,
+        fill
+      } = props;
+      if ($xeRow) {
+        if ($xeRow.props.gridLayout) {
+          if (width) {
+            col_errLog('vxe.error.notSupportProp', ['grid-layout', `width=${width}`, 'width=null']);
+          }
+          if (fill) {
+            col_errLog('vxe.error.notSupportProp', ['grid-layout', `fill=${fill}`, 'fill=false']);
+          }
+        }
+      }
+    });
     $xeCol.renderVN = renderVN;
     return $xeCol;
   },
@@ -36614,6 +36640,7 @@ const {
   createEvent: scrollbar_createEvent,
   domUtils: scrollbar_domUtils,
   globalResize: scrollbar_globalResize,
+  globalEvents: scrollbar_globalEvents,
   renderEmptyElement: scrollbar_renderEmptyElement
 } = VxeUI;
 function scrollbar_createReactData() {
@@ -37194,9 +37221,7 @@ function scrollbar_createInternalData() {
       reFlag.value++;
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(reFlag, () => {
-      $xeScrollbar.recalculate().then(() => {
-        $xeScrollbar.recalculate();
-      });
+      $xeScrollbar.recalculate();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       const {
@@ -37219,6 +37244,9 @@ function scrollbar_createInternalData() {
         internalData.resizeObserver = resizeObserver;
       }
       reFlag.value++;
+      scrollbar_globalEvents.on($xeScrollbar, 'resize', () => {
+        reFlag.value++;
+      });
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {
       const {
@@ -37227,6 +37255,7 @@ function scrollbar_createInternalData() {
       if (resizeObserver) {
         resizeObserver.disconnect();
       }
+      scrollbar_globalEvents.off($xeScrollbar, 'resize');
     });
     $xeScrollbar.renderVN = renderVN;
     return $xeScrollbar;
@@ -46355,9 +46384,17 @@ const Result = VxeResult;
 
 
 
+
+const {
+  warnLog: row_warnLog
+} = createComponentLog('row');
 /* harmony default export */ var row = (defineVxeComponent({
   name: 'VxeRow',
   props: {
+    gridLayout: {
+      type: Boolean,
+      default: () => getConfig().row.gridLayout
+    },
     gutter: [Number, String, Array],
     wrap: {
       type: Boolean,
@@ -46384,25 +46421,31 @@ const Result = VxeResult;
     };
     const computeRowStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
+        gridLayout,
         gutter,
         vertical
       } = props;
       const style = {};
       if (gutter) {
         let [lrGutter, tbGutter] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gutter) ? gutter : [gutter];
-        if (vertical) {
-          tbGutter = lrGutter;
-          lrGutter = '';
-        }
-        if (lrGutter) {
-          const offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`;
-          style.marginLeft = offsetSize;
-          style.marginRight = offsetSize;
-        }
-        if (tbGutter) {
-          const offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${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) {
+            const offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`;
+            style.marginLeft = offsetSize;
+            style.marginRight = offsetSize;
+          }
+          if (tbGutter) {
+            const offsetSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${toCssUnit(tbGutter)} / 2 * -1)`;
+            style.marginTop = offsetSize;
+            style.marginBottom = offsetSize;
+          }
         }
       }
       return style;
@@ -46431,6 +46474,7 @@ const Result = VxeResult;
     Object.assign($xeRow, rowMethods, rowPrivateMethods);
     const renderVN = () => {
       const {
+        gridLayout,
         vertical,
         wrap
       } = props;
@@ -46438,7 +46482,7 @@ const Result = VxeResult;
       const defaultSlot = slots.default;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
-        class: ['vxe-row', {
+        class: ['vxe-row', gridLayout ? 'grid--layout' : 'def--layout', {
           'is--vertical': vertical,
           'is--wrap': wrap
         }],
@@ -46446,6 +46490,15 @@ const Result = VxeResult;
         onClick: clickEvent
       }, defaultSlot ? defaultSlot({}) : []);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      const {
+        gridLayout,
+        wrap
+      } = props;
+      if (gridLayout && !wrap) {
+        row_warnLog('vxe.error.notSupportProp', ['grid-layout', 'wrap=false', 'wrap=true']);
+      }
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeRow', $xeRow);
     $xeRow.renderVN = renderVN;
     return $xeRow;