From df7413a9eaee776f0ee78ccfe78fc0d2d0962237 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 30 Oct 2024 19:59:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20base.app=E4=BA=8B=E5=8A=A1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ops/db/component/table/DbTableOp.vue      | 252 ++++++++++--------
 server/go.mod                                 |   2 +-
 server/internal/tag/application/tag_tree.go   |  12 +-
 server/pkg/base/app.go                        |   6 +-
 4 files changed, 144 insertions(+), 128 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
index 29107745..5dcedfab 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
@@ -1,137 +1,141 @@
 <template>
-    <div>
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" width="70%" :close-on-press-escape="false" :close-on-click-modal="false">
-            <el-form label-position="left" ref="formRef" :model="tableData" label-width="80px">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item prop="tableName" label="表名">
-                            <el-input style="width: 80%" v-model="tableData.tableName" size="small"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item prop="tableComment" label="备注">
-                            <el-input style="width: 80%" v-model="tableData.tableComment" size="small"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+    <el-drawer :title="title" v-model="dialogVisible" :before-close="cancel" :destroy-on-close="true" :close-on-click-modal="false" size="75%">
+        <template #header>
+            <DrawerHeader :header="title" :back="cancel" />
+        </template>
 
-                <el-tabs v-model="activeName">
-                    <el-tab-pane label="字段" name="1">
-                        <el-table :data="tableData.fields.res" :max-height="tableData.height">
-                            <el-table-column
-                                :prop="item.prop"
-                                :label="item.label"
-                                v-for="item in tableData.fields.colNames"
-                                :key="item.prop"
-                                :width="item.width"
-                            >
-                                <template #default="scope">
-                                    <el-input v-if="item.prop === 'name'" size="small" v-model="scope.row.name" />
+        <el-form label-position="left" ref="formRef" :model="tableData" label-width="80px">
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item prop="tableName" label="表名">
+                        <el-input style="width: 80%" v-model="tableData.tableName" size="small"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item prop="tableComment" label="备注">
+                        <el-input style="width: 80%" v-model="tableData.tableComment" size="small"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
 
-                                    <el-select v-else-if="item.prop === 'type'" filterable size="small" v-model="scope.row.type">
-                                        <el-option
-                                            v-for="pgsqlType in getDbDialect(dbType!).getInfo().columnTypes"
-                                            :key="pgsqlType.dataType"
-                                            :value="pgsqlType.udtName"
-                                            :label="pgsqlType.dataType"
-                                        >
-                                            <span v-if="pgsqlType.dataType === pgsqlType.udtName"
-                                                >{{ pgsqlType.dataType }}{{ pgsqlType.desc && '：' + pgsqlType.desc }}</span
-                                            >
-                                            <span v-else>{{ pgsqlType.dataType }}，别名：{{ pgsqlType.udtName }} {{ pgsqlType.desc }}</span>
-                                        </el-option>
-                                    </el-select>
+            <el-tabs v-model="activeName">
+                <el-tab-pane label="字段" name="1">
+                    <el-table ref="tableRef" :data="tableData.fields.res" :max-height="tableData.height">
+                        <el-table-column
+                            :prop="item.prop"
+                            :label="item.label"
+                            v-for="item in tableData.fields.colNames"
+                            :key="item.prop"
+                            :width="item.width"
+                        >
+                            <template #default="scope">
+                                <el-input v-if="item.prop === 'name'" size="small" v-model="scope.row.name" />
 
