liwei 1 year ago
parent
commit
cebeb70722

+ 1 - 0
src/modules/editor/assets/icons/polygon2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34"><defs><style>.a,.b,.c{fill:none;}.b,.c{stroke:#d3d3d3;stroke-width:1.2px;}.b{stroke-linecap:round;stroke-linejoin:round;}.d{stroke:none;}</style></defs><g transform="translate(974 -6080)"><g transform="translate(-0.426 293.574)"><rect class="a" width="34" height="34" rx="2" transform="translate(-973.574 5786.426)"/></g><g transform="translate(-971.192 6081.991)"><path class="b" d="M8,23.3V12" transform="translate(-1.719 -2.641)"/><path class="b" d="M40,23.3V12" transform="translate(-17.899 -2.641)"/><path class="b" d="M12,8H23.3" transform="translate(-3.459 -0.962)"/><path class="b" d="M12,40H23.3" transform="translate(-3.459 -17.081)"/><g class="c" transform="translate(4.191 20.009)"><circle class="d" cx="2.5" cy="2.5" r="2.5"/><circle class="a" cx="2.5" cy="2.5" r="1.9"/></g><g class="c" transform="translate(19.191 20.009)"><circle class="d" cx="2.5" cy="2.5" r="2.5"/><circle class="a" cx="2.5" cy="2.5" r="1.9"/></g><g class="c" transform="translate(19.191 5.009)"><circle class="d" cx="2.5" cy="2.5" r="2.5"/><circle class="a" cx="2.5" cy="2.5" r="1.9"/></g><g class="c" transform="translate(4.191 5.009)"><circle class="d" cx="2.5" cy="2.5" r="2.5"/><circle class="a" cx="2.5" cy="2.5" r="1.9"/></g></g></g></svg>

+ 1 - 1
src/modules/editor/components/CompUI/basicUI/Ellipse/index.ts

@@ -23,7 +23,7 @@ export const { createComp, useCompData } = createCompHooks({
     end: 360
   },
   layout: {
-    size: [400, 200],
+    size: [200, 400],
   },
 });
 

+ 1 - 1
src/modules/editor/components/CompUI/basicUI/Polygon/index.ts

@@ -8,7 +8,7 @@ export { Component } from "./component";
 
 export const options = {
   name: "多边形",
-  thumbnail: require("@/modules/editor/assets/icons/polygon.svg"),
+  thumbnail: require("@/modules/editor/assets/icons/polygon2.svg"),
 };
 
 export const { createComp, useCompData } = createCompHooks({

+ 4 - 4
src/modules/editor/components/Viewport/Slider/SliderLeft/Shapes.tsx

@@ -14,12 +14,12 @@ export default defineComponent({
         return [
           "Line",
           "Arc",
+          "Curve",
           "Ellipse",
-          "Triangle",
-          "Rectage",
-          "Polygon",
+          // "Triangle",
+          // "Rectage",
           "PolygonNormal",
-          "Curve",
+          "Polygon",
         ].map((key) => compUICtrl.state.components.get(key) as any);
       },
     }));