vxe-table 3.19.16 → 3.19.18

package/lib/table/module/menu/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{menus,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI;var _default=exports.default={methods:{_closeMenu(){return Object.assign(this.ctxMenuStore,{visible:!1,selected:null,selectChild:null,showChild:!1}),this.$nextTick()},moveCtxMenu(e,t,l,n,o,i){let r;var s=_xeUtils.default.findIndexOf(i,e=>t[l]===e);if(n)o&&(0,_utils.hasChildrenList)(t.selected)?t.showChild=!0:(t.showChild=!1,t.selectChild=null);else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_UP)){for(let e=s-1;0<=e;e--)if(!1!==i[e].visible){r=i[e];break}t[l]=r||i[i.length-1]}else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_DOWN)){for(let e=s+1;e<i.length;e++)if(!1!==i[e].visible){r=i[e];break}t[l]=r||i[0]}else t[l]&&(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ENTER)||globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.SPACEBAR))&&this.ctxMenuLinkEvent(e,t[l])},handleGlobalContextmenuEvent(t){var l=this,n=l.$xeGrid,o=l.$xeGantt,e=l;let i=l.xID;var{mouseConfig:r,menuConfig:s}=l,{editStore:u,ctxMenuStore:d}=l,a=e.visibleColumn,c=l.$refs.refTableFilter,f=l.$refs.refTableMenu,h=l.computeMouseOpts,v=l.computeMenuOpts,g=l.$refs.refElem,u=u.selected,m=["header","body","footer"];if((0,_utils.isEnableConf)(s)){if(d.visible&&f&&(0,_dom.getEventTargetNode)(t,f.$el).flag)return void t.preventDefault();if(e._keyCtx){s="body",d={source:"table",type:s,$table:l,$grid:n,$gantt:o,keyboard:!0,columns:a.slice(0),$event:t};if(r&&h.area){f=l.getActiveCellArea();if(f&&f.row&&f.column)return d.row=f.row,d.column=f.column,void l.handleOpenMenuEvent(t,s,d)}else if(r&&h.selected&&u.row&&u.column)return d.row=u.row,d.column=u.column,void l.handleOpenMenuEvent(t,s,d)}for(let e=0;e<m.length;e++){var x=m[e],b=(0,_dom.getEventTargetNode)(t,g,`vxe-${x}--column`,e=>e.parentNode.parentNode.parentNode.getAttribute("xid")===i),p={source:"table",type:x,$table:l,$grid:n,$gantt:o,columns:a.slice(0),$event:t};if(b.flag){var b=b.targetElem,E=l.getColumnNode(b),E=E?E.item:null;let e=x+"-";E&&Object.assign(p,{column:E,columnIndex:l.getColumnIndex(E),cell:b}),"body"===x&&(b=(E=l.getRowNode(b.parentNode))?E.item:null,e="",b)&&(p.row=b,p.rowIndex=l.getRowIndex(b));E=e+"cell-menu";return l.handleOpenMenuEvent(t,x,p),void(l.$listeners[e+"cell-context-menu"]?((0,_log.warnLog)("vxe.error.delEvent",[e+"cell-context-menu",e+"cell-menu"]),l.dispatchEvent(e+"cell-context-menu",p,t)):l.dispatchEvent(E,p,t))}if((0,_dom.getEventTargetNode)(t,l.$el,`vxe-table--${x}-wrapper`,e=>e.getAttribute("xid")===i).flag)return void("cell"===v.trigger?t.preventDefault():l.handleOpenMenuEvent(t,x,p))}}c&&!(0,_dom.getEventTargetNode)(t,c.$el).flag&&l.closeFilter(),l.closeMenu()},handleOpenMenuEvent(f,t,h){let v=this;var e=v.$xeGrid,n=v.$xeGantt;let g=e||n;e=v;let m=v,x=e.ctxMenuStore;n=v.computeIsContentMenu,e=v.computeMenuOpts,t=e[t];let{transfer:b,visibleMethod:o}=e;if(t){let{options:l,disabled:e}=t;e?f.preventDefault():n&&l&&l.length&&(h.options=l,v.preventEvent(f,"event.showMenu",h,()=>{if(!o||o(h)){f.preventDefault(),v.updateZindex();var t=(g||v).$refs.refElem.getBoundingClientRect();let{scrollTop:o,scrollLeft:i,visibleHeight:r,visibleWidth:s}=(0,_dom.getDomNode)(),u=f.clientY-t.y,d=f.clientX-t.x,n=(b&&(u=f.clientY+o,d=f.clientX+i),()=>{m._currMenuParams=h,Object.assign(x,{visible:!0,list:l,selected:null,selectChild:null,showChild:!1,style:{zIndex:m.tZindex,top:u+"px",left:d+"px"}}),v.$nextTick(()=>{var e=v.$refs.refTableMenu.$el,t=e.clientHeight,l=e.clientWidth,{boundingTop:e,boundingLeft:n}=(0,_dom.getAbsolutePos)(e),e=e+t-r,n=n+l-s;-10<e&&(x.style.top=Math.max(o+2,u-t-2)+"px"),-10<n&&(x.style.left=Math.max(i+2,d-l-2)+"px")})}),{keyboard:e,row:a,column:c}=h;e&&a&&c?v.scrollToRow(a,c).then(()=>{var e,t,l=v.getCellElement(a,c);l&&({boundingTop:e,boundingLeft:t}=(0,_dom.getAbsolutePos)(l),u=e+o+Math.floor(l.offsetHeight/2),d=t+i+Math.floor(l.offsetWidth/2)),n()}):n()}else v.closeMenu()}))}v.closeFilter()},ctxMenuMouseoverEvent(e,t,l){let d=e.currentTarget;var n=this.ctxMenuStore;e.preventDefault(),e.stopPropagation(),n.selected=t,(n.selectChild=l)||(n.showChild=(0,_utils.hasChildrenList)(t),n.showChild&&this.$nextTick(()=>{var o=d.nextElementSibling;if(o){var{boundingTop:i,boundingLeft:r,visibleHeight:s,visibleWidth:u}=(0,_dom.getAbsolutePos)(d),i=i+d.offsetHeight;let e="",t="",l=(r+d.offsetWidth+o.offsetWidth>u-10&&(e="auto",t=d.offsetWidth+"px"),""),n="";i+o.offsetHeight>s-10&&(l="auto",n="0"),o.style.left=e,o.style.right=t,o.style.top=l,o.style.bottom=n}}))},ctxMenuMouseoutEvent(e,t){var l=this.ctxMenuStore;t.children||(l.selected=null),l.selectChild=null},ctxMenuLinkEvent(e,t){var l,n=this,o=n.$xeGrid,i=n.$xeGantt,r=n;t.loading||t.disabled||!t.code&&t.children&&t.children.length||(l=menus.get(t.code),r=Object.assign({},r._currMenuParams,{menu:t,$table:n,$grid:o,$gantt:i,$event:e}),l&&l.menuMethod&&l.menuMethod(r,e),n.$listeners["context-menu-click"]?((0,_log.warnLog)("vxe.error.delEvent",["context-menu-click","menu-click"]),n.dispatchEvent("context-menu-click",r,e)):n.dispatchEvent("menu-click",r,e),n.closeMenu())}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{menus,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI;var _default=exports.default={methods:{_closeMenu(){return Object.assign(this.ctxMenuStore,{visible:!1,selected:null,selectChild:null,showChild:!1}),this.$nextTick()},moveCtxMenu(e,t,l,n,o,i){let r;var s=_xeUtils.default.findIndexOf(i,e=>t[l]===e);if(n)o&&(0,_utils.hasChildrenList)(t.selected)?t.showChild=!0:(t.showChild=!1,t.selectChild=null);else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_UP)){for(let e=s-1;0<=e;e--)if(!1!==i[e].visible){r=i[e];break}t[l]=r||i[i.length-1]}else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_DOWN)){for(let e=s+1;e<i.length;e++)if(!1!==i[e].visible){r=i[e];break}t[l]=r||i[0]}else t[l]&&(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ENTER)||globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.SPACEBAR))&&this.ctxMenuLinkEvent(e,t[l])},handleGlobalContextmenuEvent(t){var l=this,n=l.$xeGrid,o=l.$xeGantt,e=l;let i=l.xID;var{mouseConfig:r,menuConfig:s}=l,{editStore:u,ctxMenuStore:d}=l,a=e.visibleColumn,c=l.$refs.refTableFilter,g=l.$refs.refTableMenu,v=l.computeMouseOpts,f=l.computeMenuOpts,h=l.$refs.refElem,u=u.selected,m=["header","body","footer"];if((0,_utils.isEnableConf)(s)){if(d.visible&&g&&(0,_dom.getEventTargetNode)(t,g.$el).flag)return void t.preventDefault();if(e._keyCtx){s="body",d={source:"table",type:s,$table:l,$grid:n,$gantt:o,keyboard:!0,columns:a.slice(0),$event:t};if(r&&v.area){g=l.getActiveCellArea();if(g&&g.row&&g.column)return d.row=g.row,d.column=g.column,void l.handleOpenMenuEvent(t,s,d)}else if(r&&v.selected&&u.row&&u.column)return d.row=u.row,d.column=u.column,void l.handleOpenMenuEvent(t,s,d)}for(let e=0;e<m.length;e++){var x=m[e],b=(0,_dom.getEventTargetNode)(t,h,`vxe-${x}--column`,e=>e.parentNode.parentNode.parentNode.getAttribute("xid")===i),p={source:"table",type:x,$table:l,$grid:n,$gantt:o,columns:a.slice(0),$event:t};if(b.flag){var b=b.targetElem,E=l.getColumnNode(b),E=E?E.item:null;let e=x+"-";E&&Object.assign(p,{column:E,columnIndex:l.getColumnIndex(E),cell:b}),"body"===x&&(b=(E=l.getRowNode(b.parentNode))?E.item:null,e="",b)&&(p.row=b,p.rowIndex=l.getRowIndex(b));E=e+"cell-menu";return l.handleOpenMenuEvent(t,x,p),void(l.$listeners[e+"cell-context-menu"]?((0,_log.warnLog)("vxe.error.delEvent",[e+"cell-context-menu",e+"cell-menu"]),l.dispatchEvent(e+"cell-context-menu",p,t)):l.dispatchEvent(E,p,t))}if((0,_dom.getEventTargetNode)(t,h,`vxe-table--${x}-wrapper`,e=>e.getAttribute("xid")===i).flag||"body"===x&&(0,_dom.getEventTargetNode)(t,h,"vxe-table--empty-place-wrapper",e=>e.getAttribute("xid")===i).flag)return void("cell"===f.trigger?t.preventDefault():l.handleOpenMenuEvent(t,x,p))}}c&&!(0,_dom.getEventTargetNode)(t,c.$el).flag&&l.closeFilter(),l.closeMenu()},handleOpenMenuEvent(g,t,v){let f=this;var e=f.$xeGrid,n=f.$xeGantt;let h=e||n;e=f;let m=f,x=e.ctxMenuStore;n=f.computeIsContentMenu,e=f.computeMenuOpts,t=e[t];let{transfer:b,visibleMethod:o}=e;if(t){let{options:l,disabled:e}=t;e?g.preventDefault():n&&l&&l.length&&(v.options=l,f.preventEvent(g,"event.showMenu",v,()=>{if(!o||o(v)){g.preventDefault(),f.updateZindex();var t=(h||f).$refs.refElem.getBoundingClientRect();let{scrollTop:o,scrollLeft:i,visibleHeight:r,visibleWidth:s}=(0,_dom.getDomNode)(),u=g.clientY-t.y,d=g.clientX-t.x,n=(b&&(u=g.clientY+o,d=g.clientX+i),()=>{m._currMenuParams=v,Object.assign(x,{visible:!0,list:l,selected:null,selectChild:null,showChild:!1,style:{zIndex:m.tZindex,top:u+"px",left:d+"px"}}),f.$nextTick(()=>{var e=f.$refs.refTableMenu.$el,t=e.clientHeight,l=e.clientWidth,{boundingTop:e,boundingLeft:n}=(0,_dom.getAbsolutePos)(e),e=e+t-r,n=n+l-s;-10<e&&(x.style.top=Math.max(o+2,u-t-2)+"px"),-10<n&&(x.style.left=Math.max(i+2,d-l-2)+"px")})}),{keyboard:e,row:a,column:c}=v;e&&a&&c?f.scrollToRow(a,c).then(()=>{var e,t,l=f.getCellElement(a,c);l&&({boundingTop:e,boundingLeft:t}=(0,_dom.getAbsolutePos)(l),u=e+o+Math.floor(l.offsetHeight/2),d=t+i+Math.floor(l.offsetWidth/2)),n()}):n()}else f.closeMenu()}))}f.closeFilter()},ctxMenuMouseoverEvent(e,t,l){let d=e.currentTarget;var n=this.ctxMenuStore;e.preventDefault(),e.stopPropagation(),n.selected=t,(n.selectChild=l)||(n.showChild=(0,_utils.hasChildrenList)(t),n.showChild&&this.$nextTick(()=>{var o=d.nextElementSibling;if(o){var{boundingTop:i,boundingLeft:r,visibleHeight:s,visibleWidth:u}=(0,_dom.getAbsolutePos)(d),i=i+d.offsetHeight;let e="",t="",l=(r+d.offsetWidth+o.offsetWidth>u-10&&(e="auto",t=d.offsetWidth+"px"),""),n="";i+o.offsetHeight>s-10&&(l="auto",n="0"),o.style.left=e,o.style.right=t,o.style.top=l,o.style.bottom=n}}))},ctxMenuMouseoutEvent(e,t){var l=this.ctxMenuStore;t.children||(l.selected=null),l.selectChild=null},ctxMenuLinkEvent(e,t){var l,n=this,o=n.$xeGrid,i=n.$xeGantt,r=n;t.loading||t.disabled||!t.code&&t.children&&t.children.length||(l=menus.get(t.code),r=Object.assign({},r._currMenuParams,{menu:t,$table:n,$grid:o,$gantt:i,$event:e}),l&&l.menuMethod&&l.menuMethod(r,e),n.$listeners["context-menu-click"]?((0,_log.warnLog)("vxe.error.delEvent",["context-menu-click","menu-click"]),n.dispatchEvent("context-menu-click",r,e)):n.dispatchEvent("menu-click",r,e),n.closeMenu())}}};

