vxe-table 3.11.21 → 3.11.23

package/lib/table/module/custom/panel.js

@@ -34,17 +34,17 @@ function updateDropHint(_vm, evnt) {
 }
 const renderSimplePanel = (h, _vm) => {
   const VxeUIButtonComponent = _ui.VxeUI.getComponent('VxeButton');
+  const props = _vm;
   const $xeTable = _vm.$xeTable;
+  const reactData = $xeTable;
   const {
-    _e,
-    customStore,
-    dragColumn
-  } = _vm;
+    customStore
+  } = props;
   const {
-    customColumnList,
-    customOpts,
-    isMaxFixedColumn
-  } = $xeTable;
+    isCustomStatus,
+    customColumnList
+  } = reactData;
+  const customOpts = $xeTable.computeCustomOpts;
   const {
     maxHeight
   } = customStore;
@@ -57,6 +57,7 @@ const renderSimplePanel = (h, _vm) => {
     trigger,
     placement
   } = customOpts;
+  const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
   const slots = customOpts.slots || {};
   const headerSlot = slots.header;
   const topSlot = slots.top;
@@ -65,19 +66,21 @@ const renderSimplePanel = (h, _vm) => {
   const footerSlot = slots.footer;
   const colVNs = [];
   const customWrapperOns = {};
+  const isAllChecked = customStore.isAll;
+  const isAllIndeterminate = customStore.isIndeterminate;
+  const dragColumn = _vm.dragColumn;
   // hover 触发
   if (trigger === 'hover') {
     customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent;
     customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent;
   }
-  const isAllChecked = customStore.isAll;
-  const isAllIndeterminate = customStore.isIndeterminate;
   const params = {
     $table: $xeTable,
     $grid: $xeTable.xegrid,
     columns: customColumnList,
     isAllChecked,
-    isAllIndeterminate
+    isAllIndeterminate,
+    isCustomStatus
   };
   _xeUtils.default.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
@@ -124,7 +127,7 @@ const renderSimplePanel = (h, _vm) => {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-      })]) : _e(), allowSort && column.level === 1 ? h('div', {
+      })]) : renderEmptyElement($xeTable), allowSort && column.level === 1 ? h('div', {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: ['vxe-table-custom--sort-btn', {
@@ -139,7 +142,7 @@ const renderSimplePanel = (h, _vm) => {
         }
       }, [h('i', {
         class: getIcon().TABLE_CUSTOM_SORT
-      })])]) : _e(), column.type === 'html' ? h('div', {
+      })])]) : renderEmptyElement($xeTable), column.type === 'html' ? h('div', {
         key: '1',
         class: 'vxe-table-custom--checkbox-label',
         domProps: {
@@ -179,7 +182,7 @@ const renderSimplePanel = (h, _vm) => {
             _vm.changeFixedOption(column, 'right');
           }
         }
-      })]) : _e()]));
+      })]) : renderEmptyElement($xeTable)]));
     }
   });
   return h('div', {
@@ -239,7 +242,8 @@ const renderSimplePanel = (h, _vm) => {
   }, [h(VxeUIButtonComponent, {
     props: {
       mode: 'text',
-      content: customOpts.resetButtonText || getI18n('vxe.table.customRestore')
+      content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+      disabled: !isCustomStatus
     },
     on: {
       click: _vm.resetCustomEvent
@@ -260,7 +264,7 @@ const renderSimplePanel = (h, _vm) => {
     on: {
       click: _vm.cancelCustomEvent
     }
-  }), customOpts.immediate ? _e() : h(VxeUIButtonComponent, {
+  }), customOpts.immediate ? renderEmptyElement($xeTable) : h(VxeUIButtonComponent, {
     props: {
       mode: 'text',
       status: 'primary',
@@ -278,18 +282,21 @@ const renderPopupPanel = (h, _vm) => {
   const VxeUINumberInputComponent = _ui.VxeUI.getComponent('VxeInput');
   const VxeUITooltipComponent = _ui.VxeUI.getComponent('VxeTooltip');
   const $xeTableCustomPanel = _vm;
+  const props = _vm;
   const $xeTable = _vm.$xeTable;
+  const tableProps = $xeTable;
+  const reactData = $xeTable;
   const {
-    _e,
     customStore
-  } = _vm;
+  } = props;
+  const {
+    resizable: allResizable
+  } = tableProps;
   const {
-    resizable: allResizable,
-    customOpts,
-    customColumnList,
-    columnOpts,
-    isMaxFixedColumn
-  } = $xeTable;
+    isCustomStatus,
+    customColumnList
+  } = reactData;
+  const customOpts = $xeTable.computeCustomOpts;
   const {
     mode,
     modalOptions,
@@ -301,6 +308,7 @@ const renderPopupPanel = (h, _vm) => {
     checkMethod,
     visibleMethod
   } = customOpts;
+  const columnOpts = $xeTable.computeColumnOpts;
   const {
     maxFixedSize
   } = columnOpts;
@@ -311,6 +319,7 @@ const renderPopupPanel = (h, _vm) => {
   } = resizableOpts;
   const modalOpts = Object.assign({}, modalOptions);
   const drawerOpts = Object.assign({}, drawerOptions);
+  const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
   const slots = customOpts.slots || {};
   const headerSlot = slots.header;
   const topSlot = slots.top;
@@ -320,12 +329,14 @@ const renderPopupPanel = (h, _vm) => {
   const trVNs = [];
   const isAllChecked = customStore.isAll;
   const isAllIndeterminate = customStore.isIndeterminate;
+  const dragColumn = _vm.dragColumn;
   const params = {
     $table: $xeTable,
     $grid: $xeTable.xegrid,
     columns: customColumnList,
     isAllChecked,
-    isAllIndeterminate
+    isAllIndeterminate,
+    isCustomStatus
   };
   _xeUtils.default.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
@@ -391,7 +402,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-      })])]) : _e(), allowSort ? h('td', {
+      })])]) : renderEmptyElement($xeTable), allowSort ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--sort'
       }, [column.level === 1 ? h('span', {
         class: ['vxe-table-custom-popup--column-sort-btn', {
@@ -406,7 +417,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, [h('i', {
         class: getIcon().TABLE_CUSTOM_SORT
-      })]) : h('span', '-')]) : _e(), h('td', {
+      })]) : h('span', '-')]) : renderEmptyElement($xeTable), h('td', {
         class: 'vxe-table-custom-popup--column-item col--name'
       }, [column.type === 'html' ? h('div', {
         key: '1',
@@ -435,7 +446,7 @@ const renderPopupPanel = (h, _vm) => {
             column.renderResizeWidth = Math.max(0, Number(value));
           }
         }
-      }) : renderEmptyElement($xeTableCustomPanel)]) : _e(), allowFixed ? h('td', {
+      }) : renderEmptyElement($xeTableCustomPanel)]) : renderEmptyElement($xeTable), allowFixed ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--fixed'
       }, [parent ? h('span', '-') : h('vxe-radio-group', {
         props: {
@@ -462,7 +473,7 @@ const renderPopupPanel = (h, _vm) => {
             column.renderFixed = value;
           }
         }
-      })]) : _e()]));
+      })]) : renderEmptyElement($xeTable)]));
     }
   });
   const scopedSlots = {
@@ -479,15 +490,15 @@ const renderPopupPanel = (h, _vm) => {
         class: 'vxe-table-custom-popup--table-wrapper'
       }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
         class: 'vxe-table-custom-popup--table-col-seq'
-      }) : _e(), allowSort ? h('col', {
+      }) : renderEmptyElement($xeTable), allowSort ? h('col', {
         class: 'vxe-table-custom-popup--table-col-sort'
-      }) : _e(), h('col', {
+      }) : renderEmptyElement($xeTable), h('col', {
         class: 'vxe-table-custom-popup--table-col-title'
       }), allowResizable ? h('col', {
         class: 'vxe-table-custom-popup--table-col-width'
-      }) : _e(), allowFixed ? h('col', {
+      }) : renderEmptyElement($xeTable), allowFixed ? h('col', {
         class: 'vxe-table-custom-popup--table-col-fixed'
-      }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
+      }) : renderEmptyElement($xeTable)]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isAllChecked,
           'is--indeterminate': isAllIndeterminate
