From e8b34bbc0d64a3c03cbdfae35852cfa076b4120d Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 1 Nov 2017 11:26:57 +0800
Subject: [PATCH] refactor:update element-ui
---
package.json | 2 +-
.../Tinymce/components/editorImage.vue | 33 ++++++++-----------
src/views/errorPage/401.vue | 2 +-
src/views/example/tab/components/tabPane.vue | 2 +-
src/views/example/tab/index.vue | 2 +-
src/views/example/table/complexTable.vue | 4 +--
src/views/example/table/dragTable.vue | 2 +-
src/views/example/table/inlineEditTable.vue | 2 +-
src/views/theme/index.vue | 17 ++++------
9 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/package.json b/package.json
index d5fe3773..8008adde 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"codemirror": "5.31.0",
"dropzone": "5.2.0",
"echarts": "3.7.2",
- "element-ui": "2.0.1",
+ "element-ui": "2.0.2",
"file-saver": "1.3.3",
"font-awesome": "4.7.0",
"js-cookie": "2.2.0",
diff --git a/src/components/Tinymce/components/editorImage.vue b/src/components/Tinymce/components/editorImage.vue
index f390c134..b0347cf8 100644
--- a/src/components/Tinymce/components/editorImage.vue
+++ b/src/components/Tinymce/components/editorImage.vue
@@ -1,25 +1,18 @@
<template>
- <div class="upload-container">
- <el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">ä¸Šä¼ å›¾ç‰‡
- </el-button>
- <el-dialog v-model="dialogVisible">
- <el-upload
- class="editor-slide-upload"
- action="https://httpbin.org/post"
- :multiple="true"
- :file-list="fileList"
- :show-file-list="true"
- list-type="picture-card"
- :on-remove="handleRemove"
- :on-success="handleSuccess"
- :before-upload="beforeUpload">
- <el-button size="small" type="primary">ç‚¹å‡»ä¸Šä¼ </el-button>
- </el-upload>
- <el-button @click="dialogVisible = false">å– æ¶ˆ</el-button>
- <el-button type="primary" @click="handleSubmit">确 定</el-button>
- </el-dialog>
- </div>
+ <div class="upload-container">
+ <el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">ä¸Šä¼ å›¾ç‰‡
+ </el-button>
+ <el-dialog :visible.sync="dialogVisible">
+ <el-upload class="editor-slide-upload" action="https://httpbin.org/post" :multiple="true" :file-list="fileList" :show-file-list="true"
+ list-type="picture-card" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="beforeUpload">
+ <el-button size="small" type="primary">ç‚¹å‡»ä¸Šä¼ </el-button>
+ </el-upload>
+ <el-button @click="dialogVisible = false">å– æ¶ˆ</el-button>
+ <el-button type="primary" @click="handleSubmit">确 定</el-button>
+ </el-dialog>
+ </div>
</template>
+
<script>
// import { getToken } from 'api/qiniu'
diff --git a/src/views/errorPage/401.vue b/src/views/errorPage/401.vue
index 4f73b04e..e36c83a2 100644
--- a/src/views/errorPage/401.vue
+++ b/src/views/errorPage/401.vue
@@ -20,7 +20,7 @@
<img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
</el-col>
</el-row>
- <el-dialog title="éšä¾¿çœ‹" :visible.sync="dialogVisible" size="large">
+ <el-dialog title="éšä¾¿çœ‹" :visible.sync="dialogVisible">
<img class="pan-img" :src="ewizardClap">
</el-dialog>
</div>
diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue
index 8c9eb67e..aee689a7 100644
--- a/src/views/example/tab/components/tabPane.vue
+++ b/src/views/example/tab/components/tabPane.vue
@@ -74,7 +74,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
- draft: 'gray',
+ draft: 'info',
deleted: 'danger'
}
return statusMap[status]
diff --git a/src/views/example/tab/index.vue b/src/views/example/tab/index.vue
index 5bebb96b..3e6a601f 100644
--- a/src/views/example/tab/index.vue
+++ b/src/views/example/tab/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="tab-container">
- <el-tag type="primary">mounted times ：{{createdTimes}}</el-tag>
+ <el-tag>mounted times ：{{createdTimes}}</el-tag>
<el-tabs style='margin-top:15px;' v-model="activeName" type="border-card">
<el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key">
<keep-alive>
diff --git a/src/views/example/table/complexTable.vue b/src/views/example/table/complexTable.vue
index 8e11d4c2..5ee5b858 100644
--- a/src/views/example/table/complexTable.vue
+++ b/src/views/example/table/complexTable.vue
@@ -136,7 +136,7 @@
</div>
</el-dialog>
- <el-dialog title="阅读数统计" :visible.sync="dialogPvVisible" size="small">
+ <el-dialog title="阅读数统计" :visible.sync="dialogPvVisible">
<el-table :data="pvData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="key" label="æ¸ é“"> </el-table-column>
<el-table-column prop="pv" label="pv"> </el-table-column>
@@ -214,7 +214,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
- draft: 'gray',
+ draft: 'info',
deleted: 'danger'
}
return statusMap[status]
diff --git a/src/views/example/table/dragTable.vue b/src/views/example/table/dragTable.vue
index 0911e719..73d3ad57 100644
--- a/src/views/example/table/dragTable.vue
+++ b/src/views/example/table/dragTable.vue
@@ -83,7 +83,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
- draft: 'gray',
+ draft: 'info',
deleted: 'danger'
}
return statusMap[status]
diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue
index 687a5110..d6db4d96 100644
--- a/src/views/example/table/inlineEditTable.vue
+++ b/src/views/example/table/inlineEditTable.vue
@@ -69,7 +69,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
- draft: 'gray',
+ draft: 'info',
deleted: 'danger'
}
return statusMap[status]
diff --git a/src/views/theme/index.vue b/src/views/theme/index.vue
index abbfee76..d9627ad1 100644
--- a/src/views/theme/index.vue
+++ b/src/views/theme/index.vue
@@ -7,8 +7,7 @@
</div>
<div class="box-item">
<span class="field-label">æ¢è‚¤:</span>
- <el-switch v-model="theme" on-text="" off-text="">
- </el-switch>
+ <el-switch v-model="theme"></el-switch>
</div>
</el-card>
@@ -19,7 +18,7 @@
<el-button type="warning">è¦å‘ŠæŒ‰é’®</el-button>
<el-button type="danger">å±é™©æŒ‰é’®</el-button>
<el-button type="info">ä¿¡æ¯æŒ‰é’®</el-button>
- </span>
+ </span>
</div>
<div class="block">
@@ -42,7 +41,6 @@
</div>
</template>
-
<script>
import { toggleClass } from '@/utils'
// import '@/assets/custom-theme/index.css' // æ¢è‚¤ç‰ˆæœ¬element-ui css
@@ -53,12 +51,11 @@ export default {
return {
theme: false,
tags: [
- { name: 'æ ‡ç¾ä¸€', type: '' },
- { name: 'æ ‡ç¾äºŒ', type: 'gray' },
- { name: 'æ ‡ç¾ä¸‰', type: 'primary' },
- { name: 'æ ‡ç¾å››', type: 'success' },
- { name: 'æ ‡ç¾äº”', type: 'warning' },
- { name: 'æ ‡ç¾å…', type: 'danger' }
+ { name: 'Tag One', type: '' },
+ { name: 'Tag Two', type: 'info' },
+ { name: 'Tag Three', type: 'success' },
+ { name: 'Tag Four', type: 'warning' },
+ { name: 'Tag Five', type: 'danger' }
]
}
},
--
GitLab