From 8a3171726236cc5082b76f82daf921c9d5d800ed Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 7 Dec 2022 14:16:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=80=9A=E8=BF=87=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=B0=E5=A2=9Edashboard=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/popBox/selectDashboard.scss        |  2 +-
 .../components/common/mixin/editRigthBox.js   |  1 -
 .../common/popBox/selectDashboard.vue         |  3 +-
 .../common/rightBox/dashboardTempBox.vue      | 55 +++++++------------
 4 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss
index fec23f1a0..100fb0227 100644
--- a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss
+++ b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss
@@ -186,6 +186,6 @@
   // padding: 8px 0;
   box-sizing: border-box;
   .el-dropdown-menu__item{
-    line-height: 32px;
+    // line-height: 32px;
   }
 }
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/mixin/editRigthBox.js b/nezha-fronted/src/components/common/mixin/editRigthBox.js
index 5101c32fd..85198f626 100644
--- a/nezha-fronted/src/components/common/mixin/editRigthBox.js
+++ b/nezha-fronted/src/components/common/mixin/editRigthBox.js
@@ -1,4 +1,3 @@
-import i18n from '@/components/common/i18n'
 import { getUUID } from '../js/common'
 export default {
   data () {
diff --git a/nezha-fronted/src/components/common/popBox/selectDashboard.vue b/nezha-fronted/src/components/common/popBox/selectDashboard.vue
index ccffd7a93..ef205be92 100644
--- a/nezha-fronted/src/components/common/popBox/selectDashboard.vue
+++ b/nezha-fronted/src/components/common/popBox/selectDashboard.vue
@@ -163,8 +163,7 @@ export default {
       // 其他tab的数据（我的收藏、我的创建、最近浏览数据）
       otherData: [],
       // 收藏列表
-      starredList: [],
-      visible: false
+      starredList: []
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue
index c4e4ed1c8..b0d0b3be8 100644
--- a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue
@@ -16,7 +16,7 @@
           <!-- dashboardTemplate -->
           <el-form-item :label="$t('upload.template')" prop="tmplId">
             <v-selectpage
-              :data="dashboardList"
+              :data="templateList"
               :tb-columns="ChartSearchShowFields"
               :multiple="false"
               :language="language"
@@ -29,27 +29,11 @@
               @values="tempChange"
             ></v-selectpage>
           </el-form-item>
-          <!-- link(asset) -->
-          <el-form-item :label="$t('asset.asset')" prop="link" v-if="selectedTemp.varType==1" key="asset">
+          <!-- link -->
+          <el-form-item v-if="templateType" :label="templateType==1?$t('asset.asset'):$t('asset.endpoint')" prop="link" key="link">
             <v-selectpage
               :data="dataList"
-              :tb-columns="assetColumns"
-              :multiple="false"
-              :language="language"
-              key-field="id"
-              show-field="name"
-              :width="640"
-              v-model="editDashboard.link"
-              class="form-control"
-              :result-format="resultFormat"
-              @values="linkChange"
-            ></v-selectpage>
-          </el-form-item>
-          <!-- link(endpoint) -->
-          <el-form-item :label="$t('asset.endpoint')" prop="link" v-else-if="selectedTemp.varType==2" key="endpoint">
-            <v-selectpage
-              :data="dataList"
-              :tb-columns="endpointColumns"
+              :tb-columns="templateType==1?assetColumns:endpointColumns"
               :multiple="false"
               :language="language"
               key-field="id"
@@ -88,12 +72,14 @@
 
 <script>
 import bus from '@/libs/bus'
+import editRigthBox from '../mixin/editRigthBox'
 export default {
   props: {
   },
+  mixins: [editRigthBox],
   data () {
     return {
-      url: 'visual/panel/fromTmpl',
+      url: '/visual/panel/fromTmpl',
       rules: {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -208,26 +194,26 @@ export default {
         link: '',
         description: ''
       },
-      dashboardList: [],
+      templateList: [],
       dataList: [],
-      selectedTemp: {} // 选中的dashboard模板
+      templateType: undefined // 选中模板的varType
     }
   },
   computed: {
     language () { return this.$store.getters.getLanguage }
   },
-  mounted () {
+  created () {
+    this.isEdit = true
     this.getDashboardTempData()
   },
   methods: {
     // 选中的模板变化
     tempChange: bus.debounce(function (val) {
-      this.editDashboard.link = ''
-      const newValue = val.length ? val[0] : {}
-      const oldValue = this.$loadsh.cloneDeep(this.selectedTemp)
-      this.selectedTemp = this.$loadsh.cloneDeep(newValue)
+      const newValue = this.$loadsh.get(val, ['0', 'varType'])
+      const oldValue = this.templateType
+      this.templateType = newValue
       // 判断varType是否变化
-      if (oldValue.varType != newValue.varType) {
+      if (oldValue != newValue) {
         this.getTableData()
       }
       this.$refs.form.validateField('tmplId')
@@ -240,16 +226,17 @@ export default {
     getDashboardTempData () {
       this.$get('visual/panel', { type: 'template', pageSize: -1 }).then(response => {
         if (response.code === 200) {
-          this.dashboardList = response.data.list
+          this.templateList = response.data.list
         }
       })
     },
     // 根据选中模板vartype请求数据
     getTableData () {
+      this.editDashboard.link = ''
       this.dataList = []
-      if (this.selectedTemp.varType === 1) {
+      if (this.templateType === 1) {
         this.getAssetData()
-      } else if (this.selectedTemp.varType === 2) {
+      } else if (this.templateType === 2) {
         this.getEndpointData()
       }
     },
@@ -277,8 +264,8 @@ export default {
       const params = this.$loadsh.cloneDeep(this.editDashboard)
       this.$refs.form.validate((valid) => {
         if (valid) {
-          // 模板varType ≠ 0时有效且必填
-          if (this.selectedTemp.varType == 0) {
+          // 模板varType ≠ 0时link有效且必填
+          if (this.templateType == 0) {
             delete params.link
           }
           this.$post(this.url, params).then(response => {