@leafer-ui/render 1.7.0 → 1.8.0
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/package.json +4 -4
- package/src/RectRender.ts +6 -6
- package/src/UIRender.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@leafer-ui/render",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "@leafer-ui/render",
|
|
5
5
|
"author": "Chao (Leafer) Wan",
|
|
6
6
|
"license": "MIT",
|
|
@@ -22,10 +22,10 @@
|
|
|
22
22
|
"leaferjs"
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@leafer-ui/external": "1.
|
|
25
|
+
"@leafer-ui/external": "1.8.0"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@leafer/interface": "1.
|
|
29
|
-
"@leafer-ui/interface": "1.
|
|
28
|
+
"@leafer/interface": "1.8.0",
|
|
29
|
+
"@leafer-ui/interface": "1.8.0"
|
|
30
30
|
}
|
|
31
31
|
}
|
package/src/RectRender.ts
CHANGED
|
@@ -19,18 +19,18 @@ export const RectRender: IRectRenderModule = {
|
|
|
19
19
|
|
|
20
20
|
if (stroke) {
|
|
21
21
|
|
|
22
|
-
const { strokeAlign, __strokeWidth } = this.__
|
|
23
|
-
if (!
|
|
22
|
+
const { strokeAlign, __strokeWidth: strokeWidth } = this.__
|
|
23
|
+
if (!strokeWidth) return
|
|
24
24
|
|
|
25
|
-
canvas.setStroke(stroke,
|
|
26
|
-
const half =
|
|
25
|
+
canvas.setStroke(stroke, strokeWidth, this.__)
|
|
26
|
+
const half = strokeWidth / 2
|
|
27
27
|
|
|
28
28
|
switch (strokeAlign) {
|
|
29
29
|
case 'center':
|
|
30
30
|
canvas.strokeRect(0, 0, width, height)
|
|
31
31
|
break
|
|
32
32
|
case 'inside':
|
|
33
|
-
width -=
|
|
33
|
+
width -= strokeWidth, height -= strokeWidth
|
|
34
34
|
if (width < 0 || height < 0) {
|
|
35
35
|
canvas.save()
|
|
36
36
|
this.__clip(canvas, options)
|
|
@@ -39,7 +39,7 @@ export const RectRender: IRectRenderModule = {
|
|
|
39
39
|
} else canvas.strokeRect(x + half, y + half, width, height)
|
|
40
40
|
break
|
|
41
41
|
case 'outside':
|
|
42
|
-
canvas.strokeRect(x - half, y - half, width +
|
|
42
|
+
canvas.strokeRect(x - half, y - half, width + strokeWidth, height + strokeWidth)
|
|
43
43
|
break
|
|
44
44
|
}
|
|
45
45
|
|
package/src/UIRender.ts
CHANGED
|
@@ -19,7 +19,7 @@ export const UIRender: IUIRenderModule = {
|
|
|
19
19
|
|
|
20
20
|
if (data.__useEffect) {
|
|
21
21
|
const { shadow, fill, stroke } = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter
|
|
22
|
-
stintSet(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread &&
|
|
22
|
+
stintSet(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && fill && !data.__isTransparentFill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside'))) // 高性能阴影条件， @leafer-ui/image check.ts 中的 allowDraw 逻辑需与此处关联
|
|
23
23
|
data.__useEffect = !!(shadow || otherEffect)
|
|
24
24
|
}
|
|
25
25
|
|