From f4f8c17deb5b1a7c60865c328518c199f2835b86 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:54:00 +0800
Subject: [PATCH] add popover to feature management modal

---
 .../views/admin/components/FeatureManagement.vue  | 15 ++++++++++++++-
 .../tenants/components/TenantFeatureEditForm.vue  |  2 --
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/vueJs/src/views/admin/components/FeatureManagement.vue b/vueJs/src/views/admin/components/FeatureManagement.vue
index eb736c869..e88645251 100644
--- a/vueJs/src/views/admin/components/FeatureManagement.vue
+++ b/vueJs/src/views/admin/components/FeatureManagement.vue
@@ -19,6 +19,16 @@
             :prop="'features.' + fi + '.children.' + fci + '.value'"
             :rules="featureChildren.valueType.validator | inputRuleFilter(localizer)"
           >
+            <el-popover
+              :ref="'popover_' + fi + '_' + fci"
+              trigger="hover"
+              :title="featureChildren.displayName"
+              :content="featureChildren.description"
+            />
+            <span
+              slot="label"
+              v-popover="'popover_' + fi + '_' + fci"
+            >{{ featureChildren.displayName }}</span>
             <div
               v-if="featureChildren.valueType.name === 'ToggleStringValueType'"
             >
@@ -74,6 +84,7 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from 'vue-property-decorator'
 import FeatureManagementService, { ValueType, Feature, Features } from '@/api/feature-management'
+import { ElForm } from 'element-ui/types/form'
 
 /**
  * 适用于动态表单的功能节点列表
@@ -224,7 +235,8 @@ export default class extends Vue {
    * 重置表单数据
    */
   public resetFeature() {
-    this.features = new FeatureItems()
+    const frmFeature = this.$refs.frmFeature as ElForm
+    frmFeature.resetFields()
   }
 
   /**
@@ -299,6 +311,7 @@ export default class extends Vue {
    */
   private onClosed() {
     this.$emit('closed')
+    this.resetFeature()
   }
 }
 </script>
diff --git a/vueJs/src/views/admin/tenants/components/TenantFeatureEditForm.vue b/vueJs/src/views/admin/tenants/components/TenantFeatureEditForm.vue
index 09ceda3db..504942817 100644
--- a/vueJs/src/views/admin/tenants/components/TenantFeatureEditForm.vue
+++ b/vueJs/src/views/admin/tenants/components/TenantFeatureEditForm.vue
@@ -34,8 +34,6 @@ export default class extends Vue {
 
   private onFormClosed() {
     this.$emit('closed')
-    const featureManagement = this.$refs.featureManagement as FeatureManagement
-    featureManagement.resetFeature()
   }
 }
 </script>