Merge branch 'ft' into 'main_dev'

feat(packages/external): 点击按钮新增跳转提示和三维模型支持mtl材质和材质贴图上传显示和单个摄像头新增播放配置

See merge request yunteng/thingskit-view!71

@@ -11,8 +11,6 @@ export const useChartInteract = (
   useChartEditStore: ChartEditStoreType,
   param: { [T: string]: any },
   interactEventOn: string,
-  target: string,
-  status: boolean
 ) => {
   const chartEditStore = useChartEditStore()
   const { interactEvents } = chartConfig.events

@@ -26,6 +26,10 @@ const props = defineProps({
   },
   index: {
     type: Number
+  },
+  autoplay: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -40,7 +44,7 @@ const options: VideoJsPlayerOptions = {
   language: 'zh-CN', // 设置语言
   controls: true, // 是否显示控制条
   preload: 'auto', // 预加载
-  autoplay: true, // 是否自动播放
+  autoplay: props.autoplay, // 是否自动播放
   fluid: false, // 自适应宽高
   poster: props?.avatar || '',
   src: props?.sourceSrc || '', // 要嵌入的视频源的源 URL

@@ -9,11 +9,7 @@ export const option = {
       url: ''
     }
   ] as any,
-  // 自动播放的间隔（ms）
-  interval: 5000,
-  autoplay: true,
-  effect: 'slide',
-  displayMode: 'singleGrid'
+  autoplay: false,
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -7,6 +7,11 @@
         </n-input-group>
       </setting-item>
     </setting-item-box>
+    <setting-item-box name="自动播放">
+      <setting-item>
+        <n-switch v-model:value="optionData.autoplay" size="small" />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 
@@ -21,5 +26,4 @@ defineProps({
     required: true
   }
 })
-
 </script>

@@ -10,6 +10,7 @@
             :key="item + index"
             :sourceSrc="item.url"
             :index="index"
+            :autoplay="autoplay"
           />
         </div>
       </n-gi>
@@ -32,6 +33,8 @@ const props = defineProps({
 
 const { h } = toRefs(props.chartConfig.attr)
 
+const { autoplay } = toRefs(props.chartConfig.option)
+
 const responsiveComputeValue = ref(0)
 
 const option = shallowReactive({

+<template>
+  <setting-item :name="fileSizeMsg">
+    <n-upload
+      :max="max"
+      :customRequest="customRequest"
+      :onBeforeUpload="beforeUploadHandle"
+      :default-file-list="fileList"
+      @change="handleUploadChange"
+    >
+      <n-button> 上传文件</n-button>
+    </n-upload>
+  </setting-item>
+</template>
+
+<script setup lang="ts">
+import { ref, nextTick } from 'vue'
+import { SettingItem } from '@/components/Pages/ChartItemSetting'
+import { uploadFile } from '@/api/external/contentSave/content'
+import type { UploadFileInfo } from 'naive-ui'
+import { UploadCustomRequestOptions } from 'naive-ui'
+
+const props = defineProps({
+  max: {
+    type: Number,
+    default: 1
+  },
+  fileSizeConst: {
+    type: Number,
+    default: 50
+  },
+  singleFileType: {
+    type: String,
+    default: 'mtl'
+  },
+  threeSupportFileFormat: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emits = defineEmits(['fileStaticUri'])
+
+const fileList = ref<UploadFileInfo[]>([])
+
+const fileSizeMsg = ref(`文件需小于 ${props.fileSizeConst}M；格式为${props.threeSupportFileFormat.join(',')}的文件`)
+
+const extname = (filename: string) => {
+  if (!filename || typeof filename != 'string') {
+    return false
+  }
+  let a = filename.split('').reverse().join('')
+  let b = a.substring(0, a.search(/\./)).split('').reverse().join('')
+  return b
+}
+
+// 上传图片前置处理
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+//@ts-ignore
+const beforeUploadHandle = async ({ file }) => {
+  const type = extname(file.file.name) as string
+  const size = file.file.size
+  if (size / (1024 * 1024) > props.fileSizeConst) {
+    window['$message'].warning(`文件超出 ${props.fileSizeConst}M限制，请重新上传！`)
+    return false
+  }
+  if (!props.threeSupportFileFormat.includes(type)) {
+    window['$message'].warning('文件格式不符合，请重新上传！')
+    return false
+  }
+  return true
+}
+
+const handleUploadChange = (data: { fileList: UploadFileInfo[] }) => {
+  fileList.value = []
+  emits('fileStaticUri', data.fileList as never as any)
+}
+
+// 自定义上传操作
+const customRequest = (options: UploadCustomRequestOptions) => {
+  const { file } = options
+  nextTick(async () => {
+    if (file.file) {
+      const formData = new FormData()
+      formData.append('file', file.file)
+      const uploadRes = await uploadFile(formData)
+      if (uploadRes) {
+        fileList.value.push({
+          id: -Math.random() + '',
+          name: uploadRes?.fileName,
+          status: 'finished',
+          url: uploadRes?.fileStaticUri
+        })
+        fileList.value = fileList.value.filter((item: UploadFileInfo) => {
+          return item.status === 'finished'
+        })
+        emits('fileStaticUri', fileList.value)
+        window['$message'].success('上传文件成功！')
+      }
+    } else {
+      window['$message'].error('上传文件失败，请稍后重试！')
+    }
+  })
+}
+</script>

@@ -6,7 +6,7 @@ import { chartInitConfig } from '@/settings/designSetting'
 
 export const option = {
   //vue3dLoader支持数组或字符串，暂且绑定字符串，这个插件可以加载多个模型
-  dataset: "",
+  dataset: '',
   backgroundColor: '', //场景背景色
   backgroundAlpha: 0, //场景透明度
   enableDamping: false, //是否启用阻尼
@@ -19,7 +19,9 @@ export const option = {
    */
   outputEncoding: 'liner',
   clearScene: false, //是否清空场景内容
-  lights: [] //灯光，暂且没实现
+  lights: [], //灯光，暂且没实现
+  mtlPath: [], //.mtl材质路径，比如搭配obj使用
+  textureImage: [] //jpg/png 材质路径
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

 <template>
   <collapse-item name="三维配置" :expanded="true">
-    <setting-item-box name="文件上传" :alone="true">
-      <setting-item :name="fileSizeMsg">
-        <n-upload
-          :max="1"
-          :customRequest="customRequest"
-          :onBeforeUpload="beforeUploadHandle"
-          :default-file-list="defaultFileList"
-        >
-          <n-button> 上传文件</n-button>
-        </n-upload>
-      </setting-item>
+    <setting-item-box :alone="true">
+      <template #name>
+        <n-text>提示</n-text>
+        <n-tooltip trigger="hover">
+          <template #trigger>
+            <n-icon size="21" :depth="3">
+              <help-outline-icon></help-outline-icon>
+            </n-icon>
+          </template>
+          <span class="help-span">{{ threeFileHelpMessgae }}</span>
+        </n-tooltip>
+      </template>
+      <FileUpload
+        :max="1"
+        :threeSupportFileFormat="threeSupportFileFormat"
+        :singleFileType="singleFileTypeNotMtl"
+        @fileStaticUri="handleFileStaticUri"
+      />
+    </setting-item-box>
+    <setting-item-box name="mtl材质文件上传">
+      <FileUpload :max="10" :threeSupportFileFormat="supportFileMtl" @fileStaticUri="handleFileMtlStaticUri" />
+    </setting-item-box>
+    <setting-item-box name="材质贴图上传">
+      <FileUpload
+        :max="10"
+        :threeSupportFileFormat="supportFileTextureImage"
+        @fileStaticUri="handleFileTextureImageStaticUri"
+      />
     </setting-item-box>
     <setting-item-box name="属性配置">
       <setting-item name="场景色(需要这种格式HEX #000000，否则失效)">
@@ -39,12 +56,15 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, h, ref, nextTick } from 'vue'
+import { PropType, ref } from 'vue'
 import { option } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { NInputNumber, NSelect } from 'naive-ui'
-import { uploadFile } from '@/api/external/contentSave/content'
-import { UploadCustomRequestOptions } from 'naive-ui'
+import FileUpload from './components/FileUpload.vue'
+import { icon } from '@/plugins'
+import type { UploadFileInfo } from 'naive-ui'
+
+const { HelpOutlineIcon } = icon.ionicons5
 
 const props = defineProps({
   optionData: {
@@ -53,17 +73,15 @@ const props = defineProps({
   }
 })
 
-const defaultFileList = ref([])
+const singleFileTypeNotMtl = ref('')
 
-//文件限制大小
-const fileSizeConst = ref(50)
+const threeFileHelpMessgae = ref('如果格式为obj，则上传顺序是，先上传材质贴图（png或jpg）、mtl材质文件，最后是obj')
 
-/**
- * 三维文件格式,vue-3d-loader是这个插件支持的格式，其他格式待解决
- */
 const threeSupportFileFormat = ['fbx', 'obj', 'gltf', 'stl', 'dae', 'glb', 'ply', 'json']
 
-const fileSizeMsg = ref(`文件需小于 ${fileSizeConst.value}M ，格式为${threeSupportFileFormat.join(',')}的文件`)
+const supportFileMtl = ['mtl']
+
+const supportFileTextureImage = ['jpg', 'png']
 
 const handleChange = (e: boolean) => {
   if (e) props.optionData.dataset = ''
@@ -74,51 +92,24 @@ const encodinghList = [
   { label: 'sRGB ', value: 'sRGB ' }
 ]
 
-
-const extname = (filename: string) => {
-  if (!filename || typeof filename != 'string') {
-    return false
-  }
-  let a = filename.split('').reverse().join('')
-  let b = a.substring(0, a.search(/\./)).split('').reverse().join('')
-  return b
+const handleFileStaticUri = (value: UploadFileInfo[]) => {
+  props.optionData.dataset = value[0]?.url as string
 }
 
-// 上传图片前置处理
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-//@ts-ignore
-const beforeUploadHandle = async ({ file }) => {
-  defaultFileList.value = []
-  const type = extname(file.file.name) as string
-  const size = file.file.size
-  if (size / (1024 * 1024) > fileSizeConst.value) {
-    window['$message'].warning(`文件超出 ${fileSizeConst.value}M限制，请重新上传！`)
-    return false
-  }
-  if (!threeSupportFileFormat.includes(type)) {
-    window['$message'].warning('文件格式不符合，请重新上传！')
-    return false
-  }
-  return true
+const handleFileMtlStaticUri = (value: UploadFileInfo[]) => {
+  props.optionData.mtlPath = value.map(item => item?.url) as any
 }
 
-// 自定义上传操作
-const customRequest = (options: UploadCustomRequestOptions) => {
-  const { file } = options
-  nextTick(async () => {
-    if (file.file) {
-      const formData = new FormData()
-      formData.append('file', file.file)
-      const uploadRes = await uploadFile(formData)
-      if (uploadRes) {
-        props.optionData.dataset = uploadRes?.fileStaticUri
-        window['$message'].success('上传文件成功！')
-      }
-    } else {
-      window['$message'].error('上传文件失败，请稍后重试！')
-    }
-  })
+const handleFileTextureImageStaticUri = (value: UploadFileInfo[]) => {
+  props.optionData.textureImage = value.map(item => item?.url) as any
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.help-span {
+  display: flex;
+  flex-wrap: wrap;
+  width: 8vw;
+  color: white;
+}
+</style>

@@ -9,6 +9,8 @@
         :height="h"
         :width="w"
         :filePath="dataset"
+        :mltPath="mtlPath"
+        :textureImage="textureImage"
         :autoPlay="autoPlay"
         :enableDamping="enableDamping"
         :outputEncoding="outputEncoding"
@@ -101,6 +103,8 @@ const {
   autoPlay,
   enableDamping,
   dataset,
+  mtlPath,
+  textureImage,
   outputEncoding,
   clearScene,
   dampingFactor

@@ -19,12 +19,17 @@ export const option = {
       targetButton: ''
     }
   ],
-  buttonType:'primary'
+  buttonType: 'primary',
+  buttonGhost: false,
+  buttonDashed: false,
+  buttonColor: '',
+  buttonTextColor: 'white',
+  buttonTextSize: '16',
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = ButtonConfig.key
-  public attr = { ...chartInitConfig, w: 460, h: 32, zIndex: -1 }
+  public attr = { ...chartInitConfig, w: 90, h: 40, zIndex: -1 }
   public chartConfig = cloneDeep(ButtonConfig)
   public interactActions = interactActions
   public option = cloneDeep(option)

@@ -3,17 +3,53 @@
     <setting-item-box name="默认值" :alone="true">
       <n-select size="small" v-model:value="optionData.buttonType" :options="buttonTypeOptions" />
     </setting-item-box>
-    <setting-item-box name="跳转配置项" :alone="true">
+    <setting-item-box name="虚线">
+      <setting-item name="">
+        <n-switch v-model:value="optionData.buttonDashed" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="透明">
+      <setting-item name="">
+        <n-switch v-model:value="optionData.buttonGhost" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="颜色">
+      <setting-item name="">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.buttonColor"></n-color-picker>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="文字颜色">
+      <setting-item name="">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.buttonTextColor"></n-color-picker>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="文字大小">
+      <setting-item name="">
+        <n-input-number v-model:value="optionData.buttonTextSize" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box :alone="true">
+      <template #name>
+        <n-text>跳转</n-text>
+        <n-tooltip trigger="hover">
+          <template #trigger>
+            <n-icon size="21" :depth="3">
+              <help-outline-icon></help-outline-icon>
+            </n-icon>
+          </template>
+          <span class="help-span">{{ threeFileHelpMessgae }}</span>
+        </n-tooltip>
+      </template>
       <setting-item v-for="(item, index) in optionData.dataset" :key="index">
         <n-input v-model:value="item.label" size="small" placeholder="按钮文字"></n-input>
         <div style="height: 5px"></div>
-        <n-input v-model:value="item.currentButton" size="small" placeholder="当前按钮"></n-input>
+        <n-input v-model:value="item.currentButton" size="small" placeholder="填写当前按钮id（事件里面）"></n-input>
         <div style="height: 5px"></div>
-        <n-input v-model:value="item.targetButton" size="small" placeholder="目标按钮"></n-input>
+        <n-input v-model:value="item.targetButton" size="small" placeholder="填写目标按钮id（事件里面）"></n-input>
         <div style="height: 5px"></div>
-        <n-input v-model:value="item.current" size="small" placeholder="当前页面"></n-input>
+        <n-input v-model:value="item.current" size="small" placeholder="填写当前页面id（事件里面）"></n-input>
         <div style="height: 5px"></div>
-        <n-input v-model:value="item.target" size="small" placeholder="目标页面"></n-input>
+        <n-input v-model:value="item.target" size="small" placeholder="填写目标页面id（事件里面）"></n-input>
         <div style="height: 5px"></div>
       </setting-item>
     </setting-item-box>
@@ -21,9 +57,10 @@
 </template>
 
 <script lang="ts" setup>
-import { PropType } from 'vue'
+import { PropType, ref } from 'vue'
 import { CollapseItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
 import { option } from './config'
+import { icon } from '@/plugins'
 
 defineProps({
   optionData: {
@@ -32,6 +69,12 @@ defineProps({
   }
 })
 
+const { HelpOutlineIcon } = icon.ionicons5
+
+const threeFileHelpMessgae = ref(`
+在事件里面复制对应组件id，填写你要跳转的目标，相当于一个按钮就绑定了一个页面（分组），然后跳转到另一个页面，其实就是点击当前页隐藏，目标页显示
+`)
+
 const buttonTypeOptions = [
   {
     label: 'default',
@@ -63,3 +106,11 @@ const buttonTypeOptions = [
   }
 ]
 </script>
+<style lang="scss" scoped>
+.help-span {
+  display: flex;
+  flex-wrap: wrap;
+  width: 8vw;
+  color: white;
+}
+</style>

@@ -2,9 +2,13 @@
   <n-button
     :style="{ width: `${w}px`, height: `${h}px` }"
     :type="buttonType"
-    @click="onClick(option.value.dataset[0],true)"
-    >{{ option.value.dataset[0].label }}</n-button
+    :dashed="buttonDashed"
+    :ghost="buttonGhost"
+    :color="buttonColor"
+    @click="onClick(option.value.dataset[0])"
   >
+    <span class="button-text-color">{{ option.value.dataset[0].label }}</span>
+  </n-button>
 </template>
 
 <script setup lang="ts">
@@ -24,24 +28,24 @@ const props = defineProps({
 })
 
 const { w, h } = toRefs(props.chartConfig.attr)
-const { buttonType } = toRefs(props.chartConfig.option)
+const { buttonType, buttonDashed, buttonGhost, buttonColor, buttonTextColor, buttonTextSize } = toRefs(
+  props.chartConfig.option
+)
 const option = shallowReactive({
   value: cloneDeep(props.chartConfig.option)
 })
 
-const onClick = (v: any, s: boolean) => {
+const onClick = (v: any) => {
   useChartInteract(
     props.chartConfig,
     useChartEditStore,
     { [ComponentInteractParamsEnum.DATA]: v?.current },
     InteractEventOn.CHANGE,
-    v?.target,
-    s
   )
 }
 
 onMounted(() => {
-  onClick(option.value.dataset[0], false)
+  onClick(option.value.dataset[0])
 })
 
 // 手动更新
@@ -49,7 +53,7 @@ watch(
   () => props.chartConfig.option,
   (newData: any) => {
     option.value = newData
-    // onClick(newData.tabValue, true)
+    // onClick(newData.tabValue)
   },
   {
     immediate: true,
@@ -57,3 +61,10 @@ watch(
   }
 )
 </script>
+
+<style lang="scss" scoped>
+.button-text-color {
+  color: v-bind('buttonTextColor');
+  font-size: v-bind('`${buttonTextSize}px`');
+}
+</style>

@@ -94,7 +94,6 @@ const fileList = ref<UploadFileInfo[]>([])
 watch(
   () => props.optionData,
   newValue => {
-    console.log(newValue)
     fileList.value = newValue?.dataset
   },
   {
@@ -120,7 +119,6 @@ const beforeUploadHandle = async ({ file }) => {
 }
 
 const handleUploadChange = (data: { fileList: UploadFileInfo[] }) => {
-  console.log(data.fileList)
   props.optionData.dataset = data.fileList as never as any
 }
 
@@ -147,7 +145,6 @@ const customRequest = (options: UploadCustomRequestOptions) => {
           return item.status === 'finished'
         })
         fileList.value = fileArr
-        console.log(fileList.value)
         props.optionData.dataset = fileList.value as never as any
         window['$message'].success('添加图片成功！')
       }