更换图标

src/assets/icons/components/IconCube.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconCube = createIcon(<svg viewBox="0 0 16 16"><g transform="translate(-1638 -912)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(1638 912)"/><g transform="translate(-33.699 -8.514)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M15.7,12l5.7,3.257v6.514l-5.7,3.257L10,21.771V15.257Z" transform="translate(1664 910)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M10,20l5.7,3.257L21.4,20" transform="translate(1664 905.257)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,28v6.514" transform="translate(1655.7 900.514)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.55,16l2.85,1.628v3.257M12.85,16,10,17.628v3.257m2.85,4.885L15.7,27.4l2.85-1.628" transform="translate(1664 907.628)"/></g></g></svg>)

src/assets/icons/components/IconGroup.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconGroup = createIcon(<svg viewBox="0 0 16 16"><g transform="translate(-292 -40)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(292 40)"/><g transform="translate(288 35.707)"><rect fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" width="12" height="12" rx="1" transform="translate(6 6.293)"/></g><g transform="translate(291.156 38.863)"><rect fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" width="6" height="6" rx="1" transform="translate(5.844 6.137)"/></g></g></svg>)

src/assets/icons/components/IconImage.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconImage = createIcon(<svg viewBox="0 0 16 16"><g transform="translate(0 0.302)"><g transform="translate(1.771 1.772)"><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M17.141,6H7.013A1.013,1.013,0,0,0,6,7.013V17.141a1.013,1.013,0,0,0,1.013,1.013H17.141a1.013,1.013,0,0,0,1.013-1.013V7.013A1.013,1.013,0,0,0,17.141,6Z" transform="translate(-6 -6)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M14.688,16.376A1.688,1.688,0,1,0,13,14.688,1.688,1.688,0,0,0,14.688,16.376Z" transform="translate(-10.637 -10.637)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M18.154,29.376,14.44,26l-3.376,3.039L8.7,27.013,6,29.039" transform="translate(-6 -19.248)"/></g><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 -0.302)"/></g></svg>)

src/assets/icons/components/IconLocked.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconLocked = createIcon(<svg viewBox="0 0 14 14"><rect fill="none" width="14" height="14"/><g transform="translate(2.471 2.111)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" width="9.327" height="6.218" rx="2" transform="translate(0 3.73)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M14,7.73V6.636A2.636,2.636,0,0,1,16.636,4a2.742,2.742,0,0,1,2.209,1.2,2.434,2.434,0,0,1,.426,1.438V7.73" transform="translate(-11.864 -4)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,30v1.582" transform="translate(-19.228 -23.803)"/></g></svg>)

src/assets/icons/components/IconQueen.tsx

