bri-components 1.2.18 → 1.2.20

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/bri-components.min.js +2 -2
  2. package/package.json +1 -1
  3. package/src/components/controls/base/DshInput.vue +5 -0
  4. package/src/components/controls/senior/selectUsers/selectUsers.vue +22 -19
  5. package/src/components/small/DshModal.vue +2 -2
  6. package/src/styles/components/controls/senior/selectUsers/selectUsers.less +1 -0
  7. package/src/styles/components/small/BriTooltip.less +12 -7
  8. package/src/styles/components/small/DshModal.less +19 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.18",
3
+ "version": "1.2.20",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/base/DshInput.vue CHANGED
@@ -55,6 +55,7 @@
55
55
  >
56
56
  <div :class="{
57
57
  ...commonClass,
58
+ 'dsh-ellipsis': unitWrap,
58
59
  'DshInput-unit': isUnitShow,
59
60
  'DshInput-show': !isUnitShow
60
61
  }">
@@ -102,6 +103,7 @@
102
103
  _autosize: {
103
104
  minRows: 2
104
105
  },
106
+ _wrap: true, // 单元格文字换行
105
107
 
106
108
  ...this.propsObj,
107
109
  ...this.commonDealPropsObj
@@ -119,6 +121,9 @@
119
121
  // 子类型，只在type="text"有效
120
122
  subType () {
121
123
  return this.selfPropsObj._textType;
124
+ },
125
+ unitWrap () {
126
+ return !(this.isUnitShow && !!this.selfPropsObj._wrap);
122
127
  }
123
128
  },
124
129
  created () {},
package/src/components/controls/senior/selectUsers/selectUsers.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  :transfer="true"
7
7
  maxWidth="200"
8
8
  >
9
- <div @click.stop="clickInput">
9
+ <div @click="clickInput">
10
10
  <slot>
11
11
  <!-- 编辑 -->
12
12
  <bri-control-input
@@ -28,10 +28,10 @@
28
28
  v-else-if="isUnitShow"
29
29
  class="selectUsers-unit"
30
30
  >
31
- <template v-if="!$isEmptyData(curValList)">
31
+ <template v-if="!$isEmptyData(curValList)">
32
32
  <img
33
33
  v-for="item in curValList"
34
- :src="item.avatarurl || $imageSrcMap.system.boy"
34
+ :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
35
35
  :key="item._key"
36
36
  class="selectUsers-unit-img"
37
37
  />
@@ -225,6 +225,7 @@
225
225
  closable: true,
226
226
  class: "bri-modal-center"
227
227
  },
228
+
228
229
  // 筛选
229
230
  searchData: {
230
231
  name: ""
@@ -242,10 +243,10 @@
242
243
  realname: "当前用户"
243
244
  }
244
245
  ],
245
-
246
246
  loading: false,
247
247
  userList: [],
248
248
  departmentList: [],
249
+
249
250
  // 分页
250
251
  total: 0,
251
252
  pagePropsObj: {
@@ -270,6 +271,11 @@
270
271
  btnType: "primary",
271
272
  event: "clickConfirm"
272
273
  }
274
+ },
275
+ imageResizeConfig: {
276
+ m: "fixed",
277
+ w: 18,
278
+ h: 18
273
279
  }
274
280
  };
275
281
  },
@@ -319,7 +325,7 @@
319
325
  if (this.finalCanEdit) {
320
326
  this.openModal();
321
327
  this.newValList = this.$deepCopy(this.curValList);
322
- this.initModal();
328
+ this.modalInit();
323
329
  }
324
330
  },
325
331
  clickDeleteItem (deleteItem) {
@@ -330,7 +336,7 @@
330
336
  },
331
337
 
332
338
  /* ---------- 弹框里 --------- */
