bri-components 1.5.1 → 1.5.3

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 (9) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/mixins/controlMixin.js +3 -0
  3. package/src/components/controls/mixins/numberMixin.js +2 -2
  4. package/src/components/controls/mixins/userAndDepartMixin.js +44 -2
  5. package/src/components/controls/senior/selectDepartments.vue +3 -42
  6. package/src/components/controls/senior/selectUsers/selectUsers.vue +2 -41
  7. package/src/components/list/mixins/tableBaseMixin.js +5 -10
  8. package/src/components/list/mixins/treeTableBaseMixin.js +1 -2
  9. package/src/styles/index.less +16 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.5.1",
3
+ "version": "1.5.3",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/mixins/controlMixin.js CHANGED
@@ -216,6 +216,9 @@ export default {
216
216
  appKey () {
217
217
  return this.propsObj.appKey;
218
218
  },
219
+ controlThemeColor () {
220
+ return this.propsObj.controlThemeColor;
221
+ },
219
222
  entityKey () {
220
223
  return this.propsObj.entityKey;
221
224
  },
package/src/components/controls/mixins/numberMixin.js CHANGED
@@ -18,8 +18,8 @@ export default {
18
18
  _separator: true, // 常规-千位分隔符
19
19
  _showProgress: false, // 百分比-进度条展示(列表)
20
20
  _strokeWidth: 12, // 百分比-进度条宽（高）
21
- _overflowColor: "#87d068", // 百分比-进度条超100%颜色
22
- _compeleteColor: "#87d068", // 百分比-进度条100%颜色
21
+ _overflowColor: "#19be6b", // 百分比-进度条超100%颜色
22
+ _compeleteColor: "#19be6b", // 百分比-进度条100%颜色
23
23
  _lessColor: "#108ee9", // 百分比-进度条低于100%颜色
24
24
 
25
25
  _round: "decimal", // 取值方式 "decimal", "round", "normal"
package/src/components/controls/mixins/userAndDepartMixin.js CHANGED
@@ -80,6 +80,48 @@ export default {
80
80
  return this.selfPropsObj._cascaderDepartSelectVals || [];
81
81
  },
82
82
 
83
+ selfDepartList () {
84
+ const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
85
+ arr = cascaderVals.length
86
+ ? arr.filter(item => {
87
+ return reverseFilter
88
+ ? !cascaderVals.some(cascaderItem =>
89
+ item.code && cascaderItem.code
90
+ ? item.code.length < cascaderItem.code.length
91
+ ? false
92
+ : item.code.startsWith(cascaderItem.code)
93
+ : false
94
+ )
95
+ : cascaderVals.some(cascaderItem =>
96
+ item.code && cascaderItem.code
97
+ ? item.code.length < cascaderItem.code.length
98
+ ? cascaderItem.code.startsWith(item.code)
99
+ : item.code.startsWith(cascaderItem.code)
100
+ : false
101
+ );
102
+ })
103
+ : filterVals.length
104
+ ? arr.filter(item =>
105
+ reverseFilter
106
+ ? !filterVals.includes(item._key)
107
+ : filterVals.includes(item._key)
108
+ )
109
+ : arr;
110
+
111
+ return arr.reduce((newArr, item) => {
112
+ return [
113
+ ...newArr,
114
+ {
115
+ ...item,
116
+ children: loop(item.children, [], cascaderVals, reverseFilter)
117
+ }
118
+ ];
119
+ }, []);
120
+ };
121
+
122
+ return loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter);
123
+ // return loop(this.$deepCopy(this.departList), this.filterVals, this.cascaderVals, this.reverseFilter);
124
+ },
83
125
  tmpValKeys () {
84
126
  return this.tmpValList.map(item => item._key);
85
127
  },
@@ -205,13 +247,13 @@ export default {
205
247
  },
206
248
 
207
249
  // 处理数据
