From cac33618a0754b2eb5eb6c4efdf2b37f8ff947ba Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 4 Nov 2025 09:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E8=A1=8C=E8=AE=BE=E7=BD=AE=E5=8F=8A=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue       |  3 ++-
 src/components/DesignForm/assembly/index.ts   |  3 ++-
 .../DesignForm/formControlPropertiNew.vue     | 18 +++++++++++++++
 .../public/expand/rangedUserTree.vue          |  2 +-
 .../DesignForm/public/form/childTable.vue     | 22 +++++++++++++++++--
 .../DesignForm/public/form/form.vue           | 14 +++++++++---
 6 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 83402d9..2bc21bb 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1165,7 +1165,8 @@ function dateStringToTimestampLocal(dateStr: string) {
   const isoStr = dateStr.replace(' ', 'T');
   const timestamp = new Date(isoStr).getTime();
   if (isNaN(timestamp)) {
-    throw new Error('Invalid date string');
+    //throw new Error('Invalid date string');
+    return ''
   }
   return String(timestamp);
 }
diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 8d00709..43e56a0 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -687,7 +687,8 @@ export default [
 				},
 				tableData: [], // 子表表格列表数据集合
 				control: {
-					border: true
+					border: true,
+					defaultOne: ''
 				},
 				config: {
 					addBtnText: '添加一行'
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 3d25246..2320cf8 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -823,6 +823,14 @@ const attrList = computed(() => {
         vIf: state.isSearch,
         vShow: ["orgCentent"],
       },
+      {
+        label: "默认一行",
+        value: config.table,
+        path: "config.table",
+        type: "table_defaultOne",
+        vIf: state.isSearch,
+        vShow: ["table"],
+      },
       {
         label: "数据范围",
         value: config.expandUser,
@@ -4734,8 +4742,18 @@ const formatTooltip = (val: number) => {
                     <el-radio value="">否</el-radio>
                   </el-radio-group>
 
+              </el-row><!--  -->
+
+              <el-row v-else-if="item.type === 'table_defaultOne'">
+
+                <el-radio-group v-model="controlData.control.defaultOne">
+                    <el-radio value="">是</el-radio>
+                    <el-radio value="2">否</el-radio>
+                  </el-radio-group>
+
               </el-row>
 
+
               <el-row v-else-if="item.type === 'expand-user'">
                   <el-button @click="handleUserRangeDialogFlag">可选用户设置</el-button>
               </el-row>
diff --git a/src/components/DesignForm/public/expand/rangedUserTree.vue b/src/components/DesignForm/public/expand/rangedUserTree.vue
index 8b5ffd3..1b5e4bf 100644
--- a/src/components/DesignForm/public/expand/rangedUserTree.vue
+++ b/src/components/DesignForm/public/expand/rangedUserTree.vue
@@ -105,7 +105,7 @@ function checkorgAndManTree1() {
     if (i == props.orgAndManTree.length) {
         props.orgAndManTree.forEach((item: any) => {
             if (props.data.name == item.name) {
-                console.log(item.tree)
+                //console.log(item.tree)
                 result = item.tree
             }
         });
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 185ea33..abd0e2c 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -5,7 +5,7 @@
 -->
 <script lang="ts" setup>
 import FormItem from "./formItem.vue";
-import { inject, computed } from "vue";
+import { inject, computed, onMounted} from "vue";
 import Tooltips from "@/components/DesignForm/tooltip.vue";
 import { constFormProps } from "@/api/DesignForm/utils";
 import { jsonParseStringify } from "@/utils/DesignForm";
@@ -47,6 +47,21 @@ const type = computed(() => {
 const editDisabled = computed(() => {
   return formProps.value.type === 2 && props.data.config?.editDisabled;
 });
+const defaultOneFlag = ref(true)
+//新增页面,子表默认新增一行
+onMounted(()=>{
+  
+  if(props.data.control.defaultOne == 2){
+    defaultOneFlag.value = false
+  }
+  if(formProps.value.type === 1&&defaultOneFlag.value){
+    setTimeout(()=>{
+      //alert(defaultOneFlag)
+      addColumn()
+    },200)
+    
+  }
+})
 const addColumn = () => {
   console.log("如果编辑页禁用时--------->", tableDataNew.value);
   const temp: any = {};
@@ -96,6 +111,9 @@ const timeToAry = (timestamp: number) => {
     seconds,
   };
 };
+/* 
+
+*/
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:02:49
@@ -126,7 +144,7 @@ const timeToString = (timeVal: any, types: int) => {
           timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
           break;
         case "datetimerange":
-          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;//
           break;
         case "daterange":
           timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index e939203..8950b06 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -1921,6 +1921,8 @@ const asfs: any[] = [];
 const rangedUsers :any= [];
 
 const tables: any[] = [];
+
+const getAsfsRunedFlag = ref(false)
 function getAsfs() {
   /* setTimeout(() => { */
   if(props.formData.list&&props.formData.list.length>0){
@@ -2004,6 +2006,7 @@ function getAsfs() {
       }
       checkAndGetTree()
     }
+    getAsfsRunedFlag.value = true
   }else{
 		setTimeout(()=>{
 			getAsfs()
@@ -2024,9 +2027,14 @@ function checkAndGetTree(){
   if(rangedUsers.length>0){
     getTree1();
   }else{
-    setTimeout(()=>{
-      checkAndGetTree()
-    },100)
+    if(getAsfsRunedFlag){
+
+    }else{
+      setTimeout(()=>{
+        checkAndGetTree()
+      },100)
+    }
+    
   }