Merge branch 'dev' of https://github.com/zouyaoji/vue-cesium into dev

zouyaoji · Dec 27, 2023 · f375892 · f375892
2 parents d12d7be + 2b751ba
commit f375892
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 15 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,5 +1,22 @@
 ## Changelog
 
+### 3.2.5
+
+_2023-12-23_
+
+#### Bug fixes
+
+  - The browser crash issue occurs when using `ref` or `reactive` to wrap the `hierarchy` prop in the `vc-graphics-polygon` component.
+  - In native Cesium, there is an error when loading SuperMap iServer map services using `vc-provider-imagery-supermap`.
+
+### 3.2.4
+
+_2023-10-23_
+
+#### Bug fixes
+
+  - The npm release for version 3.2.3 has an error. 
+
 ### 3.2.3
 
 _2023-10-23_

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,5 +1,32 @@
 ## 更新日志
 
+### 3.2.5
+
+_2023-12-23_
+
+#### Bug 修复
+
+-  `vc-graphics-polygon` 组件使用 ref、reactive 包裹 hierarchy 参数后浏览器崩溃问题。
+-  原生 Cesium 下 `vc-provider-imagery-supermap`加载超图 iserver 的地图服务报错问题。
+
+### 3.2.4
+
+_2023-10-23_
+
+#### Bug 修复
+
+  - 3.2.3 npm 发布错误，用3.2.4代替。
+
+### 3.2.3
+
+_2023-10-23_
+
+#### Bug 修复
+
+- `vc-imagery-provider-supermap` 组件在引入超图平台报错的问题。
+- `vc-primitive-tileset` 组件传参与官方文档不一致的问题。
+- `vc-collection-primitive` 组件未转发官方新增事件的问题。
+
 ### 3.2.3
 
 _2023-10-23_

diff --git a/packages/components/providers/supermap/SuperMapImageryProvider.ts b/packages/components/providers/supermap/SuperMapImageryProvider.ts
@@ -277,20 +277,16 @@ function buildImageResource(this, x, y, level) {
 }
 
 async function init(this) {
-  console.log('ada')
   const { Resource } = Cesium
   if (this.isTileMap) {
-    const promise = Resource.fetchJsonp({
-      url: this._options.url + '.jsonp',
-      queryParameters: {
-        f: 'json'
-      }
-    })
-
     try {
-      promise.then(e => {
-        onFulfilledTileMap.call(this, e)
+      const res = await Resource.fetchJsonp({
+        url: this._options.url + '.jsonp',
+        queryParameters: {
+          f: 'json'
+        }
       })
+      onFulfilledTileMap.call(this, res)
     } catch (e) {
       onRejected.call(this)
     }
@@ -300,7 +296,6 @@ async function init(this) {
       const e = await Resource.fetchText({
         url: this.url + 'config'
       })
-      console.log('ada')
       onFulfilledRest3D.call(this, e)
     } catch (e) {
       onRejected.call(this)

diff --git a/packages/composables/use-drawing/use-drawing-fab.ts b/packages/composables/use-drawing/use-drawing-fab.ts
@@ -1,10 +1,10 @@
 /*
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-10-13 09:45:59
- * @LastEditTime: 2023-03-13 17:52:59
+ * @LastEditTime: 2023-12-06 00:13:43
  * @LastEditors: zouyaoji 370681295@qq.com
  * @Description:
- * @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-fab.ts
+ * @FilePath: \vue-cesium\packages\composables\use-drawing\use-drawing-fab.ts
  */
 import { VcCollectionPrimitive } from '@vue-cesium/components/primitive-collections'
 import type { VcFabProps, VcFabRef } from '@vue-cesium/components/ui'
@@ -169,6 +169,11 @@ export default function (
             return Cartesian3.clone(position, result)
           }
         }
+      } else {
+        position = scene.pickPosition(windowPosition, cartesianScratch)
+        if (defined(position)) {
+          return Cartesian3.clone(position, result)
+        }
       }
     }
     if (defined(scene.globe)) {

diff --git a/packages/shared/extends/materials/MaterialExtend.ts b/packages/shared/extends/materials/MaterialExtend.ts
@@ -3,7 +3,7 @@
  * @Date: 2023-08-18 00:56:13
  * @Description: Do not edit
  * @LastEditors: zouyaoji 370681295@qq.com
- * @LastEditTime: 2023-10-31 22:33:58
+ * @LastEditTime: 2023-12-06 15:54:24
  * @FilePath: \vue-cesium\packages\shared\extends\materials\MaterialExtend.ts
  */
 
@@ -12,7 +12,6 @@ import { VcCircleWaveMaterial, VcLineFlowMaterial } from '@vue-cesium/shared/sha
 let isExtended = false
 export default class MaterialExtend {
   static extend(viewer: Cesium.Viewer) {
-    console.log('asdf', viewer)
     if (isExtended) {
       return
     }