package/lib/table/src/methods.js

@@ -3926,7 +3926,7 @@ function loadTableData($xeTable, datas, isReset) {
             handleRecalculateStyle($xeTable, false, true, true);
             updateRowOffsetTop($xeTable);
             updateTreeLineStyle($xeTable);
-            resolve();
+            $xeTable.$nextTick(() => resolve());
           });
         } else {
           setTimeout(() => {
@@ -3934,7 +3934,7 @@ function loadTableData($xeTable, datas, isReset) {
               handleRecalculateStyle($xeTable, false, true, true);
               updateRowOffsetTop($xeTable);
               updateTreeLineStyle($xeTable);
-              resolve();
+              $xeTable.$nextTick(() => resolve());
             });
           });
         }
@@ -4387,48 +4387,67 @@ function lazyScrollYData($xeTable) {
     loadScrollYData($xeTable);
   }, fpsTime);
 }
+function handleSyncScroll($xeTable, isRollX, isRollY) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    scrollXLoad,
+    scrollYLoad,
+    isAllOverflow
+  } = reactData;
+  internalData.lcsRunTime = Date.now();
+  internalData.lcsTimeout = undefined;
+  internalData.intoRunScroll = false;
+  internalData.inVirtualScroll = false;
+  internalData.inWheelScroll = false;
+  internalData.inHeaderScroll = false;
+  internalData.inBodyScroll = false;
+  internalData.inFooterScroll = false;
+  reactData.lazScrollLoading = false;
+  internalData.scrollRenderType = '';
+  let xRest = null;
+  let yRest = null;
+  if (!isAllOverflow) {
+    calcCellHeight($xeTable);
+    updateRowOffsetTop($xeTable);
+  }
+  if (isRollX && scrollXLoad) {
+    xRest = $xeTable.updateScrollXData();
+  }
+  if (isRollY && scrollYLoad) {
+    yRest = $xeTable.updateScrollYData().then(() => {
+      if (!isAllOverflow) {
+        calcCellHeight($xeTable);
+        updateRowOffsetTop($xeTable);
+      }
+      return $xeTable.updateScrollYSpace();
+    });
+  }
+  updateRowExpandStyle($xeTable);
+  return Promise.all([xRest, yRest, $xeTable.updateCellAreas()]);
+}
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     lcsTimeout
   } = internalData;
