Merge pull request #1305 from ocpeng/master

修复缩略SQL乱码问题
hhyo · Dec 28, 2021 · c8006ff · c8006ff
2 parents 02c8d8d + c164451
commit c8006ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/sql/templates/detail.html b/sql/templates/detail.html
@@ -609,10 +609,11 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
                     title: 'SQL内容',
                     field: 'sql',
                     formatter: function (value, row, index) {
-                        if (value.length > 80) {
-                            return value.substr(0, 80) + '...';
+                        var sql=row.sql;
+                        if (sql.length > 80) {
+                            return sql.substr(0, 80) + '...';
                         } else {
-                            return value
+                            return sql
                         }
                     },
                     sortable: false

diff --git a/sql/templates/rollback.html b/sql/templates/rollback.html
@@ -92,10 +92,11 @@
                 title: '回滚语句',
                 field: 1,
                 formatter: function (value, row, index) {
-                    if (value.length > 80) {
-                        return value.substr(0, 80) + '...';
+                    var sql=row[1];
+                    if (sql.length > 80) {
+                        return sql.substr(0, 80) + '...';
                     } else {
-                        return value
+                        return sql
                     }
                 }
             }, {

diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
@@ -359,8 +359,9 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                     title: '语句',
                     field: 'sqllog',
                     formatter: function (value, row, index) {
-                        if (value.length > 50) {
-                            var sql = value.substr(0, 50) + '...';
+                        var _sql=row.sqllog
+                        if (_sql.length > 50) {
+                            var sql = _sql.substr(0, 50) + '...';
                             return sql;
                         } else {
                             return value