Merge branch 'bug5131' into eta1.8.3

src/lang/modules/EtaBase/commonLang.js

@@ -48,6 +48,10 @@ export default {
     zh:'查看数据',
     en:'View indicators'
   },
+  detail_lookdata2_btn: {
+    zh:'查看详情',
+    en:'View indicators'
+  },
   detail_formula_btn: {
     zh:'查看公式',
     en:'Formula'

src/lang/modules/Slides/pptPresent.js

@@ -103,7 +103,8 @@ export const presentEn = {
   apply_to_the_entire:'Apply to the entire PPT',
   title_style_fontfamily:"Font Family",
   title_style_fontsize:'Font Size',
-  title_style_color:'Font Color'
+  title_style_color:'Font Color',
+  title_paste_hint:'The clipboard is empty, please paste the text',
 };
 
 /* 中文 */
@@ -207,7 +208,8 @@ export const presentZh = {
   apply_to_the_entire:'应用至整个PPT',
   title_style_fontfamily:"字体设置",
   title_style_fontsize:'字号设置',
-  title_style_color:'字体颜色'
+  title_style_color:'字体颜色',
+  title_paste_hint:'粘贴板获取为空,请粘贴文本',
 };
 
 /**

src/utils/buttonConfig.js

@@ -278,6 +278,7 @@ export const dataSourcePermission = {
     Bloomberg_add2edb:'Bloomberg:add2edb',//添加指标库
     /* 自有数据 */
     selfData_addEdb:'selfData:addEdb',//添加到指标库
+    selfData_detail:'selfData:detail',//查看详情
     /*--------卓创资讯---- */
     zczx_showData:'zczx:showData',
     zczx_exportData:'zczx:exportData',

src/views/Home.vue

@@ -43,7 +43,7 @@
                   :style="!isCollapse ? 'text-align:left' : ''"
                   v-if="item.IsLevel === 1&&!item.hidden"
                 >
-                  <span class="el-level-path" v-if="item.path==='etaForum'" @click.prevent="handleGoETAForum">
+                  <div class="el-level-path" v-if="item.path==='etaForum'" @click.prevent="handleGoETAForum">
                     <img
                       :src="getMenuIcon(item)"
                       alt=""
@@ -62,7 +62,7 @@
                       "
                       >{{ $i18nt.locale==='zh'?item.name:item.name_en }}</span
                     >
-                  </span>
+                  </div>
                   <a
                     v-else
                     :href="`/${item.level_path}`"

src/views/classify_manage/classifyEnlistV2.vue

@@ -3,11 +3,19 @@
         <div class="top-wrap">
             <div class="type-box">
                 <!-- 中文分类 -->
-                <div class="item" @click="$emit('typeChange','1')">
+                <div class="item" @click="$emit('typeChange','1')"
+                    v-permission="permissionBtn.classifyBtn.classifyList_cnClassify"
+                >
                     {{ $t('ReportManage.CategoryList.chinese_tabs') }}
                 </div>
                 <!-- 英文分类 -->
-                <div class="item active" style="margin-left: 20px;">{{ $t('ReportManage.CategoryList.english_tabs') }}</div>
+                <div class="item active" style="margin-left: 20px;"
+                    v-permission="[
+                        permissionBtn.classifyBtn.classifyList_cnClassify,
+                        permissionBtn.enClassifyBtn.classifyList_enClassify,
+                        'and'
+                    ]"
+                >{{ $t('ReportManage.CategoryList.english_tabs') }}</div>
             </div>
             <div style="display:flex;padding:10px;gap:10px">
                 <!-- 添加分类 -->

src/views/classify_manage/classifylistV2.vue

@@ -4,7 +4,11 @@
             <div class="type-box">
                 <!-- 中文分类 -->
                 <div class="item active" 
-                    v-permission="permissionBtn.classifyBtn.classifyList_cnClassify">
+                    v-permission="[
+                        permissionBtn.classifyBtn.classifyList_cnClassify,
+                        permissionBtn.enClassifyBtn.classifyList_enClassify,
+                        'and'
+                        ]">
                     {{ $t('ReportManage.CategoryList.chinese_tabs') }}
                 </div>
                 <!-- 英文分类 -->

src/views/dataEntry_manage/thirdBase/selfDataBase.vue

@@ -80,11 +80,11 @@
           >
             <template slot-scope="{row}">
               <template v-if="item.key==='handle'">
-                <span 
+                <span v-permission="permissionBtn.dataSourcePermission.selfData_detail"
                   class="editsty"
                   @click="lookDataHandle(row)"
                 >
-                  <!-- 查看数据 -->{{$t('Edb.detail_lookdata_btn')}}
+                  <!-- 查看详情 -->{{$t('Edb.detail_lookdata2_btn')}}
                 </span>
 
                 <span 

src/views/datasheet_manage/sheetList.vue

@@ -582,7 +582,10 @@ export default {
     },
     /* 表格id */
     select_id(newval,oldVlue) {
-      newval && this.getDetailHandle();
+      if(newval){
+        this.sheetDetailInfo = {}
+        this.getDetailHandle()
+      }
       this.markFinishStatus(oldVlue)
     },
 
