Merge branch 'qin_v10_master'

src/views/sysworkflow/lowcodepage/appFormList.vue

@@ -262,7 +262,8 @@ const appKey = ref<string>("")
 */
 const editAppCont = (val:string) => {
 	emits('getRongQiAttr')
-	appKey.value = val.toString();
+	appKey.value = val.signCodeStr.toString();
+	pickAppInfo.value = val
 	appPageShow.value = true;
 }
 /**
@@ -334,7 +335,7 @@ const lookAppList = (val:any) => {
 							<el-button size="small" circle class="button" :icon="View" @click="lookAppList(item)"></el-button>
 						</el-col>
 						<el-col :span="8" class="but_centent">
-							<el-button size="small" circle class="button" :icon="Edit" @click="editAppCont(item.signCodeStr)"></el-button>
+							<el-button size="small" circle class="button" :icon="Edit" @click="editAppCont(item)"></el-button>
 						</el-col>
 						<el-col :span="8" class="but_centent">
 							<el-button size="small" circle class="button" :icon="Delete" @click="delFormApp(item.idStr)"></el-button>
@@ -362,7 +363,7 @@ const lookAppList = (val:any) => {
 
 		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
 
-		<DesignAPPpage  v-model:is-show="appPageShow" v-model:form-key="appKey"  :group-key="props.groupId" :drawer-with="props.drawerWith"  @refreshPage="getFormAppList" />
+		<DesignAPPpage  v-model:is-show="appPageShow" v-model:form-key="appKey"  :group-key="props.groupId" :drawer-with="props.drawerWith" :pick-app-info="pickAppInfo"  @refreshPage="getFormAppList" @accessapp="lookAppList" />
 		<RunApplication v-model:run-is-open="runIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" @refreshPage="getFormAppList"/>
 		<el-drawer
 			v-model="lookPageIsShow"

src/views/sysworkflow/lowcodepage/appPage/index.vue

@@ -33,9 +33,15 @@ const props = defineProps({
 	groupKey:{
 		type:String,
 		default:""
+	},
+	pickAppInfo:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
-const emits = defineEmits(["update:isShow","update:svgName","refreshPage"]);
+const emits = defineEmits(["update:isShow","update:svgName","refreshPage","accessapp"]);
 const squareUrl = 'https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png'
 const drawerOpenOrClose = ref(false)
 const tabsActive = ref(1)
@@ -160,6 +166,15 @@ watch(()=>tabsActive.value,(val:number)=>{
 		openAppPageInit.value.gainAppFormPageInit()
 	}
 })
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-28 08:46:12
+@ 功能: 访问前端页面
+*/
+const accessRunApp = () =>{
+	closeAppDraw()
+	emits("accessapp",props.pickAppInfo)
+}
 </script>
 <template>
 	<div  class="drawerClass">
@@ -189,7 +204,7 @@ watch(()=>tabsActive.value,(val:number)=>{
 							</el-tabs>
 						</div>
 						<div>
-							<el-button plain size="small">访问</el-button>
+							<el-button plain size="small" @click="accessRunApp">访问</el-button>
 							<el-button type="danger" size="small" @click="closeAppDraw">关闭</el-button>
 						</div>
 					</el-header>

src/views/sysworkflow/lowcodepage/index.vue

@@ -191,7 +191,7 @@ const getRongQiAttr = () => {
 										<el-dropdown-item @click="handleCommand('addFormGroup',item.idStr)" >新增分组</el-dropdown-item>
 										<el-dropdown-item @click="handleCommand('addForm',item.idStr)" >添加表单</el-dropdown-item>
 										<el-dropdown-item @click="handleCommand('addFormApp',item.idStr)" >添加应用</el-dropdown-item>
-										<el-dropdown-item @click="editFormGroup(item.idStr)">编辑</el-dropdown-item>
+										<el-dropdown-item @click="editFormGroup(item.idStr)" divided>编辑</el-dropdown-item>
 										<el-dropdown-item @click="eidtGroupStatus(item.idStr,3)">删除</el-dropdown-item>
 									</el-dropdown-menu>
 								</template>

src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue

@@ -166,7 +166,7 @@ const confirmEvent = (val:any) => {
 			console.log('cancel!',data)
 			ElNotification({
 				title: '系统提示！',
-				message: data.mag,
+				message: data.mag?data.mag:"删除成功",
 				type: 'success',
 			})
 			getToDoList()