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
2 changes: 1 addition & 1 deletion packages/canvas/DesignCanvas/src/DesignCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export default {
getMaterial: useMaterial().getMaterial,
addHistory: useHistory().addHistory,
request: getMetaApi(META_SERVICE.Http).getHttp(),
getPageById: getMetaApi(META_APP.AppManage).getPageById,
getPageById: getMetaApi(META_APP.AppManage)?.getPageById,
getPageAncestors: usePage().getAncestors,
getBaseInfo: () => getMetaApi(META_SERVICE.GlobalService).getBaseInfo(),
addHistoryDataChangedCallback,
Expand Down
7 changes: 5 additions & 2 deletions packages/canvas/render/src/RenderMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const {
getDataSourceMap
})
const { getRenderer, setRenderer } = useCustomRenderer()
const { setCondition } = activePageContext
const { setCondition, getConditions } = activePageContext
const updateCanvas = () => {
refreshKey.value++
}
Expand All @@ -75,6 +75,8 @@ setCurrentApi({
// 设置物料配置
setConfigure,
setCondition,
getController,
getConditions,
getRenderer,
setRenderer,
getDesignMode,
Expand All @@ -91,7 +93,6 @@ const throttleUpdateSchema = useThrottleFn(
true
)

const pageRenderer = getRenderer()
const { routerViewSetting } = useRouterViewSetting()

export default defineComponent({
Expand Down Expand Up @@ -275,6 +276,8 @@ export default defineComponent({
)
}

const pageRenderer = getRenderer()

return () =>
pageAncestors.value === null
? h(CanvasEmpty, { placeholderText: '页面分析加载中' })
Expand Down
9 changes: 6 additions & 3 deletions packages/canvas/render/src/canvas-function/canvas-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ import type { IPageContext } from '../page-block-function'
import type { useCustomRenderer } from './custom-renderer'
import type { removeBlockCompsCache, setConfigure } from '../material-function'
import type { getDesignMode, setDesignMode } from './design-mode'
import type { setController } from './controller'
import type { setController, getController } from './controller'

export interface IApplicationFunctionAPI
extends Pick<ReturnType<typeof useUtils>, 'getUtils'>,
Pick<ReturnType<typeof useDataSourceMap>, 'getDataSourceMap'> {}
export type IPageContextAPI = Pick<IPageContext, 'setCondition'>
export interface ICanvasFunctionAPI extends Pick<ReturnType<typeof useCustomRenderer>, 'getRenderer' | 'setRenderer'> {
export type IPageContextAPI = Pick<IPageContext, 'setCondition' | 'getConditions'>
export interface ICanvasFunctionAPI extends ReturnType<typeof useCustomRenderer> {
getDesignMode: typeof getDesignMode
setDesignMode: typeof setDesignMode
setController: typeof setController
getController: typeof getController
setConfigure: typeof setConfigure
updateCanvas: () => void
}
Expand All @@ -31,8 +32,10 @@ export function setCurrentApi(activeApi: IInnerCanvasAPI) {
export const api: IInnerCanvasAPI = {
getUtils: (...args) => currentApi?.getUtils(...args),
setController: (...args) => currentApi?.setController(...args),
getController: (...args) => currentApi?.getController(...args),
setConfigure: (...args) => currentApi?.setConfigure(...args),
setCondition: (...args) => currentApi?.setCondition(...args),
getConditions: (...args) => currentApi?.getConditions(...args),
getDataSourceMap: (...args) => currentApi?.getDataSourceMap(...args),
getRenderer: (...args) => currentApi?.getRenderer(...args),
setRenderer: (...args) => currentApi?.setRenderer(...args),
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas/render/src/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const create = async (config) => {
App = createApp(Main).use(TinyI18nHost).provide(I18nInjectionKey, TinyI18nHost)

if (typeof appCreated === 'function') {
await appCreated(App)
await appCreated(App, { api: renderer })
}

App.config.globalProperties.lowcodeConfig = window.parent.TinyGlobalConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export default () => {
transformMixedEsModules: true
},
cssCodeSplit: false
}
},
base: './'
})`

return res
Expand Down