@@ -502,7 +513,7 @@ const renderPopupPanel = (h, _vm) => {
         class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         class: 'vxe-checkbox--label'
-      }, getI18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
+      }, getI18n('vxe.toolbar.customAll'))])]) : renderEmptyElement($xeTable), allowSort ? h('th', {}, [h('span', {
         class: 'vxe-table-custom-popup--table-sort-help-title'
       }, getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? h(VxeUITooltipComponent, {
         props: {
@@ -517,7 +528,7 @@ const renderPopupPanel = (h, _vm) => {
             });
           }
         }
-      }) : renderEmptyElement($xeTableCustomPanel)]) : _e(), h('th', {}, getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, getI18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : _e()])]), h('transition-group', {
+      }) : renderEmptyElement($xeTableCustomPanel)]) : renderEmptyElement($xeTable), h('th', {}, getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, getI18n('vxe.custom.setting.colResizable')) : renderEmptyElement($xeTable), allowFixed ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : renderEmptyElement($xeTable)])]), h('transition-group', {
         class: 'vxe-table-custom--panel-list',
         props: {
           tag: 'tbody',
@@ -528,7 +539,7 @@ const renderPopupPanel = (h, _vm) => {
       }, $xeTable.callSlot(bottomSlot, params, h)) : renderEmptyElement($xeTable), h('div', {
         ref: 'dragHintElemRef',
         class: 'vxe-table-custom-popup--drag-hint'
-      }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]);
+      }, getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))]);
     },
     footer: () => {
       if (footerSlot) {
@@ -538,7 +549,8 @@ const renderPopupPanel = (h, _vm) => {
         class: 'vxe-table-custom-popup--footer'
       }, [h(VxeUIButtonComponent, {
         props: {
-          content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
+          content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore'),
+          disabled: !isCustomStatus
         },
         on: {
           click: _vm.resetCustomEvent

package/lib/table/module/custom/panel.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function updateDropHint(e,t){var o,e=e.$refs,l=e.dragHintElemRef,e=e.bodyElemRef;e&&l&&(o=(e=e.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(e.clientHeight-e.scrollTop-l.clientHeight,t.clientY-o.y)+"px",l.style.left=Math.min(e.clientWidth-e.scrollLeft-l.clientWidth-16,t.clientX-o.x)+"px")}let renderSimplePanel=(d,m)=>{let u=_ui.VxeUI.getComponent("VxeButton");var e=m.$xeTable;let{_e:p,customStore:t,dragColumn:o}=m,{customColumnList:l,customOpts:s,isMaxFixedColumn:v}=e;var i=t.maxHeight;let{checkMethod:x,visibleMethod:g,allowVisible:b,allowSort:h,allowFixed:C,trigger:a,placement:r}=s;var n=s.slots||{},c=n.header,E=n.top,f=n.bottom,_=n.default,n=n.footer;let I=[];var T={},O=("hover"===a&&(T.mouseenter=m.handleWrapperMouseenterEvent,T.mouseleave=m.handleWrapperMouseleaveEvent),t.isAll),k=t.isIndeterminate,y={$table:e,$grid:e.xegrid,columns:l,isAllChecked:O,isAllIndeterminate:k};return _xeUtils.default.eachTree(l,(t,e,o,l,s)=>{if(!g||g({column:t})){var i=t.renderVisible,a=t.halfVisible,r=t.children&&t.children.length,n=(0,_utils.formatText)(t.getTitle(),1);let e=!!x&&!x({column:t});var c=!i;I.push(d("li",{key:t.id,attrs:{colid:t.id},class:["vxe-table-custom--option","level--"+t.level,{"is--hidden":e||c,"is--group":r}],on:{dragstart:m.sortDragstartEvent,dragend:m.sortDragendEvent,dragover:m.sortDragoverEvent}},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":e}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{e||m.changeCheckboxOption(t)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):p(),h&&1===t.level?d("div",{class:"vxe-table-custom--sort-option"},[d("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":e||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:e||c?{}:{mousedown:m.sortMousedownEvent,mouseup:m.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):p(),"html"===t.type?d("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):d("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n),!s&&C?d("div",{class:"vxe-table-custom--fixed-option"},[d(u,{props:{mode:"text",icon:"left"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("left"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:()=>{m.changeFixedOption(t,"left")}}}),d(u,{props:{mode:"text",icon:"right"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("right"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:()=>{m.changeFixedOption(t,"right")}}})]):p()]))}}),d("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+r,{"is--active":t.visible}],style:i&&!["left","right"].includes(r)?{maxHeight:i+"px"}:{}},t.visible?[d("div",{class:"vxe-table-custom--header"},c?e.callSlot(c,y,d):[d("ul",{class:"vxe-table-custom--panel-list"},[d("li",{class:"vxe-table-custom--option"},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":O,"is--indeterminate":k}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:m.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",k?getIcon().TABLE_CHECKBOX_INDETERMINATE:O?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):d("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),d("div",{ref:"bodyElemRef",class:"vxe-table-custom--body"},[E?d("div",{class:"vxe-table-custom--panel-top"},e.callSlot(E,y,d)):renderEmptyElement(e),_?d("div",{class:"vxe-table-custom--panel-body"},e.callSlot(_,y,d)):d("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:T},I),f?d("div",{class:"vxe-table-custom--panel-bottom"},e.callSlot(f,y,d)):renderEmptyElement(e),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[o&&"html"!==o.type?o.getTitle():""]))]),s.showFooter?d("div",{class:"vxe-table-custom--footer"},n?e.callSlot(n,y,d):[d("div",{class:"vxe-table-custom--footer-buttons"},[d(u,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customRestore")},on:{click:m.resetCustomEvent}}),s.immediate?d(u,{props:{mode:"text",content:s.closeButtonText||getI18n("vxe.table.customClose")},on:{click:m.cancelCloseEvent}}):d(u,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:m.cancelCustomEvent}}),s.immediate?p():d(u,{props:{mode:"text",status:"primary",content:s.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:m.confirmCustomEvent}})])]):null]:[])},renderPopupPanel=(d,m)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let o=_ui.VxeUI.getComponent("VxeButton"),u=_ui.VxeUI.getComponent("VxeInput"),l=_ui.VxeUI.getComponent("VxeTooltip"),p=m,v=m.$xeTable,{_e:x,customStore:s}=m,{resizable:M,customOpts:i,customColumnList:a,columnOpts:g,isMaxFixedColumn:b}=v,{mode:L,modalOptions:R,drawerOptions:S,allowVisible:h,allowSort:C,allowFixed:E,allowResizable:f,checkMethod:_,visibleMethod:I}=i,r=g.maxFixedSize,{minWidth:T,maxWidth:O}=v.computeResizableOpts;var n=Object.assign({},R),c=Object.assign({},S),k=i.slots||{};let y=k.header,V=k.top,B=k.bottom,w=k.default,H=k.footer,F=[],U=s.isAll,A=s.isIndeterminate,D={$table:v,$grid:v.xegrid,columns:a,isAllChecked:U,isAllIndeterminate:A};_xeUtils.default.eachTree(a,(l,s,e,t,i)=>{if(!I||I({column:l})){let e=0,t=0;f&&(s={$table:v,column:l,columnIndex:s,$columnIndex:s,$rowIndex:-1},T&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(T)?T(s):T)),O)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(O)?O(s):O));var s=l.renderVisible,a=l.halfVisible,r=(0,_utils.formatText)(l.getTitle(),1),n=l.children&&l.children.length;let o=!!_&&!_({column:l});var c=!s;F.push(d("tr",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom-popup--row level--"+l.level,{"is--group":n}],on:{dragstart:m.sortDragstartEvent,dragend:m.sortDragendEvent,dragover:m.sortDragoverEvent}},[h?d("td",{class:"vxe-table-custom-popup--column-item col--visible"},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":o}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{o||m.changeCheckboxOption(l)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):x(),C?d("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===l.level?d("span",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":o||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:o||c?{}:{mousedown:m.sortMousedownEvent,mouseup:m.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})]):d("span","-")]):x(),d("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===l.type?d("div",{key:"1",class:"vxe-table-custom-popup--name",domProps:{innerHTML:r}}):d("div",{key:"0",class:"vxe-table-custom-popup--name",attrs:{title:r}},r)]),f?d("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[l.children&&l.children.length||!(_xeUtils.default.isBoolean(l.resizable)?l.resizable:g.resizable||M)?d("span","-"):u?d(u,{props:{type:"integer",disabled:o||c,value:l.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){l.renderResizeWidth=Math.max(0,Number(e))}}}):renderEmptyElement(p)]):x(),E?d("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[i?d("span","-"):d("vxe-radio-group",{props:{value:l.renderFixed||"",type:"button",size:"mini",disabled:o||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:o||c||b},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:o||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:o||c||b}]},on:{input(e){l.renderFixed=e}}})]):x()]))}});k={default:()=>w?v.callSlot(w,D,d):d("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[V?d("div",{class:"vxe-table-custom-popup--table-top"},v.callSlot(V,D,d)):renderEmptyElement(v),d("div",{class:"vxe-table-custom-popup--table-wrapper"},[d("table",{},[d("colgroup",{},[h?d("col",{class:"vxe-table-custom-popup--table-col-seq"}):x(),C?d("col",{class:"vxe-table-custom-popup--table-col-sort"}):x(),d("col",{class:"vxe-table-custom-popup--table-col-title"}),f?d("col",{class:"vxe-table-custom-popup--table-col-width"}):x(),E?d("col",{class:"vxe-table-custom-popup--table-col-fixed"}):x()]),d("thead",{},[d("tr",{},[h?d("th",{},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":U,"is--indeterminate":A}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:m.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",A?getIcon().TABLE_CHECKBOX_INDETERMINATE:U?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):x(),C?d("th",{},[d("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),l?d(l,{props:{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},scopedSlots:{default:()=>d("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}}):renderEmptyElement(p)]):x(),d("th",{},getI18n("vxe.custom.setting.colTitle")),f?d("th",{},getI18n("vxe.custom.setting.colResizable")):x(),E?d("th",{},getI18n("vxe.custom.setting."+(r?"colFixedMax":"colFixed"),[r])):x()])]),d("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},F)])]),B?d("div",{class:"vxe-table-custom-popup--table-bottom"},v.callSlot(B,D,d)):renderEmptyElement(v),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[m.dragColumn?m.dragColumn.getTitle():""]))]),footer:()=>H?v.callSlot(H,D,d):d("div",{class:"vxe-table-custom-popup--footer"},[d(o,{props:{content:i.resetButtonText||getI18n("vxe.custom.cstmRestore")},on:{click:m.resetCustomEvent}}),d(o,{props:{content:i.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:m.cancelCustomEvent}}),d(o,{props:{status:"primary",content:i.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:m.confirmCustomEvent}})])};return y&&(k.header=()=>v.callSlot(y,D,d)),"drawer"===L?t?d(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",c.className||""].join(" "),value:s.visible,title:c.title||getI18n("vxe.custom.cstmTitle"),width:c.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:c.position,resize:!!c.resize,escClosable:!!c.escClosable,maskClosable:!!c.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){s.visible=e}},scopedSlots:k}):renderEmptyElement(p):e?d(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",n.className||""].join(" "),value:s.visible,title:n.title||getI18n("vxe.custom.cstmTitle"),width:n.width||Math.min(880,document.documentElement.clientWidth),minWidth:n.minWidth||700,height:n.height||Math.min(680,document.documentElement.clientHeight),minHeight:n.minHeight||400,showZoom:n.showZoom,showMaximize:n.showMaximize,showMinimize:n.showMinimize,mask:n.mask,lockView:n.lockView,resize:n.resize,escClosable:!!n.escClosable,maskClosable:!!n.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){s.visible=e}},scopedSlots:k}):renderEmptyElement(p)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},inject:{$xeTable:{default:null},$xetable:{default:null}},data(){return{dragColumn:null}},computed:{},created(){if("development"===process.env.NODE_ENV){let t=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),l=_ui.VxeUI.getComponent("VxeButton"),s=_ui.VxeUI.getComponent("VxeNumberInput"),i=_ui.VxeUI.getComponent("VxeTooltip"),a=_ui.VxeUI.getComponent("VxeRadioGroup");this.$nextTick(()=>{var e=this.$xetable,e=e.customOpts,e=e.mode;t||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),l||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),i||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})}},render(e){var t=this.$xetable,t=t.customOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var{$xetable:t,customStore:o}=this;o.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let{$xetable:t,customStore:o}=this;o.activeWrapper=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xetable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},resetPopupCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.resetCustomEvent(t)}):this.resetCustomEvent(t)},handleOptionCheck(t){var e=this.$xetable,e=e.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e){var t=this.$xetable,o=t.customOpts;let l=!e.renderVisible;o.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=l,e.renderVisible=l,e.halfVisible=!1}),t.handleCustom(),t.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=l,e.halfVisible=!1}),this.handleOptionCheck(e),t.checkCustomStatus()},changeFixedOption(e,t){var o=this.$xetable,{isMaxFixedColumn:l,customOpts:s}=o;s.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},allOptionEvent(){var e=this.$xetable;e.toggleCustomAllCheckbox()},sortMousedownEvent(e){var t=this.$xetable,o=e.currentTarget.parentNode.parentNode,l=o.getAttribute("colid"),t=t.getColumnById(l);o.draggable=!0,this.dragColumn=t,(0,_dom.addClass)(o,"active--drag-origin"),updateDropHint(this,e)},sortMouseupEvent(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,(this.dragColumn=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent(e){var{$xetable:l,prevDropTrEl:s}=this,{customColumnList:i,customOpts:t}=l,e=e.currentTarget,o=this.$refs.dragHintElemRef;if(s){if(s!==e){var a=s.getAttribute("drag-pos"),r=e.getAttribute("colid");let t=l.getColumnById(r);if(!t)return;var r=_xeUtils.default.findIndexOf(i,e=>e.id===t.id),n=s.getAttribute("colid");let o=l.getColumnById(n);if(!o)return;i.splice(r,1);n=_xeUtils.default.findIndexOf(i,e=>e.id===o.id);i.splice(n+("bottom"===a?1:0),0,t)}s.draggable=!1,s.removeAttribute("drag-pos"),(0,_dom.removeClass)(s,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),t.immediate&&(_xeUtils.default.eachTree(i,(e,t,o,l,s)=>{s||(e.renderSortNumber=t+1)}),l.handleCustom(),l.saveCustomStore("update:sort"))},sortDragoverEvent(e){var{$xetable:t,prevDropTrEl:o}=this,l=e.currentTarget,o=(o!==l&&(0,_dom.removeClass)(o,"active--drag-target"),l.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-l.getBoundingClientRect().y<l.clientHeight/2?"top":"bottom",(0,_dom.addClass)(l,"active--drag-target"),l.setAttribute("drag-pos",o),this.prevDropTrEl=l),updateDropHint(this,e)}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function updateDropHint(e,t){var o,e=e.$refs,l=e.dragHintElemRef,e=e.bodyElemRef;e&&l&&(o=(e=e.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(e.clientHeight-e.scrollTop-l.clientHeight,t.clientY-o.y)+"px",l.style.left=Math.min(e.clientWidth-e.scrollLeft-l.clientWidth-16,t.clientX-o.x)+"px")}let renderSimplePanel=(m,d)=>{let u=_ui.VxeUI.getComponent("VxeButton");let p=d.$xeTable;var e=d.customStore,{isCustomStatus:t,customColumnList:o}=p,l=p.computeCustomOpts,s=e.maxHeight;let{checkMethod:v,visibleMethod:x,allowVisible:b,allowSort:g,allowFixed:h,trigger:i,placement:a}=l,E=p.computeIsMaxFixedColumn;var r=l.slots||{},n=r.header,c=r.top,C=r.bottom,f=r.default,r=r.footer;let I=[];var _={},T=e.isAll,y=e.isIndeterminate,O=d.dragColumn,k=("hover"===i&&(_.mouseenter=d.handleWrapperMouseenterEvent,_.mouseleave=d.handleWrapperMouseleaveEvent),{$table:p,$grid:p.xegrid,columns:o,isAllChecked:T,isAllIndeterminate:y,isCustomStatus:t});return _xeUtils.default.eachTree(o,(t,e,o,l,s)=>{if(!x||x({column:t})){var i=t.renderVisible,a=t.halfVisible,r=t.children&&t.children.length,n=(0,_utils.formatText)(t.getTitle(),1);let e=!!v&&!v({column:t});var c=!i;I.push(m("li",{key:t.id,attrs:{colid:t.id},class:["vxe-table-custom--option","level--"+t.level,{"is--hidden":e||c,"is--group":r}],on:{dragstart:d.sortDragstartEvent,dragend:d.sortDragendEvent,dragover:d.sortDragoverEvent}},[b?m("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":e}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{e||d.changeCheckboxOption(t)}}},[m("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):renderEmptyElement(p),g&&1===t.level?m("div",{class:"vxe-table-custom--sort-option"},[m("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":e||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:e||c?{}:{mousedown:d.sortMousedownEvent,mouseup:d.sortMouseupEvent}},[m("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):renderEmptyElement(p),"html"===t.type?m("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):m("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n),!s&&h?m("div",{class:"vxe-table-custom--fixed-option"},[m(u,{props:{mode:"text",icon:"left"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===t.renderFixed?"primary":"",disabled:e||c||E&&!t.renderFixed,title:getI18n("left"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:()=>{d.changeFixedOption(t,"left")}}}),m(u,{props:{mode:"text",icon:"right"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===t.renderFixed?"primary":"",disabled:e||c||E&&!t.renderFixed,title:getI18n("right"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:()=>{d.changeFixedOption(t,"right")}}})]):renderEmptyElement(p)]))}}),m("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+a,{"is--active":e.visible}],style:s&&!["left","right"].includes(a)?{maxHeight:s+"px"}:{}},e.visible?[m("div",{class:"vxe-table-custom--header"},n?p.callSlot(n,k,m):[m("ul",{class:"vxe-table-custom--panel-list"},[m("li",{class:"vxe-table-custom--option"},[b?m("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":T,"is--indeterminate":y}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:d.allOptionEvent}},[m("span",{class:["vxe-checkbox--icon",y?getIcon().TABLE_CHECKBOX_INDETERMINATE:T?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),m("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):m("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),m("div",{ref:"bodyElemRef",class:"vxe-table-custom--body"},[c?m("div",{class:"vxe-table-custom--panel-top"},p.callSlot(c,k,m)):renderEmptyElement(p),f?m("div",{class:"vxe-table-custom--panel-body"},p.callSlot(f,k,m)):m("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:_},I),C?m("div",{class:"vxe-table-custom--panel-bottom"},p.callSlot(C,k,m)):renderEmptyElement(p),m("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[O&&"html"!==O.type?O.getTitle():""]))]),l.showFooter?m("div",{class:"vxe-table-custom--footer"},r?p.callSlot(r,k,m):[m("div",{class:"vxe-table-custom--footer-buttons"},[m(u,{props:{mode:"text",content:l.resetButtonText||getI18n("vxe.table.customRestore"),disabled:!t},on:{click:d.resetCustomEvent}}),l.immediate?m(u,{props:{mode:"text",content:l.closeButtonText||getI18n("vxe.table.customClose")},on:{click:d.cancelCloseEvent}}):m(u,{props:{mode:"text",content:l.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:d.cancelCustomEvent}}),l.immediate?renderEmptyElement(p):m(u,{props:{mode:"text",status:"primary",content:l.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:d.confirmCustomEvent}})])]):null]:[])},renderPopupPanel=(m,d)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let o=_ui.VxeUI.getComponent("VxeButton"),u=_ui.VxeUI.getComponent("VxeInput"),l=_ui.VxeUI.getComponent("VxeTooltip"),p=d,v=d.$xeTable;var s=v,i=v;let a=d.customStore,D=s.resizable,{isCustomStatus:r,customColumnList:n}=i,c=v.computeCustomOpts,{mode:M,modalOptions:L,drawerOptions:R,allowVisible:x,allowSort:b,allowFixed:g,allowResizable:h,checkMethod:E,visibleMethod:C}=c,f=v.computeColumnOpts,I=f.maxFixedSize,{minWidth:_,maxWidth:T}=v.computeResizableOpts;s=Object.assign({},L),i=Object.assign({},R);let y=v.computeIsMaxFixedColumn;var O=c.slots||{};let k=O.header,V=O.top,B=O.bottom,w=O.default,H=O.footer,F=[],S=a.isAll,U=a.isIndeterminate,$=d.dragColumn,A={$table:v,$grid:v.xegrid,columns:n,isAllChecked:S,isAllIndeterminate:U,isCustomStatus:r};_xeUtils.default.eachTree(n,(l,s,e,t,i)=>{if(!C||C({column:l})){let e=0,t=0;h&&(s={$table:v,column:l,columnIndex:s,$columnIndex:s,$rowIndex:-1},_&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(_)?_(s):_)),T)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(T)?T(s):T));var s=l.renderVisible,a=l.halfVisible,r=(0,_utils.formatText)(l.getTitle(),1),n=l.children&&l.children.length;let o=!!E&&!E({column:l});var c=!s;F.push(m("tr",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom-popup--row level--"+l.level,{"is--group":n}],on:{dragstart:d.sortDragstartEvent,dragend:d.sortDragendEvent,dragover:d.sortDragoverEvent}},[x?m("td",{class:"vxe-table-custom-popup--column-item col--visible"},[m("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":o}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{o||d.changeCheckboxOption(l)}}},[m("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):renderEmptyElement(v),b?m("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===l.level?m("span",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":o||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:o||c?{}:{mousedown:d.sortMousedownEvent,mouseup:d.sortMouseupEvent}},[m("i",{class:getIcon().TABLE_CUSTOM_SORT})]):m("span","-")]):renderEmptyElement(v),m("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===l.type?m("div",{key:"1",class:"vxe-table-custom-popup--name",domProps:{innerHTML:r}}):m("div",{key:"0",class:"vxe-table-custom-popup--name",attrs:{title:r}},r)]),h?m("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[l.children&&l.children.length||!(_xeUtils.default.isBoolean(l.resizable)?l.resizable:f.resizable||D)?m("span","-"):u?m(u,{props:{type:"integer",disabled:o||c,value:l.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){l.renderResizeWidth=Math.max(0,Number(e))}}}):renderEmptyElement(p)]):renderEmptyElement(v),g?m("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[i?m("span","-"):m("vxe-radio-group",{props:{value:l.renderFixed||"",type:"button",size:"mini",disabled:o||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:o||c||y},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:o||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:o||c||y}]},on:{input(e){l.renderFixed=e}}})]):renderEmptyElement(v)]))}});O={default:()=>w?v.callSlot(w,A,m):m("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[V?m("div",{class:"vxe-table-custom-popup--table-top"},v.callSlot(V,A,m)):renderEmptyElement(v),m("div",{class:"vxe-table-custom-popup--table-wrapper"},[m("table",{},[m("colgroup",{},[x?m("col",{class:"vxe-table-custom-popup--table-col-seq"}):renderEmptyElement(v),b?m("col",{class:"vxe-table-custom-popup--table-col-sort"}):renderEmptyElement(v),m("col",{class:"vxe-table-custom-popup--table-col-title"}),h?m("col",{class:"vxe-table-custom-popup--table-col-width"}):renderEmptyElement(v),g?m("col",{class:"vxe-table-custom-popup--table-col-fixed"}):renderEmptyElement(v)]),m("thead",{},[m("tr",{},[x?m("th",{},[m("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":S,"is--indeterminate":U}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:d.allOptionEvent}},[m("span",{class:["vxe-checkbox--icon",U?getIcon().TABLE_CHECKBOX_INDETERMINATE:S?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),m("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):renderEmptyElement(v),b?m("th",{},[m("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),l?m(l,{props:{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},scopedSlots:{default:()=>m("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}}):renderEmptyElement(p)]):renderEmptyElement(v),m("th",{},getI18n("vxe.custom.setting.colTitle")),h?m("th",{},getI18n("vxe.custom.setting.colResizable")):renderEmptyElement(v),g?m("th",{},getI18n("vxe.custom.setting."+(I?"colFixedMax":"colFixed"),[I])):renderEmptyElement(v)])]),m("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},F)])]),B?m("div",{class:"vxe-table-custom-popup--table-bottom"},v.callSlot(B,A,m)):renderEmptyElement(v),m("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[$?$.getTitle():""]))]),footer:()=>H?v.callSlot(H,A,m):m("div",{class:"vxe-table-custom-popup--footer"},[m(o,{props:{content:c.resetButtonText||getI18n("vxe.custom.cstmRestore"),disabled:!r},on:{click:d.resetCustomEvent}}),m(o,{props:{content:c.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:d.cancelCustomEvent}}),m(o,{props:{status:"primary",content:c.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:d.confirmCustomEvent}})])};return k&&(O.header=()=>v.callSlot(k,A,m)),"drawer"===M?t?m(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",i.className||""].join(" "),value:a.visible,title:i.title||getI18n("vxe.custom.cstmTitle"),width:i.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:i.position,resize:!!i.resize,escClosable:!!i.escClosable,maskClosable:!!i.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){a.visible=e}},scopedSlots:O}):renderEmptyElement(p):e?m(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",s.className||""].join(" "),value:a.visible,title:s.title||getI18n("vxe.custom.cstmTitle"),width:s.width||Math.min(880,document.documentElement.clientWidth),minWidth:s.minWidth||700,height:s.height||Math.min(680,document.documentElement.clientHeight),minHeight:s.minHeight||400,showZoom:s.showZoom,showMaximize:s.showMaximize,showMinimize:s.showMinimize,mask:s.mask,lockView:s.lockView,resize:s.resize,escClosable:!!s.escClosable,maskClosable:!!s.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){a.visible=e}},scopedSlots:O}):renderEmptyElement(p)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},inject:{$xeTable:{default:null},$xetable:{default:null}},data(){return{dragColumn:null}},computed:{},created(){if("development"===process.env.NODE_ENV){let t=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),l=_ui.VxeUI.getComponent("VxeButton"),s=_ui.VxeUI.getComponent("VxeNumberInput"),i=_ui.VxeUI.getComponent("VxeTooltip"),a=_ui.VxeUI.getComponent("VxeRadioGroup");this.$nextTick(()=>{var e=this.$xetable,e=e.customOpts,e=e.mode;t||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),l||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),i||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})}},render(e){var t=this.$xetable,t=t.customOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var{$xetable:t,customStore:o}=this;o.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let{$xetable:t,customStore:o}=this;o.activeWrapper=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xetable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},resetPopupCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.resetCustomEvent(t)}):this.resetCustomEvent(t)},handleOptionCheck(t){var e=this.$xetable,e=e.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e){var t=this.$xetable,o=t.customOpts;let l=!e.renderVisible;o.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=l,e.renderVisible=l,e.halfVisible=!1}),t.handleCustom(),t.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=l,e.halfVisible=!1}),this.handleOptionCheck(e),t.checkCustomStatus()},changeFixedOption(e,t){var o=this.$xetable,{isMaxFixedColumn:l,customOpts:s}=o;s.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},allOptionEvent(){var e=this.$xetable;e.toggleCustomAllCheckbox()},sortMousedownEvent(e){var t=this.$xetable,o=e.currentTarget.parentNode.parentNode,l=o.getAttribute("colid"),t=t.getColumnById(l);o.draggable=!0,this.dragColumn=t,(0,_dom.addClass)(o,"active--drag-origin"),updateDropHint(this,e)},sortMouseupEvent(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,(this.dragColumn=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent(e){var{$xetable:l,prevDropTrEl:s}=this,{customColumnList:i,customOpts:t}=l,e=e.currentTarget,o=this.$refs.dragHintElemRef;if(s){if(s!==e){var a=s.getAttribute("drag-pos"),r=e.getAttribute("colid");let t=l.getColumnById(r);if(!t)return;var r=_xeUtils.default.findIndexOf(i,e=>e.id===t.id),n=s.getAttribute("colid");let o=l.getColumnById(n);if(!o)return;i.splice(r,1);n=_xeUtils.default.findIndexOf(i,e=>e.id===o.id);i.splice(n+("bottom"===a?1:0),0,t)}s.draggable=!1,s.removeAttribute("drag-pos"),(0,_dom.removeClass)(s,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),t.immediate&&(_xeUtils.default.eachTree(i,(e,t,o,l,s)=>{s||(e.renderSortNumber=t+1)}),l.handleCustom(),l.saveCustomStore("update:sort"))},sortDragoverEvent(e){var{$xetable:t,prevDropTrEl:o}=this,l=e.currentTarget,o=(o!==l&&(0,_dom.removeClass)(o,"active--drag-target"),l.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-l.getBoundingClientRect().y<l.clientHeight/2?"top":"bottom",(0,_dom.addClass)(l,"active--drag-target"),l.setAttribute("drag-pos",o),this.prevDropTrEl=l),updateDropHint(this,e)}}};

package/lib/table/render/index.js

@@ -696,7 +696,6 @@ renderer.mixin({
     tableAutoFocus: 'input',
     renderTableEdit: defaultEditRender,
     renderTableCell(h, renderOpts, params) {
-      var _a;
       const {
         props = {}
       } = renderOpts;
@@ -704,17 +703,50 @@ renderer.mixin({
         row,
         column
       } = params;
-      const digits = props.digits || ((_a = getConfig().numberInput) === null || _a === void 0 ? void 0 : _a.digits) || 2;
+      const {
+        type
+      } = props;
       let cellValue = _xeUtils.default.get(row, column.field);
       if (cellValue) {
-        switch (props.type) {
-          case 'float':
-            cellValue = _xeUtils.default.toFixed(_xeUtils.default.floor(cellValue, digits), digits);
-            break;
+        if (type === 'float') {
+          const digits = props.digits || getConfig().numberInput.digits || 1;
+          cellValue = _xeUtils.default.toFixed(_xeUtils.default.floor(cellValue, digits), digits);
+        } else if (type === 'amount') {
+          const digits = props.digits || getConfig().numberInput.digits || 2;
+          cellValue = _xeUtils.default.commafy(_xeUtils.default.toNumber(cellValue), {
+            digits
+          });
         }
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },
+    renderTableFooter(h, renderOpts, params) {
+      const {
+        props = {}
+      } = renderOpts;
+      const {
+        row,
+        column,
+        _columnIndex
+      } = params;
+      const {
+        type
+      } = props;
+      // 兼容老模式
+      const cellValue = _xeUtils.default.isArray(row) ? row[_columnIndex] : _xeUtils.default.get(row, column.field);
+      if (_xeUtils.default.isNumber(cellValue)) {
+        if (type === 'float') {
+          const digits = props.digits || getConfig().numberInput.digits || 1;
+          return _xeUtils.default.toFixed(_xeUtils.default.floor(cellValue, digits), digits);
+        } else if (type === 'amount') {
+          const digits = props.digits || getConfig().numberInput.digits || 2;
+          return _xeUtils.default.commafy(_xeUtils.default.toNumber(cellValue), {
+            digits
+          });
+        }
+      }
+      return (0, _utils.getFuncText)(cellValue, 1);
+    },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod

package/lib/table/render/index.min.js

@@ -1 +1 @@
-var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="value",defaultCompProps={};function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,l){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||l)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+(t.type||"date")))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getOldComponent({name:e}){return getOldComponentName(e)}function getDefaultComponent({name:e}){return e}function handleConfirmFilter(e,t,l){e=e.$panel;e.changeOption({},t,l)}function getNativeAttrs(e){let{name:t,attrs:l}=e;return l="input"===t?Object.assign({type:"text"},l):l}function getInputImmediateModel(e){var{name:e,immediate:t,props:l}=e;return t||("VxeInput"===e||"$input"===e?(t=(l||{}).type,!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,l,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function getCellEditFilterProps(e,t,l,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,l,r){t=t.placeholder;return[e("span",{class:"vxe-cell--label"},t&&(0,_utils.isEmptyValue)(r)?[e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(t),1))]:(0,_utils.formatText)(r,1))]}function getNativeElementOns(e,l,t,r){let n=e.events,o=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),i=a===o,u={};return n&&_xeUtils.default.objectEach(n,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(l,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),i&&r&&r(e),n&&n[o]&&n[o](l,e)}),!i&&r&&(u[(0,_vn.getOnName)(a)]=function(...e){r(...e),n&&n[a]&&n[a](l,...e)}),u}function getComponentOns(e,l,t,r){let n=e.events,o=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),i={};return _xeUtils.default.objectEach(n,(t,e)=>{i[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(l,...e)}}),t&&(i[(0,_vn.getOnName)(o)]=function(e){t(e),n&&n[o]&&n[o](l,e)}),r&&(i[(0,_vn.getOnName)(a)]=function(...e){r(...e),n&&n[a]&&n[a](l,...e)}),i}function getEditOns(e,t){let{$table:l,row:r,column:n}=t,o=e.name,a=n.model,i=isImmediateCell(e,t);return getComponentOns(e,t,e=>{a.update=!0,a.value=e,i&&(0,_util.setCellValue)(r,n,e)},e=>{!i&&["VxeInput","VxeNumberInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,a.update=!0,a.value=e,l.updateStatus(t,e)):l.updateStatus(t)})}function getFilterOns(e,t,l){return getComponentOns(e,t,e=>{l.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(l.data),l)})}function getNativeEditOns(t,l){let{$table:r,row:n,column:o}=l,a=o.model;return getNativeElementOns(t,l,e=>{e=e.target.value;isImmediateCell(t,l)?(0,_util.setCellValue)(n,o,e):(a.update=!0,a.value=e)},e=>{e=e.target.value;r.updateStatus(l,e)})}function getNativeFilterOns(e,t,l){return getNativeElementOns(e,t,e=>{l.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(l.data),l)})}function nativeEditRender(e,t,l){var{row:r,column:n}=l,o=t.name,r=isImmediateCell(t,l)?(0,_util.getCellValue)(r,n):n.model.value;return[e(o,{class:"vxe-default-"+o,attrs:getNativeAttrs(t),domProps:{value:r},on:getNativeEditOns(t,l)})]}function buttonCellRender(e,t,l){return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function defaultEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function radioAndCheckboxEditRender(e,t,l){var r=t.options,{row:n,column:o}=l,n=(0,_util.getCellValue)(n,o);return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,n)),on:getEditOns(t,l)})]}function oldEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function oldButtonEditRender(e,t,l){return[e("vxe-button",{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function oldButtonsEditRender(t,e,l){return e.children.map(e=>oldButtonEditRender(t,e,l)[0])}function renderNativeOptgroups(l,r,n,o){var{optionGroups:e,optionGroupProps:t={}}=r;let a=t.options||"options",i=t.label||"label";return e.map((e,t)=>l("optgroup",{key:t,attrs:{label:e[i]}},o(l,e[a],r,n)))}function renderNativeOptions(l,e,t,r){var{optionProps:n={}}=t,{row:o,column:a}=r;let i=n.label||"label",u=n.value||"value",d=n.disabled||"disabled",s=isImmediateCell(t,r)?(0,_util.getCellValue)(o,a):a.model.value;return e.map((e,t)=>l("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==s}},e[i]))}function nativeFilterRender(l,r,n){var e=n.column;let o=r.name,a=getNativeAttrs(r);return e.filters.map((e,t)=>l(o,{key:t,class:"vxe-default-"+o,attrs:a,domProps:{value:e.data},on:getNativeFilterOns(r,n,e)}))}function defaultFilterRender(r,n,o){var e=o.column;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,o,e)})})}function oldFilterRender(r,n,o){var e=o.column;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,o,e)})})}function handleFilterMethod({option:e,row:t,column:l}){e=e.data;return _xeUtils.default.get(t,l.field)==e}function handleInputFilterMethod({option:e,row:t,column:l}){e=e.data,t=_xeUtils.default.get(t,l.field);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t,l){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,l)},t.optionGroups?renderNativeOptgroups(e,t,l,renderNativeOptions):renderNativeOptions(e,t.options,t,l))]}function defaultSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,l)})]}function defaultTreeSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a}),on:getEditOns(t,l)})]}function oldSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=t,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,l)})]}function getSelectCellValue(e,{row:t,column:l}){let{options:r,optionGroups:n,optionProps:o={},optionGroupProps:a={}}=e;e=_xeUtils.default.get(t,l.field);let i,u=o.label||"label",d=o.value||"value";return null!=e?_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],n?t=>{var l=a.options||"options";for(let e=0;e<n.length&&!(i=_xeUtils.default.find(n[e][l],e=>e[d]==t));e++);return i?i[u]:t}:t=>(i=_xeUtils.default.find(r,e=>e[d]==t))?i[u]:t).join(", "):""}function handleExportSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getSelectCellValue(l.editRender||l.cellRender,e)}function getTreeSelectCellValue(e,{row:l,column:r}){var{options:e,optionProps:t={}}=e,l=_xeUtils.default.get(l,r.field);let n=t.label||"label",o=t.value||"value";r=t.children||"children";if(null==l)return"";{let t={};return _xeUtils.default.eachTree(e,e=>{t[_xeUtils.default.get(e,o)]=e},{children:r}),_xeUtils.default.map(_xeUtils.default.isArray(l)?l:[l],e=>{e=t[e];return e&&_xeUtils.default.get(e,n)}).join(", ")}}function handleExportTreeSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getTreeSelectCellValue(l.editRender||l.cellRender,e)}renderer.mixin({input:{tableAutoFocus:"input",renderTableEdit:nativeEditRender,renderTableDefault:nativeEditRender,renderTableFilter:nativeFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},textarea:{tableAutoFocus:"textarea",renderTableEdit:nativeEditRender},select:{renderTableEdit:nativeSelectEditRender,renderTableDefault:nativeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(l,r,n){var e=n.column;return e.filters.map((e,t)=>l("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,n,e)},r.optionGroups?renderNativeOptgroups(l,r,n,renderNativeOptions):renderNativeOptions(l,r.options,r,n)))},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:o,column:a}=l,i=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let u=_xeUtils.default.get(o,a.field);if(u)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":u=getLabelFormatDate(u,n);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,i),i)}return getCellLabelVNs(e,t,l,u)},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},VxeNumberInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:o}=l,a=r.digits||(null==(a=getConfig().numberInput)?void 0:a.digits)||2;let i=_xeUtils.default.get(n,o.field);return getCellLabelVNs(e,t,l,i=i&&"float"===r.type?_xeUtils.default.toFixed(_xeUtils.default.floor(i,a),a):i)},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},VxeDatePicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:o}=l;let a=_xeUtils.default.get(n,o.field);return getCellLabelVNs(e,t,l,a=a&&getLabelFormatDate(a,r))},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleFilterMethod},VxeTextarea:{tableAutoFocus:"textarea",renderTableEdit:defaultEditRender},VxeButton:{renderTableDefault:buttonCellRender},VxeButtonGroup:{renderTableDefault(e,t,l){var r=t.options;return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,null)),on:getComponentOns(t,l)})]}},VxeSelect:{tableAutoFocus:"input",renderTableEdit:defaultSelectEditRender,renderTableDefault:defaultSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,o){var e=o.column;let{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,o,l,{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(n,o,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeTreeSelect:{tableAutoFocus:"input",renderTableEdit:defaultTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableExportMethod:handleExportTreeSelectMethod},VxeTableSelect:{tableAutoFocus:"input",renderTableEdit:defaultTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableExportMethod:handleExportTreeSelectMethod},VxeIconPicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{row:l,column:r}=l;return e("i",{class:_xeUtils.default.get(l,r.field)})}},VxeRadioGroup:{renderTableDefault:radioAndCheckboxEditRender},VxeCheckboxGroup:{renderTableDefault:radioAndCheckboxEditRender},VxeSwitch:{tableAutoFocus:"button",renderTableEdit:defaultEditRender,renderTableDefault:defaultEditRender},VxeUpload:{renderTableEdit:defaultEditRender,renderTableCell:defaultEditRender,renderTableDefault:defaultEditRender},VxeImage:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{src:r}),on:getEditOns(t,l)})]}},VxeImageGroup:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{urlList:r}),on:getEditOns(t,l)})]}},VxeTextEllipsis:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{content:r}),on:getEditOns(t,l)})]}},VxeRate:{renderTableDefault:defaultEditRender},VxeSlider:{renderTableDefault:defaultEditRender},$input:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:o,column:a}=l,i=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let u=_xeUtils.default.get(o,a.field);if(u)switch(n.type){case"date":case"week":case"month":case"year":u=getLabelFormatDate(u,n);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,i),i)}return getCellLabelVNs(e,t,l,u)},renderTableDefault:oldEditRender,renderTableFilter:oldFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},$textarea:{tableAutoFocus:".vxe-textarea--inner"},$button:{renderTableDefault:oldButtonEditRender},$buttons:{renderTableDefault:oldButtonsEditRender},$select:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldSelectEditRender,renderTableDefault:oldSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,o){var e=o.column;let{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,o,l,{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(n,o,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},$radio:{tableAutoFocus:".vxe-radio--input"},$checkbox:{tableAutoFocus:".vxe-checkbox--input"},$switch:{tableAutoFocus:".vxe-switch--button",renderTableEdit:oldEditRender,renderTableDefault:oldEditRender}});
+var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="value",defaultCompProps={};function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,l){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||l)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+(t.type||"date")))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getOldComponent({name:e}){return getOldComponentName(e)}function getDefaultComponent({name:e}){return e}function handleConfirmFilter(e,t,l){e=e.$panel;e.changeOption({},t,l)}function getNativeAttrs(e){let{name:t,attrs:l}=e;return l="input"===t?Object.assign({type:"text"},l):l}function getInputImmediateModel(e){var{name:e,immediate:t,props:l}=e;return t||("VxeInput"===e||"$input"===e?(t=(l||{}).type,!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,l,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function getCellEditFilterProps(e,t,l,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,l,r){t=t.placeholder;return[e("span",{class:"vxe-cell--label"},t&&(0,_utils.isEmptyValue)(r)?[e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(t),1))]:(0,_utils.formatText)(r,1))]}function getNativeElementOns(e,l,t,r){let n=e.events,o=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),i=a===o,u={};return n&&_xeUtils.default.objectEach(n,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(l,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),i&&r&&r(e),n&&n[o]&&n[o](l,e)}),!i&&r&&(u[(0,_vn.getOnName)(a)]=function(...e){r(...e),n&&n[a]&&n[a](l,...e)}),u}function getComponentOns(e,l,t,r){let n=e.events,o=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),i={};return _xeUtils.default.objectEach(n,(t,e)=>{i[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(l,...e)}}),t&&(i[(0,_vn.getOnName)(o)]=function(e){t(e),n&&n[o]&&n[o](l,e)}),r&&(i[(0,_vn.getOnName)(a)]=function(...e){r(...e),n&&n[a]&&n[a](l,...e)}),i}function getEditOns(e,t){let{$table:l,row:r,column:n}=t,o=e.name,a=n.model,i=isImmediateCell(e,t);return getComponentOns(e,t,e=>{a.update=!0,a.value=e,i&&(0,_util.setCellValue)(r,n,e)},e=>{!i&&["VxeInput","VxeNumberInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,a.update=!0,a.value=e,l.updateStatus(t,e)):l.updateStatus(t)})}function getFilterOns(e,t,l){return getComponentOns(e,t,e=>{l.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(l.data),l)})}function getNativeEditOns(t,l){let{$table:r,row:n,column:o}=l,a=o.model;return getNativeElementOns(t,l,e=>{e=e.target.value;isImmediateCell(t,l)?(0,_util.setCellValue)(n,o,e):(a.update=!0,a.value=e)},e=>{e=e.target.value;r.updateStatus(l,e)})}function getNativeFilterOns(e,t,l){return getNativeElementOns(e,t,e=>{l.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(l.data),l)})}function nativeEditRender(e,t,l){var{row:r,column:n}=l,o=t.name,r=isImmediateCell(t,l)?(0,_util.getCellValue)(r,n):n.model.value;return[e(o,{class:"vxe-default-"+o,attrs:getNativeAttrs(t),domProps:{value:r},on:getNativeEditOns(t,l)})]}function buttonCellRender(e,t,l){return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function defaultEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function radioAndCheckboxEditRender(e,t,l){var r=t.options,{row:n,column:o}=l,n=(0,_util.getCellValue)(n,o);return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,n)),on:getEditOns(t,l)})]}function oldEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function oldButtonEditRender(e,t,l){return[e("vxe-button",{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function oldButtonsEditRender(t,e,l){return e.children.map(e=>oldButtonEditRender(t,e,l)[0])}function renderNativeOptgroups(l,r,n,o){var{optionGroups:e,optionGroupProps:t={}}=r;let a=t.options||"options",i=t.label||"label";return e.map((e,t)=>l("optgroup",{key:t,attrs:{label:e[i]}},o(l,e[a],r,n)))}function renderNativeOptions(l,e,t,r){var{optionProps:n={}}=t,{row:o,column:a}=r;let i=n.label||"label",u=n.value||"value",d=n.disabled||"disabled",s=isImmediateCell(t,r)?(0,_util.getCellValue)(o,a):a.model.value;return e.map((e,t)=>l("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==s}},e[i]))}function nativeFilterRender(l,r,n){var e=n.column;let o=r.name,a=getNativeAttrs(r);return e.filters.map((e,t)=>l(o,{key:t,class:"vxe-default-"+o,attrs:a,domProps:{value:e.data},on:getNativeFilterOns(r,n,e)}))}function defaultFilterRender(r,n,o){var e=o.column;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,o,e)})})}function oldFilterRender(r,n,o){var e=o.column;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,o,e)})})}function handleFilterMethod({option:e,row:t,column:l}){e=e.data;return _xeUtils.default.get(t,l.field)==e}function handleInputFilterMethod({option:e,row:t,column:l}){e=e.data,t=_xeUtils.default.get(t,l.field);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t,l){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,l)},t.optionGroups?renderNativeOptgroups(e,t,l,renderNativeOptions):renderNativeOptions(e,t.options,t,l))]}function defaultSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,l)})]}function defaultTreeSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a}),on:getEditOns(t,l)})]}function oldSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=t,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,l)})]}function getSelectCellValue(e,{row:t,column:l}){let{options:r,optionGroups:n,optionProps:o={},optionGroupProps:a={}}=e;e=_xeUtils.default.get(t,l.field);let i,u=o.label||"label",d=o.value||"value";return null!=e?_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],n?t=>{var l=a.options||"options";for(let e=0;e<n.length&&!(i=_xeUtils.default.find(n[e][l],e=>e[d]==t));e++);return i?i[u]:t}:t=>(i=_xeUtils.default.find(r,e=>e[d]==t))?i[u]:t).join(", "):""}function handleExportSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getSelectCellValue(l.editRender||l.cellRender,e)}function getTreeSelectCellValue(e,{row:l,column:r}){var{options:e,optionProps:t={}}=e,l=_xeUtils.default.get(l,r.field);let n=t.label||"label",o=t.value||"value";r=t.children||"children";if(null==l)return"";{let t={};return _xeUtils.default.eachTree(e,e=>{t[_xeUtils.default.get(e,o)]=e},{children:r}),_xeUtils.default.map(_xeUtils.default.isArray(l)?l:[l],e=>{e=t[e];return e&&_xeUtils.default.get(e,n)}).join(", ")}}function handleExportTreeSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getTreeSelectCellValue(l.editRender||l.cellRender,e)}renderer.mixin({input:{tableAutoFocus:"input",renderTableEdit:nativeEditRender,renderTableDefault:nativeEditRender,renderTableFilter:nativeFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},textarea:{tableAutoFocus:"textarea",renderTableEdit:nativeEditRender},select:{renderTableEdit:nativeSelectEditRender,renderTableDefault:nativeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(l,r,n){var e=n.column;return e.filters.map((e,t)=>l("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,n,e)},r.optionGroups?renderNativeOptgroups(l,r,n,renderNativeOptions):renderNativeOptions(l,r.options,r,n)))},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:o,column:a}=l,i=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let u=_xeUtils.default.get(o,a.field);if(u)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":u=getLabelFormatDate(u,n);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,i),i)}return getCellLabelVNs(e,t,l,u)},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},VxeNumberInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:o}=l,a=r.type;let i=_xeUtils.default.get(n,o.field);return i&&("float"===a?(n=r.digits||getConfig().numberInput.digits||1,i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,n),n)):"amount"===a&&(o=r.digits||getConfig().numberInput.digits||2,i=_xeUtils.default.commafy(_xeUtils.default.toNumber(i),{digits:o}))),getCellLabelVNs(e,t,l,i)},renderTableFooter(e,t,l){var{props:t={}}=t,{row:l,column:r,_columnIndex:n}=l,o=t.type,n=_xeUtils.default.isArray(l)?l[n]:_xeUtils.default.get(l,r.field);if(_xeUtils.default.isNumber(n)){if("float"===o)return l=t.digits||getConfig().numberInput.digits||1,_xeUtils.default.toFixed(_xeUtils.default.floor(n,l),l);if("amount"===o)return r=t.digits||getConfig().numberInput.digits||2,_xeUtils.default.commafy(_xeUtils.default.toNumber(n),{digits:r})}return(0,_utils.getFuncText)(n,1)},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},VxeDatePicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:o}=l;let a=_xeUtils.default.get(n,o.field);return getCellLabelVNs(e,t,l,a=a&&getLabelFormatDate(a,r))},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,tableFilterDefaultMethod:handleFilterMethod},VxeTextarea:{tableAutoFocus:"textarea",renderTableEdit:defaultEditRender},VxeButton:{renderTableDefault:buttonCellRender},VxeButtonGroup:{renderTableDefault(e,t,l){var r=t.options;return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,null)),on:getComponentOns(t,l)})]}},VxeSelect:{tableAutoFocus:"input",renderTableEdit:defaultSelectEditRender,renderTableDefault:defaultSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,o){var e=o.column;let{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,o,l,{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(n,o,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeTreeSelect:{tableAutoFocus:"input",renderTableEdit:defaultTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableExportMethod:handleExportTreeSelectMethod},VxeTableSelect:{tableAutoFocus:"input",renderTableEdit:defaultTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableExportMethod:handleExportTreeSelectMethod},VxeIconPicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{row:l,column:r}=l;return e("i",{class:_xeUtils.default.get(l,r.field)})}},VxeRadioGroup:{renderTableDefault:radioAndCheckboxEditRender},VxeCheckboxGroup:{renderTableDefault:radioAndCheckboxEditRender},VxeSwitch:{tableAutoFocus:"button",renderTableEdit:defaultEditRender,renderTableDefault:defaultEditRender},VxeUpload:{renderTableEdit:defaultEditRender,renderTableCell:defaultEditRender,renderTableDefault:defaultEditRender},VxeImage:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{src:r}),on:getEditOns(t,l)})]}},VxeImageGroup:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{urlList:r}),on:getEditOns(t,l)})]}},VxeTextEllipsis:{renderTableDefault(e,t,l){var{row:r,column:n}=l,o=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o),{content:r}),on:getEditOns(t,l)})]}},VxeRate:{renderTableDefault:defaultEditRender},VxeSlider:{renderTableDefault:defaultEditRender},$input:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:o,column:a}=l,i=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let u=_xeUtils.default.get(o,a.field);if(u)switch(n.type){case"date":case"week":case"month":case"year":u=getLabelFormatDate(u,n);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,i),i)}return getCellLabelVNs(e,t,l,u)},renderTableDefault:oldEditRender,renderTableFilter:oldFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},$textarea:{tableAutoFocus:".vxe-textarea--inner"},$button:{renderTableDefault:oldButtonEditRender},$buttons:{renderTableDefault:oldButtonsEditRender},$select:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldSelectEditRender,renderTableDefault:oldSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,o){var e=o.column;let{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,o,l,{options:a,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(n,o,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},$radio:{tableAutoFocus:".vxe-radio--input"},$checkbox:{tableAutoFocus:".vxe-checkbox--input"},$switch:{tableAutoFocus:".vxe-switch--button",renderTableEdit:oldEditRender,renderTableDefault:oldEditRender}});

package/lib/table/src/body.js

@@ -451,12 +451,12 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     if (editConfig) {
       isNewRow = $xeTable.isInsertByRow(row);
     }
-    if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+    if (treeConfig && !scrollYLoad && !transform) {
       rowChildren = row[childrenField];
       isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
     }
     // 拖拽行事件
-    if (rowOpts.drag && !rowLevel) {
+    if (rowOpts.drag && (!treeConfig || transform)) {
       trOn.dragstart = evnt => {
         $xeTable.handleRowDragDragstartEvent(evnt);
       };

package/lib/table/src/body.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:A,afterFullData:u,tableData:F,height:g,columnKey:N,overflowX:h,sYOpts:v,scrollXLoad:V,scrollYLoad:W,highlightCurrentRow:P,showOverflow:m,isAllOverflow:X,align:j,currentColumn:z,cellClassName:K,cellStyle:w,mergeList:x,spanMethod:G,radioOpts:J,checkboxOpts:y,expandOpts:Q,treeOpts:Z,tooltipOpts:f,mouseConfig:ee,editConfig:b,editOpts:S,editRules:le,validOpts:T,editStore:te,tooltipConfig:re,rowOpts:oe,columnOpts:se,mouseOpts:ae,areaOpts:_,validErrorMaps:C}=l,_=_.selectCellToRow,ie=l.computeCellOpts,{type:ne,cellRender:de,editRender:$,align:ce,showOverflow:O,className:pe,treeNode:ue,slots:ge}=d,ie=ie.verticalAlign,te=te.actived,v=v.rHeight,E=oe.height,R=$||de,R=R?renderer.get(R.name):null,he=R?R.tableCellClassName||R.cellClassName:"",ve=R?R.tableCellStyle||R.cellStyle:"";let D=f.showAll||f.enabled;var f=l.getColumnIndex(d),me=l.getVTColumnIndex(d),we=(0,_utils.isEnableConf)($);let L=o?d.fixed!==o:d.fixed&&h;h=_xeUtils.default.isUndefined(O)||_xeUtils.default.isNull(O)?m:O,O="ellipsis"===h;let I="title"===h,k=!0===h||"tooltip"===h;h=m||I||k||O;let xe;var M={},A=A[r],ce=ce||(R?R.tableCellAlign:"")||j,R=C[r+":"+d.id],j=le&&T.showMessage&&("default"===T.message?g||1<F.length:"inline"===T.message),C={colid:d.id};let ye=p["cell-mouseenter"],fe=p["cell-mouseleave"];le=$&&b&&"dblclick"===S.trigger;let Y={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:f,$columnIndex:c,_columnIndex:me,fixed:o,type:renderType,isHidden:L,level:s,visibleData:u,data:F,items:q};if((I||k||D||ye||re)&&(M.mouseenter=e=>{isVMScrollProcess(l)||(I?(0,_dom.updateCellTitle)(e.currentTarget,d):(k||D)&&l.triggerBodyTooltipEvent(e,Y),ye&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(k||D||fe||re)&&(M.mouseleave=e=>{isVMScrollProcess(l)||((k||D)&&l.handleTargetLeaveEvent(e),fe&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(y.range||ee)&&(M.mousedown=e=>{l.triggerCellMousedownEvent(e,Y)}),(oe.isCurrent||P||p["cell-click"]||$&&b||"row"===Q.trigger||"cell"===Q.trigger||"row"===J.trigger||"radio"===d.type&&"cell"===J.trigger||"row"===y.trigger||"checkbox"===d.type&&"cell"===y.trigger||"row"===Z.trigger||d.treeNode&&"cell"===Z.trigger)&&(M.click=e=>{l.triggerCellClickEvent(e,Y)}),(le||p["cell-dblclick"])&&(M.dblclick=e=>{l.triggerCellDblclickEvent(e,Y)}),x.length){g=(0,_util.mergeBodyMethod)(x,B,me);if(g){var{rowspan:t,colspan:r}=g;if(!t||!r)return null;1<t&&(C.rowspan=t),1<r&&(C.colspan=r)}}else if(G){var{rowspan:i=1,colspan:n=1}=G(Y)||{};if(!i||!n)return null;1<i&&(C.rowspan=i),1<n&&(C.colspan=n)}!(L=L&&x&&(1<C.colspan||1<C.rowspan)?!1:L)&&b&&($||de)&&(S.showStatus||S.showUpdateStatus)&&(xe=l.isUpdateByRow(a,d.field));f=[];L&&m&&X?f.push(e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:h&&(v||E)?`${v||E}px`:""}})):(f.push(...renderLine(e,H,l,Y),e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:h&&(v||E)?`${v||E}px`:""},attrs:{title:I?l.getCellLabel(a,d):null}},d.renderCell(e,Y))),j&&R&&(o=R.rule,s=ge?ge.valid:null,u=Object.assign(Object.assign(Object.assign({},Y),R),{rule:R}),f.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(T.className,R)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(T.theme||"normal")},[s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},R.content)]])]))));let be="";return h&&(v||E)?be=`${v||E}px`:!V&&!W||h||(be=`${A.height||24}px`),ee&&ae.area&&_&&((c||!0!==_)&&_!==d.field||f.push(e("div",{class:"vxe-cell--area-status"}))),e("td",{class:["vxe-body--column",d.id,{["col--"+ce]:ce,["col--vertical-"+ie]:ie,["col--"+ne]:ne,"col--last":c===U.length-1,"col--tree-node":ue,"col--edit":we,"col--ellipsis":h,"fixed--hidden":L,"col--dirty":xe,"col--active":b&&we&&te.row===a&&(te.column===d||"row"===S.mode),"col--valid-error":!!R,"col--current":z===d},(0,_utils.getClass)(he,Y),(0,_utils.getClass)(pe,Y),(0,_utils.getClass)(K,Y)],key:N||se.useKey||oe.useKey?d.id:c,attrs:C,style:Object.assign({height:be},_xeUtils.default.isFunction(ve)?ve(Y):ve,_xeUtils.default.isFunction(w)?w(Y):w),on:M},f)}function renderRows(m,w,x,y,f,b){let{stripe:S,rowKey:T,highlightHoverRow:_,rowClassName:C,rowStyle:$,editConfig:O,showOverflow:E,treeConfig:R,treeOpts:D,expandOpts:L,editOpts:I,treeExpandedMaps:k,scrollYLoad:M,rowExpandedMaps:Y,radioOpts:H,checkboxOpts:B,expandColumn:U,hasFixedColumn:q,fullAllDataRowIdData:A,rowOpts:F,pendingRowList:N,pendingRowMaps:V,columnOpts:W,isDragColMove:P}=x,{transform:X,seqMode:j}=D,z=D.children||D.childrenField,K=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(F.isHover||_)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=A[s];let a=0,i=-1,n=0;l&&(a=l.level,i=R&&X&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=U&&!!Y[s];let c=!1,p=[],u=!1;O&&(u=x.isInsertByRow(t)),!R||M||D.transform||(p=t[z],c=p&&p.length&&!!k[s]),F.drag&&!a&&(e.dragstart=e=>{x.handleRowDragDragstartEvent(e)},e.dragover=e=>{x.handleRowDragDragoverEvent(e)},e.dragend=e=>{x.handleRowDragDragendEvent(e)});var g,h=["vxe-body--row",R?"row--level-"+a:"",{"row--stripe":S&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(I.showStatus||I.showInsertStatus),"row--radio":H.highlight&&x.selectRadioRow===t,"row--checked":B.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":N.length&&!!V[s]},C?_xeUtils.default.isFunction(C)?C(l):C:""],v=b.map((e,l)=>renderColumn(m,w,x,i,s,y,a,t,o,r,n,e,l,b,f));K.push(W.drag?m("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(P?"":"-disabled")},class:h,attrs:{rowid:s},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:T||F.useKey||F.drag||R?s:r,nativeOn:e},v):m("tr",{class:h,attrs:{rowid:s},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:T||F.useKey||F.drag||R?s:r,on:e},v)),d&&({height:h,padding:l}=L,v={},d=(h&&(v.height=h+"px"),R&&(v.paddingLeft=a*D.indent+30+"px"),U).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?E:d,g={$table:x,seq:i,column:U,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},K.push(m("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:$?_xeUtils.default.isFunction($)?$(g):$:null,on:e},[m("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!q,"col--ellipsis":d},attrs:{colspan:b.length}},[m("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:v},[U.renderData(m,g)])])]))),c&&K.push(...renderRows(m,w,x,y,p,b))}),K}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){var e=this.$parent;let{_e:l,$parent:r,fixedColumn:o,fixedType:s}=this,{$scopedSlots:a,tId:i,tableData:n,tableColumn:d,visibleColumn:c,expandColumn:p,showOverflow:u,keyboardConfig:g,keyboardOpts:h,mergeList:v,spanMethod:m,scrollXLoad:w,scrollYLoad:x,isAllOverflow:y,emptyOpts:f,mouseConfig:b,mouseOpts:S,sYOpts:T,rowOpts:_,isDragRowMove:C}=r;s&&(d=p||!(w||x||u&&y)||v.length||m||g&&h.isMerge?c:o);let $;$=a.empty?a.empty.call(this,{$table:r},t):(O=(O=f.name?renderer.get(f.name):null)?O.renderTableEmpty||O.renderTableEmptyView||O.renderEmpty:null)?(0,_vn.getSlotVNs)(O.call(this,t,f,{$table:r})):r.emptyText||getI18n("vxe.table.emptyText");var O={scroll:this.scrollEvent};return"wheel"===T.mode&&(O.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",s?`fixed-${s}--wrapper`:"body--wrapper"],attrs:{xid:i},on:O},[s?l():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},d.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),_.drag?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(C?"":"-disabled")}},renderRows(t,this,r,s,n,d)):t("tbody",{ref:"tbody"},renderRows(t,this,r,s,n,d))]),t("div",{class:"vxe-table--checkbox-range"}),b&&S.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},S.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){r.triggerCellAreaExtendMousedownEvent&&r.triggerCellAreaExtendMousedownEvent(e,{$table:r,fixed:s,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):renderEmptyElement(e),s?renderEmptyElement(e):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},$)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let v=(r&&s?s:u).clientHeight,m=(o&&a?a:u).clientWidth,w=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(w,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:m,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:A,afterFullData:u,tableData:F,height:g,columnKey:N,overflowX:h,sYOpts:v,scrollXLoad:V,scrollYLoad:W,highlightCurrentRow:P,showOverflow:m,isAllOverflow:X,align:j,currentColumn:z,cellClassName:K,cellStyle:w,mergeList:x,spanMethod:G,radioOpts:J,checkboxOpts:y,expandOpts:Q,treeOpts:Z,tooltipOpts:f,mouseConfig:ee,editConfig:b,editOpts:S,editRules:le,validOpts:T,editStore:te,tooltipConfig:re,rowOpts:oe,columnOpts:se,mouseOpts:ae,areaOpts:_,validErrorMaps:C}=l,_=_.selectCellToRow,ie=l.computeCellOpts,{type:ne,cellRender:de,editRender:$,align:ce,showOverflow:O,className:pe,treeNode:ue,slots:ge}=d,ie=ie.verticalAlign,te=te.actived,v=v.rHeight,E=oe.height,R=$||de,R=R?renderer.get(R.name):null,he=R?R.tableCellClassName||R.cellClassName:"",ve=R?R.tableCellStyle||R.cellStyle:"";let D=f.showAll||f.enabled;var f=l.getColumnIndex(d),me=l.getVTColumnIndex(d),we=(0,_utils.isEnableConf)($);let L=o?d.fixed!==o:d.fixed&&h;h=_xeUtils.default.isUndefined(O)||_xeUtils.default.isNull(O)?m:O,O="ellipsis"===h;let I="title"===h,k=!0===h||"tooltip"===h;h=m||I||k||O;let xe;var M={},A=A[r],ce=ce||(R?R.tableCellAlign:"")||j,R=C[r+":"+d.id],j=le&&T.showMessage&&("default"===T.message?g||1<F.length:"inline"===T.message),C={colid:d.id};let ye=p["cell-mouseenter"],fe=p["cell-mouseleave"];le=$&&b&&"dblclick"===S.trigger;let Y={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:f,$columnIndex:c,_columnIndex:me,fixed:o,type:renderType,isHidden:L,level:s,visibleData:u,data:F,items:q};if((I||k||D||ye||re)&&(M.mouseenter=e=>{isVMScrollProcess(l)||(I?(0,_dom.updateCellTitle)(e.currentTarget,d):(k||D)&&l.triggerBodyTooltipEvent(e,Y),ye&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(k||D||fe||re)&&(M.mouseleave=e=>{isVMScrollProcess(l)||((k||D)&&l.handleTargetLeaveEvent(e),fe&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(y.range||ee)&&(M.mousedown=e=>{l.triggerCellMousedownEvent(e,Y)}),(oe.isCurrent||P||p["cell-click"]||$&&b||"row"===Q.trigger||"cell"===Q.trigger||"row"===J.trigger||"radio"===d.type&&"cell"===J.trigger||"row"===y.trigger||"checkbox"===d.type&&"cell"===y.trigger||"row"===Z.trigger||d.treeNode&&"cell"===Z.trigger)&&(M.click=e=>{l.triggerCellClickEvent(e,Y)}),(le||p["cell-dblclick"])&&(M.dblclick=e=>{l.triggerCellDblclickEvent(e,Y)}),x.length){g=(0,_util.mergeBodyMethod)(x,B,me);if(g){var{rowspan:t,colspan:r}=g;if(!t||!r)return null;1<t&&(C.rowspan=t),1<r&&(C.colspan=r)}}else if(G){var{rowspan:i=1,colspan:n=1}=G(Y)||{};if(!i||!n)return null;1<i&&(C.rowspan=i),1<n&&(C.colspan=n)}!(L=L&&x&&(1<C.colspan||1<C.rowspan)?!1:L)&&b&&($||de)&&(S.showStatus||S.showUpdateStatus)&&(xe=l.isUpdateByRow(a,d.field));f=[];L&&m&&X?f.push(e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:h&&(v||E)?`${v||E}px`:""}})):(f.push(...renderLine(e,H,l,Y),e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:h&&(v||E)?`${v||E}px`:""},attrs:{title:I?l.getCellLabel(a,d):null}},d.renderCell(e,Y))),j&&R&&(o=R.rule,s=ge?ge.valid:null,u=Object.assign(Object.assign(Object.assign({},Y),R),{rule:R}),f.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(T.className,R)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(T.theme||"normal")},[s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},R.content)]])]))));let be="";return h&&(v||E)?be=`${v||E}px`:!V&&!W||h||(be=`${A.height||24}px`),ee&&ae.area&&_&&((c||!0!==_)&&_!==d.field||f.push(e("div",{class:"vxe-cell--area-status"}))),e("td",{class:["vxe-body--column",d.id,{["col--"+ce]:ce,["col--vertical-"+ie]:ie,["col--"+ne]:ne,"col--last":c===U.length-1,"col--tree-node":ue,"col--edit":we,"col--ellipsis":h,"fixed--hidden":L,"col--dirty":xe,"col--active":b&&we&&te.row===a&&(te.column===d||"row"===S.mode),"col--valid-error":!!R,"col--current":z===d},(0,_utils.getClass)(he,Y),(0,_utils.getClass)(pe,Y),(0,_utils.getClass)(K,Y)],key:N||se.useKey||oe.useKey?d.id:c,attrs:C,style:Object.assign({height:be},_xeUtils.default.isFunction(ve)?ve(Y):ve,_xeUtils.default.isFunction(w)?w(Y):w),on:M},f)}function renderRows(m,w,x,y,f,b){let{stripe:S,rowKey:T,highlightHoverRow:_,rowClassName:C,rowStyle:$,editConfig:O,showOverflow:E,treeConfig:R,treeOpts:D,expandOpts:L,editOpts:I,treeExpandedMaps:k,scrollYLoad:M,rowExpandedMaps:Y,radioOpts:H,checkboxOpts:B,expandColumn:U,hasFixedColumn:q,fullAllDataRowIdData:A,rowOpts:F,pendingRowList:N,pendingRowMaps:V,columnOpts:W,isDragColMove:P}=x,{transform:X,seqMode:j}=D,z=D.children||D.childrenField,K=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(F.isHover||_)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=A[s];let a=0,i=-1,n=0;l&&(a=l.level,i=R&&X&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=U&&!!Y[s];let c=!1,p=[],u=!1;O&&(u=x.isInsertByRow(t)),!R||M||X||(p=t[z],c=p&&p.length&&!!k[s]),!F.drag||R&&!X||(e.dragstart=e=>{x.handleRowDragDragstartEvent(e)},e.dragover=e=>{x.handleRowDragDragoverEvent(e)},e.dragend=e=>{x.handleRowDragDragendEvent(e)});var g,h=["vxe-body--row",R?"row--level-"+a:"",{"row--stripe":S&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(I.showStatus||I.showInsertStatus),"row--radio":H.highlight&&x.selectRadioRow===t,"row--checked":B.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":N.length&&!!V[s]},C?_xeUtils.default.isFunction(C)?C(l):C:""],v=b.map((e,l)=>renderColumn(m,w,x,i,s,y,a,t,o,r,n,e,l,b,f));K.push(W.drag?m("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(P?"":"-disabled")},class:h,attrs:{rowid:s},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:T||F.useKey||F.drag||R?s:r,nativeOn:e},v):m("tr",{class:h,attrs:{rowid:s},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:T||F.useKey||F.drag||R?s:r,on:e},v)),d&&({height:h,padding:l}=L,v={},d=(h&&(v.height=h+"px"),R&&(v.paddingLeft=a*D.indent+30+"px"),U).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?E:d,g={$table:x,seq:i,column:U,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},K.push(m("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:$?_xeUtils.default.isFunction($)?$(g):$:null,on:e},[m("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!q,"col--ellipsis":d},attrs:{colspan:b.length}},[m("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:v},[U.renderData(m,g)])])]))),c&&K.push(...renderRows(m,w,x,y,p,b))}),K}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){var e=this.$parent;let{_e:l,$parent:r,fixedColumn:o,fixedType:s}=this,{$scopedSlots:a,tId:i,tableData:n,tableColumn:d,visibleColumn:c,expandColumn:p,showOverflow:u,keyboardConfig:g,keyboardOpts:h,mergeList:v,spanMethod:m,scrollXLoad:w,scrollYLoad:x,isAllOverflow:y,emptyOpts:f,mouseConfig:b,mouseOpts:S,sYOpts:T,rowOpts:_,isDragRowMove:C}=r;s&&(d=p||!(w||x||u&&y)||v.length||m||g&&h.isMerge?c:o);let $;$=a.empty?a.empty.call(this,{$table:r},t):(O=(O=f.name?renderer.get(f.name):null)?O.renderTableEmpty||O.renderTableEmptyView||O.renderEmpty:null)?(0,_vn.getSlotVNs)(O.call(this,t,f,{$table:r})):r.emptyText||getI18n("vxe.table.emptyText");var O={scroll:this.scrollEvent};return"wheel"===T.mode&&(O.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",s?`fixed-${s}--wrapper`:"body--wrapper"],attrs:{xid:i},on:O},[s?l():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},d.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),_.drag?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(C?"":"-disabled")}},renderRows(t,this,r,s,n,d)):t("tbody",{ref:"tbody"},renderRows(t,this,r,s,n,d))]),t("div",{class:"vxe-table--checkbox-range"}),b&&S.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},S.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){r.triggerCellAreaExtendMousedownEvent&&r.triggerCellAreaExtendMousedownEvent(e,{$table:r,fixed:s,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):renderEmptyElement(e),s?renderEmptyElement(e):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},$)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let v=(r&&s?s:u).clientHeight,m=(o&&a?a:u).clientWidth,w=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(w,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:m,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};

package/lib/table/src/cell.js

@@ -110,12 +110,17 @@ function renderCellBaseVNs(h, params, content) {
   const rowDragOpts = $table.computeRowDragOpts;
   const {
     showIcon,
+    isCrossDrag,
     visibleMethod
   } = rowDragOpts;
   const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
   const vns = _xeUtils.default.isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && (showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params))) {
-    if (!treeConfig || !level) {
+    if (treeConfig) {
+      if (isCrossDrag || !level) {
+        vns.unshift(renderCellDragIcon(h, params));
+      }
+    } else {
       vns.unshift(renderCellDragIcon(h, params));
     }
   }