diff --git a/src/views/print/index.vue b/src/views/print/index.vue index 5daa06e..0c50829 100644 --- a/src/views/print/index.vue +++ b/src/views/print/index.vue @@ -59,6 +59,7 @@ :panOnDrag="false" fit-view-on-init default-marker-color="#409EFF" + @selectionEnd="logEvent('selectionEnd', $event)" @dragover="onDragOver" @node-click="logEvent('click', $event)" @pane-click="logEvent('paneClick', $event)" @@ -185,10 +186,189 @@ /> + +
+
+
+
+
+
+
+
+
+
+
+ + + + + + +
+
+
+ +
+ + +
+ + + + + + +
+
+
+ +
+ + +
+ + + + + + +
+
+
+ +
+ + +
+ + + + + + +
+
+
+ +
+ + +
- diff --git a/src/views/print/nodes/selectNode.vue b/src/views/print/nodes/selectNode.vue index da70fc3..53c76af 100644 --- a/src/views/print/nodes/selectNode.vue +++ b/src/views/print/nodes/selectNode.vue @@ -5,7 +5,7 @@ :max-height="pageSize.height" color="#000" v-if="!props.isView && !props.isHideHandle && props.selected" />
+ :style="{...border(),textAlign:props.data.options.align,width:props.dimensions.width+'px',lineHeight:props.dimensions.height+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none'}">
@@ -92,6 +92,28 @@ watch(() => JSON.parse(JSON.stringify(props.data.options.default)), (obj1, obj2) } }, { deep: true, immediate: true }); +const border = () => { + let res = {}; + if (props.data.options.border) { + let top = props.data.options.border.find(e => e.type === 'top'); + let right = props.data.options.border.find(e => e.type === 'right'); + let bottom = props.data.options.border.find(e => e.type === 'bottom'); + let left = props.data.options.border.find(e => e.type === 'left'); + if (top.isShow) { + res['borderTop'] = `${top.width}px ${top.borderType} ${top.color}`; + } + if (right.isShow) { + res['borderRight'] = `${right.width}px ${right.borderType} ${right.color}`; + } + if (bottom.isShow) { + res['borderBottom'] = `${bottom.width}px ${bottom.borderType} ${bottom.color}`; + } + if (left.isShow) { + res['borderLeft'] = `${left.width}px ${left.borderType} ${left.color}`; + } + } + return res; +};