bri-components 1.2.1 → 1.2.2

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 (33) hide show
  1. package/lib/0.bri-components.min.js +1 -1
  2. package/lib/1.bri-components.min.js +1 -1
  3. package/lib/5.bri-components.min.js +1 -1
  4. package/lib/bri-components.min.js +5 -5
  5. package/package.json +1 -1
  6. package/src/components/controls/base/BriUpload/BriUploadImage.vue +45 -32
  7. package/src/components/controls/base/BriUpload/uploadMixin.js +3 -2
  8. package/src/components/controls/base/DshCascader/DshCascader.vue +3 -6
  9. package/src/components/controls/base/DshCheckbox.vue +130 -137
  10. package/src/components/controls/base/DshCoordinates.vue +121 -147
  11. package/src/components/controls/base/DshDaterange.vue +1 -1
  12. package/src/components/controls/base/DshEditor.vue +2 -1
  13. package/src/components/controls/base/DshSelect.vue +3 -13
  14. package/src/components/controls/base/DshSwitch.vue +13 -20
  15. package/src/components/controls/controlMixin.js +10 -1
  16. package/src/components/controls/senior/BriLabels.vue +1 -0
  17. package/src/components/controls/senior/selectUsers/DepartmentMenu.vue +2 -2
  18. package/src/components/small/DshTags.vue +131 -8
  19. package/src/styles/common/control.less +4 -2
  20. package/src/styles/components/controls/.DS_Store +0 -0
  21. package/src/styles/components/controls/base/BriUpload/BriUpload.less +1 -1
  22. package/src/styles/components/controls/base/BriUpload/BriUploadImage.less +6 -0
  23. package/src/styles/components/controls/base/DshCascader/DshCascader.less +16 -11
  24. package/src/styles/components/controls/base/DshCheckbox.less +32 -59
  25. package/src/styles/components/controls/base/DshCoordinates.less +1 -35
  26. package/src/styles/components/controls/base/DshSelect.less +16 -1
  27. package/src/styles/components/controls/base/DshSwitch.less +1 -31
  28. package/src/styles/components/controls/senior/.DS_Store +0 -0
  29. package/src/styles/components/controls/senior/BriLabels.less +1 -1
  30. package/src/styles/components/list/BriFlatTable.less +1 -1
  31. package/src/styles/components/small/DshModal.less +20 -42
  32. package/src/styles/components/small/DshTags.less +32 -14
  33. package/src/styles/components/unit/DshFormItem.less +3 -25
package/src/styles/components/controls/base/BriUpload/BriUpload.less CHANGED
@@ -160,7 +160,7 @@
160
160
  &-unit {
161
161
  .uploadList {
162
162
  &-inline-nodata {
163
- color: @text-color;
163
+ .bri-control-nodata();
164
164
  }
165
165
  }
166
166
  }
package/src/styles/components/controls/base/BriUpload/BriUploadImage.less CHANGED
@@ -78,4 +78,10 @@
78
78
  }
79
79
  }
80
80
  }
81
+
82
+ &-cropper {
83
+ width: 400px;
84
+ height: 400px;
85
+ margin: 0 auto;
86
+ }
81
87
  }