-                                    <el-input v-else-if="item.prop === 'value'" size="small" v-model="scope.row.value" />
-
-                                    <el-input v-else-if="item.prop === 'length'" type="number" size="small" v-model.number="scope.row.length" />
-
-                                    <el-input v-else-if="item.prop === 'numScale'" type="number" size="small" v-model.number="scope.row.numScale" />
-
-                                    <el-checkbox v-else-if="item.prop === 'notNull'" size="small" v-model="scope.row.notNull" />
-
-                                    <el-checkbox v-else-if="item.prop === 'pri'" size="small" v-model="scope.row.pri" />
-
-                                    <el-checkbox
-                                        v-else-if="item.prop === 'auto_increment'"
-                                        size="small"
-                                        v-model="scope.row.auto_increment"
-                                        :disabled="disableEditIncr()"
-                                    />
-
-                                    <el-input v-else-if="item.prop === 'remark'" size="small" v-model="scope.row.remark" />
-
-                                    <el-popconfirm v-else-if="item.prop === 'action'" title="确定删除?" @confirm="deleteRow(scope.$index)">
-                                        <template #reference>
-                                            <el-link type="danger" plain size="small" :underline="false">删除</el-link>
-                                        </template>
-                                    </el-popconfirm>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        <el-row style="margin-top: 20px">
-                            <el-button @click="addDefaultRows()" link type="warning" icon="plus">添加默认列</el-button>
-                            <el-button @click="addRow()" link type="primary" icon="plus">添加列</el-button>
-                        </el-row>
-                    </el-tab-pane>
-                    <el-tab-pane label="索引" name="2">
-                        <el-table :data="tableData.indexs.res" :max-height="tableData.height">
-                            <el-table-column :prop="item.prop" :label="item.label" v-for="item in tableData.indexs.colNames" :key="item.prop">
-                                <template #default="scope">
-                                    <el-input v-if="item.prop === 'indexName'" size="small" disabled v-model="scope.row.indexName"></el-input>
-
-                                    <el-select
-                                        v-if="item.prop === 'columnNames'"
-                                        v-model="scope.row.columnNames"
-                                        multiple
-                                        collapse-tags
-                                        collapse-tags-tooltip
-                                        filterable
-                                        placeholder="请选择字段"
-                                        @change="indexChanges(scope.row)"
-                                        style="width: 100%"
+                                <el-select v-else-if="item.prop === 'type'" filterable size="small" v-model="scope.row.type">
+                                    <el-option
+                                        v-for="pgsqlType in getDbDialect(dbType!).getInfo().columnTypes"
+                                        :key="pgsqlType.dataType"
+                                        :value="pgsqlType.udtName"
+                                        :label="pgsqlType.dataType"
                                     >
-                                        <el-option v-for="cl in tableData.indexs.columns" :key="cl.name" :label="cl.name" :value="cl.name">
-                                            {{ cl.name + ' - ' + (cl.remark || '') }}
-                                        </el-option>
-                                    </el-select>
+                                        <span v-if="pgsqlType.dataType === pgsqlType.udtName"
+                                            >{{ pgsqlType.dataType }}{{ pgsqlType.desc && '：' + pgsqlType.desc }}</span
+                                        >
+                                        <span v-else>{{ pgsqlType.dataType }}，别名：{{ pgsqlType.udtName }} {{ pgsqlType.desc }}</span>
+                                    </el-option>
+                                </el-select>
 
-                                    <el-checkbox v-if="item.prop === 'unique'" size="small" v-model="scope.row.unique" @change="indexChanges(scope.row)">
-                                    </el-checkbox>
+                                <el-input v-else-if="item.prop === 'value'" size="small" v-model="scope.row.value" />
 
-                                    <el-input v-if="item.prop === 'indexType'" disabled size="small" v-model="scope.row.indexType" />
+                                <el-input v-else-if="item.prop === 'length'" type="number" size="small" v-model.number="scope.row.length" />
 
-                                    <el-input v-if="item.prop === 'indexComment'" size="small" v-model="scope.row.indexComment"> </el-input>
+                                <el-input v-else-if="item.prop === 'numScale'" type="number" size="small" v-model.number="scope.row.numScale" />
 
-                                    <el-popconfirm v-else-if="item.prop === 'action'" title="确定删除?" @confirm="deleteIndex(scope.$index)">
-                                        <template #reference>
-                                            <el-link type="danger" plain size="small" :underline="false">删除</el-link>
-                                        </template>
-                                    </el-popconfirm>
-                                </template>
-                            </el-table-column>
-                        </el-table>
+                                <el-checkbox v-else-if="item.prop === 'notNull'" size="small" v-model="scope.row.notNull" />
 
