@zhangqingcq/vgce 0.0.29 → 0.0.31

package/package.json

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

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

@@ -16,7 +16,8 @@
 		prosToVBind,
 		randomString,
 		resetHandlePointOld,
-		setSvgActualInfo
+		setSvgActualInfo,
+		stopEvent
 	} from '@/utils'
 	import {
 		calculateBottom,
@@ -982,6 +983,7 @@
 					:key="item.id"
 					:transform="`translate(${item.x},${item.y})rotate(0)scale(1)`"
 					v-show="item.display"
+					@mousewheel="stopEvent"
 				>
 					<g :class="`${getCommonClass(item)}`">
 						<g

package/src/components/svg-viewer.vue

@@ -3,7 +3,7 @@
 	import { useGlobalStore } from '@/stores/global'
 	import { EGlobalStoreIntention, EMouseInfoState } from '@/stores/global/types'
 	import type { IDoneJson } from '@/stores/global/types'
-	import { getCommonClass, prosToVBind, setArrItemByID, valFormat } from '@/utils'
+	import { getCommonClass, prosToVBind, setArrItemByID, stopEvent, valFormat } from '@/utils'
 
 	import { EDoneJsonType, EEventAction, EEventType } from '@/config/types'
 	import ConnectionLine from '@/components/svg-editor/connection-line.vue'
@@ -152,6 +152,7 @@
 		return { cursor: t ? 'pointer' : 'default' }
 	}
 	const eventHandle = (root: IDoneJson, type: EEventType) => {
+		console.log(root.events, type)
 		if (root.events?.length > 0) {
 			for (let e of root.events) {
 				if (e.type === type) {
@@ -174,7 +175,7 @@
 						if (e.attrs && e.attrs.length > 0) {
 							let t
 							if (e.target) {
-								for (let item of globalStore.done_json) {
+								for (let item of preview_data.done_json) {
 									if (item.id === e.target) {
 										t = item
 										break
@@ -225,12 +226,6 @@
 		}
 	}
 
-	onMounted(() => {
-		connectNet()
-	})
-
-	onBeforeUnmount(close)
-
 	const connectNet = () => {
 		const m = preview_data.config.net.mqtt
 		if (m && m.url && m.user && m.pwd && m.topics) {
@@ -246,6 +241,12 @@
 		}
 	}
 
+	onMounted(() => {
+		connectNet()
+	})
+
+	onBeforeUnmount(close)
+
 	defineExpose({
 		setNodeAttrByID
 	})
@@ -277,6 +278,10 @@
 					v-show="item.display"
 					:style="getStyle(item)"
 					@click="eventHandle(item, EEventType.Click)"
+					@mousedown="stopEvent"
+					@mousemove="stopEvent"
+					@mouseup="stopEvent"
+					@mousewheel="stopEvent"
 				>
 					<g :class="`${getCommonClass(item)}`">
 						<g

package/src/config/types.ts

@@ -1,15 +1,7 @@
-/**
- * 组件分组数据格式
- * @property {string} groupType 组件分组类型
- * @property {string} title 组件分组标题
- * @property {Array} list 分组包含的组件项列表
- * @export
- * @interface IConfigComponentGroup
- */
 export interface IConfigComponentGroup {
-	groupType: string
-	title: string
-	list: Array<IConfigItem>
+	groupType: string //组件分组类型
+	title: string //组件分组标题
+	list: Array<IConfigItem> //分组包含的组件项列表
 }
 
 export type IConfig = IConfigComponentGroup[]

package/src/config/vue/component/common-table.ts

@@ -79,6 +79,11 @@ export const common_table: IConfigItem = {
 			type: EConfigItemPropsType.InputNumber,
 			val: 200
 		},
+		maxHeight: {
+			title: '最大高度',
+			type: EConfigItemPropsType.InputNumber,
+			val: 200
+		},
 		stripe: {
 			title: '斑马纹',
 			type: EConfigItemPropsType.Switch,

package/src/stores/system/index.ts

@@ -99,7 +99,7 @@ export const useContextMenuStore = defineStore('context-menu-store', {
 			switch (type) {
 				case EContextMenuInfoType.Copy:
 					const temp_item = objectDeepClone<IDoneJson>(globalStore.handle_svg_info.info)
-					temp_item.id = temp_item.name + randomString()
+					temp_item.id = randomString()
 					temp_item.title += '-copy'
 					temp_item.x += 10
 					temp_item.y += 10

package/src/utils/index.ts

@@ -11,6 +11,10 @@ import { useConfigStore } from '@/stores/config'
 import { useSvgEditLayoutStore } from '@/stores/svg-edit-layout'
 import { kebabCase } from 'lodash-es'
 
+export const stopEvent = (e: any) => {
+	e.stopPropagation()
+}
+
 /**
  * 生成随机字符串
  * @param len 生成个数
@@ -471,7 +475,7 @@ export const createLine = (e: MouseEvent, type?: ELineBindAnchors, itemInfo?: ID
 		)
 	}
 	const done_item_json = {
-		id: straight_line_system.name + randomString(),
+		id: randomString(),
 		x: x,
 		y: y,
 		client: {