Merge branch 'fix/get-device-list-by-productIds' into 'main_dev'

fix: 修复当产品id为空时,http请求携带参数需为空数组

See merge request yunteng/thingskit-scada!173

-import { h, render } from 'vue'
-import FirstScreenAnmation from './index.vue'
-
-export function createFirstScreen() {
-  render(h(FirstScreenAnmation), document.getElementById('geInfo')!)
-}
-

-<script setup lang="ts">
-import { onMounted, ref, unref } from 'vue'
-import type { ECharts, EChartsOption } from 'echarts'
-import { init } from 'echarts'
-const firstScreenElRef = ref()
-
-const instance = ref<ECharts>()
-
-const options: EChartsOption = {
-  graphic: {
-    elements: [
-      {
-        type: 'text',
-        left: 'center',
-        top: 'center',
-        style: {
-          text: 'Apache ECharts',
-          fontSize: 80,
-          fontWeight: 'bold',
-          lineDash: [0, 200],
-          lineDashOffset: 0,
-          fill: 'transparent',
-          stroke: '#000',
-          lineWidth: 1,
-        },
-        keyframeAnimation: {
-          duration: 3000,
-          loop: true,
-          keyframes: [
-            {
-              percent: 0.7,
-              style: {
-                fill: 'transparent',
-                lineDashOffset: 200,
-                lineDash: [200, 0],
-              },
-            },
-            {
-              // Stop for a while.
-              percent: 0.8,
-              style: {
-                fill: 'transparent',
-              },
-            },
-            {
-              percent: 1,
-              style: {
-                fill: 'black',
-              },
-            },
-          ],
-        },
-      },
-    ],
-  },
-}
-
-onMounted(() => {
-  instance.value = init(unref(firstScreenElRef), options)
-})
-</script>
-
-<template>
-  <div ref="firstScreenElRef" class="w-full h-full" />
-</template>

@@ -69,7 +69,7 @@ async function getDeviceList() {
   if (!organizationId) return
   if (!organizationId) return
   const productIds = unref(contentDataStore.getProductIds)
   const productIds = unref(contentDataStore.getProductIds)
   const result = await getListByDeviceProfileIds({ deviceProfileIds: productIds || [], organizationId })
   const result = await getListByDeviceProfileIds({ deviceProfileIds: productIds || [], organizationId })
-  deviceList.value = result.map((item: Recordable) => ({
+  deviceList.value = result.map(item => ({
     ...item,
     ...item,
     label: item.alias || item.name,
     label: item.alias || item.name,
     value: item.tbDeviceId,
     value: item.tbDeviceId,

@@ -49,7 +49,7 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           showSearch: true,
           showSearch: true,
           api: getListByDeviceProfileIds,
           api: getListByDeviceProfileIds,
           params: {
           params: {
-            deviceProfileIds: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => item?.profileId),
+            deviceProfileIds: unref(contentDataStore.getProductIds),
             organizationId,
             organizationId,
           },
           },
           aliasField: 'alias',
           aliasField: 'alias',

@@ -127,7 +127,7 @@ export class VAxios {
               await this.refreshTokenBeforeReq(doRefresh)
               await this.refreshTokenBeforeReq(doRefresh)
           }
           }
         }
         }
-        catch (error) {}
+        catch (error) { }
       }
       }
 
 
       !ignoreCancelToken && axiosCanceler.addPending(config)
       !ignoreCancelToken && axiosCanceler.addPending(config)

 import type { AxiosInstance, AxiosResponse } from 'axios'
 import type { AxiosInstance, AxiosResponse } from 'axios'
-import { clone } from 'lodash-es'
+import { clone, isArray } from 'lodash-es'
 import axios from 'axios'
 import axios from 'axios'
 import { isString, isUnDef } from '@wry-smile/utils-is'
 import { isString, isUnDef } from '@wry-smile/utils-is'
 import { isShareMode } from '../env'
 import { isShareMode } from '../env'
@@ -77,7 +77,7 @@ const transform: AxiosTransform = {
         if (
         if (
           Reflect.has(config, 'data')
           Reflect.has(config, 'data')
           && config.data
           && config.data
-          && (Object.keys(config.data).length > 0 || config.data instanceof FormData)
+          && (Object.keys(config.data).length > 0 || config.data instanceof FormData || isArray(config.data))
         ) {
         ) {
           config.data = data
           config.data = data
           config.params = params
           config.params = params