Merge pull request #2254 from dataease/pr@dev@feat_panel-publish

frontend/src/icons/svg/panel-mobile-unpublished.svg

+<svg width="1285" height="1024" xmlns="http://www.w3.org/2000/svg" p-id="2359" version="1.1" class="icon" t="1621433305409">
+ <defs>
+  <filter id="svg_4_blur">
+   <feGaussianBlur stdDeviation="0" in="SourceGraphic"/>
+  </filter>
+ </defs>
+ <g>
+  <title>Layer 1</title>
+  <path id="svg_1" p-id="2360" fill="#0069F6" d="m100.39216,70.27451a30.11765,30.11765 0 0 0 -30.11765,30.11765l0,823.21568a30.11765,30.11765 0 0 0 30.11765,30.11765l1084.23529,0a30.11765,30.11765 0 0 0 30.11765,-30.11765l0,-823.21568a30.11765,30.11765 0 0 0 -30.11765,-30.11765l-1084.23529,0zm0,-60.23529l1084.23529,0a90.35294,90.35294 0 0 1 90.35294,90.35294l0,823.21568a90.35294,90.35294 0 0 1 -90.35294,90.35294l-1084.23529,0a90.35294,90.35294 0 0 1 -90.35294,-90.35294l0,-823.21568a90.35294,90.35294 0 0 1 90.35294,-90.35294z"/>
+  <path id="svg_2" p-id="2361" fill="#5ED7BC" d="m261.01961,261.01961m-60.2353,0a60.23529,60.23529 0 1 0 120.47059,0a60.23529,60.23529 0 1 0 -120.47059,0z"/>
+  <path id="svg_3" p-id="2362" fill="#5ED7BC" d="m331.29412,839.47922a30.11765,30.11765 0 0 1 -60.2353,0a189.94196,189.94196 0 0 1 189.94196,-189.94197l186.58887,0a102.46023,102.46023 0 0 0 98.4847,-130.71058a162.69553,162.69553 0 0 1 156.37083,-207.61098l241.14196,0a30.11765,30.11765 0 0 1 0,60.23529l-241.14196,0a102.46023,102.46023 0 0 0 -98.46463,130.73067a162.69553,162.69553 0 0 1 -156.3909,207.61098l-186.58887,0a129.70667,129.70667 0 0 0 -129.70666,129.70666l0,-0.02007z"/>
+  <rect stroke="null" id="svg_8" height="760.00015" width="508.00008" y="187.00002" x="689.50014" fill="#000000"/>
+  <rect stroke="null" rx="5" filter="url(#svg_4_blur)" id="svg_4" height="669.66668" width="430.00003" y="231.99995" x="728.16665" fill="#56ffff"/>
+  <line stroke="null" id="svg_5" y2="392.99996" x2="754.16667" y1="392.99996" x1="559.16667" fill="none"/>
+  <ellipse stroke="null" ry="65.5" rx="66.33335" id="svg_6" cy="823.83325" cx="952.16662" fill="#000000"/>
+  <rect stroke="null" id="svg_7" height="47.66669" width="187.33336" y="242.6666" x="863.49997" fill="#000000"/>
+  <path fill="#f90c0c" d="m484.77374,100.01227c-214.68812,0.09178 -388.6733,173.5038 -388.76538,387.51529c0,214.01148 174.04656,387.4235 388.76538,387.48469c214.68812,-0.06119 388.6733,-173.47321 388.73469,-387.4541c-0.0307,-214.04208 -174.01587,-387.54588 -388.73469,-387.54588zm296.61586,387.51529c-0.09209,59.44593 -17.89579,114.66977 -48.16209,161.05167l-410.03774,-408.62578c46.50451,-30.22778 101.91086,-48.00343 161.61467,-48.12581c163.79409,0.33654 296.3089,132.44542 296.58517,295.69992l-0.00001,0zm-593.29312,0c0.12278,-59.44593 17.92649,-114.73096 48.28488,-161.11286l409.94565,408.65638c-46.5352,30.16659 -101.91086,47.91165 -161.58397,48.00343c-163.76339,-0.15297 -296.3089,-132.29244 -296.64656,-295.54695z" id="svg_9" stroke="#000"/>
+ </g>
+</svg>
\ No newline at end of file

