diff --git a/sql/engines/mongo.py b/sql/engines/mongo.py index 9d281b5375..e3edaeba86 100644 --- a/sql/engines/mongo.py +++ b/sql/engines/mongo.py @@ -439,8 +439,9 @@ def execute_check(self, db_name=None, sql=''): check_result.rows += [result] continue else: - method = sql_str.split('.')[2] - methodStr = method.split('(')[0].strip() + # method = sql_str.split('.')[2] + # methodStr = method.split('(')[0].strip() + methodStr = sql_str.split('(')[0].split('.')[-1].strip() # 最后一个.和括号(之间的字符串作为方法 if methodStr in is_exist_premise_method and not is_in: check_result.error = "文档不存在" check_result.error_count += 1 diff --git a/sql/sql_workflow.py b/sql/sql_workflow.py index 3d03c0d51a..5055310550 100644 --- a/sql/sql_workflow.py +++ b/sql/sql_workflow.py @@ -218,7 +218,7 @@ def submit(request): workflow_id = sql_workflow.id # 自动审核通过了,才调用工作流 if workflow_status == 'workflow_manreviewing': - # 调用工作流插入审核信息, 查询权限申请workflow_type=2 + # 调用工作流插入审核信息, SQL上线权限申请workflow_type=2 Audit.add(WorkflowDict.workflow_type['sqlreview'], workflow_id) except Exception as msg: logger.error(f"提交工单报错,错误信息:{traceback.format_exc()}") diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html index 2960aec9c6..5e7521fd10 100644 --- a/sql/templates/sqlquery.html +++ b/sql/templates/sqlquery.html @@ -780,7 +780,7 @@ //初始化查询结果 var isdetail = false var optgroup = $('#instance_name :selected').parent().attr('label'); - if (optgroup == 'Mongo') { + if (optgroup === 'Mongo' || optgroup === 'Redis') { isdetail = true } var showExport = {{can_download}}===1 @@ -812,6 +812,17 @@ $.each(row, function (key, value) { if (key === 0) {//mongodb这里要修改 let rs = value; + if (optgroup === 'Redis') { + try { + rs = JSON.parse(rs); + if (typeof rs == 'object' && rs) { + rs = JSON.stringify(rs, null, 2) + } + } catch (e) { + html.push('' + "非json格式,无法格式化!" + ''); + return false; + } + } html.push('
' + highLight(rs) + '
'); } });