@zhangqingcq/vgce 0.1.5 → 0.1.6

package/package.json

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

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

@@ -1005,9 +1005,9 @@
 							<use
 								v-else-if="item.type === EDoneJsonType.File"
 								:xlink:href="`#svg-${item.name}`"
-								v-bind="prosToVBind(item)"
-								width="100"
-								height="100"
+								v-bind="prosToVBind(item, ['height', 'width'])"
+								:width="item.props?.width?.val ?? 100"
+								:height="item.props?.height?.val ?? 100"
 								:id="item.id"
 								:transform="`translate(${item.actual_bound.x + item.actual_bound.width / 2},${
 									item.actual_bound.y + item.actual_bound.height / 2
@@ -1019,9 +1019,9 @@
 							<component
 								v-else-if="item.type === EDoneJsonType.CustomSvg"
 								:is="item.tag"
-								v-bind="prosToVBind(item)"
-								width="100"
-								height="100"
+								v-bind="prosToVBind(item, ['height', 'width'])"
+								:width="item.props?.width?.val ?? 100"
+								:height="item.props?.height?.val ?? 100"
 								:id="item.id"
 								@resize="resizeBox"
 								:transform="`translate(${item.actual_bound.x + item.actual_bound.width / 2},${

package/src/components/svg-viewer.vue

@@ -318,9 +318,9 @@
 							<use
 								v-else-if="item.type === EDoneJsonType.File"
 								:xlink:href="`#svg-${item.name}`"
-								v-bind="prosToVBind(item)"
-								width="100"
-								height="100"
+								v-bind="prosToVBind(item, ['height', 'width'])"
+								:width="item.props?.width?.val ?? 100"
+								:height="item.props?.height?.val ?? 100"
 								:id="item.id"
 								:transform="`translate(${item.actual_bound.x + item.actual_bound.width / 2},${
 									item.actual_bound.y + item.actual_bound.height / 2
@@ -332,9 +332,9 @@
 							<component
 								v-else-if="item.type === EDoneJsonType.CustomSvg"
 								:is="item.tag"
-								v-bind="prosToVBind(item)"
-								width="100"
-								height="100"
+								v-bind="prosToVBind(item, ['height', 'width'])"
+								:width="item.props?.width?.val ?? 100"
+								:height="item.props?.height?.val ?? 100"
 								:id="item.id"
 								@on-change="eventHandle(item, EEventType.Change)"
 								:transform="`translate(${item.actual_bound.x + item.actual_bound.width / 2},${

package/src/config/files/light-a.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
-	const props = withDefaults(defineProps<{ id: string; isOpen: boolean }>(), {
+	const props = withDefaults(defineProps<{ id: string; isOpen: boolean; height?: number; width?: number }>(), {
 		id: '',
-		isOpen: false
+		isOpen: false,
+		height: 100,
+		width: 100
 	})
 
 	const emit = defineEmits(['onChange'])
@@ -65,6 +67,6 @@
 				fill="#CEEFF6"
 			/>
 		</symbol>
-		<use :xlink:href="`#${props.id}light-121`" width="100" height="100" />
+		<use :xlink:href="`#${props.id}light-121`" :width="width" :height="height" />
 	</g>
 </template>

package/src/config/svg/animation/thermometer.ts

@@ -1,4 +1,4 @@
-import { EConfigItemPropsType, EDoneJsonType } from '@/config/types'
+import { EDoneJsonType } from '@/config/types'
 import type { IConfigItem } from '@/config/types'
 export const thermometer: IConfigItem = {
 	name: 'thermometer',

package/src/config/svg/custom/clock-a.ts

@@ -49,7 +49,7 @@ export const clock_a: IConfigItem = {
 			val: '#ffffff'
 		},
 		borderColor: {
-			title: '裱框颜色',
+			title: '表框颜色',
 			type: EConfigItemPropsType.Color,
 			val: '#B3A7FF'
 		}

package/src/config/svg/custom/light.ts

@@ -13,6 +13,16 @@ export const light_a: IConfigItem = {
 	},
 	display: true,
 	props: {
+		height: {
+			title: '高度',
+			type: EConfigItemPropsType.InputNumber,
+			val: 60
+		},
+		width: {
+			title: '宽度',
+			type: EConfigItemPropsType.InputNumber,
+			val: 50
+		},
 		isOpen: {
 			title: '开关',
 			type: EConfigItemPropsType.Switch,

package/src/config/svg/stateless/bot-2.ts

@@ -1,4 +1,4 @@
-import { EDoneJsonType } from '@/config/types'
+import { EConfigItemPropsType, EDoneJsonType } from '@/config/types'
 import type { IConfigItem } from '@/config/types'
 
 export const svg_bot_2: IConfigItem = {
@@ -11,7 +11,18 @@ export const svg_bot_2: IConfigItem = {
 		have_anchor: true,
 		actual_rect: true
 	},
-	props: {},
+	props: {
+		height: {
+			title: '高度',
+			type: EConfigItemPropsType.InputNumber,
+			val: 150
+		},
+		width: {
+			title: '宽度',
+			type: EConfigItemPropsType.InputNumber,
+			val: 120
+		}
+	},
 	common_animations: {
 		val: '',
 		delay: 'delay-0s',

package/src/utils/mqtt-net.ts

@@ -3,7 +3,7 @@ import type { MqttClient, PacketCallback } from 'mqtt'
 
 let client: MqttClient
 
-export const sub = (url: string, user: string, pwd: string, topics: string, callback: Function) => {
+export const sub = (url: string, user: string, pwd: string, topics: string, callback: any) => {
 	const _url = url.trim()
 	if (!/^wss?:\/\/.*$/.test(_url)) {
 		console.error('编辑器MQTT通信只支持ws协议 (url必须以"ws://"开头)')