bri-components 1.2.12 → 1.2.14

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 (32) hide show
  1. package/lib/1.bri-components.min.js +1 -1
  2. package/lib/bri-components.min.js +10 -10
  3. package/package.json +2 -2
  4. package/src/components/controls/BriControlInput.vue +9 -2
  5. package/src/components/controls/base/BriUpload/BriUpload.vue +19 -29
  6. package/src/components/controls/base/BriUpload/uploadList.vue +50 -45
  7. package/src/components/controls/base/BriUpload/uploadMixin.js +16 -1
  8. package/src/components/controls/base/DshCascader/DshCascader.vue +6 -7
  9. package/src/components/controls/base/DshCheckbox.vue +1 -2
  10. package/src/components/controls/base/DshCoordinates.vue +7 -15
  11. package/src/components/controls/controlMixin.js +5 -2
  12. package/src/components/controls/senior/BriLabels.vue +0 -1
  13. package/src/components/controls/senior/cascaderTable.vue +10 -9
  14. package/src/components/controls/senior/selectUsers/selectUsers.vue +18 -17
  15. package/src/components/list/BriFlatTable.vue +11 -3
  16. package/src/components/list/DshCascaderTable.vue +1 -0
  17. package/src/components/list/DshPage.vue +12 -14
  18. package/src/components/other/BriLoading.vue +2 -2
  19. package/src/components/small/DshTags.vue +21 -2
  20. package/src/components/unit/DshFormItem.vue +3 -1
  21. package/src/styles/common/control.less +12 -24
  22. package/src/styles/components/controls/BriControlInput.less +4 -0
  23. package/src/styles/components/controls/base/BriUpload/BriUpload.less +2 -2
  24. package/src/styles/components/controls/base/DshCascader/DshCascader.less +7 -12
  25. package/src/styles/components/controls/base/DshCheckbox.less +43 -48
  26. package/src/styles/components/controls/base/DshInput.less +1 -1
  27. package/src/styles/components/controls/base/DshNumber.less +9 -14
  28. package/src/styles/components/controls/base/DshSelect.less +81 -72
  29. package/src/styles/components/list/BriFlatTable.less +71 -0
  30. package/src/styles/components/list/DshCascaderTable.less +22 -25
  31. package/src/styles/components/small/DshTags.less +1 -0
  32. package/src/styles/components/unit/DshUnit.less +3 -3
@@ -11,7 +11,6 @@
11
11
  border-radius: 4px;
12
12
  border: none;
13
13
  color: #FFF;
14
- margin-bottom: 5px;
15
14
  margin-right: 16px;
16
15
  }
17
16
 
@@ -63,85 +62,106 @@
63
62
  }
64
63
  }
65
64
  });
66
- }
65
+ }
67
66
 
68
- &-scroll {
69
- overflow-x: auto;
70
- overflow-y: hidden;
71
- white-space: nowrap;
67
+ &-scroll {
68
+ overflow-x: auto;
69
+ overflow-y: hidden;
70
+ white-space: nowrap;
72
71
 
73
- &::-webkit-scrollbar {
74
- height: 6px;
75
- }
72
+ &::-webkit-scrollbar {
73
+ height: 6px;
74
+ }
76
75
 
77
- &:-webkit-scrollbar-thumb {
78
- border-radius: 3px;
79
- background: rgba(51, 51, 51, .1);
80
- background-clip: border-box;
81
- }
76
+ &:-webkit-scrollbar-thumb {
77
+ border-radius: 3px;
78
+ background: rgba(51, 51, 51, .1);
79
+ background-clip: border-box;
82
80
  }
83
81
  }
82
+ }
84
83
 
