From 1b92aca15f1874dd44855006157a338e784abdae Mon Sep 17 00:00:00 2001 From: yaoyun8 Date: Tue, 30 Jul 2024 01:17:39 -0700 Subject: [PATCH 1/2] feat: unibuy-render --- .../get/app-center/v1/apps/schema/918.json | 85 +------------------ packages/canvas/render/src/RenderMain.js | 5 +- packages/canvas/render/src/runner.js | 8 +- .../materials/src/composable/useMaterial.js | 1 + 4 files changed, 10 insertions(+), 89 deletions(-) diff --git a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json index e5351b18e..d3fda570f 100644 --- a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json +++ b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json @@ -2048,90 +2048,7 @@ } ], "bridge": [], - "utils": [ - { - "name": "axios", - "type": "npm", - "content": { - "type": "JSFunction", - "value": "", - "package": "axios", - "destructuring": false, - "exportName": "axios" - } - }, - { - "name": "Button", - "type": "npm", - "content": { - "package": "@opentiny/vue", - "version": "", - "exportName": "Button", - "subName": "", - "destructuring": true, - "main": "" - } - }, - { - "name": "Menu", - "type": "npm", - "content": { - "type": "JSFunction", - "value": "", - "package": "@opentiny/vue", - "exportName": "NavMenu", - "destructuring": true - } - }, - { - "name": "Modal ", - "type": "npm", - "content": { - "package": "@opentiny/vue", - "version": "", - "exportName": "Modal ", - "subName": "", - "destructuring": true, - "main": "" - } - }, - { - "name": "npm", - "type": "function", - "content": { - "type": "JSFunction", - "value": "''" - } - }, - { - "name": "Pager", - "type": "npm", - "content": { - "package": "@opentiny/vue", - "version": "", - "exportName": "Pager", - "subName": "", - "destructuring": true, - "main": "" - } - }, - { - "name": "test", - "type": "function", - "content": { - "type": "JSFunction", - "value": "function test() {\r\n return 'test'\r\n}" - } - }, - { - "name": "util", - "type": "function", - "content": { - "type": "JSFunction", - "value": "function util () {\r\n console.log(321)\r\n}" - } - } - ], + "utils": [], "config": { "sdkVersion": "1.0.3", "historyMode": "hash", diff --git a/packages/canvas/render/src/RenderMain.js b/packages/canvas/render/src/RenderMain.js index dcee72a78..0e1899c08 100644 --- a/packages/canvas/render/src/RenderMain.js +++ b/packages/canvas/render/src/RenderMain.js @@ -15,7 +15,7 @@ import { I18nInjectionKey } from 'vue-i18n' import { useBroadcastChannel } from '@vueuse/core' import { constants, utils as commonUtils } from '@opentiny/tiny-engine-utils' import renderer, { parseData, setConfigure, setController, globalNotify, isStateAccessor } from './render' -import { getNode as getNodeById, clearNodes, getRoot, setContext, getContext, setCondition, context } from './context' +import { getNode as getNodeById, clearNodes, getRoot, setContext, getContext, setCondition, context, setNode } from './context' import CanvasEmpty from './CanvasEmpty.vue' const { BROADCAST_CHANNEL } = constants @@ -422,5 +422,6 @@ export const api = { getGlobalState, getDataSourceMap, setDataSourceMap, - setGlobalState + setGlobalState, + setNode, } diff --git a/packages/canvas/render/src/runner.js b/packages/canvas/render/src/runner.js index 84df0b50d..c23769a39 100644 --- a/packages/canvas/render/src/runner.js +++ b/packages/canvas/render/src/runner.js @@ -112,7 +112,7 @@ const renderer = { const create = async (config) => { const { beforeAppCreate, appCreated } = config.lifeCycles || {} if (typeof beforeAppCreate === 'function') { - await beforeAppCreate() + await beforeAppCreate({ Vue, canvasWin: window, api }) } App && App.unmount() App = null @@ -126,12 +126,14 @@ const create = async (config) => { dispatch('canvasReady', { detail: renderer }) App = Vue.createApp(Main).use(TinyI18nHost).provide(I18nInjectionKey, TinyI18nHost) - App.config.globalProperties.lowcodeConfig = window.parent.TinyGlobalConfig - App.mount(document.querySelector('#app')) + if (typeof appCreated === 'function') { await appCreated(App) } + App.config.globalProperties.lowcodeConfig = window.parent.TinyGlobalConfig + App.mount(document.querySelector('#app')) + new ResizeObserver(() => { dispatch('canvasResize') }).observe(document.body) diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js index edbb52907..091f87edd 100644 --- a/packages/plugins/materials/src/composable/useMaterial.js +++ b/packages/plugins/materials/src/composable/useMaterial.js @@ -345,6 +345,7 @@ export default function () { materialState, // 存放着组件、物料侧区块、第三方依赖信息 initMaterial, // 物料模块初始化 fetchMaterial, // 请求物料并进行处理 + addMaterials, // 解析bundle.json，添加多个物料 getMaterialsRes, // 获取物料，并返回符合物料协议的bundle.json内容，getMaterialsRes: () => Promise generateNode, // 根据 包含{ type, componentName }的组件信息生成组件schema节点，结构： clearMaterials, // 清空物料 From 66c0fba3cd5313ded0d68d52596e44916991804b Mon Sep 17 00:00:00 2001 From: yaoyun8 Date: Tue, 30 Jul 2024 01:33:15 -0700 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9Aeslint=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/plugins/materials/src/composable/useMaterial.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js index 091f87edd..edbb52907 100644 --- a/packages/plugins/materials/src/composable/useMaterial.js +++ b/packages/plugins/materials/src/composable/useMaterial.js @@ -345,7 +345,6 @@ export default function () { materialState, // 存放着组件、物料侧区块、第三方依赖信息 initMaterial, // 物料模块初始化 fetchMaterial, // 请求物料并进行处理 - addMaterials, // 解析bundle.json，添加多个物料 getMaterialsRes, // 获取物料，并返回符合物料协议的bundle.json内容，getMaterialsRes: () => Promise generateNode, // 根据 包含{ type, componentName }的组件信息生成组件schema节点，结构： clearMaterials, // 清空物料