fix: 修改bug

public/styles/style-1.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22.4142 6.41421C21.1543 5.15428 19 6.04662 19 7.82843V11H3C1.89543 11 1 11.8954 1 13V19C1 20.1046 1.89543 21 3 21H19V24.1716C19 25.9534 21.1543 26.8457 22.4142 25.5858L30.5858 17.4142C31.3668 16.6332 31.3668 15.3668 30.5858 14.5858L22.4142 6.41421Z" stroke="white"/>
+<path d="M22.4142 6.41401C21.1543 5.15408 19 6.04642 19 7.82823V10.9998H3C1.89543 10.9998 1 11.8952 1 12.9998V18.9998C1 20.1044 1.89543 20.9998 3 20.9998H19V24.1714C19 25.9532 21.1543 26.8455 22.4142 25.5856L30.5858 17.414C31.3668 16.633 31.3668 15.3666 30.5858 14.5856L22.4142 6.41401Z" stroke="black"/>
 </svg>

public/styles/style-12.svg

@@ -1,8 +1,8 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 22C10.3137 22 13 19.3137 13 16C13 12.6863 10.3137 10 7 10C3.68629 10 1 12.6863 1 16C1 19.3137 3.68629 22 7 22Z" stroke="white" stroke-linecap="round"/>
-<path d="M13 16H22" stroke="white" stroke-linecap="round"/>
-<path d="M15 16L19.5 9" stroke="white" stroke-linecap="round"/>
-<path d="M22 16L30 10" stroke="white" stroke-linecap="round"/>
-<path d="M22 16L30 22" stroke="white" stroke-linecap="round"/>
-<path d="M15 16L19.5 23" stroke="white" stroke-linecap="round"/>
+<path d="M7 22C10.3137 22 13 19.3137 13 16C13 12.6863 10.3137 10 7 10C3.68629 10 1 12.6863 1 16C1 19.3137 3.68629 22 7 22Z" stroke="black" stroke-linecap="round"/>
+<path d="M13 16H22" stroke="black" stroke-linecap="round"/>
+<path d="M15 16L19.5 9" stroke="black" stroke-linecap="round"/>
+<path d="M22 16L30 10" stroke="black" stroke-linecap="round"/>
+<path d="M22 16L30 22" stroke="black" stroke-linecap="round"/>
+<path d="M15 16L19.5 23" stroke="black" stroke-linecap="round"/>
 </svg>

public/styles/style-13.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31 14.5L23.5 12L1 12V14.5L15.75 14.5V17H23.5L31 20.125V14.5Z" stroke="white"/>
+<path d="M31 14.5L23.5 12H1V14.5H15.75V17H23.5L31 20.125V14.5Z" stroke="black"/>
 </svg>

public/styles/style-14.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 7H31V24.7273H25.5455V17.9091H17.3636V11.0909H1V7Z" stroke="white"/>
+<path d="M1 7H31V24.7273H25.5455V17.9091H17.3636V11.0909H1V7Z" stroke="black"/>
 </svg>

public/styles/style-15.svg

@@ -1,5 +1,5 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.99951 24.4H25.5995V25.8H5.99951V24.4Z" stroke="white"/>
-<path d="M5.99951 27.2H25.5995V30H5.99951V27.2Z" stroke="white"/>
-<path d="M25.6 23C18.25 23 11.5125 23 6 23C6 11.402 10.3876 2 15.8 2C21.2124 2 25.6 11.402 25.6 23Z" stroke="white"/>
+<path d="M5.99951 24.3984H25.5995V25.7984H5.99951V24.3984Z" stroke="black"/>
+<path d="M5.99951 27.1992H25.5995V29.9992H5.99951V27.1992Z" stroke="black"/>
+<path d="M25.6 23C18.25 23 11.5125 23 6 23C6 11.402 10.3876 2 15.8 2C21.2124 2 25.6 11.402 25.6 23Z" stroke="black"/>
 </svg>

public/styles/style-16.svg

