diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 5f8b8e965..efed5e35f 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -102,8 +102,21 @@ } } } - - + .el-form-item { + .el-input__count { + line-height: 29px; + height: 25px; + } + } + .el-form-item { + .el-input--small.not-fixed-height { + height: 32px; + .el-input__count { + line-height: 29px; + height: 25px; + } + } + } .el-input__inner, .el-textarea__inner { padding: 0 10px; border-radius: $--primary-border-radius; diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue index 304cc951c..fe88bf3ab 100644 --- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue +++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue @@ -160,11 +160,10 @@ export default { this.titleSearchListCopy[key].children.forEach((item, i) => { /* (基础宽度 + 文字宽度) 总和大于文本长时 显示更多 */ if (index === -1) { - if (this.titleSearchListCopy[key].width < this.contentWidth) { - this.titleSearchListCopy[key].width += this.getDomWidth(this.titleSearchListCopy[key], item, i) - } else { + this.titleSearchListCopy[key].width += this.getDomWidth(this.titleSearchListCopy[key], item, i) + if (this.titleSearchListCopy[key].width > this.contentWidth) { this.titleSearchListCopy[key].showMore = true - this.titleSearchListCopy[key].index = i - 1 + this.titleSearchListCopy[key].index = i index = i } } @@ -183,7 +182,7 @@ export default { let width if (parentData.type === 'dropdownCheckBox') { width = this.computeDistance(`${item.name}:`) - const marginRight = 20 + const marginRight = 22 width = width + 182 + marginRight// 182是label框的宽度除去name外的部分 } else { width = this.computeDistance(item.name) diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 27164c408..6f136c8c4 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -304,7 +304,7 @@ export default { { required: true, message: this.$t('validate.required'), trigger: 'change' } ], authProtocolPort: [ - { required: true, message: this.$t('validate.required'), trigger: 'change' }, + // { required: true, message: this.$t('validate.required'), trigger: 'change' }, { validator: port, trigger: 'blur' } ] }, diff --git a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue deleted file mode 100644 index d11de4e44..000000000 --- a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue +++ /dev/null @@ -1,1138 +0,0 @@ - - - - - - - - - - - - {{$t("asset.batchEditAsset")}} - - - - - - - - {{$t('asset.asset')}} - - - - - - {{assetSearch.label}} - - - - - - - - - - - Host - - - SN - - - - - - - - - - - - - Host - SN - - - - - - - - - {{item.host}} - - {{item.sn}} - - - - - - - - - - {{$t('overall.addAssetList')}} - - All: {{this.assetList.length}} - - - - - - - {{$t('asset.selectAsset')}} - - - - - - - - - - {{scope.row.host}} - - - - - - - - - {{scope.row.sn}} - - - - - - - - - - - - - - {{$t('validate.required')}} - - - - {{$t('overall.clear')}} - - All: {{this.assetSelList.length}} - - - - - - {{$t('overall.tag')}} - - 第一个button会出现意料之外的hover样式,找不到原因,只好加个不可见的button规避问题 - - - - - - - - - - - - Tag - Value - Action - - - - - - - - - - - - - - - - - - - {{$t('config.account.account')}} - - - - - - {{type}} - - - - - - - - {{account.protocol}} - - - Required - - - - - - - - - - - - - - - - - - diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue deleted file mode 100644 index fbb5c2d8d..000000000 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - {{$t('overall.delete')}} - - - - - - {{$t("project.endpoint.editEndpoint") }} - - - - - - - - {changeProject(val);})" value-key="id" popper-class="config-dropdown" v-model="editEndpoint.projectId" placeholder="" size="small" id="edit-endpoint-input-project"> - - - - - - {changeModule(val);})" value-key="id" popper-class="config-dropdown" v-model="editEndpoint.moduleId" placeholder="" size="small" id="edit-endpoint-input-project"> - - - - - - - - - - - - - - - - - - - - - - - - {{$t('project.endpoint.param')}} - - - 第一个button会出现意料之外的hover样式,找不到原因,只好加个不可见的button规避问题 - - - - - - - - - - - - - - = - - - - - - - - - - - - - 第一个button会出现意料之外的hover样式,找不到原因,只好加个不可见的button规避问题 - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nezha-fronted/src/components/common/rightBox/metricPrePanelBox.vue b/nezha-fronted/src/components/common/rightBox/metricPrePanelBox.vue deleted file mode 100644 index 4926330df..000000000 --- a/nezha-fronted/src/components/common/rightBox/metricPrePanelBox.vue +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - {{$t('overall.save')}} - - - - - - - - - {{rightBox.title}} - - - - - - - - - - - - - - {{item.name}} - - - - - - - - - - - - - - - - - diff --git a/nezha-fronted/src/components/common/rightBox/paramEditBox.vue b/nezha-fronted/src/components/common/rightBox/paramEditBox.vue deleted file mode 100644 index 12d6e3563..000000000 --- a/nezha-fronted/src/components/common/rightBox/paramEditBox.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - = - - - - - - - - - - - - - - - diff --git a/nezha-fronted/src/components/common/rightBox/roleBox.vue b/nezha-fronted/src/components/common/rightBox/roleBox.vue deleted file mode 100644 index 60ac47f12..000000000 --- a/nezha-fronted/src/components/common/rightBox/roleBox.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - {{$t('overall.delete')}} - - - - - - {{editRole.id ? ($t("config.roles.editRole")) : $t("config.roles.createRole")}} - - - - - - - - - - - - - - - - - - - - - - {{$t(data.i18n)}} - - - - - - - - - - - - - diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index e16442cdb..796b515d1 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -436,22 +436,7 @@ export default { return this.userData[item].username } } - }, - /* formatPingTime (str) { - if (!str) { - return this.$t('asset.assetStatPre') + this.$t('asset.assetStatDown') - } - const ds = '-' - const ts = ':' - const time = new Date(bus.UTCTimeToConfigTimezone(str)) - const year = time.getFullYear() - const month = time.getMonth() + 1 > 9 ? time.getMonth() + 1 : ('0' + (time.getMonth() + 1)) - const day = time.getDate() > 9 ? time.getDate() : ('0' + time.getDate()) - const hours = time.getHours() > 9 ? time.getHours() : ('0' + time.getHours()) - const minutes = time.getMinutes() > 9 ? time.getMinutes() : ('0' + time.getMinutes()) - const seconds = time.getSeconds() > 9 ? time.getSeconds() : ('0' + time.getSeconds()) - return this.$t('asset.assetStatPre') + year + ds + month + ds + day + ' ' + hours + ts + minutes + ts + seconds - }, */ + } }, mounted () { // 初始化数据 diff --git a/nezha-fronted/src/components/page/config/system/linkTab.vue b/nezha-fronted/src/components/page/config/system/linkTab.vue index 20f09ca4e..eb4d9a408 100644 --- a/nezha-fronted/src/components/page/config/system/linkTab.vue +++ b/nezha-fronted/src/components/page/config/system/linkTab.vue @@ -11,7 +11,7 @@ - +