From bc43f882b54390fe3b921fc63ebcf7bfeecfb28c Mon Sep 17 00:00:00 2001
From: "Gui.H" <springhgui@outlook.com>
Date: Mon, 31 Jul 2023 11:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=B9=E6=AF=94=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/launchSettings.json            |   7 --
 src/OnlineWebApp/Views/Home/SyncCheck.cshtml  |  95 ++++++++++++----
 src/OnlineWebApp/Views/Shared/_Layout.cshtml  |   1 +
 src/PowerSchemaSync/Models/DiffResult.cs      |  41 ++++++-
 src/PowerSchemaSync/PowerSchemaSync.csproj    |   2 +-
 src/PowerSchemaSync/Utilitys/DiffUtility.cs   | 102 ++++++++++++------
 6 files changed, 182 insertions(+), 66 deletions(-)

diff --git a/src/OnlineWebApp/Properties/launchSettings.json b/src/OnlineWebApp/Properties/launchSettings.json
index 524d342..b7d90bf 100644
--- a/src/OnlineWebApp/Properties/launchSettings.json
+++ b/src/OnlineWebApp/Properties/launchSettings.json
@@ -25,13 +25,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
     }
   }
 }
diff --git a/src/OnlineWebApp/Views/Home/SyncCheck.cshtml b/src/OnlineWebApp/Views/Home/SyncCheck.cshtml
index 555b4dd..dcd5687 100644
--- a/src/OnlineWebApp/Views/Home/SyncCheck.cshtml
+++ b/src/OnlineWebApp/Views/Home/SyncCheck.cshtml
@@ -4,7 +4,14 @@
 @{
     ViewData["Title"] = "结构检查";
 }
-
+@section css{
+    <style>
+        .code-sql {
+            font-family: cursive;
+            font-size: .9rem;
+        }
+    </style>
+}
 <div id="app">
     <div v-loading.fullscreen.lock="fullscreenLoading" element-loading-text="正在比对..."></div>
     <!--第一步-->
@@ -14,16 +21,26 @@
         </el-header>
         <el-main>
             <!--上部分-->
