From 485d5491fb7f8544dbf0b5c0a1a85194782c555c Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Thu, 10 Oct 2024 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E5=8D=95=E5=B7=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2=E6=9C=AA?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/requestapi.ts                           | 7 +++++++
 src/views/hr/archives/basicinformation/content.vue         | 2 +-
 .../lowcodepage/appPage/appPageForm/openAppFormPage.vue    | 2 +-
 .../lowcodepage/appPage/appPageForm/pageList.vue           | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index ed2bab9..1b3b2e5 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -320,6 +320,13 @@ export function gainFormTableField(data?:any){
 		data: data
 	});
 }
+export function gainTableVersionField(data?:any){
+	return request({
+		url: '/systemapi/customer_form/gainTableVersionField',
+		method: 'post',
+		data: data
+	});
+}
 //编辑自定义表单列表数据
 export function editCustomerFormList(data: any) {
 	return request({
diff --git a/src/views/hr/archives/basicinformation/content.vue b/src/views/hr/archives/basicinformation/content.vue
index 43df198..732cba7 100644
--- a/src/views/hr/archives/basicinformation/content.vue
+++ b/src/views/hr/archives/basicinformation/content.vue
@@ -207,7 +207,7 @@ function editCont() {
       <span v-else-if="props.usercont.constellationing == 4">巨蟹座</span>
       <span v-else-if="props.usercont.constellationing == 5">狮子座</span>
       <span v-else-if="props.usercont.constellationing == 6">处女座</span>
-      <span v-else-if="props.usercont.constellationing == 7">天枰座</span>
+      <span v-else-if="props.usercont.constellationing == 7">天秤座</span>
       <span v-else-if="props.usercont.constellationing == 8">天蝎座</span>
       <span v-else-if="props.usercont.constellationing == 9">射手座</span>
       <span v-else-if="props.usercont.constellationing == 10">摩羯座</span>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index c765eb1..36155da 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -233,7 +233,7 @@ const gainAppFormPageInit = () =>{
 				let stateData = string2json(data.data.appForm.listjson)
 				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++){
 						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
 							if(stateData.tableData.columns[i].id==holeControlAndConfigStateData.list[u].name){
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index dac3709..07eeb01 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -444,6 +444,7 @@ const getListInfo = () => {
 			}
 
 			if(tableAttrLogButtonList && tableAttrLogButtonList.length > 0){
+				if(state.tableData.columns && state.tableData.columns.length > 0){
 					state.tableData.columns.forEach((itemCol:any)=>{
 						tableAttrLogButtonList.forEach((item:any)=>{
 							if(itemCol.id == item.id){
@@ -452,6 +453,7 @@ const getListInfo = () => {
 						})
 					})
 				}
+			}
 			if(state.tableData && state.tableData.controlBtn && state.tableData.controlBtn.length > 0) {
 				
 				state.tableData.controlBtn.forEach((itemCol:any)=>{
@@ -475,7 +477,7 @@ const getListInfo = () => {
 const tableFieldAttrButClick = (val:tableButton[]) => {
 	if(zhuDaunIsTrue.value == true){
 		if(val.length > 0){	//判断是否有选中的字段
-			if(state.tableData.columns.length > 0){	//判断列表是否有数据
+			if(state.tableData.columns&&state.tableData.columns.length > 0){	//判断列表是否有数据
 				val.forEach((item:tableButton)=>{
 					let isTrue = true;
 					state.tableData.columns.forEach((itemTab:tableButton)=>{
@@ -488,6 +490,7 @@ const tableFieldAttrButClick = (val:tableButton[]) => {
 					}
 				})
 			}else{ //列表无数据,直接新增
+				state.tableData.columns = []
 				val.forEach((item:tableButton)=>{
 					state.tableData.columns.push(item)
 				})