From e225a60b95cdb211b9e28cfedf740a5a72e507cb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Jan 2023 17:26:33 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=AD=89=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/EditBar.vue      |  2 +-
 .../canvas/components/editor/Preview.vue      |  3 +
 .../src/components/dataease/DeOutWidget.vue   |  2 +-
 .../src/views/panel/grantAuth/ShareTree.vue   | 89 +++++++++----------
 frontend/src/views/panel/list/PanelMain.vue   |  2 +-
 .../src/views/panel/list/PanelViewShow.vue    |  4 +-
 6 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue
index 7c7e833cc5..81bfd83253 100644
--- a/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -284,7 +284,7 @@ export default {
       return this.curComponent.type === 'view' && this.terminal === 'pc' && this.curComponent.propValue.innerType !== 'richTextView'
     },
     enlargeShow() {
-      return this.curComponent.type === 'view' && this.curComponent.propValue.innerType !== 'richTextView'
+      return this.curComponent.type === 'view' && this.curComponent.propValue.innerType !== 'richTextView' && !this.curComponent.propValue.innerType.includes('table')
     },
     selectFieldShow() {
       return this.activeModel === 'edit' && this.curComponent.type === 'view' && this.curComponent.propValue.innerType === 'richTextView' && this.curComponent.editing
diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index a94c23d16a..49a752d6bd 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -287,6 +287,9 @@ export default {
       return this.$store.state.panel.mainActiveName
     },
     showUnpublishedArea() {
+      if (this.canvasId !== 'canvas-main') {
+        return false
+      }
       if (this.showPosition === 'edit') {
         return false
       } else if (this.panelInfo && this.panelInfo.showType === 'view') {
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index c338e428ad..cd7e6134b6 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -226,7 +226,7 @@ export default {
 
 .condition-main {
   position: absolute;
-  overflow: auto;
+  overflow: hidden;
   top: 0px;
   right: 0px;
   bottom: 0px;
diff --git a/frontend/src/views/panel/grantAuth/ShareTree.vue b/frontend/src/views/panel/grantAuth/ShareTree.vue
index 88955c5479..9c8aa89596 100644
--- a/frontend/src/views/panel/grantAuth/ShareTree.vue
+++ b/frontend/src/views/panel/grantAuth/ShareTree.vue
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { loadTree, loadShareOutTree, removePanelShares } from '@/api/panel/share'
+import { loadShareOutTree, loadTree, removePanelShares } from '@/api/panel/share'
 import { uuid } from 'vue-uuid'
 import { initPanelData, viewPanelLog } from '@/api/panel/panel'
 import { proxyInitPanelData } from '@/api/panel/shareProxy'
@@ -142,7 +142,6 @@ export default {
     refreshMyShareOut() {
       this.initOutData().then(res => {
         this.outData = res.data
-        this.setMainNull()
       })
     },
     initData() {
@@ -228,57 +227,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .header-title {
-    font-size: 14px;
-    flex: 1;
-    color: var(--TextPrimary, #606266);
-    font-weight: bold;
-    display: block;
-    height: 100%;
-    /*line-height: 36px;*/
-  }
+.header-title {
+  font-size: 14px;
+  flex: 1;
+  color: var(--TextPrimary, #606266);
+  font-weight: bold;
+  display: block;
+  height: 100%;
+  /*line-height: 36px;*/
+}
 
-  .msg-node-class {
+.msg-node-class {
+  color: red;
+
+  ::v-deep i {
     color: red;
-
-    ::v-deep i {
-      color: red;
-    }
   }
+}
 
-  .custom-tree-node {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 8px;
-  }
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
 
-  .custom-tree-node-list {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding: 0 8px;
-  }
+.custom-tree-node-list {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding: 0 8px;
+}
 
-  .father .child {
-    /*display: none;*/
-    visibility: hidden;
-  }
+.father .child {
+  /*display: none;*/
+  visibility: hidden;
+}
 
-  .father:hover .child {
-    /*display: inline;*/
-    visibility: visible;
-  }
+.father:hover .child {
+  /*display: inline;*/
+  visibility: visible;
+}
 
-  .unpublished {
-    color: #b2b2b2
-  }
+.unpublished {
+  color: #b2b2b2
+}
 
-  .publish {
-  }
+.publish {
+}
 
 </style>
diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue
index d04d24deb1..811b75fd17 100644
--- a/frontend/src/views/panel/list/PanelMain.vue
+++ b/frontend/src/views/panel/list/PanelMain.vue
@@ -79,7 +79,7 @@ export default {
       }
     },
     activeName: function(newVal, oldVal) {
-      if (newVal !== 'PanelMain') {
+      if (newVal !== 'PanelList') {
         this.clear()
       }
     }
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 671b63ae69..e5e5bc15b9 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -17,7 +17,7 @@
         style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
       >
         <div style="height: 100%;">
-          <share-head />
+          <share-head/>
         </div>
       </el-row>
       <el-row
@@ -76,7 +76,7 @@
               width="400"
               trigger="click"
             >
-              <panel-detail-info />
+              <panel-detail-info/>
               <i
                 slot="reference"
                 class="el-icon-warning-outline icon-class"