Merge branch 'fix/custom-request' into 'main_dev'

fix: 修复实时请求携带无效参数报错

See merge request yunteng/thingskit-view!201

@@ -115,12 +115,12 @@ export const getVideoUrl = (id: string) =>
   })
   })
 
 
 //获取行政区域
 //获取行政区域
-export const getGeoJsonMap = (code: number | string, level: string) =>{
+export const getGeoJsonMap = (code: number | string, level: string) => {
   return defHttp.get({
   return defHttp.get({
     url: `${Api.GEOJSONURL}${code}/${level}`
     url: `${Api.GEOJSONURL}${code}/${level}`
-  },{withShareToken:isShareMode()})
+  }, { withShareToken: isShareMode() })
 }
 }
-  
+
 
 
 // 获取设备详情
 // 获取设备详情
 export const getDeviceDetail = (id: string) =>
 export const getDeviceDetail = (id: string) =>
@@ -136,11 +136,11 @@ export const getAttribute = (deviceProfileId: string) =>
 
 
 // 获取设备最新数据
 // 获取设备最新数据
 export const getDeviceLatest = (tbDeviceId: string) =>
 export const getDeviceLatest = (tbDeviceId: string) =>
-defHttp.get({
-  url: `${Api.GET_DEVICE_LATEST}${tbDeviceId}/values/timeseries`
-}, {
-  joinPrefix: false
-})
+  defHttp.get({
+    url: `${Api.GET_DEVICE_LATEST}${tbDeviceId}/values/timeseries`
+  }, {
+    joinPrefix: false
+  })
 
 
 //获取产品属性
 //获取产品属性
 export const getProfileAttrs = (params: { deviceProfileId: string; dataType?: string }) => {
 export const getProfileAttrs = (params: { deviceProfileId: string; dataType?: string }) => {

@@ -94,13 +94,15 @@ const extraValue = (object: Recordable) => {
 
 
 const handleParams = (Params: Recordable) => {
 const handleParams = (Params: Recordable) => {
   if (Params.keys && Params?.keys?.length) {
   if (Params.keys && Params?.keys?.length) {
+    // 过滤无效参数
+    Reflect.deleteProperty(Params, 'attrName')
     /** ft 修改select联动下拉框选择了属性（单个）报错问题
     /** ft 修改select联动下拉框选择了属性（单个）报错问题
      * 源代码 Params.keys = (Params.keys || [] as any).join(',')
      * 源代码 Params.keys = (Params.keys || [] as any).join(',')
      */
      */
-    if(!Array.isArray(Params.keys)){
-        Params.keys = ([Params.keys] || [] as any).join(',')
-      }else{
-        Params.keys = (Params.keys || [] as any).join(',')
+    if (!Array.isArray(Params.keys)) {
+      Params.keys = ([Params.keys] || [] as any).join(',')
+    } else {
+      Params.keys = (Params.keys || [] as any).join(',')
     }
     }
     //ft
     //ft
   }
   }
@@ -116,12 +118,12 @@ const handleParams = (Params: Recordable) => {
 }
 }
 
 
 //post请求动态追加query参数
 //post请求动态追加query参数
-const objConvertQuery= (data:Recordable)=> {
+const objConvertQuery = (data: Recordable) => {
   const _result = [];
   const _result = [];
   for (const key in data) {
   for (const key in data) {
     const value = data[key];
     const value = data[key];
     if (value.constructor == Array) {
     if (value.constructor == Array) {
-      value.forEach(function(_value) {
+      value.forEach(function (_value) {
         _result.push(key + "=" + _value);
         _result.push(key + "=" + _value);
       });
       });
     } else {
     } else {
@@ -152,11 +154,12 @@ export const customRequest = async (request: RequestConfigType) => {
    * 修改后代码 requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}
    * 修改后代码 requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}
    */
    */
   Params = handleParams(Params)
   Params = handleParams(Params)
+  console.log(Params)
   return customHttp.request<any>({
   return customHttp.request<any>({
-    url: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}`,
+    url: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl : `${requestUrl}?${objConvertQuery(Params)}`,
     baseURL: getOriginUrl(requestOriginUrl!),
     baseURL: getOriginUrl(requestOriginUrl!),
     method: requestHttpType,
     method: requestHttpType,
-    params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params: null,
+    params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params : null,
     data: body,
     data: body,
     headers: extraValue(Header)
     headers: extraValue(Header)
   }, {
   }, {

 <template>
 <template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :manual-update="isPreview()"
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()"
     :update-options="{
     :update-options="{
       replaceMerge: replaceMergeArr
       replaceMerge: replaceMergeArr
-    }"
-    autoresize
-    @mouseover="handleHighlight"
-    @mouseout="handleDownplay"
-  >
+    }" autoresize @mouseover="handleHighlight" @mouseout="handleDownplay">
   </v-chart>
   </v-chart>
 </template>
 </template>
 
 
@@ -186,6 +177,12 @@ watch(
           for (let i = 0; i < dimensionsGap; i++) {
           for (let i = 0; i < dimensionsGap; i++) {
             seriesArr.push(cloneDeep(seriesItem))
             seriesArr.push(cloneDeep(seriesItem))
           }
           }
+
+          const { request } = props.chartConfig
+          const { requestParams: { Params: { attrName } } } = request || {}
+          seriesArr.forEach((item: any, index: number) => {
+            item.name = attrName?.[index]
+          })
           props.chartConfig.option.series.push(...seriesArr)
           props.chartConfig.option.series.push(...seriesArr)
         }
         }
         replaceMergeArr.value = ['series']
         replaceMergeArr.value = ['series']
@@ -205,28 +202,29 @@ watch(
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 const updateVChart = (newData: SocketReceiveMessageType) => {
 const updateVChart = (newData: SocketReceiveMessageType) => {
   if (!newData) return
   if (!newData) return
-  const { option,request } = props.chartConfig
-  const {requestParams:{Params:{attrName}}} = request || {}
+  const { option, request } = props.chartConfig
+  const { requestParams: { Params: { attrName } } } = request || {}
   const { dataset: overrideDataset } = option
   const { dataset: overrideDataset } = option
   const { dimensions } = overrideDataset
   const { dimensions } = overrideDataset
   if (!Array.isArray(dimensions)) return
   if (!Array.isArray(dimensions)) return
   const { data } = newData
   const { data } = newData
-  const {  record } = useAssembleDataHooks(data,dimensions,(attrName as any))
+  const { record } = useAssembleDataHooks(data, dimensions, (attrName as any))
   if (unref(realTimeList).length >= chartMaxDataPoint.value) {
   if (unref(realTimeList).length >= chartMaxDataPoint.value) {
     unref(realTimeList).splice(0, 1)
     unref(realTimeList).splice(0, 1)
   }
   }
   realTimeList.value.push(record)
   realTimeList.value.push(record)
-  const dataset = { 
+  const dataset = {
     dimensions: ['ts', ...attrName],
     dimensions: ['ts', ...attrName],
     source: toRaw(unref(realTimeList))
     source: toRaw(unref(realTimeList))
   }
   }
-  option.series.forEach((item:any,index:number)=>{
+  option.series.forEach((item: any, index: number) => {
     item.name = attrName?.[index]
     item.name = attrName?.[index]
   })
   })
+
   vChartRef.value?.setOption({
   vChartRef.value?.setOption({
     ...option,
     ...option,
     dataset,
     dataset,
-    legend:{data:attrName || []}
+    legend: { data: attrName || [] }
   })
   })
 }
 }
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {