From ccfb06113a36a3204537ad8eb8bc149c3b0e67ea Mon Sep 17 00:00:00 2001
From: chy <chy@163.com>
Date: Thu, 12 Mar 2026 13:57:37 +0800
Subject: [PATCH 1/2] 1231

---
 src/views/Login/components/LoginForm.vue   | 4 ++--
 src/views/lowdesign/reportDesign/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 129dd4d..8080cfe 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -206,7 +206,7 @@ const handleLogin = async (params) => {
       authUtil.removeLoginForm()
     }
     authUtil.setToken(res)
-  
+
     if (!redirect.value) {
       redirect.value = '/'
     }
@@ -217,7 +217,7 @@ const handleLogin = async (params) => {
         const queryParams = new URLSearchParams(window.location.search);
         const ticketUrl = queryParams.get('url'); // 获取查询参数值，例如 ?paramName=value 中的 value
         const accessToken  =authUtil.getAccessToken();
-      
+
         console.log(accessToken);
         if(ticketUrl!=null){
           
diff --git a/src/views/lowdesign/reportDesign/index.vue b/src/views/lowdesign/reportDesign/index.vue
index 124010d..4329e20 100644
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -354,7 +354,7 @@ const tableFormVerify = (type) => {
         let tabKey = 'mysql'
         // 子字段不能再包含子字段
         if (item.isSubField && item.hasChildren === 'Y') {
-          debugger
+          
           messageText = `<div style="line-height:24px">
               <div>子字段不能包含子字段</div>
               <div>序号：${index + 1}</div>

From 4260e35018ee25b208f3939581ad37a564d33855 Mon Sep 17 00:00:00 2001
From: chy <chy@163.com>
Date: Thu, 12 Mar 2026 14:01:28 +0800
Subject: [PATCH 2/2] 121

---
 src/views/lowdesign/reportDesign/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/lowdesign/reportDesign/index.vue b/src/views/lowdesign/reportDesign/index.vue
index 87df5ff..4a5bddc 100644
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -354,10 +354,6 @@ const tableFormVerify = (type) => {
         let tabKey = 'mysql'
         // 子字段不能再包含子字段
         if (item.isSubField && item.hasChildren === 'Y') {
-<<<<<<< HEAD
-          
-=======
->>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
           messageText = `<div style="line-height:24px">
               <div>子字段不能包含子字段</div>
               <div>序号：${index + 1}</div>