@@ -1,4 +1,4 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.99951 28.4444C4.99951 27.5853 5.69596 26.8889 6.55507 26.8889H25.2217C26.0808 26.8889 26.7773 27.5853 26.7773 28.4444V28.4444C26.7773 29.3036 26.0808 30 25.2217 30H6.55507C5.69596 30 4.99951 29.3036 4.99951 28.4444V28.4444Z" stroke="white"/>
-<path d="M5 2H26.7778V23.3333C26.7778 24.4379 25.8823 25.3333 24.7778 25.3333H7C5.89543 25.3333 5 24.4379 5 23.3333V2Z" stroke="white"/>
+<path d="M4.99951 28.4461C4.99951 27.587 5.69596 26.8906 6.55507 26.8906H25.2217C26.0808 26.8906 26.7773 27.587 26.7773 28.4461C26.7773 29.3053 26.0808 30.0017 25.2217 30.0017H6.55507C5.69596 30.0017 4.99951 29.3053 4.99951 28.4461Z" stroke="black"/>
+<path d="M5 2H26.7778V23.3333C26.7778 24.4379 25.8823 25.3333 24.7778 25.3333H7C5.89543 25.3333 5 24.4379 5 23.3333V2Z" stroke="black"/>
 </svg>

public/styles/style-17.svg

@@ -1,6 +1,6 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 21.8C2 21.8 6.66667 26 16 26C25.3333 26 30 21.8 30 21.8" stroke="white" stroke-linecap="round"/>
-<path d="M6.2002 5C6.2002 5 9.46686 7.8 16.0002 7.8C22.5335 7.8 25.8002 5 25.8002 5" stroke="white" stroke-linecap="round"/>
-<path d="M24.3998 15.0406C24.3998 15.0406 21.3476 18.3 15.9998 18.3C10.652 18.3 4.8999 13.63 4.8999 13.63" stroke="white" stroke-linecap="round"/>
-<path d="M9.67806 12.35L4.89697 13.6311L6.17806 18.4122" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 21.8008C2 21.8008 6.66667 26.0008 16 26.0008C25.3333 26.0008 30 21.8008 30 21.8008" stroke="black" stroke-linecap="round"/>
+<path d="M6.2002 5C6.2002 5 9.46686 7.8 16.0002 7.8C22.5335 7.8 25.8002 5 25.8002 5" stroke="black" stroke-linecap="round"/>
+<path d="M24.3998 15.0395C24.3998 15.0395 21.3476 18.2989 15.9998 18.2989C10.652 18.2989 4.8999 13.6289 4.8999 13.6289" stroke="black" stroke-linecap="round"/>
+<path d="M9.67806 12.3516L4.89697 13.6327L6.17806 18.4138" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

public/styles/style-18.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21.3332 25.3333L15.9998 30.6667L10.6665 25.3333H13.3333V12C13.3333 11.2644 12.7376 10.6679 12.0023 10.6667H6.66683V13.3333L1.3335 7.99999L6.66683 2.66666V5.33332H25.3332V2.66666L30.6665 7.99999L25.3332 13.3333V10.6667H19.9968C19.2689 10.6684 18.678 11.2534 18.6668 11.979V25.3333L21.3332 25.3333Z" stroke="white"/>
+<path d="M21.3332 25.3346L15.9998 30.668L10.6665 25.3346H13.3333V12.0013C13.3333 11.2657 12.7376 10.6692 12.0023 10.668H6.66683V13.3346L1.3335 8.0013L6.66683 2.66797V5.33463H25.3332V2.66797L30.6665 8.0013L25.3332 13.3346V10.668H19.9968C19.2689 10.6697 18.678 11.2547 18.6668 11.9803V25.3346H21.3332Z" stroke="black"/>
 </svg>

public/styles/style-2.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 7H24L31 16L24 25H1V7Z" stroke="white"/>
+<path d="M1 7H24L31 16L24 25H1V7Z" stroke="black"/>
 </svg>

public/styles/style-3.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.36788 4.15752C3.09055 2.96002 1 3.86571 1 5.61659V26.3837C1 28.1345 3.09055 29.0402 4.36788 27.8427L15.4437 17.4592C15.7192 17.2009 15.9046 17.8841 16 17.547V26.3837C16 28.1345 18.0906 29.0402 19.3679 27.8427L30.4437 17.4592C31.2865 16.6691 31.2865 15.3312 30.4437 14.5411L19.3679 4.15752C18.0906 2.96002 16 3.86571 16 5.61659V14.4532C15.9046 14.1162 15.7192 14.7993 15.4437 14.5411L4.36788 4.15752Z" stroke="white" stroke-linejoin="round"/>
+<path d="M4.36788 4.15817C3.09055 2.96067 1 3.86636 1 5.61724V26.3844C1 28.1352 3.09055 29.0409 4.36788 27.8434L15.4437 17.4599C15.7192 17.2016 15.9046 17.8848 16 17.5477V26.3844C16 28.1352 18.0906 29.0409 19.3679 27.8434L30.4437 17.4599C31.2865 16.6698 31.2865 15.3319 30.4437 14.5418L19.3679 4.15817C18.0906 2.96067 16 3.86636 16 5.61724V14.4539C15.9046 14.1169 15.7192 14.8 15.4437 14.5418L4.36788 4.15817Z" stroke="black" stroke-linejoin="round"/>
 </svg>

