From 0eb674cc665f13ce61ca68e789fc758abbd1c7e4 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 24 Jul 2024 11:43:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=BE=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95KEy=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/tableListPage/index.vue  |  2 +-
 src/views/sysworkflow/lowcodepage/appCardPage.vue  |  2 +-
 .../newLowCode/appLayoutEdit/appContainerPage.vue  | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index a1a94c9..73e043d 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -863,7 +863,7 @@ const tabsView = (val:any,types:number) => {
 						
 					</template>
 					<div class="group group-btn" v-if="searchData.length">
-						<el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查1询</el-button>
+						<el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查询</el-button>
 						<el-button @click="resetFields(ruleSearchForm)"><el-icon><Refresh /></el-icon>重置</el-button>
 					</div>
 				</el-form>
diff --git a/src/views/sysworkflow/lowcodepage/appCardPage.vue b/src/views/sysworkflow/lowcodepage/appCardPage.vue
index dfb3b97..9690383 100644
--- a/src/views/sysworkflow/lowcodepage/appCardPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appCardPage.vue
@@ -405,7 +405,7 @@ const refreshPage = (pageType:string) =>{
             :total="pageTotal" @current-change="handleCurrentChange" />
         </div>
 		<AppContainer v-model:run-is-open="runIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" @refreshPage="getFormAppList" />
-		<AppContainerPage v-model:edit-is-open="editIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" @refreshPage="getFormAppList" />
+		<AppContainerPage v-model:edit-is-open="editIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" :group-key="props.appGroup" @refreshPage="getFormAppList" />
 
 
 		<el-drawer
diff --git a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
index 6851360..6eb97e9 100644
--- a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
+++ b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
@@ -35,6 +35,10 @@ const props = defineProps({
 		default(){
 			return {}
 		}
+	},
+	groupKey:{
+		type:String,
+		default:""
 	}
 });
 const emits = defineEmits(["update:editIsOpen","refreshPage"]);
@@ -89,7 +93,7 @@ const closeAppDraw = () =>{
 	tabsActive.value = 1
 	checkedMenu.value = ""
 	appPageKey.value = ""
-	props.formKey=""
+	checkedMenu.appkey=""
 	isNew.value = false
 }
 /**
@@ -206,15 +210,15 @@ const addAppPageForm = (key?:string) => {
 						</el-row>
 						<el-scrollbar class="scroBox">
 
-							<AppMenus :form-Key="props.formKey" v-model:menus-tree="menusTree" v-model:app-page-key="appPageKey"  :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" @openAppPageForm="openAppPageForm" />
+							<AppMenus :form-Key="checkedMenu.appkey" v-model:menus-tree="menusTree" v-model:app-page-key="appPageKey"  :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" @openAppPageForm="openAppPageForm" />
 
-							<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :is-new="isNew" :drawer-with="props.drawerWith"  :form-Key="props.formKey" :app-cont="appCont"  :group-key="props.groupKey" :menu-id="props.formKey" v-model:app-page-key="appPageKey" @gainSunAppContent="gainAppContent" @updateInit="updataPageInit"  />
+							<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :is-new="isNew" :drawer-with="props.drawerWith"  :form-Key="checkedMenu.appkey" :app-cont="appCont"  :group-key="props.groupKey" :menu-id="checkedMenu.appkey" v-model:app-page-key="appPageKey" @gainSunAppContent="gainAppContent" @updateInit="updataPageInit"  />
 
 						</el-scrollbar>
 					</el-aside>
 					<el-main  class="mainBox">
-						<el-scrollbar class="scroBox">
-							<OpenAppFormPage ref="openAppPageInit" :form-Key="props.formKey" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" :menus-info="checkedMenu" @editAppInfo="editAppInfo" />
+						<el-scrollbar class="scroBox">{{props.groupKey}} --- > {{checkedMenu.appkey}}
+							<OpenAppFormPage ref="openAppPageInit" :form-Key="checkedMenu.appkey" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" :menus-info="checkedMenu" @editAppInfo="editAppInfo" />
 						</el-scrollbar>
 					</el-main>
 				</el-container>