NEZ-674 fix: asset label 编辑时回显的group不正确

2021-05-26 10:58:15 +08:00
parent dbf0e74e7a
commit 23eafe446e
6 changed files with 24 additions and 17 deletions
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -475,7 +475,7 @@ const en = {
        promServer: 'Prom server'
      },
      alert: {
-        alertMessage: 'Module name / Alert Message',
+        alertMessage: 'Alert Message',
        level: 'Priority',
        alertRule: 'Alert rule',
        ruleNum: 'Rule num',
@@ -562,7 +562,7 @@ const en = {
    copySuccess: 'Copy success'
  },
  asset: {
-    asset: 'Module name / Asset ',
+    asset: 'Asset ',
    assets: 'Asset', // '资产'
    editAsset: 'Edit asset', // '编辑资产'
    createAsset: 'New asset', // '编辑资产'
@@ -1057,7 +1057,7 @@ const en = {
    assetLabel: {
      addMeta: 'Add label',
      example: 'Example',
-      editMeta: 'Edit lables',
+      editMeta: 'Edit lable',
      assetLabel: 'Asset label',
      all: 'All',
      addGroup: 'Add group',
@@ -1268,7 +1268,7 @@ const en = {
      createEndpoint: 'New endpoint', // "新增Endpoint"
      editEndpoint: 'Edit endpoint', // "编辑Endpoint"
      endpoint: 'Endpoint ', // "Endpoint"
-      endpoints: 'Module name / Endpoint',
+      endpoints: 'Endpoint',
      endpointId: 'Endpoint ID', // "Endpoint ID"
      list: 'List',
      host: 'Host', // "Host"
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="mc" @click.self="clickOutside">
    <div class="right-box right-box-project-alert">
-      <div class="right-box-title">{{$t('dashboard.overview.alert.alertMessage')}}</div>
+      <div class="right-box-title">{{ moduleName }} / {{$t('dashboard.overview.alert.alertMessage')}}</div>
      <nz-data-list
        ref="dataList"
        :api="url"
@@ -53,7 +53,8 @@ export default {
  name: 'alertTable',
  props: {
    moduleId: {},
-    projectId: {}
+    projectId: {},
+    moduleName: String
  },
  components: {
    'nz-alert-tag': nzAlertTag,
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="mc" @click.self="clickOutside">
    <div class="right-box right-box-project-alert">
-      <div class="right-box-title">{{$t('asset.asset')}}</div>
+      <div class="right-box-title">{{ moduleName }} / {{$t('asset.asset')}}</div>
      <nz-data-list
        ref="dataList"
        :api="url"
@@ -39,7 +39,8 @@ export default {
  name: 'assetTableProject',
  props: {
    moduleId: {},
-    projectId: {}
+    projectId: {},
+    moduleName: String
  },
  components: {
    nzDataList,
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="mc" @click.self="clickOutside">
    <div class="right-box right-box-project-alert">
-      <div class="right-box-title">{{$t('project.endpoint.endpoints')}}</div>
+      <div class="right-box-title">{{ moduleName }} / {{$t('project.endpoint.endpoints')}}</div>
      <nz-data-list
        ref="dataList"
        :api="url"
@@ -42,7 +42,8 @@ export default {
  name: 'endpointTableProject',
  props: {
    moduleId: {},
-    projectId: {}
+    projectId: {},
+    moduleName: String
  },
  watch: {
  },
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -213,7 +213,7 @@
          </div>
          <!--endpoint-->
          <transition name="right-box">
-            <endpointTable v-if="popDataShow.endpoint" :moduleId="moduleId" :projectId="projectInfo.id"
+            <endpointTable v-if="popDataShow.endpoint" :moduleId="moduleId" :moduleName="moduleName" :projectId="projectInfo.id"
                           @close="popDataShowUpdate('',true)">endpoint
            </endpointTable>
          </transition>
@@ -235,13 +235,13 @@
    <!--</div>-->
    <!--asset-->
    <transition name="right-box">
-      <assetTable v-if="popDataShow.asset" :moduleId="moduleId" :projectId="projectInfo.id"
+      <assetTable v-if="popDataShow.asset" :moduleId="moduleId" :moduleName="moduleName" :projectId="projectInfo.id"
                  @close="popDataShowUpdate('',true)">alert
      </assetTable>
    </transition>
    <!--alert-->
    <transition name="right-box">
-      <alertTable v-if="popDataShow.alert" :moduleId="moduleId" :projectId="projectInfo.id"
+      <alertTable v-if="popDataShow.alert" :moduleId="moduleId" :moduleName="moduleName" :projectId="projectInfo.id"
                  @close="popDataShowUpdate('',true)">alert
      </alertTable>
    </transition>
@@ -453,6 +453,7 @@ export default {
        main: false
      },
      moduleId: '',
+      moduleName: '',
      tooltipPosition: {
        top: 0,
        left: 0,
@@ -1076,7 +1077,9 @@ export default {

    // 具体内容点击
    nodeTools (node, tool) {
+      console.log(node)
      this.moduleId = node.data.moduleId
+      this.moduleName = node.data.moduleName
      if (tool.id === 'total') {
        this.popDataShowUpdate('', false, node)
        return
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -19,8 +19,8 @@
            <el-form-item :label='$t("config.assetLabel.key")' prop="metaKey">
              <el-input placeholder="" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input>
            </el-form-item>
-            <el-form-item :label='$t("config.assetLabel.group")' prop="groupId">
-              <el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" :popper-append-to-body="false">
+            <el-form-item :label='$t("config.assetLabel.group")' prop="groupName">
+              <el-select v-model="editAssetMeta.group.name" size="small" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" :popper-append-to-body="false">
                <el-option v-for="(item, index) in groupData" :key="index" :value="item.id" :label="item.name"></el-option>
              </el-select>
            </el-form-item>
@@ -158,7 +158,7 @@ export default {
      rules: {
        name: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }],
        metaKey: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }, { pattern: /\w/, message: this.$t('validate.onlyWord'), trigger: 'change' }],
-        groupId: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }],
+        groupName: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }],
        type: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }]
      },
      value: '',
@@ -237,8 +237,9 @@ export default {
          search: `${n.search}`,
          display: `${n.display}`,
          param: n.param && typeof n.param === 'string' ? JSON.parse(n.param) : {},
-          type: n.type.toUpperCase()
+          type: n.type.toUpperCase(),
        }
+        console.log(this.editAssetMeta)
      }
    },
    'editAssetMeta.search': {