frontend/src/icons/svg/panel-publish.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1621433305409" class="icon" viewBox="0 0 1285 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2359" xmlns:xlink="http://www.w3.org/1999/xlink" width="250.9765625" height="200"><defs><style type="text/css"></style></defs><path d="M100.392157 70.27451A30.117647 30.117647 0 0 0 70.27451 100.392157v823.215686A30.117647 30.117647 0 0 0 100.392157 953.72549h1084.235294a30.117647 30.117647 0 0 0 30.117647-30.117647V100.392157A30.117647 30.117647 0 0 0 1184.627451 70.27451H100.392157z m0-60.235294h1084.235294A90.352941 90.352941 0 0 1 1274.980392 100.392157v823.215686a90.352941 90.352941 0 0 1-90.352941 90.352941H100.392157A90.352941 90.352941 0 0 1 10.039216 923.607843V100.392157A90.352941 90.352941 0 0 1 100.392157 10.039216z" fill="#0069F6" p-id="2360"></path><path d="M261.019608 261.019608m-60.235294 0a60.235294 60.235294 0 1 0 120.470588 0 60.235294 60.235294 0 1 0-120.470588 0Z" fill="#5ED7BC" p-id="2361"></path><path d="M331.294118 839.479216a30.117647 30.117647 0 0 1-60.235294 0 189.941961 189.941961 0 0 1 189.94196-189.941961h186.588863a102.460235 102.460235 0 0 0 98.484706-130.710588 162.695529 162.695529 0 0 1 156.370823-207.610981h241.141961a30.117647 30.117647 0 0 1 0 60.235294h-241.141961a102.460235 102.460235 0 0 0-98.464627 130.730667 162.695529 162.695529 0 0 1-156.390902 207.61098H461.000784a129.706667 129.706667 0 0 0-129.706666 129.706667z" fill="#5ED7BC" p-id="2362"></path></svg>
\ No newline at end of file

frontend/src/icons/svg/panel-unpublished.svg

+<svg width="1285" height="1024" xmlns="http://www.w3.org/2000/svg" t="1621433305409" class="icon" version="1.1" p-id="2359">
+ <g>
+  <title>Layer 1</title>
+  <path d="m100.39216,67.77451a30.11765,30.11765 0 0 0 -30.11765,30.11765l0,823.21568a30.11765,30.11765 0 0 0 30.11765,30.11765l1084.23529,0a30.11765,30.11765 0 0 0 30.11765,-30.11765l0,-823.21568a30.11765,30.11765 0 0 0 -30.11765,-30.11765l-1084.23529,0zm0,-60.23529l1084.23529,0a90.35294,90.35294 0 0 1 90.35294,90.35294l0,823.21568a90.35294,90.35294 0 0 1 -90.35294,90.35294l-1084.23529,0a90.35294,90.35294 0 0 1 -90.35294,-90.35294l0,-823.21568a90.35294,90.35294 0 0 1 90.35294,-90.35294z" fill="#0069F6" p-id="2360" id="svg_1"/>
+  <path d="m261.01961,261.01961m-60.2353,0a60.23529,60.23529 0 1 0 120.47059,0a60.23529,60.23529 0 1 0 -120.47059,0z" fill="#5ED7BC" p-id="2361" id="svg_2"/>
+  <path d="m331.29412,839.47922a30.11765,30.11765 0 0 1 -60.2353,0a189.94196,189.94196 0 0 1 189.94196,-189.94197l186.58887,0a102.46023,102.46023 0 0 0 98.4847,-130.71058a162.69553,162.69553 0 0 1 156.37083,-207.61098l241.14196,0a30.11765,30.11765 0 0 1 0,60.23529l-241.14196,0a102.46023,102.46023 0 0 0 -98.46463,130.73067a162.69553,162.69553 0 0 1 -156.3909,207.61098l-186.58887,0a129.70667,129.70667 0 0 0 -129.70666,129.70666l0,-0.02007z" fill="#5ED7BC" p-id="2362" id="svg_3"/>
+  <path stroke="#000" fill="#f90c0c" d="m498.85771,115.35598c-213.99809,0.08971 -387.42406,169.58622 -387.51584,378.76548c0,209.17926 173.48715,378.67577 387.51584,378.73557c213.99809,-0.05981 387.42406,-169.55631 387.48525,-378.70566c-0.0306,-209.20916 -173.45656,-378.79539 -387.48525,-378.79539zm295.6625,378.76548c-0.0918,58.10369 -17.83827,112.08061 -48.0073,157.41524l-408.71983,-399.39931c46.35503,-29.54527 101.5833,-46.91955 161.09522,-47.03916c163.26763,0.32894 295.35653,129.45489 295.6319,289.02324l0.00001,0zm-591.3862,0c0.12239,-58.10369 17.86887,-112.14042 48.12968,-157.47505l408.62804,399.42922c-46.38564,29.48545 -101.5833,46.82984 -161.06461,46.91955c-163.23704,-0.14952 -295.35653,-129.30538 -295.69311,-288.87371z" id="svg_4"/>
+ </g>
+
+</svg>
\ No newline at end of file

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