208
- transformDepartList (data = [], selectedKeys = []) {
250
+ transformShowList (data = [], selectedKeys = []) {
209
251
  return data.map(item => ({
210
252
  ...item,
211
253
  title: item.name,
212
254
  checked: selectedKeys.includes(item._key),
213
255
  expand: !!(item.children && item.children.length && item.level < this.expandLevel),
214
- children: this.transformDepartList(item.children, selectedKeys)
256
+ children: this.transformShowList(item.children, selectedKeys)
215
257
  }));
216
258
  }
217
259
  }
package/src/components/controls/senior/selectDepartments.vue CHANGED
@@ -214,51 +214,12 @@
214
214
  },
215
215
 
216
216
  departShowList () {
217
- const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
218
- arr = cascaderVals.length
219
- ? arr.filter(item => {
220
- return reverseFilter
221
- ? !cascaderVals.some(cascaderItem =>
222
- item.code && cascaderItem.code
223
- ? item.code.length < cascaderItem.code.length
224
- ? false
225
- : item.code.startsWith(cascaderItem.code)
226
- : false
227
- )
228
- : cascaderVals.some(cascaderItem =>
229
- item.code && cascaderItem.code
230
- ? item.code.length < cascaderItem.code.length
231
- ? cascaderItem.code.startsWith(item.code)
232
- : item.code.startsWith(cascaderItem.code)
233
- : false
234
- );
235
- })
236
- : filterVals.length
237
- ? arr.filter(item =>
238
- reverseFilter
239
- ? !filterVals.includes(item._key)
240
- : filterVals.includes(item._key)
241
- )
242
- : arr;
243
-
244
- return arr.reduce((newArr, item) => {
245
- if (item.children && item.children.length) {
246
- item.children = loop(item.children, [], cascaderVals, reverseFilter);
247
- }
248
-
249
- return [
250
- ...newArr,
251
- item
252
- ];
253
- }, []);
254
- };
255
-
256
- const departList = [
217
+ const selfDepartList = [
257
218
  ...(this.highSearch ? this.highList : []),
258
- ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter)
219
+ ...this.selfDepartList
259
220
  ];
260
221
 
261
- return this.transformDepartList(departList, this.tmpValKeys);
222
+ return this.transformShowList(selfDepartList, this.tmpValKeys);
262
223
  },
263
224
 
