zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweak

This commit is contained in:
Pan 2019-04-15 10:20:18 +08:00
parent fdea6c684a
commit 3ab9a1ee40
20 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mock/article.js
View File

@ -3,7 +3,7 @@ import Mock from 'mockjs'
const List = []
const count = 100
const baseContent = '<p>我是测试数据我是测试数据</p><p><img src="https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943"></p>'
const baseContent = '<p>I am testing data, I am testing data.</p><p><img src="https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943"></p>'
const image_uri = 'https://wpimg.wallstcn.com/e4558086-631c-425c-9430-56ffb46e70b3'
for (let i = 0; i < count; i++) {

7
src/components/BackToTop/index.vue
View File

@ -1,12 +1,7 @@
<template>
<transition :name="transitionName">
<div v-show="visible" :style="customStyle" class="back-to-ceiling" @click="backToTop">
<svg width="16" height="16" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg" class="Icon Icon--backToTopArrow" aria-hidden="true" style="height: 16px; width: 16px;">
<title>回到顶部</title>
<g>
<path d="M12.036 15.59c0 .55-.453.995-.997.995H5.032c-.55 0-.997-.445-.997-.996V8.584H1.03c-1.1 0-1.36-.633-.578-1.416L7.33.29c.39-.39 1.026-.385 1.412 0l6.878 6.88c.782.78.523 1.415-.58 1.415h-3.004v7.004z" fill-rule="evenodd" />
</g>
</svg>
<svg width="16" height="16" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg" class="Icon Icon--backToTopArrow" aria-hidden="true" style="height:16px;width:16px"><path d="M12.036 15.59a1 1 0 0 1-.997.995H5.032a.996.996 0 0 1-.997-.996V8.584H1.03c-1.1 0-1.36-.633-.578-1.416L7.33.29a1.003 1.003 0 0 1 1.412 0l6.878 6.88c.782.78.523 1.415-.58 1.415h-3.004v7.004z" /></svg>
</div>
</transition>
</template>

1
src/components/JsonEditor/index.vue
View File

@ -16,7 +16,6 @@ import 'codemirror/addon/lint/json-lint'
export default {
name: 'JsonEditor',
/* eslint-disable vue/require-prop-types */
props: ['value'],
data() {
return {

1
src/components/Kanban/index.vue
View File

@ -15,6 +15,7 @@
</draggable>
</div>
</template>
<script>
import draggable from 'vuedraggable'

1
src/components/ThemePicker/index.vue
View File

@ -8,7 +8,6 @@
</template>
<script>
const version = require('element-ui/package.json').version // element-ui version from node_modules
const ORIGINAL_THEME = '#409EFF' // default color
import defaultSettings from '@/settings'

10
src/components/Tinymce/components/EditorImage.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="upload-container">
<el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
上传图片
upload
</el-button>
<el-dialog :visible.sync="dialogVisible">
<el-upload
@ -16,14 +16,14 @@
list-type="picture-card"
>
<el-button size="small" type="primary">
点击上传
Click upload
</el-button>
</el-upload>
<el-button @click="dialogVisible = false">
取 消
Cancel
</el-button>
<el-button type="primary" @click="handleSubmit">
确 定
Confirm
</el-button>
</el-dialog>
</div>
@ -54,7 +54,7 @@ export default {
handleSubmit() {
const arr = Object.keys(this.listObj).map(v => this.listObj[v])
if (!this.checkAllSuccess()) {
this.$message('请等待所有图片上传成功 或 出现了网络问题，请刷新页面重新上传！')
this.$message('Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!')
return
}
this.$emit('successCBK', arr)

1
src/components/Upload/SingleImage.vue
View File

@ -26,7 +26,6 @@
</template>
<script>
// 预览效果见付费文章
import { getToken } from '@/api/qiniu'
export default {

1
src/directive/el-table/adaptive.js
View File

@ -1,4 +1,3 @@
import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event'
/**

1
src/directive/el-table/index.js
View File

@ -1,4 +1,3 @@
import adaptive from './adaptive'
const install = function(Vue) {

1
src/directive/permission/permission.js
View File

@ -1,4 +1,3 @@
import store from '@/store'
export default {

2
src/filters/index.js
View File

@ -1,4 +1,4 @@
// set function parseTime,formatTime to filter
// import parseTime, formatTime and set to filter
export { parseTime, formatTime } from '@/utils'
/**

2
src/router/modules/components.js
View File

@ -1,4 +1,4 @@
/** When your routing table is too long, you can split it into small modules**/
/** When your routing table is too long, you can split it into small modules **/
import Layout from '@/layout'

2
src/router/modules/nested.js
View File

@ -1,4 +1,4 @@
/** When your routing table is too long, you can split it into small modules**/
/** When your routing table is too long, you can split it into small modules **/
import Layout from '@/layout'

2
src/router/modules/table.js
View File

@ -1,4 +1,4 @@
/** When your routing table is too long, you can split it into small modules**/
/** When your routing table is too long, you can split it into small modules **/
import Layout from '@/layout'

4
src/store/modules/permission.js
View File

@ -1,7 +1,7 @@
import { asyncRoutes, constantRoutes } from '@/router'
/**
* 通过meta.role判断是否与当前用户权限匹配
* Use meta.role to determine if the current user has permission
* @param roles
* @param route
*/
@ -14,7 +14,7 @@ function hasPermission(roles, route) {
}
/**
* 递归过滤异步路由表，返回符合用户角色权限的路由表
* Filter asynchronous routing tables by recursion
* @param routes asyncRoutes
* @param roles
*/

2
src/styles/element-ui.scss
View File

@ -1,4 +1,4 @@
//覆盖一些element-ui样式
// cover some element-ui styles
.el-breadcrumb__inner,
.el-breadcrumb__inner a {

6
src/styles/sidebar.scss
View File

@ -1,6 +1,5 @@
#app {
// 主体区域 Main container
.main-container {
min-height: 100%;
transition: margin-left .28s;
@ -8,7 +7,6 @@
position: relative;
}
// 侧边栏 Sidebar container
.sidebar-container {
transition: width 0.28s;
width: $sideBarWidth !important;
@ -22,7 +20,7 @@
z-index: 1001;
overflow: hidden;
//reset element-ui css
// reset element-ui css
.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
}
@ -149,7 +147,7 @@
min-width: $sideBarWidth !important;
}
// 适配移动端, Mobile responsive
// mobile responsive
.mobile {
.main-container {
margin-left: 0px;

8
src/styles/transition.scss
View File

@ -1,6 +1,6 @@
//global transition css
// global transition css
/*fade*/
/* fade */
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.28s;
@ -11,7 +11,7 @@
opacity: 0;
}
/*fade-transform*/
/* fade-transform */
.fade-transform-leave-active,
.fade-transform-enter-active {
transition: all .5s;
@ -27,7 +27,7 @@
transform: translateX(30px);
}
/*breadcrumb transition*/
/* breadcrumb transition */
.breadcrumb-enter-active,
.breadcrumb-leave-active {
transition: all .5s;

4
src/styles/variables.scss
View File

@ -8,10 +8,10 @@ $tiffany: #4AB7BD;
$yellow:#FEC171;
$panGreen: #30B08F;
//sidebar
// sidebar
$menuText:#bfcbd9;
$menuActiveText:#409EFF;
$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
$menuBg:#304156;
$menuHover:#263445;

4
src/views/components-demo/back-to-top.vue
View File

@ -113,8 +113,7 @@
<div>placeholder</div>
<div>placeholder</div>
</div>
<!--可自定义按钮的样式、show/hide临界点、返回的位置 -->
<!--如需文字提示，可在外部添加element的<el-tooltip></el-tooltip>元素 -->
<!-- you can add element-ui's tooltip -->
<el-tooltip placement="top" content="tooltip">
<back-to-top :custom-style="myBackToTopStyle" :visibility-height="300" :back-position="50" transition-name="fade" />
</el-tooltip>
@ -129,6 +128,7 @@ export default {
components: { BackToTop },
data() {
return {
// customizable button style, show/hide critical point, return position
myBackToTopStyle: {
right: '50px',
bottom: '50px',