Merge branch 'need_pool332' into debug

src/utils/buttonConfig.js

@@ -445,6 +445,7 @@ export const chartLibPermission = {
     chartLib_withdrawfromForum:'chartLib:withdrawfromForum',//从社区撤回
     chartLib_sourceEdit:'chartLib:sourceEdit',//编辑数据来源
 
+
     /* 图表 批量移动 设置共享 设置公开 公开目录 */
     chartLib_set_shared: 'chartLib:set:shared', //设置共享
     chartLib_set_public: 'chartLib:set:public', //设置公开

src/views/dataEntry_manage/chartSetting.vue

@@ -432,6 +432,7 @@
                         `"
                       ></div>
 
+
                       <div class="chart-bottom-insruction-info">
 
                         <div class="chart-source" >
@@ -454,6 +455,7 @@
                           <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
                           <el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
                         </el-radio-group>
+
                       </div>
                       
                     </div>

src/views/ppt_manage/newVersion/components/editor/ChangeFormatDialog.vue

@@ -49,6 +49,7 @@ import FormatPreTen from "@/views/ppt_manage/newVersion/components/formatPreview
 import FormatPreEle from "@/views/ppt_manage/newVersion/components/formatPreview/FormatPreEle";
 import FormatPreTwelve from "@/views/ppt_manage/newVersion/components/formatPreview/FormatPreTwelve";
 import FormatPreThirteen from "@/views/ppt_manage/newVersion/components/formatPreview/FormatPreThirteen";
+import FormatPreFourteen from "@/views/ppt_manage/newVersion/components/formatPreview/FormatPreFourteen";
 import {countComponentName} from '@/views/ppt_manage/newVersion/utils/untils';
 export default {
   props:{
@@ -73,7 +74,8 @@ export default {
     FormatPreTen,
     FormatPreEle,
     FormatPreTwelve,
-    FormatPreThirteen
+    FormatPreThirteen,
+    FormatPreFourteen
   },
   data() {
     return {

src/views/ppt_manage/newVersion/utils/untils.js

@@ -638,6 +638,11 @@ export const getShapeOptions = (el,position,scale)=>{
 export const getTableData = (data)=>{
   //data:[{m:'表格数据',mc:{rs:2,cs:1}}] -> [{text:'表格数据',options:{rowspan:2,colspan:1}}]
   const tableData = []
+  let alignMap = {
+    0: 'center',
+    1: 'left',
+    2: 'right'
+  }
   for(let i=0;i<data.length;i++){
     const row = data[i]
     const _row =[]
@@ -658,6 +663,8 @@ export const getTableData = (data)=>{
           : '',
         bold: cell.bl ? true : false,
         italic: cell.it ? true : false,
+        align: alignMap[cell.HorizontalType] || alignMap[cell.ht] || 'center',
+        valign: 'center'
       }
         _row.push({
           text:cell.m,