public/styles/style-4.svg

@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16 1C9.92487 1 5 5.88417 5 11.9091V20.0909C5 26.1158 9.92487 31 16 31C22.0751 31 27 26.1158 27 20.0909V11.9091C27 5.88417 22.0751 1 16 1Z" stroke="white"/>
-<path d="M22.589 24C23.0056 23.586 23.3494 22.8634 23.5892 22.0724C23.8363 21.2575 24 20.2809 24 19.2872V11.9493C24 7.55904 20.4183 4 16 4C11.5817 4 8 7.55904 8 11.9493V19.2872" stroke="white" stroke-linecap="round"/>
-<path d="M19.158 25C19.3691 24.7787 19.5773 24.4084 19.7655 23.9954C19.9621 23.5636 20.1637 23.0242 20.3452 22.4156C20.7074 21.201 21 19.6756 21 18.1375V12.2757C21 9.36199 18.7459 7 15.9654 7C13.1849 7 10.9309 9.36199 10.9309 12.2757V19.3099C10.9309 19.7121 10.7309 20.1697 10.4312 20.5466C10.2856 20.7297 10.1325 20.8728 10 20.9654" stroke="white" stroke-linecap="round"/>
-<path d="M11 23.6387C11.8688 23.1095 12.4076 22.3455 12.731 21.6359C13.0614 20.9111 13.1546 20.271 13.1546 20.0347V12.9514C13.1546 11.3214 14.2393 10 15.5773 10C16.9153 10 18 11.3214 18 12.9514V20.0347C18 20.7546 17.8693 22.0023 17.4873 23.3048C17.1054 24.607 16.4554 26.0208 15.3837 27" stroke="white" stroke-linecap="round"/>
-<path d="M11.6499 26.4546C14.3052 24.4795 15.4999 22.613 15.4999 20.1818L15.5 13" stroke="white" stroke-linecap="round"/>
+<path d="M16 1C9.92487 1 5 5.88417 5 11.9091V20.0909C5 26.1158 9.92487 31 16 31C22.0751 31 27 26.1158 27 20.0909V11.9091C27 5.88417 22.0751 1 16 1Z" stroke="black"/>
+<path d="M22.589 24C23.0056 23.586 23.3494 22.8634 23.5892 22.0724C23.8363 21.2575 24 20.2809 24 19.2872V11.9493C24 7.55904 20.4183 4 16 4C11.5817 4 8 7.55904 8 11.9493V19.2872" stroke="black" stroke-linecap="round"/>
+<path d="M19.158 25C19.3691 24.7787 19.5773 24.4084 19.7655 23.9954C19.9621 23.5636 20.1637 23.0242 20.3452 22.4156C20.7074 21.201 21 19.6756 21 18.1375V12.2757C21 9.36199 18.7459 7 15.9654 7C13.1849 7 10.9309 9.36199 10.9309 12.2757V19.3099C10.9309 19.7121 10.7309 20.1697 10.4312 20.5466C10.2856 20.7297 10.1325 20.8728 10 20.9654" stroke="black" stroke-linecap="round"/>
+<path d="M11 23.6387C11.8688 23.1095 12.4076 22.3455 12.731 21.6359C13.0614 20.9111 13.1546 20.271 13.1546 20.0347V12.9514C13.1546 11.3214 14.2393 10 15.5773 10C16.9153 10 18 11.3214 18 12.9514V20.0347C18 20.7546 17.8693 22.0023 17.4873 23.3048C17.1054 24.607 16.4554 26.0208 15.3837 27" stroke="black" stroke-linecap="round"/>
+<path d="M11.6499 26.4546C14.3052 24.4795 15.4999 22.613 15.4999 20.1818L15.5 13" stroke="black" stroke-linecap="round"/>
 </svg>

public/styles/style-5.svg

