Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<tiny-popover
:trigger="trigger"
:open-delay="1000"
:open-delay="500"
popper-class="toolbar-right-popover"
append-to-body
:content="content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ export default {
if (
props.modelValue?.value &&
props.modelValue?.type === EXPRESSION_TYPE.JS_EXPRESSION &&
Object.keys(props.modelValue || {}).length === 2
Object.keys(props.modelValue || {}).length <= 3
) {
return String(props.modelValue?.value)
}
Expand Down
12 changes: 3 additions & 9 deletions packages/design-core/src/preview/src/preview/usePreviewData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,9 @@ export const usePreviewData = ({ setFiles, store, setImportMap }: IUsePreviewDat
}) => {
const searchParams = new URLSearchParams(location.search)
const previewType = searchParams.get('previewType')
const { appData, metaData, importMapData } = await getBasicData(basicFiles, params.scripts)

if (previewType === 'page') {
const { appData, metaData, importMapData } = await getBasicData(basicFiles, params.scripts)

previewState.currentPage = params.currentPage
previewState.ancestors = params.ancestors

Expand Down Expand Up @@ -415,7 +414,6 @@ export const usePreviewData = ({ setFiles, store, setImportMap }: IUsePreviewDat
} else if (previewType === 'app') {
const appId = searchParams.get('id')
const { getAllNestedBlocksSchema, generateAppCode } = getMetaApi('engine.service.generateCode')
const importMap = await getImportMap(JSON.parse(searchParams.get('scripts') || '{}'))

let appSchema

Expand Down Expand Up @@ -611,14 +609,10 @@ export const usePreviewData = ({ setFiles, store, setImportMap }: IUsePreviewDat
prev[fileName] = formatCode(item.fileContent, fileName)
return prev
}, {})
srcFiles['import-map.json'] = JSON.stringify(importMap)
srcFiles['import-map.json'] = JSON.stringify(importMapData)
const newFiles = store.getFiles()
const enableTailwindCSS = getMergeMeta('engine.config')?.enableTailwindCSS
const appJsCode = processAppJsCode(
newFiles['app.js'],
JSON.parse(searchParams.get('styles') || '[]'),
enableTailwindCSS
)
const appJsCode = processAppJsCode(newFiles['app.js'] || '', params.styles, enableTailwindCSS)
srcFiles['app.js'] = appJsCode
srcFiles['main.js'] = `import app from './app.js' \n ${srcFiles['src/main.js']}`
srcFiles['main.js'] = srcFiles['main.js'].replace("import 'element-plus/dist/index.css'", '')
Expand Down
2 changes: 1 addition & 1 deletion packages/toolbars/preview/src/Main.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="toolbar-save toolbar-helpGuid">
<toolbar-base content="预览页面" :icon="options.icon?.default || options?.icon" :options="options" trigger="click">
<toolbar-base content="预览页面" :icon="options.icon?.default || options?.icon" :options="options" trigger="hover">
Comment thread
betterdancing marked this conversation as resolved.
<template #button>
<div class="toolbar-preview-item">
<span @click="preview('page')">页面预览</span>
Expand Down