Merge pull request #173 from dataease/pr@dev@panel

Pr@dev@panel

frontend/src/views/Tinymce/TextAttr.vue

@@ -164,8 +164,9 @@ export default {
     padding: 0px!important;
 
   }
+
   ::v-deep .el-radio-button__inner{
-    padding: 5px;
-    width: 30px;
+    padding: 5px!important;
+    width: 30px!important;
   }
 </style>

frontend/src/views/panel/list/PanelMain.vue

@@ -8,7 +8,7 @@
         </el-tab-pane>
         <el-tab-pane name="panels_star" :lazy="true">
           <span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store') }}</span>
-          <enshrine v-if="showEnshrine" />
+          <enshrine v-if="activeName==='panels_star'" />
         </el-tab-pane>
         <el-tab-pane name="panels_share" :lazy="true">
           <span slot="label"><i class="el-icon-share" />{{ $t('panel.share') }}</span>
@@ -17,7 +17,7 @@
       </el-tabs>
     </de-aside-container>
     <de-main-container>
-      <PanelViewShow v-if="mainActiveName==='PanelMain'" />
+      <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName" />
     </de-main-container>
   </de-container>
 </template>

frontend/src/views/panel/list/PanelViewShow.vue

@@ -83,6 +83,12 @@ import bus from '@/utils/bus'
 export default {
   name: 'PanelViewShow',
   components: { Preview, SaveToTemplate },
+  props: {
+    activeTab: {
+      type: String,
+      required: false
+    }
+  },
   data() {
     return {
       showMain: true,
@@ -194,7 +200,9 @@ export default {
       })
     },
     refreshStarList(isStar) {
-      bus.$emit('panle_start_list_refresh', isStar)
+      if (this.activeTab !== 'PanelList') {
+        bus.$emit('panle_start_list_refresh', isStar)
+      }
     }
 
   }