vxe-table 3.15.53 → 3.15.56

package/lib/table/src/columnInfo.js

@@ -24,6 +24,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     const proxyOpts = $xeGrid ? $xeGrid.proxyOpts : null;
     const formatter = _vm.formatter;
     const visible = _xeUtils.default.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -69,6 +73,14 @@ class ColumnInfo {
         (0, _log.errLog)('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
       }
     }
+    if (field && editRender) {
+      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+        (0, _log.errLog)('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+      }
+      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+        (0, _log.errLog)('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+      }
+    }
     Object.assign(this, {
       // 基本属性
       type: _vm.type,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,s=n?n.proxyOpts:null,a=r.formatter,u=!_xeUtils.default.isBoolean(r.visible)||r.visible,f=["seq","checkbox","radio","expand","html"];r.type&&-1===f.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,f.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(f=d.treeConfig,f)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a&&(_xeUtils.default.isString(a)?(d=formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(f=formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(f.tableCellFormatMethod||f.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),s&&s.beforeColumn&&s.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,{field:s,editRender:a}=r,f=n?n.proxyOpts:null,u=r.formatter,g=!_xeUtils.default.isBoolean(r.visible)||r.visible,c=["seq","checkbox","radio","expand","html"];r.type&&-1===c.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,c.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(c=d.treeConfig,c)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),u&&(_xeUtils.default.isString(u)?(d=formats.get(u)||_xeUtils.default[u])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[u]):!_xeUtils.default.isArray(u)||(c=formats.get(u[0])||_xeUtils.default[u[0]])&&_xeUtils.default.isFunction(c.tableCellFormatMethod||c.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[u[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),s&&a&&(a.startField&&0<=(""+a.startField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.startField="+a.startField]),a.endField)&&0<=(""+a.endField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.endField="+a.endField]),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:u,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:g,halfVisible:!1,defaultVisible:g,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),f&&f.beforeColumn&&f.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/methods.js

@@ -2414,6 +2414,10 @@ function removeFooterMerges($xeTable, merges) {
   return rest;
 }
 function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+  const internalData = $xeTable;
+  const {
+    tableFullColumn
+  } = internalData;
   const sortOpts = $xeTable.computeSortOpts;
   const {
     multiple,
@@ -2424,10 +2428,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
     sortConfs = [sortConfs];
   }
   if (sortConfs && sortConfs.length) {
+    const orderActiveMaps = {};
     if (!multiple) {
       sortConfs = [sortConfs[0]];
-      clearAllSort($xeTable);
+      tableFullColumn.forEach(column => {
+        if (column.order) {
+          orderActiveMaps[column.id] = column;
+        }
+      });
     }
+    const sortColMpps = {};
     let firstColumn = null;
     sortConfs.forEach((confs, index) => {
       let {
@@ -2449,8 +2459,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
           column.order = order;
         }
         column.sortTime = Date.now() + index;
+        sortColMpps[column.id] = column;
       }
     });
+    if (!multiple) {
+      _xeUtils.default.each(orderActiveMaps, (oaCol, oaId) => {
+        if (!sortColMpps[oaId]) {
+          oaCol.order = null;
+        }
+      });
+    }
     if (isUpdate) {
       if (!remote) {
         $xeTable.handleTableData(true);
@@ -9911,12 +9929,11 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    // 已废弃，即将去掉事件触发 new Event('click') -> null
-    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    return handleSortEvent($xeTable, null, sortConfs, isUpdate);
   },
-  setSortByEvent(evnt, sortConfs, isUpdate) {
+  setSortByEvent(evnt, sortConfs) {
     const $xeTable = this;
-    return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
+    return handleSortEvent($xeTable, evnt, sortConfs, true);
   },
   /**
    * 清空指定列的排序条件
@@ -9949,6 +9966,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -9968,7 +9988,13 @@ const Methods = {
       if (!sortOpts.remote) {
         $xeTable.handleTableData(true);
       }
-      if (sortCols.length) {
+      if (!multiple) {
+        column = sortCols[0];
+      }
+      if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column);
+      }
+      if (multiple && sortCols.length) {
         const params = {
           $table: $xeTable,
           $event: evnt,
@@ -9976,8 +10002,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -10023,14 +10047,12 @@ const Methods = {
     }
     return sortList;
   },
-  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+  setFilterByEvent(evnt, fieldOrColumn, options) {
     const $xeTable = this;
     const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
     if (column && column.filters) {
       column.filters = (0, _util.toFilters)(options || []);
-      if (isUpdate) {
-        return $xeTable.handleColumnConfirmFilter(column, evnt);
-      }
+      return $xeTable.handleColumnConfirmFilter(column, evnt);
     }
     return $xeTable.$nextTick();
   },
@@ -10089,6 +10111,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -10118,7 +10143,34 @@ const Methods = {
     if (!filterOpts.remote) {
       $xeTable.updateData();
     }
-    if (filterCols.length) {
+    if (!multiple) {
+      column = filterCols[0];
+    }
+    if (column) {
+      const filterList = () => $xeTable.getCheckedFilters();
+      const values = [];
+      const datas = [];
+      column.filters.forEach(item => {
+        if (item.checked) {
+          values.push(item.value);
+          datas.push(item.data);
+        }
+      });
+      const params = {
+        $table: $xeTable,
+        $event: evnt,
+        column,
+        field: column.field,
+        property: column.field,
+        values,
+        datas,
+        filters: filterList,
+        filterList
+      };
+      $xeTable.dispatchEvent('filter-change', params, evnt);
+      $xeTable.dispatchEvent('clear-filter', params, evnt);
+    }
+    if (multiple && filterCols.length) {
       const params = {
         $table: $xeTable,
         $event: evnt,
@@ -10126,10 +10178,6 @@ const Methods = {
         filterList: []
       };
       $xeTable.dispatchEvent('clear-all-filter', params, evnt);
-    } else if (column) {
-      $xeTable.dispatchEvent('clear-filter', {
-        filterList: () => $xeTable.getCheckedFilters()
-      }, evnt);
     }
     return $xeTable.$nextTick();
   },