From 062799609e57b17d56fa3fa3a8fd856f8806c75f Mon Sep 17 00:00:00 2001
From: JiwenBai <jiwen.bai@tusimple.ai>
Date: Thu, 25 Jul 2019 11:14:36 +0800
Subject: [PATCH 1/2] fix(advance-table): -webkit-scrollbar:horizontal
 height,async data and use default order

---
 .vscode/settings.json                     |  0
 demo/components/advanceTableDemo.vue      | 34 ++++++++------
 packages/common/AdvanceTable/src/main.vue | 56 +++++++++--------------
 styles/AdvancedTable.scss                 | 17 ++++---
 4 files changed, 52 insertions(+), 55 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/demo/components/advanceTableDemo.vue b/demo/components/advanceTableDemo.vue
index 15b74aa98..cedb77249 100644
--- a/demo/components/advanceTableDemo.vue
+++ b/demo/components/advanceTableDemo.vue
@@ -98,7 +98,8 @@ export default {
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px" // maxheight will fix header
@@ -205,7 +206,8 @@ export default {
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -306,7 +308,8 @@ export default {
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -403,11 +406,12 @@ export default {
             :data="data"
             max-height="300px"
             :on-change="onChange"
-            :pagination="{total:data.length,limit:10}"
+            :pagination="{ total: data.length, limit: 10 }"
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -507,11 +511,12 @@ export default {
             :data="data"
             max-height="300px"
             :on-change="onChange"
-            :pagination="{total:data.length,limit:10,custom:true}"
+            :pagination="{ total: data.length, limit: 10, custom: true }"
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -563,11 +568,12 @@ export default {
             max-height="300px"
             :on-change="onChange"
             :search="search"
-            :pagination="{total:data.length,limit:10}"
+            :pagination="{ total: data.length, limit: 10 }"
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -621,11 +627,12 @@ export default {
             max-height="300px"
             :on-change="onChange"
             :search="search1"
-            :pagination="{total:data.length,limit:10}"
+            :pagination="{ total: data.length, limit: 10 }"
           />
         </div>
         <div class="n-doc-section__source">
-          <textarea><n-advance-table
+          <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
@@ -677,11 +684,12 @@ export default {
               max-height="300px"
               :on-change="onChange1"
               :search="search"
-              :pagination="{total:data.length,limit:10}"
+              :pagination="{ total: data.length, limit: 10 }"
             />
           </div>
           <div class="n-doc-section__source">
-            <textarea><n-advance-table
+            <textarea>
+<n-advance-table
   :columns="columns"
   :data="data"
   max-height="300px"
diff --git a/packages/common/AdvanceTable/src/main.vue b/packages/common/AdvanceTable/src/main.vue
index 03aafe324..3ec6fcac9 100644
--- a/packages/common/AdvanceTable/src/main.vue
+++ b/packages/common/AdvanceTable/src/main.vue
@@ -1,17 +1,13 @@
 <template>
-  <div
-    ref="tableWrapper"
-    class="n-advance-tabel__wrapper"
-  >
+  <div ref="tableWrapper"
+class="n-advance-tabel__wrapper">
     <div class="n-advance-table__operation">
       <section class="n-advance-table__operation__bacth" />
       <div class="n-advance-table__operation__custom">
         <slot name="table-operation" />
       </div>
-      <div
-        v-if="search"
-        class="n-advance-table__operation__search"
-      >
+      <div v-if="search"
+class="n-advance-table__operation__search">
         <searchInput
           ref="search"
           style=" margin-bottom: 18px;"
@@ -31,21 +27,17 @@
           :key="i"
           :style="computeCustomWidthStl(column)"
         >
-        <col
-          v-if="scrollBarWidth"
-          :width="scrollBarWidth"
-        >
+        <col v-if="scrollBarWidth"
+:width="scrollBarWidth" >
       </colgroup>
       <n-thead>
         <n-tr>
-          <n-th
-            v-for="(column, i) in columns"
-            :key="column.key"
-          >
+          <n-th v-for="(column, i) in columns"
+:key="column.key">
             {{ column.title }}
             <SortIcon
               v-if="column.sortable"
-              v-model="sortIndexs[(column.key || i) ]"
+              v-model="sortIndexs[column.key || i]"
               @onSortTypeChange="
                 type =>
                   onSortTypeChange({
@@ -68,7 +60,9 @@
               :filter-key="column.key || i"
               :filter-items="column.filterItems"
               :filter-multiple="column.filterMultiple || false"
-              @on-filter="({value,key,filterFn}) => onFilter(value,key, filterFn)"
+              @on-filter="
+                ({ value, key, filterFn }) => onFilter(value, key, filterFn)
+              "
             />
           </n-th>
           <span
@@ -95,14 +89,10 @@
         >
       </colgroup>
       <n-tbody>
-        <n-tr
-          v-for="(rowData, i) in showingData"
-          :key="i"
-        >
-          <n-td
-            v-for="column in columns"
-            :key="column.key"
-          >
+        <n-tr v-for="(rowData, i) in showingData"
+:key="i">
+          <n-td v-for="column in columns"
+:key="column.key">
             <row
               :index="i"
               :row="rowData"
@@ -111,10 +101,8 @@
             />
           </n-td>
         </n-tr>
-        <div
-          v-if="showingData.length === 0"
-          class="n-no-data-tip"
-        >
+        <div v-if="showingData.length === 0"
+class="n-no-data-tip">
           No data
         </div>
       </n-tbody>
@@ -124,10 +112,8 @@
       v-if="pagination !== false && showingData.length"
       class="n-advanced-table__pagination"
     >
-      <n-pagination
-        v-model="currentPage"
-        :page-count="pageCount"
-      />
+      <n-pagination v-model="currentPage"
+:page-count="pageCount" />
     </div>
   </div>
 </template>
@@ -474,7 +460,7 @@ export default {
       let { sortable, key, type, column } = this.currentSortColumn
       // use remote sort
       if (sortable === true) {
-        if (!this.searchDataNoSort) {
+        if (!this.searchDataNoSort && this.data.length !== 0) {
           this.searchDataNoSort = data.slice(0)
         }
         if (type === 0) {
diff --git a/styles/AdvancedTable.scss b/styles/AdvancedTable.scss
index 03f29850c..13c94b8bf 100644
--- a/styles/AdvancedTable.scss
+++ b/styles/AdvancedTable.scss
@@ -19,14 +19,17 @@
       background: transparent;
     }
     &::-webkit-scrollbar-thumb {
-      background: rgba(255,255,255,0.2);
+      background: rgba(255, 255, 255, 0.2);
       border-radius: 2.5px;
     }
     &::-webkit-scrollbar-thumb:hover {
-      background: rgba(255,255,255,0.3);
+      background: rgba(255, 255, 255, 0.3);
     }
-    &::-webkit-scrollbar-corner{
-      background: transparent
+    &::-webkit-scrollbar-corner {
+      background: transparent;
+    }
+    &::-webkit-scrollbar:horizontal {
+      height: 5px;
     }
     table thead tr th:last-of-type {
       padding-left: 32px;
@@ -37,14 +40,14 @@
     display: flex;
     justify-content: flex-end;
   }
-  .n-advance-table__operation{
+  .n-advance-table__operation {
     display: flex;
     justify-content: space-between;
   }
-  .n-no-data-tip{
+  .n-no-data-tip {
     padding: 5px;
     text-align: center;
     width: 100%;
     display: table-cell;
   }
-}
\ No newline at end of file
+}

From d5befae3a383c7514b9ca471ca8631c9ca4415a3 Mon Sep 17 00:00:00 2001
From: JiwenBai <jiwen.bai@tusimple.ai>
Date: Thu, 25 Jul 2019 11:30:16 +0800
Subject: [PATCH 2/2] feat(advance-table): add minHeight props

---
 package.json                              |  2 +-
 packages/common/AdvanceTable/src/main.vue | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c860a52fc..1cb298c39 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/common/AdvanceTable/src/main.vue b/packages/common/AdvanceTable/src/main.vue
index 3ec6fcac9..4a5d9a81c 100644
--- a/packages/common/AdvanceTable/src/main.vue
+++ b/packages/common/AdvanceTable/src/main.vue
@@ -166,6 +166,10 @@ export default {
       type: Function,
       default: null
     },
+    minHeight: {
+      type: [Number, String],
+      default: 'unset'
+    },
     maxHeight: {
       type: [Number, String],
       default: 'auto'
@@ -261,6 +265,12 @@ export default {
             ? this.maxWidth + 'px'
             : this.maxWidth
       }
+      if (this.minHeight !== 'unset') {
+        stl.minHeight =
+          typeof this.minHeight === 'number'
+            ? this.minHeight + 'px'
+            : this.minHeight
+      }
       return stl
     },
     colGroup () {