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

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

Browse Source
This commit is contained in:
zhangyu
2022-06-10 15:41:09 +08:00
parent cbdbe4bf32 edb6c48123
commit d582b17fbd
24 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -188,8 +188,8 @@
</el-form-item> </el-form-item>
<!--remark--> <!--remark-->
<el-form-item :label="$t('overall.remark')" class="full-form-item" prop="remark"> <el-form-item :label="$t('overall.remark')" class="full-form-item" prop="remark">
<el-input v-model="selection.pen.data.remark" :autosize="{ minRows: 2, maxRows: 6}" maxlength="256" <el-input v-model="selection.pen.data.remark" maxlength="256"
show-word-limit type="textarea"/> show-word-limit type="textarea" size="small" :rows="2"/>
</el-form-item> </el-form-item>
<!--chart unit--> <!--chart unit-->
<el-form-item v-show="selection.pen.data.type !='text'" :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" <el-form-item v-show="selection.pen.data.type !='text'" :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item"

2
nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
View File

@@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
<!--remark--> <!--remark-->
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" show-word-limit v-model="editModel.remark" size="small" type="text"></el-input> <el-input maxlength="256" show-word-limit v-model="editModel.remark" size="small" :rows="2" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

2
nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
View File

@@ -15,7 +15,7 @@
show-word-limit size="small" type="text" v-model="editRole.name"></el-input> show-word-limit size="small" type="text" v-model="editRole.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">
<el-input maxlength="256" show-word-limit :rows="2" size='mini' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/> <el-input maxlength="256" show-word-limit :rows="2" size='small' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.roles.permission')"> <el-form-item :label="$t('config.roles.permission')">

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

@@ -149,11 +149,11 @@
</el-form-item> </el-form-item>
<!--summary--> <!--summary-->
<el-form-item :label="$t('alert.summary')" prop="summary"> <el-form-item :label="$t('alert.summary')" prop="summary">
<el-input id="alert-box-input-summary" v-model="editAlertRule.summary" maxlength="512" placeholder="" rows="3" show-word-limit size="small" type="textarea"></el-input> <el-input id="alert-box-input-summary" v-model="editAlertRule.summary" maxlength="512" placeholder="" rows="2" show-word-limit size="small" type="textarea"></el-input>
</el-form-item> </el-form-item>
<!--description--> <!--description-->
<el-form-item :label="$t('overall.remark')" prop="description"> <el-form-item :label="$t('overall.remark')" prop="description">
<el-input id="alert-box-input-description" v-model="editAlertRule.description" maxlength="256" placeholder="" rows="4" show-word-limit size="small" type="textarea"></el-input> <el-input id="alert-box-input-description" v-model="editAlertRule.description" maxlength="256" placeholder="" rows="2" show-word-limit size="small" type="textarea"></el-input>
</el-form-item> </el-form-item>
<div class="alert-rule-split-title">{{ $t('alert.config.effectiveConfig') }}</div> <div class="alert-rule-split-title">{{ $t('alert.config.effectiveConfig') }}</div>
<!--state--> <!--state-->

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

@@ -95,8 +95,8 @@
<el-form-item :label='$t("overall.remark")' class="range-time" prop="remark"> <el-form-item :label='$t("overall.remark")' class="range-time" prop="remark">
<el-input <el-input
v-model="editAlertSilence.remark" v-model="editAlertSilence.remark"
:placeholder="$t('overall.remark')"
maxlength="256" maxlength="256"
size="small" :rows="2"
show-word-limit show-word-limit
type="textarea"> type="textarea">

5
nezha-fronted/src/components/common/rightBox/apiKeyBox.vue
View File

