Merge branch 'ETA1.8.5'

src/hooks/chart/useChartRender.ts

@@ -90,13 +90,13 @@ watch(() => router.currentRoute.value.query,(nval) => {
 export const useChartRender = (Data,lang='zh',) => {
 
   state.chartInfo = Data.ChartInfo
-  state.dataList = Data.ChartInfo.Source === 1 ? Data.EdbInfoList : [Data.EdbInfoList[0]];
+  state.dataList = [1,11].includes(Data.ChartInfo.Source) ? Data.EdbInfoList : [Data.EdbInfoList[0]];
   language.value = lang
 
   let chartOptions:any;
 
   //eta图
-  if (Data.ChartInfo.Source === 1) {
+  if ([1,11].includes(Data.ChartInfo.Source)) {
     setLimitData(state.dataList)
     const typeMap = {
       1: setDefaultLineOptions,
@@ -240,7 +240,7 @@ const setDefaultLineOptions = () => {
       yAxis: sameSideIndex,
       name,
       color: item.ChartColor,
-      lineWidth: Number(item.ChartWidth),
+      lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptions.lineWidth)||1,
       ...predict_params
     };
     item.DataList = item.DataList || []

src/views/chartShow/index.vue

@@ -182,7 +182,7 @@ export default defineComponent({
     const refreshChart = _.debounce(async () => {
       loading.value = true;
       let res: any=null
-      if([1,6,7,8,9,10].includes(state.chartInfo.Source)){
+      if([1,6,7,8,9,10,11].includes(state.chartInfo.Source)){
         res=await ChartApi.refreshChart({UniqueCode: state.chartInfo.UniqueCode})
       }else if([2,5].includes(state.chartInfo.Source)){
         res=await ChartApi.refreshCommordityChart({UniqueCode: state.chartInfo.UniqueCode});