From b7815df62a79375af388a18d63be596d595752e5 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Tue, 8 Feb 2022 18:46:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90(hhyo#1367)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/models.py               | 1 +
 sql/templates/sqlquery.html | 6 ++++--
 sql/views.py                | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sql/models.py b/sql/models.py
index 552d24c505..0848b47a6c 100755
--- a/sql/models.py
+++ b/sql/models.py
@@ -730,6 +730,7 @@ class Meta:
             ('archive_review', '审核归档申请'),
             ('archive_mgt', '管理归档申请'),
             ('audit_user','审计权限'),
+            ('download', '在线查询下载权限'),
         )
 
 
diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
index 46e1d5fe47..181186496d 100644
--- a/sql/templates/sqlquery.html
+++ b/sql/templates/sqlquery.html
@@ -265,6 +265,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
     <script>
         //获取查询列表
         function get_querylog(query_log_id) {
+            var showExport = {{is_download}}==1
             //初始化table
             $('#sql-log').bootstrapTable('destroy').bootstrapTable({
                 escape: true,
@@ -280,7 +281,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                 pageNumber: 1,                      //初始化加载第一页，默认第一页,并记录
                 pageSize: 14,                       //每页的记录行数（*）
                 pageList: [10, 30, 50, 100],        //可供选择的每页的行数（*）
-                showExport: true,                   //是否显示导出按钮
+                showExport: showExport,                   //是否显示导出按钮
                 exportTypes: ['json', 'sql', 'csv', 'txt', 'xml', 'xlsx'],
                 exportOptions: {
                     ignoreColumn: [0],  //忽略某些列的索引数组
@@ -781,11 +782,12 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                         if (optgroup == 'Mongo') {
                             isdetail = true
                         }
+                        var showExport = {{is_download}}==1
                         $("#" + ('query_result' + n)).bootstrapTable('destroy').bootstrapTable({
                             escape: true,
                             data: result['rows'],
                             columns: columns,
-                            showExport: true,
+                            showExport: showExport,
                             exportDataType: "all",
                             exportTypes: ['json', 'sql', 'csv', 'txt', 'xml', 'xlsx'],
                             exportOptions: {
diff --git a/sql/views.py b/sql/views.py
index d41a24e805..fe476447fd 100644
--- a/sql/views.py
+++ b/sql/views.py
@@ -220,7 +220,8 @@ def sqlquery(request):
     # 收藏语句
     user = request.user
     favorites = QueryLog.objects.filter(username=user.username, favorite=True).values('id', 'alias')
-    return render(request, 'sqlquery.html', {'favorites': favorites})
+    is_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0
+    return render(request, 'sqlquery.html', {'favorites': favorites, 'is_download':is_download})
 
 
 @permission_required('sql.menu_queryapplylist', raise_exception=True)

From 2019bcb55470522382b6756c38b9db8da3cb6bc9 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Wed, 9 Feb 2022 09:51:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=86=99?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/templates/group.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/templates/group.html b/sql/templates/group.html
index 9593d48f03..e464837431 100644
--- a/sql/templates/group.html
+++ b/sql/templates/group.html
@@ -85,7 +85,7 @@
                 }],
                 onLoadSuccess: function () {
                 },
-                onLoadError: fonLoadErrorCallback,
+                onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
                     queryParams(e)

From cceb15b9161b47cfbef9dcc4e53809bd22f07981 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Wed, 9 Feb 2022 10:13:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=A1=A5=E5=8A=A0SQL=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/init_sql/v1.8.3.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/init_sql/v1.8.3.sql b/src/init_sql/v1.8.3.sql
index 287873505c..145f3897f3 100644
--- a/src/init_sql/v1.8.3.sql
+++ b/src/init_sql/v1.8.3.sql
@@ -23,4 +23,9 @@ alter table audit_log add `user_display` varchar(50) DEFAULT NULL COMMENT '用
 
 set @content_type_id=(select id from django_content_type where app_label='sql' and model='permission');
 insert IGNORE INTO auth_permission (name, content_type_id, codename) VALUES
-('审计权限 ', @content_type_id, 'audit_user');
+('审计权限', @content_type_id, 'audit_user');
+
+-- 在线查询下载权限
+set @content_type_id=(select id from django_content_type where app_label='sql' and model='permission');
+insert IGNORE INTO auth_permission (name, content_type_id, codename) VALUES
+('在线查询下载权限', @content_type_id, 'download');
\ No newline at end of file

From de67a2c46a95aecdf736768bc0e048fe823c7004 Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Wed, 9 Feb 2022 12:51:34 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/templates/sqlquery.html | 4 ++--
 sql/views.py                | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
index 181186496d..60deae3657 100644
--- a/sql/templates/sqlquery.html
+++ b/sql/templates/sqlquery.html
@@ -265,7 +265,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
     <script>
         //获取查询列表
         function get_querylog(query_log_id) {
-            var showExport = {{is_download}}==1
+            var showExport = {{can_download}}===1
             //初始化table
             $('#sql-log').bootstrapTable('destroy').bootstrapTable({
                 escape: true,
@@ -782,7 +782,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                         if (optgroup == 'Mongo') {
                             isdetail = true
                         }
-                        var showExport = {{is_download}}==1
+                        var showExport = {{can_download}}===1
                         $("#" + ('query_result' + n)).bootstrapTable('destroy').bootstrapTable({
                             escape: true,
                             data: result['rows'],
diff --git a/sql/views.py b/sql/views.py
index fe476447fd..7001e797a8 100644
--- a/sql/views.py
+++ b/sql/views.py
@@ -220,8 +220,8 @@ def sqlquery(request):
     # 收藏语句
     user = request.user
     favorites = QueryLog.objects.filter(username=user.username, favorite=True).values('id', 'alias')
-    is_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0
-    return render(request, 'sqlquery.html', {'favorites': favorites, 'is_download':is_download})
+    can_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0
+    return render(request, 'sqlquery.html', {'favorites': favorites, 'can_download':can_download})
 
 
 @permission_required('sql.menu_queryapplylist', raise_exception=True)
@@ -449,8 +449,7 @@ def audit_sqlquery(request):
     """SQL在线查询页面审计"""
     user = request.user
     favorites = QueryLog.objects.filter(username=user.username, favorite=True).values('id', 'alias')
-    is_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0
-    return render(request, 'audit_sqlquery.html', {'favorites': favorites, 'is_download':is_download})
+    return render(request, 'audit_sqlquery.html', {'favorites': favorites})
 
 
 def audit_sqlworkflow(request):

From c8f5a31e77b8768b6a4b4613614b6ab602562bbf Mon Sep 17 00:00:00 2001
From: weideguo <2515717245@qq.com>
Date: Wed, 9 Feb 2022 13:36:55 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/models.py           | 2 +-
 src/init_sql/v1.8.3.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/models.py b/sql/models.py
index 0848b47a6c..4d6a2c0f16 100755
--- a/sql/models.py
+++ b/sql/models.py
@@ -730,7 +730,7 @@ class Meta:
             ('archive_review', '审核归档申请'),
             ('archive_mgt', '管理归档申请'),
             ('audit_user','审计权限'),
-            ('download', '在线查询下载权限'),
+            ('query_download', '在线查询下载权限'),
         )
 
 
diff --git a/src/init_sql/v1.8.3.sql b/src/init_sql/v1.8.3.sql
index 145f3897f3..732810c819 100644
--- a/src/init_sql/v1.8.3.sql
+++ b/src/init_sql/v1.8.3.sql
@@ -28,4 +28,4 @@ insert IGNORE INTO auth_permission (name, content_type_id, codename) VALUES
 -- 在线查询下载权限
 set @content_type_id=(select id from django_content_type where app_label='sql' and model='permission');
 insert IGNORE INTO auth_permission (name, content_type_id, codename) VALUES
-('在线查询下载权限', @content_type_id, 'download');
\ No newline at end of file
+('在线查询下载权限', @content_type_id, 'query_download');
\ No newline at end of file