@@ -10,7 +10,7 @@
<div class="container__form"> <div class="container__form">
<el-form ref="apiKeyBoxForm" :model="apiKeyBox" :rules="rules" label-position="top" label-width="120px"> <el-form ref="apiKeyBoxForm" :model="apiKeyBox" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('profile.name')" prop="name"> <el-form-item :label="$t('profile.name')" prop="name">
<el-input maxlength="64" show-word-limit v-model="apiKeyBox.name" size="small" type="text" :placeholder="$t('profile.name')"></el-input> <el-input maxlength="64" show-word-limit v-model="apiKeyBox.name" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('profile.apiKey.box.expiredAt')" :label="$t('profile.apiKey.box.expiredAt')"
@@ -23,12 +23,11 @@
type="datetime" type="datetime"
prefix-icon="el-icon-date" prefix-icon="el-icon-date"
:format="timeFormatStrToDatePickFormat(dateFormatStr)" :format="timeFormatStrToDatePickFormat(dateFormatStr)"
:placeholder="$t('backup.selectData')"
> >
</my-date-picker> </my-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">
<el-input show-word-limit v-model="apiKeyBox.remark" size="small" type="textarea" :placeholder="$t('overall.remark')" maxlength="256"></el-input> <el-input size='small' show-word-limit maxlength="256" v-model="apiKeyBox.remark" type="textarea" :rows="2"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

2
nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
View File

@@ -92,7 +92,7 @@
</div> </div>
</template> </template>
<template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA"> <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA">
<el-input v-model="label.value" :maxlength="4096" size="small" type="textarea"/> <el-input v-model="label.value" :maxlength="4096" size="small" :rows="2" show-word-limit type="textarea"/>
</template> </template>
<template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.RADIO"> <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.RADIO">
<el-radio v-for="item in JSON.parse(label.param).items" :key="item.name" v-model="label.value" :label="item.name">{{item.name}}</el-radio> <el-radio v-for="item in JSON.parse(label.param).items" :key="item.name" v-model="label.value" :label="item.name">{{item.name}}</el-radio>

2
nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
View File

@@ -106,7 +106,7 @@
</div> </div>
</template> </template>
<template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA"> <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA">
<el-input v-model="label.value[0]" :maxlength="4096" size="small" type="textarea"/> <el-input v-model="label.value[0]" :maxlength="4096" show-word-limit size="small" :rows="2" type="textarea"/>
</template> </template>
<template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.RADIO"> <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.RADIO">
<el-radio-group v-model="label.value[0]"> <el-radio-group v-model="label.value[0]">

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

@@ -112,7 +112,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.remark")' prop="remark"> <el-form-item :label='$t("overall.remark")' prop="remark">
<el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editAssetMeta.remark" size="small" id="editAssetMeta-box-input-remark"></el-input> <el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editAssetMeta.remark" size="small" :rows="2" id="editAssetMeta-box-input-remark"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item :label='$t("config.assetLabel.example")'>--> <!-- <el-form-item :label='$t("config.assetLabel.example")'>-->
<!-- <assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>--> <!-- <assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>-->

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

@@ -17,7 +17,7 @@
<el-input placeholder="" maxlength="64" show-word-limit v-model="editMetaGroup.name" size="small" id="editMetaGroup-box-input-name"></el-input> <el-input placeholder="" maxlength="64" show-word-limit v-model="editMetaGroup.name" size="small" id="editMetaGroup-box-input-name"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.remark")' prop="remark"> <el-form-item :label='$t("overall.remark")' prop="remark">
<el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editMetaGroup.remark" size="small" id="editMetaGroup-box-input-remark"></el-input> <el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editMetaGroup.remark" size="small" :rows="2" id="editMetaGroup-box-input-remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
<!--descrption--> <!--descrption-->
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input id="asset-state-input-description" placeholder="" size="small" type="textarea" v-model="editAssetState.remark"></el-input> <el-input id="asset-state-input-description" placeholder="" size="small" :rows="2" type="textarea" show-word-limit maxlength="256" v-model="editAssetState.remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@@ -26,7 +26,7 @@
<el-input v-model.number="editCabinet.uSize" :max="47" size="small" id="cabinet-box-input-uSize"></el-input> <el-input v-model.number="editCabinet.uSize" :max="47" size="small" id="cabinet-box-input-uSize"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">
<el-input size='mini' maxlength="256" show-word-limit v-model="editCabinet.remark" type="textarea" :rows="2" id="cabinet-box-input-remark"/> <el-input size='small' maxlength="256" show-word-limit v-model="editCabinet.remark" type="textarea" :rows="2" id="cabinet-box-input-remark"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@@ -67,11 +67,11 @@
</div> </div>
<!--remark--> <!--remark-->
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">
<el-input maxlength="256" show-word-limit v-model="editChart.remark" :autosize="{ minRows: 1, maxRows: 6}" type="textarea"/> <el-input maxlength="256" show-word-limit v-model="editChart.remark" size="small" :rows="2" type="textarea"/>
</el-form-item> </el-form-item>
<!--remark--> <!--remark-->
<el-form-item :label="$t('overall.link')" v-if="editChart.param"> <el-form-item :label="$t('overall.link')" v-if="editChart.param">
<el-input maxlength="256" show-word-limit v-model="editChart.param.link" :autosize="{ minRows: 1, maxRows: 6}" type="textarea"/> <el-input maxlength="256" show-word-limit v-model="editChart.param.link" size="small" :rows="2" type="textarea"/>
</el-form-item> </el-form-item>
<!--title--> <!--title-->

