Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

package.json

@@ -58,7 +58,7 @@
     "proto.gl": "^1.0.0",
     "qrcode": "^1.5.3",
     "queen3d": "^0.0.80",
-    "queenjs": "^1.0.0-beta.72",
+    "queenjs": "^1.0.0-beta.73",
     "rimraf": "^3.0.2",
     "scp2": "^0.5.0",
     "swiper": "^8.4.4",

src/modules/editor/components/CompUI/customUI/Cards/Card12/component.tsx

@@ -25,7 +25,7 @@ export const Component = createUIComp({
             compId={children.img1}
             class="w-6.22rem h-6.22rem object-cover mx-auto"
           />
-          <div class="absolute right-5rem top-3rem card_color">
+          <div class="absolute right-5rem top-3rem card_color z-2">
             <div
               class="border-light-50 border-0.08rem border-top-0.06rem border-solid p-0.08rem pt-1rem"
               style={{

src/pages/website/CreateMat/components/TreePanel/MatItem.tsx

@@ -16,14 +16,16 @@ export default defineComponent({
       return (
         <div
           class={cx(
-            "flex items-center py-6px px-12px rounded-4px cursor-pointer border-1 border-solid hover:opacity-80 transition-all",
+            "flex items-center py-4px px-8px rounded-4px cursor-pointer border-1 border-solid hover:opacity-80 transition-all",
             active ? "border-orange-200" : "border-transparent"
           )}
           style={{ backgroundColor: "#303030" }}
           onClick={() => emit("click", record)}
         >
-          <Image src={record.thumbnail} class="w-48px rounded-4px" />
-          <div class="ml-10px flex-1 mr-5px w-0">{record.name || "未命名"}</div>
+          <Image src={record.thumbnail} class="w-30px rounded-4px" />
+          <div class="ml-10px flex-1 mr-5px w-0 text-12px leading-tight">
+            {record.name || "未命名"}
+          </div>
           <Button
             ghost
             type="primary"

src/pages/website/CreateMat/components/TreePanel/MeshItem.tsx

@@ -23,7 +23,7 @@ export default defineComponent({
           onClick={() => emit("click", record)}
         >
           <Image src={record.thumbnail} class="w-48px rounded-4px" />
-          <div class="ml-10px flex-1 mr-5px truncate w-0">
+          <div class="ml-10px flex-1 mr-5px w-0">
             {record.meshName || "未命名"}
           </div>
           <Button

src/pages/website/components/layout/LeftContent.tsx

@@ -18,12 +18,11 @@ export default defineUI({
   },
 
   setup(props) {
-  
     const footerOptions: TextListProps[] = [
       {
         label: "退出",
         icon: IconDownload,
-        onClick: ()=>props.Controller.loginOut(),
+        onClick: () => props.Controller.loginOut(),
       },
     ];
     const menuOptions = [
@@ -39,18 +38,18 @@ export default defineUI({
         icon: IconCamera,
         // suffix: "32",
       },
-      {
-        link: "/settings",
-        label: "设置",
-        icon: IconSettings,
-      },
+      // {
+      //   link: "/settings",
+      //   label: "设置",
+      //   icon: IconSettings,
+      // },
     ];
     return () => {
       const { userInfo } = props.Controller.state;
 
       return (
-        <div class={cx(rootStyles, "p-30px h-1/1 flex flex-col")}>
-          <div class="mt-20px">
+        <div class={cx(rootStyles, "px-25px py-16px h-1/1 flex flex-col")}>
+          <div>
             <Logo />
           </div>
           <div class="my-50px flex items-center">
@@ -62,7 +61,7 @@ export default defineUI({
               </div>
             </div>
           </div>
-          <router-link to="/">
+          {/* <router-link to="/">
             <TextListItem
               option={{
                 label: "资源中心",
@@ -76,8 +75,8 @@ export default defineUI({
                 ),
               }}
             />
-          </router-link>
-          <Divider />
+          </router-link> */}
+          <Divider class="!-mt-10px" />
           <div class="flex-1">
             {menuOptions?.map((option, index) => (
               <router-link to={option.link} key={index}>

src/pages/website/components/layout/Logo.tsx

@@ -1,8 +1,7 @@
 export default () => {
   return (
     <router-link to="/" class="block flex items-center">
-      <img class="h-25px" src={require("@/assets/imgs/Logo.png")} alt="" />
-      <span class="ml-10px text-white text-20px uppercase">queentu</span>
+      <img class="h-40px" src={require("@/assets/imgs/Logo.png")} alt="" />
     </router-link>
   );
 };

yarn.lock

@@ -7092,10 +7092,10 @@ queen3d@^0.0.80:
   resolved "http://124.70.149.18:4873/queen3d/-/queen3d-0.0.80.tgz#11d4c60f233fc54d810e8f912b79495e4acfb95e"
   integrity sha512-GaBzki+vcjC4JDN4olh/UI3oW6BRc1qbk1+pwUlbBN0oC+ilKNn9C64tLSEio0zWZikEtGb6A9jrUXntX1no4A==
 
-queenjs@^1.0.0-beta.72:
-  version "1.0.0-beta.72"
-  resolved "http://124.70.149.18:4873/queenjs/-/queenjs-1.0.0-beta.72.tgz#6baebc0ef714e5d6012749422faaac9dfec77f17"
-  integrity sha512-JqU36UHQvTaAZBFJ11Otv4Oi1bTbtDSmIchbqKLZQbzr0GWPUpqIkFMiNMPIFl0492/7HacasExOe6l1PyIqxg==
+queenjs@^1.0.0-beta.73:
+  version "1.0.0-beta.73"
+  resolved "http://124.70.149.18:4873/queenjs/-/queenjs-1.0.0-beta.73.tgz#ad9183f5652dd7a57b8d58b5d77193879a3ce168"
+  integrity sha512-uLxILs10cPqKpD0Jj5ASls5qsQxSr685JFEBarycOHu7a4z26kACRHE8piu6axAfK9nwdSq1SqY5T2PhwdpkTA==
   dependencies:
     axios "^0.27.2"
     eventemitter3 "^4.0.7"