@@ -1,7 +1,6 @@
 
 import { createIcon } from '@queenjs/icons';
 export const IconQueen = createIcon(<svg viewBox="0 0 33 33">
-  
   <g transform="translate(3 2)">
     <path fill="currentColor"
       d="M59.576,345.96h-.73c-.038,0-.076-.011-.115-.013-.318-.021-.637-.026-.953-.065-.432-.053-.864-.12-1.292-.2a12.65,12.65,0,0,1-2.631-.808A13.673,13.673,0,0,1,48.4,340.7a13.508,13.508,0,0,1-2.351-4.538,12.879,12.879,0,0,1-.5-2.532c-.032-.356-.068-.713-.069-1.069-.007-1.638,0-3.277,0-4.915,0-.112.006-.224.015-.335a.634.634,0,0,1,.545-.553c.16-.014.32-.017.481-.017H71.9c.119,0,.239,0,.358,0a.72.72,0,0,1,.367.1.683.683,0,0,1,.315.626c0,1.553,0,3.106,0,4.66a14.366,14.366,0,0,1-.13,1.992,13.314,13.314,0,0,1-.3,1.531,13.718,13.718,0,0,1-11.56,10.2c-.428.054-.861.071-1.292.105C59.633,345.95,59.6,345.956,59.576,345.96Zm-.359-14.652H50.5a.451.451,0,0,0-.45.42,9.764,9.764,0,0,0,.062,1.573,11.238,11.238,0,0,0,.217,1.162A9.033,9.033,0,0,0,53.4,339.3a8.913,8.913,0,0,0,2.774,1.566,9.228,9.228,0,0,0,4.072.461,8.7,8.7,0,0,0,1.242-.229,9.089,9.089,0,0,0,4.8-3.057,8.894,8.894,0,0,0,1.484-2.548,8.7,8.7,0,0,0,.57-2.571c.024-.391.021-.783.03-1.174a.338.338,0,0,0-.007-.065.474.474,0,0,0-.47-.376Q63.555,331.311,59.216,331.308Z"

src/assets/icons/components/IconText.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconText = createIcon(<svg viewBox="0 0 16 16"><g transform="translate(0 -0.078)"><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 0.078)"/><g transform="translate(1.892 1.971)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" width="12" height="12" rx="1" transform="translate(0.107 0.107)"/><g transform="translate(2.764 2.367)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M16,17.192V16h6.36v1.192" transform="translate(-16 -16)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M22,34h1.59" transform="translate(-19.615 -26.845)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,18v6.36" transform="translate(-20.821 -17.205)"/></g></g></g></svg>)

src/assets/icons/components/IconVideo.tsx

@@ -0,0 +1,3 @@
+
+import { createIcon } from '@queenjs/icons';
+export const IconVideo = createIcon(<svg viewBox="0 0 16 16"><g transform="translate(-292 -40)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(292 40)"/><g transform="translate(288 35.707)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" width="12" height="12" rx="1" transform="translate(6 6.293)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.5,18.845V16.206l2.285,1.319,2.285,1.319-2.285,1.319L18.5,21.484Z" transform="translate(-8.268 -6.75)"/></g></g></svg>)

src/assets/icons/index.ts

@@ -5,12 +5,18 @@ export * from "./components/IconAlignC";
 export * from "./components/IconAlignL";
 export * from "./components/IconAlignR";
 export * from "./components/IconClear";
+export * from "./components/IconCube";
 export * from "./components/IconFloatOff";
 export * from "./components/IconFloatOn";
+export * from "./components/IconGroup";
+export * from "./components/IconImage";
 export * from "./components/IconLayerDown";
 export * from "./components/IconLayerUp";
+export * from "./components/IconLocked";
 export * from "./components/IconMove";
 export * from "./components/IconQueen";
 export * from "./components/IconResizeY";
 export * from "./components/IconRotate";
+export * from "./components/IconText";
+export * from "./components/IconVideo";
 export * from "./components/IconWechat";

src/assets/icons/svg/cube.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><g transform="translate(-1638 -912)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(1638 912)"/><g transform="translate(-33.699 -8.514)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M15.7,12l5.7,3.257v6.514l-5.7,3.257L10,21.771V15.257Z" transform="translate(1664 910)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M10,20l5.7,3.257L21.4,20" transform="translate(1664 905.257)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,28v6.514" transform="translate(1655.7 900.514)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.55,16l2.85,1.628v3.257M12.85,16,10,17.628v3.257m2.85,4.885L15.7,27.4l2.85-1.628" transform="translate(1664 907.628)"/></g></g></svg>

src/assets/icons/svg/group.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><g transform="translate(-292 -40)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(292 40)"/><g transform="translate(288 35.707)"><rect fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" width="12" height="12" rx="1" transform="translate(6 6.293)"/></g><g transform="translate(291.156 38.863)"><rect fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" width="6" height="6" rx="1" transform="translate(5.844 6.137)"/></g></g></svg>

src/assets/icons/svg/image.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><g transform="translate(0 0.302)"><g transform="translate(1.771 1.772)"><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M17.141,6H7.013A1.013,1.013,0,0,0,6,7.013V17.141a1.013,1.013,0,0,0,1.013,1.013H17.141a1.013,1.013,0,0,0,1.013-1.013V7.013A1.013,1.013,0,0,0,17.141,6Z" transform="translate(-6 -6)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M14.688,16.376A1.688,1.688,0,1,0,13,14.688,1.688,1.688,0,0,0,14.688,16.376Z" transform="translate(-10.637 -10.637)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M18.154,29.376,14.44,26l-3.376,3.039L8.7,27.013,6,29.039" transform="translate(-6 -19.248)"/></g><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 -0.302)"/></g></svg>

src/assets/icons/svg/locked.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 14 14"><rect fill="none" width="14" height="14"/><g transform="translate(2.471 2.111)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" width="9.327" height="6.218" rx="2" transform="translate(0 3.73)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M14,7.73V6.636A2.636,2.636,0,0,1,16.636,4a2.742,2.742,0,0,1,2.209,1.2,2.434,2.434,0,0,1,.426,1.438V7.73" transform="translate(-11.864 -4)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,30v1.582" transform="translate(-19.228 -23.803)"/></g></svg>

src/assets/icons/svg/text.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><g transform="translate(0 -0.078)"><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 0.078)"/><g transform="translate(1.892 1.971)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" width="12" height="12" rx="1" transform="translate(0.107 0.107)"/><g transform="translate(2.764 2.367)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M16,17.192V16h6.36v1.192" transform="translate(-16 -16)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M22,34h1.59" transform="translate(-19.615 -26.845)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,18v6.36" transform="translate(-20.821 -17.205)"/></g></g></g></svg>

src/assets/icons/svg/video.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><g transform="translate(-292 -40)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(292 40)"/><g transform="translate(288 35.707)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" width="12" height="12" rx="1" transform="translate(6 6.293)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.5,18.845V16.206l2.285,1.319,2.285,1.319-2.285,1.319L18.5,21.484Z" transform="translate(-8.268 -6.75)"/></g></g></svg>

src/modules/editor/assets/icons/cube.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g transform="translate(-1638 -912)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(1638 912)"/><g transform="translate(-33.699 -8.514)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M15.7,12l5.7,3.257v6.514l-5.7,3.257L10,21.771V15.257Z" transform="translate(1664 910)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M10,20l5.7,3.257L21.4,20" transform="translate(1664 905.257)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,28v6.514" transform="translate(1655.7 900.514)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.55,16l2.85,1.628v3.257M12.85,16,10,17.628v3.257m2.85,4.885L15.7,27.4l2.85-1.628" transform="translate(1664 907.628)"/></g></g></svg>

