From 5c647546223fa6b5cc8901af3fa05b42399a9361 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 22 Jul 2018 19:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=A4=BA=E4=BE=8B=E9=94=99?=
 =?UTF-8?q?=E4=B9=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 55509c807e43c9c9173906d9f6859ce7cd16a4dd [formerly 55509c807e43c9c9173906d9f6859ce7cd16a4dd [formerly 55509c807e43c9c9173906d9f6859ce7cd16a4dd [formerly 55509c807e43c9c9173906d9f6859ce7cd16a4dd [formerly bf3ccb939de81df011acbfd7416748259cd1583c [formerly ae7370ed3f65db3257495a8bd5f052eb9e095513]]]]]
Former-commit-id: 2a9bf374333363740328b54efb2425954f4d3235
Former-commit-id: f81df7d26b3ffcaf6a2c70af0c824ec5b884b811
Former-commit-id: f4f8ff4cb317a23e2c08b638dc9aca59f20429e8 [formerly cbbda628e9b1bed507046f926f4a6ce78492bd60]
Former-commit-id: 4b68663d61558131642ea27489ee12b3da3b6ded
Former-commit-id: 562364039d7156c5d96d61b85ec42bf25fef7db7
Former-commit-id: b9d640cba58769028f78b591095855b8cf6bb767
Former-commit-id: 72ede8b88b42b913d1d8453fdb546954561056f5
Former-commit-id: 6c87b7b7aa205f9adb6fd5825624b7195c6954aa
---
 package.json                                           |  1 +
 .../element/data-table/components/table1/index.vue     |  1 +
 .../element/data-table/components/table10/index.vue    |  1 +
 .../element/data-table/components/table11/index.vue    |  1 +
 .../element/data-table/components/table12/index.vue    |  1 +
 .../element/data-table/components/table13/index.vue    |  1 +
 .../element/data-table/components/table14/index.vue    |  1 +
 .../element/data-table/components/table15/index.vue    |  1 +
 .../element/data-table/components/table16/index.vue    |  1 +
 .../element/data-table/components/table17/index.vue    |  1 +
 .../element/data-table/components/table18/index.vue    |  1 +
 .../element/data-table/components/table2/index.vue     |  1 +
 .../element/data-table/components/table3/index.vue     |  1 +
 .../element/data-table/components/table4/index.vue     |  1 +
 .../element/data-table/components/table5/index.vue     |  1 +
 .../element/data-table/components/table6/index.vue     |  1 +
 .../element/data-table/components/table7/index.vue     |  1 +
 .../element/data-table/components/table8/index.vue     |  1 +
 .../element/data-table/components/table9/index.vue     |  1 +
 src/pages/demo/element/data-table/index.vue            | 10 +++++++---
 20 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0d95ce64..e03f8427 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
+    "lodash.sortby": "^4.7.0",
     "lodash.uniqueid": "^4.0.1",
     "lowdb": "^1.0.0",
     "marked": "^0.3.9",
