vxe-table 3.18.2 → 3.18.3

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.2";
+const version = "3.18.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.2"}`;
+const log_version = `table v${"3.18.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3687,25 +3687,31 @@ function colToVisible($xeTable, column, row) {
 function getOnName(type) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().kebabCase(type);
 }
-function getModelEvent(renderOpts) {
-  switch (renderOpts.name) {
-    case 'input':
-    case 'textarea':
-      return 'input';
+function getModelEvent(name) {
+  switch (name) {
+    case 'VxeInput':
+    case 'VxeTextarea':
+    case 'VxeNumberInput':
+    case 'VxeSelect':
+    case 'VxeTreeSelect':
+    case 'VxeTableSelect':
+    case 'VxeDatePicker':
+    case 'VxeDateRangePicker':
+      return 'modelValue';
     case 'select':
       return 'change';
   }
-  return 'modelValue';
+  return 'input';
 }
-function getChangeEvent(renderOpts) {
-  switch (renderOpts.name) {
+function getChangeEvent(name) {
+  switch (name) {
     case 'input':
     case 'textarea':
     case 'VxeInput':
-    case 'VxeNumberInput':
     case 'VxeTextarea':
-    case '$input':
+    case '$input': // 已废弃
     case '$textarea':
+      // 已废弃
       return 'input';
   }
   return 'change';
@@ -19557,14 +19563,13 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || tooltipConfig) {
     tdOns.mouseenter = evnt => {
-      if (isVMScrollProcess($xeTable)) {
-        return;
-      }
-      if (showTitle) {
-        updateCellTitle(evnt.currentTarget, column);
-      } else if (showTooltip || showAllTip) {
-        // 如果配置了显示 tooltip
-        $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
+      if (!isVMScrollProcess($xeTable)) {
+        if (showTitle) {
+          updateCellTitle(evnt.currentTarget, column);
+        } else if (showTooltip || showAllTip) {
+          // 如果配置了显示 tooltip
+          $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
+        }
       }
       $xeTable.dispatchEvent('cell-mouseenter', Object.assign({
         cell: evnt.currentTarget
@@ -19574,11 +19579,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   // hover 退出事件
   if (showTooltip || showAllTip || tooltipConfig) {
     tdOns.mouseleave = evnt => {
-      if (isVMScrollProcess($xeTable)) {
-        return;
-      }
-      if (showTooltip || showAllTip) {
-        $xeTable.handleTargetLeaveEvent(evnt);
+      if (!isVMScrollProcess($xeTable)) {
+        if (showTooltip || showAllTip) {
+          $xeTable.handleTargetLeaveEvent(evnt);
+        }
       }
       $xeTable.dispatchEvent('cell-mouseleave', Object.assign({
         cell: evnt.currentTarget
@@ -23609,7 +23613,8 @@ const {
 
 
 const {
-  getIcon: menu_panel_getIcon
+  getIcon: menu_panel_getIcon,
+  renderEmptyElement: menu_panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var menu_panel = ({
   name: 'VxeTableMenuPanel',
@@ -23630,18 +23635,18 @@ const {
   },
   render(h) {
     const $xeTable = this.$parent;
+    const tableReactData = $xeTable;
     const {
-      _e,
-      ctxMenuOpts,
       ctxMenuStore
-    } = this;
+    } = tableReactData;
+    const menuOpts = $xeTable.computeMenuOpts;
     return h('div', {
-      class: ['vxe-table--context-menu-wrapper', ctxMenuOpts.className, {
+      class: ['vxe-table--context-menu-wrapper', menuOpts.className, {
         'is--visible': ctxMenuStore.visible
       }],
       style: ctxMenuStore.style
     }, ctxMenuStore.list.map((options, gIndex) => {
-      return options.every(item => item.visible === false) ? _e() : h('ul', {
+      return options.every(item => item.visible === false) ? menu_panel_renderEmptyElement($xeTable) : h('ul', {
         class: 'vxe-context-menu--option-wrapper',
         key: gIndex
       }, options.map((item, index) => {
@@ -23672,7 +23677,7 @@ const {
           class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
         }, [h('i', {
           class: prefixOpts.icon || item.prefixIcon
-        }), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : _e()]), h('span', {
+        }), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
           class: 'vxe-context-menu--link-content',
           attrs: {
             title: menuContent
@@ -23681,7 +23686,7 @@ const {
           class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
         }, [h('i', {
           class: suffixOpts.icon || item.suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
-        }), suffixOpts.content ? h('span', `${suffixOpts.content}`) : _e()])]), hasChildMenus ? h('ul', {
+        }), suffixOpts.content ? h('span', `${suffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])]), hasChildMenus ? h('ul', {
           class: ['vxe-table--context-menu-clild-wrapper', {
             'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
           }]
@@ -23712,7 +23717,7 @@ const {
             class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
           }, [h('i', {
             class: childPrefixOpts.icon || child.prefixIcon
-          }), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : _e()]), h('span', {
+          }), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
             class: 'vxe-context-menu--link-content',
             attrs: {
               title: childMenuContent
@@ -23721,7 +23726,7 @@ const {
             class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
           }, [h('i', {
             class: childSuffixOpts.icon
-          }), childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : _e()])])]);
+          }), childSuffixOpts.content ? h('span', `${childSuffixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)])])]);
         })) : null]);
       }));
     }));
@@ -24152,13 +24157,15 @@ const {
      * 关闭快捷菜单
      */
     _closeMenu() {
-      Object.assign(this.ctxMenuStore, {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      Object.assign(reactData.ctxMenuStore, {
         visible: false,
         selected: null,
         selectChild: null,
         showChild: false
       });
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     },
     // 处理菜单的移动
     moveCtxMenu(evnt, ctxMenuStore, property, hasOper, operRest, menuList) {
@@ -24199,25 +24206,34 @@ const {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
       const $xeGantt = $xeTable.$xeGantt;
+      const props = $xeTable;
+      const reactData = $xeTable;
       const internalData = $xeTable;
       const {
-        $refs,
-        tId,
-        editStore,
-        menuConfig,
-        contextMenu,
-        ctxMenuStore,
-        ctxMenuOpts,
+        xID
+      } = $xeTable;
+      const {
         mouseConfig,
-        mouseOpts
-      } = this;
+        menuConfig
+      } = props;
+      const {
+        editStore,
+        ctxMenuStore
+      } = reactData;
+      const {
+        visibleColumn
+      } = internalData;
+      const tableFilter = $xeTable.$refs.refTableFilter;
+      const tableMenu = $xeTable.$refs.refTableMenu;
+      const mouseOpts = $xeTable.computeMouseOpts;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const el = $xeTable.$refs.refElem;
       const {
         selected
       } = editStore;
-      const tableFilter = $xeTable.$refs.refTableFilter;
       const layoutList = ['header', 'body', 'footer'];
-      if (isEnableConf(menuConfig) || contextMenu) {
-        if (ctxMenuStore.visible && $refs.refTableMenu && getEventTargetNode(evnt, $refs.refTableMenu.$el).flag) {
+      if (isEnableConf(menuConfig)) {
+        if (ctxMenuStore.visible && tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) {
           evnt.preventDefault();
           return;
         }
@@ -24229,16 +24245,16 @@ const {
             $grid: $xeGrid,
             $gantt: $xeGantt,
             keyboard: true,
-            columns: this.visibleColumn.slice(0),
+            columns: visibleColumn.slice(0),
             $event: evnt
           };
           // 如果开启单元格区域
           if (mouseConfig && mouseOpts.area) {
-            const activeArea = this.getActiveCellArea();
+            const activeArea = $xeTable.getActiveCellArea();
             if (activeArea && activeArea.row && activeArea.column) {
               params.row = activeArea.row;
               params.column = activeArea.column;
-              this.handleOpenMenuEvent(evnt, type, params);
+              $xeTable.handleOpenMenuEvent(evnt, type, params);
               return;
             }
           } else if (mouseConfig && mouseOpts.selected) {
@@ -24246,7 +24262,7 @@ const {
             if (selected.row && selected.column) {
               params.row = selected.row;
               params.column = selected.column;
-              this.handleOpenMenuEvent(evnt, type, params);
+              $xeTable.handleOpenMenuEvent(evnt, type, params);
               return;
             }
           }
@@ -24254,16 +24270,16 @@ const {
         // 分别匹配表尾、内容、表尾的快捷菜单
         for (let index = 0; index < layoutList.length; index++) {
           const layout = layoutList[index];
-          const columnTargetNode = getEventTargetNode(evnt, this.$el, `vxe-${layout}--column`, target => {
+          const columnTargetNode = getEventTargetNode(evnt, el, `vxe-${layout}--column`, target => {
             // target=td|th，直接向上找 table 去匹配即可
-            return target.parentNode.parentNode.parentNode.getAttribute('xid') === tId;
+            return target.parentNode.parentNode.parentNode.getAttribute('xid') === xID;
           });
           const params = {
             type: layout,
             $table: $xeTable,
             $grid: $xeGrid,
             $gantt: $xeGantt,
-            columns: this.visibleColumn.slice(0),
+            columns: visibleColumn.slice(0),
             $event: evnt
           };
           if (columnTargetNode.flag) {
@@ -24288,41 +24304,44 @@ const {
               }
             }
             const eventType = `${typePrefix}cell-menu`;
-            this.handleOpenMenuEvent(evnt, layout, params);
+            $xeTable.handleOpenMenuEvent(evnt, layout, params);
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
-            if (this.$listeners[`${typePrefix}cell-context-menu`]) {
+            if ($xeTable.$listeners[`${typePrefix}cell-context-menu`]) {
               warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`]);
               $xeTable.dispatchEvent(`${typePrefix}cell-context-menu`, params, evnt);
             } else {
               $xeTable.dispatchEvent(eventType, params, evnt);
             }
             return;
-          } else if (getEventTargetNode(evnt, this.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === tId).flag) {
-            if (ctxMenuOpts.trigger === 'cell') {
+          } else if (getEventTargetNode(evnt, $xeTable.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag) {
+            if (menuOpts.trigger === 'cell') {
               evnt.preventDefault();
             } else {
-              this.handleOpenMenuEvent(evnt, layout, params);
+              $xeTable.handleOpenMenuEvent(evnt, layout, params);
             }
             return;
           }
         }
       }
       if (tableFilter && !getEventTargetNode(evnt, tableFilter.$el).flag) {
-        this.closeFilter();
+        $xeTable.closeFilter();
       }
-      this.closeMenu();
+      $xeTable.closeMenu();
     },
     /**
      * 显示快捷菜单
      */
     handleOpenMenuEvent(evnt, type, params) {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
-        isCtxMenu,
-        ctxMenuStore,
-        ctxMenuOpts
-      } = this;
-      const config = ctxMenuOpts[type];
-      const visibleMethod = ctxMenuOpts.visibleMethod;
+        ctxMenuStore
+      } = reactData;
+      const isMenu = $xeTable.computeIsMenu;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const config = menuOpts[type];
+      const visibleMethod = menuOpts.visibleMethod;
       if (config) {
         const {
           options,
@@ -24330,12 +24349,12 @@ const {
         } = config;
         if (disabled) {
           evnt.preventDefault();
-        } else if (isCtxMenu && options && options.length) {
+        } else if (isMenu && options && options.length) {
           params.options = options;
-          this.preventEvent(evnt, 'event.showMenu', params, () => {
+          $xeTable.preventEvent(evnt, 'event.showMenu', params, () => {
             if (!visibleMethod || visibleMethod(params)) {
               evnt.preventDefault();
-              this.updateZindex();
+              $xeTable.updateZindex();
               const {
                 scrollTop,
                 scrollLeft,
@@ -24345,21 +24364,22 @@ const {
               let top = evnt.clientY + scrollTop;
               let left = evnt.clientX + scrollLeft;
               const handleVisible = () => {
+                internalData._currMenuParams = params;
                 Object.assign(ctxMenuStore, {
-                  args: params,
                   visible: true,
                   list: options,
                   selected: null,
                   selectChild: null,
                   showChild: false,
                   style: {
-                    zIndex: this.tZindex,
+                    zIndex: internalData.tZindex,
                     top: `${top}px`,
                     left: `${left}px`
                   }
                 });
-                this.$nextTick(() => {
-                  const ctxElem = this.$refs.refTableMenu.$el;
+                $xeTable.$nextTick(() => {
+                  const tableMenu = $xeTable.$refs.refTableMenu;
+                  const ctxElem = tableMenu.$el;
                   const clientHeight = ctxElem.clientHeight;
                   const clientWidth = ctxElem.clientWidth;
                   const {
@@ -24382,30 +24402,36 @@ const {
                 column
               } = params;
               if (keyboard && row && column) {
-                this.scrollToRow(row, column).then(() => {
-                  const cell = this.getCellElement(row, column);
-                  const {
-                    boundingTop,
-                    boundingLeft
-                  } = getAbsolutePos(cell);
-                  top = boundingTop + scrollTop + Math.floor(cell.offsetHeight / 2);
-                  left = boundingLeft + scrollLeft + Math.floor(cell.offsetWidth / 2);
+                $xeTable.scrollToRow(row, column).then(() => {
+                  const cell = $xeTable.getCellElement(row, column);
+                  if (cell) {
+                    const {
+                      boundingTop,
+                      boundingLeft
+                    } = getAbsolutePos(cell);
+                    top = boundingTop + scrollTop + Math.floor(cell.offsetHeight / 2);
+                    left = boundingLeft + scrollLeft + Math.floor(cell.offsetWidth / 2);
+                  }
                   handleVisible();
                 });
               } else {
                 handleVisible();
               }
             } else {
-              this.closeMenu();
+              $xeTable.closeMenu();
             }
           });
         }
       }
-      this.closeFilter();
+      $xeTable.closeFilter();
     },
     ctxMenuMouseoverEvent(evnt, item, child) {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const menuElem = evnt.currentTarget;
-      const ctxMenuStore = this.ctxMenuStore;
+      const {
+        ctxMenuStore
+      } = reactData;
       evnt.preventDefault();
       evnt.stopPropagation();
       ctxMenuStore.selected = item;
@@ -24413,7 +24439,7 @@ const {
       if (!child) {
         ctxMenuStore.showChild = hasChildrenList(item);
         if (ctxMenuStore.showChild) {
-          this.$nextTick(() => {
+          $xeTable.$nextTick(() => {
             const childWrapperElem = menuElem.nextElementSibling;
             if (childWrapperElem) {
               const {
@@ -24448,7 +24474,11 @@ const {
       }
     },
     ctxMenuMouseoutEvent(evnt, item) {
-      const ctxMenuStore = this.ctxMenuStore;
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        ctxMenuStore
+      } = reactData;
       if (!item.children) {
         ctxMenuStore.selected = null;
       }
@@ -24461,27 +24491,28 @@ const {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
       const $xeGantt = $xeTable.$xeGantt;
+      const internalData = $xeTable;
       // 如果一级菜单有配置 code 则允许点击，否则不能点击
       if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = mixin_menus.get(menu.code);
-        const params = Object.assign({
+        const params = Object.assign({}, internalData._currMenuParams, {
           menu,
           $table: $xeTable,
           $grid: $xeGrid,
           $gantt: $xeGantt,
           $event: evnt
-        }, this.ctxMenuStore.args);
+        });
         if (gMenuOpts && gMenuOpts.menuMethod) {
           gMenuOpts.menuMethod(params, evnt);
         }
         // 在 v4 中废弃事件 context-menu-click
-        if (this.$listeners['context-menu-click']) {
+        if ($xeTable.$listeners['context-menu-click']) {
           warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click']);
           $xeTable.dispatchEvent('context-menu-click', params, evnt);
         } else {
           $xeTable.dispatchEvent('menu-click', params, evnt);
         }
-        this.closeMenu();
+        $xeTable.closeMenu();
       }
     }
   }
@@ -33093,6 +33124,8 @@ function grid_createInternalData() {
             let itemValue = null;
             if (itemRender) {
               const {
+                startField,
+                endField,
                 defaultValue
               } = itemRender;
               if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(defaultValue)) {
@@ -33102,6 +33135,10 @@ function grid_createInternalData() {
               } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(defaultValue)) {
                 itemValue = defaultValue;
               }
+              if (startField && endField) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(fData, startField, null);
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(fData, endField, null);
+              }
             }
             fData[field] = itemValue;
           }