bri-components 1.3.39 → 1.3.40
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
CHANGED
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
<!-- 全屏模式 -->
|
|
43
43
|
<dsh-modal
|
|
44
44
|
v-model="isEnlarge"
|
|
45
|
-
mode="
|
|
45
|
+
:mode="modalPropsObj.mode"
|
|
46
46
|
:propsObj="modalPropsObj"
|
|
47
47
|
>
|
|
48
48
|
<template v-if="isEnlargeFlag">
|
|
@@ -194,7 +194,7 @@
|
|
|
194
194
|
return this.selfPropsObj._searchLabelWidth;
|
|
195
195
|
},
|
|
196
196
|
searchFormList () {
|
|
197
|
-
return this.selfPropsObj._searchFields || [] // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
|
|
197
|
+
return (this.selfPropsObj._searchFields || []) // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
|
|
198
198
|
.map(fieldKey => this.columns.find(column => column._key === fieldKey))
|
|
199
199
|
.filter(column => !!column)
|
|
200
200
|
.map(column => {
|
|
@@ -29,17 +29,26 @@
|
|
|
29
29
|
class="DshModal-header"
|
|
30
30
|
>
|
|
31
31
|
<slot name="header">
|
|
32
|
-
<div class="ivu-modal-header-inner
|
|
32
|
+
<div class="ivu-modal-header-inner">
|
|
33
33
|
{{ selfPropsObj.title }}
|
|
34
34
|
</div>
|
|
35
35
|
</slot>
|
|
36
36
|
|
|
37
37
|
<slot name="header-right"></slot>
|
|
38
|
+
|
|
39
|
+
<!-- 关闭按图标 -这是定位上去的 -->
|
|
40
|
+
<Icon
|
|
41
|
+
v-if="mode === 'fullscreen'"
|
|
42
|
+
class="DshModal-close"
|
|
43
|
+
type="md-close"
|
|
44
|
+
size="20"
|
|
45
|
+
@click.native.stop="visibleChange(false)"
|
|
46
|
+
/>
|
|
38
47
|
</div>
|
|
39
48
|
|
|
40
|
-
<!-- 关闭按图标 -->
|
|
49
|
+
<!-- 关闭按图标 -这是定位上去的 -->
|
|
41
50
|
<Icon
|
|
42
|
-
v-if="selfPropsObj.showSlotClose"
|
|
51
|
+
v-if="mode !== 'fullscreen' && selfPropsObj.showSlotClose"
|
|
43
52
|
class="DshModal-close"
|
|
44
53
|
type="md-close"
|
|
45
54
|
size="20"
|
|
@@ -59,7 +68,10 @@
|
|
|
59
68
|
export default {
|
|
60
69
|
name: "DshModal",
|
|
61
70
|
props: {
|
|
62
|
-
value:
|
|
71
|
+
value: {
|
|
72
|
+
type: Boolean,
|
|
73
|
+
default: false
|
|
74
|
+
},
|
|
63
75
|
mode: {
|
|
64
76
|
type: String,
|
|
65
77
|
default: "default",
|
|
@@ -98,8 +110,9 @@
|
|
|
98
110
|
// resetDragPosition: false, // Modal 再次打开时，是否重置拖拽的位置
|
|
99
111
|
transfer: true,
|
|
100
112
|
showSlotClose: true, // 显示删除
|
|
101
|
-
|
|
113
|
+
fullscreen: this.mode === "fullscreen",
|
|
102
114
|
...this.propsObj,
|
|
115
|
+
|
|
103
116
|
class: [
|
|
104
117
|
"DshModal",
|
|
105
118
|
`DshModal-${this.mode}`,
|