fix: material config compact data and url

chilingling · Feb 7, 2025 · 7c7bc09 · 7c7bc09
1 parent 5e6d8dd
commit 7c7bc09
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/designer-demo/engine.config.js b/designer-demo/engine.config.js
@@ -1,7 +1,9 @@
+import material from '@opentiny/tiny-engine-materials'
+
 export default {
   id: 'engine.config',
   theme: import.meta.env.VITE_THEME || 'light',
-  material: ['/mock/bundle.json'],
+  material: [material],
   scripts: [],
   styles: []
 }
diff --git a/designer-demo/package.json b/designer-demo/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@opentiny/tiny-engine": "workspace:^",
+    "@opentiny/tiny-engine-materials": "workspace:*",
     "@opentiny/tiny-engine-theme-dark": "workspace:*",
     "@opentiny/tiny-engine-theme-light": "workspace:*",
     "@opentiny/tiny-engine-utils": "workspace:*",

diff --git a/packages/materials/buildMaterials.mjs b/packages/materials/buildMaterials.mjs
@@ -133,10 +133,8 @@ const generateComponents = async (entry) => {
 
 const getFrameworkWithData = (data) => {
   return {
-    data: {
-      framework: 'Vue',
-      materials: data
-    }
+    framework: 'Vue',
+    materials: data
   }
 }
 

diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js
@@ -420,7 +420,19 @@ const setMaterial = (name, data) => {
  */
 export const getMaterialsRes = async () => {
   const bundleUrls = getMergeMeta('engine.config')?.material || []
-  const materials = await Promise.allSettled(bundleUrls.map((url) => getMetaApi(META_SERVICE.Http).get(url)))
+  const materials = await Promise.allSettled(
+    bundleUrls.map((bundleItem) => {
+      // bundle 是一个 url
+      if (typeof bundleItem === 'string') {
+        return getMetaApi(META_SERVICE.Http).get(bundleItem)
+      }
+      // 直接传入 bundle
+      if (bundleItem?.materials) {
+        return bundleItem
+      }
+    })
+  )
+
   return materials
 }