@zhangqingcq/vgce 0.1.28 → 0.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangqingcq/vgce",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Vector graphics configure editor. svg组态编辑器。基于vue3.3+ts+element-plus+vite",
   "publishConfig": {
     "access": "public"

package/src/components/svg-editor/center-panel.vue

@@ -11,15 +11,15 @@
 		getCenterPoint,
 		getCommonClass,
 		getSvgNowPosition,
+		getZoomPosition,
 		moveAnchors,
 		moveHandlePoint,
+		myFixed,
 		objectDeepClone,
 		prosToVBind,
 		randomString,
 		resetHandlePointOld,
-		setSvgActualInfo,
-		getZoomPosition,
-		myFixed
+		setSvgActualInfo
 	} from '@/utils'
 	import {
 		calculateBottom,
@@ -33,8 +33,7 @@
 	} from '@/utils/scale-core'
 	import HandlePanel from '@/components/svg-editor/handle-panel.vue'
 	import ConnectionPanel from '@/components/svg-editor/connection-panel.vue'
-	import type { IConfigItem } from '@/config/types'
-	import { EDoneJsonType } from '@/config/types'
+	import { EDoneJsonType, type IConfigItem } from '@/config/types'
 	import ConnectionLine from '@/components/svg-editor/connection-line.vue'
 	import type { IVisibleInfo } from '../config'
 	import { useContextMenuStore, useEditPrivateStore } from '@/stores/system'
@@ -207,11 +206,15 @@
 		canvasRef.value?.focus()
 		if (globalStore.intention === EGlobalStoreIntention.Connection) {
 			e.stopPropagation()
+			if (!globalStore.handle_svg_info) {
+				//空白地方画线
+				createLine(e)
+			}
 			if (globalStore.handle_svg_info) {
 				if (e.button === 0) {
 					//鼠标左键创建新线段
 					const l = globalStore.handle_svg_info.info.props.point_position.val
-					if (l.length > 1 && l[0].x !== l[1].x && l[0].y !== l[1].y) {
+					if (l.length !== 1 && select_item?.type !== EDoneJsonType.ConnectionLine) {
 						//鼠标移动后的实时位置（相对于起始点，只在创建第一个点时记录了鼠标原始位置）
 						l.push({
 							x:
@@ -223,6 +226,12 @@
 								globalStore.mouse_info.position_y -
 								svgEditLayoutStore.center_offset.y
 						})
+					} else {
+						//第二个点，在鼠标没有移动的情况下，就是起始点
+						globalStore.handle_svg_info.info.props.point_position.val.push({
+							x: 0,
+							y: 0
+						})
 					}
 				} else if (e.button === 2) {
 					//鼠标右键结束线段绘制

package/src/components/svg-editor/index.vue

@@ -142,6 +142,14 @@
 
 	onMounted(() => {
 		configStore.net.mqtt.useGlobalMqtt = Boolean(props.mqtt?.cover)
+		if (!configStore.net.mqtt.global) {
+			configStore.net.mqtt.global = {
+				url: '',
+				user: '',
+				pwd: '',
+				topics: ''
+			}
+		}
 		configStore.net.mqtt.global.url = props.mqtt?.url || ''
 		configStore.net.mqtt.global.user = props.mqtt?.user || ''
 		configStore.net.mqtt.global.pwd = props.mqtt?.pwd || ''

package/src/components/svg-editor/top-panel.vue

@@ -36,6 +36,11 @@
 		set(v: any) {
 			globalStore.intention = v ? EGlobalStoreIntention.Connection : EGlobalStoreIntention.None
 			if (v) {
+				globalStore.done_json.forEach((e: Record<string, any>) => {
+					if (e?.selected) {
+						e.selected = false
+					}
+				})
 				globalStore.setHandleSvgInfo(null)
 			}
 		}
@@ -157,16 +162,16 @@
 		<el-scrollbar max-height="60vh">
 			<div class="font-bold mb-10px text-15px guide-title" style="padding-top: 16px">多选</div>
 			<div
-				>在画布空白区域按住鼠标左键可以框选（图形中心点在框选区域即判定被选中），也可以按住ctrl+鼠标左键点图形进行多选</div
-			>
+				>在画布空白区域按住鼠标左键可以框选（图形中心点在框选区域即判定被选中），也可以按住ctrl+鼠标左键点图形进行多选
+			</div>
 			<div class="el-divider el-divider--horizontal" role="separator" style="--el-border-style: solid"></div>
 			<div class="font-bold mb-10px text-15px guide-title">拖动画布</div>
 			<div>在画布空白区域按住右键可拖动画布，右侧面板‘图纸’栏可微调或重置位置</div>
 			<div class="el-divider el-divider--horizontal" role="separator" style="--el-border-style: solid"></div>
 			<div class="font-bold mb-10px text-15px guide-title">画布缩放</div>
 			<div
-				>在画布中使用鼠标滚轮或者右侧面板‘图纸’栏可控制画布缩放，鼠标滚轮以鼠标位置为缩放中心，图纸栏以图纸原点（默认在左上角）为缩放中心</div
-			>
+				>在画布中使用鼠标滚轮或者右侧面板‘图纸’栏可控制画布缩放，鼠标滚轮以鼠标位置为缩放中心，图纸栏以图纸原点（默认在左上角）为缩放中心
+			</div>
 			<div class="el-divider el-divider--horizontal" role="separator" style="--el-border-style: solid"></div>
 			<div class="font-bold mb-10px text-15px guide-title">标尺辅助线</div>
 			<div>在标尺区域按住鼠标左键并拖动即可创建标尺辅助线，将标尺辅助线拖动到标尺区域即可删除标尺辅助线</div>