|
@@ -22,11 +22,11 @@ export function createViewStyles(
|
|
style["border-width"] = (layout.border.width || 0) + "px";
|
|
style["border-width"] = (layout.border.width || 0) + "px";
|
|
style["border-color"] = layout.border.color || "#000";
|
|
style["border-color"] = layout.border.color || "#000";
|
|
|
|
|
|
- if (layout.border.radius) {
|
|
|
|
|
|
+ if (layout.border.radius && layout.border.radius !== 0) {
|
|
style["border-radius"] = layout.border.radius / 2 + "%";
|
|
style["border-radius"] = layout.border.radius / 2 + "%";
|
|
style["overflow"] = "hidden";
|
|
style["overflow"] = "hidden";
|
|
}
|
|
}
|
|
- if (layout.border.radius2 !== undefined) {
|
|
|
|
|
|
+ if (layout.border.radius2 !== undefined && layout.border.radius2 !== 0) {
|
|
if (!layout.size) return;
|
|
if (!layout.size) return;
|
|
style["border-radius"] =
|
|
style["border-radius"] =
|
|
(designSizeToPx(Math.min(layout.size[0], layout.size[1])) *
|
|
(designSizeToPx(Math.min(layout.size[0], layout.size[1])) *
|
|
@@ -105,7 +105,7 @@ export function createCompStyle(
|
|
// console.log(comp.value.text, comp.layout.transformMatrix)
|
|
// console.log(comp.value.text, comp.layout.transformMatrix)
|
|
// }
|
|
// }
|
|
|
|
|
|
- if (comp.compKey == "Text" || comp.compKey == "Group") {
|
|
|
|
|
|
+ if (comp.compKey == "Group") {
|
|
if (layout.transformMatrix) {
|
|
if (layout.transformMatrix) {
|
|
style.transform = layout.transformMatrix;
|
|
style.transform = layout.transformMatrix;
|
|
style.transformOrigin = "0 0";
|
|
style.transformOrigin = "0 0";
|