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

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

Browse Source
This commit is contained in:
zhangyu
2023-06-26 15:46:29 +08:00
parent 966de386da ea62255cd1
commit aa372ffe2e
9 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nezha-fronted/src/assets/css/components/common/latIngPicker.scss
View File

@@ -6,7 +6,7 @@
margin-right: 20px;
flex: 1;
}
.latlng .input-box .el-input,.latlng .input-box .el-input-number{
.latlng .input-box .input-box-item .el-input,.latlng .input-box .input-box-item .el-input-number{
width: 100%;
}
.latlng .map-config-dialog .el-dialog{
@@ -20,3 +20,24 @@
padding:0px 5px!important;
}
.prepend_unit{
display: flex;
.el-input--small .el-input__inner {
border-radius: 0 4px 4px 0;
border-left: none;
}
&::before{
content: attr(data-unit);
//position: absolute;
display: inline-block;
top: 0;
right: 100%;
padding: 0 5px;
color: $--color-text-secondary;
background-color: $--background-color-base;
border: 1px solid $--border-color-light;
border-radius:4px 0 0 4px;
}
}

4
nezha-fronted/src/assets/css/components/common/rightBox/pipelineSelect.scss
View File

@@ -24,8 +24,8 @@
display: none !important;
}
}
.right-box__select{
.right-box__select-pipeline{
position: absolute;
left: -55px;
left: -65px;
top: 0;
}

1
nezha-fronted/src/assets/css/components/index.scss
View File

@@ -60,6 +60,7 @@
@import './common/rightBox/assetMetaBox.scss';
@import './common/rightBox/menuBox.scss';
@import './common/rightBox/moduleBox.scss';
@import './common/rightBox/pipelineSelect.scss';
@import './common/rightBox/ipam.scss';
@import './common/rightBox/assetMetaBox.scss';
@import './common/rightBox/chartRightBox/chartRightBox.scss';

9
nezha-fronted/src/components/common/latlngPicker.vue
View File

@@ -7,9 +7,8 @@
</el-input>
</div>
<div class="input-box-item" v-if="showZoom">
<el-input v-model="zoom" :max="mapParam.maxZoom" :min="mapParam.minZoom" :step="1" controls-position="right">
<template v-if="showZoom" slot="prepend">{{$t('config.system.basic.zoom')}}</template>
</el-input>
<el-input-number v-model="zoom" :max="mapParam.maxZoom" :precision="0" :min="mapParam.minZoom" :controls="false" class="prepend_unit" :data-unit="$t('config.system.basic.zoom')">
</el-input-number>
</div>
<div class="input-box-item" style="margin-right: unset !important;width: 30px !important;flex:unset;" @click="mapConfigVisible = true"><i class="nz-icon nz-icon-weizhi" style="color:rgb(238, 157, 63)"></i></div>
</div>
@@ -209,9 +208,7 @@ export default {
} else {
this.mapParam = { ...mapParam }
}
if (!this.zoom) {
this.zoom = mapParam.zoom
}
this.zoom = mapParam.zoom
resolve()
}
})

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

@@ -2,7 +2,7 @@
<span style="position: relative">
<el-select
id="module-box-logs-pipeline-type"
class="right-box__select"
class="right-box__select right-box__select-pipeline"
placeholder=""
popper-class="right-box-select-top prevent-clickoutside pipeline"
size="small"
@@ -22,7 +22,7 @@
</el-option>
</el-option-group>
</el-select>
<i class="nz-icon nz-icon-plus" @click="addPipelineShow" :title="$t('tip.add')"></i>
<i class="nz-icon nz-icon-plus" @click="addPipelineShow" :title="$t('tip.add')" style="top: 2px"></i>
</span>
</template>

11
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -1112,7 +1112,16 @@ export default {
// 获取历史记录 数据进行处理以便循环展示
restructure_historyDate () {
if (localStorage.getItem('nz-history-' + this.where) !== undefined && localStorage.getItem('nz-history-' + this.where) !== null) {
this.history_once = JSON.parse(localStorage.getItem('nz-history-' + this.where))
const arr = JSON.parse(localStorage.getItem('nz-history-' + this.where))
arr.forEach(labelArr => {
labelArr.forEach((item)=>{
const findItem = this.searchMsg.searchLabelList.find(searchLabel => searchLabel.id == item.id)
if(findItem) {
item.name = findItem.name
}
})
})
this.history_once = arr
}
},
clear_search_list (e) {

2
nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
View File

@@ -95,7 +95,7 @@
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
<!-- <el-dropdown-item v-has="'asset_label_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>-->
<el-dropdown-item v-has="'asset_label_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_label_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:false, single:true}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_label_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:false}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>

6
nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
View File

@@ -38,15 +38,15 @@
<template v-else-if="item.prop === 'state'">
<div v-if="scope.row[item.prop] === 1">
<span class="nz-icon nz-icon-circle ip-detail-available"></span>
{{ 'Available' }}
{{ $t('overall.ipam.available') }}
</div>
<div v-else-if="scope.row[item.prop] === 2">
<span class="nz-icon nz-icon-circle ip-detail-transient"></span>
{{ 'Transient' }}
{{ $t('overall.ipam.available') }}
</div>
<div v-else-if="scope.row[item.prop] === 3">
<span class="nz-icon nz-icon-circle ip-detail-used"></span>
{{ 'Used' }}
{{ $t('overall.ipam.used') }}
</div>
</template>
<span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>

2
nezha-fronted/src/components/page/config/assetMeta.vue
View File

@@ -38,7 +38,7 @@
ref="deleteButton"
:single="false"
:from="'assetMeta'"
:forceDeleteShow="false"
:forceDeleteShow="true"
:delete-objs="batchDeleteObjs"
@after="getTableData"
id="meta-msg-batch-delete"