自定义分析增加上传说明、生成指标页面增加刷新指标功能

src/lang/modules/ETATables/En.js

@@ -135,6 +135,12 @@ export default {
     share_check_text:'Viewable',
     share_edit_text:'Editable',
     share_set_hint:'Please select shared user permissions',
+
+    upload_tips:`上传文件提示：<br>
+    1、表格文件不超过1M； <br>
+    2、表格中不包含#N/A等计算失败的结果值，建议是简单的基础原始值；<br>
+    3、数据单元格建议全选，设置为文本格式，避免数据类型不兼容。
+    `,
   },
 
   ETableChildren: {

src/lang/modules/ETATables/Zh.js

@@ -135,6 +135,12 @@ export default {
     share_check_text:'可查看权限',
     share_edit_text:'可编辑权限',
     share_set_hint:'未选择用户,请检查',
+
+    upload_tips:`上传文件提示：<br>
+    1、表格文件不超过1M； <br>
+    2、表格中不包含#N/A等计算失败的结果值，建议是简单的基础原始值；<br>
+    3、数据单元格建议全选，设置为文本格式，避免数据类型不兼容。
+    `,
   },
 
   ETableChildren: {

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -22,7 +22,7 @@
           />
         </el-tabs>
         <div class="sheet-wrapper">
-          <Sheet ref="sheetRef" :option="sheetConfig" v-if="sheetConfig.data" :limit="{disabled:false}"/>
+          <Sheet ref="sheetRef" :option="sheetConfig" @updated="hasChange=true" v-if="sheetConfig.data" :limit="{disabled:false}"/>
 
           <dataLoading :loading="isLoading"/>
         </div>
@@ -35,6 +35,8 @@
         v-if="$route.path==='/createTaregtBySheet'"
         :list="edbList"
         :sheetDetailInfo="this.sheetDetailInfo"
+        :isEdbReFreshLoading="isEdbReFreshLoading"
+        @refreshEdb="refreshSheet"
         @choose="chooseEdbHandle"
       />
     </div>
@@ -104,9 +106,84 @@ export default {
       dataToalPage: 0,
 
       edbList: [],//生成的指标列表
+
+      // 内容是否更新
+      hasChange:false,
+      isEdbReFreshLoading:false
     }
   },
   methods: {
+    async saveApi(){
+      luckysheet.exitEditMode();
+      let data = luckysheet.getAllSheets();
+
+      this.loading = this.$loading({
+        target: ".dataSheet-container",
+        lock: true,
+        text: this.$t('MsgPrompt.saveing_msg') + "...",
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.6)",
+      });
+
+      let img = getSheetImage(data[0]);
+      const form = new FormData();
+      form.append("Image", img);
+      form.append("closableErrMsg123", true);
+      const { Data } = await sheetInterface.uploadImg(form);
+
+      data.luckysheet_select_save = [];
+      const { ExcelInfoId, ExcelName, ExcelClassifyId } = this.sheetDetailInfo;
+
+      const res = await sheetInterface.sheetAnalysisInterface.sheetEdit({
+        ExcelInfoId,
+        ExcelName,
+        ExcelClassifyId,
+        ExcelImage: Data.ResourceUrl,
+        Content: JSON.stringify(data),
+        closableErrMsg123:true
+      });
+      this.loading.close();
+      if (res.Ret !== 200) return false;
+      this.hasChange=false
+      this.shouldClosedHintshow(this.$t('MsgPrompt.saved_msg'))
+      return true
+    },
+
+    /* 刷新表格 */
+    refreshSheet: _.debounce(function() {
+      if(this.isEdbReFreshLoading) return
+      //退出编辑模式，让文本框失焦 
+      luckysheet.exitEditMode();
+      // 保存逻辑延后 让hasChange取得正确的值
+      setTimeout(async()=>{
+        this.isEdbReFreshLoading = true;
+        let res={}
+        // 内容有改变 刷新前需要先保存
+        if(this.hasChange){
+          let saveSuccess = await this.saveApi()
+          if(!saveSuccess){
+            // 没保存成功
+            this.isEdbReFreshLoading = false;
+            return
+          }
+          res = await sheetInterface.sheetAnalysisInterface.sheetRefresh({ExcelInfoId: this.sheetDetailInfo.ExcelInfoId,closableErrMsg123:true})
+        }else{
+          res = await sheetInterface.sheetAnalysisInterface.sheetRefresh({ExcelInfoId: this.sheetDetailInfo.ExcelInfoId,closableErrMsg123:true})
+        }
+
+        this.isEdbReFreshLoading = false;
+        if(res.Ret !== 200) return 
+        this.shouldClosedHintshow(res.Msg)
+      })
+    },300),
+    shouldClosedHintshow(msg){
+      let messageHint=this.$message.success({
+        message:msg,
+        duration:0,
+        showClose:true
+      })
+      this.$store.commit('PUSH_CLOSABLE_HINT',messageHint)
+    },
 
     backHandle(scence=null) {
       if(scence === 'into-detail') {

src/views/datasheet_manage/customAnalysis/components/rightSection.vue

@@ -4,6 +4,12 @@
         <div class="search-box">
             <el-input :placeholder="$t('ToolBox.ForexCalendar.edb_input')" prefix-icon="el-icon-search" clearable
                 v-model="keyWord" @input="getTargetList"/>
+            <el-button 
+              @click="refreshSheet" 
+              :loading="isEdbReFreshLoading" 
+              type="primary"
+              v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.RefreshEdbButton"
+            >{{isEdbReFreshLoading? $t('CustomAnalysisPage.refreshing_loading'):$t('CustomAnalysisPage.refresh_loading')}}</el-button>
         </div>
       <ul class="edb-list" v-if="edbList.length">
         <li :class="['edb-item',{'selected':selectEdb.EdbInfoId===item.EdbInfoId}]" v-for="(item,index) in edbList" :key="index" @click="chooseEdb(item)">
@@ -21,14 +27,20 @@
   </div>
 </template>
 <script>
+import leftMixin from "../../mixins/classifyMixin";
 import * as sheetInterface from '@/api/modules/sheetApi.js';
 export default {
+  mixins: [leftMixin],
   props: {
     list: {
       type: Array
     },
     sheetDetailInfo:{
         type:Object
+    },
+    isEdbReFreshLoading:{
+      type:Boolean,
+      default:false
     }
   },
   watch: {
@@ -51,6 +63,9 @@ export default {
 
   },
   methods:{
+    refreshSheet(){
+      this.$emit('refreshEdb')
+    },
 
     chooseEdb(item) {
       if(item.EdbInfoId === this.selectEdb.EdbInfoId) {
@@ -136,6 +151,8 @@ export default {
     .search-box{
         padding:30px;
         padding-bottom: 0;
+        display: flex;
+        gap: 0 5px;
     }
   }
 }

src/views/datasheet_manage/customAnalysis/list.vue

@@ -18,6 +18,15 @@
             @click="clickUpload"
             v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_analysis_upload)"
           >{{$t('CustomAnalysisPage.up_file_btn')}}</el-button>
+          <el-tooltip effect="dark">
+            <div
+              slot="content"
+              v-html="uploadTips"
+              style="line-height: 20px; width: 350px"
+            ></div>
+            <i class="el-icon-info" style="font-size:18px"></i>
+          </el-tooltip>
+          
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
           <!-- 只看我的 -->
           <!-- <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox> -->
@@ -412,6 +421,9 @@ export default {
           { required: true, message: this.$t('OnlineExcelPage.cannot_be_empty_table') , trigger: "blur" },
         ],
       }
+    },
+    uploadTips(){
+      return this.$t('CustomAnalysisPage.upload_tips')||''
     }
   },
   data() {

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -354,7 +354,8 @@ export default {
         '/sheetTimeList': 'etaTable_customize_data',
         '/sheetMixedList': 'etaTable_customize_mix',
         '/sheetAnalysisList': 'etaTable_analysis',
-        '/sheetBalanceList':'etaTable_customize_balance'
+        '/sheetBalanceList':'etaTable_customize_balance',
+        '/createTaregtBySheet':'etaTable_analysis'
       }
       return this.permissionBtn.isShowBtn('etaTablePermission',`${sheetType[this.$route.path]}_${type}`)
     }