From b211a9e6cc51c52eb16b876475a2d7817e03c84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 4 Aug 2023 13:43:24 +0800
Subject: [PATCH] =?UTF-8?q?addEditFromApi=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addEditFromApiPop/index.vue    | 44 ++++++++++++-------
 .../components/addEditFromApiPop/index.vue    | 44 ++++++++++++-------
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue b/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
index a23a87a..566b887 100644
--- a/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
+++ b/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
@@ -13,7 +13,7 @@
   >
     <!-- 数据填写 -->
     <div v-if="active === 0" style="height: 100%;">
-      <div class="centerInnerContent">
+      <div class="centerInnerContent" :class="{'hasDetails' : flexTableData}">
         <!-- 左侧主表 -->
         <div class="leftMainForm">
           <div class="dialogOuterTitle">{{formTitle}} 【主表信息】</div>
@@ -98,16 +98,14 @@
           </el-form>
         </div>
         <!-- 右侧子表 -->
-        <div class="rightDetailTable">
+        <div class="rightDetailTable" v-if="flexTableData">
           <div class="dialogOuterTitle">{{formTitle}} 【子表信息】</div>
-          <!-- 子表 -->
           <currenTableFlex
             ref="currenTableFlex_Ref"
             :isShowIndex="true"
             :isEditable="true"
             :setUTableHeight="230"
             class="currenTableFlex"
-            v-if="flexTableData"
             :flexTableData="flexTableData"
             :flexTableColumns="flexTableColumns"
           ></currenTableFlex>
@@ -214,7 +212,11 @@ export default {
     initFormItems(){
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
       let _dtoList = this.currentDtos[_dtoList_type].dtoList
-      this.formItemData = JSON.parse(JSON.stringify(_dtoList))
+      // 除去子表信息
+      let _formItems = _dtoList.filter(item=>{
+        return item.prop.toUpperCase() != 'DETAILS'
+      })
+      if(_formItems)this.formItemData = _formItems
       // 编辑格式：特殊处理默认值
       if(this.handleType == 'edit' && this.editRowData){
         this.formData = JSON.parse(JSON.stringify(this.editRowData))
@@ -222,7 +224,7 @@ export default {
         this.formData = {}
       }
       // 子表数据
-      let _list = this.formItemData.filter(item=>{
+      let _list = _dtoList.filter(item=>{
         return item.prop.toUpperCase() == 'DETAILS'
       })
       if(_list && _list.length > 0){
@@ -233,9 +235,11 @@ export default {
         }
       }
       // 子表数据列
-      let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
-      let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
-      this.flexTableColumns = _detailDtos
+      if(this.URLOption_detailList){
+        let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
+        let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
+        this.flexTableColumns = _detailDtos
+      }
 
       // 表单验证格式化
       this.formRules={}
@@ -359,19 +363,25 @@ export default {
   .centerInnerContent{
     height: calc(100% - 60px);
     overflow: auto;
-    display: flex;
 
     .leftMainForm{
-      width: 50%;
-      flex-shrink: 0;
       height: calc(100% - 60px);
     }
 
-    .rightDetailTable{
-      height: calc(100% - 60px);
-      width: calc(50%);
-      padding-left:40px;
-      border-left: #ddd solid 1px;
+    &.hasDetails{
+      display: flex;
+
+      .leftMainForm{
+        width: 50%;
+        flex-shrink: 0;
+      }
+
+      .rightDetailTable{
+        height: calc(100% - 60px);
+        width: calc(50%);
+        padding-left:40px;
+        border-left: #ddd solid 1px;
+      }
     }
   }
 </style>
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
index a23a87a..566b887 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
@@ -13,7 +13,7 @@
   >
     <!-- 数据填写 -->
     <div v-if="active === 0" style="height: 100%;">
-      <div class="centerInnerContent">
+      <div class="centerInnerContent" :class="{'hasDetails' : flexTableData}">
         <!-- 左侧主表 -->
         <div class="leftMainForm">
           <div class="dialogOuterTitle">{{formTitle}} 【主表信息】</div>
@@ -98,16 +98,14 @@
           </el-form>
         </div>
         <!-- 右侧子表 -->
-        <div class="rightDetailTable">
+        <div class="rightDetailTable" v-if="flexTableData">
           <div class="dialogOuterTitle">{{formTitle}} 【子表信息】</div>
-          <!-- 子表 -->
           <currenTableFlex
             ref="currenTableFlex_Ref"
             :isShowIndex="true"
             :isEditable="true"
             :setUTableHeight="230"
             class="currenTableFlex"
-            v-if="flexTableData"
             :flexTableData="flexTableData"
             :flexTableColumns="flexTableColumns"
           ></currenTableFlex>
@@ -214,7 +212,11 @@ export default {
     initFormItems(){
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
       let _dtoList = this.currentDtos[_dtoList_type].dtoList
-      this.formItemData = JSON.parse(JSON.stringify(_dtoList))
+      // 除去子表信息
+      let _formItems = _dtoList.filter(item=>{
+        return item.prop.toUpperCase() != 'DETAILS'
+      })
+      if(_formItems)this.formItemData = _formItems
       // 编辑格式：特殊处理默认值
       if(this.handleType == 'edit' && this.editRowData){
         this.formData = JSON.parse(JSON.stringify(this.editRowData))
@@ -222,7 +224,7 @@ export default {
         this.formData = {}
       }
       // 子表数据
-      let _list = this.formItemData.filter(item=>{
+      let _list = _dtoList.filter(item=>{
         return item.prop.toUpperCase() == 'DETAILS'
       })
       if(_list && _list.length > 0){
@@ -233,9 +235,11 @@ export default {
         }
       }
       // 子表数据列
-      let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
-      let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
-      this.flexTableColumns = _detailDtos
+      if(this.URLOption_detailList){
+        let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
+        let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
+        this.flexTableColumns = _detailDtos
+      }
 
       // 表单验证格式化
       this.formRules={}
@@ -359,19 +363,25 @@ export default {
   .centerInnerContent{
     height: calc(100% - 60px);
     overflow: auto;
-    display: flex;
 
     .leftMainForm{
-      width: 50%;
-      flex-shrink: 0;
       height: calc(100% - 60px);
     }
 
-    .rightDetailTable{
-      height: calc(100% - 60px);
-      width: calc(50%);
-      padding-left:40px;
-      border-left: #ddd solid 1px;
+    &.hasDetails{
+      display: flex;
+
+      .leftMainForm{
+        width: 50%;
+        flex-shrink: 0;
+      }
+
+      .rightDetailTable{
+        height: calc(100% - 60px);
+        width: calc(50%);
+        padding-left:40px;
+        border-left: #ddd solid 1px;
+      }
     }
   }
 </style>
\ No newline at end of file