bri-components 1.2.20 → 1.2.21

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 (38) 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/2.bri-components.min.js +1 -1
  4. package/lib/3.bri-components.min.js +1 -1
  5. package/lib/5.bri-components.min.js +1 -1
  6. package/lib/6.bri-components.min.js +1 -1
  7. package/lib/bri-components.min.js +7 -7
  8. package/lib/styles/bri-components.css +1 -1
  9. package/package.json +1 -1
  10. package/src/abolish/DshFlatTable.vue +6 -6
  11. package/src/components/controls/senior/selectDepartments.vue +2 -1
  12. package/src/components/controls/senior/selectUsers/selectUsers.vue +6 -2
  13. package/src/components/form/DshAdvSearchForm.vue +2 -2
  14. package/src/components/form/DshDefaultSearch.vue +2 -2
  15. package/src/components/form/DshForm.vue +14 -10
  16. package/src/components/form/searchMixin.js +5 -1
  17. package/src/components/list/BriFlatTable.vue +8 -4
  18. package/src/components/list/BriTable.vue +1 -0
  19. package/src/components/list/DshBox/DshCard.vue +2 -2
  20. package/src/components/list/DshBox/DshCrossTable.vue +4 -4
  21. package/src/components/list/DshBox/DshList.vue +3 -15
  22. package/src/components/list/DshBox/DshPanel.vue +2 -2
  23. package/src/components/list/DshCascaderTable.vue +4 -4
  24. package/src/components/small/BriButton.vue +11 -5
  25. package/src/components/small/{DshTdRender.js → DshListRender.js} +1 -1
  26. package/src/components/unit/{DshFormItem.vue → DshFormUnit.vue} +13 -13
  27. package/src/components/unit/{DshUnit.vue → DshListUnit.vue} +14 -5
  28. package/src/components/unit/unitMixin.js +2 -5
  29. package/src/index.js +11 -9
  30. package/src/styles/components/form/DshAdvSearchForm.less +1 -1
  31. package/src/styles/components/form/DshDefaultSearch.less +4 -4
  32. package/src/styles/components/form/DshForm.less +3 -2
  33. package/src/styles/components/index.less +2 -2
  34. package/src/styles/components/small/DshModal.less +66 -60
  35. package/src/styles/components/unit/{DshFormItem.less → DshFormUnit.less} +4 -4
  36. package/src/styles/components/unit/DshListUnit.less +3 -0
  37. package/src/utils/table.js +1 -1
  38. package/src/styles/components/unit/DshUnit.less +0 -5
package/src/styles/components/small/DshModal.less CHANGED
@@ -118,8 +118,8 @@
118
118
  .ivu-modal {
119
119
  // width: 1000px !important;
120
120
  // height: 800px !important;
121
- width: 65% !important;
122
- height: 80% !important;
121
+ width: 60% !important;
122
+ height: 85% !important;
123
123
  min-width: 500px;
124
124
  min-height: 400px;
125
125
 
@@ -167,75 +167,81 @@
167
167
  }
168
168
  }
169
169
 
170
+ .ivu-modal-mask {
171
+ background-color: rgba(55, 55, 55, 0.8);
172
+ }
170
173
 
171
174
  // 默认模态框brimodal