src/modules/editor/assets/icons/image.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g transform="translate(0 0.302)"><g transform="translate(1.771 1.772)"><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M17.141,6H7.013A1.013,1.013,0,0,0,6,7.013V17.141a1.013,1.013,0,0,0,1.013,1.013H17.141a1.013,1.013,0,0,0,1.013-1.013V7.013A1.013,1.013,0,0,0,17.141,6Z" transform="translate(-6 -6)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M14.688,16.376A1.688,1.688,0,1,0,13,14.688,1.688,1.688,0,0,0,14.688,16.376Z" transform="translate(-10.637 -10.637)"/><path fill="none" stroke="#a9abaf" stroke-linecap="round" stroke-linejoin="round" d="M18.154,29.376,14.44,26l-3.376,3.039L8.7,27.013,6,29.039" transform="translate(-6 -19.248)"/></g><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 -0.302)"/></g></svg>

src/modules/editor/assets/icons/text2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g transform="translate(0 -0.078)"><rect fill="none" opacity="0.2" width="16" height="16" transform="translate(0 0.078)"/><g transform="translate(1.892 1.971)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" width="12" height="12" rx="1" transform="translate(0.107 0.107)"/><g transform="translate(2.764 2.367)"><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M16,17.192V16h6.36v1.192" transform="translate(-16 -16)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M22,34h1.59" transform="translate(-19.615 -26.845)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" d="M24,18v6.36" transform="translate(-20.821 -17.205)"/></g></g></g></svg>

src/modules/editor/assets/icons/video2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g transform="translate(-292 -40)"><rect fill="none" opacity="0.128" width="16" height="16" transform="translate(292 40)"/><g transform="translate(288 35.707)"><rect fill="none" stroke="#a9abaf" stroke-linejoin="round" stroke-linecap="round" width="12" height="12" rx="1" transform="translate(6 6.293)"/><path fill="none" stroke="#a9abaf" stroke-linejoin="round" d="M18.5,18.845V16.206l2.285,1.319,2.285,1.319-2.285,1.319L18.5,21.484Z" transform="translate(-8.268 -6.75)"/></g></g></svg>

src/modules/editor/components/CompUI/basicUI/Image2/index.ts

@@ -6,7 +6,7 @@ export { Component } from "./component";
 
 export const options = {
   name: "图片",
-  thumbnail: require("@/modules/editor/assets/icons/picture.svg"),
+  thumbnail: require("@/modules/editor/assets/icons/image.svg"),
 };
 
 export const { createComp, useCompData } = createCompHooks({

src/modules/editor/components/CompUI/basicUI/Text/index.ts

@@ -6,7 +6,7 @@ export { Component } from "./component";
 
 export const options = {
   name: "文本",
-  thumbnail: require("@/modules/editor/assets/icons/text.svg"),
+  thumbnail: require("@/modules/editor/assets/icons/text2.svg"),
 };
 
 export const { createComp, useCompData } = createCompHooks({

src/modules/editor/components/CompUI/basicUI/Video/index.ts

@@ -6,7 +6,7 @@ export { Component } from "./component";
 
 export const options = {
   name: "视频",
-  thumbnail: require("@/modules/editor/assets/icons/video.svg"),
+  thumbnail: require("@/modules/editor/assets/icons/video2.svg"),
 };
 
 export const { createComp, useCompData } = createCompHooks({

src/modules/editor/components/CompUI/basicUI/Web3D/index.ts

@@ -7,7 +7,7 @@ export { Component } from "./component";
 
 export const options = {
   name: "3D",
-  thumbnail: require("@/modules/editor/assets/icons/3d.svg"),
+  thumbnail: require("@/modules/editor/assets/icons/cube.svg"),
 };
 
 export const { createComp, useCompData } = createCompHooks({

src/modules/editor/components/Viewport/Slider/SliderLeft/index.tsx

@@ -21,11 +21,7 @@ export default defineUI({
     const state = useReactive(() => ({
       currTabType: "senior",
       basicComps() {
-        return Array.from(compUICtrl.state.components.values()).filter(
-          (item) =>
-            item.compType === "basic" &&
-            !["Page", "Container", "Group"].includes(item.compKey)
-        );
+        return ["Text", "Image", "Video", "Web3D"].map(key => compUICtrl.state.components.get(key) as any);
       },
       currComps() {
         return Array.from(compUICtrl.state.components.values()).filter(

src/pages/share/Promotion/index.tsx

@@ -26,7 +26,12 @@ export default defineComponent(() => {
       editor.controls.wxCtrl.setShare(shareData);
     });
   }
-
+  // fetch("https://restapi.amap.com/v3/ip?key=6f53b2e09f72ad63423b2da6e08b25d7").then(response=>{
+  //    return response.json();
+  // }).then(data=>{
+  //   console.log(data);
+  // })
+  
   return () => (
     <div class="flex items-center justify-center h-100vh bg-gray-100">
       <div class={isPc() ? `h-668px scrollbar` : `h-full`}>