@@ -39,8 +39,8 @@
             <span slot-scope="{ node, data }" class="custom-tree-node father">
               <span style="display: flex; flex: 1 1 0%; width: 0px;">
                 <span>
-                  <svg-icon v-if="!data.mobileLayout" icon-class="panel" class="ds-icon-scene" />
-                  <svg-icon v-if="data.mobileLayout" icon-class="panel-mobile" class="ds-icon-scene" />
+                  <svg-icon v-if="!data.mobileLayout" :icon-class="'panel-'+data.status" class="ds-icon-scene" />
+                  <svg-icon v-if="data.mobileLayout" :icon-class="'panel-mobile-'+data.status" class="ds-icon-scene" />
                 </span>
                 <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
               </span>
@@ -91,8 +91,8 @@
             <span slot-scope="{ node, data }" class="custom-tree-node-list father">
               <span style="display: flex; flex: 1 1 0%; width: 0px;">
                 <span v-if="data.nodeType === 'panel'">
-                  <svg-icon v-if="!data.mobileLayout" icon-class="panel" class="ds-icon-scene" />
-                  <svg-icon v-if="data.mobileLayout" icon-class="panel-mobile" class="ds-icon-scene" />
+                  <svg-icon v-if="!data.mobileLayout" :icon-class="'panel-'+data.status" class="ds-icon-scene" />
+                  <svg-icon v-if="data.mobileLayout" :icon-class="'panel-mobile-'+data.status" class="ds-icon-scene" />
                 </span>
                 <span v-if="data.nodeType === 'folder'">
                   <i class="el-icon-folder" />
@@ -806,6 +806,11 @@ export default {
     },
     editFromPanelViewShow() {
       this.edit(this.lastActiveNodeData, this.lastActiveNode)
+    },
+    editPanelBashInfo(params) {
+      if (params.operation === 'status') {
+        this.lastActiveNodeData.status = params.value
+      }
     }
   }
 }

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

@@ -17,7 +17,7 @@
       </el-tabs>
     </de-aside-container>
     <de-main-container>
-      <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName" @editPanel="editPanel" />
+      <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName" @editPanel="editPanel" @editPanelBashInfo="editPanelBashInfo" />
     </de-main-container>
   </de-container>
 </template>
@@ -104,6 +104,9 @@ export default {
     },
     editPanel() {
       this.$refs.panelList.editFromPanelViewShow()
+    },
+    editPanelBashInfo(param) {
+      this.$refs.panelList.editPanelBashInfo(param)
     }
 
   }

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

@@ -436,6 +436,10 @@ export default {
         this.panelInfo.status = 'publish'
       }
       updatePanelStatus(this.panelInfo.id, { 'status': this.panelInfo.status })
+      this.$emit('editPanelBashInfo', {
+        'operation': 'status',
+        'value': this.panelInfo.status
+      })
     }
   }
 }