@pdfme/schemas 5.3.14 → 5.3.15-dev.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/shapes/rectAndEllipse.js +16 -2
- package/dist/cjs/src/shapes/rectAndEllipse.js.map +1 -1
- package/dist/esm/src/shapes/rectAndEllipse.js +16 -2
- package/dist/esm/src/shapes/rectAndEllipse.js.map +1 -1
- package/dist/node/src/shapes/rectAndEllipse.js +16 -2
- package/dist/node/src/shapes/rectAndEllipse.js.map +1 -1
- package/dist/types/src/shapes/rectAndEllipse.d.ts +3 -0
- package/package.json +3 -3
- package/src/shapes/rectAndEllipse.ts +17 -2
|
@@ -16,6 +16,9 @@ const shape = {
|
|
|
16
16
|
if (schema.type === 'ellipse') {
|
|
17
17
|
div.style.borderRadius = '50%';
|
|
18
18
|
}
|
|
19
|
+
else if (schema.radius && schema.radius > 0) {
|
|
20
|
+
div.style.borderRadius = `${schema.radius}mm`;
|
|
21
|
+
}
|
|
19
22
|
div.style.borderWidth = `${schema.borderWidth ?? 0}mm`;
|
|
20
23
|
div.style.borderStyle = schema.borderWidth && schema.borderColor ? 'solid' : 'none';
|
|
21
24
|
div.style.borderColor = schema.borderColor ?? 'transparent';
|
|
@@ -50,6 +53,7 @@ const shape = {
|
|
|
50
53
|
});
|
|
51
54
|
}
|
|
52
55
|
else if (schema.type === 'rectangle') {
|
|
56
|
+
const radius = schema.radius ?? 0;
|
|
53
57
|
page.drawRectangle({
|
|
54
58
|
x: position.x +
|
|
55
59
|
borderWidth * ((1 - Math.sin((0, pdf_lib_1.toRadians)(rotate))) / 2) +
|
|
@@ -59,6 +63,7 @@ const shape = {
|
|
|
59
63
|
Math.tan((0, pdf_lib_1.toRadians)(rotate)) * Math.PI ** 2,
|
|
60
64
|
width: width - borderWidth,
|
|
61
65
|
height: height - borderWidth,
|
|
66
|
+
...(radius ? { radius: (0, common_1.mm2pt)(radius) } : {}),
|
|
62
67
|
...drawOptions,
|
|
63
68
|
});
|
|
64
69
|
}
|
|
@@ -69,8 +74,8 @@ const shape = {
|
|
|
69
74
|
title: i18n('schemas.borderWidth'),
|
|
70
75
|
type: 'number',
|
|
71
76
|
widget: 'inputNumber',
|
|
72
|
-
props: { min: 0 },
|
|
73
|
-
|
|
77
|
+
props: { min: 0, step: 1 },
|
|
78
|
+
span: 12,
|
|
74
79
|
},
|
|
75
80
|
borderColor: {
|
|
76
81
|
title: i18n('schemas.borderColor'),
|
|
@@ -80,6 +85,7 @@ const shape = {
|
|
|
80
85
|
disabledAlpha: true,
|
|
81
86
|
},
|
|
82
87
|
rules: [{ pattern: constants_js_1.HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
88
|
+
span: 12,
|
|
83
89
|
},
|
|
84
90
|
color: {
|
|
85
91
|
title: i18n('schemas.color'),
|
|
@@ -90,6 +96,13 @@ const shape = {
|
|
|
90
96
|
},
|
|
91
97
|
rules: [{ pattern: constants_js_1.HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
92
98
|
},
|
|
99
|
+
radius: {
|
|
100
|
+
title: i18n('schemas.radius'),
|
|
101
|
+
type: 'number',
|
|
102
|
+
widget: 'inputNumber',
|
|
103
|
+
props: { min: 0, step: 1 },
|
|
104
|
+
span: 12,
|
|
105
|
+
},
|
|
93
106
|
}),
|
|
94
107
|
defaultSchema: {
|
|
95
108
|
name: '',
|
|
@@ -103,6 +116,7 @@ const shape = {
|
|
|
103
116
|
borderColor: '#000000',
|
|
104
117
|
color: '',
|
|
105
118
|
readOnly: true,
|
|
119
|
+
radius: 0,
|
|
106
120
|
},
|
|
107
121
|
},
|
|
108
122
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":";;;AAAA,0CAAsD;AACtD,kDAAoD;AACpD,0CAAwF;AACxF,4CAA2C;AAC3C,mCAAwC;
|
|
1
|
+
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,9 @@ const shape = {
|
|
|
13
13
|
if (schema.type === 'ellipse') {
|
|
14
14
|
div.style.borderRadius = '50%';
|
|
15
15
|
}
|
|
16
|
+
else if (schema.radius && schema.radius > 0) {
|
|
17
|
+
div.style.borderRadius = `${schema.radius}mm`;
|
|
18
|
+
}
|
|
16
19
|
div.style.borderWidth = `${schema.borderWidth ?? 0}mm`;
|
|
17
20
|
div.style.borderStyle = schema.borderWidth && schema.borderColor ? 'solid' : 'none';
|
|
18
21
|
div.style.borderColor = schema.borderColor ?? 'transparent';
|
|
@@ -47,6 +50,7 @@ const shape = {
|
|
|
47
50
|
});
|
|
48
51
|
}
|
|
49
52
|
else if (schema.type === 'rectangle') {
|
|
53
|
+
const radius = schema.radius ?? 0;
|
|
50
54
|
page.drawRectangle({
|
|
51
55
|
x: position.x +
|
|
52
56
|
borderWidth * ((1 - Math.sin(toRadians(rotate))) / 2) +
|
|
@@ -56,6 +60,7 @@ const shape = {
|
|
|
56
60
|
Math.tan(toRadians(rotate)) * Math.PI ** 2,
|
|
57
61
|
width: width - borderWidth,
|
|
58
62
|
height: height - borderWidth,
|
|
63
|
+
...(radius ? { radius: mm2pt(radius) } : {}),
|
|
59
64
|
...drawOptions,
|
|
60
65
|
});
|
|
61
66
|
}
|
|
@@ -66,8 +71,8 @@ const shape = {
|
|
|
66
71
|
title: i18n('schemas.borderWidth'),
|
|
67
72
|
type: 'number',
|
|
68
73
|
widget: 'inputNumber',
|
|
69
|
-
props: { min: 0 },
|
|
70
|
-
|
|
74
|
+
props: { min: 0, step: 1 },
|
|
75
|
+
span: 12,
|
|
71
76
|
},
|
|
72
77
|
borderColor: {
|
|
73
78
|
title: i18n('schemas.borderColor'),
|
|
@@ -77,6 +82,7 @@ const shape = {
|
|
|
77
82
|
disabledAlpha: true,
|
|
78
83
|
},
|
|
79
84
|
rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
85
|
+
span: 12,
|
|
80
86
|
},
|
|
81
87
|
color: {
|
|
82
88
|
title: i18n('schemas.color'),
|
|
@@ -87,6 +93,13 @@ const shape = {
|
|
|
87
93
|
},
|
|
88
94
|
rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
89
95
|
},
|
|
96
|
+
radius: {
|
|
97
|
+
title: i18n('schemas.radius'),
|
|
98
|
+
type: 'number',
|
|
99
|
+
widget: 'inputNumber',
|
|
100
|
+
props: { min: 0, step: 1 },
|
|
101
|
+
span: 12,
|
|
102
|
+
},
|
|
90
103
|
}),
|
|
91
104
|
defaultSchema: {
|
|
92
105
|
name: '',
|
|
@@ -100,6 +113,7 @@ const shape = {
|
|
|
100
113
|
borderColor: '#000000',
|
|
101
114
|
color: '',
|
|
102
115
|
readOnly: true,
|
|
116
|
+
radius: 0,
|
|
103
117
|
},
|
|
104
118
|
},
|
|
105
119
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,9 @@ const shape = {
|
|
|
16
16
|
if (schema.type === 'ellipse') {
|
|
17
17
|
div.style.borderRadius = '50%';
|
|
18
18
|
}
|
|
19
|
+
else if (schema.radius && schema.radius > 0) {
|
|
20
|
+
div.style.borderRadius = `${schema.radius}mm`;
|
|
21
|
+
}
|
|
19
22
|
div.style.borderWidth = `${schema.borderWidth ?? 0}mm`;
|
|
20
23
|
div.style.borderStyle = schema.borderWidth && schema.borderColor ? 'solid' : 'none';
|
|
21
24
|
div.style.borderColor = schema.borderColor ?? 'transparent';
|
|
@@ -50,6 +53,7 @@ const shape = {
|
|
|
50
53
|
});
|
|
51
54
|
}
|
|
52
55
|
else if (schema.type === 'rectangle') {
|
|
56
|
+
const radius = schema.radius ?? 0;
|
|
53
57
|
page.drawRectangle({
|
|
54
58
|
x: position.x +
|
|
55
59
|
borderWidth * ((1 - Math.sin((0, pdf_lib_1.toRadians)(rotate))) / 2) +
|
|
@@ -59,6 +63,7 @@ const shape = {
|
|
|
59
63
|
Math.tan((0, pdf_lib_1.toRadians)(rotate)) * Math.PI ** 2,
|
|
60
64
|
width: width - borderWidth,
|
|
61
65
|
height: height - borderWidth,
|
|
66
|
+
...(radius ? { radius: (0, common_1.mm2pt)(radius) } : {}),
|
|
62
67
|
...drawOptions,
|
|
63
68
|
});
|
|
64
69
|
}
|
|
@@ -69,8 +74,8 @@ const shape = {
|
|
|
69
74
|
title: i18n('schemas.borderWidth'),
|
|
70
75
|
type: 'number',
|
|
71
76
|
widget: 'inputNumber',
|
|
72
|
-
props: { min: 0 },
|
|
73
|
-
|
|
77
|
+
props: { min: 0, step: 1 },
|
|
78
|
+
span: 12,
|
|
74
79
|
},
|
|
75
80
|
borderColor: {
|
|
76
81
|
title: i18n('schemas.borderColor'),
|
|
@@ -80,6 +85,7 @@ const shape = {
|
|
|
80
85
|
disabledAlpha: true,
|
|
81
86
|
},
|
|
82
87
|
rules: [{ pattern: constants_js_1.HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
88
|
+
span: 12,
|
|
83
89
|
},
|
|
84
90
|
color: {
|
|
85
91
|
title: i18n('schemas.color'),
|
|
@@ -90,6 +96,13 @@ const shape = {
|
|
|
90
96
|
},
|
|
91
97
|
rules: [{ pattern: constants_js_1.HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
92
98
|
},
|
|
99
|
+
radius: {
|
|
100
|
+
title: i18n('schemas.radius'),
|
|
101
|
+
type: 'number',
|
|
102
|
+
widget: 'inputNumber',
|
|
103
|
+
props: { min: 0, step: 1 },
|
|
104
|
+
span: 12,
|
|
105
|
+
},
|
|
93
106
|
}),
|
|
94
107
|
defaultSchema: {
|
|
95
108
|
name: '',
|
|
@@ -103,6 +116,7 @@ const shape = {
|
|
|
103
116
|
borderColor: '#000000',
|
|
104
117
|
color: '',
|
|
105
118
|
readOnly: true,
|
|
119
|
+
radius: 0,
|
|
106
120
|
},
|
|
107
121
|
},
|
|
108
122
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":";;;AAAA,0CAAsD;AACtD,kDAAoD;AACpD,0CAAwF;AACxF,4CAA2C;AAC3C,mCAAwC;
|
|
1
|
+
{"version":3,"file":"rectAndEllipse.js","sourceRoot":"","sources":["../../../../src/shapes/rectAndEllipse.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ interface ShapeSchema extends Schema {
|
|
|
4
4
|
borderWidth: number;
|
|
5
5
|
borderColor: string;
|
|
6
6
|
color: string;
|
|
7
|
+
radius?: number;
|
|
7
8
|
}
|
|
8
9
|
export declare const rectangle: {
|
|
9
10
|
propPanel: {
|
|
@@ -12,6 +13,7 @@ export declare const rectangle: {
|
|
|
12
13
|
borderWidth: number;
|
|
13
14
|
borderColor: string;
|
|
14
15
|
color: string;
|
|
16
|
+
radius?: number;
|
|
15
17
|
name: string;
|
|
16
18
|
position: {
|
|
17
19
|
x: number;
|
|
@@ -96,6 +98,7 @@ export declare const ellipse: {
|
|
|
96
98
|
borderWidth: number;
|
|
97
99
|
borderColor: string;
|
|
98
100
|
color: string;
|
|
101
|
+
radius?: number;
|
|
99
102
|
name: string;
|
|
100
103
|
position: {
|
|
101
104
|
x: number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pdfme/schemas",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.15-dev.1",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"author": "hand-dot",
|
|
6
6
|
"license": "MIT",
|
|
@@ -60,12 +60,12 @@
|
|
|
60
60
|
"bwip-js": "^4.1.1",
|
|
61
61
|
"date-fns": "^4.1.0",
|
|
62
62
|
"fontkit": "^2.0.2",
|
|
63
|
-
"lucide": "^0.
|
|
63
|
+
"lucide": "^0.486.0"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
66
|
"@pdfme/common": "*",
|
|
67
67
|
"@types/bwip-js": "^3.2.1",
|
|
68
|
-
"@types/fontkit": "^2.0.
|
|
68
|
+
"@types/fontkit": "^2.0.8",
|
|
69
69
|
"@types/pngjs": "^6.0.2",
|
|
70
70
|
"jsqr": "^1.4.0",
|
|
71
71
|
"pngjs": "^7.0.0"
|
|
@@ -9,6 +9,7 @@ interface ShapeSchema extends Schema {
|
|
|
9
9
|
borderWidth: number;
|
|
10
10
|
borderColor: string;
|
|
11
11
|
color: string;
|
|
12
|
+
radius?: number;
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
const shape: Plugin<ShapeSchema> = {
|
|
@@ -20,6 +21,8 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
20
21
|
div.style.boxSizing = 'border-box';
|
|
21
22
|
if (schema.type === 'ellipse') {
|
|
22
23
|
div.style.borderRadius = '50%';
|
|
24
|
+
} else if (schema.radius && schema.radius > 0) {
|
|
25
|
+
div.style.borderRadius = `${schema.radius}mm`;
|
|
23
26
|
}
|
|
24
27
|
div.style.borderWidth = `${schema.borderWidth ?? 0}mm`;
|
|
25
28
|
div.style.borderStyle = schema.borderWidth && schema.borderColor ? 'solid' : 'none';
|
|
@@ -57,6 +60,8 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
57
60
|
...drawOptions,
|
|
58
61
|
});
|
|
59
62
|
} else if (schema.type === 'rectangle') {
|
|
63
|
+
const radius = schema.radius ?? 0;
|
|
64
|
+
|
|
60
65
|
page.drawRectangle({
|
|
61
66
|
x:
|
|
62
67
|
position.x +
|
|
@@ -68,6 +73,7 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
68
73
|
Math.tan(toRadians(rotate)) * Math.PI ** 2,
|
|
69
74
|
width: width - borderWidth,
|
|
70
75
|
height: height - borderWidth,
|
|
76
|
+
...(radius ? { radius: mm2pt(radius) } : {}),
|
|
71
77
|
...drawOptions,
|
|
72
78
|
});
|
|
73
79
|
}
|
|
@@ -78,8 +84,8 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
78
84
|
title: i18n('schemas.borderWidth'),
|
|
79
85
|
type: 'number',
|
|
80
86
|
widget: 'inputNumber',
|
|
81
|
-
props: { min: 0 },
|
|
82
|
-
|
|
87
|
+
props: { min: 0, step: 1 },
|
|
88
|
+
span: 12,
|
|
83
89
|
},
|
|
84
90
|
borderColor: {
|
|
85
91
|
title: i18n('schemas.borderColor'),
|
|
@@ -89,6 +95,7 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
89
95
|
disabledAlpha: true,
|
|
90
96
|
},
|
|
91
97
|
rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
98
|
+
span: 12,
|
|
92
99
|
},
|
|
93
100
|
color: {
|
|
94
101
|
title: i18n('schemas.color'),
|
|
@@ -99,6 +106,13 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
99
106
|
},
|
|
100
107
|
rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
|
|
101
108
|
},
|
|
109
|
+
radius: {
|
|
110
|
+
title: i18n('schemas.radius'),
|
|
111
|
+
type: 'number',
|
|
112
|
+
widget: 'inputNumber',
|
|
113
|
+
props: { min: 0, step: 1 },
|
|
114
|
+
span: 12,
|
|
115
|
+
},
|
|
102
116
|
}),
|
|
103
117
|
defaultSchema: {
|
|
104
118
|
name: '',
|
|
@@ -112,6 +126,7 @@ const shape: Plugin<ShapeSchema> = {
|
|
|
112
126
|
borderColor: '#000000',
|
|
113
127
|
color: '',
|
|
114
128
|
readOnly: true,
|
|
129
|
+
radius: 0,
|
|
115
130
|
},
|
|
116
131
|
},
|
|
117
132
|
};
|