Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
vue_3.0
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
vue_3.0
Commits
86d4bd95
Commit
86d4bd95
authored
Dec 18, 2019
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
a979b7dd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
26 additions
and
75 deletions
+26
-75
routes.js
mock/role/routes.js
+1
-1
index.vue
src/components/Breadcrumb/index.vue
+0
-1
EditorImage.vue
src/components/Tinymce/components/EditorImage.vue
+1
-1
index.vue
src/components/Tinymce/index.vue
+1
-38
Navbar.vue
src/layout/components/Navbar.vue
+0
-5
index.vue
src/layout/components/TagsView/index.vue
+0
-0
index.js
src/router/index.js
+9
-9
components.js
src/router/modules/components.js
+3
-3
table.js
src/router/modules/table.js
+4
-4
get-page-title.js
src/utils/get-page-title.js
+0
-1
tinymce.vue
src/views/components-demo/tinymce.vue
+2
-2
index.vue
src/views/dashboard/index.vue
+2
-1
index.vue
src/views/error-log/index.vue
+1
-2
FilenameOption.vue
src/views/excel/components/FilenameOption.vue
+0
-1
export-excel.vue
src/views/excel/export-excel.vue
+0
-1
select-excel.vue
src/views/excel/select-excel.vue
+0
-1
index.vue
src/views/i18n-demo/index.vue
+1
-1
role.vue
src/views/permission/role.vue
+1
-1
drag-table.vue
src/views/table/drag-table.vue
+0
-1
index.vue
src/views/zip/index.vue
+0
-1
No files found.
mock/role/routes.js
View file @
86d4bd95
...
@@ -194,7 +194,7 @@ export const asyncRoutes = [
...
@@ -194,7 +194,7 @@ export const asyncRoutes = [
path
:
'back-to-top'
,
path
:
'back-to-top'
,
component
:
'views/components-demo/back-to-top'
,
component
:
'views/components-demo/back-to-top'
,
name
:
'BackToTopDemo'
,
name
:
'BackToTopDemo'
,
meta
:
{
title
:
'
backToTop
'
}
meta
:
{
title
:
'
返回顶部
'
}
},
},
{
{
path
:
'drag-dialog'
,
path
:
'drag-dialog'
,
...
...
src/components/Breadcrumb/index.vue
View file @
86d4bd95
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
},
},
watch
:
{
// 侦听路由变化
watch
:
{
// 侦听路由变化
$route
(
route
)
{
$route
(
route
)
{
console
.
log
(
route
)
// if you go to the redirect page, do not update the breadcrumbs
// if you go to the redirect page, do not update the breadcrumbs
if
(
route
.
path
.
startsWith
(
'/redirect/'
))
{
if
(
route
.
path
.
startsWith
(
'/redirect/'
))
{
return
return
...
...
src/components/Tinymce/components/EditorImage.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
class=
"upload-container"
>
<div
class=
"upload-container"
>
<el-button
:style=
"
{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
<el-button
:style=
"
{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
upload
上传本地图片
</el-button>
</el-button>
<el-dialog
:visible
.
sync=
"dialogVisible"
>
<el-dialog
:visible
.
sync=
"dialogVisible"
>
<el-upload
<el-upload
...
...
src/components/Tinymce/index.vue
View file @
86d4bd95
...
@@ -8,16 +8,12 @@
...
@@ -8,16 +8,12 @@
</
template
>
</
template
>
<
script
>
<
script
>
/**
* docs:
* https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
*/
import
editorImage
from
'./components/EditorImage'
import
editorImage
from
'./components/EditorImage'
import
plugins
from
'./plugins'
import
plugins
from
'./plugins'
import
toolbar
from
'./toolbar'
import
toolbar
from
'./toolbar'
import
load
from
'./dynamicLoadScript'
import
load
from
'./dynamicLoadScript'
// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
const
tinymceCDN
=
'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
const
tinymceCDN
=
'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
export
default
{
export
default
{
...
@@ -155,39 +151,6 @@ export default {
...
@@ -155,39 +151,6 @@ export default {
_this
.
fullscreen
=
e
.
state
_this
.
fullscreen
=
e
.
state
})
})
}
}
// 整合七牛上传
// images_dataimg_filter(img) {
// setTimeout(() => {
// const $image = $(img);
// $image.removeAttr('width');
// $image.removeAttr('height');
// if ($image[0].height && $image[0].width) {
// $image.attr('data-wscntype', 'image');
// $image.attr('data-wscnh', $image[0].height);
// $image.attr('data-wscnw', $image[0].width);
// $image.addClass('wscnph');
// }
// }, 0);
// return img
// },
// images_upload_handler(blobInfo, success, failure, progress) {
// progress(0);
// const token = _this.$store.getters.token;
// getToken(token).then(response => {
// const url = response.data.qiniu_url;
// const formData = new FormData();
// formData.append('token', response.data.qiniu_token);
// formData.append('key', response.data.qiniu_key);
// formData.append('file', blobInfo.blob(), url);
// upload(formData).then(() => {
// success(url);
// progress(100);
// })
// }).catch(err => {
// failure('出现未知问题,刷新页面,或者联系程序员')
// console.log(err);
// });
// },
})
})
},
},
destroyTinymce
()
{
destroyTinymce
()
{
...
...
src/layout/components/Navbar.vue
View file @
86d4bd95
...
@@ -19,11 +19,6 @@
...
@@ -19,11 +19,6 @@
<i
class=
"el-icon-caret-bottom"
/>
<i
class=
"el-icon-caret-bottom"
/>
</div>
</div>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-menu
slot=
"dropdown"
>
<router-link
to=
"/profile/index"
>
<el-dropdown-item>
个人中心
</el-dropdown-item>
</router-link>
<router-link
to=
"/"
>
<router-link
to=
"/"
>
<el-dropdown-item>
<el-dropdown-item>
首页
首页
...
...
src/layout/components/TagsView/index.vue
View file @
86d4bd95
This diff is collapsed.
Click to expand it.
src/router/index.js
View file @
86d4bd95
...
@@ -53,7 +53,7 @@ export const constantRoutes = [
...
@@ -53,7 +53,7 @@ export const constantRoutes = [
path
:
'dashboard'
,
path
:
'dashboard'
,
component
:
()
=>
import
(
'@/views/dashboard/index'
),
component
:
()
=>
import
(
'@/views/dashboard/index'
),
name
:
'Dashboard'
,
name
:
'Dashboard'
,
meta
:
{
title
:
'
dashboard
'
,
icon
:
'dashboard'
,
affix
:
true
}
meta
:
{
title
:
'
首页
'
,
icon
:
'dashboard'
,
affix
:
true
}
}
}
]
]
},
},
...
@@ -63,10 +63,10 @@ export const constantRoutes = [
...
@@ -63,10 +63,10 @@ export const constantRoutes = [
redirect
:
'/guide/index'
,
redirect
:
'/guide/index'
,
children
:
[
children
:
[
{
{
path
:
'
pdf-view.vue
'
,
path
:
'
index
'
,
component
:
()
=>
import
(
'@/views/guide/index'
),
component
:
()
=>
import
(
'@/views/guide/index'
),
name
:
'Guide'
,
name
:
'Guide'
,
meta
:
{
title
:
'
guide
'
,
icon
:
'guide'
,
noCache
:
true
}
meta
:
{
title
:
'
引导页
'
,
icon
:
'guide'
,
noCache
:
true
}
}
}
]
]
},
},
...
@@ -77,7 +77,7 @@ export const constantRoutes = [
...
@@ -77,7 +77,7 @@ export const constantRoutes = [
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
{
{
path
:
'
pdf-view.vue
'
,
path
:
'
index
'
,
component
:
()
=>
import
(
'@/views/profile/index'
),
component
:
()
=>
import
(
'@/views/profile/index'
),
name
:
'Profile'
,
name
:
'Profile'
,
meta
:
{
title
:
'profile'
,
icon
:
'user'
,
noCache
:
true
}
meta
:
{
title
:
'profile'
,
icon
:
'user'
,
noCache
:
true
}
...
@@ -138,10 +138,10 @@ export const asyncRoutes = [
...
@@ -138,10 +138,10 @@ export const asyncRoutes = [
component
:
Layout
,
component
:
Layout
,
children
:
[
children
:
[
{
{
path
:
'
pdf-view.vue
'
,
path
:
'
index
'
,
component
:
()
=>
import
(
'@/views/icons/index'
),
component
:
()
=>
import
(
'@/views/icons/index'
),
name
:
'Icons'
,
name
:
'Icons'
,
meta
:
{
title
:
'
icons
'
,
icon
:
'icon'
,
noCache
:
true
}
meta
:
{
title
:
'
图标
'
,
icon
:
'icon'
,
noCache
:
true
}
}
}
]
]
},
},
...
@@ -189,7 +189,7 @@ export const asyncRoutes = [
...
@@ -189,7 +189,7 @@ export const asyncRoutes = [
component
:
Layout
,
component
:
Layout
,
children
:
[
children
:
[
{
{
path
:
'
pdf-view.vue
'
,
path
:
'
index
'
,
component
:
()
=>
import
(
'@/views/tab/index'
),
component
:
()
=>
import
(
'@/views/tab/index'
),
name
:
'Tab'
,
name
:
'Tab'
,
meta
:
{
title
:
'tab'
,
icon
:
'tab'
}
meta
:
{
title
:
'tab'
,
icon
:
'tab'
}
...
@@ -211,13 +211,13 @@ export const asyncRoutes = [
...
@@ -211,13 +211,13 @@ export const asyncRoutes = [
path
:
'401'
,
path
:
'401'
,
component
:
()
=>
import
(
'@/views/error-page/401'
),
component
:
()
=>
import
(
'@/views/error-page/401'
),
name
:
'Page401'
,
name
:
'Page401'
,
meta
:
{
title
:
'
page
401'
,
noCache
:
true
}
meta
:
{
title
:
'401'
,
noCache
:
true
}
},
},
{
{
path
:
'404'
,
path
:
'404'
,
component
:
()
=>
import
(
'@/views/error-page/404'
),
component
:
()
=>
import
(
'@/views/error-page/404'
),
name
:
'Page404'
,
name
:
'Page404'
,
meta
:
{
title
:
'
page
404'
,
noCache
:
true
}
meta
:
{
title
:
'404'
,
noCache
:
true
}
}
}
]
]
},
},
...
...
src/router/modules/components.js
View file @
86d4bd95
...
@@ -16,7 +16,7 @@ const componentsRouter = {
...
@@ -16,7 +16,7 @@ const componentsRouter = {
path
:
'tinymce'
,
path
:
'tinymce'
,
component
:
()
=>
import
(
'@/views/components-demo/tinymce'
),
component
:
()
=>
import
(
'@/views/components-demo/tinymce'
),
name
:
'TinymceDemo'
,
name
:
'TinymceDemo'
,
meta
:
{
title
:
'
tinymce
'
}
meta
:
{
title
:
'
富文本
'
}
},
},
// {
// {
// path: 'markdown',
// path: 'markdown',
...
@@ -118,13 +118,13 @@ const componentsRouter = {
...
@@ -118,13 +118,13 @@ const componentsRouter = {
path
:
'dnd-list'
,
path
:
'dnd-list'
,
component
:
()
=>
import
(
'@/views/components-demo/dnd-list'
),
component
:
()
=>
import
(
'@/views/components-demo/dnd-list'
),
name
:
'DndListDemo'
,
name
:
'DndListDemo'
,
meta
:
{
title
:
'
dndList
'
}
meta
:
{
title
:
'
列表拖拽
'
}
},
},
{
{
path
:
'drag-kanban'
,
path
:
'drag-kanban'
,
component
:
()
=>
import
(
'@/views/components-demo/drag-kanban'
),
component
:
()
=>
import
(
'@/views/components-demo/drag-kanban'
),
name
:
'DragKanbanDemo'
,
name
:
'DragKanbanDemo'
,
meta
:
{
title
:
'
dragKanban
'
}
meta
:
{
title
:
'
可拖拽看板
'
}
}
}
]
]
}
}
...
...
src/router/modules/table.js
View file @
86d4bd95
...
@@ -16,25 +16,25 @@ const tableRouter = {
...
@@ -16,25 +16,25 @@ const tableRouter = {
path
:
'dynamic-table'
,
path
:
'dynamic-table'
,
component
:
()
=>
import
(
'@/views/table/dynamic-table/index'
),
component
:
()
=>
import
(
'@/views/table/dynamic-table/index'
),
name
:
'DynamicTable'
,
name
:
'DynamicTable'
,
meta
:
{
title
:
'
dynamic
Table'
}
meta
:
{
title
:
'
动态
Table'
}
},
},
{
{
path
:
'drag-table'
,
path
:
'drag-table'
,
component
:
()
=>
import
(
'@/views/table/drag-table'
),
component
:
()
=>
import
(
'@/views/table/drag-table'
),
name
:
'DragTable'
,
name
:
'DragTable'
,
meta
:
{
title
:
'
drag
Table'
}
meta
:
{
title
:
'
拖拽
Table'
}
},
},
{
{
path
:
'inline-edit-table'
,
path
:
'inline-edit-table'
,
component
:
()
=>
import
(
'@/views/table/inline-edit-table'
),
component
:
()
=>
import
(
'@/views/table/inline-edit-table'
),
name
:
'InlineEditTable'
,
name
:
'InlineEditTable'
,
meta
:
{
title
:
'
inlineEditTable
'
}
meta
:
{
title
:
'
Table内编辑
'
}
},
},
{
{
path
:
'complex-table'
,
path
:
'complex-table'
,
component
:
()
=>
import
(
'@/views/table/complex-table'
),
component
:
()
=>
import
(
'@/views/table/complex-table'
),
name
:
'ComplexTable'
,
name
:
'ComplexTable'
,
meta
:
{
title
:
'
complex
Table'
}
meta
:
{
title
:
'
综合
Table'
}
}
}
]
]
}
}
...
...
src/utils/get-page-title.js
View file @
86d4bd95
import
defaultSettings
from
'@/settings'
import
defaultSettings
from
'@/settings'
import
i18n
from
'@/lang'
const
title
=
defaultSettings
.
title
||
'Vue Element Admin'
const
title
=
defaultSettings
.
title
||
'Vue Element Admin'
...
...
src/views/components-demo/tinymce.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
class=
"components-container"
>
<div
class=
"components-container"
>
<aside>
<aside>
{{
$t
(
'components.tinymceTips'
)
}}
富文本介绍见
<a
target=
"_blank"
class=
"link-type"
href=
"https://
panjiachen.github.io/vue-element-admin-site/component/rich-editor.html"
>
{{
$t
(
'components.documentation'
)
}}
</a>
<a
target=
"_blank"
class=
"link-type"
href=
"https://
github.com/tinymce/tinymce"
>
文档
</a>
</aside>
</aside>
<div>
<div>
<tinymce
v-model=
"content"
:height=
"300"
/>
<tinymce
v-model=
"content"
:height=
"300"
/>
...
...
src/views/dashboard/index.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
class=
"dashboard-container"
>
<div
class=
"dashboard-container"
>
<component
:is=
"currentRole"
/>
首页
<!--
<component
:is=
"currentRole"
/>
-->
</div>
</div>
</
template
>
</
template
>
...
...
src/views/error-log/index.vue
View file @
86d4bd95
...
@@ -2,8 +2,7 @@
...
@@ -2,8 +2,7 @@
<div
class=
"errPage-container"
>
<div
class=
"errPage-container"
>
<ErrorA
/>
<ErrorA
/>
<ErrorB
/>
<ErrorB
/>
<!-- $t is vue-i18n global function to translate lang -->
<h3>
{{
$t
(
'errorLog.tips'
)
}}
</h3>
<h3>
{{
$t
(
'errorLog.tips'
)
}}
</h3>
<aside>
<aside>
{{
$t
(
'errorLog.description'
)
}}
{{
$t
(
'errorLog.description'
)
}}
<a
target=
"_blank"
class=
"link-type"
href=
"https://panjiachen.github.io/vue-element-admin-site/guide/advanced/error.html"
>
<a
target=
"_blank"
class=
"link-type"
href=
"https://panjiachen.github.io/vue-element-admin-site/guide/advanced/error.html"
>
...
...
src/views/excel/components/FilenameOption.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
style=
"display:inline-block;"
>
<div
style=
"display:inline-block;"
>
<!-- $t is vue-i18n global function to translate lang -->
<label
class=
"radio-label"
style=
"padding-left:0;"
>
Filename:
</label>
<label
class=
"radio-label"
style=
"padding-left:0;"
>
Filename:
</label>
<el-input
v-model=
"filename"
:placeholder=
"$t('excel.placeholder')"
style=
"width:350px;"
prefix-icon=
"el-icon-document"
/>
<el-input
v-model=
"filename"
:placeholder=
"$t('excel.placeholder')"
style=
"width:350px;"
prefix-icon=
"el-icon-document"
/>
</div>
</div>
...
...
src/views/excel/export-excel.vue
View file @
86d4bd95
<
template
>
<
template
>
<!-- $t is vue-i18n global function to translate lang -->
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<div>
<div>
<FilenameOption
v-model=
"filename"
/>
<FilenameOption
v-model=
"filename"
/>
...
...
src/views/excel/select-excel.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<!-- $t is vue-i18n global function to translate lang -->
<el-input
v-model=
"filename"
:placeholder=
"$t('excel.placeholder')"
style=
"width:350px;"
prefix-icon=
"el-icon-document"
/>
<el-input
v-model=
"filename"
:placeholder=
"$t('excel.placeholder')"
style=
"width:350px;"
prefix-icon=
"el-icon-document"
/>
<el-button
:loading=
"downloadLoading"
style=
"margin-bottom:20px"
type=
"primary"
icon=
"el-icon-document"
@
click=
"handleDownload"
>
<el-button
:loading=
"downloadLoading"
style=
"margin-bottom:20px"
type=
"primary"
icon=
"el-icon-document"
@
click=
"handleDownload"
>
{{
$t
(
'excel.selectedExport'
)
}}
{{
$t
(
'excel.selectedExport'
)
}}
...
...
src/views/i18n-demo/index.vue
View file @
86d4bd95
<
template
>
F
<
template
>
<div>
<div>
<el-card
class=
"box-card"
style=
"margin-top:40px;"
>
<el-card
class=
"box-card"
style=
"margin-top:40px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
slot=
"header"
class=
"clearfix"
>
...
...
src/views/permission/role.vue
View file @
86d4bd95
...
@@ -112,7 +112,7 @@ export default {
...
@@ -112,7 +112,7 @@ export default {
},
},
i18n
(
routes
)
{
i18n
(
routes
)
{
const
app
=
routes
.
map
(
route
=>
{
const
app
=
routes
.
map
(
route
=>
{
// route.title = i18n.t(`route.${route.title}`)
route
.
title
=
`route.
${
route
.
title
}
`
if
(
route
.
children
)
{
if
(
route
.
children
)
{
route
.
children
=
this
.
i18n
(
route
.
children
)
route
.
children
=
this
.
i18n
(
route
.
children
)
}
}
...
...
src/views/table/drag-table.vue
View file @
86d4bd95
...
@@ -52,7 +52,6 @@
...
@@ -52,7 +52,6 @@
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
/el-table
>
<
/el-table
>
<!--
$t
is
vue
-
i18n
global
function
to
translate
lang
(
lang
in
@
/lang
)
--
>
<
div
class
=
"show-d"
>
<
div
class
=
"show-d"
>
<
el
-
tag
style
=
"margin-right:12px;"
>
{{
$t
(
'table.dragTips1'
)
}}
:
<
/el-tag> {{ oldList
}}
<
el
-
tag
style
=
"margin-right:12px;"
>
{{
$t
(
'table.dragTips1'
)
}}
:
<
/el-tag> {{ oldList
}}
<
/div
>
<
/div
>
...
...
src/views/zip/index.vue
View file @
86d4bd95
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<!-- $t is vue-i18n global function to translate lang -->
<el-input
v-model=
"filename"
:placeholder=
"$t('zip.placeholder')"
style=
"width:300px;"
prefix-icon=
"el-icon-document"
/>
<el-input
v-model=
"filename"
:placeholder=
"$t('zip.placeholder')"
style=
"width:300px;"
prefix-icon=
"el-icon-document"
/>
<el-button
:loading=
"downloadLoading"
style=
"margin-bottom:20px;"
type=
"primary"
icon=
"el-icon-document"
@
click=
"handleDownload"
>
<el-button
:loading=
"downloadLoading"
style=
"margin-bottom:20px;"
type=
"primary"
icon=
"el-icon-document"
@
click=
"handleDownload"
>
{{
$t
(
'zip.export'
)
}}
Zip
{{
$t
(
'zip.export'
)
}}
Zip
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment