Merge branch 'fix/editor/10-17/2024' into 'main_dev'

perf(src/packages): 修改获取域名方式

See merge request yunteng/thingskit-view!292

-let threeFilePath = ''
+const { host, protocol } = location
 
 
-const VITE_GLOB_PROXY = import.meta.env.VITE_GLOB_PROXY
+let threeFilePath = `${protocol}//${host}`
 
 
-const VITE_GLOB_API_URL_PREFIX = import.meta.env.VITE_GLOB_API_URL_PREFIX
+const VITE_GLOB_API_URL = import.meta.env.VITE_GLOB_API_URL
 
 
-try {
-  const getViteGlobProxy= Array.isArray(JSON.parse(VITE_GLOB_PROXY)) ? JSON.parse(VITE_GLOB_PROXY)[0][1] : VITE_GLOB_PROXY
-  threeFilePath = getViteGlobProxy
-} catch {
-  // 生产环境是字符串，json parse 报错，直接等于字符串即可
-  threeFilePath = getViteGlobProxy
-}
+const VITE_GLOB_API_URL_PREFIX = import.meta.env.VITE_GLOB_API_URL_PREFIX
 
 
-export const BASE_URL = `${threeFilePath}${VITE_GLOB_API_URL_PREFIX}`
+export const BASE_URL = `${threeFilePath}${VITE_GLOB_API_URL}${VITE_GLOB_API_URL_PREFIX}`

@@ -115,16 +115,10 @@ watch(
         page: 1,
         page: 1,
         pageSize: 999999
         pageSize: 999999
       })
       })
-      let threeFilePath = ''
-      const VITE_GLOB_PROXY: [string, string][] | string = import.meta.env.VITE_GLOB_PROXY
+      const { host, protocol } = location
+      let threeFilePath = `${protocol}//${host}`
+      const VITE_GLOB_API_URL = import.meta.env.VITE_GLOB_API_URL
       const VITE_GLOB_API_URL_PREFIX = import.meta.env.VITE_GLOB_API_URL_PREFIX
       const VITE_GLOB_API_URL_PREFIX = import.meta.env.VITE_GLOB_API_URL_PREFIX
-      try {
-        const getViteGlobProxy = isArray(JSON.parse(VITE_GLOB_PROXY as unknown as string)) ? JSON.parse(VITE_GLOB_PROXY as unknown as string)[0][1] : VITE_GLOB_PROXY
-        threeFilePath = getViteGlobProxy
-      } catch {
-        // 生产环境是字符串，json parse 报错，直接等于字符串即可
-        threeFilePath = VITE_GLOB_PROXY as unknown as string
-      }
       threeJsModels.value = items
       threeJsModels.value = items
         ?.filter(filterItem => filterItem.state === 1)
         ?.filter(filterItem => filterItem.state === 1)
         ?.map((modelItem: ChartType) => {
         ?.map((modelItem: ChartType) => {
@@ -141,7 +135,7 @@ watch(
             redirectComponent: 'Decorates/Three/Loader',
             redirectComponent: 'Decorates/Three/Loader',
             isThreeModel: true,
             isThreeModel: true,
             threeModelContent: modelItem.content,
             threeModelContent: modelItem.content,
-            threeModelFilePath: `${threeFilePath}${VITE_GLOB_API_URL_PREFIX}/3d_component/json/${modelItem.id}/scene.json`
+            threeModelFilePath: `${threeFilePath}${VITE_GLOB_API_URL}${VITE_GLOB_API_URL_PREFIX}/3d_component/json/${modelItem.id}/scene.json`
           }
           }
         })
         })
     }
     }