gy-webcode2 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,9 +26,9 @@
26
26
  </div>
27
27
  <div class="pageHeader" v-if="pageHeaderShow">
28
28
  <div class="name">
29
- <span :class="{myHover:breadcrumb_list.length}" @click="backClick()">
29
+ <span :class="{myHover:isBack && breadcrumb_list.length}" @click="backClick()">
30
30
  <template v-if="breadcrumb_list.length">
31
- <i class="el-icon-arrow-left"></i>
31
+ <i v-if="isBack" class="el-icon-arrow-left"></i>
32
32
  {{breadcrumb_list[breadcrumb_list.length -1].name}}
33
33
  </template>
34
34
  <template v-else>
@@ -62,10 +62,14 @@ export default {
62
62
  },
63
63
  breadcrumb_list(){
64
64
  return this.$store.state.menu.breadcrumb_list;
65
+ },
66
+ isBack(){
67
+ return this.$listeners && this.$listeners['goBack']
65
68
  }
66
69
 
67
70
  },
68
71
  created(){
72
+ // console.log(this.$listeners['goBack']);
69
73
  let breadcrumb_list = this.$store.state.menu.breadcrumb_list;
70
74
  if(this.names.length){
71
75
  this.names.forEach(item => {
@@ -1,5 +1,8 @@
1
1
  <template>
2
2
  <scrollBar left="25px" top="10px" right="25px">
3
+ <div class="pageStyle">
4
+
5
+
3
6
  <div class="row1">
4
7
  整体风格设置
5
8
  </div>
@@ -38,6 +41,7 @@
38
41
  <el-switch v-model="$store.state.breadcrumbShow"></el-switch>
39
42
  </div>
40
43
  </div>
44
+ </div>
41
45
 
42
46
  </scrollBar>
43
47
  </template>
@@ -148,73 +152,59 @@
148
152
 
149
153
  <style lang="scss" scoped>
150
154
  .pageStyle{
151
- .header{
152
- height: 56px;
155
+ position: relative;
156
+ .row1{
157
+ padding: 10px 0;
158
+ // padding: 10px 0 5px 0;
159
+ font-weight: bold;
160
+ }
161
+ .stylPreview{
153
162
  display: flex;
154
- align-items: center;
155
- border-bottom: 1px solid #f0f0f0;
156
- padding-left: 25px;
157
- font-size: 16px;
158
- i{
159
- margin-right: 10px;
163
+ padding: 10px 0;
164
+ .item{
165
+ position: relative;
166
+ width: 64px;
167
+ height: 48px;
168
+ margin-right: 16px;
169
+ box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1);
160
170
  cursor: pointer;
171
+ .iconBox{
172
+ display: none;
173
+ color: #1890ff ;
174
+ font-size: 20px;
175
+ width: 20px;
176
+ height: 20px;
177
+ position: absolute;
178
+ left: 30px;
179
+ top: 22px;
180
+ }
181
+ &.active .iconBox{
182
+ display: block;
183
+ }
161
184
  }
162
185
  }
163
- .body{
164
- position: relative;
165
- .row1{
166
- padding: 10px 0;
167
- // padding: 10px 0 5px 0;
168
- font-weight: bold;
169
- }
170
- .stylPreview{
186
+ .themeColors{
187
+ display: flex;
188
+ padding: 10px 0;
189
+ .item{
190
+ width: 20px;
191
+ height: 20px;
192
+ background: #000;
193
+ border-radius: 4px;
194
+ margin-right: 8px;
171
195
  display: flex;
172
- padding: 10px 0;
173
- .item{
174
- position: relative;
175
- width: 64px;
176
- height: 48px;
177
- margin-right: 16px;
178
- box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1);
179
- cursor: pointer;
180
- .iconBox{
181
- display: none;
182
- color: #1890ff ;
183
- font-size: 20px;
184
- width: 20px;
185
- height: 20px;
186
- position: absolute;
187
- left: 30px;
188
- top: 22px;
189
- }
190
- &.active .iconBox{
191
- display: block;
192
- }
196
+ align-items: center;
197
+ justify-content: center;
198
+ text-align: center;
199
+ line-height: 20px;
200
+ color: #fff;
201
+ font-size: 12px;
202
+ cursor: pointer;
203
+ .iconBox{
204
+ display: none;
193
205
  }
194
- }
195
- .themeColors{
196
- display: flex;
197
- padding: 10px 0;
198
- .item{
199
- width: 20px;
200
- height: 20px;
201
- background: #000;
202
- border-radius: 4px;
203
- margin-right: 8px;
204
- display: flex;
205
- align-items: center;
206
- justify-content: center;
207
- text-align: center;
208
- line-height: 20px;
209
- color: #fff;
210
- font-size: 12px;
211
- cursor: pointer;
212
- .iconBox{
213
- display: none;
214
- }
215
- &.active .iconBox{
216
- display: block;
217
- }
206
+ &.active .iconBox{
207
+ display: block;
218
208
  }
219
209
  }
220
210
  }
package/css/common.scss CHANGED
@@ -59,6 +59,30 @@ a:hover{
59
59
  }
60
60
  }
61
61
 
62
+ .myBar_X_MAX,
63
+ .myBar_X_MAX .el-table--scrollable-x .el-table__body-wrapper ,
64
+ .myBar_X_MAX .el-table--scrollable-y .el-table__body-wrapper {
65
+ &::-webkit-scrollbar {
66
+ height: 16px;
67
+ }
68
+ }
69
+ .myBar_Y_MAX ,
70
+ .myBar_Y_MAX .el-table--scrollable-x .el-table__body-wrapper ,
71
+ .myBar_Y_MAX .el-table--scrollable-y .el-table__body-wrapper {
72
+ &::-webkit-scrollbar {
73
+ width: 16px;
74
+ }
75
+ }
76
+ .myBar_MAX ,
77
+ .myBar_MAX .el-table--scrollable-x .el-table__body-wrapper ,
78
+ .myBar_MAX .el-table--scrollable-y .el-table__body-wrapper {
79
+ &::-webkit-scrollbar {
80
+ height: 16px;
81
+ width: 16px;
82
+ }
83
+ }
84
+
85
+
62
86
  .hover,.iconHover{
63
87
  cursor: pointer;
64
88
  @include themeColor('color','color');
package/css/layout.scss CHANGED
@@ -215,70 +215,8 @@
215
215
  }
216
216
  .body{
217
217
  position: relative;
218
- .row1{
219
- padding: 10px 0;
220
- // padding: 10px 0 5px 0;
221
- font-weight: bold;
222
- }
223
- .stylPreview{
224
- display: flex;
225
- padding: 10px 0;
226
- .item{
227
- position: relative;
228
- width: 64px;
229
- height: 48px;
230
- margin-right: 16px;
231
- box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1);
232
- cursor: pointer;
233
- .iconBox{
234
- display: none;
235
- color: #1890ff ;
236
- font-size: 20px;
237
- width: 20px;
238
- height: 20px;
239
- position: absolute;
240
- left: 30px;
241
- top: 22px;
242
- }
243
- &.active .iconBox{
244
- display: block;
245
- }
246
- &.item_1{
247
- background-image: url("~gy-webcode2/img/theme/pageStyle_1.png");
248
- }
249
- &.item_2{
250
- background-image: url("~gy-webcode2/img/theme/pageStyle_2.png");
251
- }
252
- &.item_3{
253
- background-image: url("~gy-webcode2/img/theme/pageStyle_3.png");
254
- }
255
- }
256
- }
257
- .themeColors{
258
- display: flex;
259
- padding: 10px 0;
260
- .item{
261
- width: 20px;
262
- height: 20px;
263
- background: #000;
264
- border-radius: 4px;
265
- margin-right: 8px;
266
- display: flex;
267
- align-items: center;
268
- justify-content: center;
269
- text-align: center;
270
- line-height: 20px;
271
- color: #fff;
272
- font-size: 12px;
273
- cursor: pointer;
274
- .iconBox{
275
- display: none;
276
- }
277
- &.active .iconBox{
278
- display: block;
279
- }
280
- }
281
- }
218
+ flex: 1;
219
+ height: 0;
282
220
  }
283
221
 
284
222
  }
@@ -1,7 +1,7 @@
1
1
  //文字颜色
2
2
  .color_hong{
3
3
  // color: #b61f1f;
4
- color:#d81e06 !important;
4
+ color:#f63942 !important;
5
5
  }
6
6
  .color_lv{
7
7
  color: #52c41a !important;
@@ -436,4 +436,7 @@
436
436
  padding: 16px 16px 0 16px;
437
437
  font-weight: bold;
438
438
  margin-bottom: 16px;
439
+ }
440
+ .el-form-item{
441
+ margin-bottom: 0 !important;
439
442
  }
@@ -32,11 +32,6 @@
32
32
  // display:block;
33
33
  width: 100%;
34
34
  }
35
- // ::v-deep {
36
- .el-form-item{
37
- margin-bottom:17px;
38
- }
39
- // }
40
35
  }
41
36
  }
42
37
  .form_item[layout='left']{
@@ -16,6 +16,10 @@
16
16
  border-radius: 8px 0 0 0 ;
17
17
  }
18
18
  &:nth-last-child(2){
19
+ border-radius:0 ;
20
+ // border-right: none;
21
+ }
22
+ &:nth-last-child(1){
19
23
  border-radius:0 8px 0 0 ;
20
24
  }
21
25
  }
@@ -24,6 +28,10 @@
24
28
  padding-left:10px;
25
29
  padding-right:10px;
26
30
  }
31
+
32
+ &.el-table--mini td{
33
+ padding: 7px 0 !important;
34
+ }
27
35
 
28
36
  }