@@ -1,8 +1,8 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.355 6.46922C12.6081 8.02312 9.72177 13.15 11.842 17.325C13.9622 21.5 13.9973 21.9165 13.9626 24.5139C13.9464 25.7285 13.9307 26.9029 14.6644 28.6261C16.4571 32.3235 22.6443 31.5404 23.2449 27.3977C23.2904 25.7346 22.7251 24.9238 22.1631 24.1177C20.1423 21.2191 21.2162 17.3854 22.5147 14.4016C23.0893 13.0812 23.6648 11.7586 23.8486 10.3755C24.1305 6.68419 20.7688 5.04431 17.355 6.46922Z" stroke="white"/>
-<path d="M10.0853 8.37411C11.7665 8.22761 12.251 10.9588 10.4408 11.0581C8.81045 11.1476 8.38974 8.52039 10.0853 8.37411Z" stroke="white"/>
-<path d="M11.6454 5.35831C9.75754 5.44325 10.203 8.41993 11.9518 8.35555C13.8029 8.28451 13.4293 5.28354 11.6454 5.35831Z" stroke="white"/>
-<path d="M14.7253 3.01308C12.6211 2.28966 11.8417 5.74147 13.7784 6.42183C15.8329 7.13965 16.7048 3.69243 14.7253 3.01308Z" stroke="white"/>
-<path d="M15.9476 2.99217C15.8956 3.98435 16.4747 5.0927 17.3787 5.27695C19.6047 5.74037 20.035 2.03484 17.8843 1.61332C17.1655 1.4673 15.9996 1.99999 15.9476 2.99217Z" stroke="white"/>
-<path d="M22.239 5.42914C24.8984 5.30336 24.2528 0.93033 21.7548 1.00084C19.1707 1.07359 19.7911 5.53551 22.239 5.42914Z" stroke="white"/>
+<path d="M17.355 6.46742C12.6081 8.02132 9.72177 13.1482 11.842 17.3232C13.9622 21.4982 13.9973 21.9147 13.9626 24.5121C13.9464 25.7267 13.9307 26.9011 14.6644 28.6243C16.4571 32.3217 22.6443 31.5386 23.2449 27.3959C23.2904 25.7328 22.7251 24.922 22.1631 24.1159C20.1423 21.2173 21.2162 17.3836 22.5147 14.3998C23.0893 13.0794 23.6648 11.7568 23.8486 10.3737C24.1305 6.68239 20.7688 5.04251 17.355 6.46742Z" stroke="black"/>
+<path d="M10.0853 8.37288C11.7665 8.22638 12.251 10.9576 10.4408 11.0569C8.81045 11.1464 8.38974 8.51916 10.0853 8.37288Z" stroke="black"/>
+<path d="M11.6454 5.35684C9.75753 5.44178 10.203 8.41846 11.9518 8.35408C13.8029 8.28304 13.4293 5.28207 11.6454 5.35684Z" stroke="black"/>
+<path d="M14.7253 3.01316C12.6211 2.28974 11.8417 5.74155 13.7784 6.42191C15.8329 7.13973 16.7048 3.69251 14.7253 3.01316Z" stroke="black"/>
+<path d="M15.9476 2.99254C15.8956 3.98472 16.4747 5.09307 17.3787 5.27732C19.6047 5.74074 20.035 2.03521 17.8843 1.61369C17.1655 1.46767 15.9996 2.00036 15.9476 2.99254Z" stroke="black"/>
+<path d="M22.239 5.42914C24.8984 5.30336 24.2528 0.930334 21.7548 1.00084C19.1707 1.07359 19.7911 5.53551 22.239 5.42914Z" stroke="black"/>
 </svg>

public/styles/style-6.svg

