From f82afbfe5760a337e1b7e2811ec98227dfee57f8 Mon Sep 17 00:00:00 2001 From: siyaqi Date: Sat, 8 Nov 2025 14:29:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/dataAsset/assetDetail/index.vue | 201 +++++++++--------- 1 file changed, 105 insertions(+), 96 deletions(-) diff --git a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue index 52f5c63..6d7ae13 100644 --- a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue +++ b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue @@ -132,103 +132,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新增 - - - - - - - - - - - - - - - - - - - - - - - - From 5d96d55e8245c4c9d43688e255cf6a809056084f Mon Sep 17 00:00:00 2001 From: siyaqi Date: Sat, 8 Nov 2025 17:17:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/metasecurity_service.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/vue-fastapi-backend/module_admin/service/metasecurity_service.py b/vue-fastapi-backend/module_admin/service/metasecurity_service.py index 1e0de02..579d615 100644 --- a/vue-fastapi-backend/module_admin/service/metasecurity_service.py +++ b/vue-fastapi-backend/module_admin/service/metasecurity_service.py @@ -734,25 +734,25 @@ async def replace_table_with_subquery(ctrSqlDict, oldStrSql): original_table = match.group(2) alias_part = match.group(3) # " AS xxx" 或 " xxx" alias_name = match.group(4) # xxx - + sql_keywords = { + "SELECT", "INSERT", "UPDATE", "DELETE", "MERGE", "TRUNCATE", + "VALUES", "RETURNING", "FROM", "WHERE", "GROUP", "HAVING", "ORDER", + "LIMIT", "OFFSET", "DISTINCT", "ALL", "UNION", "INTERSECT", "EXCEPT", + "JOIN", "INNER", "LEFT", "RIGHT", "FULL", "CROSS", "NATURAL", "USING", "ON", + "TABLE", "VIEW", "INDEX", "PRIMARY", "KEY", "FOREIGN", "REFERENCES", "NOT", + "NULL", "UNIQUE", "CHECK", "DEFAULT", "IF", "ELSE", "CASE", "WHEN", "THEN", + "END", "LOOP", "FOR", "WHILE", "CREATE", "ALTER", "DROP", "TRUNCATE", "COMMENT", + "EXISTS", "IN", "IS", "LIKE", "ILIKE", "SIMILAR", "BETWEEN", "AND", "OR", "ANY", + "ALL", "SOME", "FETCH", "NEXT", "ONLY", "ASC", "DESC", "GRANT", "REVOKE", "ROLE", + "USER", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", + } # 动态获取子查询 - if original_table in ctrSqlDict: + if original_table in ctrSqlDict and alias_name not in sql_keywords: # 使用 ctrSqlDict 中的子查询替换表名 replaced = f"{keyword} ({ctrSqlDict[original_table]}) {alias_part}" else: # 默认处理逻辑：判断 alias 是否为关键字 - sql_keywords = { - "SELECT", "INSERT", "UPDATE", "DELETE", "MERGE", "TRUNCATE", - "VALUES", "RETURNING", "FROM", "WHERE", "GROUP", "HAVING", "ORDER", - "LIMIT", "OFFSET", "DISTINCT", "ALL", "UNION", "INTERSECT", "EXCEPT", - "JOIN", "INNER", "LEFT", "RIGHT", "FULL", "CROSS", "NATURAL", "USING", "ON", - "TABLE", "VIEW", "INDEX", "PRIMARY", "KEY", "FOREIGN", "REFERENCES", "NOT", - "NULL", "UNIQUE", "CHECK", "DEFAULT", "IF", "ELSE", "CASE", "WHEN", "THEN", - "END", "LOOP", "FOR", "WHILE", "CREATE", "ALTER", "DROP", "TRUNCATE", "COMMENT", - "EXISTS", "IN", "IS", "LIKE", "ILIKE", "SIMILAR", "BETWEEN", "AND", "OR", "ANY", - "ALL", "SOME", "FETCH", "NEXT", "ONLY", "ASC", "DESC", "GRANT", "REVOKE", "ROLE", - "USER", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - } + if alias_name and alias_name.upper().split()[0] not in sql_keywords: replaced = f"{keyword} ({subquery}) {alias_part}" From 1e7c70ef031255ca57b4b4ddc33a888793adcdc4 Mon Sep 17 00:00:00 2001 From: "si@aidatagov.com" Date: Tue, 11 Nov 2025 02:15:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/dataAsset/directory/components/FormDialog.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vue-fastapi-frontend/src/views/dataAsset/directory/components/FormDialog.vue b/vue-fastapi-frontend/src/views/dataAsset/directory/components/FormDialog.vue index 52d8b78..ed86c15 100644 --- a/vue-fastapi-frontend/src/views/dataAsset/directory/components/FormDialog.vue +++ b/vue-fastapi-frontend/src/views/dataAsset/directory/components/FormDialog.vue @@ -55,7 +55,7 @@ @@ -84,6 +84,8 @@ From 1b109094279d59542c4fa39bbb649d79d4ef3435 Mon Sep 17 00:00:00 2001 From: "si@aidatagov.com" Date: Sat, 15 Nov 2025 22:15:56 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-fastapi-backend/module_admin/service/datastd_service.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py index 07cf171..50989cb 100644 --- a/vue-fastapi-backend/module_admin/service/datastd_service.py +++ b/vue-fastapi-backend/module_admin/service/datastd_service.py @@ -41,6 +41,12 @@ class DataStdService: :param is_page: 是否开启分页 :return: 列配置列表信息对象 """ + if query_object.src_sys==10000: + query_object.src_sys = None + query_object.cd_type ='company' + if query_object.src_sys==99999: + query_object.src_sys = None + query_object.cd_type ='sys' col_list_result = await DataStdDao.get_std_code_list(query_db, query_object, is_page) return col_list_result # @classmethod