@gct-paas/core-web 0.1.6-dev.37 → 0.1.6-dev.38

package/es/components/label-design/components/widgets/QrCode.vue_vue_type_script_setup_true_name_QR_CODE_lang.mjs

@@ -1,6 +1,7 @@
 import qrcode_default from "./images/qrcode.png.mjs";
 import gs1datamatrix_default from "./images/gs1datamatrix.png.mjs";
-import { createElementBlock, defineComponent, normalizeStyle, openBlock, ref } from "vue";
+import { createCommentVNode, createElementBlock, createElementVNode, defineComponent, nextTick, normalizeStyle, onMounted, openBlock, ref, vShow, watch, withDirectives } from "vue";
+import bwipjs from "bwip-js";
 //#region src/components/label-design/components/widgets/QrCode.vue?vue&type=script&setup=true&name=QR_CODE&lang.ts
 var _hoisted_1 = { class: "p-qrcode" };
 var QrCode_vue_vue_type_script_setup_true_name_QR_CODE_lang_default = /* @__PURE__ */ defineComponent({
@@ -13,10 +14,87 @@ var QrCode_vue_vue_type_script_setup_true_name_QR_CODE_lang_default = /* @__PURE
 		type: {
 			type: Object,
 			default: () => ({ value: "QR_CODE" })
+		},
+		content: {
+			type: Object,
+			default: () => ({
+				type: "text",
+				val: "QR Code Text",
+				var: ""
+			})
+		},
+		rowHeight: {
+			type: Object,
+			default: () => ({ val: 3 })
+		},
+		rows: {
+			type: Object,
+			default: () => ({ val: null })
+		},
+		columns: {
+			type: Object,
+			default: () => ({ val: null })
 		}
 	},
-	setup(__props) {
+	emits: ["qrcodeChange"],
+	setup(__props, { emit: __emit }) {
+		const props = __props;
+		const emit = __emit;
 		const style = ref();
+		const canvasRef = ref();
+		watch(() => [
+			props.type.value,
+			props.content.value,
+			props.rows.value,
+			props.columns.value,
+			props.rowHeight.value
+		], () => {
+			createQrcode();
+		});
+		onMounted(() => {
+			createQrcode();
+		});
+		async function createQrcode() {
+			if (props.type.value !== "PDF_417") return;
+			await nextTick();
+			const canvas = canvasRef.value;
+			if (!canvas) return;
+			const content = props.content.value || "PDF417 Text";
+			try {
+				bwipjs.toCanvas(canvas, {
+					bcid: "pdf417",
+					text: content,
+					scale: 1,
+					rowmult: props.rowHeight.value ?? 3,
+					rows: props.rows.value ?? 0,
+					columns: props.columns.value ?? 0,
+					eclevel: 4,
+					paddingwidth: 2,
+					paddingheight: 1
+				});
+				syncCanvasDisplaySize();
+				await nextTick();
+				notifySizeChange();
+			} catch (err) {
+				console.warn(err);
+			}
+		}
+		/** 按 canvas 实际像素尺寸展示，避免被旧容器拉伸 */
+		function syncCanvasDisplaySize() {
+			const canvas = canvasRef.value;
+			if (!canvas) return;
+			canvas.style.width = `${canvas.width}px`;
+			canvas.style.height = `${canvas.height}px`;
+		}
+		/** canvas 无 load 事件，绘制完成后主动同步外层元素尺寸 */
+		function notifySizeChange() {
+			const canvas = canvasRef.value;
+			if (!canvas) return;
+			emit("qrcodeChange", {
+				width: canvas.width,
+				height: canvas.height
+			});
+		}
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [__props.type.value == "QR_CODE" ? (openBlock(), createElementBlock("img", {
 				key: 0,
@@ -24,13 +102,17 @@ var QrCode_vue_vue_type_script_setup_true_name_QR_CODE_lang_default = /* @__PURE
 				alt: "qrcode",
 				class: "p-img-element",
 				style: normalizeStyle(style.value)
-			}, null, 4)) : (openBlock(), createElementBlock("img", {
+			}, null, 4)) : __props.type.value == "GS1_DATA_MATRIX" ? (openBlock(), createElementBlock("img", {
 				key: 1,
 				src: gs1datamatrix_default,
 				alt: "gs1datamatrix",
 				class: "p-img-element",
 				style: normalizeStyle(style.value)
-			}, null, 4))]);
+			}, null, 4)) : createCommentVNode("", true), withDirectives(createElementVNode("canvas", {
+				ref_key: "canvasRef",
+				ref: canvasRef,
+				class: "p-pdf417-canvas"
+			}, null, 512), [[vShow, __props.type.value == "PDF_417"]])]);
 		};
 	}
 });

package/es/components/label-design/components/widgets/QrCode.vue_vue_type_style_index_0_scoped_2fb36afd_lang.css

@@ -0,0 +1,14 @@
+
+.p-qrcode[data-v-2fb36afd] {
+  position: absolute;
+  overflow: hidden;
+  text-align: center;
+}
+.p-qrcode img[data-v-2fb36afd],
+.p-pdf417-canvas[data-v-2fb36afd] {
+  display: block;
+}
+.p-qrcode img[data-v-2fb36afd] {
+  width: 100%;
+  height: 100%;
+}

package/es/components/label-design/components/widgets/Text.vue.mjs

@@ -1,9 +1,9 @@
 import { __exportAll } from "../../../../_virtual/_rolldown/runtime.mjs";
 import _plugin_vue_export_helper_default from "../../../../_virtual/_plugin-vue_export-helper.mjs";
-import Text_vue_vue_type_script_setup_true_lang_default from "./Text.vue_vue_type_script_setup_true_lang.mjs";
-import './Text.vue_vue_type_style_index_0_scoped_170abee2_lang.css';/* empty css                                                          */
+import Text_vue_vue_type_script_setup_true_name_TEXT_lang_default from "./Text.vue_vue_type_script_setup_true_name_TEXT_lang.mjs";
+import './Text.vue_vue_type_style_index_0_scoped_d9ace99f_lang.css';/* empty css                                                          */
 //#region src/components/label-design/components/widgets/Text.vue
 var Text_exports = /* @__PURE__ */ __exportAll({ default: () => Text_default });
-var Text_default = /* @__PURE__ */ _plugin_vue_export_helper_default(Text_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-170abee2"]]);
+var Text_default = /* @__PURE__ */ _plugin_vue_export_helper_default(Text_vue_vue_type_script_setup_true_name_TEXT_lang_default, [["__scopeId", "data-v-d9ace99f"]]);
 //#endregion
 export { Text_exports };

package/es/components/label-design/components/widgets/{Text.vue_vue_type_script_setup_true_lang.mjs → Text.vue_vue_type_script_setup_true_name_TEXT_lang.mjs}

@@ -1,9 +1,9 @@
 import { useDesigner } from "../../hooks/useDesigner.mjs";
 import { useProp } from "../../hooks/useProp.mjs";
-import { computed, createBlock, createElementBlock, defineComponent, normalizeClass, normalizeStyle, openBlock, resolveComponent, toDisplayString } from "vue";
-//#region src/components/label-design/components/widgets/Text.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = ["textContent"];
-var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+import { computed, createElementBlock, createVNode, defineComponent, normalizeStyle, openBlock, resolveComponent, unref } from "vue";
+import { t } from "@gct-paas/core";
+//#region src/components/label-design/components/widgets/Text.vue?vue&type=script&setup=true&name=TEXT&lang.ts
+var Text_vue_vue_type_script_setup_true_name_TEXT_lang_default = /* @__PURE__ */ defineComponent({
 	name: "TextWidget",
 	__name: "Text",
 	props: {
@@ -66,19 +66,41 @@ var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		const showEdit = computed(() => {
 			return props.isEdit;
 		});
-		const style = computed(() => {
-			const obj = {
-				fontSize: props.fontSize + "px",
-				backgroundColor: props.bgColor || "",
-				fontFamily: props.fontFamily,
-				lineHeight: Math.round(props.fontSize * 1.5) + "px"
+		const spacingStyle = computed(() => {
+			const fontSize = props.fontSize;
+			const styles = props.styles || {};
+			const spaceType = styles["space-type"] || "LINE";
+			const space = styles.space;
+			const finalLineHeight = spaceType === "FIXED" ? Math.min(100, Math.max(fontSize, space ?? 24)) : Math.max(fontSize, Math.round(fontSize * (space ?? 1.5) * 100) / 100);
+			return {
+				fontSize,
+				lineHeight: finalLineHeight,
+				trimOffset: Math.max(0, finalLineHeight - fontSize) / 2
 			};
+		});
+		const containerStyle = computed(() => {
+			const obj = { backgroundColor: props.bgColor };
 			if (props.borderTop) obj.borderTop = `${props.borderTop.borderColor} ${props.borderTop.borderStyle} ${props.borderTop.borderWidth}px`;
 			if (props.borderRight) obj.borderRight = `${props.borderRight.borderColor} ${props.borderRight.borderStyle} ${props.borderRight.borderWidth}px`;
 			if (props.borderBottom) obj.borderBottom = `${props.borderBottom.borderColor} ${props.borderBottom.borderStyle} ${props.borderBottom.borderWidth}px`;
 			if (props.borderLeft) obj.borderLeft = `${props.borderLeft.borderColor} ${props.borderLeft.borderStyle} ${props.borderLeft.borderWidth}px`;
 			obj.borderRadius = `${props.borderTopLeftRadius || "0"}px ${props.borderTopRightRadius || "0"}px ${props.borderBottomRightRadius || "0"}px ${props.borderBottomLeftRadius || "0"}px`;
+			return obj;
+		});
+		const editStyle = computed(() => {
 			const styles = props.styles || {};
+			const { fontSize, lineHeight, trimOffset } = spacingStyle.value;
+			const obj = {
+				fontSize: fontSize + "px",
+				lineHeight: lineHeight + "px",
+				fontFamily: props.fontFamily,
+				marginTop: trimOffset ? `-${trimOffset}px` : void 0,
+				marginBottom: trimOffset ? `-${trimOffset}px` : void 0,
+				backgroundColor: "transparent",
+				border: "none",
+				boxShadow: "none",
+				resize: "none"
+			};
 			if (styles["text-decoration"]) obj.textDecoration = styles["text-decoration"];
 			if (styles["text-align"]) obj.textAlign = styles["text-align"];
 			if (styles["font-weight"]) obj.fontWeight = styles["font-weight"];
@@ -89,23 +111,23 @@ var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			const _component_a_textarea = resolveComponent("a-textarea");
 			return openBlock(), createElementBlock("div", {
 				class: "p-label",
-				style: normalizeStyle(style.value)
-			}, [!showEdit.value ? (openBlock(), createElementBlock("div", {
-				key: 0,
-				class: normalizeClass(["p-label_text", { "is-empty": !showText.value }]),
-				"data-placeholder": "请输入文本",
-				textContent: toDisplayString(showText.value)
-			}, null, 10, _hoisted_1)) : (openBlock(), createBlock(_component_a_textarea, {
-				key: 1,
+				style: normalizeStyle(containerStyle.value)
+			}, [createVNode(_component_a_textarea, {
 				value: showText.value,
 				"onUpdate:value": _cache[0] || (_cache[0] = ($event) => showText.value = $event),
 				"auto-size": "",
 				maxlength: 1e3,
-				style: normalizeStyle(style.value),
-				placeholder: "请输入文本"
-			}, null, 8, ["value", "style"]))], 4);
+				style: normalizeStyle(editStyle.value),
+				placeholder: unref(t)("sys.pleaseInputSth", { sth: unref(t)("sys.text") }),
+				disabled: !showEdit.value
+			}, null, 8, [
+				"value",
+				"style",
+				"placeholder",
+				"disabled"
+			])], 4);
 		};
 	}
 });
 //#endregion
-export { Text_vue_vue_type_script_setup_true_lang_default as default };
+export { Text_vue_vue_type_script_setup_true_name_TEXT_lang_default as default };

package/es/components/label-design/components/widgets/Text.vue_vue_type_style_index_0_scoped_d9ace99f_lang.css

@@ -0,0 +1,37 @@
+
+.p-label {
+&[data-v-d9ace99f] {
+  box-sizing: border-box;
+
+  /* display: table; */
+  width: 100%;
+  border: 1px dashed #e8ebf0;
+  outline: none;
+
+  /* overflow: hidden; */
+  text-overflow: ellipsis;
+  word-break: break-all; /* 任意字符处都可换行（包括单词中间） */
+  overflow-wrap: break-word; /* 允许在单词内换行 */
+}
+.ant-input[data-v-d9ace99f] {
+    overflow: hidden;
+}
+}
+[data-v-d9ace99f] .ant-input {
+  padding: 0;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  resize: none;
+}
+[data-v-d9ace99f] .ant-input[disabled],[data-v-d9ace99f] .ant-input-disabled,[data-v-d9ace99f] textarea[disabled] {
+  color: inherit;
+  background: transparent;
+  cursor: default;
+  opacity: 1;
+  -webkit-text-fill-color: currentColor;
+}
+[data-v-d9ace99f] .ant-input[disabled]::placeholder,[data-v-d9ace99f] .ant-input-disabled::placeholder,[data-v-d9ace99f] textarea[disabled]::placeholder {
+  color: #c3c3c3;
+  opacity: 1;
+}

package/es/components/label-design/components/widgets/richText.vue.mjs

@@ -1,9 +1,9 @@
 import { __exportAll } from "../../../../_virtual/_rolldown/runtime.mjs";
 import _plugin_vue_export_helper_default from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 import richText_vue_vue_type_script_setup_true_lang_default from "./richText.vue_vue_type_script_setup_true_lang.mjs";
-import './richText.vue_vue_type_style_index_0_scoped_d05f3ffd_lang.css';/* empty css                                                              */
+import './richText.vue_vue_type_style_index_0_scoped_fc7a37f7_lang.css';/* empty css                                                              */
 //#region src/components/label-design/components/widgets/richText.vue
 var richText_exports = /* @__PURE__ */ __exportAll({ default: () => richText_default });
-var richText_default = /* @__PURE__ */ _plugin_vue_export_helper_default(richText_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-d05f3ffd"]]);
+var richText_default = /* @__PURE__ */ _plugin_vue_export_helper_default(richText_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-fc7a37f7"]]);
 //#endregion
 export { richText_exports };

package/es/components/label-design/components/widgets/richText.vue_vue_type_script_setup_true_lang.mjs

@@ -1,6 +1,7 @@
-import { computed, createElementBlock, createElementVNode, defineComponent, normalizeClass, normalizeStyle, openBlock } from "vue";
+import { computed, createElementBlock, createElementVNode, defineComponent, normalizeClass, normalizeStyle, openBlock, unref } from "vue";
+import { t } from "@gct-paas/core";
 //#region src/components/label-design/components/widgets/richText.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = ["innerHTML"];
+var _hoisted_1 = ["data-placeholder", "innerHTML"];
 var richText_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "RichTextWidget",
 	__name: "richText",
@@ -48,7 +49,7 @@ var richText_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 					"color-[#C3C3C3]": !props.text,
 					"is-empty": !props.text
 				}]),
-				"data-placeholder": "请输入富文本",
+				"data-placeholder": unref(t)("sys.printDesigner.pleaseEnterRichText"),
 				innerHTML: showText.value
 			}, null, 10, _hoisted_1)], 4);
 		};

package/es/components/label-design/components/widgets/{richText.vue_vue_type_style_index_0_scoped_d05f3ffd_lang.css → richText.vue_vue_type_style_index_0_scoped_fc7a37f7_lang.css}

@@ -1,5 +1,5 @@
 
-.p-label[data-v-d05f3ffd] {
+.p-label[data-v-fc7a37f7] {
   /* overflow: hidden; */
   text-overflow: ellipsis;
   outline: none;
@@ -9,7 +9,7 @@
   overflow-wrap: break-word; /* 允许在单词内换行 */
   box-sizing: border-box;
 }
-.p-label_text[data-v-d05f3ffd] {
+.p-label_text[data-v-fc7a37f7] {
   width: 100%;
   /* height: 100%; */
   word-break: break-all; /* 任意字符处都可换行（包括单词中间） */
@@ -18,7 +18,7 @@
   box-sizing: border-box;
 }
 .is-empty {
-&[data-v-d05f3ffd]::before {
+&[data-v-fc7a37f7]::before {
     content: attr(data-placeholder);
     width: 100%;
     height: 100%;

package/es/components/label-design/constants/CommonPrintElems.d.ts

@@ -20,8 +20,14 @@ export declare enum CONTENT_TYPE {
 }
 export declare enum QR_CODE_TYPE {
     QR_CODE = "QR_CODE",
-    GS1_DATA_MATRIX = "GS1_DATA_MATRIX"
+    GS1_DATA_MATRIX = "GS1_DATA_MATRIX",
+    PDF_417 = "PDF_417"
 }
+export declare const QR_CODE_TEXT: {
+    QR_CODE: string;
+    GS1_DATA_MATRIX: string;
+    PDF_417: string;
+};
 declare const symbolElements: ({
     label: string;
     children: ({
@@ -45,6 +51,8 @@ declare const symbolElements: ({
             color?: undefined;
             'font-size'?: undefined;
             'font-family'?: undefined;
+            'space-type'?: undefined;
+            space?: undefined;
         };
         classes: {};
         rotate: number;
@@ -70,6 +78,8 @@ declare const symbolElements: ({
             'vertical-align'?: undefined;
             'font-size'?: undefined;
             'font-family'?: undefined;
+            'space-type'?: undefined;
+            space?: undefined;
         };
         classes: {};
         rotate: number;
@@ -100,6 +110,8 @@ declare const symbolElements: ({
             'vertical-align'?: undefined;
             'font-size'?: undefined;
             'font-family'?: undefined;
+            'space-type'?: undefined;
+            space?: undefined;
         };
         classes: {};
         rotate: number;
@@ -134,6 +146,8 @@ declare const symbolElements: ({
             color: string;
             'font-size': number;
             'font-family': string;
+            'space-type': string;
+            space: number;
         };
         classes: {};
         rotate: number;
@@ -165,6 +179,8 @@ declare const symbolElements: ({
             color?: undefined;
             'font-size'?: undefined;
             'font-family'?: undefined;
+            'space-type'?: undefined;
+            space?: undefined;
         };
         classes: {};
         rotate: number;
@@ -201,6 +217,9 @@ declare const symbolElements: ({
                 value: number;
             };
             magnification?: undefined;
+            rowHeight?: undefined;
+            rows?: undefined;
+            columns?: undefined;
             icon?: undefined;
             logoColor?: undefined;
             logoBgColor?: undefined;
@@ -212,10 +231,9 @@ declare const symbolElements: ({
         hasRotate: boolean;
         rotateWidth: number;
         rotateHeight: number;
+        hasError?: undefined;
+        errMsg?: undefined;
     } | {
-        hasRotate?: undefined;
-        rotateWidth?: undefined;
-        rotateHeight?: undefined;
         alias: string;
         iconName: string;
         displayName: string;
@@ -237,6 +255,15 @@ declare const symbolElements: ({
             magnification: {
                 value: number;
             };
+            rowHeight: {
+                value: number;
+            };
+            rows: {
+                value: null;
+            };
+            columns: {
+                value: null;
+            };
             icon?: undefined;
             logoColor?: undefined;
             logoBgColor?: undefined;
@@ -245,7 +272,14 @@ declare const symbolElements: ({
         classes: {};
         rotate: number;
         hasPos: boolean;
+        hasRotate: boolean;
+        rotateWidth: number;
+        rotateHeight: number;
+        hasError: boolean;
+        errMsg: string;
     } | {
+        hasError?: undefined;
+        errMsg?: undefined;
         alias: string;
         iconName: string;
         displayName: string;
@@ -259,6 +293,9 @@ declare const symbolElements: ({
             content?: undefined;
             type?: undefined;
             magnification?: undefined;
+            rowHeight?: undefined;
+            rows?: undefined;
+            columns?: undefined;
             icon: {
                 value: string;
             };

package/es/components/label-design/constants/CommonPrintElems.mjs

@@ -25,15 +25,21 @@ var CONTENT_TYPE = /* @__PURE__ */ function(CONTENT_TYPE) {
 var QR_CODE_TYPE = /* @__PURE__ */ function(QR_CODE_TYPE) {
 	QR_CODE_TYPE["QR_CODE"] = "QR_CODE";
 	QR_CODE_TYPE["GS1_DATA_MATRIX"] = "GS1_DATA_MATRIX";
+	QR_CODE_TYPE["PDF_417"] = "PDF_417";
 	return QR_CODE_TYPE;
 }({});
+var QR_CODE_TEXT = {
+	[QR_CODE_TYPE.QR_CODE]: "QR code Text",
+	[QR_CODE_TYPE.GS1_DATA_MATRIX]: "GS1 Data Matrix Text",
+	[QR_CODE_TYPE.PDF_417]: "PDF417 Text"
+};
 var symbolElements = [{
-	label: "基础",
+	label: "sys.printDesigner.basic",
 	children: [
 		{
 			alias: "",
 			iconName: "juxing",
-			displayName: "矩形",
+			displayName: "sys.printDesigner.rect",
 			type: PRINT_ELE_TYPE.RECTANGLE,
 			width: 100,
 			height: 50,
@@ -51,7 +57,7 @@ var symbolElements = [{
 		{
 			alias: "",
 			iconName: "hengxian",
-			displayName: "横线",
+			displayName: "sys.printDesigner.horizontalLine",
 			type: PRINT_ELE_TYPE.HORIZONTAL_LINE,
 			width: 200,
 			height: 24,
@@ -66,7 +72,7 @@ var symbolElements = [{
 		{
 			alias: "",
 			iconName: "shuxian",
-			displayName: "竖线",
+			displayName: "sys.printDesigner.verticalLine",
 			type: PRINT_ELE_TYPE.VERTICAL_LINE,
 			width: 24,
 			height: 200,
@@ -82,13 +88,13 @@ var symbolElements = [{
 		{
 			alias: "",
 			iconName: "wenben1",
-			displayName: "文本",
+			displayName: "sys.text",
 			type: PRINT_ELE_TYPE.TEXT,
 			width: 100,
 			height: 40,
 			isEdit: false,
 			attrs: { text: {
-				label: "文本",
+				label: "sys.text",
 				value: "",
 				type: DATA_TYPE.FIXED
 			} },
@@ -97,7 +103,9 @@ var symbolElements = [{
 				"vertical-align": "top",
 				color: "#000",
 				"font-size": 18,
-				"font-family": "微软雅黑"
+				"font-family": "微软雅黑",
+				"space-type": "LINE",
+				space: 1.5
 			},
 			classes: {},
 			rotate: 0,
@@ -109,7 +117,7 @@ var symbolElements = [{
 		{
 			alias: "",
 			iconName: "tupian_wudaima",
-			displayName: "图片",
+			displayName: "sys.image",
 			type: PRINT_ELE_TYPE.IMAGE,
 			width: 80,
 			height: 80,
@@ -124,12 +132,12 @@ var symbolElements = [{
 		}
 	]
 }, {
-	label: "高级",
+	label: "sys.printDesigner.advanced",
 	children: [
 		{
 			alias: "",
 			iconName: "tiaoma",
-			displayName: "条形码",
+			displayName: "sys.printDesigner.barcode.index",
 			type: PRINT_ELE_TYPE.BAR_CODE,
 			width: 167,
 			height: 40,
@@ -155,7 +163,7 @@ var symbolElements = [{
 		{
 			alias: "",
 			iconName: "erweima2",
-			displayName: "二维码",
+			displayName: "sys.printDesigner.qrCode.index",
 			type: PRINT_ELE_TYPE.QR_CODE,
 			width: 102,
 			height: 102,
@@ -166,17 +174,25 @@ var symbolElements = [{
 					type: DATA_TYPE.FIXED
 				},
 				type: { value: "QR_CODE" },
-				magnification: { value: 4 }
+				magnification: { value: 4 },
+				rowHeight: { value: 3 },
+				rows: { value: null },
+				columns: { value: null }
 			},
 			styles: {},
 			classes: {},
 			rotate: 0,
-			hasPos: true
+			hasPos: true,
+			hasRotate: false,
+			rotateWidth: 0,
+			rotateHeight: 0,
+			hasError: false,
+			errMsg: ""
 		},
 		{
 			alias: "",
 			iconName: "tubiao",
-			displayName: "图标",
+			displayName: "sys.appDesigner.icon",
 			type: PRINT_ELE_TYPE.ICON,
 			width: 72,
 			height: 72,
@@ -196,4 +212,4 @@ var symbolElements = [{
 	]
 }];
 //#endregion
-export { CONTENT_TYPE, DATA_TYPE, PRINT_ELE_TYPE, QR_CODE_TYPE, symbolElements as default };
+export { CONTENT_TYPE, DATA_TYPE, PRINT_ELE_TYPE, QR_CODE_TEXT, QR_CODE_TYPE, symbolElements as default };

package/es/components/label-design/header/test-var-modal.vue.d.ts

@@ -12,9 +12,11 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {
     }> & Readonly<{
         onMovingItem?: ((...args: any[]) => any) | undefined;
         onUpdatePBarcodeWidth?: ((...args: any[]) => any) | undefined;
+        onUpdatePQrCodeWidthAndHeight?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         movingItem: (...args: any[]) => void;
         updatePBarcodeWidth: (...args: any[]) => void;
+        updatePQrCodeWidthAndHeight: (...args: any[]) => void;
     }, import('vue').PublicProps, {}, false, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {
         mrContainerRef: ({
             $: import('vue').ComponentInternalInstance;
@@ -199,6 +201,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {
     }> & Readonly<{
         onMovingItem?: ((...args: any[]) => any) | undefined;
         onUpdatePBarcodeWidth?: ((...args: any[]) => any) | undefined;
+        onUpdatePQrCodeWidthAndHeight?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, {}> | null;
 }, HTMLDivElement>;
 export default _default;

package/es/components/label-design/hooks/useDesigner.d.ts

@@ -23,6 +23,7 @@ export declare function useDesigner(): {
     snapTracking: import('vue').Ref<boolean, boolean>;
     registerElement: (payload: IObject) => void;
     resizeBarcodeWidth: (payload: IObject) => void;
+    resizeQrCodeWidthAndHeight: (payload: IObject) => void;
     hoveredElements: import('vue').Ref<IObject[], IObject[]>;
     isModal: import('vue').Ref<boolean, boolean>;
 };

package/es/components/label-design/hooks/useDesigner.mjs

@@ -60,7 +60,7 @@ function useDesigner() {
 		});
 	}
 	function removeElement(payload) {
-		if (selectedElements.value[0]?.isEdit) return;
+		if (selectedElements.value[0] && selectedElements.value[0].isEdit) return;
 		clearSelectedElements();
 		const parent = selectedPage.value;
 		const eggIndex = parent.findIndex((egg) => egg.id === payload.elId);
@@ -98,6 +98,9 @@ function useDesigner() {
 		if (payload.classes) payload.egglement.classes = payload.classes;
 		if (payload.styles) payload.egglement.styles = payload.styles;
 		if (payload.attrs) payload.egglement.attrs = payload.attrs;
+		if (typeof payload.hasError !== "undefined" && payload.hasError !== null) payload.egglement.hasError = payload.hasError;
+		if (typeof payload.errMsg !== "undefined" && payload.errMsg !== null) payload.egglement.errMsg = payload.errMsg;
+		if (typeof payload.hasRotate !== "undefined" && payload.hasRotate !== null) payload.egglement.hasRotate = payload.hasRotate;
 	}
 	function deleteEgglement(payload) {
 		payload.parent.splice(payload.eggIndex, 1);
@@ -132,6 +135,20 @@ function useDesigner() {
 			width: payload.width
 		});
 	}
+	function resizeQrCodeWidthAndHeight(payload) {
+		const egglement = selectedPage.value?.find((d) => d.id === payload.elId) || {};
+		if (!egglement) return;
+		if (egglement.rotate === 90 || egglement.rotate === 270) updateEgglement({
+			egglement,
+			width: payload.height,
+			height: payload.width
+		});
+		else updateEgglement({
+			egglement,
+			width: payload.width,
+			height: payload.height
+		});
+	}
 	function togglePanel(value) {
 		if (currentPanel.value === value) return;
 		currentPanel.value = value;
@@ -155,6 +172,7 @@ function useDesigner() {
 		snapTracking,
 		registerElement,
 		resizeBarcodeWidth,
+		resizeQrCodeWidthAndHeight,
 		hoveredElements,
 		isModal
 	};