@@ -1,8 +1,8 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.5976 6.46922C20.3445 8.02312 23.2309 13.15 21.1106 17.325C18.9904 21.5 18.9553 21.9165 18.99 24.5139C19.0063 25.7285 19.022 26.9029 18.2883 28.6261C16.4955 32.3235 10.3084 31.5404 9.70774 27.3977C9.66227 25.7346 10.2275 24.9238 10.7895 24.1177C12.8104 21.2191 11.7364 17.3854 10.4379 14.4016C9.86337 13.0812 9.28781 11.7586 9.10404 10.3755C8.82211 6.68419 12.1838 5.04431 15.5976 6.46922Z" stroke="white"/>
-<path d="M22.8673 8.37411C21.1862 8.22761 20.7016 10.9588 22.5119 11.0581C24.1422 11.1476 24.5629 8.52039 22.8673 8.37411Z" stroke="white"/>
-<path d="M21.3073 5.35831C23.1951 5.44325 22.7497 8.41993 21.0008 8.35555C19.1497 8.28451 19.5233 5.28354 21.3073 5.35831Z" stroke="white"/>
-<path d="M18.2273 3.01308C20.3316 2.28966 21.111 5.74147 19.1743 6.42183C17.1198 7.13965 16.2478 3.69243 18.2273 3.01308Z" stroke="white"/>
-<path d="M17.0051 2.99217C17.0571 3.98435 16.478 5.0927 15.574 5.27695C13.348 5.74037 12.9176 2.03484 15.0683 1.61332C15.7872 1.4673 16.9531 1.99999 17.0051 2.99217Z" stroke="white"/>
-<path d="M10.7136 5.42914C8.05421 5.30336 8.69984 0.93033 11.1978 1.00084C13.782 1.07359 13.1615 5.53551 10.7136 5.42914Z" stroke="white"/>
+<path d="M15.5975 6.46742C20.3444 8.02132 23.2308 13.1482 21.1105 17.3232C18.9903 21.4982 18.9552 21.9147 18.9899 24.5121C19.0062 25.7267 19.0219 26.9011 18.2882 28.6243C16.4954 32.3217 10.3083 31.5386 9.70768 27.3959C9.66221 25.7328 10.2274 24.922 10.7894 24.1159C12.8103 21.2173 11.7363 17.3836 10.4378 14.3998C9.86331 13.0794 9.28775 11.7568 9.10398 10.3737C8.82205 6.68239 12.1837 5.04251 15.5975 6.46742Z" stroke="black"/>
+<path d="M22.8675 8.37288C21.1864 8.22638 20.7018 10.9576 22.5121 11.0569C24.1424 11.1464 24.5631 8.51916 22.8675 8.37288Z" stroke="black"/>
+<path d="M21.3071 5.35684C23.1949 5.44178 22.7495 8.41846 21.0006 8.35408C19.1495 8.28304 19.5231 5.28207 21.3071 5.35684Z" stroke="black"/>
+<path d="M18.2272 3.01316C20.3315 2.28974 21.1109 5.74155 19.1742 6.42191C17.1197 7.13973 16.2477 3.69251 18.2272 3.01316Z" stroke="black"/>
+<path d="M17.005 2.99254C17.057 3.98472 16.4779 5.09307 15.5739 5.27732C13.3479 5.74074 12.9175 2.03521 15.0682 1.61369C15.7871 1.46767 16.953 2.00036 17.005 2.99254Z" stroke="black"/>
+<path d="M10.7134 5.42914C8.05402 5.30336 8.69965 0.930334 11.1976 1.00084C13.7818 1.07359 13.1613 5.53551 10.7134 5.42914Z" stroke="black"/>
 </svg>

public/styles/style-7.svg

@@ -1,4 +1,4 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.6461 21.4545H20.3585C20.463 22.0609 20.6519 22.6914 20.8437 23.3319C21.323 24.9319 21.8209 26.594 21.0688 28.0955C20.257 29.7318 18.8219 31 16.0386 31H15.9516C13.1683 31 11.7331 29.7455 10.9213 28.0955C10.1679 26.5599 10.6984 24.787 11.1968 23.1213C11.3682 22.5483 11.5359 21.9881 11.6461 21.4545Z" stroke="white"/>
-<path d="M9.5209 7.18095C8.70385 9.78901 9.502 12.5224 10.4421 15.0904L11.7736 18.7273H20.1322L21.6681 14.5947C22.4526 12.4838 23.1577 10.2625 22.6416 8.07382C21.8555 4.74035 19.5021 1 15.9531 1C12.6773 1 10.4776 4.12722 9.5209 7.18095Z" stroke="white"/>
+<path d="M11.6461 21.4531H20.3585C20.463 22.0595 20.6519 22.69 20.8437 23.3305C21.323 24.9305 21.8209 26.5926 21.0688 28.0941C20.257 29.7304 18.8219 30.9986 16.0386 30.9986H15.9516C13.1683 30.9986 11.7331 29.7441 10.9213 28.0941C10.1679 26.5585 10.6984 24.7856 11.1968 23.1199C11.3682 22.5469 11.5359 21.9867 11.6461 21.4531Z" stroke="black"/>
+<path d="M9.5209 7.18095C8.70385 9.78901 9.502 12.5224 10.4421 15.0904L11.7736 18.7273H20.1322L21.6681 14.5947C22.4526 12.4838 23.1577 10.2625 22.6416 8.07382C21.8555 4.74035 19.5021 1 15.9531 1C12.6773 1 10.4776 4.12722 9.5209 7.18095Z" stroke="black"/>
 </svg>

