@zhangqingcq/vgce 0.1.30 → 0.1.32

package/package.json

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

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

@@ -105,6 +105,7 @@
 		}
 	}
 	const bindAnchor = (e: any, type: ELineBindAnchors) => {
+		e.stopPropagation()
 		if (globalStore.intention === EGlobalStoreIntention.None) {
 			createLine(e, type, props.itemInfo)
 			if (globalStore.handle_svg_info) {

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

@@ -67,7 +67,6 @@
 
 	const canZoom = computed(() => props.itemInfo.config.can_zoom)
 	const onHandleMouseDown = (type: EScaleInfoType, e: MouseEvent) => {
-		console.log('handMousedown', e)
 		const { clientX, clientY } = e
 		e.stopPropagation()
 		globalStore.intention = EGlobalStoreIntention.Zoom

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

@@ -45,6 +45,7 @@
 			data?: string
 			saveFile?: boolean
 			mqtt?: { cover: boolean; url: string; user: string; pwd: string; topics: string }
+			slotBackground?: boolean
 		}>(),
 		{
 			saveFile: false,
@@ -54,7 +55,8 @@
 				user: '',
 				pwd: '',
 				topics: ''
-			})
+			}),
+			slotBackground: false
 		}
 	)
 	const globalStore = useGlobalStore(pinia)
@@ -198,7 +200,7 @@
 					style="border-left: 1px solid #efefef"
 				>
 					<el-scrollbar class="el-scroll-pc">
-						<right-panel></right-panel>
+						<right-panel :slotBackground="props.slotBackground"></right-panel>
 					</el-scrollbar>
 				</el-aside>
 			</el-container>

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

@@ -38,6 +38,7 @@
 	const globalStore = useGlobalStore(pinia)
 	const svgEditLayoutStore = useSvgEditLayoutStore(pinia)
 
+	const props = defineProps<{ slotBackground: boolean }>()
 	const activeName = ref('page')
 	const activeNameB = ref('style')
 
@@ -117,7 +118,7 @@
 	<el-tabs class="mx-2 rightTabs" v-if="globalStore.intention != EGlobalStoreIntention.Select" v-model="activeName">
 		<el-tab-pane label="图纸" name="page">
 			<el-form label-width="60px" label-position="left">
-				<el-form-item label="背景色" size="small">
+				<el-form-item label="背景色" size="small" v-if="!props.slotBackground">
 					<el-color-picker v-model="configStore.svg.background_color" />
 				</el-form-item>
 				<el-form-item label="画布" size="small">

package/src/config/files/common-table.vue

@@ -1,48 +1,48 @@
-<script setup lang="ts">
-	import { ElTable, ElTableColumn } from 'element-plus'
-
-	const props = withDefaults(
-		defineProps<{
-			colConfig: ICol[]
-			data: any[]
-			height?: number
-			maxHeight?: number
-			stripe?: boolean
-			border?: boolean
-			size?: string
-			fit?: boolean
-			operateDisplay?: boolean
-			selectionData?: any[]
-		}>(),
-		{
-			colConfig: () => [],
-			data: () => [],
-			height: 200,
-			stripe: false,
-			border: false,
-			fit: false,
-			operateDisplay: false,
-			selectionData: () => []
-		}
-	)
-	const table_props = ref({})
-	watchEffect(() => {
-		const { colConfig, ...temp_props } = props
-		table_props.value = temp_props
-	})
-
-	interface ICol {
-		prop: string
-		label: string
-		width: string
-		fixed: string | boolean
-		sortable: boolean
-		'show-overflow-tooltip': boolean
-	}
-</script>
-
-<template>
-	<el-table v-bind="table_props">
-		<el-table-column v-for="item in props.colConfig" :key="item.prop" v-bind="item"></el-table-column>
-	</el-table>
-</template>
+<script setup lang="ts">
+	import { ElTable, ElTableColumn } from 'element-plus'
+
+	const props = withDefaults(
+		defineProps<{
+			colConfig: ICol[]
+			data: any[]
+			height?: number
+			maxHeight?: number
+			stripe?: boolean
+			border?: boolean
+			size?: string
+			fit?: boolean
+			operateDisplay?: boolean
+			selectionData?: any[]
+		}>(),
+		{
+			colConfig: () => [],
+			data: () => [],
+			height: 200,
+			stripe: false,
+			border: false,
+			fit: false,
+			operateDisplay: false,
+			selectionData: () => []
+		}
+	)
+	const table_props = ref({})
+	watchEffect(() => {
+		const { colConfig, ...temp_props } = props
+		table_props.value = temp_props
+	})
+
+	interface ICol {
+		prop: string
+		label: string
+		width: string
+		fixed: string | boolean
+		sortable: boolean
+		'show-overflow-tooltip': boolean
+	}
+</script>
+
+<template>
+	<el-table v-bind="table_props">
+		<el-table-column v-for="item in props.colConfig" :key="item.prop" v-bind="item"></el-table-column>
+	</el-table>
+</template>

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

