Merge branch 'ft' into 'main_dev'

fix(src/api/external): 修改传post请求body体里携带空字符串问题

See merge request yunteng/thingskit-view!136

-import { RequestBodyEnum, RequestParams } from "@/enums/httpEnum"
+import { RequestBodyEnum, RequestHttpEnum, RequestParams } from "@/enums/httpEnum"
 import { ExtraRequestConfigType } from "@/store/external/modules/extraComponentInfo.d"
 import { ExtraRequestConfigType } from "@/store/external/modules/extraComponentInfo.d"
 import { RequestConfigType } from "@/store/modules/chartEditStore/chartEditStore.d"
 import { RequestConfigType } from "@/store/modules/chartEditStore/chartEditStore.d"
 import { isShareMode } from "@/views/share/hook"
 import { isShareMode } from "@/views/share/hook"
@@ -115,6 +115,22 @@ const handleParams = (Params: Recordable) => {
   return Object.keys(Params).filter(Boolean).reduce((prev, next) => ({ ...prev, [next]: Params[next] }), {})
   return Object.keys(Params).filter(Boolean).reduce((prev, next) => ({ ...prev, [next]: Params[next] }), {})
 }
 }
 
 
+//post请求动态追加query参数
+const objConvertQuery= (data:Recordable)=> {
+  const _result = [];
+  for (const key in data) {
+    const value = data[key];
+    if (value.constructor == Array) {
+      value.forEach(function(_value) {
+        _result.push(key + "=" + _value);
+      });
+    } else {
+      _result.push(key + '=' + value);
+    }
+  }
+  return _result.join('&');
+}
+
 export const customRequest = async (request: RequestConfigType) => {
 export const customRequest = async (request: RequestConfigType) => {
   const { requestHttpType, requestParams, requestParamsBodyType, requestOriginUrl } = request as ExtraRequestConfigType
   const { requestHttpType, requestParams, requestParamsBodyType, requestOriginUrl } = request as ExtraRequestConfigType
   let { requestUrl } = request as ExtraRequestConfigType
   let { requestUrl } = request as ExtraRequestConfigType
@@ -130,18 +146,18 @@ export const customRequest = async (request: RequestConfigType) => {
   const body = transformBodyValue(Body, requestParamsBodyType)
   const body = transformBodyValue(Body, requestParamsBodyType)
 
 
   /**
   /**
-   * ft 修改post请求针对这种接口(/api/yt/device,设备列表分页)，是post请求，body体一定要携带内容，空内容也可以
+   * ft 修改post请求针对这种接口(/api/yt/device,设备列表分页)，是post请求,page和pageSize是query参数，body可以不传内容
    * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
    * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
-   * 源代码 data: body,
-   * 修改后代码   data: !body? {"":null} :body,
+   * 源代码 url: requestUrl
+   * 修改后代码 requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}
    */
    */
   Params = handleParams(Params)
   Params = handleParams(Params)
   return customHttp.request<any>({
   return customHttp.request<any>({
-    url: requestUrl,
+    url: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? requestUrl: `${requestUrl}?${objConvertQuery(Params)}`,
     baseURL: getOriginUrl(requestOriginUrl!),
     baseURL: getOriginUrl(requestOriginUrl!),
     method: requestHttpType,
     method: requestHttpType,
-    params: Params,
-    data: !body? {"":null} :body,
+    params: requestHttpType === RequestHttpEnum.GET.toUpperCase() ? Params: null,
+    data: body,
     headers: extraValue(Header)
     headers: extraValue(Header)
   }, {
   }, {
     joinPrefix: false,
     joinPrefix: false,

 import { ChartFrameEnum, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChartFrameEnum, PackagesCategoryEnum } from '@/packages/index.d'
 import { ImageConfig } from '@/packages/components/Informations/Mores/Image/index'
 import { ImageConfig } from '@/packages/components/Informations/Mores/Image/index'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
+import carousel1 from '@/assets/images/chart/photos/carousel1.jpeg'
+import carousel2 from '@/assets/images/chart/photos/carousel2.jpeg'
 
 
 // 远程共享库（调接口获取图像列表）
 // 远程共享库（调接口获取图像列表）
 const imageList = [
 const imageList = [
-  { imageName: 'carousel1', imageUrl: 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel1.jpeg' },
-  { imageName: 'carousel2', imageUrl: 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel2.jpeg' }
+  { imageName: 'carousel1', imageUrl: 'carousel1.jpeg' },
+  { imageName: 'carousel2', imageUrl: 'carousel2.jpeg' }
 ]
 ]
 
 
 const photoConfigList = imageList.map(i => ({
 const photoConfigList = imageList.map(i => ({
@@ -15,7 +17,7 @@ const photoConfigList = imageList.map(i => ({
   package: PackagesCategoryEnum.PHOTOS,
   package: PackagesCategoryEnum.PHOTOS,
   chartFrame: ChartFrameEnum.STATIC,
   chartFrame: ChartFrameEnum.STATIC,
   image: i.imageUrl,
   image: i.imageUrl,
-  dataset: i.imageUrl,
+  dataset: i.imageName==='carousel1' ? carousel1 : carousel2,
   title: i.imageName,
   title: i.imageName,
   redirectComponent: `${ImageConfig.package}/${ImageConfig.category}/${ImageConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
   redirectComponent: `${ImageConfig.package}/${ImageConfig.category}/${ImageConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
 }))
 }))