gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.10

Browse Source
This commit is contained in:
zyh
2024-05-16 17:02:15 +08:00
parent ecf7e19883 05fd5fd781
commit 48aeb972d2
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/css/components/page/dashboard/explore/exploreHistory.scss
View File

@@ -53,6 +53,7 @@
.query-prompt-content-title{ .query-prompt-content-title{
max-width: 100%; max-width: 100%;
display: inline-block; display: inline-block;
line-height: 22px;
} }
.query-prompt-content-icon{ .query-prompt-content-icon{
margin-left: 10px; margin-left: 10px;

16
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -838,10 +838,10 @@ export default {
}, },
jsonKey: 'val' jsonKey: 'val'
}, },
state: { statuses: {
target: this.searchLabel, target: this.searchLabel,
isSearchInput: true, isSearchInput: true,
propertyName: 'state', propertyName: 'statuses',
type: 'string', type: 'string',
defaultJson: { defaultJson: {
disabled: false, disabled: false,
@@ -849,9 +849,11 @@ export default {
name: 'State', name: 'State',
readonly: true, readonly: true,
type: 'select', type: 'select',
val: '' val: '',
valnum: '',
listStr: 'promState'
}, },
jsonKey: 'val' jsonKey: 'valnum'
}, },
dcIds: { dcIds: {
target: this.searchLabel, target: this.searchLabel,
@@ -880,9 +882,11 @@ export default {
name: 'Type', name: 'Type',
readonly: true, readonly: true,
type: 'select', type: 'select',
val: '' val: '',
valnum: '',
listStr: 'promType'
}, },
jsonKey: 'val' jsonKey: 'valnum'
}, },
host: { host: {
target: this.searchLabel, target: this.searchLabel,