vxe-table 4.1.9 → 4.1.11

package/lib/edit/src/hook.js

@@ -55,7 +55,6 @@ var editHook = {
         computeMouseOpts = _a.computeMouseOpts,
         computeEditOpts = _a.computeEditOpts,
         computeCheckboxOpts = _a.computeCheckboxOpts,
-        computeSYOpts = _a.computeSYOpts,
         computeTreeOpts = _a.computeTreeOpts;
 
     var editMethods = {};
@@ -114,7 +113,7 @@ var editHook = {
     }
 
     function insertTreeRow(newRecords, isAppend) {
-      var treeFullData = internalData.treeFullData,
+      var tableFullTreeData = internalData.tableFullTreeData,
           afterFullData = internalData.afterFullData,
           fullDataRowIdData = internalData.fullDataRowIdData,
           fullAllDataRowIdData = internalData.fullAllDataRowIdData;
@@ -123,7 +122,7 @@ var editHook = {
       newRecords.forEach(function (item) {
         var parentRowId = item[treeOpts.parentField];
         var rowid = (0, _util.getRowid)($xetable, item);
-        var matchObj = parentRowId ? _xeUtils.default.findTree(treeFullData, function (item) {
+        var matchObj = parentRowId ? _xeUtils.default.findTree(tableFullTreeData, function (item) {
           return parentRowId === item[treeOpts.rowField];
         }, treeOpts) : null;
 
@@ -159,7 +158,7 @@ var editHook = {
           }
 
           afterFullData[funcName](item);
-          treeFullData[funcName](item);
+          tableFullTreeData[funcName](item);
           var rest = {
             row: item,
             rowid: rowid,
@@ -167,7 +166,7 @@ var editHook = {
             index: -1,
             _index: -1,
             $index: -1,
-            items: treeFullData,
+            items: tableFullTreeData,
             parent: null,
             level: 0
           };
@@ -175,7 +174,6 @@ var editHook = {
           fullAllDataRowIdData[rowid] = rest;
         }
       });
-      $xetable.updateVirtualTreeData();
     }
 
     editMethods = {
@@ -201,14 +199,12 @@ var editHook = {
 
         var treeConfig = props.treeConfig;
         var mergeList = reactData.mergeList,
-            editStore = reactData.editStore,
-            scrollYLoad = reactData.scrollYLoad;
-        var treeFullData = internalData.treeFullData,
+            editStore = reactData.editStore;
+        var tableFullTreeData = internalData.tableFullTreeData,
             afterFullData = internalData.afterFullData,
             tableFullData = internalData.tableFullData,
             fullDataRowIdData = internalData.fullDataRowIdData,
             fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-        var sYOpts = computeSYOpts.value;
         var treeOpts = computeTreeOpts.value;
         var transform = treeOpts.transform;
 
@@ -257,7 +253,7 @@ var editHook = {
           } else {
             // 如果为虚拟树
             if (treeConfig && transform) {
-              var matchObj_1 = _xeUtils.default.findTree(treeFullData, function (item) {
+              var matchObj_1 = _xeUtils.default.findTree(tableFullTreeData, function (item) {
                 return row[treeOpts.rowField] === item[treeOpts.rowField];
               }, treeOpts);
 
@@ -296,7 +292,6 @@ var editHook = {
                   fullDataRowIdData[rowid] = rest;
                   fullAllDataRowIdData[rowid] = rest;
                 });
-                $xetable.updateVirtualTreeData();
               } else {
                 if (process.env.NODE_ENV === 'development') {
                   (0, _utils.warnLog)('vxe.error.unableInsert');
@@ -334,14 +329,12 @@ var editHook = {
 
         (_a = editStore.insertList).unshift.apply(_a, newRecords);
 
-        reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData(transform);
-        $xetable.updateAfterDataIndex();
+        $xetable.handleTableData(treeConfig && treeOpts.transform);
         $xetable.checkSelectionStatus();
 
-        if (scrollYLoad) {
+        if (reactData.scrollYLoad) {
           $xetable.updateScrollYSpace();
         }
 
@@ -366,13 +359,11 @@ var editHook = {
         var treeConfig = props.treeConfig;
         var mergeList = reactData.mergeList,
             editStore = reactData.editStore,
-            selection = reactData.selection,
-            scrollYLoad = reactData.scrollYLoad;
-        var treeFullData = internalData.treeFullData,
+            selection = reactData.selection;
+        var tableFullTreeData = internalData.tableFullTreeData,
             afterFullData = internalData.afterFullData,
             tableFullData = internalData.tableFullData;
         var checkboxOpts = computeCheckboxOpts.value;
-        var sYOpts = computeSYOpts.value;
         var treeOpts = computeTreeOpts.value;
         var transform = treeOpts.transform;
         var actived = editStore.actived,
@@ -416,7 +407,7 @@ var editHook = {
             rows.forEach(function (row) {
               var rowid = (0, _util.getRowid)($xetable, row);
 
-              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+              var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
                 return rowid === (0, _util.getRowid)($xetable, item);
               }, treeOpts);
 
@@ -430,8 +421,6 @@ var editHook = {
               if (afIndex > -1) {
                 afterFullData.splice(afIndex, 1);
               }
-
-              $xetable.updateVirtualTreeData();
             });
           } else {
             rows.forEach(function (row) {
@@ -475,14 +464,12 @@ var editHook = {
             insertList.splice(iIndex, 1);
           }
         });
-        reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData(transform);
-        $xetable.updateAfterDataIndex();
+        $xetable.handleTableData(treeConfig && treeOpts.transform);
         $xetable.checkSelectionStatus();
 
-        if (scrollYLoad) {
+        if (reactData.scrollYLoad) {
           $xetable.updateScrollYSpace();
         }
 
@@ -546,7 +533,7 @@ var editHook = {
       getInsertRecords: function getInsertRecords() {
         var treeConfig = props.treeConfig;
         var editStore = reactData.editStore;
-        var treeFullData = internalData.treeFullData,
+        var tableFullTreeData = internalData.tableFullTreeData,
             tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
         var insertList = editStore.insertList;
@@ -558,7 +545,7 @@ var editHook = {
             insertList.forEach(function (row) {
               var rowid = (0, _util.getRowid)($xetable, row);
 
-              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+              var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
                 return rowid === (0, _util.getRowid)($xetable, item);
               }, treeOpts);
 

package/lib/edit/src/hook.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(R){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var _=R.props,C=R.reactData,I=R.internalData,o=R.getRefMaps().refElem,e=R.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,m=e.computeCheckboxOpts,b=e.computeSYOpts,S=e.computeTreeOpts,h={},w={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function A(e,t){var a=I.treeFullData,i=I.afterFullData,u=I.fullDataRowIdData,c=I.fullAllDataRowIdData,d=S.value,s=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[d.parentField],n=(0,_util.getRowid)(R,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d.rowField]},d):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(R,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[s](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_utils.warnLog)("vxe.error.unableInsert"),i[s](e),a[s](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e}),R.updateVirtualTreeData()}return h={insert:function(e){return h.insertAt(e,null)},insertAt:function(e,t){var r=_.treeConfig,l=C.mergeList,n=C.editStore,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=I.fullDataRowIdData,d=I.fullAllDataRowIdData,s=b.value,f=S.value,v=f.transform,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return R.defineField(Object.assign({},e))});if(t)if(-1===t)r&&v?A(p,!0):(i.push.apply(i,p),u.push.apply(u,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+p.length)}));else if(r&&v){var w,g,m,h=_xeUtils.default.findTree(a,function(e){return t[f.rowField]===e[f.rowField]},f);h?(w=h.parent,g=h.items,a=d[(0,_util.getRowid)(R,w)],m=a?a.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(R,e);"development"===process.env.NODE_ENV&&e[f.parentField]&&w&&e[f.parentField]!==w[f.rowField]&&(0,_utils.errLog)("vxe.error.errProp",[f.parentField+"="+e[f.parentField],f.parentField+"="+w[f.rowField]]),w&&(e[f.parentField]=w[f.rowField]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};c[r]=e,d[r]=e}),R.updateVirtualTreeData()):("development"===process.env.NODE_ENV&&(0,_utils.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_utils.getLog)("vxe.error.noTree",["insert"]));var x=R.findRowIndexOf(i,t);if(-1===x)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));i.splice.apply(i,__spreadArray([x,0],p)),u.splice.apply(u,__spreadArray([R.findRowIndexOf(u,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+p.length:x<t+r&&(e.rowspan=r+p.length)})}else r&&v?A(p,!1):(i.unshift.apply(i,p),u.unshift.apply(u,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),C.scrollYLoad=!r&&-1<s.gt&&s.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(v),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=_.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=m.value,d=b.value,s=S.value,f=s.transform,v=l.actived,p=l.removeList,w=l.insertList,c=c.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(function(e){R.isInsertByRow(e)||p.push(e)}),c||e.forEach(function(e){e=R.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),u===e?(e=g=u.slice(0),I.tableFullData=[],I.afterFullData=[],R.clearMergeCells()):t&&f?e.forEach(function(e){var t=(0,_util.getRowid)(R,e),r=_xeUtils.default.findTree(a,function(e){return t===(0,_util.getRowid)(R,e)},s);r&&(r=r.items.splice(r.index,1),g.push(r[0]));e=R.findRowIndexOf(i,e);-1<e&&i.splice(e,1),R.updateVirtualTreeData()}):e.forEach(function(e){var t=R.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),g.push(t[0]));var l=R.findRowIndexOf(i,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),i.splice(l,1))}),v.row&&-1<R.findRowIndexOf(e,v.row)&&h.clearActived(),e.forEach(function(e){e=R.findRowIndexOf(w,e);-1<e&&w.splice(e,1)}),C.scrollYLoad=!t&&-1<d.gt&&d.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(f),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},removeCheckboxRow:function(){return h.remove(R.getCheckboxRecords()).then(function(e){return R.clearCheckboxRow(),e})},removeRadioRow:function(){var e=R.getRadioRecord();return h.remove(e||[]).then(function(e){return R.clearRadioRow(),e})},removeCurrentRow:function(){var e=R.getCurrentRecord();return h.remove(e||[]).then(function(e){return R.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:h.getInsertRecords(),removeRecords:h.getRemoveRecords(),updateRecords:h.getUpdateRecords()}},getInsertRecords:function(){var e=_.treeConfig,t=C.editStore,r=I.treeFullData,l=I.tableFullData,n=S.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(R,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(R,e)},n)&&o.push(e)}):t.forEach(function(e){-1<R.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=_.keepSource,t=_.treeConfig,r=I.tableFullData,l=S.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return R.isUpdateByRow(e)},l):r.filter(function(e){return R.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=I.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<R.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,R.updateFooter(),R.dispatchEvent("edit-closed",{row:r,rowIndex:R.getRowIndex(r),$rowIndex:R.getVMRowIndex(r),column:l,columnIndex:R.getColumnIndex(l),$columnIndex:R.getVMColumnIndex(l)},e||null)),(R.clearValidate?R.clearValidate():(0,_vue.nextTick)()).then(function(){return R.recalculate()})},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){var t=I.visibleColumn;return R.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=_.editConfig,l=_xeUtils.default.isString(e)?R.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?R.scrollToRow(t,l).then(function(){var e=R.getCell(t,l);return e&&(w.handleActived({row:t,rowIndex:R.getRowIndex(t),column:l,columnIndex:R.getColumnIndex(l),cell:e,$table:R}),I._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=I.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?R.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=R.findRowIndexOf(r,e))&&t&&(r=R.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},R.handleSelected(r,{}))),(0,_vue.nextTick)()}},w={handleActived:function(e,t){var r,l=_.editConfig,n=_.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell=e.cell||R.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),R.closeTooltip(),h.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){w.handleFocus(e,t)})),R.dispatchEvent(r,{row:s,rowIndex:R.getRowIndex(s),$rowIndex:R.getVMRowIndex(s),column:f,columnIndex:R.getColumnIndex(f),$columnIndex:R.getVMColumnIndex(f)},t)):(r=d.column,n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),R.clearValidate&&R.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){w.handleFocus(e,t)})),R.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):R.scrollToRow(l,n))},handleSelected:function(e,t){var r=_.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(h.clearActived(t),h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&w.addCellSelectedClass(),R.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=R.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},h),w)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(h){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var x=h.props,R=h.reactData,_=h.internalData,o=h.getRefMaps().refElem,e=h.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,C=e.computeTreeOpts,g={},m={};function a(){var e=R.editStore,t=R.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function b(e,t){var a=_.tableFullTreeData,i=_.afterFullData,u=_.fullDataRowIdData,c=_.fullAllDataRowIdData,d=C.value,s=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[d.parentField],n=(0,_util.getRowid)(h,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d.rowField]},d):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(h,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[s](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_utils.warnLog)("vxe.error.unableInsert"),i[s](e),a[s](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=x.treeConfig,l=R.mergeList,n=R.editStore,o=_.tableFullTreeData,a=_.afterFullData,i=_.tableFullData,u=_.fullDataRowIdData,c=_.fullAllDataRowIdData,d=C.value,s=d.transform,f=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return h.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?b(f,!0):(a.push.apply(a,f),i.push.apply(i,f),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+f.length)}));else if(r&&s){var v,p,w,g=_xeUtils.default.findTree(o,function(e){return t[d.rowField]===e[d.rowField]},d);g?(v=g.parent,p=g.items,o=c[(0,_util.getRowid)(h,v)],w=o?o.level:0,f.forEach(function(e,t){var r=(0,_util.getRowid)(h,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&v&&e[d.parentField]!==v[d.rowField]&&(0,_utils.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+v[d.rowField]]),v&&(e[d.parentField]=v[d.rowField]),p.splice(g.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:p,parent:v,level:w+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_utils.warnLog)("vxe.error.unableInsert"),b(f,!0))}else{if(r)throw new Error((0,_utils.getLog)("vxe.error.noTree",["insert"]));var m=h.findRowIndexOf(a,t);if(-1===m)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([m,0],f)),i.splice.apply(i,__spreadArray([h.findRowIndexOf(i,t),0],f)),l.forEach(function(e){var t=e.row,r=e.rowspan;m<t?e.row=t+f.length:m<t+r&&(e.rowspan=r+f.length)})}else r&&s?b(f,!1):(a.unshift.apply(a,f),i.unshift.apply(i,f),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+f.length)}));return(n=n.insertList).unshift.apply(n,f),h.updateFooter(),h.cacheRowMap(),h.handleTableData(r&&d.transform),h.checkSelectionStatus(),R.scrollYLoad&&h.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return h.updateCellAreas(),h.recalculate()}).then(function(){return{row:f.length?f[f.length-1]:null,rows:f}})},remove:function(e){var t=x.treeConfig,r=R.mergeList,l=R.editStore,n=R.selection,o=_.tableFullTreeData,a=_.afterFullData,i=_.tableFullData,u=w.value,c=C.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){h.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=h.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),_.tableFullData=[],_.afterFullData=[],h.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(h,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(h,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=h.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=h.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=h.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<h.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=h.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),h.updateFooter(),h.cacheRowMap(),h.handleTableData(t&&c.transform),h.checkSelectionStatus(),R.scrollYLoad&&h.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return h.updateCellAreas(),h.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(h.getCheckboxRecords()).then(function(e){return h.clearCheckboxRow(),e})},removeRadioRow:function(){var e=h.getRadioRecord();return g.remove(e||[]).then(function(e){return h.clearRadioRow(),e})},removeCurrentRow:function(){var e=h.getCurrentRecord();return g.remove(e||[]).then(function(e){return h.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=x.treeConfig,t=R.editStore,r=_.tableFullTreeData,l=_.tableFullData,n=C.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(h,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(h,e)},n)&&o.push(e)}):t.forEach(function(e){-1<h.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return R.editStore.removeList},getUpdateRecords:function(){var e=x.keepSource,t=x.treeConfig,r=_.tableFullData,l=C.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return h.isUpdateByRow(e)},l):r.filter(function(e){return h.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=R.editStore,t=_.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<h.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=R.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=R.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,h.updateFooter(),h.dispatchEvent("edit-closed",{row:r,rowIndex:h.getRowIndex(r),$rowIndex:h.getVMRowIndex(r),column:l,columnIndex:h.getColumnIndex(l),$columnIndex:h.getVMColumnIndex(l)},e||null)),(h.clearValidate?h.clearValidate():(0,_vue.nextTick)()).then(function(){return h.recalculate()})},clearSelected:function(){var e=R.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return R.editStore.actived.row===e},setActiveRow:function(e){var t=_.visibleColumn;return h.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=x.editConfig,l=_xeUtils.default.isString(e)?h.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?h.scrollToRow(t,l).then(function(){var e=h.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:h.getRowIndex(t),column:l,columnIndex:h.getColumnIndex(l),cell:e,$table:h}),_._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=R.tableData,l=_.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?h.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=h.findRowIndexOf(r,e))&&t&&(r=h.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},h.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=x.editConfig,n=x.mouseConfig,o=R.editStore,a=R.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell=e.cell||h.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(n&&(g.clearSelected(),h.clearCellAreas&&(h.clearCellAreas(),h.clearCopyCellArea())),h.closeTooltip(),g.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),h.dispatchEvent(r,{row:s,rowIndex:h.getRowIndex(s),$rowIndex:h.getVMRowIndex(s),column:f,columnIndex:h.getColumnIndex(f),$columnIndex:h.getVMColumnIndex(f)},t)):(r=d.column,n&&(g.clearSelected(),h.clearCellAreas&&(h.clearCellAreas(),h.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),h.clearValidate&&h.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){m.handleFocus(e,t)})),h.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):h.scrollToRow(l,n))},handleSelected:function(e,t){var r=x.mouseConfig,l=R.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),h.clearCellAreas&&(h.clearCellAreas(),h.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),h.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=R.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=h.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

