Skip to content

Commit ac97002

Browse files
GongJSvanoneang
GongJS
authored and
vanoneang
committed
Component (#129)：调整button大小
* fix:UI插件 * optimize: 调整reuse宽度 * fix:temp * fix: 修改table样式 * merge * perf(user): optimize ui * table样式 * feat(table): 添加组合示例 * fix * optimize: ui * 调整button大小
1 parent 9e290d7 commit ac97002

8 files changed

Lines changed: 91 additions & 35 deletions

File tree

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
1717
.el-button {
1818
padding: 8px 16px;
1919
border-radius: 2px;
20+
&.is-round {
21+
padding:8px 16px;
22+
}
2023
&.el-button--mini {
21-
padding:5px 12px;
24+
padding: 5px 12px;
25+
}
26+
&.el-button--medium {
27+
padding: 7px 12px;
28+
}
29+
&.el-button--small {
30+
padding: 6px 12px;
2231
}
2332
}
2433
.el-button--primary.is-plain,
@@ -285,7 +294,8 @@ thead tr {
285294
.el-table__body tr {
286295
height: 52px;
287296
}
288-
.el-table th, .el-table td {
297+
.el-table th,
298+
.el-table td {
289299
padding: 9px 0px;
290300
}
291301
.el-table--striped .el-table__body tr {
@@ -301,6 +311,13 @@ thead tr {
301311
.el-table__body tr.hover-row > td {
302312
background-color: #ecf5ff;
303313
}
314+
315+
.el-table__expand-icon {
316+
color:#3963bc;
317+
font-size: 18px;
318+
top:-5px;
319+
}
320+
304321
// dialog
305322
.el-dialog__footer {
306323
text-align: left;

‎src/components/layout/SideBar.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ export default {
148148
}
149149
.app-sidebar {
150150
background: #192a5e;
151+
&::-webkit-scrollbar {
152+
width: 0px;
153+
height: 0px;
154+
}
151155
152156
.logo {
153157
width: $sidebar-width;

‎src/plugins/LinCmsUi/views/button/Button.vue‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div class="lin-container">
33
<sticky-top>
4-
<div class="lin-title">Button 按钮</div>
5-
<lin-1px />
4+
<div class="lin-title">Button 按钮</div>
5+
<lin-1px/>
66
</sticky-top>
77
<div class="lin-wrap-ui">
88
<el-card class="box-card" style="margin-bottom:50px;">
@@ -143,6 +143,29 @@
143143
</el-collapse-item>
144144
</el-collapse>
145145
</el-card>
146+
147+
<el-card class="box-card" style="margin-bottom:50px;">
148+
<div slot="header">
149+
<span>不同尺寸</span>
150+
</div>
151+
<el-row>
152+
<el-button>默认按钮</el-button>
153+
<el-button size="medium">中等按钮</el-button>
154+
<el-button size="small">小型按钮</el-button>
155+
<el-button size="mini">超小按钮</el-button>
156+
</el-row>
157+
<el-row style="margin-top:10px;">
158+
<el-button round>默认按钮</el-button>
159+
<el-button size="medium" round>中等按钮</el-button>
160+
<el-button size="small" round>小型按钮</el-button>
161+
<el-button size="mini" round>超小按钮</el-button>
162+
</el-row>
163+
<el-collapse>
164+
<el-collapse-item title="查看代码" name="2">
165+
<div style="white-space: pre-wrap;">{{size}}</div>
166+
</el-collapse-item>
167+
</el-collapse>
168+
</el-card>
146169
</div>
147170
</div>
148171
</template>
@@ -209,6 +232,16 @@ export default {
209232
<el-button type="primary" icon="el-icon-share"></el-button>
210233
<el-button type="primary" icon="el-icon-delete"></el-button>
211234
</el-button-group>`,
235+
size: `
236+
<el-button>默认按钮</el-button>
237+
<el-button size="medium">中等按钮</el-button>
238+
<el-button size="small">小型按钮</el-button>
239+
<el-button size="mini">超小按钮</el-button>
240+
241+
<el-button round>默认按钮</el-button>
242+
<el-button size="medium" round>中等按钮</el-button>
243+
<el-button size="small" round>小型按钮</el-button>
244+
<el-button size="mini" round>超小按钮</el-button>`,
212245
}
213246
},
214247
// 计算属性设置
@@ -227,8 +260,7 @@ export default {
227260
// },
228261
methods: {
229262
// 执行获取数据等初始化动作
230-
init() {
231-
},
263+
init() {},
232264
},
233265
}
234266
</script>
@@ -248,13 +280,13 @@ export default {
248280
249281
.el-collapse-item__header {
250282
border-bottom: none;
251-
color:#2f4e8c;
283+
color: #2f4e8c;
252284
padding-left: calc(100% - 77px);
253285
}
254286
255287
.el-collapse-item__content {
256288
background: #e9f0f8;
257-
color:#2f4e8c;
289+
color: #2f4e8c;
258290
border-radius: 4px;
259291
padding: 0px 20px 20px 20px;
260292
margin-bottom: 20px;

‎src/plugins/LinCmsUi/views/table/Table.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<el-table-column prop="province" label="省份" width="120"></el-table-column>
1717
<el-table-column prop="city" label="市区" width="120"></el-table-column>
1818
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
19-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
19+
<el-table-column prop="address" label="地址"></el-table-column>
2020
</el-table>
2121
</el-row>
2222
<el-collapse>
@@ -37,7 +37,7 @@
3737
<el-table-column prop="province" label="省份" width="120"></el-table-column>
3838
<el-table-column prop="city" label="市区" width="120"></el-table-column>
3939
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
40-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
40+
<el-table-column prop="address" label="地址"></el-table-column>
4141
</el-table>
4242
</el-row>
4343
<el-collapse>
@@ -58,7 +58,7 @@
5858
<el-table-column prop="province" label="省份" width="120"></el-table-column>
5959
<el-table-column prop="city" label="市区" width="120"></el-table-column>
6060
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
61-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
61+
<el-table-column prop="address" label="地址"></el-table-column>
6262
</el-table>
6363
</el-row>
6464
<el-collapse>
@@ -81,7 +81,7 @@
8181
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
8282
<el-table-column prop="province" label="省份" width="120"></el-table-column>
8383
<el-table-column prop="city" label="市区" width="120"></el-table-column>
84-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
84+
<el-table-column prop="address" label="地址" width="300"></el-table-column>
8585
<el-table-column prop="zip" label="邮编" width="120" fixed="right"></el-table-column>
8686
</el-table>
8787
</el-row>
@@ -102,7 +102,7 @@
102102
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
103103
<el-table-column prop="province" label="省份" width="120"></el-table-column>
104104
<el-table-column prop="city" label="市区" width="120"></el-table-column>
105-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
105+
<el-table-column prop="address" label="地址" width="300"></el-table-column>
106106
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
107107
<el-table-column label="操作" width="140" fixed="right">
108108
<template slot-scope="scope">
@@ -175,7 +175,7 @@ export default {
175175
<el-table-column prop="province" label="省份" width="120"></el-table-column>
176176
<el-table-column prop="city" label="市区" width="120"></el-table-column>
177177
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
178-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
178+
<el-table-column prop="address" label="地址"></el-table-column>
179179
</el-table>`,
180180
border: `
181181
<el-table :data="tableData" stripe border>
@@ -184,7 +184,7 @@ export default {
184184
<el-table-column prop="province" label="省份" width="120"></el-table-column>
185185
<el-table-column prop="city" label="市区" width="120"></el-table-column>
186186
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
187-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
187+
<el-table-column prop="address" label="地址"></el-table-column>
188188
</el-table>`,
189189
header: `
190190
<el-table :data="tableData" height="200" stripe>
@@ -193,15 +193,15 @@ export default {
193193
<el-table-column prop="province" label="省份" width="120"></el-table-column>
194194
<el-table-column prop="city" label="市区" width="120"></el-table-column>
195195
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
196-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
196+
<el-table-column prop="address" label="地址"></el-table-column>
197197
</el-table>`,
198198
column: `
199199
<el-table :data="tableData" border style="width:800px;margin-left:auto;margin-right:auto;">
200200
<el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
201201
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
202202
<el-table-column prop="province" label="省份" width="120"></el-table-column>
203203
<el-table-column prop="city" label="市区" width="120"></el-table-column>
204-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
204+
<el-table-column prop="address" label="地址" width="300"></el-table-column>
205205
<el-table-column prop="zip" label="邮编" width="120" fixed="right"></el-table-column>
206206
</el-table>`,
207207
operate: `
@@ -210,7 +210,7 @@ export default {
210210
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
211211
<el-table-column prop="province" label="省份" width="120"></el-table-column>
212212
<el-table-column prop="city" label="市区" width="120"></el-table-column>
213-
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
213+
<el-table-column prop="address" label="地址" width="300"></el-table-column>
214214
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
215215
<el-table-column label="操作" width="150">
216216
<template slot-scope="scope">

‎src/plugins/LinCmsUi/views/table/TableCombo.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,13 @@
151151
<!-- 操作列 -->
152152
<el-table-column label="操作" fixed="right" width="170">
153153
<template slot-scope="scope">
154-
<lin-button
154+
<el-button
155155
v-for="(item,index) in operate"
156156
:type="item.type"
157157
plain
158+
size="mini"
158159
:key="index"
159-
@click.native.prevent.stop="buttonMethods(item.func, scope.$index, scope.row)">{{item.name}}</lin-button>
160+
@click.native.prevent.stop="buttonMethods(item.func, scope.$index, scope.row)">{{item.name}}</el-button>
160161
</template>
161162
</el-table-column>
162163
</el-table>
@@ -182,15 +183,12 @@
182183
// import Sortable from 'sortablejs' // eslint-disable-line
183184
// import FileSaver from 'file-saver' // eslint-disable-line
184185
// import XLSX from 'xlsx' // eslint-disable-line
185-
import LinButton from '@/components/base/button/lin-button'
186186
import LinSearch from '@/components/base/search/lin-search'
187-
188187
import { tableColumn } from './data'
189188
import movie from '../../models/movie.js'
190189
191190
export default {
192191
components: {
193-
LinButton,
194192
LinSearch,
195193
},
196194
data() {

‎src/views/admin/group/GroupAuths.vue‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,17 @@ export default {
122122
intersect.length > 0 &&
123123
intersect.length < currentModuleChildrenArr.length
124124
) {
125-
// this.auths.splice(this.auths.indexOf(moduleName),1)
125+
if (this.auths.indexOf(moduleName) > -1) {
126+
this.auths.splice(this.auths.indexOf(moduleName), 1);
127+
}
126128
this.halfAuths.push(moduleName);
127-
} else {
128-
129-
this.halfAuths.splice(this.halfAuths.indexOf(moduleName), 1);
130-
this.auths.splice(this.auths.indexOf(moduleName), 1);
129+
} else if (intersect.length === 0){
130+
if (this.halfAuths.indexOf(moduleName) > -1) {
131+
this.halfAuths.splice(this.halfAuths.indexOf(moduleName), 1);
132+
}
133+
if (this.auths.indexOf(moduleName) > -1) {
134+
this.auths.splice(this.auths.indexOf(moduleName), 1);
135+
}
131136
}
132137
this.halfAuths = Array.from(new Set(this.halfAuths));
133138
this.auths = Array.from(new Set(this.auths));

‎src/views/admin/user/UserInfo.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<el-input clearable v-model="form.nickname" :disabled="isEdited"></el-input>
1717
</el-form-item>
1818
<el-form-item label="邮箱" prop="email">
19-
<el-input clearable v-model="form.email" autocomplete="off"></el-input>
19+
<el-input clearable v-model="form.email" auto-complete="new-password"></el-input>
2020
</el-form-item>
2121
<el-form-item v-if="pageType === 'add'" label="密码" prop="password">
22-
<el-input clearable type="password" v-model="form.password" autocomplete="off"></el-input>
22+
<el-input clearable type="password" v-model="form.password" auto-complete="new-password"></el-input>
2323
</el-form-item>
2424
<el-form-item
2525
v-if="pageType === 'add'"

‎src/views/home/Home.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div style="height:100%;">
33
<el-container>
44
<el-aside :width="sideBarWidth" class="aside">
5-
<side-bar :isCollapse="isCollapse" class="sidebar"></side-bar>
5+
<side-bar :isCollapse="isCollapse"></side-bar>
66
</el-aside>
77
<el-container>
88
<el-header class="header">
@@ -126,6 +126,10 @@ export default {
126126
.aside {
127127
background: rgb(25, 42, 94);
128128
overflow-x: hidden;
129+
&::-webkit-scrollbar {
130+
width: 0px;
131+
height: 0px;
132+
}
129133
}
130134
131135
.header {
@@ -181,10 +185,6 @@ export default {
181185
overflow-y: auto;
182186
position: relative;
183187
padding: 0;
184-
&::-webkit-scrollbar {
185-
width: 2px;
186-
height: 0px;
187-
}
188188
}
189189
190190
.backTop {

0 commit comments

Comments
 (0)