From 55fb438c37bfbe1bf437ff0f18f4c276c75cb6b3 Mon Sep 17 00:00:00 2001
From: "owen.li" <owen.li@vipshop.com>
Date: Tue, 18 Jun 2019 11:34:48 +0800
Subject: [PATCH] =?UTF-8?q?#64=20=E5=A2=9E=E5=8A=A0nested=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=20[vip:platform/pallas#879]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../version_info_dialog/version_info_dialog.vue     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pallas-console-web/src/pages/index_detail/version_manage/version_info_dialog/version_info_dialog.vue b/pallas-console-web/src/pages/index_detail/version_manage/version_info_dialog/version_info_dialog.vue
index 50f993b4..598c1ca8 100644
--- a/pallas-console-web/src/pages/index_detail/version_manage/version_info_dialog/version_info_dialog.vue
+++ b/pallas-console-web/src/pages/index_detail/version_manage/version_info_dialog/version_info_dialog.vue
@@ -193,9 +193,11 @@
                                 <el-button type="text" v-show="scope.row.isNew">
                                     <span>子字段</span>
                                 </el-button>
+                                        <el-button type="warning" size="mini" @click="viewSchemaChildren(scope.row)" v-if="scope.row.children.length !== 0" ><i class="fa"></i>nested</el-button>
+                                        <el-button type="warning" size="mini" @click="viewSchemaMultiFields(scope.row)" v-if="scope.row.multiField.length !== 0" ><i class="fa"></i>subFields</el-button>
+                                        <div>
                                 <el-tag type="success" v-if="scope.row.copyTo.length > 0">copy to: {{scope.row.copyTo}}</el-tag>
-                                <el-button type="warning" @click="viewSchemaChildren(scope.row)" v-if="scope.row.children.length !== 0" ><i class="fa"></i>nested</el-button>
-                                <el-button type="warning" @click="viewSchemaMultiFields(scope.row)" v-if="scope.row.multiField.length !== 0" ><i class="fa"></i>subFields</el-button>
+                                        </div>
                             </template>
                         </el-table-column>
                         <el-table-column label="DB类型" v-if="!isMetaDataNull">
@@ -235,7 +237,7 @@
                                 操作<i class="el-icon-caret-bottom el-icon--right"></i>
                               </span>
                                     <el-dropdown-menu class="dropdown-operation" slot="dropdown">
-                                        <el-dropdown-item v-if="scope.row.multiField.length === 0 && (scope.row.fieldType === 'nested' || scope.row.fieldType === 'object')"><a @click="viewSchemaChildren(scope.row)"><span><i class="fa fa-play-circle"></i>添加nested</span></a></el-dropdown-item>
+                                                <el-dropdown-item v-if="scope.row.multiField.length === 0"><a @click="viewSchemaChildren(scope.row)"><span><i class="fa fa-play-circle"></i>添加nested/object</span></a></el-dropdown-item>
                                         <el-dropdown-item v-if="scope.row.children.length === 0 && scope.row.fieldType !== 'nested'"><a @click="viewSchemaMultiFields(scope.row)"><span><i class="fa fa-play-circle"></i>添加subFields</span></a></el-dropdown-item>
                                         <el-dropdown-item v-if="!isEditable" ><a @click="viewSchemaCopyTo(scope.row)"><span><i class="fa fa-play-circle"></i>添加copyTo</span></a></el-dropdown-item>
                                     </el-dropdown-menu>
@@ -507,6 +509,10 @@ export default {
       this.isCopyToFieldsVisible = false;
     },
     viewSchemaChildren(row) {
+      if (row.fieldType !== 'nested' && row.fieldType !== 'object') {
+        this.$message.errorMessage(`ES类型必须为nested或者object`);
+        return;
+      }
       this.isSchemaChildVisible = true;
       this.schemaExtInfo = row;
     },
@@ -549,7 +555,6 @@ export default {
       }
     },
     addSchemaChild(array) {
-      console.log(JSON.stringify(array));
       this.isSchemaChildVisible = false;
     },
     addSchemaMultiFields(array) {