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

fix: 修复panelTableNew 时间选择器样式问题

Browse Source
This commit is contained in:
@changcode
2022-01-10 11:58:26 +08:00
parent b9f899f11b
commit b07f8521a1
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/css/common/tableCommon.scss
View File

@@ -65,7 +65,7 @@
border-left: none; border-left: none;
} }
.top-tool-btn { .top-tool-btn {
background-color: $--button-icon-background-color; background-color: $--background-color-empty;
} }
} }
.top-tool-btn { .top-tool-btn {

1
nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
View File

@@ -164,7 +164,6 @@
.el-dropdown-link { .el-dropdown-link {
cursor: pointer; cursor: pointer;
font-weight: bold;
} }
.refresh { .refresh {

2
nezha-fronted/src/assets/css/components/common/timePicker.scss
View File

@@ -8,7 +8,7 @@
line-height: 40px; line-height: 40px;
height: 40px; height: 40px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid $--border-color-light; border: 1px solid $--border-color-base;
border-radius: $--border-radius-small; border-radius: $--border-radius-small;
} }
.calendar.calendar--small { .calendar.calendar--small {

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="interval-refresh"> <div class="interval-refresh margin-r-10">
<time-picker v-if="showTimePicker" ref="timePicker" v-model="searchTime" :default-pick="defaultPick" :show-empty="showEmpty" class="time-picker margin-r-10" size="small" @change="dateChange"></time-picker> <time-picker v-if="showTimePicker" ref="timePicker" v-model="searchTime" :default-pick="defaultPick" :show-empty="showEmpty" class="time-picker margin-r-10" size="small" @change="dateChange"></time-picker>
<multipleTime v-if="showMultiple" ref="multipleTime" :stepSearchTime="searchTime" class="multiple-time margin-r-10" @change="dateChange(searchTime)"/> <multipleTime v-if="showMultiple" ref="multipleTime" :stepSearchTime="searchTime" class="multiple-time margin-r-10" @change="dateChange(searchTime)"/>
<chart-unit v-if="useChartUnit" v-model="unit" class="margin-r-10"></chart-unit> <chart-unit v-if="useChartUnit" v-model="unit" class="margin-r-10"></chart-unit>

1
nezha-fronted/src/components/page/config/template/chartTemp.vue
View File

@@ -3,7 +3,6 @@
<nzDataList <nzDataList
ref="dataList" ref="dataList"
:api="url" :api="url"
v-if="switchTab === 'chartTemp'"
:layout="['searchInput', 'elementSet', 'pagination']" :layout="['searchInput', 'elementSet', 'pagination']"
:custom-table-title.sync="tools.customTableTitle" :custom-table-title.sync="tools.customTableTitle"
:from="fromRoute.chartTemp" :from="fromRoute.chartTemp"

1
nezha-fronted/src/components/page/config/template/exprTemp.vue
View File

@@ -3,7 +3,6 @@
<nzDataList <nzDataList
ref="dataList" ref="dataList"
:api="url" :api="url"
v-if="switchTab === 'exprTemp'"
:layout="['searchInput', 'elementSet', 'pagination']" :layout="['searchInput', 'elementSet', 'pagination']"
:custom-table-title.sync="tools.customTableTitle" :custom-table-title.sync="tools.customTableTitle"
:from="fromRoute.expressionTemplate" :from="fromRoute.expressionTemplate"

7
nezha-fronted/src/components/page/config/template/index.vue
View File

@@ -4,7 +4,7 @@
<div id="module-type-1" v-has="'expressionTemplate_view'" class="nz-tab-item-box" @click="templateSwitchTab('exprTemp')"> <div id="module-type-1" v-has="'expressionTemplate_view'" class="nz-tab-item-box" @click="templateSwitchTab('exprTemp')">
<div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'exprTemp'}">{{$t("config.exprTemp.exprTemp")}}</div> <div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'exprTemp'}">{{$t("config.exprTemp.exprTemp")}}</div>
</div> </div>
<div id="module-type-2" v-has="''" class="nz-tab-item-box" @click="templateSwitchTab('chartTemp')"> <div id="module-type-2" class="nz-tab-item-box" @click="templateSwitchTab('chartTemp')">
<div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'chartTemp'}">{{$t("config.chartTemp.chartTemp")}}</div> <div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'chartTemp'}">{{$t("config.chartTemp.chartTemp")}}</div>
</div> </div>
</div> </div>
@@ -47,8 +47,11 @@ export default {
if (e === 'expressionTemplate_view') { if (e === 'expressionTemplate_view') {
this.templateHasTabExprTemp = 'exprTemp' this.templateHasTabExprTemp = 'exprTemp'
this.templateHasTab = this.templateHasTabExprTemp this.templateHasTab = this.templateHasTabExprTemp
} else { } else if (e === 'chartTemplate_view') {
this.templateHasTabExprTemp = 'chartTemp' this.templateHasTabExprTemp = 'chartTemp'
this.templateHasTab = this.templateHasTabExprTemp
} else {
this.templateHasTabExprTemp = 'exprTemp'
} }
}) })
if (this.templateHasTabExprTemp) { if (this.templateHasTabExprTemp) {