Skip to content

Commit 1f11dc7

Browse files
vanoneangvanoneang
authored
Merge pull request #152 from TaleLin/develop
publish beta.2 version
2 parents 411a7a6 + 7df8c3f commit 1f11dc7

37 files changed

+1727
-206
lines changed

‎package-lock.json‎

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lin-cms",
3-
"version": "0.1.0-beta.1",
3+
"version": "0.1.0-beta.2",
44
"private": true,
55
"scripts": {
66
"serve": "node script/plugin-get-config.js && vue-cli-service serve",
@@ -19,6 +19,7 @@
1919
"fastscan": "^1.0.4",
2020
"good-storage": "^1.1.0",
2121
"js-cookie": "^2.2.0",
22+
"screenfull": "4.2.0",
2223
"vue": "^2.6.8",
2324
"vue-awesome-swiper": "^3.1.3",
2425
"vue-router": "~3.0.1",

‎public/iconfont.css‎

Lines changed: 14 additions & 6 deletions
Large diffs are not rendered by default.

‎public/index.html‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,98 @@
66
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
77
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
88
<link rel="stylesheet" type="text/css" href="./iconfont.css" />
9-
<script>//at.alicdn.com/t/font_1104271_so151lbumpq.js</script>
9+
<script src="//at.alicdn.com/t/font_1104271_so151lbumpq.js"></script>
1010
<title>lin-cms</title>
11+
<style>
12+
#loader {
13+
position: fixed;
14+
left: 0;
15+
right: 0;
16+
bottom: 0;
17+
top: 0;
18+
background:#fff;
19+
display: flex;
20+
justify-content: center;
21+
align-items: center;
22+
transition: display 1s ease .5s;
23+
}
24+
.loader-logo {
25+
width: 60px;
26+
height: 98px;
27+
position: fixed;
28+
left: 30px;
29+
}
30+
.spinner {
31+
position: relative;
32+
line-height: 0;
33+
box-sizing: border-box;
34+
width: 40px;
35+
height: 40px;
36+
color: #3963bc;
37+
}
38+
39+
.spinner:before {
40+
content: '';
41+
width: 100%;
42+
height: 20%;
43+
min-width: 5px;
44+
background: #000;
45+
opacity: 0.1;
46+
position: absolute;
47+
bottom: 0%;
48+
left: 0;
49+
border-radius: 50%;
50+
animation: rotate-square-2-shadow .5s linear infinite;
51+
}
52+
.spinner:after {
53+
content: '';
54+
width: 100%;
55+
height: 100%;
56+
background: #3963bc;
57+
animation: rotate-square-2-animate .5s linear infinite;
58+
position: absolute;
59+
bottom:40%;
60+
left: 0;
61+
border-radius: 3px;
62+
}
63+
64+
65+
@keyframes rotate-square-2-animate {
66+
17% {
67+
border-bottom-right-radius: 3px;
68+
}
69+
25% {
70+
transform: translateY(20%) rotate(22.5deg);
71+
}
72+
50% {
73+
transform: translateY(40%) scale(1, .9) rotate(45deg);
74+
border-bottom-right-radius: 50%;
75+
}
76+
75% {
77+
transform: translateY(20%) rotate(67.5deg);
78+
}
79+
100% {
80+
transform: translateY(0) rotate(90deg);
81+
}
82+
}
83+
84+
@keyframes rotate-square-2-shadow {
85+
0%, 100% {
86+
transform: scale(1, 1);
87+
}
88+
50% {
89+
transform: scale(1.2, 1);
90+
}
91+
}
92+
</style>
1193
</head>
1294

1395
<body>
96+
97+
<div id="loader">
98+
<div class="spinner spinner--rotate-square-2"></div>
99+
<img src="./static/img/logo.png" alt="" class="loader-logo">
100+
</div>
14101
<div id="app"></div>
15102
<!-- built files will be auto injected -->
16103
</body>

‎public/static/img/logo.png‎

12.4 KB
Loading

‎src/App.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ export default {
1515
eventBus: new Vue(),
1616
}
1717
},
18+
mounted() {
19+
document.getElementById('loader').style.display = 'none'
20+
},
1821
provide() {
1922
// eventBus挂载的事件： addGroup addUser
2023
return {

‎src/assets/styles/realize/element-variables.scss‎

Lines changed: 14 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $--color-success: #00c292 !default;
66
$--color-warning: #dee2e6 !default;
77
$--color-danger: #f4516c !default;
88

9+
$--background-color-base: #F6F7FA !default;
10+
911
/* 改变 icon 字体路径变量，必需 */
1012
$--font-path: "~element-ui/lib/theme-chalk/fonts";
1113

@@ -155,12 +157,16 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
155157
}
156158

157159
.el-radio-group {
158-
padding-top: 15px;
160+
// padding-top: 15px;
159161
width: 100%;
160162
}
161163

162164
.el-radio__inner {
163165
border: 1px solid #c4c0d2 !important;
166+
&::after {
167+
width:7px;
168+
height:7px;
169+
}
164170
}
165171

166172
.el-radio__input.is-checked .el-radio__inner {
@@ -185,7 +191,6 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
185191
}
186192

187193
.el-form--label-top .el-form-item__label {
188-
padding-bottom: 0px !important;
189194
color: $title-color;
190195
font-weight: 500;
191196
}
@@ -195,8 +200,10 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
195200
}
196201

197202
// pagination
198-
.el-pagination__editor.el-input .el-input__inner {
199-
border-radius: 4px;
203+
.el-pagination__editor.el-input {
204+
.el-input__inner {
205+
border-radius: 4px;
206+
}
200207
}
201208

202209
.el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -205,48 +212,10 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
205212
}
206213

