vxe-table 3.21.12 → 3.21.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.12",
+  "version": "3.21.13",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/module/menu/panel.ts

@@ -61,7 +61,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           return options.every((item) => item.visible === false)
             ? renderEmptyElement($xeTable)
             : h('ul', {
-              class: 'vxe-context-menu--option-wrapper',
+              class: 'vxe-table--context-menu-group-wrapper',
               key: gIndex
             }, options.map((item, index) => {
               const { children, loading } = item
@@ -74,7 +74,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               return item.visible === false
                 ? renderEmptyElement($xeTable)
                 : h('li', {
-                  class: [item.className, {
+                  class: ['vxe-table--context-menu--option', item.className, {
                     'link--loading': loading,
                     'link--disabled': item.disabled,
                     'link--active': item === ctxMenuStore.selected
@@ -128,12 +128,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
                       suffixOpts.content ? h('span', `${suffixOpts.content}`) : renderEmptyElement($xeTable)
                     ])
                   ]),
-                  hasChildMenus && item.children
+                  hasChildMenus && children
                     ? h('ul', {
                       class: ['vxe-table--context-menu-clild-wrapper', {
                         'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
                       }]
-                    }, item.children.map((child, cIndex) => {
+                    }, children.map((child, cIndex) => {
                       const { loading: childLoading } = child
                       const childPrefixOpts = Object.assign({}, child.prefixConfig)
                       const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon
@@ -143,7 +143,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                       return child.visible === false
                         ? null
                         : h('li', {
-                          class: [child.className, {
+                          class: ['vxe-table--context-menu--option', child.className, {
                             'link--loading': childLoading,
                             'link--disabled': child.disabled,
                             'link--active': child === ctxMenuStore.selectChild

package/packages/table/src/methods.ts

@@ -453,7 +453,11 @@ function updateScrollYStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   const { transform } = treeOpts
   const allList = fullData || internalData.tableFullData
   // 如果gt为0，则总是启用
-  const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length)
+  let scrollYLoad = !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length)
+  if (scrollYLoad && (treeConfig && !transform)) {
+    errLog('vxe.error.notSupportProp', ['[table] virtual-y-config.enabled=true', 'tree-config.transform=false', 'tree-config.transform=true'])
+    scrollYLoad = false
+  }
   reactData.scrollYLoad = scrollYLoad
   syncGanttScrollYStatus($xeTable)
   return scrollYLoad
@@ -5160,7 +5164,7 @@ const tableMethods: any = {
       const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
       XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
         const rowid = handleUpdateRowId(row)
-        if (treeConfig && lazy) {
+        if (lazy) {
           if (row[hasChildField] && row[childrenField] === undefined) {
             row[childrenField] = null
           }

package/packages/table/src/table.ts

@@ -1863,7 +1863,7 @@ export default {
       warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
     }
     if (props.treeConfig && checkboxOpts.isShiftKey) {
-      errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+      errLog('vxe.error.reqSupportProp', ['tree-config', 'checkbox-config.isShiftKey=false'])
     }
     if (checkboxOpts.halfField) {
       warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])

package/styles/components/table-module/menu.scss

@@ -18,13 +18,16 @@
   font-family: var(--vxe-ui-font-family);
   background-color: var(--vxe-ui-layout-background-color);
 }
+.vxe-context-menu--option {
+  color: var(--vxe-ui-font-color);
+}
 .vxe-context-menu--link {
   display: flex;
   flex-direction: row;
   width: var(--vxe-ui-table-menu-item-width);
   line-height: 26px;
   padding: 0 0.8em;
-  color: var(--vxe-ui-font-color);
+  color: inherit;
   cursor: pointer;
   .vxe-context-menu--link-prefix,
   .vxe-context-menu--link-suffix {
@@ -41,7 +44,7 @@
     white-space: nowrap;
   }
 }
-.vxe-context-menu--option-wrapper,
+.vxe-table--context-menu-group-wrapper,
 .vxe-table--context-menu-clild-wrapper {
   margin: 0;
   padding: 0;