Merge branch 'ft_exclude3d' into 'main_dev'

fix: 修复摄像头点击新增样式错和修改select联动下拉框选择了属性（单个）报错问题；和新增过滤器交互

See merge request yunteng/thingskit-view!64

@@ -94,7 +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) {
-    Params.keys = (Params.keys || [] as any).join(',')
+    /** ft 修改select联动下拉框选择了属性（单个）报错问题
+     * 源代码 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
   }
   }
 
 
   const timePeriod = Params[SelectTimeAggregationFieldEnum.TIME_PERIOD]
   const timePeriod = Params[SelectTimeAggregationFieldEnum.TIME_PERIOD]

@@ -39,6 +39,7 @@ export interface PublicInterfaceRecord {
   requestParamsBodyType: string,
   requestParamsBodyType: string,
   requestUrl: string,
   requestUrl: string,
   requestParams: string,
   requestParams: string,
+  filter?:string//FT 新增一个字段filter
 }
 }
 
 
 
 

 <template>
 <template>
   <div class="banner-box" ref="root">
   <div class="banner-box" ref="root">
-    <div class="wrapper">
+    <div  class="wrapper">
       <div v-for="(item, index) in option.dataset" :key="index + item" :class="item.className" :style="item.sty">
       <div v-for="(item, index) in option.dataset" :key="index + item" :class="item.className" :style="item.sty">
         <CameraItem
         <CameraItem
           ref="cameraRef"
           ref="cameraRef"
@@ -43,7 +43,7 @@ const cameraRef = ref<InstanceType<typeof CameraItem>>()
 
 
 let initial = ref(0)
 let initial = ref(0)
 
 
-let interval = ref(4000)
+let interval = ref(2500)
 
 
 const computedFunc = (initial: number, source: any) => {
 const computedFunc = (initial: number, source: any) => {
   if (initial < 0) initial = 0
   if (initial < 0) initial = 0
@@ -55,35 +55,35 @@ const computedFunc = (initial: number, source: any) => {
       temp4 = initial + 1 >= len ? initial + 1 - len : initial + 1,
       temp4 = initial + 1 >= len ? initial + 1 - len : initial + 1,
       temp5 = initial + 2 >= len ? initial + 2 - len : initial + 2
       temp5 = initial + 2 >= len ? initial + 2 - len : initial + 2
     return source?.map((item: any, index: number) => {
     return source?.map((item: any, index: number) => {
-      let transform = `translate(-50%, -50%) scale(0.7)`,
+      let transform = `translateX(-50%) scale(0.7)`,
         zIndex = 0,
         zIndex = 0,
         className = 'slide'
         className = 'slide'
       switch (index) {
       switch (index) {
         case temp3:
         case temp3:
-          transform = `translate(-50%, -50%) scale(1)`
+          transform = `translateX(-50%) scale(1)`
           className = ['slide', 'activate'] as any
           className = ['slide', 'activate'] as any
-          zIndex = 3
+          zIndex = 300
           break
           break
         case temp1:
         case temp1:
-          transform = `translate(-80%, -50%) scale(0.7)`
-          zIndex = 1
+          transform = `translateX(-80%) scale(0.7)`
+          zIndex = 100
           break
           break
         case temp5:
         case temp5:
-          transform = `translate(100%, -50%) scale(0.7)`
-          zIndex = 1
+          transform = `translateX(100%) scale(0.7)`
+          zIndex = 100
           break
           break
         case temp2:
         case temp2:
-          transform = `translate(-100%, -50%) scale(0.85)`
-          zIndex = 2
+          transform = `translateX(-100%) scale(0.85)`
+          zIndex = 200
           break
           break
         case temp4:
         case temp4:
-          transform = `translate(58%, -50%) scale(0.85)`
-          zIndex = 2
+          transform = `translateX(58%) scale(0.85)`
+          zIndex = 200
           break
           break
       }
       }
       item.sty = {
       item.sty = {
         transform,
         transform,
-        zIndex
+        zIndex,
       }
       }
       item.className = className
       item.className = className
       return item
       return item
@@ -155,16 +155,18 @@ function changeSlide(dir: string) {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .banner-box {
 .banner-box {
   .wrapper {
   .wrapper {
-    width: 100%;
+    // width: 100%;
     height: 100%;
     height: 100%;
-    position: relative;
+    // position: relative;
+    display: flex;
+    overflow: hidden;
     .slide {
     .slide {
       width: 20%;
       width: 20%;
       height: 100%;
       height: 100%;
       position: absolute;
       position: absolute;
-      top: 50%;
+      // top: 50%;
       left: 10%;
       left: 10%;
-      transform: translate(-50%, -50%);
+      transform: translateX(-50%);
       transition: 0.5s;
       transition: 0.5s;
       box-shadow: 0 0 4px black;
       box-shadow: 0 0 4px black;
       .video-title {
       .video-title {

@@ -78,6 +78,11 @@ const handleClickPanel = () => {
 // TODO socket 请求时会触发
 // TODO socket 请求时会触发
 watchEffect(() => {
 watchEffect(() => {
   const filter = targetData.value?.filter
   const filter = targetData.value?.filter
+  /**
+   * FT 修改
+   */
+  if(!filter) return
+  //ft
   if (lastFilter !== filter && firstFocus) {
   if (lastFilter !== filter && firstFocus) {
     lastFilter = filter
     lastFilter = filter
     sendHandle()
     sendHandle()

@@ -13,6 +13,7 @@ import { ExtraRequestConfigType } from '@/store/external/modules/extraComponentI
 import { DynamicForm } from '../DynamicForm';
 import { DynamicForm } from '../DynamicForm';
 import { extraPublicInterfaceInfo } from '../DynamicForm/utils';
 import { extraPublicInterfaceInfo } from '../DynamicForm/utils';
 import { isArray } from '@/utils';
 import { isArray } from '@/utils';
+import { useTargetData } from '../../../../hooks/useTargetData.hook';
 
 
 const publicInterfaceList = ref<PublicInterfaceRecord[]>([])
 const publicInterfaceList = ref<PublicInterfaceRecord[]>([])
 
 
@@ -86,6 +87,13 @@ const handleSelectedInterfaceChange = async (_value: string, option: PublicInter
   headerRef.value = isArray(Header) ? (Header as ParamsItemType[]).reduce((prev, next) => ({ ...prev, [next.key]: next.value }), {}) : {}
   headerRef.value = isArray(Header) ? (Header as ParamsItemType[]).reduce((prev, next) => ({ ...prev, [next.key]: next.value }), {}) : {}
   unref(bodyContentEl)?.setConfigurationData(unref(getSelectedInterfaceBody), Body)
   unref(bodyContentEl)?.setConfigurationData(unref(getSelectedInterfaceBody), Body)
   await nextTick()
   await nextTick()
+  /**
+   * FT 修改新增从接口取出filter
+   */
+  const { filter } = option
+  const { targetData } = useTargetData()
+  targetData.value.filter = filter ?? 'return res'
+  //ft
   setDynamicFormValue(option as unknown as ExtraRequestConfigType)
   setDynamicFormValue(option as unknown as ExtraRequestConfigType)
 }
 }