85
- &-modal {
86
- .ivu-modal-wrap {
87
- display: flex;
88
- align-items: center;
89
- justify-content: center;
90
- }
84
+ &-modal {
85
+ .ivu-modal-wrap {
86
+ display: flex;
87
+ align-items: center;
88
+ justify-content: center;
89
+ }
91
90
 
92
- .ivu-modal {
93
- width: 544px !important;
94
- position: static;
95
- }
91
+ .ivu-modal {
92
+ width: 544px !important;
93
+ position: static;
94
+ }
96
95
 
97
- .ivu-modal-content {
98
- border-radius: 8px;
99
- }
96
+ .ivu-modal-content {
97
+ border-radius: 8px;
98
+ }
100
99
 
101
- .ivu-modal-header {
102
- border-bottom: none;
103
- padding: 32px 32px 0;
100
+ .ivu-modal-header {
101
+ border-bottom: none;
102
+ padding: 32px 32px 0;
104
103
 
105
- .ivu-modal-header-inner {
106
- font-size: 18px;
107
- font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
108
- font-weight: 600;
109
- color: #252F36;
110
- }
104
+ .ivu-modal-header-inner {
105
+ font-size: 18px;
106
+ font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
107
+ font-weight: 600;
108
+ color: #252F36;
111
109
  }
110
+ }
112
111
 
113
112
 
114
- .DshModal-close {
115
- right: 30px !important;
116
- top: 30px !important;
117
- background: #F4F6F8;
118
- border-radius: 4px 4px 4px 4px;
119
- }
113
+ .DshModal-close {
114
+ right: 30px !important;
115
+ top: 30px !important;
116
+ background: #F4F6F8;
117
+ border-radius: 4px 4px 4px 4px;
118
+ }
120
119
 
121
- .ivu-modal-body {
122
- padding: 24px 32px 32px;
123
- }
120
+ .ivu-modal-body {
121
+ padding: 24px 32px 32px;
122
+ }
124
123
 
125
- &-footer {
126
- margin-top: 24px;
127
- text-align: right;
124
+ &-footer {
125
+ margin-top: 24px;
126
+ text-align: right;
128
127
 
129
- .ivu-btn {
130
- font-size: 16px;
131
- font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
132
- font-weight: 600;
133
- border-radius: 4px;
134
- }
128
+ .ivu-btn {
129
+ font-size: 16px;
130
+ font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
131
+ font-weight: 600;
132
+ border-radius: 4px;
135
133
  }
136
134
  }
135
+ }
136
+
137
+ &-tip {
138
+ cursor: pointer;
139
+
140
+ .ivu-radio {
141
+ display: none;
142
+ }
143
+ }
144
+ }
145
+
146
+ .ivu-select {
147
+ .ivu-select-selection {
148
+ // .bri-control-edit();
149
+ }
150
+ }
137
151
 
138
- &-tip {
139
- cursor: pointer;
152
+ .ivu-select-disabled {
153
+ .ivu-select-selection {
154
+ .bri-control-disabled();
140
155
 
141
- .ivu-radio {
142
- display: none;
156
+ &:hover {
157
+ border-color: @border-disabled;
143
158
  }
144
159
  }
160
+
161
+ .ivu-select-input[disabled] {
162
+ color: @textColor;
163
+ -webkit-text-fill-color: @textColor;
164
+ }
145
165
  }
146
166
 
147
167
  .ivu-select-item {
@@ -153,7 +173,7 @@
153
173
  }
154
174
 
155
175
  &-selected {
156
- background-color: @theme-focus !important;
176
+ background-color: @theme-focus;
157
177
  color: @themeColor;
158
178
  }
159
179
 
@@ -162,20 +182,9 @@
162
182
  .bri-control-disabled();
163
183
  }
164
184
  }
165
-
185
+
166
186
  &-input[disabled] {
167
187
  color: @textColor-disabled;
168
188
  -webkit-text-fill-color: @textColor-disabled;
169
189
  }
170
- }
171
-
172
- .ivu-select-disabled .ivu-select-selection {
173
- .bri-control-disabled();
174
- &:hover {
175
- border-color: @border-disabled;
176
- }
177
- }
178
- .ivu-select-input[disabled] {
179
- color: @textColor;
180
- -webkit-text-fill-color: @textColor-disabled;
181
- }
190
+ }
@@ -1,6 +1,77 @@
1
1
  .BriFlatTable {
2
2
  .BriFlatTable-main {
3
+ width: 100%;
3
4
  height: auto;
5
+
6
+ .table {
7
+ width: 100%;
8
+ border-spacing: 0;
9
+ border-collapse: collapse;
10
+ border-color: #E5E5E5;
11
+ background-color: #fff;
12
+
13
+ &-head {
14
+ background-color: #f0f0f0;
15
+ color: #666;
16
+
17
+ &-description {
18
+ color: #828499;
19
+ }
20
+ }
21
+
22
+ &-row {
23
+ height: 50px;
24
+
25
+ &:hover {
26
+ .table-row-td-add {
27
+ display: inline-block;
28
+ }
29
+ }
30
+
31
+ &-td {
32
+ position: relative;
33
+
34
+ .td-inner {
35
+ &-compare {
36
+ width: 100%;
37
+ }
38
+ }
39
+
40
+ &-tip {
41
+ padding: 2px 5px 0px 20px;
42
+ font-size: 12px;
43
+ line-height: 1;
44
+ color: #ed4014;
45
+ position: absolute;
46
+ top: calc(100% -15px);
47
+ left: 0px;
48
+ }
49
+
50
+ &-add {
51
+ line-height: 20px;
52
+ position: absolute;
53
+ bottom: 0px;
54
+ right: 0px;
55
+ display: none;
56
+ }
57
+ }
58
+
59
+ &-nodata {
60
+ width: 100%;
61
+ height: 40px;
62
+ text-align: center;
63
+ }
64
+ }
65
+
66
+ tbody {
67
+ // display: block;
68
+ // overflow-y: scroll;
69
+ }
70
+
71
+ thead {
72
+ // display: block;
73
+ }
74
+ }
4
75
  }
5
76
 
6
77
  &-create {
@@ -48,13 +48,24 @@
48
48
  border-collapse: collapse;
49
49
  border-color: #E5E5E5;
50
50
  line-height: 16px;
51
- color: #666;
52
51
 
53
52
  &-col {
54
53
  height: 40px;
55
54
  }
56
55
 
57
- &-row {}
56
+ &-row {
57
+ .textarea {
58
+ .ivu-input {
59
+ border: none;
60
+ box-shadow: none;
61
+ background-color: transparent;
62
+ min-height: 16px;
63
+ padding: 0px;
64
+ line-height: 16px;
65
+ font-size: 12px;
66
+ }
67
+ }
68
+ }
58
69
 
59
70
  &-nodata {
60
71
  height: 30px;
@@ -75,6 +86,15 @@
75
86
  bottom: 0px;
76
87
  z-index: 2;
77
88
  text-align: left;
89
+
90
+ &-list {
91
+ min-width: 120px;
92
+ margin: 0px;
93
+
94
+ li {
95
+ padding-left: 15px !important;
96
+ }
97
+ }
78
98
  }
79
99
 
80
100
  &:hover {
@@ -86,28 +106,5 @@
86
106
  }
87
107
  }
88
108
  }
89
-
90
109
  }
91
110
 
92
- .DshCascaderTable {
93
- .textarea {
94
- .ivu-input {
95
- border: none;
96
- box-shadow: none;
97
- background-color: transparent;
98
- min-height: 16px;
99
- padding: 0px;
100
- line-height: 16px;
101
- font-size: 12px;
102
- }
103
- }
104
- }
105
-
106
- .td-tree-dropdown-list {
107
- min-width: 120px;
108
- margin: 0px;
109
-
110
- li {
111
- padding-left: 15px !important;
112
- }
113
- }
@@ -3,6 +3,7 @@
3
3
  overflow: hidden;
4
4
  width: 100%;
5
5
  }
6
+
6
7
  &-poptip {
7
8
  &-tag {
8
9
  margin: 2px 0;
@@ -1,5 +1,5 @@
1
1
  .DshUnit {
2
- .ivu-input {
3
- font-size: 12px;
4
- }
2
+ // .ivu-input {
3
+ // font-size: 12px;
4
+ // }
5
5
  }