feat(advance-table): unfinished

.eslintrc.js

@@ -1,6 +1,15 @@
 module.exports = {
-  extends: [
+  extends: ['plugin:vue/recommended', '@vue/standard'],
-    'plugin:vue/recommended',
+  rules: {
-    '@vue/standard'
+    'vue/max-attributes-per-line': [
-  ]
+      2,
-}
+      {
+        singleline: 20,
+        multiline: {
+          max: 1,
+          allowFirstLine: false
+        }
+      }
+    ]
+  }
+}

demo/documentation/components/advancedTable/enUS/basic.md

@@ -1,4 +1,5 @@
 # Basic
+
 ```html
 <n-advance-table
   ref="table"
@@ -11,10 +12,7 @@
   @on-change="onChange"
   @on-selected-change="onSelectedChange"
 >
-  <div
+  <div slot="table-operation-batch-left" style="padding-left:27px;">
-    slot="table-operation-batch-left"
-    style="padding-left:27px;"
-  >
     <n-icon
       v-show="selectedRow.length"
       color="rgba(255,255,255,.7)"
@@ -35,6 +33,7 @@
   </div>
 </n-advance-table>
 ```
+
 ```js
 const items = [
   {
@@ -56,20 +55,21 @@ const sex = [
     value: 'female'
   }
 ]
-const _columns3 = ($this) => {
+const _columns3 = $this => {
   return [
     {
       type: 'selection',
-      disabled (params, index) {
+      disabled(params, index) {
         return params.row.age < 8
       }
+      // fixed: 'left'
     },
     {
       title: 'Name',
       key: 'name',
       sortable: true,
       width: 300,
-      renderHeader(h,column){
+      renderHeader(h, column) {
         return <n-tag>{column.title}</n-tag>
       }
     },
@@ -77,7 +77,7 @@ const _columns3 = ($this) => {
       title: 'Age',
       key: 'age',
       sortable: true,
-      sorter (a, b) {
+      sorter(a, b) {
         return a.age - b.age
       },
       // filterMultiple: true,
@@ -102,7 +102,7 @@ const _columns3 = ($this) => {
         return values.includes(record.sex)
       },
       filterMultiple: true,
-      asyncFilterItems () {
+      asyncFilterItems() {
         return new Promise((resolve, reject) => {
           setTimeout(() => {
             Math.random() > 0.6
@@ -114,6 +114,8 @@ const _columns3 = ($this) => {
     },
     {
       title: '#',
+      fixed: 'right',
+      width: 200,
       render: (h, params) => {
         return (
           <n-button
@@ -130,7 +132,7 @@ const _columns3 = ($this) => {
 }
 export default {
   components: {},
-  data () {
+  data() {
     const columns = _columns3(this)
 
     return {
@@ -156,30 +158,30 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     this.data = this.getData()
     // data一定要先有值才可以再selectRow
     this.$refs.table.selectRow([1, 2, 5])
     // this.$refs.table.selectRow('all') // 可以全选当前展示数据
   },
   methods: {
-    clearSelect () {
+    clearSelect() {
       this.$refs.table.clearSelect()
     },
-    batchDelete () {
+    batchDelete() {
-      this.selectedRow.forEach((item) => {
+      this.selectedRow.forEach(item => {
         let index = item._index
         this.data[index] = null
       })
-      this.data = this.data.filter((item) => item !== null)
+      this.data = this.data.filter(item => item !== null)
     },
-    computeRowcls (params) {
+    computeRowcls(params) {
       if (params.row.age > 15) {
         return 'age-too-old'
       }
       return ''
     },
-    handleDelete (params) {
+    handleDelete(params) {
       let index = params._index
       this.data.splice(index, 1)
       this.$NMessage.success('Delete successfully,', { duration: 2000 })
@@ -187,7 +189,7 @@ export default {
         duration: 4000
       })
     },
-    getData (args) {
+    getData(args) {
       let d = new Array(20).fill(0)
       d = d.map((item, idx) => {
         return {
@@ -198,11 +200,11 @@ export default {
       })
       return d
     },
-    onSelectedChange (selectedRow) {
+    onSelectedChange(selectedRow) {
       console.log(selectedRow)
       this.selectedRow = selectedRow
     },
-    onChange (args) {
+    onChange(args) {
       /**
        * "filter": {
           "age": {
@@ -236,7 +238,7 @@ export default {
       }
        */
     },
-    clear () {
+    clear() {
       // 清除所有的Filter选项,会触发onchange事件
       this.$refs.table.setParams({})
       this.$NMessage.info('clear all filters', { duration: 5000 })
@@ -244,8 +246,9 @@ export default {
   }
 }
 ```
