lisang
/
iview-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update iview to v3.0.0

This commit is contained in:
zhigang.li 2018-07-30 20:13:07 +08:00
parent a70db92cfa
commit eb288c36c8
13 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -7853,9 +7853,9 @@
"dev": true
},
"iview": {
"version": "2.14.3",
"resolved": "https://registry.npmjs.org/iview/-/iview-2.14.3.tgz",
"integrity": "sha512-jK5CBNuNBKUZWooCVlipBIUkNnGeZHRtypeuMo9VhQmJ9cCXmuI6BalrtxBFkBCnuUXRdFD34/kSevF9Cc2kpg==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/iview/-/iview-3.0.0.tgz",
"integrity": "sha512-9PnDxVGXDLUyx9KAPX4UJnqa3M2PA6HEGESd5sz4setgGBAAYTgPjho+87vvbLWjVxYnAzwtu1FuONWORP9IGA==",
"requires": {
"async-validator": "1.8.2",
"deepmerge": "2.1.1",

2
package.json
View File

@ -18,7 +18,7 @@
"cropperjs": "^1.2.2",
"echarts": "^4.0.4",
"html2canvas": "^1.0.0-alpha.12",
"iview": "^2.14.3",
"iview": "^3.0.0",
"iview-area": "^1.5.17",
"js-cookie": "^2.2.0",
"simplemde": "^1.11.2",

4
src/components/login-form/login-form.vue
View File

@ -3,14 +3,14 @@
<FormItem prop="userName">
<Input v-model="form.userName" placeholder="请输入用户名">
<span slot="prepend">
<Icon :size="16" type="person"></Icon>
<Icon :size="16" type="ios-person"></Icon>
</span>
</Input>
</FormItem>
<FormItem prop="password">
<Input type="password" v-model="form.password" placeholder="请输入密码">
<span slot="prepend">
<Icon :size="14" type="locked"></Icon>
<Icon :size="14" type="md-lock"></Icon>
</span>
</Input>
</FormItem>

20
src/libs/axios.js
View File

@ -42,18 +42,16 @@ class httpRequest {
// Spin.hide()
}, 500)
}
if (!(data instanceof Blob)) {
if (data.code !== 200) {
// 后端服务在个别情况下回报201，待确认
if (data.code === 401) {
Cookies.remove(TOKEN_KEY)
window.location.href = '/#/login'
Message.error('未登录，或登录失效，请登录')
} else {
if (data.msg) Message.error(data.msg)
}
return false
if (data.code !== 200) {
// 后端服务在个别情况下回报201，待确认
if (data.code === 401) {
Cookies.remove(TOKEN_KEY)
window.location.href = '/#/login'
Message.error('未登录，或登录失效，请登录')
} else {
if (data.msg) Message.error(data.msg)
}
return false
}
return data
}, (error) => {

20
src/router/routers.js
View File

@ -71,7 +71,7 @@ export default [
path: '/components',
name: 'components',
meta: {
icon: 'social-buffer',
icon: 'logo-buffer',
title: '组件'
},
component: Main,
@ -80,7 +80,7 @@ export default [
path: 'count_to_page',
name: 'count_to_page',
meta: {
icon: 'arrow-graph-up-right',
icon: 'md-trending-up',
title: '数字渐变'
},
component: () => import('@/view/components/count-to/count-to.vue')
@ -89,7 +89,7 @@ export default [
path: 'tables_page',
name: 'tables_page',
meta: {
icon: 'ios-grid-view',
icon: 'md-grid',
title: '多功能表格'
},
component: () => import('@/view/components/tables/tables.vue')
@ -98,7 +98,7 @@ export default [
path: 'split_pane_page',
name: 'split_pane_page',
meta: {
icon: 'pause',
icon: 'md-pause',
title: '分割窗口'
},
component: () => import('@/view/components/split-pane/split-pane.vue')
@ -107,7 +107,7 @@ export default [
path: 'markdown_page',
name: 'markdown_page',
meta: {
icon: 'social-markdown',
icon: 'logo-markdown',
title: 'Markdown编辑器'
},
component: () => import('@/view/components/markdown/markdown.vue')
@ -116,7 +116,7 @@ export default [
path: 'editor_page',
name: 'editor_page',
meta: {
icon: 'compose',
icon: 'ios-create',
title: '富文本编辑器'
},
component: () => import('@/view/components/editor/editor.vue')
@ -136,7 +136,7 @@ export default [
path: '/update',
name: 'update',
meta: {
icon: 'upload',
icon: 'md-cloud-upload',
title: '数据上传'
},
component: Main,
@ -145,7 +145,7 @@ export default [
path: 'update_table_page',
name: 'update_table_page',
meta: {
icon: 'document-text',
icon: 'ios-document',
title: '上传Csv'
},
component: () => import('@/view/update/update-table.vue')
@ -154,7 +154,7 @@ export default [
path: 'update_paste_page',
name: 'update_paste_page',
meta: {
icon: 'clipboard',
icon: 'md-clipboard',
title: '粘贴表格数据'
},
component: () => import('@/view/update/update-paste.vue')
@ -184,7 +184,7 @@ export default [
path: '/multilevel',
name: 'multilevel',
meta: {
icon: 'arrow-graph-up-right',
icon: 'md-menu',
title: '多级菜单'
},
component: Main,

2
src/view/main/components/header-bar/header-bar.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="header-bar">
<sider-trigger :collapsed="collapsed" icon="navicon-round" @on-change="handleCollpasedChange"></sider-trigger>
<sider-trigger :collapsed="collapsed" icon="md-menu" @on-change="handleCollpasedChange"></sider-trigger>
<custom-bread-crumb show-icon style="margin-left: 30px;" :list="breadCrumbList"></custom-bread-crumb>
<div class="custom-content-con">
<slot></slot>

2
src/view/main/components/language/language.vue
View File

@ -3,7 +3,7 @@
<Dropdown trigger="click" @on-click="selectLang">
<a href="javascript:void(0)">
{{ title }}
<Icon type="arrow-down-b"></Icon>
<Icon :size="18" type="md-arrow-dropdown" />
</a>
<DropdownMenu slot="list">
<DropdownItem v-for="(value, key) in localList" :name="key" :key="`lang-${key}`">{{ value }}</DropdownItem>

3
src/view/main/components/tags-nav/tags-nav.less
View File

@ -34,7 +34,8 @@
padding-top: 3px;
z-index: 10;
button{
padding: 6px 10px;
padding: 6px 4px;
line-height: 14px;
text-align: center;
}
&.left-btn{

12
src/view/main/components/tags-nav/tags-nav.vue
View File

@ -3,7 +3,7 @@
<div class="close-con">
<Dropdown transfer @on-click="handleTagsOption" style="margin-top:7px;">
<Button size="small" type="text">
<Icon :size="18" type="ios-close-outline"></Icon>
<Icon :size="18" type="ios-close-circle-outline" />
</Button>
<DropdownMenu slot="list">
<DropdownItem name="close-all">关闭所有</DropdownItem>
@ -12,10 +12,14 @@
</Dropdown>
</div>
<div class="btn-con left-btn">
<Button icon="chevron-left" type="text" @click="handleScroll(240)"></Button>
<Button type="text" @click="handleScroll(240)">
<Icon :size="18" type="ios-arrow-back" />
</Button>
</div>
<div class="btn-con right-btn">
<Button icon="chevron-right" type="text" @click="handleScroll(-240)"></Button>
<Button type="text" @click="handleScroll(-240)">
<Icon :size="18" type="ios-arrow-forward" />
</Button>
</div>
<div class="scroll-outer" ref="scrollOuter" @DOMMouseScroll="handlescroll" @mousewheel="handlescroll">
<div ref="scrollBody" class="scroll-body" :style="{left: tagBodyLeft + 'px'}">
@ -29,7 +33,7 @@
@on-close="handleClose"
@click.native="handleClick(item)"
:closable="item.name !== 'home'"
:color="item.name === value.name ? 'blue' : 'default'"
:color="item.name === value.name ? 'primary' : 'default'"
>{{ showTitleInside(item) }}</Tag>
</transition-group>
</div>

2
src/view/main/components/user/user.vue
View File

@ -2,7 +2,7 @@
<div class="user-avator-dropdown">
<Dropdown @on-click="handleClick">
<Avatar :src="userAvator"/>
<Icon :size="12" type="arrow-down-b"></Icon>
<Icon :size="18" type="md-arrow-dropdown"></Icon>
<DropdownMenu slot="list">
<DropdownItem name="logout">退出登录</DropdownItem>
</DropdownMenu>

2
src/view/main/main.vue
View File

@ -130,7 +130,7 @@ export default {
// 设置初始语言
this.setLocal(this.$i18n.locale)
// 文档提示
this.$Notice.open({
this.$Notice.info({
title: '想快速上手，去看文档吧',
duration: 0,
render: (h) => {

12
src/view/single-page/home/home.vue
View File

@ -45,12 +45,12 @@ export default {
data () {
return {
inforCardData: [
{ title: '新增用户', icon: 'android-person-add', count: 803, color: '#2d8cf0' },
{ title: '累计点击', icon: 'pinpoint', count: 23432, color: '#19be6b' },
{ title: '新增问答', icon: 'help-circled', count: 142, color: '#ff9900' },
{ title: '分享统计', icon: 'android-share-alt', count: 657, color: '#ed3f14' },
{ title: '新增活动', icon: 'social-twitch', count: 12, color: '#E46CBB' },
{ title: '新增页面', icon: 'paper-airplane', count: 14, color: '#9A66E4' }
{ title: '新增用户', icon: 'md-person-add', count: 803, color: '#2d8cf0' },
{ title: '累计点击', icon: 'md-locate', count: 23432, color: '#19be6b' },
{ title: '新增问答', icon: 'md-help-circle', count: 142, color: '#ff9900' },
{ title: '分享统计', icon: 'md-share', count: 657, color: '#ed3f14' },
{ title: '新增互动', icon: 'md-chatbubbles', count: 12, color: '#E46CBB' },
{ title: '新增页面', icon: 'md-map', count: 14, color: '#9A66E4' }
],
pieData: [
{value: 335, name: '直接访问'},

6
src/view/update/update-table.vue
View File

@ -3,12 +3,12 @@
<i-col span="6">
<Card>
<Upload action="" :before-upload="beforeUpload">
<Button type="ghost" icon="ios-cloud-upload-outline">上传Csv文件</Button>
<Button icon="ios-cloud-upload-outline">上传Csv文件</Button>
&nbsp;&nbsp;&nbsp;&nbsp;点击上传Csv文件
</Upload>
<p>util.js提供两个方法用来实现这个功能：</p>
<p class="update-table-intro"><Icon style="margin-right: 10px;" :size="10" type="heart"/><span class="code-high-line">getArrayFromFile</span>：将Csv文件解析为二维数组</p>
<p class="update-table-intro"><Icon style="margin-right: 10px;" :size="10" type="heart"/><span class="code-high-line">getTableDataFromArray</span>：将二维数组转为表格数据，具体请看文档</p>
<p class="update-table-intro"><Icon style="margin-right: 10px;" :size="10" type="md-heart"/><span class="code-high-line">getArrayFromFile</span>：将Csv文件解析为二维数组</p>
<p class="update-table-intro"><Icon style="margin-right: 10px;" :size="10" type="md-heart"/><span class="code-high-line">getTableDataFromArray</span>：将二维数组转为表格数据，具体请看文档</p>
</Card>
</i-col>
<i-col span="18">