fix: preview page breadcrumb don't exist useBlock method and preview …

…block error when type undefined (#988) * fix: preview breadcrumb don't exist useBlock method * fix: resolve block preview error when type is undefined --------- Co-authored-by: hexqi <[email protected]>
opentiny · Jan 2, 2025 · 3e63170 · 3e63170
1 parent d30593a
commit 3e63170
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/toolbars/breadcrumb/src/Main.vue b/packages/toolbars/breadcrumb/src/Main.vue
@@ -77,7 +77,7 @@ export default {
       plugins.render = breadcrumbData.value[0] === CONSTANTS.PAGETEXT ? PLUGINS_ID.PAGEID : PLUGINS_ID.BLOCKID
     }
 
-    const currentBlock = computed(useBlock().getCurrentBlock)
+    const currentBlock = computed(() => useBlock?.()?.getCurrentBlock?.())
 
     const handleChangeSchema = (newSchema) => {
       useBlock().initBlock({ ...useBlock().getCurrentBlock(), content: newSchema })

diff --git a/packages/vue-generator/src/generator/vue/sfc/generateScript.js b/packages/vue-generator/src/generator/vue/sfc/generateScript.js
@@ -21,7 +21,7 @@ export const defaultGenPropsHook = (schema) => {
 
   properties.forEach(({ content = [] }) => {
     content.forEach(({ property, type, defaultValue }) => {
-      let propType = capitalize(type)
+      let propType = type && capitalize(type)
       let propValue = defaultValue
 
       if (propType === 'String') {