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

Merge remote-tracking branch 'origin/codeCheck' into codeCheck

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/charts/chart-single-stat.vue
#	nezha-fronted/src/components/charts/chart-table.vue
#	nezha-fronted/src/components/charts/chart-url.vue
#	nezha-fronted/src/components/charts/line-chart-block.vue
#	nezha-fronted/src/components/charts/text-chart.vue
This commit is contained in:
chenjinsong
2020-12-15 21:21:35 +08:00
parent b7b238bb1e 935d37e611
commit 7f00a1483f
35 changed files with 1323 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -51,7 +51,7 @@
<span class="temp-dom"></span>
<draggable v-model="dataList" @start="start" @end="end" :move="move" :key
<draggable v-model="dataList" @start="start" @end="end" :move="move" :key :disabled="panelLock"
:scroll-sensitivity="150"
:options="{
group:{name:'chartGroup',pull:'false'},
@@ -75,6 +75,7 @@
@on-drag-chart="editChartForDrag"
@on-edit-chart-block="editData"
:panel-id="filter.panelId"
:is-lock="panelLock"
:chart-index="index"
:chart-data="item"></line-chart-block>
@@ -86,6 +87,7 @@
@on-drag-chart="editChartForDrag"
@on-edit-chart-block="editData"
:chart-data="item"
:is-lock="panelLock"
:panel-id="filter.panelId"
:chart-index="index"></chart-single-stat>
@@ -96,6 +98,7 @@
@on-duplicate-chart-block="duplicateChart"
@on-drag-chart="editChartForDrag"
@on-edit-chart-block="editData"
:is-lock="panelLock"
:panel-id="filter.panelId"
:chart-data="item"
:chart-index="index"></chart-table>
@@ -106,6 +109,7 @@
@on-remove-chart-block="removeChart"
@on-duplicate-chart-block="duplicateChart"
@on-drag-chart="editChartForDrag"
:is-lock="panelLock"
@on-edit-chart-block="editData"
:panel-id="filter.panelId"
:chart-data="item"
@@ -115,6 +119,7 @@
:from="from" :panel-id="filter.panelId"
:chart-index="index"
@on-refresh-data="refreshChart"
:is-lock="panelLock"
:chart-data="item"
:editChartId="'editChartId' + item.id"
></chart-detail>
@@ -125,6 +130,7 @@
@on-duplicate-chart-block="duplicateChart"
@on-drag-chart="editChartForDrag"
@on-edit-chart-block="editData"
:is-lock="panelLock"
:panel-id="filter.panelId"
:chart-data="item"
:chart-index="index"
@@ -135,6 +141,7 @@
:chart-index="index"
v-if="item.type === 'alertList'"
:editChartId="'editChartId' + item.id"
:is-lock="panelLock"
:chart-info="item"
@on-refresh-data="refreshChart"
@on-search-data="searchData"
@@ -170,7 +177,8 @@
additionalInfo:{},
draggable: {type: Boolean, default: true},
detail: Object,
from: {type: String}
from: {type: String},
panelLock:{type:Boolean,default:false}
},
components: {
@@ -219,7 +227,7 @@
this.tempDom.width = span.offsetWidth;
},
start (event) {
//console.log('start', event, this.dataList);
// console.log('start', event, this.dataList);
event.item.querySelector('.chartTitle').style.background = '#d8dce1';
let projectAndAssetFeatureInfos = event.item.querySelectorAll(".feature-content");
if (projectAndAssetFeatureInfos && projectAndAssetFeatureInfos.length > 0) {