29
37
  .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
@@ -113,22 +121,3 @@
113
121
  }
114
122
  }
115
123
 
116
-
117
- .xqTable {
118
- font-size: 12px;
119
- table {
120
- width: 100%;
121
- border-left: 1px solid #cccccc;
122
- border-top: 1px solid #cccccc;
123
- }
124
- td {
125
- line-height: 18px;
126
- padding: 5px;
127
- border-right: 1px solid #cccccc;
128
- border-bottom: 1px solid #cccccc;
129
- }
130
- .td_title {
131
- vertical-align: top;
132
- background: #f3f3f3;
133
- }
134
- }
@@ -2,11 +2,12 @@
2
2
  background: #000;
3
3
  color: #fff;
4
4
  border-radius: 3px;
5
- padding: 2px ;
5
+ padding: 2px 4px ;
6
6
  font-size: 12px;
7
7
  border:1px solid #000;
8
8
  display: inline-block;
9
9
  line-height: 1;
10
+ cursor: default;
10
11
 
11
12
  &.wide{
12
13
  padding: 4px 8px ;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gy-webcode2",
3
- "version": "1.0.4",
3
+ "version": "1.0.5",
4
4
  "description": "gy前端公共代码",
5
5
  "main": "index.js",
6
6
  "scripts": {