fix types issues

Author: gene9831

packages/plugins/materials/src/composable/types.ts

@@ -63,8 +63,8 @@ export interface BlockResource {
   lifeCycles?: {
     [key: string]: TypeValuePair
   }
-  id?: string
-  type?: 'block'
+  id?: string | number
+  type?: string
   component?: string
   label?: string
   configure?: Configure
@@ -131,7 +131,7 @@ export interface BuildInfo {
 }
 
 export interface Component {
-  id?: number
+  id?: number | string
   version?: string
   name: {
     zh_CN?: string

packages/plugins/materials/src/composable/useMaterial.ts

@@ -409,7 +409,7 @@ const addMaterials = (materials: Material) => {
   addBlocks(materials.blocks)
 }
 
-const getMaterial = (name: string): Resource | BlockResource | object => {
+const getMaterial = (name: string): Partial<Resource & BlockResource> => {
   if (name) {
     // 先读取组件缓存，再读取区块缓存
     return (