meixioacomponent 0.2.57 → 0.2.60

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.
Files changed (8) hide show
  1. package/lib/meixioacomponent.common.js +104 -102
  2. package/lib/meixioacomponent.umd.js +104 -102
  3. package/lib/meixioacomponent.umd.min.js +12 -12
  4. package/lib/style/element/index.css +22 -63
  5. package/package.json +1 -1
  6. package/packages/components/proForm/dialogForm/baseDialogForm.vue +2 -1
  7. package/packages/components/proPageTable/oa_pro_table.vue +1 -1
  8. package/packages/components/style/element/index.css +22 -63
package/lib/style/element/index.css CHANGED
@@ -2965,12 +2965,7 @@
2965
2965
  .el-button.is-round {
2966
2966
  padding: 12px 20px;
2967
2967
  }
2968
- .el-button:focus,
2969
- .el-button:hover {
2970
- color: var(--color-primary);
2971
- border-color: #b3cbf4;
2972
- background-color: #e6eefb;
2973
- }
2968
+
2974
2969
  .el-button:active {
2975
2970
  color: #004ac3;
2976
2971
  border-color: #004ac3;
@@ -3285,13 +3280,7 @@
3285
3280
  .el-button--mini.is-circle {
3286
3281
  padding: 7px;
3287
3282
  }
3288
- .el-button--text {
3289
- border-color: transparent;
3290
- color: var(--color-primary);
3291
- background: 0 0;
3292
- padding-left: 0;
3293
- padding-right: 0;
3294
- }
3283
+
3295
3284
  .el-button--text:focus,
3296
3285
  .el-button--text:hover {
3297
3286
  color: #3375e1;
@@ -5176,7 +5165,7 @@
5176
5165
  z-index: -1;
5177
5166
  }
5178
5167
  .el-radio-button__orig-radio:checked + .el-radio-button__inner {
5179
- color: var(--text-color);
5168
+ color: var(--text-white);
5180
5169
  background-color: var(--color-primary);
5181
5170
  border-color: var(--color-primary);
5182
5171
  -webkit-box-shadow: -1px 0 0 0 var(--color-primary);
@@ -6604,12 +6593,7 @@
6604
6593
  .el-button.is-round {
6605
6594
  padding: 12px 20px;
6606
6595
  }
6607
- .el-button:focus,
6608
- .el-button:hover {
6609
- color: var(--color-primary);
6610
- border-color: #b3cbf4;
6611
- background-color: #e6eefb;
6612
- }
6596
+
6613
6597
  .el-button:active {
6614
6598
  color: #004ac3;
6615
6599
  border-color: #004ac3;
@@ -6923,13 +6907,7 @@
6923
6907
  .el-button--mini.is-circle {
6924
6908
  padding: 7px;
6925
6909
  }
6926
- .el-button--text {
6927
- border-color: transparent;
6928
- color: var(--color-primary);
6929
- background: 0 0;
6930
- padding-left: 0;
6931
- padding-right: 0;
6932
- }
6910
+
6933
6911
  .el-button--text:focus,
6934
6912
  .el-button--text:hover {
6935
6913
  color: #3375e1;
@@ -12245,12 +12223,7 @@
12245
12223
  .el-button.is-round {
12246
12224
  padding: 12px 20px;
12247
12225
  }
12248
- .el-button:focus,
12249
- .el-button:hover {
12250
- color: var(--color-primary);
12251
- border-color: #b3cbf4;
12252
- background-color: #e6eefb;
12253
- }
12226
+
12254
12227
  .el-button:active {
12255
12228
  color: #004ac3;
12256
12229
  border-color: #004ac3;
@@ -12557,13 +12530,7 @@
12557
12530
  .el-button--mini.is-circle {
12558
12531
  padding: 7px;
12559
12532
  }
12560
- .el-button--text {
12561
- border-color: transparent;
12562
- color: var(--color-primary);
12563
- background: 0 0;
12564
- padding-left: 0;
12565
- padding-right: 0;
12566
- }
12533
+
12567
12534
  .el-button--text:focus,
12568
12535
  .el-button--text:hover {
12569
12536
  color: #3375e1;
@@ -22400,12 +22367,7 @@
22400
22367
  .el-button.is-round {
22401
22368
  padding: 12px 20px;
22402
22369
  }
22403
- .el-button:focus,
22404
- .el-button:hover {
22405
- color: var(--color-primary);
22406
- border-color: #b3cbf4;
22407
- background-color: #e6eefb;
22408
- }
22370
+
22409
22371
  .el-button:active {
22410
22372
  color: #004ac3;
22411
22373
  border-color: #004ac3;
@@ -22735,13 +22697,7 @@
22735
22697
  .el-button--mini.is-circle {
22736
22698
  padding: 7px;
22737
22699
  }
22738
- .el-button--text {
22739
- border-color: transparent;
22740
- color: var(--color-primary);
22741
- background: 0 0;
22742
- padding-left: 0;
22743
- padding-right: 0;
22744
- }
22700
+
22745
22701
  .el-button--text:focus,
22746
22702
  .el-button--text:hover {
22747
22703
  color: #3375e1;
@@ -23918,12 +23874,7 @@
23918
23874
  .el-button.is-round {
23919
23875
  padding: 12px 20px;
23920
23876
  }
23921
- .el-button:focus,
23922
- .el-button:hover {
23923
- color: #094c5f;
23924
- border-color: #b3cbf4;
23925
- background-color: #e6eefb;
23926
- }
23877
+
23927
23878
  .el-button:active {
23928
23879
  color: #1f5b6c;
23929
23880
  border-color: #1f5b6c;
@@ -24307,16 +24258,24 @@
24307
24258
  padding-left: 0;
24308
24259
  padding-right: 0;
24309
24260
  }
24310
- .el-button--text:focus,
24311
- .el-button--text:hover {
24312
- color: #083f52;
24261
+ .el-button--primary-text {
24262
+ border-color: transparent;
24263
+ color: var(--color-primary);
24264
+ background: 0 0;
24265
+ padding-left: 0;
24266
+ padding-right: 0;
24267
+ }
24268
+ .el-button--primary-text:focus,
24269
+ .el-button--primary-text:hover {
24313
24270
  border-color: transparent;
24314
24271
  background-color: transparent;
24272
+ color: var(--color-active-primary);
24315
24273
  }
24274
+
24316
24275
  .el-button--text:active {
24317
- color: #1f5b6c;
24318
24276
  border-color: transparent;
24319
24277
  background-color: transparent;
24278
+ color: var(--color-active-primary);
24320
24279
  }
24321
24280
  .el-button--text.is-disabled,
24322
24281
  .el-button--text.is-disabled:focus,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "meixioacomponent",
3
- "version": "0.2.57",
3
+ "version": "0.2.60",
4
4
  "private": false,
5
5
  "author": "YuRi",
6
6
  "main": "lib/meixioacomponent.umd.min.js",
package/packages/components/proForm/dialogForm/baseDialogForm.vue CHANGED
@@ -211,7 +211,8 @@ export default {
211
211
  let obj = {};
212
212
  for (let i = 0; i < this.module.length; i++) {
213
213
  let result = this.$refs.proFormVue[i].returnFormValue();
214
- obj[`${this.module[i].key}`] = result;
214
+ // obj[`${this.module[i].key}`] = result;
215
+ obj = { ...obj, ...result };
215
216
  }
216
217
  return obj;
217
218
  },
package/packages/components/proPageTable/oa_pro_table.vue CHANGED
@@ -810,7 +810,7 @@ export default {
810
810
  }
811
811
  }
812
812
  /deep/ td {
813
- padding: var(--padding-4) var(--padding-5);
813
+ padding: var(--padding-2) var(--padding-3);
814
814
  .cell {
815
815
  padding-left: 0px !important;
816
816
  padding-right: 0px !important;
package/packages/components/style/element/index.css CHANGED
@@ -2965,12 +2965,7 @@
2965
2965
  .el-button.is-round {
2966
2966
  padding: 12px 20px;
2967
2967
  }
2968
- .el-button:focus,
2969
- .el-button:hover {
2970
- color: var(--color-primary);
2971
- border-color: #b3cbf4;
2972
- background-color: #e6eefb;
2973
- }
2968
+
2974
2969
  .el-button:active {
2975
2970
  color: #004ac3;
2976
2971
  border-color: #004ac3;
@@ -3285,13 +3280,7 @@
3285
3280
  .el-button--mini.is-circle {
3286
3281
  padding: 7px;
3287
3282
  }
3288
- .el-button--text {
3289
- border-color: transparent;
3290
- color: var(--color-primary);
3291
- background: 0 0;
3292
- padding-left: 0;
3293
- padding-right: 0;
3294
- }
3283
+
3295
3284
  .el-button--text:focus,
3296
3285
  .el-button--text:hover {
3297
3286
  color: #3375e1;
@@ -5176,7 +5165,7 @@
5176
5165
  z-index: -1;
5177
5166
  }
5178
5167
  .el-radio-button__orig-radio:checked + .el-radio-button__inner {
5179
- color: var(--text-color);
5168
+ color: var(--text-white);
5180
5169
  background-color: var(--color-primary);
5181
5170
  border-color: var(--color-primary);
5182
5171
  -webkit-box-shadow: -1px 0 0 0 var(--color-primary);
@@ -6604,12 +6593,7 @@
6604
6593
  .el-button.is-round {
6605
6594
  padding: 12px 20px;
6606
6595
  }
6607
- .el-button:focus,
6608
- .el-button:hover {
6609
- color: var(--color-primary);
6610
- border-color: #b3cbf4;
6611
- background-color: #e6eefb;
6612
- }
6596
+
6613
6597
  .el-button:active {
6614
6598
  color: #004ac3;
6615
6599
  border-color: #004ac3;
@@ -6923,13 +6907,7 @@
6923
6907
  .el-button--mini.is-circle {
6924
6908
  padding: 7px;
6925
6909
  }
6926
- .el-button--text {
6927
- border-color: transparent;
6928
- color: var(--color-primary);
6929
- background: 0 0;
6930
- padding-left: 0;
6931
- padding-right: 0;
6932
- }
6910
+
6933
6911
  .el-button--text:focus,
6934
6912
  .el-button--text:hover {
6935
6913
  color: #3375e1;
@@ -12245,12 +12223,7 @@
12245
12223
  .el-button.is-round {
12246
12224
  padding: 12px 20px;
12247
12225
  }
12248
- .el-button:focus,
12249
- .el-button:hover {
12250
- color: var(--color-primary);
12251
- border-color: #b3cbf4;
12252
- background-color: #e6eefb;
12253
- }
12226
+
12254
12227
  .el-button:active {
12255
12228
  color: #004ac3;
12256
12229
  border-color: #004ac3;
@@ -12557,13 +12530,7 @@
12557
12530
  .el-button--mini.is-circle {
12558
12531
  padding: 7px;
12559
12532
  }
12560
- .el-button--text {
12561
- border-color: transparent;
12562
- color: var(--color-primary);
12563
- background: 0 0;
12564
- padding-left: 0;
12565
- padding-right: 0;
12566
- }
12533
+
12567
12534
  .el-button--text:focus,
12568
12535
  .el-button--text:hover {
12569
12536
  color: #3375e1;
@@ -22400,12 +22367,7 @@
22400
22367
  .el-button.is-round {
22401
22368
  padding: 12px 20px;
22402
22369
  }
22403
- .el-button:focus,
22404
- .el-button:hover {
22405
- color: var(--color-primary);
22406
- border-color: #b3cbf4;
22407
- background-color: #e6eefb;
22408
- }
22370
+
22409
22371
  .el-button:active {
22410
22372
  color: #004ac3;
22411
22373
  border-color: #004ac3;
@@ -22735,13 +22697,7 @@
22735
22697
  .el-button--mini.is-circle {
22736
22698
  padding: 7px;
22737
22699
  }
22738
- .el-button--text {
22739
- border-color: transparent;
22740
- color: var(--color-primary);
22741
- background: 0 0;
22742
- padding-left: 0;
22743
- padding-right: 0;
22744
- }
22700
+
22745
22701
  .el-button--text:focus,
22746
22702
  .el-button--text:hover {
22747
22703
  color: #3375e1;
@@ -23918,12 +23874,7 @@
23918
23874
  .el-button.is-round {
23919
23875
  padding: 12px 20px;
23920
23876
  }
23921
- .el-button:focus,
23922
- .el-button:hover {
23923
- color: #094c5f;
23924
- border-color: #b3cbf4;
23925
- background-color: #e6eefb;
23926
- }
23877
+
23927
23878
  .el-button:active {
23928
23879
  color: #1f5b6c;
23929
23880
  border-color: #1f5b6c;
@@ -24307,16 +24258,24 @@
24307
24258
  padding-left: 0;
24308
24259
  padding-right: 0;
24309
24260
  }
24310
- .el-button--text:focus,
24311
- .el-button--text:hover {
24312
- color: #083f52;
24261
+ .el-button--primary-text {
24262
+ border-color: transparent;
24263
+ color: var(--color-primary);
24264
+ background: 0 0;
24265
+ padding-left: 0;
24266
+ padding-right: 0;
24267
+ }
24268
+ .el-button--primary-text:focus,
24269
+ .el-button--primary-text:hover {
24313
24270
  border-color: transparent;
24314
24271
  background-color: transparent;
24272
+ color: var(--color-active-primary);
24315
24273
  }
24274
+
24316
24275
  .el-button--text:active {
24317
- color: #1f5b6c;
24318
24276
  border-color: transparent;
24319
24277
  background-color: transparent;
24278
+ color: var(--color-active-primary);
24320
24279
  }
24321
24280
  .el-button--text.is-disabled,
24322
24281
  .el-button--text.is-disabled:focus,