Merge branch 'v1.9.0' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0

src/api/setup.ts

@@ -132,7 +132,7 @@ export const axiosFactory = () => {
         hook.before && hook.before(config)
       }
 
-      console.log(axiosConfig.unTokenSet)
+      // console.log(axiosConfig.unTokenSet)
       if (!matchURL(axiosConfig.unTokenSet, config)) {
         if (!axiosConfig.token) {
           if (!offline && !matchURL(axiosConfig.unReqErrorSet, config)) {

src/components/static-preview/resource.vue

@@ -42,7 +42,7 @@ const url = computed(() =>
     ? getResource(props.data)
     : URL.createObjectURL(props.data)
 );
-
+console.log(`./xfile-viewer/index.html?file=${url}&time=${Date.now()}`, 9999)
 const type = computed(() => {
   if (props.type) {
     return props.type;

src/layout/edit/scene-edit.vue

@@ -26,6 +26,7 @@ import { asyncTimeout } from "@/utils";
 const loaded = ref(false);
 const initialSys = async () => {
   await Promise.all([initialFuseModels(), initialScenes()]);
+  console.log(fuseModel, 777777)
   await loadModel(fuseModel);
   await asyncTimeout(1000);
   loaded.value = true;

src/model/index.ts

@@ -23,7 +23,7 @@ export const getModelTypeDesc = (model: ModelType) => {
   }
 }
 export const getModelDesc = (model: ModelType) => {
-  console.log(model)
+  console.log(model, 66666)
   if (model === fuseModel) {
     return '融合场景'
   } else {

src/store/floder-type.ts

@@ -12,7 +12,7 @@ export const getFloderType = (id: FloderType["filesTypeId"]) =>
 export const initialFloderTypes = async () => {
   const floders = await fetchFloders();
   floderTypes.value = await fetchFloderTypes();
-  console.log(floders,floderTypes.value,898989)
+  // console.log(floders,floderTypes.value,898989)
 };
 
 export type FloderRoot = {
@@ -67,7 +67,7 @@ export const getLevelRoot = (floder: Floder, roots = floderRoots.value): FloderR
 }
 
 export const getFlatFloders = (root: FloderRoot, floders: FloderRoot['floders'] = []) => {
-  console.log(root, 99999)
+  // console.log(root, 99999)
   floders.push(...root.floders)
   if (root.children?.length) {
     root.children.forEach(child => getFlatFloders(child, floders))

src/utils/meta.ts

@@ -7,10 +7,10 @@ export enum MetaType {
 }
 
 export const metaTypeExtnames = {
-  [MetaType.image]: ['bmp', 'jpg', 'jpeg', 'png', 'tif', 'gif', 'pcx', 'tga', 'exif', 'fpx', 'svg', 'psd', 'cdr', 'pcd', 'dxf', 'ufo', 'eps', 'ai', 'raw', 'WMF', 'webp', 'avif', 'apng'],
+  [MetaType.image]: ['bmp', 'jpg', 'jpeg', 'png', 'tif', 'gif', 'pcx', 'tga', 'exif', 'fpx', 'svg', 'psd', 'cdr', 'pcd', 'dxf', 'ufo', 'eps', 'ai', 'WMF', 'webp', 'avif', 'apng'],
   [MetaType.audio]: ['mp3'],
   [MetaType.video]: ['wmv', 'asf', 'asx', 'rm', 'rmvb', 'mp4', '3gp', 'mov', 'm4v', 'avi', 'dat', 'mkv', 'flv', 'vob'],
-  [MetaType.xfile]: [".raw", ".dcm"]
+  [MetaType.xfile]: [".raw", "raw", "dcm", ".dcm"]
 }
 
 export const getExtname = (url: string) => {

src/views/folder/floder-view.vue

@@ -94,7 +94,7 @@ const children = computed(() => {
 const showChildren = ref(props.root.modal ? false : true);
 watchEffect(() => {
   if (showChildren.value) {
-    console.log(toRaw(props.root));
+    // console.log(toRaw(props.root));
   }
 });
 </script>

src/views/folder/modal-floder-view.vue

@@ -81,6 +81,7 @@ const floders = computed(() => {
     return props.root.floders;
   }
 });
+console.log(floders, 9898);
 const children = computed(() => {
   if (props.root.flat) {
     return [];

src/views/setting/index.vue

@@ -11,7 +11,7 @@
 
     <ui-group title="设置天空">
       <ui-group-option>
-        <selectBack :value="[setting?.back, setting?.mapId]" @update:value="changeBack" />
+        <selectBack :value="setting?.back || setting?.mapId ? [setting?.back, setting?.mapId] : ['dt', 1]" @update:value="changeBack" />
       </ui-group-option>
     </ui-group>
   </RightFillPano>

src/views/setting/select-back.vue

@@ -101,9 +101,9 @@ const backs = computed(() => [
 // 添加默认选中逻辑
 onMounted(() => {
   // 如果没有获取到默认值（value[0]和value[1]都为空），则默认选中"无"选项
-  if (!props.value[0] && !props.value[1]) {
-    emit("update:value", ["dt", 1]);
-  }
+  // if (!props.value[0] && !props.value[1]) {
+  //   emit("update:value", ["dt", 1]);
+  // }
 });
 
 const activeParent = computed(() => {