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: 4 additions & 1 deletion packages/canvas/render/src/RenderMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,11 @@ const updateCanvas = () => {
refreshKey.value++
}
setCurrentApi({
// 用于lowcode.ts获取utils工具
getUtils,
getDataSourceMap,
setController,
// 设置物料配置
setConfigure,
setCondition,
getRenderer,
Expand Down Expand Up @@ -102,7 +105,7 @@ export default defineComponent({
default: null
},
parentContext: {
type: Object as PropTye<ReturnType<typeof useContext>>,
type: Object as PropType<ReturnType<typeof useContext>>,
default: null
},
renderSchema: {
Expand Down
38 changes: 14 additions & 24 deletions packages/canvas/render/src/canvas-function/canvas-api.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import type { useDataSourceMap, useUtils } from '../application-function'
import type { IPageContext, useSchema } from '../page-block-function'
import type { IPageContext } from '../page-block-function'
import type { useCustomRenderer } from './custom-renderer'
import type { setConfigure } from '../material-function'
import type { removeBlockCompsCache, setConfigure } from '../material-function'
import type { getDesignMode, setDesignMode } from './design-mode'
import type { setController } from './controller'

export interface IApplicationFunctionAPI
extends Pick<ReturnType<typeof useUtils>, 'getUtils' | 'setUtils'>,
Pick<ReturnType<typeof useDataSourceMap>, 'getDataSourceMap' | 'setDataSourceMap'> {}
export interface IPageFunctionAPI
extends Pick<
ReturnType<typeof useSchema>,
'setSchema' | 'setState' | 'setProps' | 'getMethods' | 'setMethods' | 'setPageCss'
> {}
export interface IPageContextAPI
extends Pick<IPageContext, 'getContext' | 'setCondition' | 'getCondition' | 'getConditions'> {}
extends Pick<ReturnType<typeof useUtils>, 'getUtils'>,
Pick<ReturnType<typeof useDataSourceMap>, 'getDataSourceMap'> {}
export interface IPageContextAPI extends Pick<IPageContext, 'setCondition'> {}
export interface ICanvasFunctionAPI extends Pick<ReturnType<typeof useCustomRenderer>, 'getRenderer' | 'setRenderer'> {
getDesignMode: typeof getDesignMode
setDesignMode: typeof setDesignMode
setController: typeof setController
setConfigure: typeof setConfigure
updateCanvas: () => void
}
export type IInnerCanvasAPI = IApplicationFunctionAPI & IPageFunctionAPI & ICanvasFunctionAPI & IPageContextAPI
export interface IMaterialFunctionAPI {
removeBlockCompsCache: typeof removeBlockCompsCache
}

export type IInnerCanvasAPI = IApplicationFunctionAPI & ICanvasFunctionAPI & IPageContextAPI & IMaterialFunctionAPI

let currentApi: IInnerCanvasAPI

Expand All @@ -31,23 +30,14 @@ export function setCurrentApi(activeApi: IInnerCanvasAPI) {

export const api: IInnerCanvasAPI = {
getUtils: (...args) => currentApi?.getUtils(...args),
setUtils: (...args) => currentApi?.setUtils(...args),
getMethods: (...args) => currentApi?.getMethods(...args),
setMethods: (...args) => currentApi?.setMethods(...args),
setController: (...args) => currentApi?.setController(...args),
setConfigure: (...args) => currentApi?.setConfigure(...args),
setSchema: (...args) => currentApi?.setSchema(...args),
setState: (...args) => currentApi?.setState(...args),
setProps: (...args) => currentApi?.setProps(...args),
getContext: (...args) => currentApi?.getContext(...args),
setPageCss: (...args) => currentApi?.setPageCss(...args),
setCondition: (...args) => currentApi?.setCondition(...args),
getCondition: (...args) => currentApi?.getCondition(...args),
getConditions: (...args) => currentApi?.getConditions(...args),
getDataSourceMap: (...args) => currentApi?.getDataSourceMap(...args),
setDataSourceMap: (...args) => currentApi?.setDataSourceMap(...args),
getRenderer: (...args) => currentApi?.getRenderer(...args),
setRenderer: (...args) => currentApi?.setRenderer(...args),
getDesignMode: (...args) => currentApi?.getDesignMode(...args),
setDesignMode: (...args) => currentApi?.setDesignMode(...args)
setDesignMode: (...args) => currentApi?.setDesignMode(...args),
removeBlockCompsCache: (...args) => currentApi?.removeBlockCompsCache(...args),
updateCanvas: (...args) => currentApi?.updateCanvas(...args)
}
2 changes: 1 addition & 1 deletion packages/canvas/render/src/data-function/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { transformSync } from '@babel/core'
import i18nHost from '@opentiny/tiny-engine-i18n-host'

import { globalNotify } from '../canvas-function'
import { collectionMethodsMap, getComponent, getIcon } from '../material-function'
import { getComponent, getIcon } from '../material-function'
import { newFn } from '../data-utils'
import { renderDefault } from '../render'

Expand Down
2 changes: 1 addition & 1 deletion packages/canvas/render/src/lowcode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
*/

import { getCurrentInstance, nextTick, provide, inject } from 'vue'
import { getCurrentInstance, nextTick, provide, inject, Ref } from 'vue'
import { I18nInjectionKey } from 'vue-i18n'
import { api } from './RenderMain'
import { globalNotify } from './canvas-function'
Expand Down
4 changes: 2 additions & 2 deletions packages/canvas/render/src/page-block-function/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function useSchema(
const schema = reactive<Partial<IPageSchema>>({})
const { generateAccessor, stateAccessorMap, propsAccessorMap, generateStateAccessors } = useAccessorMap(globalContext)

const { state, setState } = useState(schema, {
const { state, setState } = useState({
getContext,
generateStateAccessors
})
Expand Down Expand Up @@ -90,7 +90,7 @@ export function useSchema(
const accessorFunctions = initProps(newSchema.schema?.properties)

// 这里setState(会触发画布渲染),是因为状态管理里面的变量会用到props、utils、bridge、stores、methods
setState(newSchema.state, true)
setState(newSchema.state)

await nextTick()
setPageCss(data.css, pageId)
Expand Down
4 changes: 2 additions & 2 deletions packages/canvas/render/src/page-block-function/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { shallowReactive } from 'vue'
import { getDeletedKeys } from '../data-utils'
import { isStateAccessor, parseData } from '../data-function'

export function useState(schema, { getContext, generateStateAccessors }) {
export function useState({ getContext, generateStateAccessors }) {
const state = shallowReactive({})

const setState = (data, clear = false) => {
const setState = (data) => {
if (typeof data !== 'object' || data === null) {
return
}
Expand Down