Merge branch 'demand-187'

src/styles/global.scss

@@ -137,12 +137,12 @@ button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusri
 .chart-bottom-insruction-info {
     margin-top: 10px;
     display: flex;
-    gap: 0 20px;
     .chart-source {
-        width: 30%;
-        min-width: 150px;
+        /* width: 30%; */
+        flex:auto;
     }
 
+
     .calendar-cont {
         display: block;
         margin: 0 auto;
@@ -151,7 +151,6 @@ button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusri
     }
 
     .chart-instruction {
-        flex: 1;
-        text-align: right;
+        width:30%;
     }
 }

src/views/ppt_manage/newVersion/components/formatEl/ChartEl.vue

@@ -55,7 +55,7 @@
     <!-- 图表说明 -->
     <div 
       class="chart-instruction text_oneLine"
-      v-if="chartInstructions&&chartInstructions.isShow"
+      v-if="chartInstructions&&chartInstructions.isShow&&chartInstructions.text.length"
       v-text="chartInstructions.text"
       :style="`
         color: ${chartInstructions.color};