@@ -18,25 +18,25 @@ const t: IConfigItem = {
 			type: EConfigItemPropsType.JsonEdit,
 			val: [
 				{
-					prop: 'date',
-					label: '第一列',
-					width: '120px',
+					prop: 'index',
+					label: '序号',
+					'min-width': '80',
 					fixed: false,
 					sortable: false,
 					'show-overflow-tooltip': false
 				},
 				{
 					prop: 'name',
-					label: '第二列',
-					width: '120px',
+					label: '名字',
+					'min-width': '120',
 					fixed: false,
 					sortable: false,
 					'show-overflow-tooltip': false
 				},
 				{
-					prop: 'address',
-					label: '第三列测试',
-					width: '280px',
+					prop: 'age',
+					label: '年龄',
+					'min-width': '80',
 					fixed: false,
 					sortable: false,
 					'show-overflow-tooltip': false
@@ -48,31 +48,31 @@ const t: IConfigItem = {
 			type: EConfigItemPropsType.JsonEdit,
 			val: [
 				{
-					date: '2016-05-03',
-					name: 'Tom',
-					address: 'No. 189, Grove St, Los Angeles'
+					index: '1',
+					name: 'Jack',
+					age: '34'
 				},
 				{
-					date: '2016-05-02',
-					name: 'Tom',
-					address: 'No. 189, Grove St, Los Angeles'
+					index: '2',
+					name: 'Marry',
+					age: '18'
 				},
 				{
-					date: '2016-05-04',
-					name: 'Tom',
-					address: 'No. 189, Grove St, Los Angeles'
+					index: '3',
+					name: 'Lee',
+					age: '23'
 				},
 				{
-					date: '2016-05-01',
-					name: 'Tom',
-					address: 'No. 189, Grove St, Los Angeles'
+					index: '4',
+					name: 'Steve',
+					age: '31'
 				}
 			]
 		},
 		width: {
 			title: '宽度',
 			type: EConfigItemPropsType.InputNumber,
-			val: 500
+			val: 280
 		},
 		height: {
 			title: '高度',

package/src/config/vue/echarts/pie-charts.ts

@@ -28,24 +28,24 @@ const t: IConfigItem = {
 			type: EConfigItemPropsType.JsonEdit,
 			val: [
 				{
-					value: 1048,
-					name: '办公楼A'
+					value: 998,
+					name: '20岁以下'
 				},
 				{
-					value: 735,
-					name: '办公楼B'
+					value: 546,
+					name: '20-40岁'
 				},
 				{
-					value: 580,
-					name: '保安室'
+					value: 354,
+					name: '40-60岁'
 				},
 				{
-					value: 484,
-					name: '地下车库'
+					value: 421,
+					name: '60-70岁'
 				},
 				{
-					value: 300,
-					name: '食堂'
+					value: 607,
+					name: '70岁以上'
 				}
 			]
 		}

package/src/stores/system/index.ts

@@ -29,7 +29,6 @@ export const useEditPrivateStore = defineStore('edit-private-store', {
 	},
 	actions: {
 		topUndoBtnClick() {
-			console.log('撤销')
 			if (this.history_now_index < 1) {
 				return
 			}
@@ -40,7 +39,6 @@ export const useEditPrivateStore = defineStore('edit-private-store', {
 			global_store.setDoneJson(this.history_doneComponent[this.history_now_index])
 		},
 		topRedoBtnClick() {
-			console.log('重做')
 			if (this.history_now_index + 1 == this.history_doneComponent.length) {
 				return
 			}