vxe-table 3.21.12 → 3.21.13

package/es/table/module/menu/panel.js

@@ -49,7 +49,7 @@ export default {
                     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;
@@ -62,7 +62,7 @@ export default {
                             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
@@ -116,12 +116,12 @@ export default {
                                             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;
@@ -131,7 +131,7 @@ export default {
                                             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/es/table/src/methods.js

@@ -415,7 +415,11 @@ function updateScrollYStatus($xeTable, fullData) {
     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;
@@ -4937,7 +4941,7 @@ const tableMethods = {
             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/es/table/src/table.js

@@ -1728,7 +1728,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/es/table/style.css

@@ -1698,13 +1698,17 @@
   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 .vxe-context-menu--link-prefix,
@@ -1722,35 +1726,35 @@
   white-space: nowrap;
 }
 
-.vxe-context-menu--option-wrapper,
+.vxe-table--context-menu-group-wrapper,
 .vxe-table--context-menu-clild-wrapper {
   margin: 0;
   padding: 0;
   list-style-type: none;
   border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
 }
-.vxe-context-menu--option-wrapper li,
+.vxe-table--context-menu-group-wrapper li,
 .vxe-table--context-menu-clild-wrapper li {
   position: relative;
   margin: 1px 0;
   border: 1px solid transparent;
 }
-.vxe-context-menu--option-wrapper li:last-child,
+.vxe-table--context-menu-group-wrapper li:last-child,
 .vxe-table--context-menu-clild-wrapper li:last-child {
   border: 0;
 }
-.vxe-context-menu--option-wrapper li.link--active,
+.vxe-table--context-menu-group-wrapper li.link--active,
 .vxe-table--context-menu-clild-wrapper li.link--active {
   background-color: var(--vxe-ui-base-hover-background-color);
   border-color: var(--vxe-ui-base-hover-background-color);
 }
-.vxe-context-menu--option-wrapper li.link--loading > .vxe-context-menu--link, .vxe-context-menu--option-wrapper li.link--disabled > .vxe-context-menu--link,
+.vxe-table--context-menu-group-wrapper li.link--loading > .vxe-context-menu--link, .vxe-table--context-menu-group-wrapper li.link--disabled > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--loading > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--disabled > .vxe-context-menu--link {
   color: var(--vxe-ui-font-disabled-color);
   cursor: no-drop;
 }
-.vxe-context-menu--option-wrapper li.link--loading.link--active:hover, .vxe-context-menu--option-wrapper li.link--disabled.link--active:hover,
+.vxe-table--context-menu-group-wrapper li.link--loading.link--active:hover, .vxe-table--context-menu-group-wrapper li.link--disabled.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--loading.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--disabled.link--active:hover {
   background-color: inherit;