diff --git a/src/pages/demo/element/data-table/components/table1/index.vue b/src/pages/demo/element/data-table/components/table1/index.vue
index 1df759b4..8dea0858 100644
--- a/src/pages/demo/element/data-table/components/table1/index.vue
+++ b/src/pages/demo/element/data-table/components/table1/index.vue
@@ -22,6 +22,7 @@
 <script>
 export default {
   title: '基础表格',
+  index: 1,
   data () {
     return {
       tableData: [
diff --git a/src/pages/demo/element/data-table/components/table10/index.vue b/src/pages/demo/element/data-table/components/table10/index.vue
index 70ad801d..509f37c6 100644
--- a/src/pages/demo/element/data-table/components/table10/index.vue
+++ b/src/pages/demo/element/data-table/components/table10/index.vue
@@ -35,6 +35,7 @@
 <script>
 export default {
   title: '单选',
+  index: 10,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table11/index.vue b/src/pages/demo/element/data-table/components/table11/index.vue
index 478ab38e..2c557fc2 100644
--- a/src/pages/demo/element/data-table/components/table11/index.vue
+++ b/src/pages/demo/element/data-table/components/table11/index.vue
@@ -36,6 +36,7 @@
 <script>
 export default {
   title: '多选',
+  index: 11,
   data () {
     return {
       tableData3: [{
diff --git a/src/pages/demo/element/data-table/components/table12/index.vue b/src/pages/demo/element/data-table/components/table12/index.vue
index 6a3430dc..3c45fa46 100644
--- a/src/pages/demo/element/data-table/components/table12/index.vue
+++ b/src/pages/demo/element/data-table/components/table12/index.vue
@@ -27,6 +27,7 @@
 <script>
 export default {
   title: '排序',
+  index: 12,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table13/index.vue b/src/pages/demo/element/data-table/components/table13/index.vue
index 79557c90..eaf9b07b 100644
--- a/src/pages/demo/element/data-table/components/table13/index.vue
+++ b/src/pages/demo/element/data-table/components/table13/index.vue
@@ -40,6 +40,7 @@
 <script>
 export default {
   title: '筛选',
+  index: 13,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table14/index.vue b/src/pages/demo/element/data-table/components/table14/index.vue
index 2dfc6b24..91614ccd 100644
--- a/src/pages/demo/element/data-table/components/table14/index.vue
+++ b/src/pages/demo/element/data-table/components/table14/index.vue
@@ -40,6 +40,7 @@
 <script>
 export default {
   title: '自定义列模板',
+  index: 14,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table15/index.vue b/src/pages/demo/element/data-table/components/table15/index.vue
index eb824784..9be2a73d 100644
--- a/src/pages/demo/element/data-table/components/table15/index.vue
+++ b/src/pages/demo/element/data-table/components/table15/index.vue
@@ -47,6 +47,7 @@
 <script>
 export default {
   title: '展开行',
+  index: 15,
   data () {
     return {
       tableData5: [{
diff --git a/src/pages/demo/element/data-table/components/table16/index.vue b/src/pages/demo/element/data-table/components/table16/index.vue
index d02f904e..6bcea96d 100644
--- a/src/pages/demo/element/data-table/components/table16/index.vue
+++ b/src/pages/demo/element/data-table/components/table16/index.vue
@@ -65,6 +65,7 @@
 <script>
 export default {
   title: '表尾合计行',
+  index: 16,
   data () {
     return {
       tableData6: [{
diff --git a/src/pages/demo/element/data-table/components/table17/index.vue b/src/pages/demo/element/data-table/components/table17/index.vue
index 9042af9a..3427e2e5 100644
--- a/src/pages/demo/element/data-table/components/table17/index.vue
+++ b/src/pages/demo/element/data-table/components/table17/index.vue
@@ -64,6 +64,7 @@
 <script>
 export default {
   title: '合并行或列',
+  index: 17,
   data () {
     return {
       tableData6: [{
diff --git a/src/pages/demo/element/data-table/components/table18/index.vue b/src/pages/demo/element/data-table/components/table18/index.vue
index 41f7c4b5..de4e644f 100644
--- a/src/pages/demo/element/data-table/components/table18/index.vue
+++ b/src/pages/demo/element/data-table/components/table18/index.vue
@@ -26,6 +26,7 @@
 <script>
 export default {
   title: '自定义索引',
+  index: 18,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table2/index.vue b/src/pages/demo/element/data-table/components/table2/index.vue
index 8bea5304..fc8286eb 100644
--- a/src/pages/demo/element/data-table/components/table2/index.vue
+++ b/src/pages/demo/element/data-table/components/table2/index.vue
@@ -23,6 +23,7 @@
 <script>
 export default {
   title: '带斑马纹表格',
+  index: 2,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table3/index.vue b/src/pages/demo/element/data-table/components/table3/index.vue
index fa202a85..f646695e 100644
--- a/src/pages/demo/element/data-table/components/table3/index.vue
+++ b/src/pages/demo/element/data-table/components/table3/index.vue
@@ -23,6 +23,7 @@
 <script>
 export default {
   title: '带边框表格',
+  index: 3,
   data () {
     return {
       tableData: [{
diff --git a/src/pages/demo/element/data-table/components/table4/index.vue b/src/pages/demo/element/data-table/components/table4/index.vue
index 5e5c73a1..32f04b01 100644
--- a/src/pages/demo/element/data-table/components/table4/index.vue
+++ b/src/pages/demo/element/data-table/components/table4/index.vue
@@ -23,6 +23,7 @@
 <script>
 export default {
   title: '带状态表格',
+  index: 4,
   methods: {
     tableRowClassName ({row, rowIndex}) {
       if (rowIndex === 1) {
diff --git a/src/pages/demo/element/data-table/components/table5/index.vue b/src/pages/demo/element/data-table/components/table5/index.vue
index 0383fbf1..54e2d1cc 100644
--- a/src/pages/demo/element/data-table/components/table5/index.vue
+++ b/src/pages/demo/element/data-table/components/table5/index.vue
@@ -24,6 +24,7 @@
 <script>
 export default {
   title: '固定表头',
+  index: 5,
   data () {
     return {
       tableData3: [{
diff --git a/src/pages/demo/element/data-table/components/table6/index.vue b/src/pages/demo/element/data-table/components/table6/index.vue
index 9a8ed428..5bc8951a 100644
--- a/src/pages/demo/element/data-table/components/table6/index.vue
+++ b/src/pages/demo/element/data-table/components/table6/index.vue
@@ -49,6 +49,7 @@
 <script>
 export default {
   title: '固定列',
+  index: 6,
   methods: {
     handleClick (row) {
       console.log(row)
diff --git a/src/pages/demo/element/data-table/components/table7/index.vue b/src/pages/demo/element/data-table/components/table7/index.vue
index fea3657d..d9677254 100644
--- a/src/pages/demo/element/data-table/components/table7/index.vue
+++ b/src/pages/demo/element/data-table/components/table7/index.vue
@@ -40,6 +40,7 @@
 <script>
 export default {
   title: '固定列和表头',
+  index: 7,
   data () {
     return {
       tableData3: [{
diff --git a/src/pages/demo/element/data-table/components/table8/index.vue b/src/pages/demo/element/data-table/components/table8/index.vue
index d958e009..1a7d523a 100644
--- a/src/pages/demo/element/data-table/components/table8/index.vue
+++ b/src/pages/demo/element/data-table/components/table8/index.vue
@@ -53,6 +53,7 @@
 <script>
 export default {
   title: '流体高度',
+  index: 8,
   methods: {
     deleteRow (index, rows) {
       rows.splice(index, 1)
diff --git a/src/pages/demo/element/data-table/components/table9/index.vue b/src/pages/demo/element/data-table/components/table9/index.vue
index 1a11a278..8a6e3b0f 100644
--- a/src/pages/demo/element/data-table/components/table9/index.vue
+++ b/src/pages/demo/element/data-table/components/table9/index.vue
@@ -42,6 +42,7 @@
 <script>
 export default {
   title: '多级表头',
+  index: 9,
   data () {
     return {
       tableData3: [{
diff --git a/src/pages/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
index e41ec8ef..c5a3c178 100644
--- a/src/pages/demo/element/data-table/index.vue
+++ b/src/pages/demo/element/data-table/index.vue
@@ -15,14 +15,18 @@
 </template>
 
 <script>
+import sortby from 'lodash.sortby'
 const req = context => context.keys().map(context)
 const tables = req(require.context('./components', true, /\.vue$/))
 const components = {}
 const tableList = []
-tables.forEach((table, index) => {
-  components[`d2-demo-el-table-${index + 1}`] = table.default
+sortby(tables.map(e => ({
+  component: e.default,
+  index: e.default.index
+})), ['index']).forEach((table, index) => {
+  components[`d2-demo-el-table-${index + 1}`] = table.component
   tableList.push({
-    title: table.default.title,
+    title: table.component.title,
     component: `d2-demo-el-table-${index + 1}`
   })
 })