bri-components 1.4.31 → 1.4.33

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/senior/selectDepartments.vue +1 -2
  3. package/src/components/controls/senior/selectUsers/selectUsers.vue +57 -21
  4. package/src/components/list/DshBox/DshTable.vue +2 -2
  5. package/src/components/list/mixins/tableBaseMixin.js +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.4.31",
3
+ "version": "1.4.33",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/senior/selectDepartments.vue CHANGED
@@ -120,7 +120,6 @@
120
120
  >
121
121
  <!-- 有值 -->
122
122
  <template v-if="!$isEmptyData(curShowValList)">
123
- <!-- 表单查看 -->
124
123
  <!-- 高度自由时 -->
125
124
  <dsh-tags
126
125
  v-if="isHeightAuto"
@@ -331,7 +330,7 @@
331
330
  &-show {
332
331
  &-auto,
333
332
  &-ellipsis {
334
- margin: 5px 0px;
333
+ margin: 2px 0px;
335
334
  }
336
335
  }
337
336
  }
package/src/components/controls/senior/selectUsers/selectUsers.vue CHANGED
@@ -173,32 +173,60 @@
173
173
  <!-- 有值 -->
174
174
  <template v-if="!$isEmptyData(curShowValList)">
175
175
  <!-- 单元格查看 -->
176
- <bri-tooltip
177
- v-if="isUnitShow"
178
- :content="showVal"
179
- placement="top"
180
- maxWidth="200"
181
- :transfer="true"
182
- >
183
- <div :class="{
184
- ...commonClass,
185
- 'selectUsers-show-unit': true
186
- }">
176
+ <template v-if="isUnitShow">
177
+ <!-- 高度自由时 -->
178
+ <div
179
+ v-if="isHeightAuto"
180
+ :class="{
181
+ ...commonClass,
182
+ 'selectUsers-show-auto': true,
183
+ 'selectUsers-show-unit': true
184
+ }"
185
+ >
187
186
  <template v-for="item in curShowValList">
188
187
  <img
189
- :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
188
+ :src="getAvatarUrl(item)"
190
189
  :key="item._key"
191
190
  class="selectUsers-show-unit-img"
192
191
  />
193
192
  <span
194
- :key="item._key + 'span'"
193
+ :key="item._key"
195
194
  class="selectUsers-show-unit-text"
196
195
  >
197
196
  {{ getShowName(item) }}
198
197
  </span>
199
198
  </template>
200
199
  </div>
201
- </bri-tooltip>
200
+
201
+ <!-- 高度不自由（不换行） -->
202
+ <bri-tooltip
203
+ v-else
204
+ :content="showVal"
205
+ placement="top"
206
+ maxWidth="200"
207
+ :transfer="true"
208
+ >
209
+ <div :class="{
210
+ ...commonClass,
211
+ 'selectUsers-show-ellipsis': true,
212
+ 'selectUsers-show-unit': true
213
+ }">
214
+ <template v-for="item in curShowValList">
215
+ <img
216
+ :src="getAvatarUrl(item)"
217
+ :key="item._key"
218
+ class="selectUsers-show-unit-img"
219
+ />
220
+ <span
221
+ :key="item._key + 'span'"
222
+ class="selectUsers-show-unit-text"
223
+ >
224
+ {{ getShowName(item) }}
225
+ </span>
226
+ </template>
227
+ </div>
228
+ </bri-tooltip>
229
+ </template>
202
230
 
203
231
  <!-- 表单查看 -->
204
232
  <template v-else>
@@ -453,6 +481,12 @@
453
481
  getShowName (selectItem) {
454
482
  return selectItem.realname || selectItem.name || selectItem.mobile;
455
483
  },
484
+ // 获取头像
485
+ getAvatarUrl (selectItem) {
486
+ return selectItem.avatarurl
487
+ ? this.$imageResize(selectItem.avatarurl, this.imageResizeConfig)
488
+ : this.$imageSrcMap.system.boy;
489
+ },
456
490
  getData () {
457
491
  this.getDepartListData();
458
492
  this.getListData();
@@ -514,19 +548,21 @@
514
548
  &-show {
515
549
  &-auto,
516
550
  &-ellipsis {
517
- margin: 5px 0px;
551
+ margin: 2px 0px;
518
552
  }
519
553
 
520
554
  &-unit {
521
- .dsh-ellipsis();
522
- padding-left: 5px;
523
-
524
555
  &-img {
525
- width: 18px;
556
+ width: 23px;
526
557
  height: 18px;
527
- vertical-align: middle;
528
- margin-left: -5px;
558
+ padding-left: 5px;
529
559
  border-radius: 50%;
560
+ vertical-align: middle;
561
+
562
+ &:first-of-type {
563
+ width: 18px;
564
+ padding-left: 0px;
565
+ }
530
566
  }
531
567
 
532
568
  &-text {
package/src/components/list/DshBox/DshTable.vue CHANGED
@@ -106,7 +106,7 @@
106
106
  key: "__selection__",
107
107
  field: "__selection__",
108
108
  type: "checkbox", // 内置类型
109
- width: 66,
109
+ width: 50,
110
110
  align: "center",
111
111
  fixed: "left"
112
112
  };
@@ -117,7 +117,7 @@
117
117
  _key: "__index__",
118
118
  key: "__index__",
119
119
  field: "__index__",
120
- width: 78,
120
+ width: 60,
121
121
  align: "center",
122
122
  fixed: "left",
123
123
  renderBodyCell: ({ row, rowIndex, column }, h) => {
package/src/components/list/mixins/tableBaseMixin.js CHANGED
@@ -532,7 +532,7 @@ export default {
532
532
  key: "__selection__",
533
533
  field: "__selection__",
534
534
  type: "checkbox",
535
- width: 66,
535
+ width: 50,
536
536
  align: "center",
537
537
  fixed: "left"
538
538
  };
@@ -1135,7 +1135,7 @@ export default {
1135
1135
  e.stopPropagation();
1136
1136
  }
1137
1137
  }
1138
- });
1138
+ });
1139
1139
  },
1140
1140
  topSearchRender (h) {
1141
1141
  return this.searchFormList.length
@@ -1425,7 +1425,7 @@ export default {
1425
1425
  getRowDelBtnCanEdit (row, rowIndex) {
1426
1426
  return row.__readonly__ !== true && // 不能为只读数据
1427
1427
  (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
1428
- (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
1428
+ (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
1429
1429
  },
1430
1430
  // 行内容是否可编辑
1431
1431
  getRowCanEdit (row, rowIndex) {