From 0de226bbf30ed56a65bc3902c57d8d23b0bc8349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=AE=97=E6=B4=8B?= <liuzongyang@cqliving.com>
Date: Sat, 29 Oct 2022 17:11:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=201.=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=B7=E6=96=B0=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E7=B4=A2=E5=BC=95sql=E6=8B=BC=E6=8E=A5b?=
 =?UTF-8?q?ug=203.=E6=9A=82=E6=97=B6=E5=8F=AA=E6=9C=89mysql=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=BC=96=E8=BE=91=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/layout/navBars/breadcrumb/user.vue  |  2 +-
 .../src/views/ops/db/CreateTable.vue          |  5 ++++-
 mayfly_go_web/src/views/ops/db/DbList.vue     | 19 +++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue b/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue
index b5162717..20845c9f 100644
--- a/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue
+++ b/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue
@@ -55,7 +55,7 @@
         <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
             <span class="layout-navbars-breadcrumb-user-link" style="cursor: pointer">
                 <img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-                {{ getUserInfos.username === '' ? 'test' : getUserInfos.username }}
+                {{ getUserInfos.name || 'test' }}
                 <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <template #dropdown>
diff --git a/mayfly_go_web/src/views/ops/db/CreateTable.vue b/mayfly_go_web/src/views/ops/db/CreateTable.vue
index c81704ac..b7b7181c 100644
--- a/mayfly_go_web/src/views/ops/db/CreateTable.vue
+++ b/mayfly_go_web/src/views/ops/db/CreateTable.vue
@@ -340,6 +340,7 @@ const submit = async () => {
         db: props.db,
         runSuccessCallback: () => {
             proxy.$parent.openEditTable({ tableName: state.tableData.tableName });
+            proxy.$parent.refreshTableInfo();
             // cancel();
         },
     });
@@ -507,7 +508,9 @@ const genSql = () => {
                 }
 
                 if (addIndexs.length > 0) {
-                    sql += ','
+                    if (dropIndexNames.length > 0){
+                        sql += ','
+                    }
                     addIndexs.forEach(a => {
                         sql += ` ADD ${a.unique ? 'UNIQUE' : ''} INDEX ${a.indexName}(${a.columnNames.join(',')}) USING ${a.indexType} COMMENT '${a.indexComment}',`;
                     })
diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue
index 3b500478..412b0333 100644
--- a/mayfly_go_web/src/views/ops/db/DbList.vue
+++ b/mayfly_go_web/src/views/ops/db/DbList.vue
@@ -144,7 +144,9 @@
                     <template #default="scope">
                         <el-link @click.prevent="showColumns(scope.row)" type="primary">字段</el-link>
                         <el-link class="ml5" @click.prevent="showTableIndex(scope.row)" type="success">索引</el-link>
-                        <el-link class="ml5" @click.prevent="openEditTable(scope.row)" type="warning">编辑表</el-link>
+                        <el-link class="ml5" 
+                                 v-if="tableCreateDialog.enableEditTypes.indexOf(tableCreateDialog.type) > -1" 
+                                 @click.prevent="openEditTable(scope.row)" type="warning">编辑表</el-link>
                         <el-link class="ml5" @click.prevent="showCreateDdl(scope.row)" type="info">DDL</el-link>
                     </template>
                 </el-table-column>
@@ -349,11 +351,13 @@ const state = reactive({
         columns: [],
         indexs: [],
         activeName: '1',
+        type: '',
+        enableEditTypes:['mysql'], // 支持"编辑表"的数据库类型
         data: {  // 修改表时，传递修改数据
             edit: false,
             row: {},
             indexs: [],
-            columns: []
+            columns: [],
         },
     },
     filterDb: {
@@ -571,6 +575,7 @@ const showTableInfo = async (row: any, db: string) => {
     state.tableInfoDialog.visible = true;
     try {
         state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: row.id, db });
+        state.tableCreateDialog.type = row.type
         state.dbId = row.id;
         state.row = row;
         state.db = db;
@@ -581,6 +586,12 @@ const showTableInfo = async (row: any, db: string) => {
     }
 };
 
+// 给子组件调用，勿删
+// eslint-disable-next-line no-unused-vars
+const refreshTableInfo = async () => {
+  state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: state.dbId, db: state.db });
+}
+
 const closeTableInfo = () => {
     state.showDumpInfo = false;
     state.tableInfoDialog.visible = false;
@@ -678,8 +689,8 @@ const openEditTable = async (row: any) => {
     state.tableCreateDialog.visible = true
     state.tableCreateDialog.activeName = '1'
 
-    if (row === false) {
-        state.tableCreateDialog.data = { edit: false, row: {}, indexs: [], columns: [] }
+    if(row === false){
+        state.tableCreateDialog.data = {edit: false, row: {}, indexs: [], columns: [] }
         state.tableCreateDialog.title = '创建表'
     }