fix: zoom scaling

src/components/modules/layout/zoomControl/index.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: ShawnPhang
+ * @Date: 2024-06-20 15:01:39
+ * @Description: 缩放画板
+ * @LastEditors: ShawnPhang <https://m.palxp.cn>
+ * @LastEditTime: 2025-03-24 14:47:12
+-->
 <template>
   <div id="zoom-control">
     <ul v-show="show" class="zoom-selecter">
@@ -27,6 +34,7 @@ import { OtherList, TZoomData, ZoomList } from './data';
 import { useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useCanvasStore, useForceStore } from '@/store';
+import { findClosestNumber } from '@/utils/utils';
 
 const route = useRoute()
 
@@ -216,10 +224,12 @@ function sub() {
 function mousewheelZoom(down: boolean) {
   const value = Number(dZoom.value.toFixed(0))
   if (down && value <= 1) return
-  canvasStore.updateZoom(down ? value - 1 : value + 1)
+  canvasStore.updateZoom(down ? value - 2 : value + 2)
   zoom.value.text = (value + '%') as any
+  zoom.value.value = value
   autoFixTop()
-  activezoomIndex.value = -99
+  const closest = findClosestNumber(value, zoomList.value.map(x => x.value))
+  activezoomIndex.value = zoomList.value.findIndex(x => x.value === closest)
 }
 
 function nearZoom(add?: boolean) {

src/utils/utils.ts

@@ -3,42 +3,6 @@ export const config = app_config
 
 type TComObj = Record<string,any>
 
-/**
- * 星期换算
- * @param {String} 'YYYY-MM-DD'
- */
-// export const transformDate = (date: string) => {
-//   const weekDay = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
-//   const myDate = new Date(date.replace(/-/g, '/'))
-//   if (weekDay[myDate.getDay()]) {
-//     return weekDay[myDate.getDay()]
-//   } else {
-//     return ''
-//   }
-// }
-/**
- * 返回正确时间
- */
-// export const getDate = (date: string) => {
-//   const reDate = new Date(date.replace(/-/g, '/'))
-//   return reDate
-// }
-/**
- * 短日期
- */
-// export const getMinDate = (d: string, type: string) => {
-//   const mydate = new Date(d.replace(/-/g, '/'))
-//   if (isNaN(mydate.getDate())) {
-//     return d
-//   }
-//   if (type === 'ym') {
-//     return mydate.getFullYear() + ' - ' + (mydate.getMonth() + 1)
-//   } else if (type === 'md') {
-//     return mydate.getMonth() + 1 + '-' + mydate.getDate()
-//   } else {
-//     return String(mydate.getMonth() + 1).padStart(2, '0')
-//   }
-// }
 // 判断是否在数组中并返回下标
 export const isInArray = (arr: (string | number)[], value: (string | number)) => {
   const index = arr.indexOf(value)
@@ -65,48 +29,28 @@ export const pickSome = <R extends TComObj, T extends TComObj = TComObj>(obj: T,
   return newObj as R extends T ? R : Partial<T>
 }
 
-/** String长度 */
+/** 随机数 */
-// export const getBLen = (str: string | any) => {
-//   if (str === null) {
-//     return 0
-//   }
-//   return String(str).replace(/[^\x00-\xff]/g, '01').length
-// }
-/** 随机 */
 export const rndNum = (n: number, m: number) => {
   const random = Math.floor(Math.random() * (m - n + 1) + n)
   return random
 }
 
-/** Proxy 转 Object */
+/** 计算差值 */
-// export const proxyToObject = <P extends Record<string, any>>(proxy: P, seen = new WeakMap()): P => {
+export const findClosestNumber = (target: number, numbers: number[]) => {
-//   if (proxy === null || typeof proxy !== 'object') {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
-//     return proxy;
+    throw new Error('数组不能为空')
-//   }
+  }
-
+  let closestNumber = numbers[0]
-//   // 检查是否已经处理过该对象
+  let minDifference = Math.abs(target - closestNumber)
-//   if (seen.has(proxy)) {
+  for (let i = 1; i < numbers.length; i++) {
-//     return '[Circular Reference]' as any;
+    const currentNumber = numbers[i]
-//   }
+    const currentDifference = Math.abs(target - currentNumber)
-
+    if (currentDifference < minDifference) {
-//   let obj: Record<string, any>;
+      closestNumber = currentNumber
-
+      minDifference = currentDifference
-//   if (Array.isArray(proxy)) {
+    }
-//     obj = proxy.map(val => proxyToObject(val, seen)) as any;
+  }
-//   } else {
+  return closestNumber
-//     obj = {};
+}
-//     // 将当前对象添加到已处理对象集合
-//     seen.set(proxy, obj);
-//     for (const key in proxy) {
-//       if (Object.prototype.hasOwnProperty.call(proxy, key)) {
-//         const value = proxyToObject(proxy[key], seen);
-//         if (value !== '[Circular Reference]') {
-//           obj[key] = value;
-//         }
-//       }
-//     }
-//   }
-//   return obj as P;
-// };
 
 export default {}