2
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -133,7 +133,7 @@
</div> </div>
<!--url--> <!--url-->
<el-form-item v-if="isUrl(chartConfig.type)" :label='$t("dashboard.panel.chartForm.url")' :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }" prop="param.url"> <el-form-item v-if="isUrl(chartConfig.type)" :label='$t("dashboard.panel.chartForm.url")' :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }" prop="param.url">
<el-input id="chart-box-url" v-model="chartConfig.param.url" maxlength="1024" show-word-limit size="small" type="textarea" @change="change"></el-input> <el-input id="chart-box-url" v-model="chartConfig.param.url" maxlength="1024" show-word-limit size="small" :rows="2" type="textarea" @change="change"></el-input>
</el-form-item> </el-form-item>
<!--topoData--> <!--topoData-->
<el-form-item v-if="isDiagram(chartConfig.type)" > <el-form-item v-if="isDiagram(chartConfig.type)" >

3
nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
View File

@@ -48,10 +48,9 @@
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input <el-input
v-model="editExprTemp.remark" v-model="editExprTemp.remark"
:placeholder="$t('overall.remark')"
maxlength="256" maxlength="256"
show-word-limit show-word-limit
size="small" size="small" :rows="2"
type="textarea" type="textarea"
></el-input> ></el-input>
</el-form-item> </el-form-item>

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

@@ -24,7 +24,7 @@
<el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipDetails.state" size="small"></el-input> <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipDetails.state" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editipDetails.remark" size="small" id="mib-box-input-remark"></el-input> <el-input maxlength="256" rows="2" show-word-limit type="textarea" placeholder="" v-model="editipDetails.remark" size="small" id="mib-box-input-remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@@ -61,7 +61,7 @@
<el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input> <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editipam.remark" size="small" id="mib-box-input-remark"></el-input> <el-input maxlength="256" rows="2" show-word-limit type="textarea" placeholder="" v-model="editipam.remark" size="small" id="mib-box-input-remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@@ -25,7 +25,7 @@
clearable></el-cascader> clearable></el-cascader>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editMib.remark" size="small" id="mib-box-input-remark"></el-input> <el-input maxlength="256" rows="2" show-word-limit type="textarea" placeholder="" v-model="editMib.remark" size="small" id="mib-box-input-remark"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.mib.mibFiles')" prop="file" :rules="[{validator:checkMibFile,trigger:'change'}]" :class="{'add-required':!editMib.id}"> <el-form-item :label="$t('config.mib.mibFiles')" prop="file" :rules="[{validator:checkMibFile,trigger:'change'}]" :class="{'add-required':!editMib.id}">
<el-upload drag :multiple="false" action="" :file-list="uploadFileList" :on-change="uploadChange" :auto-upload="false" accept="" :on-remove="afterClearFile" ref="mibFileUpload" class="mib-upload right-box-form-row" id="mib-box-input-file"> <el-upload drag :multiple="false" action="" :file-list="uploadFileList" :on-change="uploadChange" :auto-upload="false" accept="" :on-remove="afterClearFile" ref="mibFileUpload" class="mib-upload right-box-form-row" id="mib-box-input-file">