package/lib/filter/src/hook.js

@@ -133,7 +133,7 @@ var tableFilterHook = {
             var maxHeight = null;
 
             if (filterHeight >= bodyElem.clientHeight) {
-              maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
+              maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
             }
 
             if (column.fixed === 'left') {

package/lib/filter/src/hook.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(u){var s=u.reactData,a=u.internalData,e=u.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=u.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:u})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,f,u,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(40,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?f=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(u=p+r-s+10-v)&&(a-=u),t.left=Math.min(c,Math.max(10,a))+"px"):f&&(0<(u=p+r-s+10-v)&&(f+=u),t.right=Math.max(10,f)+"px"),m.style=t,m.maxHeight=l})),u.dispatchEvent("filter-visible",{column:d,property:d.property,filterList:u.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:u})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.property,a=[],f=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),f.push(e.data))});t=u.getCheckedFilters();i.remote||(u.handleTableData(!0),u.checkSelectionStatus(),u.updateFooter(),(l||r)&&(u.clearScroll(),r&&u.updateScrollYSpace())),u.dispatchEvent("filter-change",{column:n,property:o,values:a,datas:f,filters:t,filterList:t},e),u.closeFilter(),(0,_vue.nextTick)(function(){u.recalculate(),u.updateCellAreas()})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(u,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return u.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"];e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(u,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(u,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():u.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.property,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(u){var s=u.reactData,a=u.internalData,e=u.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=u.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:u})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,f,u,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(60,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?f=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(u=p+r-s+10-v)&&(a-=u),t.left=Math.min(c,Math.max(10,a))+"px"):f&&(0<(u=p+r-s+10-v)&&(f+=u),t.right=Math.max(10,f)+"px"),m.style=t,m.maxHeight=l})),u.dispatchEvent("filter-visible",{column:d,property:d.property,filterList:u.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:u})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.property,a=[],f=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),f.push(e.data))});t=u.getCheckedFilters();i.remote||(u.handleTableData(!0),u.checkSelectionStatus(),u.updateFooter(),(l||r)&&(u.clearScroll(),r&&u.updateScrollYSpace())),u.dispatchEvent("filter-change",{column:n,property:o,values:a,datas:f,filters:t,filterList:t},e),u.closeFilter(),(0,_vue.nextTick)(function(){u.recalculate(),u.updateCellAreas()})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(u,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return u.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"];e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(u,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(u,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():u.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.property,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;