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
152 changes: 63 additions & 89 deletions designer-demo/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,39 @@
*
*/

import {
Breadcrumb,
Fullscreen,
Lang,
Checkinout,
Logo,
Media,
Redoundo,
Save,
Clean,
Preview,
GenerateVue,
Refresh,
Collaboration,
Setting,
Materials,
Data,
Script,
Tree,
Help,
Schema,
Page,
I18n,
Bridge,
Block,
Datasource,
Robot,
Props,
Events,
Styles,
} from '@opentiny/tiny-engine'


export default {
config: {
id: 'engine.config',
Expand All @@ -18,99 +51,40 @@ export default {
},
layout: { id: 'engine.layout' },
toolbars: [
{
id: 'engine.toolbars.logo'
},
{
id: 'engine.toolbars.breadcrumb'
},
{
id: 'engine.toolbars.media'
},
{
id: 'engine.toolbars.collaboration'
},
{
id: 'engine.toolbars.clean'
},
{
id: 'engine.toolbars.refresh'
},
{
id: 'engine.toolbars.save'
},
{
id: 'engine.toolbars.generate-vue'
},
{
id: 'engine.toolbars.preview'
},
{
id: 'engine.toolbars.redoundo'
},
{
id: 'engine.toolbars.fullscreen'
},
{
id: 'engine.toolbars.lock'
},
{
id: 'engine.toolbars.setting'
},
{
id: 'engine.toolbars.lang'
}
Logo,
Breadcrumb,
Media,
Collaboration,
Clean,
Refresh,
Save,
GenerateVue,
Preview,
Redoundo,
Fullscreen,
Checkinout,
Setting,
Lang
],
plugins: [
{
id: 'engine.plugins.materials'
},
{
id: 'engine.plugins.outlinetree'
},
{
id: 'engine.plugins.appmanage'
},
{
id: 'engine.plugins.blockmanage'
},
{
id: 'engine.plugins.collections'
},
{
id: 'engine.plugins.bridge'
},
{
id: 'engine.plugins.i18n'
},
{
id: 'engine.plugins.pagecontroller'
},
{
id: 'engine.plugins.state'
},
{
id: 'engine.plugins.schema'
},
{
id: 'engine.plugins.editorhelp'
},
{
id: 'engine.plugins.robot'
}
Materials,
Tree,
Page,
Block,
Datasource,
Bridge,
I18n,
Script,
Data,
Schema,
Help,
Robot
],
dsls: [{ id: 'engine.dsls.dslvue' }],
settings: [
{
id: 'engine.setting.props'
},
{
id: 'engine.setting.styles'
},
{
id: 'engine.setting.event'
}
Props,
Styles,
Events
],
canvas: {},
utils: { id: 'engine.utils' }
canvas: {}
}
2 changes: 1 addition & 1 deletion designer-demo/src/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

import { initPreview } from '@opentiny/tiny-engine'

initPreview()
initPreview({ registry: { config: { id : 'engine.config', theme: 'light' } } })
2 changes: 2 additions & 0 deletions packages/design-core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ export { default as Events } from '@opentiny/tiny-engine-setting-events'
export { default as Styles } from '@opentiny/tiny-engine-setting-styles'

export { initPreview } from './src/preview/src/main'

export { default as defaultRegistry } from './registry'
54 changes: 1 addition & 53 deletions packages/design-core/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,6 @@
*
*/

import Breadcrumb from '@opentiny/tiny-engine-toolbar-breadcrumb'
import Fullscreen from '@opentiny/tiny-engine-toolbar-fullscreen'
import Lang from '@opentiny/tiny-engine-toolbar-lang'
import Checkinout from '@opentiny/tiny-engine-toolbar-checkinout'
import Logo from '@opentiny/tiny-engine-toolbar-logo'
import Media from '@opentiny/tiny-engine-toolbar-media'
import Redoundo from '@opentiny/tiny-engine-toolbar-redoundo'
import Save from '@opentiny/tiny-engine-toolbar-save'
import Clean from '@opentiny/tiny-engine-toolbar-clean'
import Preview from '@opentiny/tiny-engine-toolbar-preview'
import GenerateVue from '@opentiny/tiny-engine-toolbar-generate-vue'
import Refresh from '@opentiny/tiny-engine-toolbar-refresh'
import Collaboration from '@opentiny/tiny-engine-toolbar-collaboration'
import Setting from '@opentiny/tiny-engine-toolbar-setting'

import Materials from '@opentiny/tiny-engine-plugin-materials'
import Data from '@opentiny/tiny-engine-plugin-data'
import Script from '@opentiny/tiny-engine-plugin-script'
import Tree from '@opentiny/tiny-engine-plugin-tree'
import Help from '@opentiny/tiny-engine-plugin-help'
import Schema from '@opentiny/tiny-engine-plugin-schema'
import Page from '@opentiny/tiny-engine-plugin-page'
import I18n from '@opentiny/tiny-engine-plugin-i18n'
import Bridge from '@opentiny/tiny-engine-plugin-bridge'
import Block from '@opentiny/tiny-engine-plugin-block'
import Datasource from '@opentiny/tiny-engine-plugin-datasource'
import Robot from '@opentiny/tiny-engine-plugin-robot'

import Props from '@opentiny/tiny-engine-setting-props'
import Events from '@opentiny/tiny-engine-setting-events'
import Styles from '@opentiny/tiny-engine-setting-styles'

export default {
config: {
id: 'engine.config',
Expand Down Expand Up @@ -98,25 +66,5 @@ export default {
lifeCycleTips: {
Vue: '通过Vue解构出来的方法都可以在setup这里使用,比如watch、computed、watchEffect等'
}
},
layout: { id: 'engine.layout' },
toolbars: [
Logo,
Breadcrumb,
Media,
Collaboration,
Clean,
Refresh,
Save,
GenerateVue,
Preview,
Redoundo,
Fullscreen,
Checkinout,
Setting,
Lang
],
plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, Data, Schema, Help, Robot],
settings: [Props, Styles, Events],
canvas: {}
}
}
5 changes: 0 additions & 5 deletions packages/design-core/src/preview/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@
</template>

<script>
import { getMergeMeta } from '@opentiny/tiny-engine-entry'
import { useDebugSwitch } from './preview/debugSwitch'
import Preview from './preview/Preview.vue'
import Toolbar from './Toolbar.vue'

const config = getMergeMeta('engine.config')

import(`../../theme/${config.theme}.js`)

export default {
components: {
Preview,
Expand Down
13 changes: 10 additions & 3 deletions packages/design-core/src/preview/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@

import { createApp } from 'vue'
import initSvgs from '@opentiny/tiny-engine-svgs'
import { defineEntry, mergeRegistry } from '@opentiny/tiny-engine-entry'
import defaultRegistry from '../../../registry.js'
import App from './App.vue'
import 'virtual:svg-icons-register'

export const initPreview = () => {
export const initPreview = ({ registry }) => {
const mergedRegistry = mergeRegistry(registry, defaultRegistry)
defineEntry(mergedRegistry)

import(`../../theme/${mergedRegistry.config.theme || 'light'}.js`)

const app = createApp(App)

initSvgs(app)

app.mount('#app')
}