3
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -28,12 +28,11 @@
<el-input <el-input
id="module-box-input-remark" id="module-box-input-remark"
v-model="editModule.remark" v-model="editModule.remark"
:autosize="{ minRows: 1, maxRows: 6}"
class="not-fixed-height no-resize" class="not-fixed-height no-resize"
maxlength="256" maxlength="256"
show-word-limit show-word-limit
placeholder="" placeholder=""
size="small" size="small" :rows="2"
type="textarea"></el-input> type="textarea"></el-input>
</el-form-item> </el-form-item>
<!--Enpoint template--> <!--Enpoint template-->

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

@@ -16,7 +16,7 @@
<el-input id="project-box-input-name" v-model="editProject.name" maxlength="64" show-word-limit size="small"></el-input> <el-input id="project-box-input-name" v-model="editProject.name" maxlength="64" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.remark")'> <el-form-item :label='$t("overall.remark")'>
<el-input id="project-box-input-remark" v-model="editProject.remark" maxlength="256" show-word-limit type="textarea"></el-input> <el-input id="project-box-input-remark" v-model="editProject.remark" maxlength="256" show-word-limit type="textarea" size="small" :rows="2"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

2
nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
View File

@@ -19,7 +19,7 @@
<el-input v-model.number="editCabinet.uSize" :max="47" id="cabinet-box-input-uSize" size="small"></el-input> <el-input v-model.number="editCabinet.uSize" :max="47" id="cabinet-box-input-uSize" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.remark')"> <el-form-item :label="$t('overall.remark')">
<el-input size='mini' maxlength="256" show-word-limit v-model="editCabinet.remark" type="textarea" :rows="2" id="cabinet-box-input-remark"/> <el-input size="small" :rows="2" maxlength="256" show-word-limit v-model="editCabinet.remark" type="textarea" id="cabinet-box-input-remark"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

2
nezha-fronted/src/components/page/asset/components/assetTagEx.vue
View File

@@ -21,7 +21,7 @@
</el-row> </el-row>
</div> </div>
<div v-else-if="type==='textarea'"> <div v-else-if="type==='textarea'">
<el-input v-model="inputValue" size="small" type="textarea" maxlength="512" :autosize="{ minRows: 2, maxRows: 4}"/> <el-input v-model="inputValue" size="small" type="textarea" show-word-limit maxlength="512" :rows="2"/>
</div> </div>
<div v-else-if="type==='radio'"> <div v-else-if="type==='radio'">
<el-radio-group v-model="optionValue" > <el-radio-group v-model="optionValue" >

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

@@ -21,7 +21,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('licenseGen.comment')" prop="comment"> <el-form-item :label="$t('licenseGen.comment')" prop="comment">
<el-input id="alert-box-input-description" placeholder="" size="small" type="textarea" v-model="licenseGen.comment"></el-input> <el-input id="alert-box-input-description" placeholder="" size="small" :rows="2" type="textarea" v-model="licenseGen.comment" show-word-limit maxlength="256"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="license-gen-error" prop="file"> <el-form-item class="license-gen-error" prop="file">
<div class="license-gen-form__upload"> <div class="license-gen-form__upload">

5
nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
View File

@@ -90,9 +90,10 @@
v-if="type == 'log'" v-if="type == 'log'"
:id="inputId" :id="inputId"
v-model="expressionList[index]" v-model="expressionList[index]"
:autosize="{ minRows: 1, maxRows: 6 }" size="small" :rows="2"
class="not-fixed-height no-resize" class="not-fixed-height no-resize"
type="textarea" type="textarea"
show-word-limit maxlength="256"
@input="metricKeyDown" @input="metricKeyDown"
@keyup.enter.native="expressionChange" @keyup.enter.native="expressionChange"
ref="elInput" ref="elInput"
@@ -252,7 +253,7 @@
type="textarea" type="textarea"
:maxlength="styleType === 3 ? 512 : 4096" :maxlength="styleType === 3 ? 512 : 4096"
show-word-limit show-word-limit
:autosize="{ minRows: 1, maxRows: 6 }" size="small" :rows="2"
class="not-fixed-height no-resize" class="not-fixed-height no-resize"
ref="elInput" ref="elInput"
></el-input> ></el-input>