vxe-table 3.15.18 → 3.15.19

package/es/table/render/index.js

@@ -380,14 +380,17 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
     const { optionGroups, optionGroupProps = {} } = renderOpts;
     const groupOptions = optionGroupProps.options || 'options';
     const groupLabel = optionGroupProps.label || 'label';
-    return optionGroups.map((group, gIndex) => {
-        return h('optgroup', {
-            key: gIndex,
-            attrs: {
-                label: group[groupLabel]
-            }
-        }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
-    });
+    if (optionGroups) {
+        return optionGroups.map((group, gIndex) => {
+            return h('optgroup', {
+                key: gIndex,
+                attrs: {
+                    label: group[groupLabel]
+                }
+            }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
+        });
+    }
+    return [];
 }
 /**
  * 渲染原生的 option 标签
@@ -399,19 +402,22 @@ function renderNativeOptions(h, options, renderOpts, params) {
     const valueProp = optionProps.value || 'value';
     const disabledProp = optionProps.disabled || 'disabled';
     const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-    return options.map((option, oIndex) => {
-        return h('option', {
-            key: oIndex,
-            attrs: {
-                value: option[valueProp],
-                disabled: option[disabledProp]
-            },
-            domProps: {
-                /* eslint-disable eqeqeq */
-                selected: option[valueProp] == cellValue
-            }
-        }, option[labelProp]);
-    });
+    if (options) {
+        return options.map((option, oIndex) => {
+            return h('option', {
+                key: oIndex,
+                attrs: {
+                    value: option[valueProp],
+                    disabled: option[disabledProp]
+                },
+                domProps: {
+                    /* eslint-disable eqeqeq */
+                    selected: option[valueProp] == cellValue
+                }
+            }, option[labelProp]);
+        });
+    }
+    return [];
 }
 function nativeFilterRender(h, renderOpts, params) {
     const { column } = params;

package/es/table/src/body.js

@@ -789,7 +789,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/footer.js

@@ -354,7 +354,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/header.js

@@ -349,7 +349,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/methods.js

@@ -6886,25 +6886,27 @@ const Methods = {
         const { selectRadioRow: oldValue } = reactData;
         const { row } = params;
         const radioOpts = $xeTable.computeRadioOpts;
-        const { trigger } = radioOpts;
+        const { trigger, checkMethod } = radioOpts;
         if (trigger === 'manual') {
             return;
         }
         evnt.stopPropagation();
-        let newValue = row;
-        let isChange = oldValue !== newValue;
-        if (isChange) {
-            handleCheckedRadioRow($xeTable, newValue);
-        }
-        else if (!radioOpts.strict) {
-            isChange = oldValue === newValue;
+        if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
+            let newValue = row;
+            let isChange = oldValue !== newValue;
             if (isChange) {
-                newValue = null;
-                $xeTable.clearRadioRow();
+                handleCheckedRadioRow($xeTable, newValue);
+            }
+            else if (!radioOpts.strict) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
+                    $xeTable.clearRadioRow();
+                }
+            }
+            if (isChange) {
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
             }
-        }
-        if (isChange) {
-            $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
         }
     },
     triggerCurrentColumnEvent(evnt, params) {
@@ -8649,7 +8651,9 @@ const Methods = {
         return rest;
     },
     /**
-     * 获取树表格状态
+     * 内部方法、获取树表格状态
+     * @deprecated
+     * @private
      */
     getTreeStatus() {
         if (this.treeConfig) {

package/es/table/src/table.js

@@ -1450,8 +1450,8 @@ export default {
         if (props.editConfig && editOpts.showStatus && !props.keepSource) {
             warnLog('vxe.error.reqProp', ['keep-source']);
         }
-        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
+            warnLog('vxe.error.reqProp', ['show-overflow']);
         }
         if (treeConfig && !treeOpts.transform && props.stripe) {
             warnLog('vxe.error.noTree', ['stripe']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.18";
+export const version = "3.15.19";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.18"}`;
+const version = `table v${"3.15.19"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.18";
+const version = "3.15.19";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.18"}`;
+const log_version = `table v${"3.15.19"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -13307,29 +13307,35 @@ const Methods = {
     } = params;
     const radioOpts = $xeTable.computeRadioOpts;
     const {
-      trigger
+      trigger,
+      checkMethod
     } = radioOpts;
     if (trigger === 'manual') {
       return;
     }
     evnt.stopPropagation();
-    let newValue = row;
-    let isChange = oldValue !== newValue;
-    if (isChange) {
-      handleCheckedRadioRow($xeTable, newValue);
-    } else if (!radioOpts.strict) {
-      isChange = oldValue === newValue;
+    if (!checkMethod || checkMethod({
+      $table: $xeTable,
+      row
+    })) {
+      let newValue = row;
+      let isChange = oldValue !== newValue;
       if (isChange) {
-        newValue = null;
-        $xeTable.clearRadioRow();
+        handleCheckedRadioRow($xeTable, newValue);
+      } else if (!radioOpts.strict) {
+        isChange = oldValue === newValue;
+        if (isChange) {
+          newValue = null;
+          $xeTable.clearRadioRow();
+        }
+      }
+      if (isChange) {
+        $xeTable.dispatchEvent('radio-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
       }
-    }
-    if (isChange) {
-      $xeTable.dispatchEvent('radio-change', {
-        oldValue,
-        newValue,
-        ...params
-      }, evnt);
     }
   },
   triggerCurrentColumnEvent(evnt, params) {
@@ -15400,7 +15406,9 @@ const Methods = {
     return rest;
   },
   /**
-   * 获取树表格状态
+   * 内部方法、获取树表格状态
+   * @deprecated
+   * @private
    */
   getTreeStatus() {
     if (this.treeConfig) {
@@ -17880,7 +17888,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18355,7 +18364,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18829,7 +18839,8 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -28489,8 +28500,8 @@ function renderBody(h, $xeTable) {
     if (props.editConfig && editOpts.showStatus && !props.keepSource) {
       warnLog('vxe.error.reqProp', ['keep-source']);
     }
-    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-      warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+    if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
+      warnLog('vxe.error.reqProp', ['show-overflow']);
     }
     if (treeConfig && !treeOpts.transform && props.stripe) {
       warnLog('vxe.error.noTree', ['stripe']);
@@ -31889,14 +31900,17 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
   } = renderOpts;
   const groupOptions = optionGroupProps.options || 'options';
   const groupLabel = optionGroupProps.label || 'label';
-  return optionGroups.map((group, gIndex) => {
-    return h('optgroup', {
-      key: gIndex,
-      attrs: {
-        label: group[groupLabel]
-      }
-    }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
-  });
+  if (optionGroups) {
+    return optionGroups.map((group, gIndex) => {
+      return h('optgroup', {
+        key: gIndex,
+        attrs: {
+          label: group[groupLabel]
+        }
+      }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
+    });
+  }
+  return [];
 }
 /**
  * 渲染原生的 option 标签
@@ -31913,19 +31927,22 @@ function renderNativeOptions(h, options, renderOpts, params) {
   const valueProp = optionProps.value || 'value';
   const disabledProp = optionProps.disabled || 'disabled';
   const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-  return options.map((option, oIndex) => {
-    return h('option', {
-      key: oIndex,
-      attrs: {
-        value: option[valueProp],
-        disabled: option[disabledProp]
-      },
-      domProps: {
-        /* eslint-disable eqeqeq */
-        selected: option[valueProp] == cellValue
-      }
-    }, option[labelProp]);
-  });
+  if (options) {
+    return options.map((option, oIndex) => {
+      return h('option', {
+        key: oIndex,
+        attrs: {
+          value: option[valueProp],
+          disabled: option[disabledProp]
+        },
+        domProps: {
+          /* eslint-disable eqeqeq */
+          selected: option[valueProp] == cellValue
+        }
+      }, option[labelProp]);
+    });
+  }
+  return [];
 }
 function nativeFilterRender(h, renderOpts, params) {
   const {
@@ -33048,7 +33065,7 @@ const Toolbar = VxeToolbar;
           year: 'yyyy'
         },
         weeks: {
-          w: '周',
+          w: '',
           w0: '周日',
           w1: '周一',
           w2: '周二',