Browse Source

优化查询

xiaochan 2 years ago
parent
commit
95ef304a6f

+ 7 - 4
src/components/query-components/XcQuery.vue

@@ -86,10 +86,13 @@ const submit = async (reset = false) => {
   let queryData = extractQueryData(pageJson.value);
 
   pageJson.value.tableConfig.loading = true
-  let res = await executeSQL(pageJson.value.submitQuerySql, queryData) as any[]
-  pageJson.value.tableConfig.loading = false
-  pageJson.value.tableConfig.data = res
-  pageJson.value.pageConfig.total = res.length
+  try {
+    let res = await executeSQL(pageJson.value.submitQuerySql, queryData) as any[]
+    pageJson.value.tableConfig.data = res
+    pageJson.value.pageConfig.total = res.length
+  } catch {
+    pageJson.value.tableConfig.loading = false
+  }
 
   // 动态执行函数,暂时先废弃
   // let func = new Function('queryData', 'config', 'axios', 'return ' + deleteFunction(pageJson.value.submitEvent))

+ 1 - 0
src/views/utilities/page-editor-help/PageEditorHelp.vue

@@ -89,6 +89,7 @@ const getPageStr = () => {
   })
   tempDate.tableConfig.data = [];
   tempDate.queryParam = {}
+  tempDate.tableConfig.loading = false
   tempDate.pageConfig = {
     currentPage: 1,
     pageSize: 50,