+
 ```css
 .age-too-old {
   color: rgba(255, 255, 255, 0.3);
 }
-```
+```

packages/common/AdvanceTable/header/header.vue

@@ -0,0 +1,190 @@
+<template>
+  <n-table
+    ref="header"
+    style="padding:0;border-bottom-left-radius:0;border-bottom-right-radius:0;"
+    :style="colGroupStl"
+    class="n-advance-table__header"
+  >
+    <colgroup>
+      <col
+        v-for="(column, i) in columns"
+        :key="i"
+        :style="computeCustomWidthStl(column)"
+      >
+
+      <col v-if="scrollBarWidth" :width="scrollBarWidth" >
+    </colgroup>
+    <n-thead>
+      <n-tr>
+        <template v-for="(column, i) in columns">
+          <!-- fixed列不显示 -->
+          <n-th v-if="column.fixed" :key="column.key">
+            <i />
+          </n-th>
+          <n-th
+            v-else
+            ref="theads"
+            :key="column.key"
+            :style="computeAlign(column)"
+            :class="{
+              'n-advance-table__sortable-column': column.sortable
+            }"
+            @click.native.self="() => sortByColumn(column)"
+          >
+            <!-- 当前页全选 -->
+            <n-checkbox
+              v-if="column.type === 'selection'"
+              v-model="currentPageAllSelect"
+              :indeterminate="!isCheckedBoxAllIndeterminate"
+              @click.native="onAllCheckboxesClick"
+            />
+            <row
+              v-if="column.renderHeader"
+              :index="i"
+              :row="column"
+              :key-name="column.key || i"
+              :render="column.renderHeader"
+            />
+            {{ !column.renderHeader ? column.title : "" }}
+            <SortIcon
+              v-if="column.sortable"
+              :ref="'sorter_' + (column.key || i)"
+              :value="sortIndexs[column.key || i]"
+              class="n-advance-table__header-icon"
+              @input="sortInput"
+              :current-key="currentKey"
+              :column="column"
+              :index="i"
+              @onSortTypeChange="onSortTypeChange"
+            />
+
+            <!-- 优先自定义 -->
+            {{ column.filterDropdown && column.filterDropdown() }}
+            <!-- 否则默认渲染 -->
+            <PopFilter
+              v-if="
+                column.onFilter &&
+                  (column.filterItems || column.asyncFilterItems)
+              "
+              v-model="selectedFilter[column.key]"
+              class="n-advance-table__header-icon"
+              :column="column"
+              :items="column.filterItems || column.asyncFilterItems"
+              @on-filter="onFilter"
+            />
+          </n-th>
+        </template>
+        <span
+          v-if="scrollBarWidth"
+          :style="
+            'padding-left:' + scrollBarWidth + 'px;' + 'visibility:hidden;'
+          "
+          rowspan="1"
+        />
+      </n-tr>
+    </n-thead>
+  </n-table>
+</template>
+
+<script>
+import row from '../row/index.js'
+import SortIcon from '../sortIcon'
+import PopFilter from '../popFilter'
+
+export default {
+  components: {
+    row,
+    SortIcon,
+    PopFilter
+  },
+  props: {
+    colGroupStl: {},
+    columns: {},
+    scrollBarWidth: {},
+    sortIndexs: {},
+    selectedFilter: {},
+    showingData: {}
+  },
+  data () {
+    return {
+      currentPageAllSelect: false
+    }
+  },
+  computed: {
+    isCheckedBoxAllIndeterminate () {
+      return (
+        this.currentPageSelected === this.showingData.length ||
+        this.currentPageSelected === 0
+      )
+    },
+    currentKey () {
+      let currentKey = null
+      Object.keys(this.sortIndexs).forEach(key => {
+        if (this.sortIndexs[key] !== null) {
+          currentKey = key
+        }
+      })
+      return currentKey
+    }
+  },
+  methods: {
+    onCheckBoxChange (v) {
+      this.$emit('on-checkbox-all-change', v)
+    },
+    computeAlign (column) {
+      if (column.align) {
+        return {
+          'text-align': column.align
+        }
+      }
+    },
+    sortInput (value, column) {
+      this.$set(this.sortIndexs, column.key, value)
+    },
+    sortByColumn (column) {
+      if (!column.sortable || column.key === void 0) return
+      const ref = this.$refs['sorter_' + column.key][0]
+      ref.changeSort()
+      // this.$set(this.sortIndexs, column.key, value)
+    },
+    computeCustomWidthStl (column) {
+      if (column.width) {
+        let width = column.width
+        return {
+          width: width + 'px',
+          'padding-right': this.scrollBarWidth + 'px'
+          // minWidth: width + 'px'
+        }
+      } else if (column.type === 'selection') {
+        let width = 60
+        return {
+          width: width + 'px',
+          'padding-right': this.scrollBarWidth + 'px'
+          // minWidth: width + 'px'
+        }
+      }
+      return null
+    },
+    clearSort () {
+      Object.keys(this.sortIndexs).forEach(key => {
+        this.sortIndexs[key] = null
+      })
+    },
+    onAllCheckboxesClick () {
+      this.$emit('on-checkbox-all', this.currentPageAllSelect)
+    },
+    onSortTypeChange (sorter) {
+      this.clearSort()
+      this.sortInput(sorter.type, sorter.column)
+      console.log('TCL: onSortTypeChange -> sorter', sorter)
+      this.$emit('on-sort-change', sorter)
+    },
+    onFilter (value, column) {
+      this.$emit('on-filter', value, column)
+    }
+  }
+}
+</script>
+
+<style>
+</style>

packages/common/AdvanceTable/sortIcon/index.vue

@@ -22,7 +22,7 @@
 </template>
 <script>
 // refer to https://github.com/TuSimple/infra-ecos-webui/blob/develop/src/components/SortIcon.vue
-const computeOpacity = (val) => {
+const computeOpacity = val => {
   let self = {}
   switch (val) {
     case 0:
@@ -62,7 +62,8 @@ export default {
     column: {
       type: Object,
       required: true
-    }
+    },
+    currentKey: {}
   },
   data () {
     return {
@@ -72,10 +73,28 @@ export default {
   },
   computed: {
     opacitys () {
+      if (this.currentKey !== this.column.key) {
+        this.upOpacity = 0.4
+        this.downOpacity = 0.4
+        return 0.4
+      }
       let val = this.value
       return computeOpacity(val)
     }
   },
+  watch: {
+    value (val) {
+      if (val !== null) {
+        this.$emit('onSortTypeChange', {
+          i: this.index,
+          sortable: this.column.sortable,
+          key: this.column.key || this.index,
+          type: val,
+          column: this.column
+        })
+      }
+    }
+  },
   mounted () {
     if (this.value !== 0 && this.value !== null) {
       this.setSort(this.value)
@@ -112,14 +131,6 @@ export default {
     },
     setSort (val) {
       this.$emit('input', val)
-      this.$emit('onSortTypeChange', {
-        i: this.index,
-        sortable: this.column.sortable,
-        key: this.column.key || this.index,
-        type: val,
-        column: this.column
-      })
-      // this.changeOpacity(val)
     }
   }
 }

packages/common/AdvanceTable/src/main.vue

@@ -4,7 +4,7 @@
     class="n-advance-table__wrapper n-advance-table"
     :class="{
       [`n-${synthesizedTheme}-theme`]: synthesizedTheme,
-      'n-advance-table--col-border':colBorder
+      'n-advance-table--col-border': colBorder
     }"
   >
     <div class="n-advance-table__operation">
@@ -18,10 +18,7 @@
         :style="search ? 'margin-bottom: 18px;' : ''"
       >
         <slot name="table-operation" />
-        <div
+        <div v-if="search" class="n-advance-table__operation__search">
-          v-if="search"
-          class="n-advance-table__operation__search"
-        >
           <searchInput
             ref="search"
             :options="search"
@@ -31,99 +28,21 @@
         <slot name="table-operation-search-right" />
       </div>
     </div>
-    <div
+    <div ref="tbodyWrapper" class="n-advance-table__tbody">
-      ref="tbodyWrapper"
+      <!-- table head -->
-      class="n-advance-table__tbody"
+      <table-header
-    >
-      <n-table
         ref="header"
-        style="padding:0;border-bottom-left-radius:0;border-bottom-right-radius:0;"
+        :columns="columns"
-        :style="colGroup"
+        :col-group-stl="colGroup"
-        class="n-advance-table__header"
+        :scroll-bar-width="scrollBarWidth"
-      >
+        :sort-indexs="sortIndexs"
-        <colgroup>
+        :selected-filter="selectedFilter"
-          <col
+        :showing-data="showingData"
-            v-for="(column, i) in columns"
+        @on-checkbox-all="onAllCheckboxesClick"
-            :key="i"
+        @on-sort-change="onSortTypeChange"
-            :style="computeCustomWidthStl(column)"
+        @on-filter="onFilter"
-          >
+      />
-          <col
+      <!-- table body -->
-            v-if="scrollBarWidth"
-            :width="scrollBarWidth"
-          >
-        </colgroup>
-        <n-thead>
-          <n-tr>
-            <n-th
-              v-for="(column, i) in columns"
-              ref="theads"
-              :key="column.key"
-              :style="computeAlign(column)"
-              :class="{
-                'n-advance-table__sortable-column': column.sortable
-              }"
-              @click.native.self="()=>sortByColumn(column)"
-            >
-              <!-- 当前页全选 -->
-              <n-checkbox
-                v-if="column.type === 'selection'"
-                v-model="currentPageAllSelect"
-                :indeterminate="!isCheckedBoxAllIndeterminate"
-                @click.native="onAllCheckboxesClick"
-              />
-              <row
-                v-if="column.renderHeader"
-                :index="i"
-                :row="column"
-                :key-name="column.key || i"
-                :render="column.renderHeader"
-              />
-              {{ !column.renderHeader ? column.title : '' }}
-              <SortIcon
-                v-if="column.sortable"
-                :ref="'sorter_' + (column.key || i)"
-                v-model="sortIndexs[column.key || i]"
-                class="n-advance-table__header-icon"
-                :column="column"
-                :index="i"
-                @onSortTypeChange="onSortTypeChange"
-              />
-
-              <!-- 优先自定义 -->
-              {{ column.filterDropdown && column.filterDropdown() }}
-              <!-- 否则默认渲染 -->
-              <PopFilter
-                v-if="column.onFilter && (column.filterItems || column.asyncFilterItems)"
-                v-model="selectedFilter[column.key]"
-                class="n-advance-table__header-icon"
-                :column="column"
-                :items="column.filterItems || column.asyncFilterItems"
-                @on-filter="onFilter"
-              />
-
-            <!-- <filterDropDown
-              v-if="column.filterItems && !column.filterDropdown"
-              :ref="'filterDropDown_' + (column.key || i)"
-              :max-height="column.filterDropDownMaxHeight"
-              :filter-fn="column.onFilter"
-              :filter-key="column.key || i"
-              :filter-items="column.filterItems"
-              :filter-multiple="column.filterMultiple || false"
-              @on-filter="
-                ({ value, key, filterFn }) => onFilter(value, key, filterFn)
-              "
-            /> -->
-            </n-th>
-            <span
-              v-if="scrollBarWidth"
-              :style="
-                'padding-left:' + scrollBarWidth + 'px;' + 'visibility:hidden;'
-              "
-              rowspan="1"
-            />
-          </n-tr>
-        </n-thead>
-      </n-table>
       <n-table
         ref="tbody"
         :style="tableStl"
@@ -141,36 +60,52 @@
           <n-tr
             v-for="(rowData, i) in showingData"
             :key="i"
-            :class="typeof rowClassName === 'function' ? rowClassName(rowData,i) : rowClassName"
+            :class="
+              typeof rowClassName === 'function'
+                ? rowClassName(rowData, i)
+                : rowClassName
+            "
           >
-            <n-td
+            <template v-for="column in columns">
-              v-for="column in columns"
+              <!-- fixed列不显示 -->
-              :key="column.key"
+              <n-td v-if="column.fixed" :key="column.key">
-              :style="computeAlign(column)"
+                <i />
-              :class="computeTdClass(column, rowData)"
+              </n-td>
-            >
+              <n-td
-              <!-- 批量选择 -->
-              <n-checkbox
-                v-if="column.type === 'selection' && (column.disabled && !column.disabled(rowData,i))"
-                v-model="checkBoxes[rowData._index]"
-              />
-              <n-checkbox
-                v-else-if="column.type === 'selection' && (column.disabled && column.disabled(rowData,i))"
-                v-model="disabledCheckBox[rowData._index]"
-                :disabled="!(disabledCheckBox[rowData._index]=false)"
-              />
-              <n-checkbox
-                v-else-if="column.type === 'selection'"
-                v-model="checkBoxes[rowData._index]"
-              />
-              <row
                 v-else
-                :index="i"
+                :key="column.key"
-                :row="rowData"
+                :style="computeAlign(column)"
-                :key-name="column.key"
+                :class="computeTdClass(column, rowData)"
-                :render="column.render"
+              >
-              />
+                <!-- 批量选择 -->
-            </n-td>
+                <n-checkbox
+                  v-if="
+                    column.type === 'selection' &&
+                      (column.disabled && !column.disabled(rowData, i))
+                  "
+                  v-model="checkBoxes[rowData._index]"
+                />
+                <n-checkbox
+                  v-else-if="
+                    column.type === 'selection' &&
+                      (column.disabled && column.disabled(rowData, i))
+                  "
+                  v-model="disabledCheckBox[rowData._index]"
+                  :disabled="!(disabledCheckBox[rowData._index] = false)"
+                />
+                <n-checkbox
+                  v-else-if="column.type === 'selection'"
+                  v-model="checkBoxes[rowData._index]"
+                />
+                <row
+                  v-else
+                  :index="i"
+                  :row="rowData"
+                  :key-name="column.key"
+                  :render="column.render"
+                />
+              </n-td>
+            </template>
           </n-tr>
           <div
             v-if="showingData.length === 0"
@@ -178,9 +113,9 @@
           >
             No data
           </div>
-        <!-- <tr style="display:inline-block;width:100%;"> -->
+          <!-- <tr style="display:inline-block;width:100%;"> -->
 
-        <!-- </tr> -->
+          <!-- </tr> -->
         </n-tbody>
         <template v-if="loading">
           <n-spin
@@ -195,10 +130,7 @@
       v-if="pagination !== false && showingData.length"
       class="n-advance-table__pagination"
     >
-      <n-pagination
+      <n-pagination v-model="currentPage" :page-count="pageCount" />
-        v-model="currentPage"
-        :page-count="pageCount"
-      />
     </div>
   </div>
 </template>
@@ -211,6 +143,7 @@ import searchInput from '../searchInput'
 import { noopFn } from '../../../utils/index'
 import withapp from '../../../mixins/withapp'
 import themeable from '../../../mixins/themeable'
+import TableHeader from '../header/header'
 
 export default {
   name: 'NAdvanceTable',
@@ -218,13 +151,10 @@ export default {
     row,
     SortIcon,
     PopFilter,
-    searchInput
+    searchInput,
-
+    TableHeader
   },
-  mixins: [
+  mixins: [withapp, themeable],
-    withapp,
-    themeable
-  ],
   props: {
     search: {
       /**
@@ -400,24 +330,33 @@ export default {
             return this.copyData[idx]
           }
         })
-        .filter((item) => item !== void 0)
+        .filter(item => item !== void 0)
     },
     currentPageSelected () {
       let selectedLen = 0
-      this.showingData.forEach((item) => {
+      this.showingData.forEach(item => {
         let realIdx = item._index
-        if (this.checkBoxes[realIdx] === true && this.disabledCheckBox[realIdx] !== false) {
+        if (
+          this.checkBoxes[realIdx] === true &&
+          this.disabledCheckBox[realIdx] !== false
+        ) {
           selectedLen++
         }
       })
       return selectedLen
     },
     isCheckedBoxAllIndeterminate () {
-      return this.currentPageSelected === this.showingData.length || this.currentPageSelected === 0
+      return (
+        this.currentPageSelected === this.showingData.length ||
+        this.currentPageSelected === 0
+      )
     },
     allCheckboxesSelect: {
       get () {
-        if (this.currentPageSelected === this.showingData.length && this.showingData.length !== 0) {
+        if (
+          this.currentPageSelected === this.showingData.length &&
+          this.showingData.length !== 0
+        ) {
           return true
         }
         return false
@@ -461,7 +400,7 @@ export default {
         if (keys.length) {
           this.currentFilterColumn = {}
         }
-        this.columns.forEach((column) => {
+        this.columns.forEach(column => {
           let key = column.key
           if (keys.includes(key) && val[key] && val[key].length !== 0) {
             // TODO: 未来版本单选将会返回一个数值而不是数组!
@@ -553,13 +492,13 @@ export default {
     selectRow (rowIndexs = []) {
       this.$nextTick(() => {
         if (rowIndexs === 'all') {
-          this.showingData.forEach((item) => {
+          this.showingData.forEach(item => {
             this.checkBoxes[item._index] = true
           })
           this.checkBoxes = [].concat(this.checkBoxes)
         } else {
           if (this.showingData.length > 0) {
-            rowIndexs.forEach((idx) => {
+            rowIndexs.forEach(idx => {
               if (this.showingData[idx]) {
                 const realIdx = this.showingData[idx]._index
                 this.checkBoxes[realIdx] = true
@@ -578,21 +517,22 @@ export default {
      */
     setParams ({ filter, sorter, page, searcher }) {
       if (sorter) {
-        const ref = this.$refs['sorter_' + sorter.key][0]
+        this.sortIndexs[sorter.key] = sorter.type
-        ref.setSort(sorter.type)
+        // const ref = this.$refs['sorter_' + sorter.key][0]
+        // ref.setSort(sorter.type)
         // this.sortIndexs[sorter.key] = sorter.type
       } else {
         // clear
         this.clearSort()
       }
       this.currentFilterColumn &&
-        Object.keys(this.currentFilterColumn).forEach((key) => {
+        Object.keys(this.currentFilterColumn).forEach(key => {
           this.selectedFilter = {}
         })
       if (filter) {
         // ---- TODO: 未来版本将会去除这段代码,为了兼容老版本
-        Object.keys(filter).forEach((key) => {
+        Object.keys(filter).forEach(key => {
-          let column = this.columns.find((item) => item.key === key)
+          let column = this.columns.find(item => item.key === key)
           if (column && !column.filterMultiple) {
             if (filter[key].length) {
               filter[key] = filter[key][0]
@@ -618,7 +558,7 @@ export default {
       // TODO:测试功能 有远程 无远程 ，半有半无
     },
     clearSort () {
-      Object.keys(this.sortIndexs).forEach((key) => {
+      Object.keys(this.sortIndexs).forEach(key => {
         this.sortIndexs[key] = 0
       })
       this.currentSortColumn = null
@@ -681,9 +621,9 @@ export default {
         // this.scrollBarWidth = 5
       })
     },
-    onAllCheckboxesClick () {
+    onAllCheckboxesClick (currentPageAllSelect) {
-      this.showingData.forEach((item) => {
+      this.showingData.forEach(item => {
-        this.checkBoxes[item._index] = this.currentPageAllSelect
+        this.checkBoxes[item._index] = currentPageAllSelect
       })
       this.checkBoxes = [].concat(this.checkBoxes)
     },
@@ -710,7 +650,7 @@ export default {
       let keys = Object.keys(this.currentFilterColumn)
       currentFilterColumn = {}
 
-      keys.forEach((key) => {
+      keys.forEach(key => {
         let val = this.currentFilterColumn[key].value
         let filterFn = this.currentFilterColumn[key].filterFn
         if (filterFn === 'custom') {
@@ -728,7 +668,9 @@ export default {
       if (!this.currentSortColumn) {
         return null
       }
-      const isCustom = (this.currentSortColumn.sortable === 'custom' && this.currentSortColumn.type !== null)
+      const isCustom =
+        this.currentSortColumn.sortable === 'custom' &&
+        this.currentSortColumn.type !== null
       return isCustom ? this.currentSortColumn : null
     },
     useRemoteChange () {
@@ -737,6 +679,11 @@ export default {
       this.remoteTimter = setTimeout(() => {
         const currentFilterColumn = this.getCusomFilterData()
         const currentSortColumn = this.getCusomSorterData()
+        console.log(
+          'TCL: this.remoteTimter -> currentSortColumn',
+          currentSortColumn,
+          this.currentSortColumn
+        )
         const emitData = {
           filter: currentFilterColumn,
           sorter: currentSortColumn,
@@ -744,7 +691,7 @@ export default {
           search: this.currentSearchColumn
         }
         this.$emit('on-change', emitData)
-        this.onChange(emitData)
+        this.onChange && this.onChange(emitData)
       }, 300)
     },
     computeShowingData () {
@@ -755,10 +702,10 @@ export default {
         if (Object.keys(this.currentFilterColumn).length === 0) {
           this.searchData = []
         }
-        Object.keys(this.currentFilterColumn).forEach((key) => {
+        Object.keys(this.currentFilterColumn).forEach(key => {
           const { value, filterFn } = this.currentFilterColumn[key]
           if (value && filterFn !== 'custom') {
-            data = data.filter((item) => {
+            data = data.filter(item => {
               return filterFn(value, item.row)
             })
           }
@@ -767,7 +714,7 @@ export default {
       // compute search
       if (this.currentSearchColumn && this.search.onSearch !== 'custom') {
         const { key, word } = this.currentSearchColumn
-        data = data.filter((item) => {
+        data = data.filter(item => {
           return this.search.onSearch(key, word, item.row)
         })
       }
@@ -812,13 +759,6 @@ export default {
           })
         }
       }
-      if (type !== 0) {
-        Object.keys(this.sortIndexs).forEach((key) => {
-          if (key !== column.key) {
-            this.sortIndexs[key] = 0
-          }
-        })
-      }
       return data
     },
     onFilter (value, column) {
@@ -828,6 +768,11 @@ export default {
       this.$emit('on-filter-change', this.currentFilterColumn)
     },
     onSortTypeChange ({ i, sortable, key, type, column }) {
+      console.log(
+        'TCL: onSortTypeChange -> onSortTypeChange',
+        'onSortTypeChange'
+      )
+      this.$set(this.sortIndexs, key, type)
       this.currentSortColumn = {
         sortable,
         key,
@@ -835,7 +780,7 @@ export default {
         column,
         i
       }
-      if (this.onChange && sortable === 'custom') {
+      if (sortable === 'custom') {
         this.useRemoteChange()
       }
       this.$emit('on-sort-change', this.currentSortColumn)