From bec6f7c10146f6b610df3c9870e53a9c125f3f69 Mon Sep 17 00:00:00 2001 From: xuanlid <51027603+xuanlid@users.noreply.github.com> Date: Tue, 25 Mar 2025 02:15:09 -0700 Subject: [PATCH 1/3] fix: default vite.config template should base config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改出码模板的 vite.config.js 文件，增加 `base: './'` 配置 --- .../src/templates/vue-template/templateFiles/genViteConfig.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vue-generator/src/templates/vue-template/templateFiles/genViteConfig.js b/packages/vue-generator/src/templates/vue-template/templateFiles/genViteConfig.js index da9563182d..99dde75cd1 100644 --- a/packages/vue-generator/src/templates/vue-template/templateFiles/genViteConfig.js +++ b/packages/vue-generator/src/templates/vue-template/templateFiles/genViteConfig.js @@ -24,7 +24,8 @@ export default () => { transformMixedEsModules: true }, cssCodeSplit: false - } + }, + base: './' })` return res From fb88fdb0a3feba3bb1dc452d22972b0a252fb3bd Mon Sep 17 00:00:00 2001 From: yy-wow Date: Thu, 27 Mar 2025 23:27:32 -0700 Subject: [PATCH 2/3] fix: export more api for application --- packages/canvas/DesignCanvas/src/DesignCanvas.vue | 2 +- packages/canvas/render/src/RenderMain.ts | 8 ++++++-- .../canvas/render/src/canvas-function/canvas-api.ts | 10 +++++++--- packages/canvas/render/src/runner.ts | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue index 0d1a98b373..17182a5039 100644 --- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue +++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue @@ -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, diff --git a/packages/canvas/render/src/RenderMain.ts b/packages/canvas/render/src/RenderMain.ts index f7786ae78f..ec47b20726 100644 --- a/packages/canvas/render/src/RenderMain.ts +++ b/packages/canvas/render/src/RenderMain.ts @@ -63,7 +63,7 @@ const { getDataSourceMap }) const { getRenderer, setRenderer } = useCustomRenderer() -const { setCondition } = activePageContext +const { setCondition, getConditions } = activePageContext const updateCanvas = () => { refreshKey.value++ } @@ -75,6 +75,9 @@ setCurrentApi({ // 设置物料配置 setConfigure, setCondition, + getController, + setContext: setGlobalContext, + getConditions, getRenderer, setRenderer, getDesignMode, @@ -91,7 +94,6 @@ const throttleUpdateSchema = useThrottleFn( true ) -const pageRenderer = getRenderer() const { routerViewSetting } = useRouterViewSetting() export default defineComponent({ @@ -275,6 +277,8 @@ export default defineComponent({ ) } + const pageRenderer = getRenderer() + return () => pageAncestors.value === null ? h(CanvasEmpty, { placeholderText: '页面分析加载中' }) diff --git a/packages/canvas/render/src/canvas-function/canvas-api.ts b/packages/canvas/render/src/canvas-function/canvas-api.ts index 867c568ff8..98f1e9b2ef 100644 --- a/packages/canvas/render/src/canvas-function/canvas-api.ts +++ b/packages/canvas/render/src/canvas-function/canvas-api.ts @@ -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, 'getUtils'>, Pick, 'getDataSourceMap'> {} -export type IPageContextAPI = Pick -export interface ICanvasFunctionAPI extends Pick, 'getRenderer' | 'setRenderer'> { +export type IPageContextAPI = Pick +export interface ICanvasFunctionAPI extends ReturnType { getDesignMode: typeof getDesignMode setDesignMode: typeof setDesignMode setController: typeof setController + getController: typeof getController setConfigure: typeof setConfigure updateCanvas: () => void } @@ -29,10 +30,13 @@ export function setCurrentApi(activeApi: IInnerCanvasAPI) { } export const api: IInnerCanvasAPI = { + setContext: (...args) => currentApi?.setContext(...args), 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), diff --git a/packages/canvas/render/src/runner.ts b/packages/canvas/render/src/runner.ts index 903c83cd02..cd30e36342 100644 --- a/packages/canvas/render/src/runner.ts +++ b/packages/canvas/render/src/runner.ts @@ -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({ api: renderer }) } App.config.globalProperties.lowcodeConfig = window.parent.TinyGlobalConfig From f2d70243de00b0371e04a852e03208c1a879222b Mon Sep 17 00:00:00 2001 From: yy-wow Date: Sun, 6 Apr 2025 20:49:20 -0700 Subject: [PATCH 3/3] fix: review --- packages/canvas/render/src/RenderMain.ts | 1 - packages/canvas/render/src/canvas-function/canvas-api.ts | 3 +-- packages/canvas/render/src/runner.ts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/canvas/render/src/RenderMain.ts b/packages/canvas/render/src/RenderMain.ts index ec47b20726..f185c80c4e 100644 --- a/packages/canvas/render/src/RenderMain.ts +++ b/packages/canvas/render/src/RenderMain.ts @@ -76,7 +76,6 @@ setCurrentApi({ setConfigure, setCondition, getController, - setContext: setGlobalContext, getConditions, getRenderer, setRenderer, diff --git a/packages/canvas/render/src/canvas-function/canvas-api.ts b/packages/canvas/render/src/canvas-function/canvas-api.ts index 98f1e9b2ef..239db1e240 100644 --- a/packages/canvas/render/src/canvas-function/canvas-api.ts +++ b/packages/canvas/render/src/canvas-function/canvas-api.ts @@ -8,7 +8,7 @@ import type { setController, getController } from './controller' export interface IApplicationFunctionAPI extends Pick, 'getUtils'>, Pick, 'getDataSourceMap'> {} -export type IPageContextAPI = Pick +export type IPageContextAPI = Pick export interface ICanvasFunctionAPI extends ReturnType { getDesignMode: typeof getDesignMode setDesignMode: typeof setDesignMode @@ -30,7 +30,6 @@ export function setCurrentApi(activeApi: IInnerCanvasAPI) { } export const api: IInnerCanvasAPI = { - setContext: (...args) => currentApi?.setContext(...args), getUtils: (...args) => currentApi?.getUtils(...args), setController: (...args) => currentApi?.setController(...args), getController: (...args) => currentApi?.getController(...args), diff --git a/packages/canvas/render/src/runner.ts b/packages/canvas/render/src/runner.ts index cd30e36342..0b53ee4270 100644 --- a/packages/canvas/render/src/runner.ts +++ b/packages/canvas/render/src/runner.ts @@ -66,7 +66,7 @@ const create = async (config) => { App = createApp(Main).use(TinyI18nHost).provide(I18nInjectionKey, TinyI18nHost) if (typeof appCreated === 'function') { - await appCreated({ api: renderer }) + await appCreated(App, { api: renderer }) } App.config.globalProperties.lowcodeConfig = window.parent.TinyGlobalConfig