From b99c442107a310d15fae1187ce1c88e5fdadacd8 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 31 Jul 2024 11:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E5=B0=8FBU?=
 =?UTF-8?q?G=E3=80=82=E4=BF=AE=E6=AD=A3=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=96=87=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue  | 16 ++++++++--------
 .../DesignForm/formControlAttr_2024024.vue     | 16 ++++++++--------
 .../DesignForm/formControlAttres.vue           | 16 ++++++++--------
 .../DesignForm/formControlPropertiNew.vue      | 16 ++++++++--------
 .../DesignForm/formControlProperties.vue       | 18 +++++++++---------
 src/utils/DesignForm/form.ts                   |  2 ++
 .../lowcodepage/appPage/createAppFormPage.vue  |  5 ++++-
 7 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 1e629eb..ccc7f77 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -886,14 +886,14 @@
                     type: 'select',
                     placeholder: '显示类型',
                     dict: {
-                        year: 'year',
-                        month: 'month',
-                        date: 'date',
-                        datetime: 'datetime',
-                        week: 'week',
-                        datetimerange: 'datetimerange',
-                        daterange: 'daterange',
-                        monthrange: 'monthrange'
+                        year: '年',
+						month: '月',
+						date: '日期',
+						datetime: '日期+时间',
+						week: '周',
+						datetimerange: '开始日期时间至结束日期时间',
+						daterange: '开始日期至结束日期',
+						monthrange: '开始月至结束月'
                     }
                 },
                 {
diff --git a/src/components/DesignForm/formControlAttr_2024024.vue b/src/components/DesignForm/formControlAttr_2024024.vue
index 703eace..2a21e87 100644
--- a/src/components/DesignForm/formControlAttr_2024024.vue
+++ b/src/components/DesignForm/formControlAttr_2024024.vue
@@ -758,14 +758,14 @@ const attrList = computed(() => {
 				type: 'select',
 				placeholder: '显示类型',
 				dict: {
-					year: 'year',
-					month: 'month',
-					date: 'date',
-					datetime: 'datetime',
-					week: 'week',
-					datetimerange: 'datetimerange',
-					daterange: 'daterange',
-					monthrange: 'monthrange'
+					year: '年',
+					month: '月',
+					date: '日期',
+					datetime: '日期+时间',
+					week: '周',
+					datetimerange: '开始日期时间至结束日期时间',
+					daterange: '开始日期至结束日期',
+					monthrange: '开始月至结束月'
 				}
 			},
 			{
diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue
index 2a7144c..2514a64 100644
--- a/src/components/DesignForm/formControlAttres.vue
+++ b/src/components/DesignForm/formControlAttres.vue
@@ -646,14 +646,14 @@ const attrList = computed(() => {
           type: 'select',
           placeholder: '显示类型',
           dict: {
-            year: 'year',
-            month: 'month',
-            date: 'date',
-            datetime: 'datetime',
-            week: 'week',
-            datetimerange: 'datetimerange',
-            daterange: 'daterange',
-            monthrange: 'monthrange'
+						year: '年',
+						month: '月',
+						date: '日期',
+						datetime: '日期+时间',
+						week: '周',
+						datetimerange: '开始日期时间至结束日期时间',
+						daterange: '开始日期至结束日期',
+						monthrange: '开始月至结束月'
           }
         },
         {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index e6c2155..481b9fa 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -902,14 +902,14 @@ const attrList = computed(() => {
                     type: 'select',
                     placeholder: '显示类型',
                     dict: {
-                        year: 'year',
-                        month: 'month',
-                        date: 'date',
-                        datetime: 'datetime',
-                        week: 'week',
-                        datetimerange: 'datetimerange',
-                        daterange: 'daterange',
-                        monthrange: 'monthrange'
+                        year: '年',
+						month: '月',
+						date: '日期',
+						datetime: '日期+时间',
+						week: '周',
+						datetimerange: '开始日期时间至结束日期时间',
+						daterange: '开始日期至结束日期',
+						monthrange: '开始月至结束月'
                     }
                 },
                 {
diff --git a/src/components/DesignForm/formControlProperties.vue b/src/components/DesignForm/formControlProperties.vue
index 76e1a4a..fb4dd0e 100644
--- a/src/components/DesignForm/formControlProperties.vue
+++ b/src/components/DesignForm/formControlProperties.vue
@@ -968,14 +968,14 @@ const attrList = computed(()=>{
                 type: 'select',
                 placeholder: '显示类型',
                 dict: {
-                    year: 'year',
-                    month: 'month',
-                    date: 'date',
-                    datetime: 'datetime',
-                    week: 'week',
-                    datetimerange: 'datetimerange',
-                    daterange: 'daterange',
-                    monthrange: 'monthrange'
+                    year: '年',
+					month: '月',
+					date: '日期',
+					datetime: '日期+时间',
+					week: '周',
+					datetimerange: '开始日期时间至结束日期时间',
+					daterange: '开始日期至结束日期',
+					monthrange: '开始月至结束月'
                 }
             },
             {
@@ -1527,7 +1527,7 @@ const disabledIstrue = (val:string) => {
 			<el-tab-pane label="字段配置" name="first">
 				<el-scrollbar class="formAttributeBox">
 					<el-form size="small" class="form">
-						<el-divider content-position="left">通用2属性</el-divider>
+						<el-divider content-position="left">通用属性</el-divider>
 						<template v-for="(item, index) in attrList" :key="index">
 							<el-form-item :label="item.label"  class="form_cont">
 								<el-select
diff --git a/src/utils/DesignForm/form.ts b/src/utils/DesignForm/form.ts
index bb5f371..d32c494 100644
--- a/src/utils/DesignForm/form.ts
+++ b/src/utils/DesignForm/form.ts
@@ -60,11 +60,13 @@ export function objToStringify(obj: any, isBeautify?: boolean) {
 	// console.log("EDITTYPE--->",EDITTYPE,isBeautify)
   if (EDITTYPE === 'javascript') {
     if (isBeautify) {
+			// console.log("EDITTYPE-2-->",EDITTYPE,isBeautify)
       return jsBeautify('opt=' + obj2string(obj), {
         indent_size: 2,
         brace_style: 'expand'
       })
     } else {
+			// console.log("EDITTYPE-2-->",EDITTYPE,isBeautify)
       return obj2string(obj)
     }
   } else {
diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
index 878a107..b8e790e 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
@@ -110,7 +110,10 @@ const closeSavePageForm = () =>{
 	emits("updateInit")
 	emits("update:isNew",false)
 	// console.log("appPageInfo.value",appPageInfo.value)
-	appPageInfo.value.gainTableForm()
+	if(tabsActive.value == 1){
+		appPageInfo.value.gainTableForm()
+	}
+	
 }
 
 onBeforeMount(() => {