From 7b9edd238b007402a6027bb32cf612640cb54186 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 14 五月 2024 11:45:34 +0800
Subject: [PATCH] 删除log

---
 Source/ProjectWeb/src/views/base/UIContentArea.vue |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/Source/ProjectWeb/src/views/base/UIContentArea.vue b/Source/ProjectWeb/src/views/base/UIContentArea.vue
index a52160e..4979665 100644
--- a/Source/ProjectWeb/src/views/base/UIContentArea.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -9,23 +9,30 @@
             </template>
             <div class="componentVO">
               <compoent-index :key="areasName+'componentVO-'+componentVO.oid"
+                              :uiBtmType="uiBtmType"
+                              :uiContext="uiContext"
                               :inDialog="inDialog"
+                              :canEdit="canEdit"
+                              :actionType="actionType"
                               :componentVO="componentVO"
                               :sourceData="newSourceData"
+                              :sourceBtmType="sourceBtmType"
                               :dataStore="dataStore"
                               :areasName="areasName"
                               :paramVOS="paramVOS"
+                              @setData="setData"
                               @setDataStore="setDataStore"
                               :isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
             </div>
           </el-collapse-item>
         </el-collapse>
-        <div v-else class="componentVO">
+        <div v-else-if="areaItem.componentVOs.length==1" class="componentVO">
           <compoent-index :key="areasName+'componentVO-'+areaItem.componentVOs[0].oid"
                           :uiBtmType="uiBtmType"
                           :uiContext="uiContext"
                           :inDialog="inDialog"
                           :canEdit="canEdit"
+                          :actionType="actionType"
                           :componentVO="areaItem.componentVOs[0]"
                           :sourceData="newSourceData"
                           :sourceBtmType="sourceBtmType"
@@ -35,6 +42,15 @@
                           @setData="setData"
                           @setDataStore="setDataStore"
                           :isShow="activeName==(areasName+'-Tab-'+index)?true:false"></compoent-index>
+        </div>
+        <div v-else>
+          <el-alert
+            class="alert"
+            :closable="false"
+            title=""
+            type="info"
+            description="娌℃湁鍙樉绀虹殑鍐呭锛岃鑱旂郴绠＄悊浜哄憳妫�鏌ラ厤缃��">
+          </el-alert>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -50,6 +66,7 @@
                             :uiContext="uiContext"
                             :inDialog="inDialog"
                             :canEdit="canEdit"
+                            :actionType="actionType"
                             :componentVO="componentVO"
                             :sourceData="newSourceData"
                             :sourceBtmType="sourceBtmType"
@@ -62,12 +79,13 @@
           </div>
         </el-collapse-item>
       </el-collapse>
-      <div v-else class="componentVO">
+      <div v-else-if="newAreasData[0].componentVOs.length===1" class="componentVO">
         <compoent-index :key="areasName+'componentVO-'+newAreasData[0].componentVOs[0].oid"
                         :uiBtmType="uiBtmType"
                         :uiContext="uiContext"
                         :inDialog="inDialog"
                         :canEdit="canEdit"
+                        :actionType="actionType"
                         :componentVO="newAreasData[0].componentVOs[0]"
                         :sourceData="newSourceData"
                         :sourceBtmType="sourceBtmType"
@@ -77,6 +95,15 @@
                         @setData="setData"
                         @setDataStore="setDataStore"
                         :isShow="true"></compoent-index>
+      </div>
+      <div v-else>
+        <el-alert
+          class="alert"
+          :closable="false"
+          title=""
+          type="info"
+          description="娌℃湁鍙樉绀虹殑鍐呭锛岃鑱旂郴绠＄悊浜哄憳妫�鏌ラ厤缃��">
+        </el-alert>
       </div>
     </div>
     <div v-else>
@@ -132,6 +159,10 @@
       //鍐呭鏄惁鍙紪杈�
       type:Boolean,
       default:false
+    },
+    actionType:{
+      //鎸夐挳鎿嶄綔绫诲瀷
+      default:""
     },
     areasName:{
       type:String,
@@ -205,6 +236,8 @@
           }
         })
         this.newAreasData = newAreasData;
+      }else {
+        this.newAreasData=this.areasData;
       }
     },
     checkDisplayExpression(displayExpressionStr) {

--
Gitblit v1.9.3