207214
// input
208-
.el-input-group__append {
209-
padding: 0 8px;
210-
border-top-right-radius: 20px;
211-
border-bottom-right-radius: 20px;
215+
.el-input-group__append, .el-input-group__prepend {
212216
background: $theme;
213-
color: #ffffff;
214-
border: 1px solid $theme;
215-
}
216-
217-
.el-input-group--append .el-input__inner {
218-
border-top-left-radius: 20px;
219-
border-bottom-left-radius: 20px;
220-
border-right: none;
221-
width: 150px;
222-
transition: all 0.2s linear;
223-
224-
&:focus {
225-
width: 250px;
226-
transition: all 0.3s linear;
227-
}
228-
}
229-
230-
.el-input-group__append,
231-
.el-input-group__prepend {
232-
padding: 0 8px;
233-
border-top-right-radius: 20px;
234-
border-bottom-right-radius: 20px;
235-
background: $theme;
236-
color: #ffffff;
237-
border: 1px solid $theme;
238-
239-
.el-icon-search {
240-
font-size: 18px;
241-
}
242-
}
243-
244-
.el-input .el-input__inner {
245-
border: 1px solid #c4c0d2 !important;
246-
}
247-
248-
.input-with-select > input.el-input__inner {
249-
border-right: none !important;
217+
border:1px solid $theme;
218+
color:#fff;
250219
}
251220

252221
// table
@@ -455,11 +424,6 @@ thead tr {
455424
top: 53%;
456425
}
457426

458-
.el-input__inner{
459-
height: 32px;
460-
line-height: 32px;
461-
}
462-
463427
.app-sidebar .el-menu-item-group .el-menu-item {
464428
padding-left: 60px !important;
465429
}

‎src/components/base/date-picker/lin-date-picker.vue‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
start-placeholder="开始日期"
77
end-placeholder="结束日期"
88
align="right"
9+
size="medium"
910
popper-class="date-box"
1011
value-format="yyyy-MM-dd HH:mm:ss"
1112
:default-time="['00:00:00', '23:59:59']"
@@ -60,28 +61,3 @@ export default {
6061
},
6162
}
6263
</script>
63-
64-
<style>
65-
.el-popper[x-placement^="bottom"]{
66-
margin-top: 10px;
67-
}
68-
.el-input__inner{
69-
height: 32px;
70-
line-height: 32px;
71-
}
72-
.el-date-editor .el-range__icon {
73-
height: 32px;
74-
}
75-
.el-date-editor .el-range-separator{
76-
height: 32px;
77-
}
78-
.el-date-table td.start-date span, .el-date-table td.end-date span{
79-
background-color: #3963BC;
80-
}
81-
.el-date-table td.today span{
82-
color: #3963BC;
83-
}
84-
.el-picker-panel__shortcut:hover{
85-
color: #3963BC;
86-
}
87-
</style>

‎src/components/base/icon/lin-icon.vue‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<template>
2+
<svg class="l-icon" :style="{ width, height }" @click="$emit('click', $event)">
3+
<use :xlink:href="`#icon-${name}`" :fill="color"></use>
4+
</svg>
5+
</template>
6+
<script>
7+
export default {
8+
name: 'LIcon',
9+
props: {
10+
name: {
11+
type: String,
12+
default: '',
13+
},
14+
color: {
15+
type: String,
16+
default: '',
17+
},
18+
width: {
19+
type: String,
20+
default: '1.2em',
21+
},
22+
height: {
23+
type: String,
24+
default: '1.2em',
25+
},
26+
},
27+
}
28+
</script>
29+
<style lang="scss" scoped>
30+
.l-icon {
31+
&:hover,
32+
&:focus {
33+
color: #fff;
34+
}
35+
}
36+
</style>

‎src/components/base/search/lin-search.vue‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<template>
2-
<div>
3-
<el-input
4-
:placeholder="placeholder"
5-
clearable
6-
v-model="keyword"
7-
class="input-with-select">
2+
<div class="lin-search">
3+
<el-input size="medium" :placeholder="placeholder" clearable v-model="keyword" class="input-with-select">
84
<el-button slot="append" icon="el-icon-search"></el-button>
95
</el-input>
106
</div>
@@ -27,9 +23,12 @@ export default {
2723
},
2824
created() {
2925
// 节流搜索
30-
this.$watch('keyword', Utils.debounce((newQuery) => {
31-
this.$emit('query', newQuery)
32-
}, 1000))
26+
this.$watch(
27+
'keyword',
28+
Utils.debounce((newQuery) => {
29+
this.$emit('query', newQuery)
30+
}, 1000),
31+
)
3332
},
3433
methods: {
3534
clear() {
@@ -38,3 +37,27 @@ export default {
3837
},
3938
}
4039
</script>
40+
<style lang="scss" scoped>
41+
.lin-search /deep/ .el-input-group__append {
42+
border-top-right-radius: 20px;
43+
border-bottom-right-radius: 20px;
44+
padding: 0 8px;
45+
color: #ffffff;
46+
border: 1px solid $theme;
47+
.el-icon-search {
48+
font-size: 18px;
49+
}
50+
}
51+
.lin-search /deep/ .el-input__inner {
52+
border-top-left-radius: 20px;
53+
border-bottom-left-radius: 20px;
54+
border-right: none;
55+
width: 150px;
56+
transition: all 0.2s linear;
57+
58+
&:focus {
59+
width: 250px;
60+
transition: all 0.3s linear;
61+
}
62+
}
63+
</style>

0 commit comments

Comments
 (0)