数据安全接口优化及初始化页面更新

vue-fastapi-backend/module_admin/controller/data_ast_content_controller.py

@@ -108,6 +108,9 @@ async def getMetaSercuityData(
     apiModel.dbRCode = dataAstSecuRequest.data_ast_src
     apiModel.username = user_name
     apiModel.password = password
+    apiModel.isPage = True
+    apiModel.pageNum = 1
+    apiModel.pageSize = 10
     apiModel.sqlStr = "select * from " + dataAstSecuRequest.data_ast_eng_name
     # logger.info(f"设置 apiModel 参数：dbRId={apiModel.dbRId}, username={apiModel.username}, password={apiModel.password}, sqlStr={apiModel.sqlStr}")
 

vue-fastapi-backend/module_admin/service/metasecurity_service.py

@@ -306,8 +306,9 @@ class MetaSecurityService:
         # await test_connection(dbConnent)
         #3获取sql中涉及的表名
         sqlScheamAndTable =await cls.get_tables_from_sql(page_object.sqlStr)
+        oldStrSql=generate_pagination_sql(page_object,dsDataResource["type"])
         #4.执行原始sql
-        result = await cls.execute_sql(dbConnent, page_object.sqlStr,"原始")
+        result = await cls.execute_sql(dbConnent, oldStrSql,"原始")
         if 3 in role_id_list:
                 resultDict={
                 "ctrlSql": page_object.sqlStr,

vue-fastapi-frontend/src/store/modules/user.js

@@ -31,13 +31,6 @@ const useUserStore = defineStore(
             setToken(res.token)
             this.token = res.token
             resolve()
-          }).catch(error => {
-            reject(error)
-          })
-        })
-      },
-      getdsSysList(){
-        return new Promise((resolve, reject) => {
                 datasourcetree()
       .then(res => {
         this.dsSysList = res.rows || [] // 确保为空时不报错
@@ -48,6 +41,14 @@ const useUserStore = defineStore(
         this.dsSysList = [] // 请求失败也清空列表，避免残留
         reject(error)
       })
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
+      getdsSysList(){
+        return new Promise((resolve, reject) => {
+
   })
       },
       // 获取用户信息