package/src/styles/components/controls/base/DshCascader/DshCascader.less CHANGED
@@ -26,12 +26,6 @@
26
26
  &-show {
27
27
  &-multiple {
28
28
  #bri-control-wrap();
29
-
30
- .overflow {
31
- &-unit {
32
- .dsh-ellipsis();
33
- }
34
- }
35
29
  }
36
30
 
37
31
  &-single {
@@ -41,11 +35,22 @@
41
35
 
42
36
  // 多选类型且独自一行时
43
37
  &-row {
44
- height: 68px;
45
-
46
- .overflow {
47
- width: 100%;
48
- height: 100%;
38
+ &-edit,
39
+ &-show {
40
+ .text,
41
+ .overflow {
42
+ width: 100%;
43
+ height: 100%;
44
+ white-space: normal;
45
+ overflow: auto;
46
+ .bri-scrollbar3();
47
+ }
48
+ }
49
+ &-edit {
50
+ height: 68px;
51
+ }
52
+ &-show {
53
+ height: auto;
49
54
  }
50
55
  }
51
56
  }
package/src/styles/components/controls/base/DshCheckbox.less CHANGED
@@ -4,21 +4,20 @@
4
4
  &-group {
5
5
  width: 100%;
6
6
 
7
- &-disabled {
8
- .ivu-checkbox-disabled+span {
9
- color: #515a6e;
10
- }
7
+ // 选中时背景为白色
8
+ .ivu-checkbox-checked .ivu-checkbox-inner {
9
+ background-color: @themeColor;
11
10
  }
12
11
 
13
12
  &-color {
14
13
  .ivu-checkbox-border {
14
+ margin-bottom: 5px;
15
+ margin-right: 16px;
15
16
  height: 32px;
16
17
  line-height: 32px;
17
18
  border-radius: 4px;
18
19
  border: none;
19
20
  color: #FFF;
20
- margin-bottom: 5px;
21
- margin-right: 16px;
22
21
  }
23
22
 
24
23
  .ivu-checkbox {
@@ -37,29 +36,25 @@
37
36
  }
38
37
 
39
38
  each(@resourceColor, {
40
- .color-@{index} {
41
- .ivu-checkbox {
42
- .ivu-checkbox-inner {
43
- border-color: @value;
44
- }
39
+ .color-@{index} {
40
+ .ivu-checkbox {
41
+ .ivu-checkbox-inner {
42
+ border-color: @value;
45
43
  }
46
44
  }
47
45
 
48
- .color-@{index}.myChecked {
49
- .ivu-checkbox-checked {
50
- .ivu-checkbox-inner {
51
- background-color: @value;
52
- }
46
+ .ivu-checkbox-checked {
47
+ .ivu-checkbox-inner {
48
+ background-color: @value;
53
49
  }
54
50
  }
55
51
  }
56
-
57
- );
52
+ });
58
53
  }
59
54
 
60
- &-disabled-color {
55
+ &-disabled {
61
56
  .ivu-checkbox-disabled+span {
62
- color: inherit;
57
+ color: #515a6e;
63
58
  }
64
59
  }
65
60
 
@@ -80,35 +75,19 @@
80
75
  }
81
76
  }
82
77
 
83
- // 选中时背景为白色
84
- .myChecked {
85
- .ivu-checkbox-checked .ivu-checkbox-inner {
86
- background-color: @themeColor;
87
- }
88
- }
78
+ &-item {
89
79
 
90
- &-content {
91
- text-align: center;
92
- border-radius: 12px;
93
- line-height: 100%;
94
- padding: 5px 10px;
95
- font-size: 14px;
96
- vertical-align: middle;
97
80
  }
98
81
 
99
- &-tip {
100
- cursor: pointer;
82
+ &-show {
101
83
 
102
- .ivu-checkbox {
103
- display: none;
104
- }
105
84
  }
106
85
 
107
86
  .ivu-select-multiple {
108
87
  .ivu-select-selection {
109
88
  height: 32px;
110
89
 
111
- &>div {
90
+ & > div {
112
91
  overflow-x: auto;
113
92
  overflow-y: hidden;
114
93
  white-space: nowrap;
@@ -129,28 +108,22 @@
129
108
  }
130
109
  }
131
110
 
111
+ &.ivu-select-default {
112
+ .ivu-select-selection {
113
+ height: 32px;
114
+ overflow: hidden;
115
+
116
+ & > div {
117
+ width: 100%;
118
+ height: 100%;
119
+ .dsh-flex-row-start-center();
120
+ flex-wrap: wrap;
121
+ }
122
+ }
123
+ }
124
+
132
125
  .ivu-select-item-selected:after {
133
126
  content: none;
134
127
  }
135
128
  }
136
- }
137
-
138
- // TODO：必须单独拿出来，DshSelect组件里在混入此样式
139
- .DshCheckbox-value {
140
- height: 24px;
141
- line-height: 20px;
142
- padding: 2px 8px;
143
- border-radius: 4px;
144
- margin-right: 8px;
145
- display: inline-flex;
146
-
147
- &:last-of-type {
148
- margin-right: 0px;
149
- }
150
-
151
- &-wrapper {
152
- min-height: 32px;
153
- padding: 4px 0;
154
- .dsh-ellipsis();
155
- }
156
129
  }
package/src/styles/components/controls/base/DshCoordinates.less CHANGED
@@ -1,37 +1,8 @@
1
1
  .DshCoordinates {
2
2
  width: 100%;
3
- line-height: 30px;
4
3
 
5
4
  &-edit {
6
- position: relative;
7
- padding: 0 32px 0 8px;
8
-
9
- .value {
10
- width: 100%;
11
- display: flex;
12
- justify-content: space-between;
13
- align-items: center;
14
-
15
- &-name {
16
- .dsh-ellipsis();
17
- }
18
-
19
- &-icon {
20
- padding: 5px;
21
- }
22
- }
23
-
24
- .nodata {
25
- color: @placeholderColor;
26
-
27
- &-icon {
28
- color: #e5e5e5;
29
- line-height: 32px;
30
- position: absolute;
31
- right: 6px;
32
- top: 0;
33
- }
34
- }
5
+ #bri-control-wrap ();
35
6
  }
36
7
 
37
8
  &-modal {
@@ -76,9 +47,4 @@
76
47
  }
77
48
  }
78
49
  }
79
-
80
- &-show {
81
- padding: 0 8px;
82
- line-height: 32px;
83
- }
84
50
  }
package/src/styles/components/controls/base/DshSelect.less CHANGED
@@ -136,7 +136,22 @@
136
136
  }
137
137
 
138
138
  &-value {
139
- .DshCheckbox-value();
139
+ height: 24px;
140
+ line-height: 20px;
141
+ padding: 2px 8px;
142
+ border-radius: 4px;
143
+ margin-right: 8px;
144
+ display: inline-flex;
145
+
146
+ &:last-of-type {
147
+ margin-right: 0px;
148
+ }
149
+
150
+ &-wrapper {
151
+ min-height: 32px;
152
+ padding: 4px 0;
153
+ .dsh-ellipsis();
154
+ }
140
155
  }
141
156
 
142
157
  &-tip {
package/src/styles/components/controls/base/DshSwitch.less CHANGED
@@ -2,36 +2,6 @@
2
2
  width: 100%;
3
3
 
4
4
  &-show {
5
- height: 24px;
6
- padding: 2px 8px;
7
- border-radius: 4px;
8
- line-height: 20px;
9
- flex-grow: 1;
10
- display: flex;
11
- justify-content: flex-start;
12
-
13
- &-name {
14
- .dsh-ellipsis();
15
- display: flex;
16
- min-height: 32px;
17
- padding: 4px;
18
- }
19
- }
20
-
21
- .ivu-switch {
22
- width: 50px;
23
- }
24
- .ivu-switch-checked:after {
25
- left: 29px;
26
- }
27
- .ivu-switch-inner {
28
- color: #fff;
29
- font-size: 12px;
30
- position: absolute;
31
- left: auto;
32
- right: 4px;
33
- }
34
- .ivu-switch-checked .ivu-switch-inner {
35
- left: 3px;
5
+ .bri-unit-show();
36
6
  }
37
7
  }
package/src/styles/components/controls/senior/BriLabels.less CHANGED
@@ -1,7 +1,7 @@
1
1
  .BriLabels {
2
2
  width: 100%;
3
3
 
4
- &-dit {
4
+ &-edit {
5
5
  #bri-control-wrap();
6
6
  }
7
7
 
package/src/styles/components/list/BriFlatTable.less CHANGED
@@ -1,5 +1,5 @@
1
1
  .BriFlatTable {
2
- &-main {
2
+ .BriFlatTable-main {
3
3
  height: auto;
4
4
  }
5
5
  &-create {
package/src/styles/components/small/DshModal.less CHANGED
@@ -154,54 +154,32 @@
154
154
 
155
155
  // 默认模态框brimodal
156
156
  .bri-modal {
157
- .ivu-modal-header {
158
- padding: 14px 36px;
159
-
160
- .ivu-modal-header-inner {
161
- color: @titleColor;
162
- font-size: @titleSize;
163
- font-weight: bold;
164
- }
165
- }
166
-
167
- .ivu-modal-body {
168
- padding: 16px;
157
+ .DshModal-close {
158
+ top: 20px;
159
+ right: 24px;
160
+ color: rgba(0,0,0,0.6);
161
+ font-size: 16px;
169
162
  }
170
163
 
171
- .ivu-modal-footer {
172
- display: flex;
173
- justify-content: space-between;
174
- padding: 20px;
175
-
176
- button {
177
- width: 48%;
178
- height: 44px;
179
- line-height: 44px;
164
+ .ivu-modal-header {
165
+ width: 100%;
166
+ height: 44px;
167
+ padding: 20px 24px 0px 24px;
168
+ border-bottom: none;
169
+ &-inner {
170
+ color: rgba(0,0,0,0.9);
171
+ font-size: 16px;
172
+ font-weight: 500;
173
+ line-height: 24px;
174
+ height: 24px;
180
175
  }
181
176
  }
182
-
183
- &-content {
184
- padding: 20px 0;
177
+ .ivu-modal-body {
178
+ padding: 16px 24px 20px;
185
179
  }
186
180
 
187
181
  &-footer {
188
- display: flex;
189
- justify-content: space-between;
190
- padding: 20px 0;
191
-
192
- button {
193
- flex: 1;
194
- margin: 0 10px;
195
- height: 44px;
196
- line-height: 44px;
197
-
198
- &:first-child {
199
- margin-left: 0;
200
- }
201
-
202
- &:last-child {
203
- margin-right: 0;
204
- }
205
- }
182
+ text-align: right;
183
+ margin-top: 16px;
206
184
  }
207
185
  }
package/src/styles/components/small/DshTags.less CHANGED
@@ -1,17 +1,35 @@
1
- .DshTags {
2
- .ivu-tag {
3
- &-default {
4
- border: none;
5
- background-color: @borderColor;
6
- color: @text-color;
1
+ .DshTags {
2
+ &-autoEllipsis {
3
+ overflow: hidden;
4
+ width: 100%;
5
+ }
6
+ &-poptip {
7
+ &-tag {
8
+ margin: 2px 0;
9
+ .dsh-flex-row-between-center();
7
10
  }
8
- &-size-medium {
9
- height: 24px;
10
- line-height: 26px;
11
- padding: 0 8px;
11
+ .ivu-tag-text {
12
+ .dsh-ellipsis();
12
13
  }
13
- &[disabled] {
14
- background-color: @border-disabled;
15
- }
16
- }
14
+ }
15
+ }
16
+
17
+ .ivu-tag {
18
+ &-default {
19
+ border: none;
20
+ background-color: @borderColor;
21
+ color: @text-color;
22
+ }
23
+ &-size-medium {
24
+ height: 24px;
25
+ line-height: 26px;
26
+ padding: 0 8px;
27
+ }
28
+ &[disabled] {
29
+ background-color: @border-disabled;
30
+ }
31
+
32
+ .ivu-tag-text {
33
+ color: inherit;
34
+ }
17
35
  }
package/src/styles/components/unit/DshFormItem.less CHANGED
@@ -46,7 +46,7 @@
46
46
  color: @textColor;
47
47
  }
48
48
  &-show {
49
- color: @contentColor
49
+ color: @contentColor;
50
50
  }
51
51
  &-sign {
52
52
  #dsh-sign-change();
@@ -59,12 +59,7 @@
59
59
  }
60
60
 
61
61
  &-control {
62
- min-height: 30px;
63
-
64
- .DshPackage-edit {
65
- border: none;
66
- padding: 0;
67
- }
62
+ min-height: 32px;
68
63
  }
69
64
 
70
65
  &-line {
@@ -79,6 +74,7 @@
79
74
  overflow: hidden;
80
75
  margin: 0px;
81
76
  margin-right: 8px;
77
+
82
78
  // fixedbug:line模式下显示必填
83
79
  margin-left: -10px;
84
80
  padding-left: 10px;
@@ -102,24 +98,6 @@
102
98
  display: flex;
103
99
  justify-content: flex-end;
104
100
  align-items: center;
105
-
106
- .ivu-select-default.ivu-select-multiple {
107
- .ivu-select-selection {
108
- height: 32px;
109
- overflow: hidden;
110
-
111
- &>div {
112
- width: 100%;
113
- height: 100%;
114
- .dsh-flex-row-start-center();
115
- flex-wrap: wrap;
116
- }
117
- }
118
- }
119
101
  }
120
102
  }
121
-
122
- .ivu-tooltip {
123
- display: flex;
124
- }
125
103
  }