diff --git a/packages/abc/simple-table/simple-table.component.ts b/packages/abc/simple-table/simple-table.component.ts index ac0f82967..ad46955da 100644 --- a/packages/abc/simple-table/simple-table.component.ts +++ b/packages/abc/simple-table/simple-table.component.ts @@ -604,11 +604,13 @@ export class SimpleTableComponent implements OnInit, OnChanges, OnDestroy { const ms = this.multiSort; if (ms) { - Object.keys(this._sortMap).forEach(key => { - const item = this._sortMap[key]; - ret[item.key] = - (item.column.sortReName || this.sortReName || {})[item.v] || item.v; - }); + Object.keys(this._sortMap) + .filter(key => this._sortMap[key].enabled && this._sortMap[key].v) + .forEach(key => { + const item = this._sortMap[key]; + ret[item.key] = + (item.column.sortReName || this.sortReName || {})[item.v] || item.v; + }); // 合并处理 if (typeof ms === 'object') { ret = { diff --git a/packages/abc/simple-table/simple-table.spec.ts b/packages/abc/simple-table/simple-table.spec.ts index a0d271f5b..90b05ec67 100644 --- a/packages/abc/simple-table/simple-table.spec.ts +++ b/packages/abc/simple-table/simple-table.spec.ts @@ -1007,6 +1007,7 @@ describe('abc: simple-table', () => { describe('#multiSort', () => { beforeEach(() => (context.columns = [ + { title: '', index: 'index' }, { title: '', index: 'index', diff --git a/scaffold b/scaffold index fb030c4e3..c3ccfead2 160000 --- a/scaffold +++ b/scaffold @@ -1 +1 @@ -Subproject commit fb030c4e3c098a054fdc225468e4d30bd0fd1a66 +Subproject commit c3ccfead221aa5bac7f48984274be7dc83a72d98