172
- // 通用样式
173
175
  .bri-modal {
174
- .ivu-modal-wrap {
175
- .ivu-modal {
176
- &-content {
177
- height: 100%;
178
- display: flex;
179
- flex-direction: column;
180
-
181
- .DshModal-close,
182
- .ivu-modal-close {
183
- top: 20px;
184
- right: 24px;
185
- color: @contentColor;
186
- font-size: @smallTitleSize;
187
-
188
- .ivu-icon-ios-close {
189
- font-size: 22px;
176
+ #bri-modal-common () {
177
+ .ivu-modal-wrap {
178
+ .ivu-modal {
179
+ &-content {
180
+ height: 100%;
181
+ display: flex;
182
+ flex-direction: column;
183
+
184
+ .DshModal-close,
185
+ .ivu-modal-close {
186
+ top: 20px;
187
+ right: 24px;
190
188
  color: @contentColor;
189
+ font-size: @smallTitleSize;
190
+
191
+ .ivu-icon-ios-close {
192
+ font-size: 22px;
193
+ color: @contentColor;
194
+ }
191
195
  }
192
- }
193
-
194
- .ivu-modal-header {
195
- width: 100%;
196
- height: 44px;
197
- padding: 20px 24px 0px 24px;
198
- border-bottom: none;
199
-
200
- &-inner {
201
- color: rgba(0, 0, 0, 0.9);
202
- font-size: 16px;
203
- font-weight: 500;
204
- line-height: 24px;
205
- height: 24px;
196
+
197
+ .ivu-modal-header {
198
+ width: 100%;
199
+ height: 44px;
200
+ padding: 20px 24px 0px 24px;
201
+ border-bottom: none;
202
+
203
+ &-inner {
204
+ color: rgba(0, 0, 0, 0.9);
205
+ font-size: 16px;
206
+ font-weight: 500;
207
+ line-height: 24px;
208
+ height: 24px;
209
+ }
210
+ }
211
+
212
+ .ivu-modal-body {
213
+ flex: 1;
214
+ overflow: auto;
215
+ padding: 16px 24px 20px;
206
216
  }
207
- }
208
-
209
- .ivu-modal-body {
210
- flex: 1;
211
- overflow: auto;
212
- padding: 16px 24px 20px;
213
217
  }
214
218
  }
215
219
  }
216
220
  }
217
- }
218
-
219
- // 小框 无固定高度，上下居中
220
- .bri-modal-center {
221
- .bri-modal();
221
+
222
+ #bri-modal-common();
222
223
 
223
- .ivu-modal-wrap {
224
- width: 100%;
225
- height: 100%;
226
- display: flex;
227
- flex-direction: column;
228
- align-items: center;
229
- justify-content: center;
230
-
231
- .ivu-modal {
232
- top: 0px;
224
+ // 小框 无固定高度，上下居中
225
+ &-center {
226
+ #bri-modal-common();
227
+
228
+ .ivu-modal-wrap {
229
+ width: 100%;
230
+ height: 100%;
231
+ display: flex;
232
+ flex-direction: column;
233
+ align-items: center;
234
+ justify-content: center;
235
+
236
+ .ivu-modal {
237
+ top: 0px;
238
+ }
233
239
  }
234
240
  }
241
+
242
+ // modal内部公用样式
243
+ &-footer {
244
+ text-align: right;
245
+ margin-top: 16px;
246
+ }
235
247
  }
236
-
237
- // modal内部公用样式
238
- .bri-modal-footer {
239
- text-align: right;
240
- margin-top: 16px;
241
- }
package/src/styles/components/unit/{DshFormItem.less → DshFormUnit.less} RENAMED
@@ -1,9 +1,9 @@
1
- .DshFormItem {
1
+ .DshFormUnit {
2
2
  margin: 5px 6px;
3
3
  padding: 3px 10px;
4
4
 
5
5
  &-required {
6
- .DshFormItem-label-name:before {
6
+ .DshFormUnit-label-name:before {
7
7
  content: '*';
8
8
  display: inline-block;
9
9
  line-height: 1.5;
@@ -67,7 +67,7 @@
67
67
  justify-content: space-between;
68
68
  align-items: center;
69
69
 
70
- .DshFormItem-label {
70
+ .DshFormUnit-label {
71
71
  max-width: 280px;
72
72
  // min-width: 100px;
73
73
  font-size: @textSize;
@@ -92,7 +92,7 @@
92
92
  }
93
93
  }
94
94
 
95
- .DshFormItem-control {
95
+ .DshFormUnit-control {
96
96
  flex: 1;
97
97
  min-width: 50px;
98
98
  display: flex;
package/src/styles/components/unit/DshListUnit.less ADDED
@@ -0,0 +1,3 @@
1
+ .DshListUnit {
2
+
3
+ }
package/src/utils/table.js CHANGED
@@ -44,7 +44,7 @@ const transformToColumns = function (form, {
44
44
  }
45
45
  : {
46
46
  renderBodyCell: ({ row, column, rowIndex }, h) => {
47
- return h("dsh-unit", {
47
+ return h("dsh-list-unit", {
48
48
  props: {
49
49
  canEdit: false,
50
50
  rowIndex: rowIndex,
package/src/styles/components/unit/DshUnit.less DELETED
@@ -1,5 +0,0 @@
1
- .DshUnit {
2
- // .ivu-input {
3
- // font-size: 12px;
4
- // }
5
- }