diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index f00d91b40..57a1973d0 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -325,7 +325,12 @@ margin-top: 0 !important; margin-bottom: 0 !important; max-width: 626px !important; - + .hidden-padding { + padding: 0; + > span{ + padding: 0 20px; + } + } } .api-select.right-box-select-top.right-public-box-dropdown-top { .el-scrollbar__view.el-select-dropdown__list { diff --git a/nezha-fronted/src/assets/css/components/common/latIngPicker.scss b/nezha-fronted/src/assets/css/components/common/latIngPicker.scss index 64ffadc65..a234f0b30 100644 --- a/nezha-fronted/src/assets/css/components/common/latIngPicker.scss +++ b/nezha-fronted/src/assets/css/components/common/latIngPicker.scss @@ -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; + } +} + diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss index dcebc8a43..1f805b982 100644 --- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss @@ -16,6 +16,9 @@ border: none !important; } } +.meta2d-chart-hide-header { + height: calc(100% - 78px); +} .meta2d-project{ height: calc(100% - 78px); border: 1px solid; diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/pipelineSelect.scss b/nezha-fronted/src/assets/css/components/common/rightBox/pipelineSelect.scss index 7fec1290a..5ac30b331 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/pipelineSelect.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/pipelineSelect.scss @@ -24,8 +24,8 @@ display: none !important; } } -.right-box__select{ +.right-box__select-pipeline{ position: absolute; - left: -55px; + left: -65px; top: 0; } diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 2984502b4..07087b4e0 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -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'; diff --git a/nezha-fronted/src/assets/css/index.scss b/nezha-fronted/src/assets/css/index.scss index 9f4ceabc4..4d037646c 100644 --- a/nezha-fronted/src/assets/css/index.scss +++ b/nezha-fronted/src/assets/css/index.scss @@ -13,7 +13,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; // 避免ele原字体加载 } body { height: 100%; - min-width: 1024px; + min-width: 1400px; margin:0 !important; padding: 0 !important; cursor: default; diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index ae4c92033..b2c32d20f 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -19,6 +19,7 @@ :is-chart="true" :iconArray="iconArray" :ref="'topology' + index" + :paddingTop="40" /> diff --git a/nezha-fronted/src/components/chart/defaultLineData.js b/nezha-fronted/src/components/chart/defaultLineData.js index b5c5fed06..586a5b103 100644 --- a/nezha-fronted/src/components/chart/defaultLineData.js +++ b/nezha-fronted/src/components/chart/defaultLineData.js @@ -4,7 +4,7 @@ const data = { showHeader: true, name: '', dashboardId: 1244, - groupId: 0, + groupId: undefined, span: 4, height: 4, updateBy: 381, diff --git a/nezha-fronted/src/components/cli/consoleNew.vue b/nezha-fronted/src/components/cli/consoleNew.vue index eca10d6a3..27032f7d0 100644 --- a/nezha-fronted/src/components/cli/consoleNew.vue +++ b/nezha-fronted/src/components/cli/consoleNew.vue @@ -94,7 +94,8 @@ export default { this.term = new Terminal({ cursorStyle: 'block', // 光标样式 null | 'block' | 'underline' | 'bar' disableStdin: false, // 是否应禁用输入 - fontSize: 16 + fontSize: 16, + lineHeight: 1.2 }) this.term.open(terminalContainer) this.term.focus() diff --git a/nezha-fronted/src/components/cli/fileDirectory.vue b/nezha-fronted/src/components/cli/fileDirectory.vue index 9615830c1..e00d40de3 100644 --- a/nezha-fronted/src/components/cli/fileDirectory.vue +++ b/nezha-fronted/src/components/cli/fileDirectory.vue @@ -150,6 +150,9 @@ +
+ {{$t('fileDirectory.overNum', {num: overNum})}} +
this.showNum) { + this.overNum = res.data.list.length - this.showNum + res.data.list.splice(this.showNum, res.data.list.length) + } else { + this.overNum = false + } res.data.list.forEach(item => { if (item.name[0] === '.') { item.isHide = true diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue index 62bb69d89..56764a619 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue @@ -175,6 +175,7 @@ export default { }, viewGraph () { this.$refs.recordRulesQueryTab.viewGraph() + this.dropdownHandler(true) }, dropdownHandler (show) { if (!show) { diff --git a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue index 0b5eb7cf2..149820ea2 100644 --- a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue +++ b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue @@ -48,6 +48,7 @@ :class="[selectSize ? `is-${ selectSize }` : '']" :disabled="selectDisabled" :autocomplete="autoComplete || autocomplete" + :maxlength = "maxlength" @focus="handleFocus" @blur="softFocus = false" @click.stop @@ -72,6 +73,7 @@ v-model="selectedLabel" type="text" :placeholder="currentPlaceholder" + :maxlength = "maxlength" :name="name" :id="id" :autocomplete="autoComplete || autocomplete" @@ -301,6 +303,9 @@ export default { popperAppendToBody: { type: Boolean, default: true + }, + maxlength: { + type: Number } }, diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue index 0b2d8f76e..8f3f4343e 100644 --- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue +++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue @@ -12,7 +12,7 @@
- - - + +
@@ -209,9 +208,7 @@ export default { } else { this.mapParam = { ...mapParam } } - if (!this.zoom) { - this.zoom = mapParam.zoom - } + this.zoom = mapParam.zoom resolve() } }) diff --git a/nezha-fronted/src/components/common/nzTransfer.vue b/nezha-fronted/src/components/common/nzTransfer.vue index d734875f7..bd192c48e 100644 --- a/nezha-fronted/src/components/common/nzTransfer.vue +++ b/nezha-fronted/src/components/common/nzTransfer.vue @@ -8,6 +8,7 @@ :search-msg="searchMsg" :show-history="false" :show-search="false" + :isNzTransfet="true" style="width:100%" @search="search" > diff --git a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue index eab47081d..d6c3fd759 100644 --- a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue +++ b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue @@ -30,13 +30,13 @@ - + - + {{$t('overall.edit')}} - + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue index 4c6ba566c..bfaeba3aa 100644 --- a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue +++ b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue @@ -65,6 +65,7 @@ export default { historiesLength: 0 } }, + inject: ['option'], props: { meta2dId: { require: true @@ -81,10 +82,16 @@ export default { undo () { // 撤销 getTopology(this.meta2dId).undo() // getTopology(this.meta2dId).inactive() + if (this.option.map) { + getTopology(this.meta2dId).showMap() + } bus.$emit('changeSelectPens', []) }, redo () { // 重做 getTopology(this.meta2dId).redo() + if (this.option.map) { + getTopology(this.meta2dId).showMap() + } // getTopology(this.meta2dId).inactive() bus.$emit('changeSelectPens', []) }, diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 338344053..c6457b972 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -137,7 +137,7 @@ export default { getTopology(this.meta2dId).resize() getTopology(this.meta2dId).open(data) if (this.isChart) { - getTopology(this.meta2dId).fitView(true, 20) + getTopology(this.meta2dId).fitView(true, this.paddingTop) } else { getTopology(this.meta2dId).centerView() } @@ -366,12 +366,12 @@ export default { this.position.top = ePosition.layerY this.$nextTick(() => { if ((boxWidth / 2) > ePosition.layerX) { - this.position.left = ePosition.layerX + 20 + this.position.left = ePosition.layerX + 15 } else { - this.position.left = ePosition.layerX - 20 - 400 + this.position.left = ePosition.layerX - 15 - 400 } if (boxHeight / 2 > ePosition.layerY) { - this.position.top = ePosition.layerY + 50 + this.position.top = ePosition.layerY + 15 } else { this.position.top = ePosition.layerY - 300 } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 23f0f551c..100fd7024 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -466,7 +466,7 @@
- +
@@ -806,7 +806,7 @@
- +
@@ -1087,7 +1087,7 @@ :title="legend.legend" style="width: 100%" filterable - allow-create + allow-create :maxlength="64" default-first-option clearable> diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index c8e6901a6..a4e5dc082 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -13,7 +13,11 @@ @saveChart="saveChart" @getNodesArr="getNodesArr" /> -
+
{ const findItem = this.queryValues.find(query => query.name === item.legend && query.parent === item.parent) diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue index ef494396c..00d4db522 100644 --- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue @@ -98,18 +98,9 @@ import { deepClone, s8 } from '@meta2d/core' import lineData from './js/defaultPenLineData' export default { name: 'topologyTopTool', + inject: ['option'], data () { return { - option: { - lineName: 'curve', - lineWidth: 1, - fromArrow: '', - toArrow: 'triangleSolid', - scale: 100, - grid: false, - rule: false, - map: false - }, dragstartFlag: false, drawLineFlag: false, scaleNum: 100, @@ -277,10 +268,12 @@ export default { undo () { // 撤销 getTopology(this.meta2dId).undo() // getTopology(this.meta2dId).inactive() + this.showMap() bus.$emit('changeSelectPens', []) }, redo () { // 重做 getTopology(this.meta2dId).redo() + this.showMap() // getTopology(this.meta2dId).render() // getTopology(this.meta2dId).inactive() bus.$emit('changeSelectPens', []) diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue index 596db3b05..b4cfe6e31 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue @@ -15,7 +15,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index f3ca52d5a..6a7a880db 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -75,6 +75,7 @@ popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="key" size="mini" + :maxlength="64" @select="handleSelect" > diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index 63df0c5ad..a49cb11b3 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -40,8 +40,8 @@ - - + +
  {{item.name}}
 diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index a535e0c46..b549406a6 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -1025,7 +1025,7 @@ style="margin-right: 10px" @change="change('valueMapping', index)" filterable - allow-create + allow-create :maxlength="64" default-first-option > --> - + diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue index 5f98ac4c9..9fb5a76f6 100644 --- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue +++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue @@ -16,6 +16,7 @@ id="traffic-setting-asset" popper-class="no-style-class" size="small" + :maxlength="64" v-model="assetSetting.host" > @@ -177,6 +178,7 @@ :trigger-on-focus="true" popper-class="no-style-class" size="mini" + :maxlength="64" :highlight-first-item="true" @input="ifIndexInputChange(scope.row[item.prop],scope.row,scope.$index)" > diff --git a/nezha-fronted/src/components/common/searchBox/searchBox.vue b/nezha-fronted/src/components/common/searchBox/searchBox.vue index b9a1e4fa3..d2a5ee66b 100644 --- a/nezha-fronted/src/components/common/searchBox/searchBox.vue +++ b/nezha-fronted/src/components/common/searchBox/searchBox.vue @@ -182,7 +182,7 @@ v-model="editDialogObj.realValue" multiple filterable - allow-create + allow-create :maxlength="64" default-first-option :filter-method="dialogValueListSet" v-loadMore="{ diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index e08ed355d..a1b1bf370 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -501,6 +501,7 @@ export default { defaultItem: {}, defaultValue: {}, inTransform: {}, + isNzTransfet: {}, position: { type: String, default: '' @@ -1111,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) { @@ -1544,6 +1554,12 @@ export default { const inputListDom = this.$refs['input-center-box'] if (inputListDom) { this.$nextTick(() => { + if (this.isNzTransfet) { + const position = inputListDom.getBoundingClientRect() + this.selectDom.top = position.top + 36 + 'px' + this.selectDom.left = position.left + 'px' + return + } if (this.inTransform) { const position = inputListDom.getBoundingClientRect() this.selectDom.top = position.top + 36 + 'px' diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue index 87e27fd00..02d8ff1b6 100644 --- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue @@ -95,7 +95,7 @@ {{$t('overall.duplicate')}} - {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue index 2ae1b1626..4201bf071 100644 --- a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue @@ -37,9 +37,9 @@