From 43339fee20a33eb26d2939619a5f03462bf5bed4 Mon Sep 17 00:00:00 2001 From: hooray <304327508@qq.com> Date: Wed, 21 Oct 2020 02:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImagePreview/index.vue | 7 +- src/components/PageHeader/index.vue | 9 +- src/components/PageMain/index.vue | 18 +++- src/components/Result/index.vue | 2 +- src/components/Time/index.vue | 96 ------------------- src/router/modules/component.example.js | 16 ++-- src/views/component_example/actionbar.vue | 82 ++++++++++++++++ src/views/component_example/area.vue | 1 + .../component_example/batchactionbar.vue | 6 ++ src/views/component_example/image.preview.vue | 3 +- src/views/component_example/pageheader.vue | 9 +- src/views/component_example/pagemain.vue | 23 ++++- src/views/component_example/result.vue | 4 +- src/views/component_example/searchbar.vue | 60 +++++++++++- .../component_example/table.autoheight.vue | 2 +- src/views/component_example/trend.vue | 62 +++++++----- src/views/component_example/upload.vue | 10 +- 17 files changed, 259 insertions(+), 151 deletions(-) delete mode 100644 src/components/Time/index.vue diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index 5a193c24..5374950e 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -1,13 +1,10 @@ @@ -55,7 +52,7 @@ export default { transition: all 0.3s; cursor: pointer; &:hover { - transform: scale(1.2) rotateZ(-10deg); + transform: scale(1.2); } } ::v-deep .image-slot { diff --git a/src/components/PageHeader/index.vue b/src/components/PageHeader/index.vue index cc4e2bea..a26df720 100644 --- a/src/components/PageHeader/index.vue +++ b/src/components/PageHeader/index.vue @@ -2,9 +2,11 @@
{{ title }}
-
{{ content }}
+
+ {{ content }} +
-
+
@@ -42,6 +44,9 @@ export default { color: #909399; font-size: 14px; margin-top: 10px; + &:empty { + display: none; + } } } diff --git a/src/components/PageMain/index.vue b/src/components/PageMain/index.vue index a0f7146b..7a68311d 100644 --- a/src/components/PageMain/index.vue +++ b/src/components/PageMain/index.vue @@ -1,19 +1,35 @@ diff --git a/src/components/Result/index.vue b/src/components/Result/index.vue index fe8236d5..bff30e1f 100644 --- a/src/components/Result/index.vue +++ b/src/components/Result/index.vue @@ -47,7 +47,7 @@ $warning: #e6a23c; $error: #f56c6c; .result { width: 72%; - margin: 0 auto; + margin: 20px auto 0; text-align: center; .icon { i { diff --git a/src/components/Time/index.vue b/src/components/Time/index.vue deleted file mode 100644 index e547ed7c..00000000 --- a/src/components/Time/index.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - diff --git a/src/router/modules/component.example.js b/src/router/modules/component.example.js index b91fc967..a2b8adbe 100644 --- a/src/router/modules/component.example.js +++ b/src/router/modules/component.example.js @@ -10,14 +10,6 @@ export default { icon: 'sidebar-component' }, children: [ - { - path: 'pagemain', - name: 'componentExamplePagemain', - component: () => import(/* webpackChunkName: 'component_example' */ '@/views/component_example/pagemain'), - meta: { - title: '空白页' - } - }, { path: 'pageheader', name: 'componentExamplePageheader', @@ -26,6 +18,14 @@ export default { title: '页头' } }, + { + path: 'pagemain', + name: 'componentExamplePagemain', + component: () => import(/* webpackChunkName: 'component_example' */ '@/views/component_example/pagemain'), + meta: { + title: '内容块' + } + }, { path: 'editor', name: 'componentExampleEditor', diff --git a/src/views/component_example/actionbar.vue b/src/views/component_example/actionbar.vue index db107d3e..0c80d11c 100644 --- a/src/views/component_example/actionbar.vue +++ b/src/views/component_example/actionbar.vue @@ -1,5 +1,11 @@