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

zouyaoji · Jan 4, 2024 · c307638 · c307638
2 parents 7beb69d + 2170235
commit c307638
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 28 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -2,12 +2,13 @@
 
 ### 3.2.5
 
-_2023-12-23_
+_2023-12-27_
 
 #### 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`.
+  - Fixed the issue of consecutive mouse clicks not taking effect in the `vc-navigation-sm` component. **[Removed the functionality of double-clicking the outer dial to realign with the north direction]**
 
 ### 3.2.4
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -2,12 +2,13 @@
 
 ### 3.2.5
 
-_2023-12-23_
+_2023-12-27_
 
 #### Bug 修复
 
 -  `vc-graphics-polygon` 组件使用 ref、reactive 包裹 hierarchy 参数后浏览器崩溃问题。
 -  原生 Cesium 下 `vc-provider-imagery-supermap`加载超图 iserver 的地图服务报错问题。
+- `vc-navigation-sm` 组件四个方向按钮连续点击不生效的问题。**【去掉了双击外圆盘回正北的功能】**
 
 ### 3.2.4
 

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 <!--
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-09-03 16:57:27
- * @LastEditTime: 2023-08-01 11:14:52
- * @LastEditors: zouyaoji 370681295@qq.com
+ * @LastEditTime: 2023-12-13 10:33:36
+ * @LastEditors: ly
  * @Description:
- * @FilePath: \vue-cesium@next\README.md
+ * @FilePath: \vue-cesium\README.md
 -->
 <p align="center">
   <img width="256px" src="https://zouyaoji.top/vue-cesium/images/vue-cesium-logo.svg">
@@ -75,6 +75,7 @@ the project will install all dependencies.
 With command
 
 ```bash
+$ pnpm gen:version
 $ pnpm website-dev
 ```
 

diff --git a/README.zh.md b/README.zh.md
@@ -1,10 +1,10 @@
 <!--
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-04-29 16:12:05
- * @LastEditTime: 2023-08-01 11:05:07
- * @LastEditors: zouyaoji 370681295@qq.com
+ * @LastEditTime: 2023-12-27 10:28:42
+ * @LastEditors: ly
  * @Description:
- * @FilePath: \vue-cesium@next\README.zh.md
+ * @FilePath: \vue-cesium\README.zh.md
 -->
 <p align="center">
   <img width="256px" src="https://zouyaoji.top/vue-cesium/images/vue-cesium-logo.svg">
@@ -77,6 +77,7 @@ $ pnpm i
 命令
 
 ```bash
+$ pnpm gen:version
 $ pnpm website-dev
 ```
 

diff --git a/packages/components/controls/navigation-sm/compass-sm.ts b/packages/components/controls/navigation-sm/compass-sm.ts
@@ -189,18 +189,18 @@ export default defineComponent({
               ref: outerRingRef,
               class: 'vc-compass-outer-ring-sm',
               style: outerRingStyle.value
-            },
-            props.tooltip
-              ? h(
-                  VcTooltip,
-                  {
-                    ref: compassState.tooltipRef,
-                    ...props.tooltip,
-                    onBeforeShow: compassState.onTooltipBeforeShow
-                  },
-                  () => h('strong', {}, (props.tooltip as any).tip || t('vc.navigationSm.compass.outerTip'))
-                )
-              : createCommentVNode('v-if')
+            }
+            // props.tooltip
+            //   ? h(
+            //       VcTooltip,
+            //       {
+            //         ref: compassState.tooltipRef,
+            //         ...props.tooltip,
+            //         onBeforeShow: compassState.onTooltipBeforeShow
+            //       },
+            //       () => h('strong', {}, (props.tooltip as any).tip || t('vc.navigationSm.compass.outerTip'))
+            //     )
+            //   : createCommentVNode('v-if')
           )
         )
         children.push(
@@ -234,7 +234,7 @@ export default defineComponent({
             ref: rootRef,
             class: 'vc-compass-sm ' + positionState.classes.value,
             style: rootStyle,
-            onDblclick: compassState.handleDoubleClick,
+            // onDblclick: compassState.handleDoubleClick,
             onMousedown: compassState.handleMouseDown,
             onMouseup: compassState.handleMouseUp,
             onTouchend: compassState.handleMouseUp,

diff --git a/packages/components/controls/navigation-sm/use-compass.ts b/packages/components/controls/navigation-sm/use-compass.ts
@@ -220,9 +220,9 @@ export default function (props, { emit }, vcInstance: VcComponentInternalInstanc
     const scene = vcInstance.viewer.scene
     const sscc = scene.screenSpaceCameraController
     // do not orbit if it is disabled
-    if (scene.mode === SceneMode.MORPHING || !sscc.enableInputs) {
-      return
-    }
+    // if (scene.mode === SceneMode.MORPHING || !sscc.enableInputs) {
+    //   return
+    // }
 
     switch (scene.mode) {
       case SceneMode.COLUMBUS_VIEW:

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
     }