|
|
@ -524,15 +524,15 @@ export default { |
|
|
fontUnderline: false, |
|
|
fontUnderline: false, |
|
|
}, |
|
|
}, |
|
|
onecode: { |
|
|
onecode: { |
|
|
width: 2, // 默认宽度2mm |
|
|
|
|
|
height: 15, // 默认高度15mm |
|
|
|
|
|
|
|
|
width: 0.5, // 默认宽度0.5mm |
|
|
|
|
|
height: 10, // 默认高度10mm |
|
|
data: '', |
|
|
data: '', |
|
|
barcodeType: 'CODE128', // 默认条码类型 |
|
|
barcodeType: 'CODE128', // 默认条码类型 |
|
|
showContent: true // 默认显示内容 |
|
|
showContent: true // 默认显示内容 |
|
|
}, |
|
|
}, |
|
|
qrcode: { |
|
|
qrcode: { |
|
|
width: 10, |
|
|
width: 10, |
|
|
height: 10, // 默认尺寸10mm |
|
|
|
|
|
|
|
|
height: 15, // 默认尺寸15mm |
|
|
data: '' |
|
|
data: '' |
|
|
}, |
|
|
}, |
|
|
pic: { |
|
|
pic: { |
|
|
@ -913,15 +913,15 @@ export default { |
|
|
// 处理字体变化 |
|
|
// 处理字体变化 |
|
|
handleFontChanged(fontData) { |
|
|
handleFontChanged(fontData) { |
|
|
console.log('LabelDesigner收到字体变化事件:', fontData) |
|
|
console.log('LabelDesigner收到字体变化事件:', fontData) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (fontData && fontData.elementId && this.selectedElement && this.selectedElement.id === fontData.elementId) { |
|
|
if (fontData && fontData.elementId && this.selectedElement && this.selectedElement.id === fontData.elementId) { |
|
|
// 确保字体值正确设置 |
|
|
// 确保字体值正确设置 |
|
|
this.$set(this.selectedElement, 'fontFamily', fontData.fontFamily) |
|
|
this.$set(this.selectedElement, 'fontFamily', fontData.fontFamily) |
|
|
console.log('字体已更新:', this.selectedElement.fontFamily) |
|
|
console.log('字体已更新:', this.selectedElement.fontFamily) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 强制更新画布 |
|
|
// 强制更新画布 |
|
|
this.canvasUpdateKey++ |
|
|
this.canvasUpdateKey++ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 触发ZPL预览更新 |
|
|
// 触发ZPL预览更新 |
|
|
this.$nextTick(() => { |
|
|
this.$nextTick(() => { |
|
|
this.$emit('font-updated', fontData) |
|
|
this.$emit('font-updated', fontData) |
|
|
|