333
- initModal () {
339
+ modalInit () {
334
340
  this.searchData = {
335
341
  name: ""
336
342
  };
@@ -394,34 +400,31 @@
394
400
 
395
401
  /* ----------- 接口方法 ------------- */
396
402
  getUserListData () {
397
- this.loading = true;
398
403
  this.userList = [];
399
- let searchName = this.searchData.name;
400
- let search = {};
401
- if (searchName && searchName !== "") {
402
- search["realname"] = {
403
- "$regex": `.*${this.$speciaWord(searchName)}.*`, $options: "i"
404
- };
405
- } else {
406
- delete search["realname"];
407
- }
404
+
408
405
  this.$https({
409
406
  url: {
410
407
  module: "company",
411
408
  name: "userIndex"
412
409
  },
413
410
  params: {
414
- search: search,
411
+ search: {
412
+ realname: this.searchData.name
413
+ ? {
414
+ "$regex": `.*${this.$speciaWord(this.searchData.name)}.*`, $options: "i"
415
+ }
416
+ : undefined
417
+ },
415
418
  department: this.curDepartment._key,
416
419
  pagination: {
417
420
  page: this.pagePropsObj.page,
418
421
  pagesize: this.pagePropsObj.pagesize
419
422
  }
420
423
  },
424
+ loadingName: "loading",
421
425
  callback: data => {
422
- this.total = data.total;
423
426
  this.userList = data.list;
424
- this.loading = false;
427
+ this.total = data.total;
425
428
  }
426
429
  });
427
430
  },
package/src/components/small/DshModal.vue CHANGED
@@ -63,8 +63,8 @@
63
63
  mode: {
64
64
  type: String,
65
65
  default: "default",
66
- validator: function (value) {
67
- return ["small", "default", "middle", "large", "custom", "auto"].indexOf(value) !== -1;
66
+ validator (val) {
67
+ return ["small", "default", "middle", "large", "custom", "auto"].includes(val);
68
68
  }
69
69
  },
70
70
  propsObj: {
package/src/styles/components/controls/senior/selectUsers/selectUsers.less CHANGED
@@ -7,6 +7,7 @@
7
7
 
8
8
  &-unit {
9
9
  .dsh-ellipsis();
10
+ padding-left: 5px;
10
11
 
11
12
  &-img {
12
13
  width: 18px;
package/src/styles/components/small/BriTooltip.less CHANGED
@@ -1,20 +1,25 @@
1
1
  .BriTooltip {
2
2
  display: flex;
3
-
4
- .ivu-tooltip-arrow {
5
- border-bottom-color: rgba(0, 0, 0, 0.9) !important;
3
+ }
4
+
5
+ .ivu-tooltip {
6
+ &-arrow {
7
+ border-bottom-color: @textColor !important;
6
8
  }
7
9
 
8
- .ivu-tooltip-inner {
10
+ &-inner {
9
11
  padding: 5px 8px;
10
12
  border-radius: 4px;
11
- background: rgba(0, 0, 0, 0.9);
13
+ line-height: 22px;
14
+ background: @textColor;
12
15
  font-size: 14px;
13
16
  font-weight: 400;
14
- color: rgba(255, 255, 255, 0.9);
17
+ color: @textWhColor;
18
+ max-height: 350px;
19
+ overflow: auto;
15
20
  }
16
21
 
17
- .ivu-tooltip-rel {
22
+ &-rel {
18
23
  width: 100%;
19
24
  }
20
25
  }
package/src/styles/components/small/DshModal.less CHANGED
@@ -3,6 +3,7 @@
3
3
  width: 100%;
4
4
  height: 100%;
5
5
  }
6
+
6
7
  &-close {
7
8
  padding: 2px;
8
9
  position: absolute;
@@ -81,8 +82,8 @@
81
82
  .DshModal-close {
82
83
  top: 20px;
83
84
  right: 24px;
84
- color: rgba(0,0,0,0.6);
85
- font-size: 16px!important;
85
+ color: rgba(0, 0, 0, 0.6);
86
+ font-size: 16px !important;
86
87
  }
87
88
 
88
89
  .ivu-modal {
@@ -93,7 +94,7 @@
93
94
  border-bottom: none;
94
95
 
95
96
  &-inner {
96
- color: rgba(0,0,0,0.9);
97
+ color: rgba(0, 0, 0, 0.9);
97
98
  font-size: 16px;
98
99
  font-weight: 500;
99
100
  line-height: 24px;
@@ -121,8 +122,18 @@
121
122
  height: 80% !important;
122
123
  min-width: 500px;
123
124
  min-height: 400px;
125
+
124
126
  // max-width: 900px;
125
127
  // max-height: 800px;
128
+ .ivu-modal-content {
129
+ .ivu-modal-header {
130
+
131
+ &-inner {
132
+ line-height: 24px;
133
+ height: 24px;
134
+ }
135
+ }
136
+ }
126
137
  }
127
138
  }
128
139
  }
@@ -166,26 +177,26 @@
166
177
  height: 100%;
167
178
  display: flex;
168
179
  flex-direction: column;
169
-
180
+
170
181
  .DshModal-close,
171
182
  .ivu-modal-close {
172
183
  top: 20px;
173
184
  right: 24px;
174
185
  color: @contentColor;
175
186
  font-size: @smallTitleSize;
176
-
187
+
177
188
  .ivu-icon-ios-close {
178
189
  font-size: 22px;
179
190
  color: @contentColor;
180
191
  }
181
192
  }
182
-
193
+
183
194
  .ivu-modal-header {
184
195
  width: 100%;
185
196
  height: 44px;
186
197
  padding: 20px 24px 0px 24px;
187
198
  border-bottom: none;
188
-
199
+
189
200
  &-inner {
190
201
  color: rgba(0, 0, 0, 0.9);
191
202
  font-size: 16px;
@@ -194,7 +205,7 @@
194
205
  height: 24px;
195
206
  }
196
207
  }
197
-
208
+
198
209
  .ivu-modal-body {
199
210
  flex: 1;
200
211
  overflow: auto;