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
5 changes: 3 additions & 2 deletions designer-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build"
"dev": "cross-env VITE_THEME=light vite",
"build": "cross-env VITE_THEME=light vite build"
},
"dependencies": {
"vue": "^3.4.21",
Expand All @@ -19,6 +19,7 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"cross-env": "^7.0.3",
"vite": "^5.2.7",
"@opentiny/tiny-engine-vite-config": "workspace:^",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:^"
Expand Down
11 changes: 9 additions & 2 deletions designer-demo/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,23 @@ import {
Styles,
} from '@opentiny/tiny-engine'


export default {
config: {
id: 'engine.config',
theme: 'light',
theme: import.meta.env.VITE_THEME || 'light',
material: ['/mock/bundle.json'],
scripts: [],
styles: []
},
layout: { id: 'engine.layout' },
themes: [
{
id: 'engine.theme.light'
},
{
id: 'engine.theme.dark'
}
],
toolbars: [
Logo,
Breadcrumb,
Expand Down
1 change: 1 addition & 0 deletions designer-demo/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { init } from '@opentiny/tiny-engine'
import { initHook, HOOK_NAME } from '@opentiny/tiny-engine-entry'
import { configurators } from './configurators.js'
import 'virtual:svg-icons-register'
import '@opentiny/tiny-engine-theme'

const beforeAppCreate = () => {
initHook(HOOK_NAME.useEnv, import.meta.env)
Expand Down
8 changes: 6 additions & 2 deletions designer-demo/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ export default defineConfig((options) => {
'@opentiny/tiny-engine-builtin-component': path.resolve(__dirname, '../packages/builtinComponent/index.js'),
'@opentiny/tiny-engine-entry': path.resolve(__dirname, '../packages/entry/src/index.js'),
'@opentiny/tiny-engine-layout': path.resolve(__dirname, '../packages/layout/index.js'),
'@opentiny/tiny-engine-configurator': path.resolve(__dirname, '../packages/configurator/src/index.js')
'@opentiny/tiny-engine-configurator': path.resolve(__dirname, '../packages/configurator/src/index.js'),
'@opentiny/tiny-engine-theme': ['light', 'dark'].includes(extOptions.VITE_THEME)
? path.resolve(process.cwd(), `../packages/theme/${extOptions.VITE_THEME}/index.less`)
// ? path.resolve(process.cwd(), `./node_modules/@opentiny/tiny-engine/node_modules/@opentiny/tiny-engine-theme-${extOptions.VITE_THEME}/dist/style.css`)
: ''
}

const config = {
Expand All @@ -74,6 +78,6 @@ export default defineConfig((options) => {
alias: devAlias
}
}

return mergeConfig(defaultConfig, config)
})
12 changes: 11 additions & 1 deletion packages/design-core/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,15 @@ export default {
lifeCycleTips: {
Vue: '通过Vue解构出来的方法都可以在setup这里使用,比如watch、computed、watchEffect等'
}
}
},
themes: [
{
id: 'engine.theme.light',
title: '亮色主题'
},
{
id: 'engine.theme.dark',
title: '暗色主题'
}
],
}
2 changes: 1 addition & 1 deletion packages/design-core/src/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const defaultLifeCycles = {
defineEntry(newRegistry)

// 加载主题样式,尽早加载
import(`./theme/${newRegistry.config.theme}.js`)
// import(`./theme/${newRegistry.config.theme}.js`)

initHttp({ env: import.meta.env })

Expand Down