From a8818c55ac3df6305f422826a6c23ab33a9fb7ed Mon Sep 17 00:00:00 2001 From: rhlin Date: Tue, 14 Jan 2025 01:38:05 -0800 Subject: [PATCH] fix: remove redundant and wrong type declaration --- packages/canvas/render/src/RenderMain.ts | 5 ++- .../render/src/canvas-function/canvas-api.ts | 38 +++++++------------ .../canvas/render/src/data-function/parser.ts | 2 +- packages/canvas/render/src/lowcode.ts | 2 +- .../render/src/page-block-function/schema.ts | 4 +- .../render/src/page-block-function/state.ts | 4 +- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/packages/canvas/render/src/RenderMain.ts b/packages/canvas/render/src/RenderMain.ts index 339f4ef0ee..b215003e8b 100644 --- a/packages/canvas/render/src/RenderMain.ts +++ b/packages/canvas/render/src/RenderMain.ts @@ -67,8 +67,11 @@ const updateCanvas = () => { refreshKey.value++ } setCurrentApi({ + // 用于lowcode.ts获取utils工具 getUtils, + getDataSourceMap, setController, + // 设置物料配置 setConfigure, setCondition, getRenderer, @@ -102,7 +105,7 @@ export default defineComponent({ default: null }, parentContext: { - type: Object as PropTye>, + type: Object as PropType>, default: null }, renderSchema: { diff --git a/packages/canvas/render/src/canvas-function/canvas-api.ts b/packages/canvas/render/src/canvas-function/canvas-api.ts index 24312d5142..8899f0a982 100644 --- a/packages/canvas/render/src/canvas-function/canvas-api.ts +++ b/packages/canvas/render/src/canvas-function/canvas-api.ts @@ -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, 'getUtils' | 'setUtils'>, - Pick, 'getDataSourceMap' | 'setDataSourceMap'> {} -export interface IPageFunctionAPI - extends Pick< - ReturnType, - 'setSchema' | 'setState' | 'setProps' | 'getMethods' | 'setMethods' | 'setPageCss' - > {} -export interface IPageContextAPI - extends Pick {} + extends Pick, 'getUtils'>, + Pick, 'getDataSourceMap'> {} +export interface IPageContextAPI extends Pick {} export interface ICanvasFunctionAPI extends Pick, '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 @@ -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) } diff --git a/packages/canvas/render/src/data-function/parser.ts b/packages/canvas/render/src/data-function/parser.ts index 466a28a16e..dc93823b18 100644 --- a/packages/canvas/render/src/data-function/parser.ts +++ b/packages/canvas/render/src/data-function/parser.ts @@ -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' diff --git a/packages/canvas/render/src/lowcode.ts b/packages/canvas/render/src/lowcode.ts index de651513d9..ea5fb42bf9 100644 --- a/packages/canvas/render/src/lowcode.ts +++ b/packages/canvas/render/src/lowcode.ts @@ -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' diff --git a/packages/canvas/render/src/page-block-function/schema.ts b/packages/canvas/render/src/page-block-function/schema.ts index 136f0db0b4..380fb8a947 100644 --- a/packages/canvas/render/src/page-block-function/schema.ts +++ b/packages/canvas/render/src/page-block-function/schema.ts @@ -17,7 +17,7 @@ export function useSchema( const schema = reactive>({}) const { generateAccessor, stateAccessorMap, propsAccessorMap, generateStateAccessors } = useAccessorMap(globalContext) - const { state, setState } = useState(schema, { + const { state, setState } = useState({ getContext, generateStateAccessors }) @@ -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) diff --git a/packages/canvas/render/src/page-block-function/state.ts b/packages/canvas/render/src/page-block-function/state.ts index 8256b6ee45..93b4847c46 100644 --- a/packages/canvas/render/src/page-block-function/state.ts +++ b/packages/canvas/render/src/page-block-function/state.ts @@ -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 }