diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue
index 709555e7..217de09b 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue
@@ -56,14 +56,13 @@
{ label: $t('no'), value: false },
]
"
- type="html"
>
-
-
+ {{ valueTypeMap[row.value_type] }}
+ {{ row[column.field] }}
@@ -196,9 +195,8 @@ export default {
.trim()
.toLowerCase()
if (filterName) {
- const filterRE = new RegExp(filterName, 'gi')
const searchProps = ['name', 'alias', 'value_type']
- const rest = this.tableData.filter((item) =>
+ this.list = this.tableData.filter((item) =>
searchProps.some(
(key) =>
XEUtils.toValueString(item[key])
@@ -206,16 +204,6 @@ export default {
.indexOf(filterName) > -1
)
)
- this.list = rest.map((row) => {
- const item = Object.assign({}, row)
- searchProps.forEach((key) => {
- item[key] = XEUtils.toValueString(item[key]).replace(
- filterRE,
- (match) => `${match}`
- )
- })
- return item
- })
} else {
this.list = this.tableData
}
diff --git a/cmdb-ui/src/views/noticeCenter/index.vue b/cmdb-ui/src/views/noticeCenter/index.vue
index 28c15279..a7b211e7 100644
--- a/cmdb-ui/src/views/noticeCenter/index.vue
+++ b/cmdb-ui/src/views/noticeCenter/index.vue
@@ -85,7 +85,7 @@
-
+ {{ row.content }}