From 4bb34221487169abe5da5dc3f4d192535c6a8069 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 22 Jul 2018 18:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E7=A4=BA?=
=?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: dd9ec5144e4c4668498c42327126c9cd2ff9590a [formerly dd9ec5144e4c4668498c42327126c9cd2ff9590a [formerly dd9ec5144e4c4668498c42327126c9cd2ff9590a [formerly dd9ec5144e4c4668498c42327126c9cd2ff9590a [formerly 096c7586394466fcfa6aeef76f941c65b6c58cb3 [formerly 6ea50546558bb7a5f54d99d34301d3fbae8beea4]]]]]
Former-commit-id: 4909868f8dac1be92c76feda0bc3c4a51f8221ca
Former-commit-id: 7bcf816a13380e5e1823ef3d8a0050fa95842c73
Former-commit-id: cea58af19fb83f6e4f61a7cc95e999706784a7f2 [formerly 881c7fe80386e4bbd6bdd323eb873c98e7894941]
Former-commit-id: edf39aef375f7ecf4d07951f57b8a92baab4ee37
Former-commit-id: 829a819ac72421f791a5cf5a4d62b7a860e7648b
Former-commit-id: e3da2e3e4a6f41a5a712760729560efdcf551a3f
Former-commit-id: 57e8f1b908c2578a985798a6672a650b9dc53c0c
Former-commit-id: 9667afc9b61cdbc5c624a07ee92b4156d0470582
---
docs/zh/guide/change-log.md | 2 +
docs/zh/others/css.md | 6 +-
.../style/theme/theme.scss.REMOVED.git-id | 2 +-
.../container/components/d2-demo-article.vue | 1 -
.../data-table/components/table1/index.vue | 49 +++++++
.../data-table/components/table10/index.vue | 69 +++++++++
.../data-table/components/table11/index.vue | 88 ++++++++++++
.../data-table/components/table12/index.vue | 57 ++++++++
.../data-table/components/table13/index.vue | 81 +++++++++++
.../data-table/components/table14/index.vue | 73 ++++++++++
.../data-table/components/table15/index.vue | 103 ++++++++++++++
.../data-table/components/table16/index.vue | 131 ++++++++++++++++++
.../data-table/components/table17/index.vue | 129 +++++++++++++++++
.../data-table/components/table18/index.vue | 72 ++++++++++
.../data-table/components/table2/index.vue | 48 +++++++
.../data-table/components/table3/index.vue | 48 +++++++
.../data-table/components/table4/index.vue | 67 +++++++++
.../data-table/components/table5/index.vue | 61 ++++++++
.../data-table/components/table6/index.vue | 91 ++++++++++++
.../data-table/components/table7/index.vue | 98 +++++++++++++
.../data-table/components/table8/index.vue | 116 ++++++++++++++++
.../data-table/components/table9/index.vue | 100 +++++++++++++
src/pages/demo/element/data-table/index.vue | 61 +++-----
23 files changed, 1509 insertions(+), 44 deletions(-)
create mode 100644 src/pages/demo/element/data-table/components/table1/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table10/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table11/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table12/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table13/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table14/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table15/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table16/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table17/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table18/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table2/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table3/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table4/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table5/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table6/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table7/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table8/index.vue
create mode 100644 src/pages/demo/element/data-table/components/table9/index.vue
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 6faf657f..ad758b71 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -24,6 +24,8 @@
* [ 新增 ] 持久化存储根据系统版本区分数据,防止因更新导致数据错乱
* [ 修改 ] token 和 uuid 读写删规范化,保存的时候增加版本号区分
* [ 新增 ] 注销画面灰度效果
+* [ 新增 ] .d2-card 样式类,可以让 el-card 具有跟随主题变化的样式
+* [ 新增 ] ElementUI 表格组件全部示例移植
## v1.1.4
diff --git a/docs/zh/others/css.md b/docs/zh/others/css.md
index 8e5ff929..1ca48b9a 100644
--- a/docs/zh/others/css.md
+++ b/docs/zh/others/css.md
@@ -9,7 +9,11 @@
`.d2-card` 示例
``` vue
-
+
+ header
+ body
+
+
```
## 文字
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index 1f2b5ba2..2ea44f9c 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-d7807eecc7082d138c70f222eb3834c6ad63c366
\ No newline at end of file
+4de0cf35d6c48da3ab573596be724d71292d8440
\ No newline at end of file
diff --git a/src/pages/demo/components/container/components/d2-demo-article.vue b/src/pages/demo/components/container/components/d2-demo-article.vue
index 1d77d8fc..45a0ed6e 100644
--- a/src/pages/demo/components/container/components/d2-demo-article.vue
+++ b/src/pages/demo/components/container/components/d2-demo-article.vue
@@ -35,4 +35,3 @@ export default {
background-color: #f4f4f5;
}
-
diff --git a/src/pages/demo/element/data-table/components/table1/index.vue b/src/pages/demo/element/data-table/components/table1/index.vue
new file mode 100644
index 00000000..1df759b4
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table1/index.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table10/index.vue b/src/pages/demo/element/data-table/components/table10/index.vue
new file mode 100644
index 00000000..70ad801d
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table10/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选中第二行
+ 取消选择
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table11/index.vue b/src/pages/demo/element/data-table/components/table11/index.vue
new file mode 100644
index 00000000..478ab38e
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table11/index.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+
+ 切换第二、第三行的选中状态
+ 取消选择
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table12/index.vue b/src/pages/demo/element/data-table/components/table12/index.vue
new file mode 100644
index 00000000..6a3430dc
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table12/index.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table13/index.vue b/src/pages/demo/element/data-table/components/table13/index.vue
new file mode 100644
index 00000000..79557c90
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table13/index.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.tag}}
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table14/index.vue b/src/pages/demo/element/data-table/components/table14/index.vue
new file mode 100644
index 00000000..2dfc6b24
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table14/index.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+ 姓名: {{ scope.row.name }}
+ 住址: {{ scope.row.address }}
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table15/index.vue b/src/pages/demo/element/data-table/components/table15/index.vue
new file mode 100644
index 00000000..eb824784
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table15/index.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+ {{ props.row.name }}
+
+
+ {{ props.row.shop }}
+
+
+ {{ props.row.id }}
+
+
+ {{ props.row.shopId }}
+
+
+ {{ props.row.category }}
+
+
+ {{ props.row.address }}
+
+
+ {{ props.row.desc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table16/index.vue b/src/pages/demo/element/data-table/components/table16/index.vue
new file mode 100644
index 00000000..d02f904e
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table16/index.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table17/index.vue b/src/pages/demo/element/data-table/components/table17/index.vue
new file mode 100644
index 00000000..9042af9a
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table17/index.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table18/index.vue b/src/pages/demo/element/data-table/components/table18/index.vue
new file mode 100644
index 00000000..41f7c4b5
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table18/index.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table2/index.vue b/src/pages/demo/element/data-table/components/table2/index.vue
new file mode 100644
index 00000000..8bea5304
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table2/index.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table3/index.vue b/src/pages/demo/element/data-table/components/table3/index.vue
new file mode 100644
index 00000000..fa202a85
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table3/index.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table4/index.vue b/src/pages/demo/element/data-table/components/table4/index.vue
new file mode 100644
index 00000000..5e5c73a1
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table4/index.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table5/index.vue b/src/pages/demo/element/data-table/components/table5/index.vue
new file mode 100644
index 00000000..0383fbf1
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table5/index.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table6/index.vue b/src/pages/demo/element/data-table/components/table6/index.vue
new file mode 100644
index 00000000..9a8ed428
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table6/index.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table7/index.vue b/src/pages/demo/element/data-table/components/table7/index.vue
new file mode 100644
index 00000000..fea3657d
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table7/index.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table8/index.vue b/src/pages/demo/element/data-table/components/table8/index.vue
new file mode 100644
index 00000000..d958e009
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table8/index.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/components/table9/index.vue b/src/pages/demo/element/data-table/components/table9/index.vue
new file mode 100644
index 00000000..1a11a278
--- /dev/null
+++ b/src/pages/demo/element/data-table/components/table9/index.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
index 9ea11691..e41ec8ef 100644
--- a/src/pages/demo/element/data-table/index.vue
+++ b/src/pages/demo/element/data-table/index.vue
@@ -2,56 +2,35 @@
表格组件
-
-
- 基础用法
-
-
-
-
-
-
-
-
+
+ {{table.title}}
+
-