264
225
  curValShowList () {
package/src/components/controls/senior/selectUsers/selectUsers.vue CHANGED
@@ -335,45 +335,6 @@
335
335
 
336
336
  // 展示的部门
337
337
  departShowList () {
338
- const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
339
- arr = cascaderVals.length
340
- ? arr.filter(item => {
341
- return reverseFilter
342
- ? !cascaderVals.some(cascaderItem =>
343
- item.code && cascaderItem.code
344
- ? item.code.length < cascaderItem.code.length
345
- ? false
346
- : item.code.startsWith(cascaderItem.code)
347
- : false
348
- )
349
- : cascaderVals.some(cascaderItem =>
350
- item.code && cascaderItem.code
351
- ? item.code.length < cascaderItem.code.length
352
- ? cascaderItem.code.startsWith(item.code)
353
- : item.code.startsWith(cascaderItem.code)
354
- : false
355
- );
356
- })
357
- : filterVals.length
358
- ? arr.filter(item =>
359
- reverseFilter
360
- ? !filterVals.includes(item._key)
361
- : filterVals.includes(item._key)
362
- )
363
- : arr;
364
-
365
- return arr.reduce((newArr, item) => {
366
- if (item.children && item.children.length) {
367
- item.children = loop(item.children, [], cascaderVals, reverseFilter);
368
- }
369
-
370
- return [
371
- ...newArr,
372
- item
373
- ];
374
- }, []);
375
- };
376
-
377
338
  return [
378
339
  ...(this.highSearch ? this.highList : []),
379
340
  {
@@ -382,7 +343,7 @@
382
343
  level: 1,
383
344
  is_leaf: true
384
345
  },
385
- ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter),
346
+ ...this.selfDepartList,
386
347
  ...(
387
348
  this.isCompAdmin
388
349
  ? [
@@ -424,7 +385,7 @@
424
385
  ? list
425
386
  : list.filter(item => item.departmentKey === this.curDepart._key);
426
387
 
427
- return this.transformDepartList(list, this.tmpValKeys);
388
+ return this.transformShowList(list, this.tmpValKeys);
428
389
  },
429
390
  userKeys () {
430
391
  return this.userShowList.map(item => item._key);
package/src/components/list/mixins/tableBaseMixin.js CHANGED
@@ -137,7 +137,6 @@ export default {
137
137
  btnType: "errorText",
138
138
  icon: "md-trash",
139
139
  size: "small",
140
- color: "#E83636",
141
140
  disabled: false,
142
141
  event: "clickDelete"
143
142
  }
@@ -199,13 +198,10 @@ export default {
199
198
  };
200
199
  },
201
200
  computed: {
202
- appObj () {
203
- return this.$store.getters.appThemeColor;
204
- },
205
-
206
201
  dshRender () {
207
202
  return this[this.dshRenderName];
208
203
  },
204
+
209
205
  controlKey () {
210
206
  return this.propsObj._key;
211
207
  },
@@ -715,8 +711,7 @@ export default {
715
711
  : this.baseOperationMap.canInsert.name,
716
712
  tip: this.showMode === "form"
717
713
  ? this.baseOperationMap.canInsert.tip.replace("行", "条")
718
- : this.baseOperationMap.canInsert.tip,
719
- color: this.appThemeColor
714
+ : this.baseOperationMap.canInsert.tip
720
715
  },
721
716
  canHideOrShow: {
722
717
  ...this.topOperationMap.canHideOrShow,
@@ -1344,13 +1339,13 @@ export default {
1344
1339
 
1345
1340
  return operationItem && operationItem.disabled !== true
1346
1341
  ? h("div", {
1342
+ class: `dsh-color-border-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
1347
1343
  style: {
1348
1344
  position: "absolute",
1349
1345
  bottom: "0px",
1350
1346
  right: isLeft ? `${iconSize + 3}px` : "0px",
1351
1347
  width: `${iconSize + 2}px`,
1352
1348
  height: `${iconSize + 2}px`,
1353
- border: `1px solid ${operationItem.color}`,
1354
1349
  borderRadius: "2px",
1355
1350
  backgroundColor: "#ffffff",
1356
1351
  lineHeight: `${iconSize - 2}px`,
@@ -1367,9 +1362,9 @@ export default {
1367
1362
  }
1368
1363
  }, [
1369
1364
  h("Icon", {
1365
+ class: `dsh-color-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
1370
1366
  style: {
1371
- fontWeight: "500",
1372
- color: operationItem.color
1367
+ fontWeight: "500"
1373
1368
  },
1374
1369
  props: {
1375
1370
  type: operationItem.icon,
package/src/components/list/mixins/treeTableBaseMixin.js CHANGED
@@ -78,8 +78,7 @@ export default {
78
78
  : this.baseOperationMap.canCreateChild.name,
79
79
  tip: this.showMode === "form"
80
80
  ? this.baseOperationMap.canCreateChild.tip.replace("行", "条")
81
- : this.baseOperationMap.canCreateChild.tip,
82
- color: this.appThemeColor
81
+ : this.baseOperationMap.canCreateChild.tip
83
82
  }
84
83
  };
85
84
  }
package/src/styles/index.less CHANGED
@@ -9,4 +9,19 @@
9
9
  // @import "./global/global.less"; // 全局公共css
10
10
 
11
11
  @import "./iconfont/iconfont.css"; // 字体图标样式
12
- @import "./components/index.less"; // 组件样式
12
+ @import "./components/index.less"; // 组件样式
13
+
14
+ .dsh-color-primary {
15
+ color: @themeColor;
16
+ }
17
+ .dsh-color-error {
18
+ color: @error-color;
19
+ }
20
+ .dsh-color-border-primary {
21
+ border: 1px solid @themeColor;
22
+ color: @themeColor;
23
+ }
24
+ .dsh-color-border-error {
25
+ color: @error-color;
26
+ border: 1px solid @error-color;
27
+ }