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

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2

Browse Source 
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
This commit is contained in:
chenjinsong
2021-11-29 16:19:13 +08:00
parent d0cf76513e 85a35de8d0
commit 7581b30f2c
80 changed files with 3257 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -1,7 +1,8 @@
<template>
<div class="props-box" :loading="loading">
<!--所有属性-->
<el-tabs v-model="tab" type="card" v-if="selection.pen" @tab-click="tabClick">
<keep-alive>
<el-tabs v-model="tab" type="card" v-if="selection.pen" @tab-click="tabClick">
<el-tab-pane :label="$t('project.topology.data')" name="1">
<el-form v-model="selection.pen.data" class="pens-data" label-position="top">
<!--module-->
@@ -748,8 +749,10 @@
</el-collapse>
</el-tab-pane>
</el-tabs>
</keep-alive>
<!--选中多个-->
<div v-else-if="selection.pens" class="">
<keep-alive>
<div v-if="selection.pens" class="">
<el-collapse v-model="activeNames">
<!--对齐方式-->
<el-collapse-item :title="$t('project.topology.align')" name="1" v-if="selection.pens">
@@ -816,8 +819,10 @@
</el-collapse-item>
</el-collapse>
</div>
</keep-alive>
<!-- 选中为空 -->
<div v-else style="height: 100%">
<keep-alive>
<div v-if="!selection.pens&&!selection.pen" style="height: 100%">
<div class="project-title">
Project
</div>
@@ -1080,7 +1085,7 @@
</div>
</div>
</keep-alive>
</div>
</template>
@@ -1582,7 +1587,7 @@ export default {
},
onClickName (name) {
this.pen.name = name
// this.pen.calcControlPoints()
this.selection.pen.calcControlPoints()
this.drowdown = 0
if (this.selection.pen) {
this.selection.pen.name = name