Skip to content

Commit a53054d

Browse files
author
张晨曦
committed
fix bug
2 parents d26cf7a + 2e22bd6 commit a53054d

File tree

7 files changed

+356
-139
lines changed

7 files changed

+356
-139
lines changed

‎web/src/apps/dataGovernance/module/common/tabCard/index.vue‎

Lines changed: 120 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,129 @@
44
<div class="tab-card-t">
55
<div class="tab-card-t-l">
66
<SvgIcon icon-class="biao" style="fontSize: 16px;" />
7-
<span style="marginLeft: 8px; fontSize: 16px">{{ model.name }}</span>
7+
<span style="marginLeft: 8px; fontSize: 16px" v-html="model.name "></span>
88
</div>
99
<div class="tab-card-t-r">
1010
<!-- <span>读取次数：{{ model.readCount }}次</span> -->
11+
<div>负责人：<span v-html="model.owner" class="content-html"></span></div>
12+
<div :title="model.createTime">创建时间：{{ model.createTime }}</div>
1113
</div>
14+
1215
</div>
1316

1417
<!-- bottom -->
1518
<div class="tab-card-b">
16-
<div :title="model.owner">负责人：{{ model.owner }}</div>
17-
<div :title="model.createTime">创建时间：{{ model.createTime }}</div>
18-
<div :title="model.dbName">数据库：{{ model.dbName }}</div>
19-
<div :title="subject">主题域：{{ subject }}</div>
20-
<div :title="layer">分层：{{ layer }}</div>
19+
<div :title="model.dbName">数据库：<span v-html="model.dbName" class="content-html"></span></div>
20+
<div :title="subject">主题域：<span v-html="subject" class="content-html"></span></div>
21+
<div :title="layer">分层：<span v-html="layer" class="content-html"></span></div>
22+
</div>
23+
24+
<div class="tab-card-b">
25+
<div v-if="!model.comment">
26+
<span>描述：-</span>
27+
</div>
28+
<div v-else>
29+
描述：<span v-html="model.comment" class="content-html"></span>
30+
</div>
31+
</div>
32+
33+
<div class="tab-card-b" style="width: 100%">
34+
<div v-if="model.labels.length > 0">
35+
<span>标签：</span>
36+
<span class="tab-card-b-tag content-html" v-for="(label, idx) in model.labels" :key="idx" v-html="label"></span>
37+
</div>
38+
<div v-else>
39+
<span>标签：-</span>
40+
</div>
41+
</div>
42+
43+
<div class="tab-card-b" v-if="model.columns && model.columns.length > 0">
44+
<div class="tab-card-b-field" style="width: 100%">
45+
<span>相关字段：</span>
46+
<span
47+
v-for="(item, idx) in model.columns"
48+
:key="idx"
49+
v-html="idx + 1 < model.columns.length ? item+'/' : item"
50+
class="content-html"></span>
51+
</div>
2152
</div>
2253
</div>
2354
</template>
2455

