bri-components 1.3.31 → 1.3.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.
- package/package.json +1 -1
- package/src/components/controls/base/BriUpload/BriUpload.vue +2 -12
- package/src/components/controls/base/BriUpload/uploadList.vue +35 -31
- package/src/components/controls/base/DshCascader/components/cascaderSimple.vue +1 -2
- package/src/components/controls/senior/selectUsers/selectUsers.vue +16 -13
- package/src/components/form/DshDefaultSearch.vue +1 -2
- package/src/components/list/DshCascaderTable.vue +1 -1
- package/src/components/list/DshFlatTable.vue +2 -4
- package/src/components/list/DshTreeTable.vue +146 -98
- package/src/components/list/common/flatTableImportModal.vue +1 -9
- package/src/components/list/mixins/flatTableMixin.js +11 -6
- package/src/components/list/mixins/quoteListModal.vue +215 -0
- package/src/components/list/mixins/tableBaseMixin.js +173 -32
- package/src/styles/components/list/BriTable.less +4 -16
- package/src/styles/global/variables.less +3 -0
package/package.json
CHANGED
|
@@ -77,11 +77,11 @@
|
|
|
77
77
|
<!-- 编辑和查看 列表 -->
|
|
78
78
|
<slot name="list">
|
|
79
79
|
<upload-list
|
|
80
|
+
:showMode="showMode"
|
|
80
81
|
:canEdit="finalCanEdit"
|
|
81
82
|
:files="curValList"
|
|
82
|
-
:emptyShowVal="emptyShowVal"
|
|
83
|
-
:showMode="showMode"
|
|
84
83
|
:propsObj="propsObj"
|
|
84
|
+
:emptyShowVal="emptyShowVal"
|
|
85
85
|
@deleteItem="clickDeteItem"
|
|
86
86
|
></upload-list>
|
|
87
87
|
</slot>
|
|
@@ -370,16 +370,6 @@
|
|
|
370
370
|
height: 80px;
|
|
371
371
|
}
|
|
372
372
|
}
|
|
373
|
-
|
|
374
|
-
&-inline {
|
|
375
|
-
.bri-scrollbar6();
|
|
376
|
-
height: 48px;
|
|
377
|
-
line-height: 48px;
|
|
378
|
-
|
|
379
|
-
.item {
|
|
380
|
-
flex: 0 0 48px
|
|
381
|
-
}
|
|
382
|
-
}
|
|
383
373
|
}
|
|
384
374
|
}
|
|
385
375
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
>
|
|
2
|
+
<div :class="{
|
|
3
|
+
uploadList: true,
|
|
4
|
+
[`uploadList-${showMode}`]: true
|
|
5
|
+
}">
|
|
6
6
|
<!-- 普通文本模式 -->
|
|
7
7
|
<template v-if="showMode ==='old'">
|
|
8
8
|
<!-- 有值 -->
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
class="uploadList-nodata"
|
|
51
51
|
>
|
|
52
52
|
<Icon type="ios-time" />
|
|
53
|
-
<span>{{
|
|
53
|
+
<span>{{ noDataText }}</span>
|
|
54
54
|
</div>
|
|
55
55
|
</template>
|
|
56
56
|
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
v-else
|
|
94
94
|
class="uploadList-inline-nodata"
|
|
95
95
|
>
|
|
96
|
-
{{
|
|
96
|
+
{{ noDataText }}
|
|
97
97
|
</span>
|
|
98
98
|
</template>
|
|
99
99
|
</div>
|
|
@@ -106,6 +106,10 @@
|
|
|
106
106
|
export default {
|
|
107
107
|
name: "uploadList",
|
|
108
108
|
props: {
|
|
109
|
+
showMode: {
|
|
110
|
+
type: String,
|
|
111
|
+
default: "old" // inline, old, normal
|
|
112
|
+
},
|
|
109
113
|
canEdit: {
|
|
110
114
|
type: Boolean,
|
|
111
115
|
default: true
|
|
@@ -116,23 +120,19 @@
|
|
|
116
120
|
return [];
|
|
117
121
|
}
|
|
118
122
|
},
|
|
119
|
-
showMode: {
|
|
120
|
-
type: String,
|
|
121
|
-
default: "old" // inline, old, normal
|
|
122
|
-
},
|
|
123
|
-
emptyShowVal: String,
|
|
124
123
|
propsObj: {
|
|
125
124
|
type: Object,
|
|
126
125
|
default () {
|
|
127
126
|
return {};
|
|
128
127
|
}
|
|
129
|
-
}
|
|
128
|
+
},
|
|
129
|
+
emptyShowVal: String
|
|
130
130
|
},
|
|
131
131
|
computed: {
|
|
132
132
|
imageResizeConfig () {
|
|
133
133
|
return {};
|
|
134
134
|
},
|
|
135
|
-
|
|
135
|
+
noDataText () {
|
|
136
136
|
return this.canEdit
|
|
137
137
|
? `未上传${this.propsObj._fileType === "image" ? "图片" : "文件"}`
|
|
138
138
|
: this.emptyShowVal;
|
|
@@ -334,13 +334,13 @@
|
|
|
334
334
|
}
|
|
335
335
|
|
|
336
336
|
&-action {
|
|
337
|
-
background-color: @placeholderColor;
|
|
338
|
-
display: none !important;
|
|
339
337
|
position: absolute;
|
|
340
338
|
right: 0px;
|
|
341
339
|
top: 0px;
|
|
342
340
|
left: 0px;
|
|
343
341
|
bottom: 0px;
|
|
342
|
+
background-color: @placeholderColor;
|
|
343
|
+
display: none !important;
|
|
344
344
|
align-items: center;
|
|
345
345
|
justify-content: center;
|
|
346
346
|
|
|
@@ -349,7 +349,6 @@
|
|
|
349
349
|
height: 22px;
|
|
350
350
|
line-height: 22px;
|
|
351
351
|
color: #fff;
|
|
352
|
-
margin-left: 2px;
|
|
353
352
|
}
|
|
354
353
|
}
|
|
355
354
|
}
|
|
@@ -357,31 +356,25 @@
|
|
|
357
356
|
|
|
358
357
|
// 内部表格inline模式
|
|
359
358
|
&-inline {
|
|
360
|
-
height:
|
|
361
|
-
line-height:
|
|
359
|
+
height: 32px;
|
|
360
|
+
line-height: 32px;
|
|
362
361
|
|
|
363
362
|
&-list {
|
|
364
363
|
width: 100%;
|
|
365
364
|
height: 100%;
|
|
365
|
+
padding-left: 3px;
|
|
366
366
|
display: flex;
|
|
367
367
|
flex-wrap: nowrap;
|
|
368
368
|
overflow-x: auto;
|
|
369
369
|
overflow-y: hidden;
|
|
370
|
-
padding-left: 3px;
|
|
371
370
|
|
|
372
371
|
.item {
|
|
373
|
-
flex: 0 0
|
|
374
|
-
background: #f4f5fa;
|
|
372
|
+
flex: 0 0 32px;
|
|
375
373
|
margin-right: 3px;
|
|
376
|
-
position: relative;
|
|
377
374
|
border-radius: @borderRadius;
|
|
375
|
+
background: #f4f5fa;
|
|
378
376
|
text-align: center;
|
|
379
|
-
|
|
380
|
-
.item-action {
|
|
381
|
-
display: flex !important;
|
|
382
|
-
animation: toTop 0.1s;
|
|
383
|
-
}
|
|
384
|
-
}
|
|
377
|
+
position: relative;
|
|
385
378
|
|
|
386
379
|
img {
|
|
387
380
|
max-width: 100%;
|
|
@@ -390,18 +383,22 @@
|
|
|
390
383
|
}
|
|
391
384
|
|
|
392
385
|
&-action {
|
|
393
|
-
display: none !important;
|
|
394
386
|
position: absolute;
|
|
395
387
|
left: 0;
|
|
396
388
|
right: 0;
|
|
397
389
|
top: 0;
|
|
398
390
|
bottom: 0;
|
|
391
|
+
display: none !important;
|
|
399
392
|
background-color: @placeholderColor;
|
|
400
393
|
color: #fff;
|
|
401
394
|
align-items: center;
|
|
402
395
|
justify-content: center;
|
|
403
|
-
|
|
404
|
-
|
|
396
|
+
|
|
397
|
+
&-icon {
|
|
398
|
+
width: 18px;
|
|
399
|
+
height: 18px;
|
|
400
|
+
line-height: 18px;
|
|
401
|
+
color: #fff;
|
|
405
402
|
}
|
|
406
403
|
}
|
|
407
404
|
|
|
@@ -414,6 +411,13 @@
|
|
|
414
411
|
top: 0;
|
|
415
412
|
}
|
|
416
413
|
}
|
|
414
|
+
|
|
415
|
+
&:hover {
|
|
416
|
+
.item-action {
|
|
417
|
+
display: flex !important;
|
|
418
|
+
animation: toTop 0.1s;
|
|
419
|
+
}
|
|
420
|
+
}
|
|
417
421
|
}
|
|
418
422
|
}
|
|
419
423
|
|
|
@@ -28,18 +28,19 @@
|
|
|
28
28
|
}"
|
|
29
29
|
>
|
|
30
30
|
<template v-if="!$isEmptyData(curValList)">
|
|
31
|
-
<
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
31
|
+
<template v-for="item in curValList">
|
|
32
|
+
<img
|
|
33
|
+
:src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
|
|
34
|
+
:key="item._key"
|
|
35
|
+
class="selectUsers-unit-img"
|
|
36
|
+
/>
|
|
37
|
+
<span
|
|
38
|
+
:key="item._key + 'span'"
|
|
39
|
+
class="selectUsers-unit-text"
|
|
40
|
+
>
|
|
41
|
+
{{ item.name || item.realname || item.mobile }}
|
|
42
|
+
</span>
|
|
43
|
+
</template>
|
|
43
44
|
</template>
|
|
44
45
|
|
|
45
46
|
<template v-else>
|
|
@@ -274,7 +275,9 @@
|
|
|
274
275
|
m: "fixed",
|
|
275
276
|
w: 18,
|
|
276
277
|
h: 18
|
|
277
|
-
}
|
|
278
|
+
},
|
|
279
|
+
|
|
280
|
+
allListFilterVals: []
|
|
278
281
|
};
|
|
279
282
|
},
|
|
280
283
|
computed: {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
mode="custom"
|
|
33
33
|
:propsObj="modalPropsObj"
|
|
34
34
|
>
|
|
35
|
-
<template v-if="
|
|
35
|
+
<template v-if="isEnlargeFlag">
|
|
36
36
|
<!-- 表格 -->
|
|
37
37
|
<bri-table
|
|
38
38
|
class="DshFlatTable-main"
|
|
@@ -80,9 +80,7 @@
|
|
|
80
80
|
},
|
|
81
81
|
props: {},
|
|
82
82
|
data () {
|
|
83
|
-
return {
|
|
84
|
-
isDshFlatTable: true // 做标记的
|
|
85
|
-
};
|
|
83
|
+
return {};
|
|
86
84
|
},
|
|
87
85
|
computed: {},
|
|
88
86
|
created () {},
|