qinyan 1 jaar geleden
bovenliggende
commit
22d1a2c172
2 gewijzigde bestanden met toevoegingen van 30 en 31 verwijderingen
  1. 13 8
      src/modules/resource/actions/material.ts
  2. 17 23
      src/pages/website/EditMaterial/components/RightPanel.tsx

+ 13 - 8
src/modules/resource/actions/material.ts

@@ -50,20 +50,25 @@ export const materialActions = ResourceModule.action({
     this.store.setSourceDetail(res.result);
     this.store.setSelectedId(res.result.webEditor?.meshSlots[0]?.Id);
   },
-  async submitRender(id: string, images:any, vidoes:any) {
+  async submitRender(id: string, images: any, vidoes: any) {
+    queenApi.showLoading("任务提交中");
 
-    queenApi.showLoading("任务提交中")
-
-    console.log("iamges=>",images, "videos->", vidoes);
+    console.log("iamges=>", images, "videos->", vidoes);
 
     try {
-      await this.https.sourceGen({genRequest: {templateId: id, vidoes: vidoes, images:images, matSlots: this.store.matSlots}})
-      queenApi.messageSuccess("任务提交成功")
+      await this.https.sourceGen({
+        genRequest: {
+          templateId: id,
+          vidoes: vidoes,
+          images: images,
+          matSlots: this.store.matSlots,
+        },
+      });
+      queenApi.messageSuccess("任务提交成功");
       return true;
-      
     } catch (error) {
       console.error(error);
-    } finally{
+    } finally {
       queenApi.hideLoading();
     }
   },

+ 17 - 23
src/pages/website/EditMaterial/components/RightPanel.tsx

@@ -15,30 +15,14 @@ export default defineComponent({
     const queditor = useQueditor();
 
     const replaceMat = async (record: any) => {
-      console.log("replace=>", record);
-
+      // console.error("replace=>", record);
       const branchFolder = await resource.showModal<AssetItemFile>(
         <LibraryModal nodeTypes={["matGroupItem", "mat", "packMat"]} />,
-        {
-          width: "900px",
-        }
+        { width: "900px" }
       );
-      console.log("branchFolder: ", branchFolder);
-
+      // console.error("branchFolder: ", branchFolder);
       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);
-        }
-      }
+      // console.error("data: ", data);
 
       let mat;
       switch (branchFolder.nodeType) {
@@ -57,11 +41,21 @@ export default defineComponent({
           break;
       }
 
-      const targetComp = getTargetProCom();
-      console.error("targetComp: ", targetComp);
+      if (data && mat) {
+        const matConf = resource.store.matSlots.find(
+          (item) => item.id == record.id
+        );
+        if (matConf) {
+          matConf.material = mat;
+        } else {
+          const matSlot = { id: record.id, material: mat };
+          resource.store.matSlots.push(matSlot);
+        }
+      }
+      // console.error("resource.store.matSlots: ", resource.store.matSlots);
 
+      const targetComp = getTargetProCom();
       if (!targetComp || !mat) return;
-
       queditor.actions.updatePackProductCompMat(targetComp, mat);
     };