2556
<script>
57+
import Tag from "../../../../../components/tag/index.vue";
58+
import { EventBus } from "../../../module/common/eventBus/event-bus";
2659
export default {
2760
name: "tabCard",
2861
props: {
2962
model: {
3063
type: Object,
3164
default: null
32-
}
65+
},
3366
},
3467
data() {
3568
return {
36-
modal: []
37-
};
69+
modal: [],
70+
query: ''
71+
}
72+
},
73+
mounted() {
74+
EventBus.$on("onQueryForHighLight", query => {
75+
this.query = query
76+
});
77+
},
78+
destroyed() {
79+
EventBus.$off("onQueryForHighLight")
3880
},
3981
methods: {
4082
onChoose() {
4183
this.$emit("on-choose", this.model);
42-
}
43-
},
44-
computed: {
45-
subject: function() {
46-
let classifications = this.model.classifications;
47-
let subject = "";
48-
if (classifications && classifications.length) {
49-
classifications.forEach(classification => {
50-
if (
51-
classification.superTypeNames &&
52-
classification.superTypeNames.length
53-
) {
54-
if (classification.superTypeNames[0] === "subject") {
55-
subject = classification.typeName;
56-
}
57-
}
58-
});
5984
}
60-
return subject;
6185
},
62-
layer: function() {
63-
let classifications = this.model.classifications;
64-
let layer = "";
65-
if (classifications && classifications.length) {
66-
classifications.forEach(classification => {
67-
if (
68-
classification.superTypeNames &&
69-
classification.superTypeNames.length
70-
) {
71-
if (
72-
classification.superTypeNames[0] === "layer" ||
73-
classification.superTypeNames[0] === "layer_system"
74-
) {
75-
layer = classification.typeName;
86+
computed: {
87+
subject: function () {
88+
let classifications = this.model.classifications;
89+
let subject = "";
90+
if (classifications && classifications.length) {
91+
classifications.forEach(classification => {
92+
if (classification.superTypeNames &&
93+
classification.superTypeNames.length) {
94+
if (classification.superTypeNames[0] === "subject") {
95+
subject = classification.typeName;
96+
}
7697
}
77-
}
78-
});
98+
});
99+
}
100+
if( this.query ) {
101+
let reg = new RegExp(this.query, 'g')
102+
let _query = `<span>${this.query}</span>`
103+
subject = subject.replace(reg, _query)
104+
}
105+
return subject
106+
},
107+
layer: function () {
108+
let classifications = this.model.classifications;
109+
let layer = "";
110+
if (classifications && classifications.length) {
111+
classifications.forEach(classification => {
112+
if (classification.superTypeNames &&
113+
classification.superTypeNames.length) {
114+
if (classification.superTypeNames[0] === "layer" ||
115+
classification.superTypeNames[0] === "layer_system") {
116+
layer = classification.typeName;
117+
}
118+
}
119+
});
120+
}
121+
if( this.query ) {
122+
let reg = new RegExp(this.query, 'g')
123+
let _query = `<span>${this.query}</span>`
124+
layer = layer.replace(reg, _query)
125+
}
126+
return layer;
79127
}
80-
return layer;
81-
}
82-
}
128+
},
129+
components: { Tag }
83130
};
84131
</script>
85132

@@ -122,6 +169,9 @@ export default {
122169
@include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);
123170
text-align: left;
124171
line-height: 22px;
172+
display: flex;
173+
flex: 1;
174+
justify-content: space-between;
125175
}
126176
}
127177
.tab-card-b {
@@ -141,6 +191,30 @@ export default {
141191
@include font-color(rgba(0, 0, 0, 0.65), $dark-text-color);
142192
display: inline-block;
143193
}
194+
195+
&-field {
196+
height: 40px;
197+
line-height: 40px;
198+
@include bg-color(#F4F7FB, $dark-border-color-base);
199+
padding-left: 12px;
200+
font-family: PingFangSC-Regular;
201+
font-size: 14px;
202+
text-align: left;
203+
font-weight: 400;
204+
}
205+
206+
&-tag {
207+
background: rgba(0,0,0,0.04);
208+
border: 1px solid #DEE4EC;
209+
border-radius: 2px;
210+
padding: 4px 8px;
211+
}
212+
}
213+
}
214+
.content-html {
215+
/deep/ span {
216+
color: #3495F7;
144217
}
145218
}
219+
146220
</style>

‎web/src/apps/dataGovernance/view/assetsInfo/index.vue‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<label for="store">存储量</label>
3939
<span>{{ basicData.store }}</span>
4040
</div>
41-
<div class="assets-info-b-l-content-item">
41+
<div class="assets-info-b-l-content-item" style="overflow: hidden; width: 100%">
4242
<label for="comment">描述</label>
4343
<span v-show="!isCommentEdit">{{ basicData.comment }}</span>
4444
<!-- <Input
@@ -61,7 +61,7 @@
6161
style="float:right;cursor: pointer;"
6262
></Icon> -->
6363
</div>
64-
<div class="assets-info-b-l-content-item" style="overflow: hidden">
64+
<div class="assets-info-b-l-content-item" style="overflow: hidden; width: 100%">
6565
<label for="labels">标签</label>
6666
<div
6767
style="display: inline-block;width: calc(100% - 70px);float: right;line-height: 32px"
@@ -150,6 +150,15 @@
150150
</Select>
151151
<span v-else>{{ classification.layer }}</span>
152152
</div>
153+
154+
<div class="assets-info-b-l-content-item">
155+
<label for="tableType">表类别</label>
156+
<span>{{ basicData.tableType == 'EXTERNAL_TABLE' ? '外部表' : '内部表' }}</span>
157+
</div>
158+
<div class="assets-info-b-l-content-item" v-if=" basicData.tableType == 'EXTERNAL_TABLE' && basicData.location">
159+
<label for="location">表路径</label>
160+
<span :style="{'word-break': 'break-all'}">{{ basicData.location }}</span>
161+
</div>
153162
</div>
154163
</div>
155164
<!-- right -->
@@ -539,6 +548,7 @@ export default {
539548
font-family: PingFangSC-Regular;
540549
font-size: 14px;
541550
margin-top: 16px;
551+
padding-right: 8px;
542552
label {
543553
font-weight: normal;
544554
@include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);

0 commit comments

Comments
 (0)