-                        <el-row style="margin-top: 20px">
-                            <el-button @click="addIndex()" link type="primary" icon="plus">添加索引</el-button>
-                        </el-row>
-                    </el-tab-pane>
-                </el-tabs>
-            </el-form>
-            <template #footer>
-                <el-button @click="cancel()">取消</el-button>
-                <el-button :loading="btnloading" @click="submit()" type="primary">保存</el-button>
-            </template>
-        </el-dialog>
-    </div>
+                                <el-checkbox v-else-if="item.prop === 'pri'" size="small" v-model="scope.row.pri" />
+
+                                <el-checkbox
+                                    v-else-if="item.prop === 'auto_increment'"
+                                    size="small"
+                                    v-model="scope.row.auto_increment"
+                                    :disabled="disableEditIncr()"
+                                />
+
+                                <el-input v-else-if="item.prop === 'remark'" size="small" v-model="scope.row.remark" />
+
+                                <el-popconfirm v-else-if="item.prop === 'action'" title="确定删除?" @confirm="deleteRow(scope.$index)">
+                                    <template #reference>
+                                        <el-link type="danger" plain size="small" :underline="false">删除</el-link>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <el-row style="margin-top: 20px">
+                        <el-button @click="addDefaultRows()" link type="warning" icon="plus">添加默认列</el-button>
+                        <el-button @click="addRow()" link type="primary" icon="plus">添加列</el-button>
+                    </el-row>
+                </el-tab-pane>
+                <el-tab-pane label="索引" name="2">
+                    <el-table :data="tableData.indexs.res" :max-height="tableData.height">
+                        <el-table-column :prop="item.prop" :label="item.label" v-for="item in tableData.indexs.colNames" :key="item.prop">
+                            <template #default="scope">
+                                <el-input v-if="item.prop === 'indexName'" size="small" disabled v-model="scope.row.indexName"></el-input>
+
+                                <el-select
+                                    v-if="item.prop === 'columnNames'"
+                                    v-model="scope.row.columnNames"
+                                    multiple
+                                    collapse-tags
+                                    collapse-tags-tooltip
+                                    filterable
+                                    placeholder="请选择字段"
+                                    @change="indexChanges(scope.row)"
+                                    style="width: 100%"
+                                >
+                                    <el-option v-for="cl in tableData.indexs.columns" :key="cl.name" :label="cl.name" :value="cl.name">
+                                        {{ cl.name + ' - ' + (cl.remark || '') }}
+                                    </el-option>
+                                </el-select>
+
+                                <el-checkbox v-if="item.prop === 'unique'" size="small" v-model="scope.row.unique" @change="indexChanges(scope.row)">
+                                </el-checkbox>
+
+                                <el-input v-if="item.prop === 'indexType'" disabled size="small" v-model="scope.row.indexType" />
+
+                                <el-input v-if="item.prop === 'indexComment'" size="small" v-model="scope.row.indexComment"> </el-input>
+
+                                <el-popconfirm v-else-if="item.prop === 'action'" title="确定删除?" @confirm="deleteIndex(scope.$index)">
+                                    <template #reference>
+                                        <el-link type="danger" plain size="small" :underline="false">删除</el-link>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+
+                    <el-row style="margin-top: 20px">
+                        <el-button @click="addIndex()" link type="primary" icon="plus">添加索引</el-button>
+                    </el-row>
+                </el-tab-pane>
+            </el-tabs>
+        </el-form>
+        <template #footer>
+            <el-button @click="cancel()">取消</el-button>
+            <el-button :loading="btnloading" @click="submit()" type="primary">保存</el-button>
+        </template>
+    </el-drawer>
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive, ref, toRefs, watch } from 'vue';
+import { computed, reactive, ref, toRefs, watch, useTemplateRef, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
 import SqlExecBox from '../sqleditor/SqlExecBox';
 import { DbType, getDbDialect, IndexDefinition, RowDefinition } from '../../dialect/index';
 import { DbInst } from '../../db';
+import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
+
 
 const props = defineProps({
     visible: {
@@ -169,6 +173,8 @@ type ColName = {
 };
 
 const formRef: any = ref();
+const tableRef: any = useTemplateRef('tableRef');
+
 const state = reactive({
     dialogVisible: false,
     btnloading: false,
@@ -265,7 +271,7 @@ const state = reactive({
         tableComment: '',
         oldTableName: '',
         oldTableComment: '',
-        height: 450,
+        height: 'calc(100vh - 310px)',
         db: '',
     },
 });
@@ -306,6 +312,16 @@ const addRow = () => {
         auto_increment: false,
         remark: '',
     });
+
+    // 滚动到最后一行
+  nextTick(() => {
+    if (tableRef.value) {
+      const lastRow = tableRef.value.$el.querySelector('.el-table__body-wrapper tbody tr:last-child');
+      if (lastRow) {
+        lastRow.scrollIntoView({ behavior: 'smooth' });
+      }
+    }
+  });
 };
 
 const addIndex = () => {
diff --git a/server/go.mod b/server/go.mod
index 826fe660..6bdd85f9 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/microsoft/go-mssqldb v1.7.2
 	github.com/mojocn/base64Captcha v1.3.6 // 验证码
 	github.com/pkg/errors v0.9.1
-	github.com/pkg/sftp v1.13.6
+	github.com/pkg/sftp v1.13.7
 	github.com/pquerna/otp v1.4.0
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
diff --git a/server/internal/tag/application/tag_tree.go b/server/internal/tag/application/tag_tree.go
index 65a816cd..57156afc 100644
--- a/server/internal/tag/application/tag_tree.go
+++ b/server/internal/tag/application/tag_tree.go
@@ -503,12 +503,12 @@ func (p *tagTreeAppImpl) toTags(parentTags []*entity.TagTree, param *dto.Resourc
 }
 
 func (p *tagTreeAppImpl) deleteByIds(ctx context.Context, tagIds []uint64) error {
-	if err := p.DeleteById(ctx, tagIds...); err != nil {
-		return err
-	}
-
-	// 删除与标签有关联信息的记录(如团队关联的标签等)
-	return p.tagTreeRelateApp.DeleteByCond(ctx, model.NewCond().In("tag_id", tagIds))
+	return p.Tx(ctx, func(ctx context.Context) error {
+		return p.DeleteById(ctx, tagIds...)
+	}, func(ctx context.Context) error {
+		// 删除与标签有关联信息的记录(如团队关联的标签等)
+		return p.tagTreeRelateApp.DeleteByCond(ctx, model.NewCond().In("tag_id", tagIds))
+	})
 }
 
 // filterCodePaths 根据账号拥有的标签路径以及指定的标签路径，过滤出符合查询条件的标签路径
diff --git a/server/pkg/base/app.go b/server/pkg/base/app.go
index 01254480..a66feb75 100644
--- a/server/pkg/base/app.go
+++ b/server/pkg/base/app.go
@@ -183,7 +183,7 @@ func (ai *AppImpl[T, R]) Tx(ctx context.Context, funcs ...func(context.Context)
 		}
 
 		tx.Count--
-		if tx.Count < 1 {
+		if tx.Count == 0 {
 			// 移除当前已执行完成的的数据库事务实例
 			contextx.RmDb(ctx)
 		}
@@ -191,8 +191,8 @@ func (ai *AppImpl[T, R]) Tx(ctx context.Context, funcs ...func(context.Context)
 
 	for _, f := range funcs {
 		err = f(dbCtx)
-		if err != nil {
-			tx.Count = 0
+		if err != nil && tx.Count > 0 {
+			tx.Count = 1
 			txDb.Rollback()
 			return
 		}