From 7744f76d4ebd58e35aab02be4a92d72f2b6f98fa Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 22 May 2024 09:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lowcodepage/appPage/appMenus.vue            | 17 ++++++++++++++---
 .../appPage/appPageForm/pageForm.vue            | 10 +++++++---
 .../lowcodepage/appPage/createAppFormPage.vue   | 17 +++++++++++++----
 .../sysworkflow/lowcodepage/appPage/index.vue   |  2 +-
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
index d3568d17c..d853d00aa 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -42,10 +42,14 @@ const props = defineProps({
 	groupKey:{
 		type:String,
 		default:""
+	},
+	appPageKey:{
+		type:String,
+		default:""
 	}
 });
 const svgIsShow = ref(false)
-const emits = defineEmits(["update:menusTree","openAppPageForm"]);
+const emits = defineEmits(["update:menusTree","update:appPageKey","openAppPageForm"]);
 const appOenMenu = ref<appMenuTreeInfo>({})
 /**
 @ 作者: 秦东
@@ -61,7 +65,14 @@ const appMenuTree =  computed({
 	}
 });
 
-
+const appPageKey =  computed({
+	get() {
+		return props.appPageKey
+	},
+	set(val: any) {
+		emits('update:appPageKey', val)
+	}
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-22 10:06:20
@@ -309,7 +320,7 @@ const openAppPage = (val:any) =>{
 	<AppMenuSvgPage v-model:is-show="svgIsShow" v-model:svg-name="svgName" :svg-id="svgId" :icon-list="allIconNames" />
 	<AppMenuGroup v-model:is-show="menuGroupShow" :menu-parent-key="menuParentKey" :app-cont="props.appCont" @updateMenu="gainSunAppContent" />
 	<EditAppMenuNamePage v-model:is-show="editAppMenuNameShow" :menu-cont="appOenMenu" @updateMenu="gainSunAppContent" />
-	<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :drawer-with="props.drawerWith"  :form-Key="props.formKey" :app-cont="props.appCont"  :group-key="props.groupKey" :menu-id="creetMenuId" @gainSunAppContent="gainSunAppContent"   />
+	<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" v-model:app-page-key="appPageKey" :drawer-with="props.drawerWith"  :form-Key="props.formKey" :app-cont="props.appCont"  :group-key="props.groupKey" :menu-id="creetMenuId" @gainSunAppContent="gainSunAppContent"   />
 </template>
 <style  lang='scss' scoped>
 .appMenuTitle{
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 7aa2fc2ab..d2285a489 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -89,7 +89,7 @@ const appFormKeyVal =  computed({
 });
 
 
-const appPageKeyStr =  computed({
+const appPageKey =  computed({
 	get() {
 		return props.appPageKey
 	},
@@ -370,8 +370,12 @@ const saveAppFormData = () => {
 		.then((data:any) => {
 			state.value.loading = false
 			console.log("写入自建应用App表单--->",data)
-			appPageKeyStr.value = data.data.customerFormCont.id.toString()
+			// appPageKey.value = data.data.customerFormCont.id
+			// appPageKey.set(data.data.customerFormCont.id.toString())
 			emits('update:formVersion', data.data.formVersion.id.toString())
+			emits('update:appPageKey', data.data.customerFormCont.id.toString())
+			console.log("写入自建应用App表单-11111-->",data.data.customerFormCont.id)
+			console.log("写入自建应用App表单-2222-->",props.appPageKey)
 			// emits('update:appPageKey', data.data.customerFormCont.id.toString())
 			gainTableForm()
 		})
@@ -507,7 +511,7 @@ const versionPreviewPage = (val:string) => {
 		/>
 	</el-aside>
 	<el-main class="mainBox rightBox">
-	{{appPageKeyStr}}-->{{props.formVersion}}
+
 		<HeadToolsApp  v-loading="state.loading"  :customerformid="props.appPageKey" @click="buttonCallbackEvent" />
 		<div v-loading="state.loading" class="main_form">
 				<div v-if="state.formData.list.length === 0" class="empty-tips">
diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
index b6f1332ab..30fa9959d 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
@@ -44,7 +44,7 @@ const props = defineProps({
 		default:""
 	}
 });
-const emits = defineEmits(["update:isShow","gainSunAppContent","updateInit"]);
+const emits = defineEmits(["update:isShow","update:appPageKey","gainSunAppContent","updateInit"]);
 const tabsActive = ref(1)
 const route: any = useRoute().query || {}
 const formConfigCont = reactive<customerFormConfig>({
@@ -52,8 +52,17 @@ const formConfigCont = reactive<customerFormConfig>({
 	formlogo:"",
 	signCode:""
 })
+const appPageKey =  computed({
+	get() {
+		return props.appPageKey
+	},
+	set(val: any) {
+		emits('update:appPageKey', val)
+	}
+});
 //表单版本ID
 const formVersion = ref<string>("")
+const formPageId = ref<string>("")
 const state = reactive<formStruct>({
     formData: {
 		list: [],
@@ -159,9 +168,9 @@ onBeforeMount(() => {
 					</div>
 				</el-header>
 				<el-container>
-					<PageForm ref="appPageInfo" v-if="tabsActive==1" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey" v-model:state="state" v-model:form-version="formVersion" :formconfigcont="formConfigCont" :app-page-key="appPageKey" />
-					<PageFlow v-if="tabsActive==2" v-model:state="state" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey"  :app-page-key="appPageKey" v-model:form-version="formVersion"  />
-					<PageList v-if="tabsActive==3" v-model:state="state" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey" :app-page-key="appPageKey" v-model:form-version="formVersion" />
+					<PageForm ref="appPageInfo" v-if="tabsActive==1" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey" v-model:state="state" v-model:form-version="formVersion" :formconfigcont="formConfigCont" v-model:app-page-key="appPageKey" />
+					<PageFlow v-if="tabsActive==2" v-model:state="state" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey"  v-model:app-page-key="appPageKey" v-model:form-version="formVersion"  />
+					<PageList v-if="tabsActive==3" v-model:state="state" :form-Key="props.formKey" :app-cont="props.appCont" :menu-id="menuId" :group-key="props.groupKey" v-model:app-page-key="appPageKey" v-model:form-version="formVersion" />
 				</el-container>
 			</el-container>
 		</div>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/index.vue b/src/views/sysworkflow/lowcodepage/appPage/index.vue
index 2708b5f40..3d0ab9d09 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/index.vue
@@ -293,7 +293,7 @@ const updataPageInit = () => {
 									</el-menu-item>
 								</el-menu> -->
 
-								<AppMenus :form-Key="props.formKey" v-model:menus-tree="menusTree" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" @openAppPageForm="openAppPageForm" />
+								<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" />
 
 								<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :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"  />