-            <el-table row-key="tableName" :data="tableData" style="width: 100%" highlight-current-row @@current-change="currentChange">
-                <el-table-column prop="tableName" label="源对象" min-width="45%" sortable>
+            <el-table row-key="name" :data="tableData" style="width: 100%" highlight-current-row @@current-change="currentChange">
+                @* <el-table-column type="selection" width="55"></el-table-column> *@
+                <el-table-column prop="name" label="源对象" min-width="45%" sortable>
+                    <template #default="scope">
+                        {{ scope.row.name }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="operate" label="操作" min-width="10%" sortable>
                     <template #default="scope">
-                        {{ scope.row.tableName }}
+                        <div :title="scope.row.operate">
+                            <el-icon v-if="scope.row.operate=='Edit'"><Right /></el-icon>
+                            <el-icon v-if="scope.row.operate=='Delete'"><Close></Close></el-icon>
+                            <el-icon v-if="scope.row.operate=='None'"><Check></Check></el-icon>
+                            <el-icon v-if="scope.row.operate=='Created'"><Plus></Plus></el-icon>
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="operate" label="操作" min-width="10%" sortable></el-table-column>
-                <el-table-column prop="tableName" label="目标对象" min-width="45%" sortable>
+                <el-table-column prop="name" label="目标对象" min-width="45%" sortable>
                     <template #default="scope">
-                        <div v-if="scope.row.operate!=''">{{ scope.row.tableName }}</div>
+                        <div v-if="scope.row.operate!=''">{{ scope.row.name }}</div>
                         <div else="scope.row.operate!=''"></div>
                     </template>
                 </el-table-column>
@@ -32,8 +49,14 @@
             <div>
                 <div><h3>部署脚本</h3></div>
                 <div class="sql-container">
-                    <div v-for="sql in currentRow.syncSqls">
-                        {{sql}}
+                    <div v-if="currentRow.syncSql">
+                        <div class="code-sql"> {{currentRow.syncSql}}</div>
+                    </div>
+
+                    <div v-if="currentRow.type=='table'">
+                        <div class="code-sql" v-for="sql in currentRow.syncSqls">
+                            {{sql}}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -44,15 +67,17 @@
         <el-main>
             <div><h3>部署脚本</h3></div>
             <div class="sql-container">
-                <div>
+                <div class="code-sql">
                     SET FOREIGN_KEY_CHECKS=0;
                 </div>
-                <template v-for="item in diffResult.tables">
-                    <div v-for="sql in item.syncSqls">
+
+                <template v-for="item in allTables">
+                    <div class="code-sql" v-for="sql in item.syncSqls">
                         {{sql}}
                     </div>
                 </template>
-                <div>
+
+                <div class="code-sql">
                     SET FOREIGN_KEY_CHECKS=1;
                 </div>
             </div>
@@ -73,18 +98,25 @@
     <script>
         const app = Vue.createApp(
             {
+                components: ElementPlusIconsVue,
                 data() {
                     return {
                         step: 1,
                         tableData: [],
                         diffResult: {},
                         fullscreenLoading: false,
-                        groued: [],
                         currentRow: {}
                     };
                 },
                 computed: {
+                    allTables() {
+                        var res = [];
+                        for (const groud of this.tableData) {
+                            res = res.concat(groud.children)
+                        }
 
+                        return res;
+                    }
                 },
                 methods: {
                     run() {
@@ -100,6 +132,7 @@
                             });
                     },
                     currentChange(row) {
+                        console.log(row)
                         this.currentRow = row;
                     },
                     grouedTables(tables) {
@@ -115,10 +148,32 @@
 
                         var res = [];
                         for (const item of Object.keys(groupedBy)) {
+                            let children = [];
+                            for (const table of groupedBy[item]) {
+
+                                var syncSqls = [];
+                                for (const column of table.columns) {
+                                    syncSqls.push(column.syncSql);
+                                }
+
+                                for (const index of table.indexs) {
+                                    syncSqls.push(index.syncSql);
+                                }
+
+                                children.push({
+                                    type: 'table',
+                                    name: table.tableName,
+                                    operate: table.operate,
+                                    syncSqls: syncSqls,
+                                    children: table.columns.concat(table.indexs)
+                                })
+                            }
+
                             res.push({
-                                tableName: item,
+                                type: 'group',
+                                name: item == "Edit" ? "要修改的对象" : item == "None" ? "没有操作" : item == "Delete" ? "要删除的对象" : item == "Created" ? "要创建的对象" : "",
                                 operate: "",
-                                children: groupedBy[item]
+                                children: children
                             });
                         }
                         return res;
@@ -132,13 +187,13 @@
                         axios.get('/api/Sync/diff' + location.search).then(res => {
                             this.diffResult = res.data
 
-                            var groued = this.grouedTables(this.diffResult.tables);
-                            console.log(groued)
-                            this.tableData = groued;
+                            this.tableData = this.grouedTables(this.diffResult.tables);
+                            console.log(this.tableData)
+ 
                             this.fullscreenLoading = false;
                         }).catch(err => {
                             this.fullscreenLoading = false;
-                            this.$message.error(err.response.data);
+                            this.$message.error(err.message || err.response.data);
                         })
                     },
                     reDiff() {
diff --git a/src/OnlineWebApp/Views/Shared/_Layout.cshtml b/src/OnlineWebApp/Views/Shared/_Layout.cshtml
index 580e32f..1ea199b 100644
--- a/src/OnlineWebApp/Views/Shared/_Layout.cshtml
+++ b/src/OnlineWebApp/Views/Shared/_Layout.cshtml
@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="//unpkg.com/element-plus/dist/index.css" />
     <script src="//unpkg.com/vue@3"></script>
     <script src="//unpkg.com/element-plus"></script>
+    <script src="//unpkg.com/@@element-plus/icons-vue"></script>
     @await RenderSectionAsync("css", required: false)
 </head>
 <body>
diff --git a/src/PowerSchemaSync/Models/DiffResult.cs b/src/PowerSchemaSync/Models/DiffResult.cs
index defd936..47d3cd3 100644
--- a/src/PowerSchemaSync/Models/DiffResult.cs
+++ b/src/PowerSchemaSync/Models/DiffResult.cs
@@ -20,17 +20,52 @@ public class DiffInfo
     {
         public string TableName { get; set; }
 
-        public DiffTable Source { get; set; }
+        public List<DiffColumn> Columns { get; set; } = new List<DiffColumn>();
 
-        public DiffTable Target { get; set; }
+        public List<DiffIndex> Indexs { get; set; } = new List<DiffIndex>();
 
-        public List<string> SyncSqls { get; set; } = new List<string>();
+        /// <summary>
+        /// 需要操作的类型
+        /// </summary>
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public OprateEnum Operate { get; set; }
+
+        public string SyncSql { get; set; }
 
+        [JsonIgnore]
+        public IEnumerable<string> SyncSqls
+        {
+            get
+            {
+                return Columns.Select(c => c.SyncSql).Concat(Indexs.Select(x => x.SyncSql));
+            }
+        }
+    }
+
+    public class DiffIndex
+    {
         /// <summary>
         /// 需要操作的类型
         /// </summary>
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public OprateEnum Operate { get; set; }
+
+        public string Name { get; set; }
+
+        public string SyncSql { get; set; }
+    }
+
+    public class DiffColumn
+    {
+        /// <summary>
+        /// 需要操作的类型
+        /// </summary>
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public OprateEnum Operate { get; set; }
+
+        public string Name { get; set; }
+
+        public string SyncSql { get; set; }
     }
 
     public enum OprateEnum
diff --git a/src/PowerSchemaSync/PowerSchemaSync.csproj b/src/PowerSchemaSync/PowerSchemaSync.csproj
index d66013e..ebddfdf 100644
--- a/src/PowerSchemaSync/PowerSchemaSync.csproj
+++ b/src/PowerSchemaSync/PowerSchemaSync.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0</Version>
+		<Version>1.2.1</Version>
 		<Description>数据库结构同步工具库</Description>
 		<TargetFrameworks>net6.0;net461</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/PowerSchemaSync/Utilitys/DiffUtility.cs b/src/PowerSchemaSync/Utilitys/DiffUtility.cs
index 770466f..28fe579 100644
--- a/src/PowerSchemaSync/Utilitys/DiffUtility.cs
+++ b/src/PowerSchemaSync/Utilitys/DiffUtility.cs
@@ -57,11 +57,8 @@ public DiffResult Diff()
 
                 if (sourceTable == null)
                 {
-                    diff.Source = null;
-                    diff.Target = new DiffTable {/* TODO */ };
-
                     var dropSql = Target.DropTableSql(targetTable!.Schema, tableName);
-                    diff.SyncSqls.Add(dropSql);
+                    diff.SyncSql = dropSql;
                     diff.Operate = OprateEnum.Delete;
                     res.Tables.Add(diff);
                     continue;
@@ -69,24 +66,18 @@ public DiffResult Diff()
 
                 if (targetTable == null)
                 {
-                    diff.Source = new DiffTable {/* TODO */ };
-                    diff.Target = null;
-
-                    // TODO: 创建表的sql
-                    diff.SyncSqls.Add(sourceTable.CreateTable);
+                    diff.SyncSql = sourceTable.CreateTable;
                     diff.Operate = OprateEnum.Created;
                     res.Tables.Add(diff);
                     continue;
                 }
 
                 // 两库中均存在该表
+                diff.Operate = OprateEnum.None;
+
                 diffColumns(ref diff, sourceTable, targetTable);
                 diffIndex(ref diff, sourceTable, targetTable);
 
-                diff.Operate = OprateEnum.Edit;
-                if (diff.SyncSqls.Count == 0)
-                    diff.Operate = OprateEnum.None;
-
                 res.Tables.Add(diff);
             }
 
@@ -97,6 +88,7 @@ private void diffColumns(ref DiffInfo diff, DataTableModel sourceTable, DataTabl
         {
             // 1.获取两个库中并集
             var unionColumes = sourceTable.Columes.Select(x => x.Name).Union(targetTable.Columes.Select(x => x.Name));
+
             foreach (var columeName in unionColumes)
             {
                 var sourceColume = sourceTable.Columes.FirstOrDefault(x => x.Name == columeName);
@@ -104,11 +96,13 @@ private void diffColumns(ref DiffInfo diff, DataTableModel sourceTable, DataTabl
 
                 if (sourceColume == null)
                 {
-                    diff.Source = null;
-                    diff.Target = new DiffTable {/* TODO */ };
-
                     var sql = Target.DropColumnSql(targetTable.Schema, targetTable.TableName, columeName);
-                    diff.SyncSqls.Add(sql);
+                    diff.Columns.Add(new DiffColumn
+                    {
+                        Name = columeName,
+                        Operate = OprateEnum.Delete,
+                        SyncSql = sql,
+                    });
                     continue;
                 }
 
@@ -135,25 +129,36 @@ private void diffColumns(ref DiffInfo diff, DataTableModel sourceTable, DataTabl
                 var comment = $"{(string.IsNullOrEmpty(sourceColume.Comment) ? null : $" COMMENT '{sourceColume.Comment}'")}";
                 if (targetColume == null)
                 {
-                    diff.Source = new DiffTable {/* TODO */ };
-                    diff.Target = null;
-
                     var sql = Target.AddColumnSql(targetTable.Schema, targetTable.TableName, columeName, sourceColume.COLUMN_TYPE, sourceColume.IsNull, defaultValue, comment, position);
-                    diff.SyncSqls.Add(sql);
+                    diff.Columns.Add(new DiffColumn
+                    {
+                        Name = columeName,
+                        Operate = OprateEnum.Created,
+                        SyncSql = sql,
+                    });
                     continue;
                 }
 
                 // 比较两个字段的定义，任何一个不同就需要按源表的字段进行覆盖
-                if (!checkType(targetColume, sourceColume)
-                    || targetColume.DefaultValue != sourceColume.DefaultValue
+                if (targetColume.DefaultValue != sourceColume.DefaultValue
                     || targetColume.Comment != sourceColume.Comment
                     || targetColume.Extra != sourceColume.Extra
-                    || targetColume.IsNull != sourceColume.IsNull)
+                    || targetColume.IsNull != sourceColume.IsNull || !checkType(targetColume, sourceColume))
                 {
                     var sql = Target.ModifyColumnSql(targetTable.Schema, targetTable.TableName, columeName, sourceColume.COLUMN_TYPE, sourceColume.IsNull, defaultValue, comment, position);
-                    diff.SyncSqls.Add(sql);
+                    diff.Columns.Add(new DiffColumn
+                    {
+                        Name = columeName,
+                        Operate = OprateEnum.Edit,
+                        SyncSql = sql,
+                    });
                 }
             }
+
+            if (diff.Columns.Any(x => x.Operate != OprateEnum.None))
+            {
+                diff.Operate = OprateEnum.Edit;
+            }
         }
 
         // 从8.0.17版本开始，TINYINT, SMALLINT, MEDIUMINT, INT, and BIGINT 类型的显示宽度将失效。
@@ -161,6 +166,11 @@ private void diffColumns(ref DiffInfo diff, DataTableModel sourceTable, DataTabl
 
         bool checkType(ColumnMetadata column1, ColumnMetadata column2)
         {
+            if (column1.ORDINAL_POSITION != column2.ORDINAL_POSITION)
+            {
+                return false;
+            }
+
             if (column1.COLUMN_TYPE == column2.COLUMN_TYPE)
                 return true;
 
@@ -188,27 +198,39 @@ private void diffIndex(ref DiffInfo diff, DataTableModel sourceTable, DataTableM
 
                 if (sourceIndex == null)
                 {
-                    diff.Source = null;
-                    diff.Target = new DiffTable {/* TODO */ };
-
-                    diff.SyncSqls.Add($"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` DROP {indexTypeWithName};");
+                    var deleteSql = $"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` DROP {indexTypeWithName};";
+                    diff.Indexs.Add(new DiffIndex
+                    {
+                        Name = indexName,
+                        Operate = OprateEnum.Delete,
+                        SyncSql = deleteSql
+                    });
                     continue;
                 }
 
                 var comment = $"{(string.IsNullOrEmpty(sourceIndex.COMMENT) ? null : $" COMMENT '{sourceIndex.COMMENT}'")}";
                 if (targetIndex == null)
                 {
-                    diff.Source = new DiffTable {/* TODO */ };
-                    diff.Target = null;
-
                     if (sourceIndex.IndexType == "FULLTEXT")
                     {
                         // 查看源表全文索引使用的解析器
                         var parser = getFTParser(sourceTable.CreateTable, indexName);
-                        diff.SyncSqls.Add($"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` ADD FULLTEXT {indexTypeWithName}({sourceIndex.ColumnsJoined}){parser}{comment};");
+                        diff.Indexs.Add(new DiffIndex
+                        {
+                            Name = indexName,
+                            Operate = OprateEnum.Created,
+                            SyncSql = $"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` ADD FULLTEXT {indexTypeWithName}({sourceIndex.ColumnsJoined}){parser}{comment};"
+                        });
                     }
                     else
-                        diff.SyncSqls.Add($"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` ADD {indexTypeWithName}({sourceIndex.ColumnsJoined}) USING {sourceIndex.IndexType}{comment};");
+                    {
+                        diff.Indexs.Add(new DiffIndex
+                        {
+                            Name = indexName,
+                            Operate = OprateEnum.Created,
+                            SyncSql = $"ALTER TABLE `{targetTable.Schema}`.`{targetTable.TableName}` ADD {indexTypeWithName}({sourceIndex.ColumnsJoined}) USING {sourceIndex.IndexType}{comment};"
+                        });
+                    }
 
                     continue;
                 }
@@ -230,9 +252,19 @@ private void diffIndex(ref DiffInfo diff, DataTableModel sourceTable, DataTableM
                     else
                         dropAndRebuild.Append($"ADD {indexTypeWithName}({sourceIndex.ColumnsJoined}) USING {sourceIndex.IndexType}{comment};");
 
-                    diff.SyncSqls.Add(dropAndRebuild.ToString());
+                    diff.Indexs.Add(new DiffIndex
+                    {
+                        SyncSql = dropAndRebuild.ToString(),
+                        Operate = OprateEnum.Edit,
+                        Name = indexName,
+                    });
                 }
             }
+
+            if (diff.Indexs.Any(x => x.Operate != OprateEnum.None))
+            {
+                diff.Operate = OprateEnum.Edit;
+            }
         }
 
         private string getFTParser(string createTable, string indexName)