Merge branch 'eta2.4.5' into debug

src/CustomElement/EtaChart.ce.vue

@@ -35,7 +35,8 @@ async function getChartData(){
             IsReplace:1
         }): await chartInfoByCode({
             UniqueCode:params.code,
-            IsReplace:1
+            IsReplace:1,
+            AuthToken: params.authToken || ''
         })
         if(res.Ret!==200) return
         chartInfo.value=res.Data.ChartInfo

src/CustomElement/EtaTable.ce.vue

@@ -31,7 +31,8 @@ async function getTableData(){
         UniqueCode: params.code,
         FromScene: Number(params.fromScene||''),
         ReferencedId: Number(params.sourceId||''),
-        Uuid: params.uid||""
+        Uuid: params.uid||"",
+        AuthToken: params.authToken || ''
     });
     if(res.Ret !== 200) return
 

src/views/report/EditReport.vue

@@ -193,7 +193,6 @@ async function handleInsert({list,type,chartType}){
                 const isETAForumChart=item.startsWith('isETAForumChart_')?true:false;
                 //临时权限token
                 let authToken = await getLinkAuthToken(item);
-
                 reportContentEditorIns.html.insert(`<p style='text-align:left; margin-top:10px;'>
 						<iframe src='${link}?code=${isETAForumChart?item.replace(/^isETAForumChart_/, ''):item}&fromPage=&isETAForumChart=${isETAForumChart}&authToken=${authToken}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 					</p>`,false)

src/views/report/smartReport/EditReport.vue

@@ -526,6 +526,7 @@ async function handleChartInsert({list,type,chartType}){
 						const isETAForumChart=item.startsWith('isETAForumChart_')?true:false
 						//临时权限token
 						const authToken = await getLinkAuthToken(item);
+						const isETAForumChart=item.startsWith('isETAForumChart_')?true:false
 						tempCompDataArr.push({
 							compId:3,
 							compType:'chart',

src/views/reportEn/AddReport.vue

@@ -195,7 +195,6 @@ function handleInsert({list,type,chartType}){
                 const isETAForumChart=item.startsWith('isETAForumChart_')?true:false;
                 //临时权限token
                 let authToken = await getLinkAuthToken(item);
-
                 reportContentIns.html.insert(`<p style='text-align:left; margin-top:10px;'>
 						<iframe src='${link}?code=${isETAForumChart?item.replace(/^isETAForumChart_/, ''):item}&fromPage=en&isETAForumChart=${isETAForumChart}&authToken=${authToken}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 					</p>`)

src/views/sheetList/components/BalanceSheet.vue

@@ -24,17 +24,28 @@
     let total_length = props.TableInfo.TableData.Data.length;
     return getRowHeaderCode(total_length);
   });
+  // 提取公共路径到局部变量
+  const tableFreeze = computed(() => props.TableInfo.ExtraConfig.TableFreeze);
+
+  // 使用对象解构获取所需属性
   const minRow = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.min(FreezeStartRow, FreezeEndRow) === 0 ? 1 : Math.min(FreezeStartRow, FreezeEndRow)
   });
+
   const maxRow = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
-  });
-  const maxCol = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.max(FreezeStartRow, FreezeEndRow);
   });
+
   const minCol = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.min(FreezeStartCol, FreezeEndCol) === 0 ? 1 : Math.min(FreezeStartCol, FreezeEndCol);
+  });
+
+  const maxCol = computed(() => {
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.max(FreezeStartCol, FreezeEndCol);
   });
 
   //手机端pc端不同样式

src/views/sheetList/components/MixedSheet.vue

@@ -24,17 +24,28 @@
     let total_length = props.TableInfo.TableData.Data.length;
     return getRowHeaderCode(total_length);
   });
+  // 提取公共路径到局部变量
+  const tableFreeze = computed(() => props.TableInfo.ExtraConfig.TableFreeze);
+
+  // 使用对象解构获取所需属性
   const minRow = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.min(FreezeStartRow, FreezeEndRow) === 0 ? 1 : Math.min(FreezeStartRow, FreezeEndRow)
   });
+
   const maxRow = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
-  });
-  const maxCol = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.max(FreezeStartRow, FreezeEndRow);
   });
+
   const minCol = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.min(FreezeStartCol, FreezeEndCol) === 0 ? 1 : Math.min(FreezeStartCol, FreezeEndCol);
+  });
+
+  const maxCol = computed(() => {
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.max(FreezeStartCol, FreezeEndCol);
   });
 
   //手机端pc端不同样式
@@ -241,9 +252,9 @@ function isNumberVal(value) {
    // 获取某一列的宽度
   function getColumnHeaderWidth (index) {
     if (!cellRef.value) return
-    console.log(index);
-    console.log(cellRef.value);
-    console.log(cellRef.value[index].offsetWidth);
+    // console.log(index);
+    // console.log(cellRef.value);
+    // console.log(cellRef.value[index].offsetWidth);
     
     return cellRef.value && cellRef.value[index] ? cellRef.value[index].offsetWidth : 104
   }

src/views/sheetList/components/TimelineSheet.vue

@@ -26,17 +26,27 @@
     let total_length = dateArr.value.length +  props.TableInfo.TableData.TextRowData.length;
     return getRowHeaderCode(total_length);
   });
+  // 提取公共路径到局部变量
+  const tableFreeze = computed(() => props.TableInfo.ExtraConfig.TableFreeze);
+
   const minRow = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.min(FreezeStartRow, FreezeEndRow) === 0 ? 1 : Math.min(FreezeStartRow, FreezeEndRow)
   });
+
   const maxRow = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartRow, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndRow)
-  });
-  const maxCol = computed(() => {
-    return Math.max(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartRow, FreezeEndRow } = tableFreeze.value;
+    return Math.max(FreezeStartRow, FreezeEndRow);
   });
+
   const minCol = computed(() => {
-    return Math.min(props.TableInfo.ExtraConfig.TableFreeze.FreezeStartCol, props.TableInfo.ExtraConfig.TableFreeze.FreezeEndCol)
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.min(FreezeStartCol, FreezeEndCol) === 0 ? 1 : Math.min(FreezeStartCol, FreezeEndCol);
+  });
+
+  const maxCol = computed(() => {
+    const { FreezeStartCol, FreezeEndCol } = tableFreeze.value;
+    return Math.max(FreezeStartCol, FreezeEndCol);
   });
 
   //手机端pc端不同样式