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

Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7

Browse Source
This commit is contained in:
zhangyu
2023-03-06 16:17:13 +08:00
parent ba8c1a61aa de49073057
commit 7efa29fcbf
7 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss
View File

@@ -149,5 +149,8 @@
.nz-icon{
color: $--color-text-regular;
}
.activeLi .nz-icon {
color: $--color-primary;
}
}

4
nezha-fronted/src/components/common/js/common.js
View File

@@ -16,6 +16,10 @@ export function getUUID () {
return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4())
}
export function s8 () {
return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1)
}
export const chartCache = {}
export function getChart (key) {

2
nezha-fronted/src/components/common/nezhaColor.vue
View File

@@ -19,7 +19,7 @@
<div v-if="showColorPicker" class="vue-color right-box-select-top" :style="{top:position.y+'px',left:position.x+'px'}" ref="colorBox">
<el-row v-if="!single" class="color-tab">
<div v-for="item in valueArr" :key="item.key" :class="[keyName==item.name?'color-active':'']" @click="colorTabChange(item)">{{item.name}}</div>
<div v-for="item in valueArr" :key="item.key" :class="[keyName==item.name?'color-active':'']" @click.stop="colorTabChange(item)">{{item.name}}</div>
</el-row>
<sketch v-model="colors" :disableAlpha="disableAlpha" @input="updateValue" :presetColors="presetColors"/>
</div>

4
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -628,7 +628,7 @@
<el-row v-if="chartConfig.param.enable.thresholds && isThresholdConfig(chartConfig.type)">
<el-form-item
v-for="(item,index) in chartConfig.param.thresholds"
:key="item.color + '' + index"
:key="item.id + '' + index"
class="thresholds-item"
:prop="'param.thresholds.' + index + '.value'"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
@@ -1083,6 +1083,7 @@ import publicConfig from '@/components/common/rightBox/chart/publicConfig'
import chartTypeShow from '@/components/common/rightBox/chart/chartTypeShow'
import VueTagsInput from '@johmun/vue-tags-input'
import draggable from 'vuedraggable'
import { s8 } from '@/components/common/js/common'
import { randomcolor, ColorReverse } from '@/components/common/js/radomcolor/randomcolor'
import { isSankey } from '@/components/chart/chart/tools'
@@ -1348,6 +1349,7 @@ export default {
},
addThresholds () {
this.chartConfig.param.thresholds.push({
id: s8(),
value: undefined,
color: randomcolor()
})

8
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -129,7 +129,7 @@
<script>
import { fromRoute } from '@/components/common/js/constants'
import editRigthBox from '@/components/common/mixin/editRigthBox'
import { resetZIndex, getUUID } from '@/components/common/js/common'
import { resetZIndex, getUUID, s8 } from '@/components/common/js/common'
import selectPanel from '@/components/common/popBox/selectPanel'
import chartConfig from '@/components/common/rightBox/chart/chartConfig'
import otherChartConfig from '@/components/common/rightBox/chart/otherChartConfig'
@@ -377,7 +377,7 @@ export default {
valueMapping: false,
visibility: false
},
thresholds: [{ value: undefined, color: '#eeeeeeff' }],
thresholds: [{ id: s8(), value: undefined, color: '#eeeeeeff' }],
showHeader: this.editChart.param.showHeader,
visibility: {
varName: '',
@@ -536,6 +536,10 @@ export default {
}
if (obj.param && !obj.param.thresholds) {
obj.param.thresholds = []
} else if (obj.param && obj.param.thresholds) {
obj.param.thresholds.forEach(item => {
item.id = s8()
})
}
if (obj.groupId === -1) {
obj.groupId = ''

2
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -398,7 +398,7 @@
<el-row v-if="chartConfig.param.enable.thresholds && isThresholdConfig(chartConfig.type)">
<el-form-item
v-for="(item,index) in chartConfig.param.thresholds"
:key="item.color + '' + index"
:key="item.id + '' + index"
class="thresholds-item"
:prop="'param.thresholds.' + index + '.value'"
:rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"

2
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -389,7 +389,7 @@ export default {
}
this.variablesInit = false
this.showPanel = val
this.variables = this.$loadsh.get(this, 'showPanel.param.variables', []) || []
this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || [])
this.showPanel.type = 'dashboard'
this.filter.panelId = this.showPanel.id
this.panelId = this.showPanel.id