types: Simplify types

Author: gene9831

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

@@ -46,14 +46,16 @@ export interface Assets {
   styles: string[]
 }
 
+export type Resource = Omit<Component, 'component'> & { type: string; component?: string; item?: string }
+
 export interface BlockResource {
   componentName: string
   fileName: string
   css?: string
   props: Record<string, any>
   dataSource?: Record<string, any>
-  schema: ContentSchema
-  children: BlockContentChildren[]
+  schema: Schema
+  children: Schema[]
   state?: Record<string, any>
   methods: {
     [key: string]: TypeValuePair
@@ -70,69 +72,22 @@ export interface BlockResource {
   blockName?: string
 }
 
-export interface BlockContentChildren {
-  componentName: string
-  props?: Record<string, any>
-  children?: BlockContentChildren[]
-  id: string
-  condition?: boolean
-  fileName?: string
-}
-
 export interface TypeValuePair {
   type: DataTypeEnum
   value: string
 }
 
 export type DataTypeEnum = 'JSExpression' | 'JSFunction' | 'JSResource' | 'JSResouce'
 
-export interface ContentSchema {
-  properties?: Property[]
-  events?: Record<string, any>
-  slots?: unknown
-  lifeCycles?: Record<string, TypeValuePair>
-}
-
 export interface Locale {
   zh_CN?: string
 }
 
-export interface Property {
-  label: Locale
-  description: Locale
-  collapse: Collapse
-  content?: BlockProperty[]
-  defaultValue?: any[]
-}
-
 export interface Collapse {
   number: number
   text: Locale
 }
 
-export interface BlockProperty {
-  property: string
-  type?: string
-  defaultValue: unknown
-  label: {
-    text: Locale
-  }
-  description?: Locale
-  widget?: {
-    component: string
-    props?: Record<string, any>
-  }
-  cols?: number
-  rules?: any[]
-  linked?: Linked
-  handle?: Record<string, any>
-  hidden?: boolean
-  required?: boolean
-  readOnly?: boolean
-  disabled?: boolean
-  labelPosition?: string
-}
-
 export interface Linked {
   componentName: string
   property: string
@@ -207,7 +162,7 @@ export interface Component {
     slots?: unknown
   }
   library?: number
-  schema: ComponentSchema
+  schema: Schema
 }
 
 export interface Configure {
@@ -236,13 +191,7 @@ export interface ContextMenu {
   disable: string[]
 }
 
-export interface ComponentSchema {
-  properties?: ComponentProperty[]
-  events?: Record<string, any>
-  slots?: unknown
-}
-
-export interface ComponentProperty {
+export interface Property {
   label: Locale
   description?: Locale
   collapse?: Collapse
@@ -268,9 +217,12 @@ export interface ComponentProperty {
     device?: any[]
     onChange?: string
     properties?: ContentProperty[]
+    linked?: Linked
+    handle?: Record<string, any>
   }[]
   name?: string
   group?: string
+  defaultValue?: unknown
 }
 
 export interface ContentProperty {
@@ -313,7 +265,7 @@ export interface Snippet {
 export interface SnippetChild {
   icon?: string
   name?: Locale
-  schema?: SnippetSchema
+  schema?: Schema
   screenshot?: string
   snippetName?: string
   configure?: Configure
@@ -349,14 +301,18 @@ export interface NestingRule {
   ancestorWhitelist?: string[]
 }
 
-export interface SnippetSchema {
+export interface Schema {
   props?: Record<string, any>
-  children?: SnippetSchema[]
+  children?: Schema[]
   componentName?: string
   componentType?: string
-  properties?: unknown[]
-  events?: unknown
+  properties?: Property[]
+  events?: Record<string, any>
   slots?: unknown
+  lifeCycles?: Record<string, TypeValuePair>
+  id?: string
+  condition?: boolean
+  fileName?: string
 }
 
 export interface MaterialState {

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

@@ -28,23 +28,24 @@ import meta from '../../meta'
 import { getBlockCompileRes, getBlockByName, updateBlockCompileCache } from './block-compile'
 import type {
   Block,
-  Material,
-  MaterialState,
-  SnippetSchema,
-  Snippet,
+  BlockResource,
   Component,
-  InitMaterialOptions,
   ComponentMap,
-  BlockResource,
-  ComponentProperty,
-  Dependency
+  Dependency,
+  InitMaterialOptions,
+  Material,
+  MaterialState,
+  Property,
+  Resource,
+  Schema,
+  Snippet
 } from './types'
 
 const { camelize, capitalize, deepClone } = utils
 const { MATERIAL_TYPE } = constants
 
 // 这里存放所有TinyVue组件、原生HTML、内置组件的缓存，包含了物料插件面板里所有显示的组件，也包含了没显示的一些联动组件
-const resource = new Map<string, Omit<Component, 'component'> & { type: string; component?: string; item?: string }>()
+const resource = new Map<string, Resource>()
 
 // 这里涉及到区块发布后的更新问题，所以需要单独缓存区块
 const blockResource = new Map<string, BlockResource>()
@@ -60,7 +61,7 @@ const componentState = reactive<{ componentsMap: Record<string, ComponentMap> }>
   componentsMap: {}
 })
 const getSnippet = (component: string) => {
-  let schema: SnippetSchema = {}
+  let schema: Schema = {}
   materialState.components.some(({ children }) => {
     const child = children.find(({ snippetName }) => snippetName === component)
     if (child?.schema) {
@@ -76,7 +77,7 @@ const getSnippet = (component: string) => {
 const generateNode = ({ type, component }: { type: string; component: string }) => {
   const snippet = getSnippet(component) || {}
 
-  const schema: SnippetSchema & Required<Pick<SnippetSchema, 'props'>> = {
+  const schema: Schema & Required<Pick<Schema, 'props'>> = {
     componentName: component,
     ...snippet,
     props: {
@@ -109,7 +110,7 @@ const getConfigureMap = () => {
  * @param schemaProperties
  * @returns
  */
-const patchBaseProps = (schemaProperties?: ComponentProperty[]) => {
+const patchBaseProps = (schemaProperties?: Property[]) => {
   if (!Array.isArray(schemaProperties)) {
     return
   }
@@ -408,7 +409,7 @@ const addMaterials = (materials: Material) => {
   addBlocks(materials.blocks)
 }
 
-const getMaterial = (name: string) => {
+const getMaterial = (name: string): Resource | BlockResource | object => {
   if (name) {
     // 先读取组件缓存，再读取区块缓存
     return (
@@ -423,7 +424,7 @@ const getMaterial = (name: string) => {
   }
 }
 
-const setMaterial = (name: string, data: any) => {
+const setMaterial = (name: string, data: Resource) => {
   resource.set(name, data)
 }