From 2567636901207318f70c769d9b64d365cc958cc7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 17 Apr 2024 10:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=84=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf                         | 9 +++++++--
 src/components/rowDrop/index.vue | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.env.wyf b/.env.wyf
index a42a17cd3..50e551a39 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -3,6 +3,11 @@ NODE_ENV=test
 
 VITE_DEV=false
 
+# # 请求路径
+# VITE_BASE_URL='http://192.168.0.108:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload'
+
 # 请求路径
 VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
 
@@ -31,7 +36,7 @@ VITE_BASE_PATH=/
 VITE_OUT_DIR=sfms3.0
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
+VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
+VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 45c97c0aa..f02a935b8 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -125,7 +125,11 @@ const dragover = (e) => {
 // 初始化当前全选状态
 const initSelectSta = () => {
   RedisApi.getRedis(routeName.value).then(res => {
-    let _myTableColumns = [...props.allSchemas?.tableColumns,...props.detailAllSchemas?.tableMainColumns]
+
+    let _myTableColumns = [...props.allSchemas?.tableColumns]
+    if(props.detailAllSchemas){
+      _myTableColumns = [...props.allSchemas?.tableColumns,...props.detailAllSchemas?.tableMainColumns]
+    }
     // 有缓存
     if (res) {
       checkedDataList.value = []