From aae53647424ce38b6b70e46acbb63619b6a953b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 4 Sep 2025 15:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=20=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 ++--
 src/utils/request.ts                          |  4 ++--
 src/views/boardGenerate/dataSourceList.vue    | 23 ++++++++++++++++---
 .../nodes/data/customDataNode.vue             | 13 +++++------
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index a4c6477..765829c 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "typescript": "5.4.5",
     "unocss": "0.58.6",
     "unplugin-auto-import": "0.17.5",
-    "unplugin-icons": "0.18.5",
+    "unplugin-icons": "^22.2.0",
     "unplugin-vue-components": "0.26.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
     "vite": "5.2.12",
@@ -115,7 +115,7 @@
     "vite-plugin-svg-icons": "2.0.1",
     "vitest": "1.5.0",
     "vue-eslint-parser": "9.4.2",
-    "vue-tsc": "2.0.13"
+    "vue-tsc": "^3.0.6"
   },
   "overrides": {
     "vue": "3.4.34",
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1b4fff0..5e10619 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -174,10 +174,10 @@ service.interceptors.response.use(
       }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。');
     } else if (code === HttpStatus.SERVER_ERROR) {
-      // ElMessage({ message: msg, type: 'error' });
+      ElMessage({ message: msg, type: 'error' });
       return Promise.reject(new Error(msg));
     } else if (code === HttpStatus.WARN) {
-      // ElMessage({ message: msg, type: 'warning' });
+      ElMessage({ message: msg, type: 'warning' });
       return Promise.reject(new Error(msg));
     } else if (code !== HttpStatus.SUCCESS) {
       ElNotification.error({ title: msg });
diff --git a/src/views/boardGenerate/dataSourceList.vue b/src/views/boardGenerate/dataSourceList.vue
index 238cabf..b962a1b 100644
--- a/src/views/boardGenerate/dataSourceList.vue
+++ b/src/views/boardGenerate/dataSourceList.vue
@@ -173,6 +173,23 @@
         <el-form-item label="是否分页" prop="dataSourceName">
           <el-switch v-model="addSQLForm.isPage" />
         </el-form-item>
+        <el-form-item label="输入数据">
+          <el-table :data="addSQLForm.testList" style="width: 100%">
+            <el-table-column label="字段名称" min-width="120">
+              <template #default="scope">
+                <el-input v-model="scope.row.fieldOne" style="width: 100%" />
+              </template>
+            </el-table-column>
+            <el-table-column label="测试数据" min-width="120">
+              <template #default="scope">
+                <el-input v-model="scope.row.fieldTwo" style="width: 100%" />
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-button style="width: 100%" @click="addSQLForm.testList.push({})">
+            添加字段
+          </el-button>
+        </el-form-item>
         <el-form-item label="SQL" prop="SQL">
           <el-input
             v-model="addSQLForm.SQL"
@@ -298,8 +315,7 @@ const keyword = ref(['SELECT', 'FROM', 'WHERE', 'GROUP BY', 'HAVING', 'ORDER BY'
   'BEGIN', 'START TRANSACTION', 'COMMIT', 'ROLLBACK', 'SAVEPOINT',
   'JOIN', 'LEFT JOIN', 'RIGHT JOIN', 'FULL JOIN', 'ON', 'IN', 'EXISTS', 'ANY', 'ALL',
   'CASE', 'WHEN', 'THEN', 'ELSE', 'IS NULL', 'IS NOT NULL', 'LIKE', 'BETWEEN',
-  'UNION', 'UNION ALL', 'WITH']
-);
+  'UNION', 'UNION ALL', 'WITH']);
 const getList = async () => {
   loading.value = true;
   getDataSourceList(selectForm.value)
@@ -327,7 +343,8 @@ const constructionData = () => {
 const addSQL = () => {
   addSQLFormVisible.value = true;
   addSQLForm.value = {
-    designDataFieldList: []
+    designDataFieldList: [],
+    testList: []
   };
   getDbList();
 };
diff --git a/src/views/boardGenerate/nodes/data/customDataNode.vue b/src/views/boardGenerate/nodes/data/customDataNode.vue
index 55323a3..d34e389 100644
--- a/src/views/boardGenerate/nodes/data/customDataNode.vue
+++ b/src/views/boardGenerate/nodes/data/customDataNode.vue
@@ -95,11 +95,12 @@ const parseData = (data, rule) => {
 };
 const formulaFun = (formula) => {
   let data = formula.replace(/\$\{\s*([^}]+?)\s*\}/g, (_, key) => {
-    console.log(props.inputData);
-    if (`${props.inputData[key]}`?.trim() !== '' && !isNaN(props.inputData[key])) {
-      return props.inputData[key] || '';
-    } else {
-      return `${props.inputData[key]}`;
+    let infos = key.split(',');
+    if (infos.length === 1) {
+      return props.inputData[infos[0]] || '';
+    }
+    if (infos.length === 2) {
+      return `AND ${infos[0]} = ${props.inputData[infos[1]]}`;
     }
   });
   return data;
@@ -140,8 +141,6 @@ const getOutputData = () => {
         isErr.value = false;
         let data = res;
         let output = {};
-        console.log(output);
-        console.log(props.data.customData.outputData);
         props.data.customData.outputData.forEach(item => {
           output[item.fieldOne] = parseData(data, item.fieldTwo);
         });