src/core/components/icon/index.ts

@@ -55,7 +55,7 @@ export const getMouseStyle = (data: IconData) => {
 export type IconData = Partial<typeof defaultStyle> &
   BaseItem & Size & {
     fill?: string | null;
-    stroke?: string;
+    stroke?: string | null;
     name?: string
     strokeWidth?: number;
     coverFill?: string;

src/core/components/index.ts

@@ -64,8 +64,8 @@ type _Components = {
   [key in keyof typeof _components]: (typeof _components)[key]
 }
 export type Components = {
-  [key in keyof _Components]: key extends keyof CompAttach<key> ? CompAttach<key> : _Components[key]
-};
+  [key in keyof _Components]: Omit<_Components[key], keyof CompAttach<key>> & CompAttach<key>
+} 
 export type ComponentValue<
   T extends ShapeType,
   K extends keyof Components[T]

src/core/components/serial/index.ts

@@ -52,7 +52,14 @@ export const getCurrentNdx = (store: DrawStore) => {
   const cs = store
     .getTypeItems("serial")
     .map((item) => Number(item.content || 0));
-  return (Math.max(...cs, 0) + 1).toString();
+  let max = Math.max(...cs, 0) + 1
+  let i = 1
+  for (; i < max; i++) {
+    if (!cs.includes(i)) {
+      break;
+    }
+  } 
+  return i.toString();
 };
 
 export const interactiveToData: InteractiveTo<"serial"> = ({
@@ -111,25 +118,25 @@ export const delItem = (store: DrawStore, item: SerialData) => {
       s = getPosition(i);
       for (let j = 0; j < s[2]; j++) {
         table.content[r[0]][r[1] + j] = table.content[s[0]][s[1] + j];
-        if (j === 0) {
-          table.content[r[0]][r[1] + j].content = oldItem.content!;
-        } else {
-          table.content[r[0]][r[1] + j].content =
-            table.content[s[0]][s[1] + j].content!;
-        }
+        // if (j === 0) {
+        //   table.content[r[0]][r[1] + j].content = oldItem.content!;
+        // } else {
+        //   table.content[r[0]][r[1] + j].content =
+        //     table.content[s[0]][s[1] + j].content!;
+        // }
       }
-      let cur = { ...data[i] };
-      data[i].content = oldItem.content;
-      const radius = (getSerialFontW(data[i]) * Math.sqrt(2)) / 2;
-      data[i].radiusX = radius;
-      data[i].radiusY = radius;
-      matResponse({
-        data: data[i],
-        mat: new Transform(data[i].mat),
-        increment: false,
-      });
-      store.setItem("serial", { id: data[i].id, value: { ...data[i] } });
-      oldItem = cur;
+      // let cur = { ...data[i] };
+      // data[i].content = oldItem.content;
+      // const radius = (getSerialFontW(data[i]) * Math.sqrt(2)) / 2;
+      // data[i].radiusX = radius;
+      // data[i].radiusY = radius;
+      // matResponse({
+      //   data: data[i],
+      //   mat: new Transform(data[i].mat),
+      //   increment: false,
+      // });
+      // store.setItem("serial", { id: data[i].id, value: { ...data[i] } });
+      // oldItem = cur;
     }
     table.content[s[0]][s[1]].content = "";
     const cols = table.content.flatMap((row) => {

src/core/components/serial/serial-group.vue

@@ -1,5 +1,5 @@
 <template>
-  <template v-for="(item, ndx) in data" :key="item.id">
+  <template v-for="item in data" :key="item.id">
     <Serial
       :data="item"
       @updateShape="(value: any) => store.setItem('serial', { id: item.id, value })"

src/core/hook/use-expose.ts

@@ -59,7 +59,7 @@ export const useAutoPaste = () => {
       async handler(pos, val, type) {
         const url = await resourceHandler(val, type);
         if (type.includes("svg")) {
-          drawAPI.addShape("icon", { url, stroke: '#000000', fill: null }, pos, true);
+          drawAPI.addShape("icon", { url, stroke: null, fill: '#000000' }, pos, true);
         } else {
           const image = await getImage(url);
           drawAPI.addShape(
@@ -150,7 +150,6 @@ export const useShortcutKey = () => {
           })
           .filter((item) => !!item);
         history.onceTrack(() => {
-          console.log(delItems);
           delItems.forEach(([type, item, childId]) => {
             if (!childId) {
               if (components[type as ShapeType].delItem) {

src/core/html-mount/propertys/hover-operate.vue

@@ -95,6 +95,9 @@ const calcPointer = async () => {
     pointer.value = null;
     return;
   }
+  if (!menus.value.length) {
+    return;
+  }
   const $shape = props.target!.getNode();
   const shapeRect = $shape.getClientRect();
 

src/example/components/header/actions.ts

@@ -51,7 +51,11 @@ export const getHeaderActions = (draw: Draw) => {
       disabled: computed(() => !draw.history.hasRedo.value),
     }),
     clear: reactive({
-      handler: () => draw.store.clear(),
+      handler: () => {
+        draw.store.setConfig({ compass: { ...draw.store.config.compass, rotation: 0 } })
+        draw.store.clear()
+        
+      },
       disabled: computed(() => draw.drawing),
       text: "清空",
       icon: "clear",

src/example/components/slide/slide.vue

@@ -44,7 +44,11 @@ const selectHandler = async (val: string) => {
   active.value = val;
 
   const menu = activeMenu.value;
-  if (menu) {
+  if (!menu) return;
+  if (menu.handler) {
+    menu.handler(props.draw);
+    nextTick(() => (active.value = undefined));
+  } else {
     props.draw.enterDrawShape(menu.payload.type, menu.payload.preset, menu.single);
   }
 };
@@ -70,9 +74,11 @@ const openHandler = (value: string) => {
   margin-left: var(--left);
   background: #fff;
   transition: margin-left 0.3s ease;
+
   &.hide {
     transform: translateX(-100%);
   }
+
   position: relative;
 }
 
@@ -153,6 +159,7 @@ const openHandler = (value: string) => {
   justify-content: center;
   line-height: 1em;
   font-size: 22px;
+
   span {
     font-size: 14px;
     margin-top: 5px;
@@ -162,12 +169,14 @@ const openHandler = (value: string) => {
 .sub-menu-horizontal .el-menu--popup {
   --el-menu-base-level-padding: 0;
   min-width: auto;
+
   .menu-layout {
     padding-left: 20px;
     padding-right: 20px;
     font-size: 32px;
     display: flex;
     align-items: center;
+
     span {
       margin-left: 5px;
       font-size: 14px;

src/example/fuse/views/tabulation/gen-tab.ts

@@ -203,6 +203,7 @@ export const genTabulationData = async (paperKey: PaperKey, compass?: number, co
       url: './icons/compass.svg',
       fill: "#000000",
       disableDelete: true,
+      itemName: '指南针',
       coverOpcatiy: 0,
       strokeScaleEnabled: false,
       key: tableCompassKey,

src/example/fuse/views/tabulation/header.vue

@@ -68,7 +68,7 @@ const baseActions = getHeaderActions(draw);
 const actions = [
   [baseActions.undo, baseActions.redo],
   [
-    baseActions.clear,
+    // baseActions.clear,
     {
       ...baseActions.initViewport,
       handler: () => {

src/example/fuse/views/tabulation/index.vue

@@ -215,8 +215,10 @@ const compass = computed(
 watch(compass, (compass, _, onCleanup) => {
   if (!compass || !draw.value) return;
   const mountMenus = draw.value.mountFilter;
+  const menusFilter = draw.value.menusFilter;
+  menusFilter.setShapeMenusFilter(compass.id, () => []);
   mountMenus.setShapeMenusFilter(compass.id, (des) => ({
-    ...des,
+    // ...des,
     rotate: {
       type: "num",
       label: "旋转角度",
@@ -242,7 +244,10 @@ watch(compass, (compass, _, onCleanup) => {
       },
     },
   }));
-  onCleanup(() => mountMenus.setShapeMenusFilter(compass.id));
+  onCleanup(() => {
+    mountMenus.setShapeMenusFilter(compass.id);
+    menusFilter.setShapeMenusFilter(compass.id);
+  });
 });
 
 const title = computed(() => tabulationData.value?.title || "图纸");

src/example/platform/platform-draw.ts

@@ -11,6 +11,7 @@ import { ElMessage } from "element-plus";
 import { ImageData } from "@/core/components/image";
 import { Size } from "@/utils/math";
 import { watchEffect } from "vue";
+import { getSvgContent, parseSvgContent } from "@/utils/resource";
 
 const scaleResource = (info: AIExposeData, scale: number) => {
   const floors = info.floors.map((item) => ({
@@ -220,7 +221,7 @@ const drawLayerResource = async (
       lock: import.meta.env.DEV ? false : true,
       height,
       cornerRadius: 0,
-      zIndex: -1
+      zIndex: -1,
     };
     images.push(thumb);
   }
@@ -253,7 +254,7 @@ const drawLayerResource = async (
       });
     });
   } else if (sGeo) {
-    sGeo.itemName = "1";  
+    sGeo.itemName = "1";
   } else {
     geo.itemName = "1";
   }
@@ -263,44 +264,57 @@ const drawLayerResource = async (
   });
 
   if (sGeo) {
-    sGeo.points = sGeo.points.concat(geo.points)
-    sGeo.lines = sGeo.lines.concat(geo.lines)
-    sGeo.polygon = sGeo.polygon.concat(geo.polygon)
-    geo = sGeo
+    sGeo.points = sGeo.points.concat(geo.points);
+    sGeo.lines = sGeo.lines.concat(geo.lines);
+    sGeo.polygon = sGeo.polygon.concat(geo.polygon);
+    geo = sGeo;
     draw.store.setItem("line", { id: geo.id, value: geo });
   } else {
     draw.store.addItem("line", geo);
   }
   if (thumb!) {
-    thumb.mat[4] = offset.x
-    thumb.mat[5] = offset.y
+    thumb.mat[4] = offset.x;
+    thumb.mat[5] = offset.y;
   }
-  images.push(
-    ...layerResource.taggings.map((item, ndx) => {
-      bound.update(item.position);
-      const tf = new Transform().translate(
-        item.position.x + offset.x,
-        item.position.y + offset.y
-      );
-      if (item.rotate) {
-        tf.rotate(item.rotate);
-      }
-      return {
-        ...getBaseItem(),
+  for (let ndx = 0; ndx < layerResource.taggings.length; ndx++) {
+    const item = layerResource.taggings[ndx];
+    bound.update(item.position);
+    const tf = new Transform().translate(
+      item.position.x + offset.x,
+      item.position.y + offset.y
+    );
+    if (item.rotate) {
+      tf.rotate(item.rotate);
+    }
+    let svgAttach: any = {}
+    if (item.url.includes(".svg")) {
+      svgAttach = {
         ...iconDefaultStyle,
-        name: item.name,
-        stroke: item.url.includes(".svg") ? "#000000" : undefined,
-        fill: null,
-        createTime: createTime + layerResource.geos.length + ndx,
-        url: item.url,
-        lock: import.meta.env.DEV ? false : true,
-        mat: tf.m,
-        width: item.size ? item.size.width : 100,
-        height: item.size ? item.size.height : 100,
-        cornerRadius: 0,
-      };
-    })
-  );
+        stroke: "#000000" ,
+        fill: null
+      }
+      try {
+        const svg = parseSvgContent(await getSvgContent(item.url))
+        if (svg.paths.length) {
+          svgAttach.fill = svg.paths[0].fill || null
+          svgAttach.stroke = svg.paths[0].stroke || null
+        }
+      } catch {}
+    }
+
+    images.push({
+      ...getBaseItem(),
+      ...svgAttach,
+      name: item.name,
+      createTime: createTime + layerResource.geos.length + ndx,
+      url: item.url,
+      lock: import.meta.env.DEV ? false : true,
+      mat: tf.m,
+      width: item.size ? item.size.width : 100,
+      height: item.size ? item.size.height : 100,
+      cornerRadius: 0,
+    });
+  }
 
   draw.store.addItems(
     "icon",
@@ -327,8 +341,8 @@ const drawLayerResource = async (
     center: {
       x: box.center.x + offset.x,
       y: box.center.y + offset.y,
-    }
-  }
+    },
+  };
 };
 
 export const drawPlatformResource = async (data: AIExposeData, draw: Draw) => {