Merge branch 'qin_v2'

src/views/sysworkflow/lowcodepage/appCardPage.vue

@@ -4,6 +4,7 @@
 @ 备注: 自定义应用卡片视图
 -->
 <script lang='ts' setup>
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 import { customerFormCont } from "@/api/DesignForm/type";
 import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord } from '@/api/DesignForm/requestapi'
 
@@ -15,6 +16,7 @@ import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord
 import AppContainer from '@/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue'
 import AppContainerPage  from '@/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue' //自建应用编辑
 import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
+import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
 
 const props = defineProps({
 	searchQuery:{
@@ -34,6 +36,7 @@ const props = defineProps({
 });
 
 const emits = defineEmits(["getRongQiAttr"]);
+const openTaskDrawer = ref(false) //新增任务
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:09:29
@@ -272,17 +275,19 @@ const addFormIsShow = ref(false)
 const lookFormList = (val:any) => {
 	emits('getRongQiAttr')
 	// console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
-	lookPageIsShow.value = true
-	state.formId = val.idStr
+	
 
 	versionId.value = val.versionId
 	versionTitle.value = val.name
 
-	let stateData = string2json(val.listjson)
-			// console.log(val.listjson)
-			// console.log("查看表单列表---->",stateData)
+	if(val.listjson != "" && val.listjson != null){
+			lookPageIsShow.value = true
+			state.formId = val.idStr
+			let stateData = string2json(val.listjson)
+			console.log(val.listjson)
+			console.log("查看表单列表---->",stateData)
 			//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
-			if(stateData.tableData.columns.length>0){
+			if(stateData.tableData.columns&&stateData.tableData.columns.length>0){
 				for(let i = 0;i<stateData.tableData.columns.length;i++){
 					if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
 						// console.log(stateData.tableData.columns[i])
@@ -319,6 +324,12 @@ const lookFormList = (val:any) => {
 			state.formApi = stateData.formApi
 			state.dict = stateData.dict
 			state.refreshTable = stateData.refreshTable
+	}else{
+		openTaskDrawer.value = true
+	}
+
+
+	
 
 
 }
@@ -434,6 +445,9 @@ const refreshPage = (pageType:string) =>{
 			/>
 		</el-drawer>
 		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
+
+
+		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :drawerwith="props.drawerWith" @searchquery="getFormAppList" />
 	</div>
 </template>
 <style  lang='scss' scoped>

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

@@ -75,7 +75,6 @@ const state = reactive<formStruct>({
 			name:'',
 			formName: formConfigCont.formName,
 			dataTitle: [],
-			labelWidth: "75",
 			labelPosition: "left"
 		},
 		config: {