Merge branch 'master' of http://124.70.149.18:10880/lianghj/queenshow

src/modules/resource/actions/material.ts

@@ -57,7 +57,7 @@ export const materialActions = ResourceModule.action({
     console.log("iamges=>",images, "videos->", vidoes);
 
     try {
-      await this.https.sourceGen({genRequest: {templateId: id, vidoes: vidoes, images:images}})
+      await this.https.sourceGen({genRequest: {templateId: id, vidoes: vidoes, images:images, matSlots: this.store.matSlots}})
       queenApi.messageSuccess("任务提交成功")
       return true;
       

src/modules/resource/store.ts

@@ -7,7 +7,9 @@ export const store = ResourceModule.store({
     sourceDetail: {
       webEditor: { pack: {} },
     } as any,
+    matSlots: [] as any[],
   }),
+  
   getters: {
     currentMesh(state) {
       return state.sourceDetail.webEditor?.meshSlots?.find(

src/pages/website/EditMaterial/components/LibraryModal.tsx

@@ -1,7 +1,7 @@
 import "@/modules/_default/viewerStorage";
 import {
   initQueentreeExplorer,
-  NodeTypes
+  NodeTypes,
 } from "@queenjs-modules/queentree-explorer";
 import PickNodeSteps from "@queenjs-modules/queentree-explorer/components/PickNodeSteps";
 import PickNodeStep from "@queenjs-modules/queentree-explorer/components/PickNodeSteps/PickNodeStep";

src/pages/website/EditMaterial/components/RightPanel.tsx

@@ -14,7 +14,9 @@ export default defineComponent({
     const resource = useResource();
     const queditor = useQueditor();
 
-    const replaceMat = async () => {
+    const replaceMat = async (record: any) => {
+      console.log("replace=>", record);
+
       const branchFolder = await resource.showModal<AssetItemFile>(
         <LibraryModal nodeTypes={["matGroupItem", "mat", "packMat"]} />,
         {
@@ -26,6 +28,18 @@ export default defineComponent({
       const data = await branchFolder.getAssetDetail();
       console.log("data: ", data);
 
+      if (data && data.source) {
+        const matConf = resource.store.matSlots.find(
+          (item) => item.id == record.id
+        );
+        if (matConf) {
+          matConf.material = data.source;
+        } else {
+          const matSlot = { id: record.id, material: data.source };
+          resource.store.matSlots.push(matSlot);
+        }
+      }
+
       let mat;
       switch (branchFolder.nodeType) {
         case "matGroupItem":
@@ -70,7 +84,7 @@ export default defineComponent({
           <List data={list} gap="10px" class="scrollbar flex-1 py-15px px-15px">
             {{
               item: (record: any) => (
-                <CompItem record={record} onClick={replaceMat} />
+                <CompItem record={record} onClick={() => replaceMat(record)} />
               ),
               loadmore: () => (
                 <div class="text-center py-20px text-12px opacity-80">