+  reactData.lazScrollLoading = true;
   if (lcsTimeout) {
     clearTimeout(lcsTimeout);
   }
   internalData.lcsTimeout = setTimeout(() => {
-    const {
-      scrollXLoad,
-      scrollYLoad,
-      isAllOverflow
-    } = reactData;
-    internalData.lcsRunTime = Date.now();
-    internalData.lcsTimeout = undefined;
-    internalData.intoRunScroll = false;
-    internalData.inVirtualScroll = false;
-    internalData.inWheelScroll = false;
-    internalData.inHeaderScroll = false;
-    internalData.inBodyScroll = false;
-    internalData.inFooterScroll = false;
-    internalData.scrollRenderType = '';
-    if (!isAllOverflow) {
-      calcCellHeight($xeTable);
-      updateRowOffsetTop($xeTable);
-    }
-    if (isRollX && scrollXLoad) {
-      $xeTable.updateScrollXData();
-    }
-    if (isRollY && scrollYLoad) {
-      $xeTable.updateScrollYData().then(() => {
-        if (!isAllOverflow) {
-          calcCellHeight($xeTable);
-          updateRowOffsetTop($xeTable);
-        }
-        $xeTable.updateScrollYSpace();
-      });
-    }
-    $xeTable.updateCellAreas();
-  }, 250);
+    handleSyncScroll($xeTable, isRollX, isRollY).then(() => {
+      if (reactData.scrollXLoad || reactData.scrollYLoad) {
+        $xeTable.$nextTick(() => {
+          updateRowExpandStyle($xeTable);
+          if (!internalData.lcsTimeout) {
+            handleSyncScroll($xeTable, isRollX, isRollY);
+          }
+        });
+      }
+    });
+  }, 200);
 }
 const getWheelSpeed = lastScrollTime => {
   let multiple = 1;
@@ -10352,6 +10371,8 @@ const Methods = {
         return errRest;
       });
     }
+    clearRowDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleCrossTableRowDragCancelEvent() {
@@ -10892,6 +10913,8 @@ const Methods = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
       return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
         if (!status) {
+          clearColDragData($xeTable);
+          clearCrossTableDragStatus($xeTable);
           return errRest;
         }
         let dragTargetColumn = null;
@@ -11146,6 +11169,8 @@ const Methods = {
         return errRest;
       });
     }
+    clearColDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
@@ -13422,7 +13447,7 @@ const Methods = {
       $xeGanttView.handleUpdateSYSpace();
     }
     return $xeTable.$nextTick().then(() => {
-      updateStyle($xeTable);
+      return updateStyle($xeTable);
     });
   },
   updateScrollYStatus() {