@@ -753,7 +756,6 @@ export default {
       this.select_classify = !ExcelInfoId ? ExcelClassifyId : 0;
       if (this.select_id !== ExcelInfoId) {
         this.select_id = ExcelInfoId || 0;
-        this.sheetDetailInfo = {};
       }
       this.resetNodeStyle(node);
       this.dynamicNode = node;

src/views/ppt_manage/mixins/pptEditorMixins.js

@@ -88,7 +88,18 @@ export default{
     }
   },
   methods:{
-    testInput(e,item){
+    handlePaste(e,item){
+        //不触发input
+        e.preventDefault()
+        //只获取文字
+        const text = e.clipboardData.getData('text/plain')
+        if(!text.trim().length){
+            this.$message.warning(this.$t('Slides.title_paste_hint'))
+        }
+        e.target.innerHTML += text.trim()
+        item.title += text.trim()
+    },
+    handleInput(e,item){
         const text = e.target.innerHTML
         item.title = text
     },

src/views/ppt_manage/mixins/pptMixins.js

@@ -861,7 +861,9 @@ export default {
             // 查找class为'background'的rect元素并修改fill属性
             let rectElement = svgDoc.querySelector('rect.highcharts-plot-background');
             if (rectElement) {
-                rectElement.setAttribute('fill', plotBackgroundColor);
+                //transparent(生成的图表背景会变黑) -> rgba(255, 255, 255, 0)
+                let currentColor = plotBackgroundColor==='transparent'?'rgba(255, 255, 255, 0)':plotBackgroundColor
+                rectElement.setAttribute('fill', currentColor);
             }
             // 将修改后的SVG文档转换回字符串
             let serializer = new XMLSerializer();

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -99,7 +99,8 @@
                                 }:{ color:'#333',fontSize:'22px',fontFamily:'helvetica',outline:0}"
                                     v-click-title-outside="exitEditTitle"
                                     @click.stop="handleEditTitle(item)"
-                                    @input="(e)=>testInput(e,item)"></div>
+                                    @paste.stop="(e)=>handlePaste(e,item)"
+                                    @input="(e)=>handleInput(e,item)"></div>
                         </div>
                         <!-- 内容 -->
                         <component  :is="getComponentName(item.modelId)"

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -85,7 +85,8 @@
                                 }:{ color:'#333',fontSize:'22px',fontFamily:'helvetica',outline:0}"
                                     v-click-title-outside="exitEditTitle"
                                     @click.stop="handleEditTitle(item)"
-                                    @input="(e)=>testInput(e,item)"></div>
+                                    @paste.stop="(e)=>handlePaste(e,item)"
+                                    @input="(e)=>handleInput(e,item)"></div>
                         </div>
                     <!-- 内容 -->
                     <component  :is="getComponentName(item.modelId)"

src/views/report_manage/addreportNew.vue

@@ -825,7 +825,7 @@ export default {
 				const t=new Date().getTime()
 				item.domId=item.UniqueCode+t //避免多次添加同一图表 id相同
 				htmlStr=htmlStr+`<p style='text-align:left; margin-top:10px;'>
-							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${this.currentLang}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 						</p>`
 			})
 			this.$nextTick(()=>{

src/views/report_manage/editChapterReport.vue

@@ -796,7 +796,7 @@ export default {
         htmlStr =
           htmlStr +
           `<p style='text-align:left; margin-top:10px;'>
-							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${this.currentLang}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 						</p>`;
       });
       this.$nextTick(() => {

src/views/report_manage/editreportNew.vue

@@ -832,7 +832,7 @@ export default {
 				const t=new Date().getTime()
 				item.domId=item.UniqueCode+t //避免多次添加同一图表 id相同
 				htmlStr=htmlStr+`<p style='text-align:left; margin-top:10px;'>
-							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${this.currentLang}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 						</p>`
 			})
 			this.$nextTick(()=>{

src/views/smartReport/editReport.vue

@@ -500,7 +500,7 @@ export default {
                     resArr={
                         compId:3,
                         compType:'chart',
-                        content:`${LINK_CHART_URL}?code=${temarr[0].UniqueCode}`,
+                        content:`${LINK_CHART_URL}?code=${temarr[0].UniqueCode}&lang=${this.currentLang}`,
                         id:this.getCompId(`chart${temarr[0].UniqueCode}_`),
                         style:'height:350px',
                         child:[]
@@ -1181,7 +1181,11 @@ export default {
                     icon:require('@/assets/img/smartReport/icon09.png')
                 }
             ]
-      }
+      },
+       //语言版本
+        currentLang() {
+            return this.$store.state.lang
+        }
     },
     created() {
         this.getPublicSettings()

src/views/system_manage/dataRefreshSetting.vue

@@ -210,7 +210,7 @@ export default {
                 },
                 {
                 value: "半年度",
-                label: /* '半年度' */ this.$t("Edb.FreAll.month"),
+                label: /* '半年度' */ this.$t("Edb.FreAll.half_year"),
                 },
                 {
                 value: "年度",