wangxuefeng/low-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangxuefeng:813547331d5ab8d8d5cb6c4d0eb6fb819dc3b69e
Branches Tags
wangxuefeng:master
wangxuefeng:feature/low-code-platform
wangxuefeng:release
wangxuefeng:low-code-engine
wangxuefeng:feature/update-devpen
wangxuefeng:feature/update-depencies
..
compare: wangxuefeng:0e377eefccaad6c7699f67de7aef5e3b3459e913
Branches Tags
wangxuefeng:feature/low-code-platform
wangxuefeng:release
wangxuefeng:low-code-engine
wangxuefeng:feature/update-devpen
wangxuefeng:feature/update-depencies
wangxuefeng:master

No commits in common. "813547331d5ab8d8d5cb6c4d0eb6fb819dc3b69e" and "0e377eefccaad6c7699f67de7aef5e3b3459e913" have entirely different histories.
813547331d ... 0e377eefcc

26 changed files with 1556 additions and 1804 deletions
Show Stats Expand all files Collapse all files

20
apps/designer/package.json
View File

@ -15,17 +15,17 @@
"typecheck": "vue-tsc --noEmit --skipLibCheck" "typecheck": "vue-tsc --noEmit --skipLibCheck"
}, },
"dependencies": { "dependencies": {
"@vtj/core": "^0.11.12", "@vtj/core": "^0.11.7",
"@vtj/designer": "0.11.12", "@vtj/designer": "0.11.7",
"@vtj/icons": "0.11.12", "@vtj/icons": "0.11.7",
"@vtj/local": "^0.11.12", "@vtj/local": "^0.11.7",
"@vtj/materials": "^0.11.12", "@vtj/materials": "^0.11.7",
"@vtj/node": "0.11.2", "@vtj/node": "0.11.2",
"@vtj/pro": "^0.11.12", "@vtj/pro": "^0.11.7",
"@vtj/renderer": "^0.11.12", "@vtj/renderer": "^0.11.7",
"@vtj/ui": "^0.11.12", "@vtj/ui": "^0.11.7",
"@vtj/utils": "0.11.12", "@vtj/utils": "0.11.7",
"@vtj/web": "^0.11.12", "@vtj/web": "^0.11.7",
"axios": "^1.8.1", "axios": "^1.8.1",
"element-plus": "^2.9.4", "element-plus": "^2.9.4",
"licia-es": "^1.46.0", "licia-es": "^1.46.0",

10
apps/designer/src/views/index.vue
View File

@ -28,10 +28,10 @@ onMounted(async () => {
console.log('get parent model', model); console.log('get parent model', model);
userStore.setToken(model.accessToken); userStore.setToken(model.accessToken);
localStorage.setItem('y-code-access-token', model.accessToken); localStorage.setItem('y-code-access-token', model.accessToken);
request.useRequest((req) => { // request.useRequest((req) => {
req.headers.set('Authorization', `Bearer ${model.accessToken}`); // req.headers.set('Authorization', `Bearer ${model.accessToken}`);
return req; // return req;
}); // });
sessionStorage.setItem('projectId', model.projectId); sessionStorage.setItem('projectId', model.projectId);
const _engine = new Engine({ const _engine = new Engine({
container, container,
@ -66,7 +66,7 @@ onMounted(async () => {
widgetManager.set('History', { widgetManager.set('History', {
// 有 bug，先隐藏 // 有 bug，先隐藏
// invisible: true invisible: true
}); });
}); });
}); });

8
apps/designer/src/views/preview.vue
View File

@ -9,10 +9,10 @@ import { jsonp, request } from '@vtj/utils';
const userStore = useUserStore(); const userStore = useUserStore();
const service = new LowCodeService(); const service = new LowCodeService();
request.useRequest((req) => { // request.useRequest((req) => {
req.headers.set('Authorization', `Bearer ${userStore.token}`); // req.headers.set('Authorization', `Bearer ${userStore.token}`);
return req; // return req;
}); // });
const { provider, onReady } = createProvider({ const { provider, onReady } = createProvider({
mode: ContextMode.Runtime, mode: ContextMode.Runtime,
service, service,

7
apps/platform/CHANGELOG.md
View File

@ -1,12 +1,5 @@
# @sy/y-code-platform # @sy/y-code-platform
## 1.0.2
### Patch Changes
- Updated dependencies
- @sy/wujie-vue3-renderer-adapter@1.0.2
## 1.0.1 ## 1.0.1
### Patch Changes ### Patch Changes

2
apps/platform/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sy/y-code-platform", "name": "@sy/y-code-platform",
"version": "1.0.2", "version": "1.0.1",
"private": true, "private": true,
"author": { "author": {
"name": "wangxuefeng", "name": "wangxuefeng",

1
apps/platform/src/router/routes/modules/application.ts
View File

@ -11,7 +11,6 @@ const routes: Array<RouteRecordRaw> = [
meta: { meta: {
title: '应用管理', title: '应用管理',
icon: 'ant-design:appstore-outlined', icon: 'ant-design:appstore-outlined',
hideInMenu: true,
}, },
children: [ children: [
{ {

1
apps/platform/src/router/routes/modules/micro.ts
View File

@ -33,7 +33,6 @@ const routes: RouteRecordRaw[] = [
url: `${VITE_DESIGNER_URL}`, url: `${VITE_DESIGNER_URL}`,
projectId: LOW_CODE_PROJECT_ID, projectId: LOW_CODE_PROJECT_ID,
name: 'admin-designer', name: 'admin-designer',
accessToken: localStorage.getItem('y-code-access-token'),
route, route,
}; };
}, },

5
apps/platform/src/router/routes/modules/project.ts
View File

@ -12,10 +12,9 @@ const routes: Array<RouteRecordRaw> = [
path: '/project', path: '/project',
name: moduleName, name: moduleName,
meta: { meta: {
// hideInMenu: true, hideInMenu: true,
title: '项目管理', title: '项目管理',
icon: 'ant-design:appstore-outlined', icon: 'ant-design:appstore-outlined',
redirect: '/project/list',
}, },
children: [ children: [
{ {
@ -24,7 +23,7 @@ const routes: Array<RouteRecordRaw> = [
meta: { meta: {
title: '项目列表', title: '项目列表',
icon: 'ant-design:list', icon: 'ant-design:list',
// hideInMenu: true, hideInMenu: true,
}, },
component: Renderer, component: Renderer,
props: (route) => { props: (route) => {

14
apps/renderer/index.html
View File

@ -10,19 +10,5 @@
<body> <body>
<div id="y-code-renderer" style="width: 100%; height: 100%"></div> <div id="y-code-renderer" style="width: 100%; height: 100%"></div>
<script type="module" src="/src/index.ts"></script> <script type="module" src="/src/index.ts"></script>
<!-- Google tag (gtag.js) -->
<script
async
src="https://www.googletagmanager.com/gtag/js?id=G-LPQRRS1VVF"
></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());
gtag('config', 'G-LPQRRS1VVF');
</script>
</body> </body>
</html> </html>

18
apps/renderer/package.json
View File

@ -16,15 +16,15 @@
"dependencies": { "dependencies": {
"@sentry/vue": "^9.7.0", "@sentry/vue": "^9.7.0",
"@tanstack/vue-query": "^5.69.0", "@tanstack/vue-query": "^5.69.0",
"@vtj/charts": "^0.11.12", "@vtj/charts": "^0.11.7",
"@vtj/core": "^0.11.12", "@vtj/core": "^0.11.7",
"@vtj/icons": "0.11.12", "@vtj/icons": "0.11.7",
"@vtj/materials": "^0.11.12", "@vtj/materials": "^0.11.7",
"@vtj/pro": "^0.11.12", "@vtj/pro": "^0.11.7",
"@vtj/renderer": "^0.11.12", "@vtj/renderer": "^0.11.7",
"@vtj/ui": "^0.11.12", "@vtj/ui": "^0.11.7",
"@vtj/utils": "^0.11.12", "@vtj/utils": "^0.11.7",
"@vtj/web": "^0.11.12", "@vtj/web": "^0.11.7",
"ant-design-vue": "catalog:", "ant-design-vue": "catalog:",
"axios": "catalog:", "axios": "catalog:",
"core-js": "catalog:", "core-js": "catalog:",

152
apps/renderer/src/App.vue
View File

@ -1,15 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { AxiosInterceptorManager, AxiosResponse } from 'axios'; import type { AxiosInterceptorManager, AxiosResponse } from 'axios';
import { import { getCurrentInstance, onMounted, ref, watch } from 'vue';
getCurrentInstance,
onBeforeUnmount,
onMounted,
provide,
reactive,
ref,
watch,
} from 'vue';
import { useQuery } from '@tanstack/vue-query'; import { useQuery } from '@tanstack/vue-query';
import { jsonp, request } from '@vtj/utils'; import { jsonp, request } from '@vtj/utils';
@ -57,7 +49,7 @@ interface InitParams {
// 响应式状态 // 响应式状态
const renderer = ref(); const renderer = ref();
const lowCodeService = new LowCodeService(); const lowCodeService = new LowCodeService();
const isLoading = ref(true); const isLoading = ref(false);
const provider = ref(null); const provider = ref(null);
const loadingInstance = ref(null); const loadingInstance = ref(null);
const errorMessage = ref(''); const errorMessage = ref('');
@ -245,131 +237,6 @@ const notifyParent = (event: string, data?: any) => {
} }
}; };
// 创建响应式上下文对象
const contextRef = ref(null);
// 初始化上下文
const initContext = () => {
if (!isValidParams(initParams.value)) return;
contextRef.value = reactive({
...initParams.value,
updateTimestamp: Date.now(),
});
};
// 提供上下文给所有子组件
provide('lowCodeContext', contextRef);
// 添加一个函数来检测 wujie props 的变化并更新上下文
const setupWujiePropsWatcher = () => {
if (!isWujieSubApp) return;
// 获取当前 props 的快照
let prevPropsSnapshot = window.$wujie?.props
? JSON.stringify(window.$wujie.props)
: null;
// 设置定时器定期检查 props 变化
const intervalId = setInterval(() => {
if (!window.$wujie?.props) return;
// 获取最新的 props 并序列化
const currentPropsSnapshot = JSON.stringify(window.$wujie.props);
// 比较是否发生变化
if (currentPropsSnapshot !== prevPropsSnapshot) {
console.log('检测到 wujie props 变化:', window.$wujie.props);
// 更新快照
prevPropsSnapshot = currentPropsSnapshot;
// 解析新的 props
const newProps = JSON.parse(currentPropsSnapshot);
const oldParams = initParams.value;
// 更新 initParams
initParams.value = {
...newProps,
_timestamp: Date.now(),
};
// 如果上下文已初始化，更新上下文
if (contextRef.value) {
// 使用 Object.assign 保持响应式
Object.assign(contextRef.value, {
...newProps,
updateTimestamp: Date.now(),
});
console.log('上下文已更新:', contextRef.value);
// 触发上下文更新事件
if (isWujieSubApp) {
window.$wujie.bus.$emit('context-updated', contextRef.value);
}
}
// 如果核心参数发生变化，重新加载组件
if (
isValidParams(initParams.value) &&
(oldParams?.fileId !== initParams.value.fileId ||
oldParams?.projectId !== initParams.value.projectId)
) {
console.log('核心参数发生变化，重新加载组件');
reloadComponent();
}
}
}, 300);
onBeforeUnmount(() => {
clearInterval(intervalId);
});
};
// 重新加载组件的函数
const reloadComponent = async () => {
if (!isValidParams(initParams.value)) {
errorMessage.value = '缺少必要参数：fileId 和 projectId';
if (isWujieSubApp) {
notifyParent('render-fail', errorMessage.value);
}
return;
}
isLoading.value = true;
showLoading('参数已更新，重新加载组件...');
try {
// 如果需要，重置 provider 以强制重新初始化
provider.value = null;
// 重新初始化低代码引擎
await initLowCodeEngine();
// 获取新的渲染组件
const component = await getRenderComponent();
if (component) {
renderer.value = component;
if (isWujieSubApp) {
notifyParent('render-success');
}
} else {
if (isWujieSubApp) {
notifyParent('render-fail', 'Failed to get component');
}
}
} catch (error) {
console.error('重新加载过程出错:', error);
if (isWujieSubApp) {
notifyParent('render-fail', error);
}
} finally {
isLoading.value = false;
hideLoading();
}
};
// 组件挂载后执行初始化 // 组件挂载后执行初始化
onMounted(async () => { onMounted(async () => {
// 通知父应用已准备就绪（如果是wujie子应用） // 通知父应用已准备就绪（如果是wujie子应用）
@ -377,7 +244,7 @@ onMounted(async () => {
notifyParent('ready', 'y-code-renderer is ready'); notifyParent('ready', 'y-code-renderer is ready');
} }
// 获取初始化参数 // 获取初始化参数 - 在挂载时执行一次
initParams.value = getInitParams(); initParams.value = getInitParams();
const paramsValid = isValidParams(initParams.value); const paramsValid = isValidParams(initParams.value);
@ -397,12 +264,6 @@ onMounted(async () => {
renderer.value = component; renderer.value = component;
if (isWujieSubApp) { if (isWujieSubApp) {
notifyParent('render-success'); notifyParent('render-success');
// 初始化上下文
initContext();
// 设置 wujie props 监听器
setupWujiePropsWatcher();
} }
} else { } else {
if (isWujieSubApp) { if (isWujieSubApp) {
@ -423,7 +284,8 @@ onMounted(async () => {
<component <component
:is="renderer" :is="renderer"
v-if="renderer" v-if="renderer"
:ctx-props="contextRef" :ctx-props="initParams"
v-bind="initParams"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
/> />
@ -434,6 +296,10 @@ onMounted(async () => {
<div v-else-if="!isLoading && isError" class="error-message"> <div v-else-if="!isLoading && isError" class="error-message">
{{ errorMessage || '组件加载失败，请检查参数和网络连接' }} {{ errorMessage || '组件加载失败，请检查参数和网络连接' }}
</div> </div>
<div v-else-if="!isLoading" class="error-message">
{{ errorMessage || '组件加载失败，请检查控制台日志' }}
</div>
</div> </div>
</template> </template>

2
apps/y-code-v1/.env.development
View File

@ -7,6 +7,4 @@ VITE_OA_BASEURL = https://oa-pre.shiyue.com
VITE_YCODE_BASEURL = https://custom-chart-pre-api.shiyue.com VITE_YCODE_BASEURL = https://custom-chart-pre-api.shiyue.com
VITE_CLIENT_ID = y-code-v1
VITE_YCODE_BASEURL_FRONT = https://custom-chart.shiyue.com VITE_YCODE_BASEURL_FRONT = https://custom-chart.shiyue.com

2
apps/y-code-v1/index.html
View File

@ -7,7 +7,7 @@
<title>悦码后台</title> <title>悦码后台</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="y-code-app"></div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>

3
apps/y-code-v1/package.json
View File

@ -4,7 +4,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite start --mode development --config vite.config.ts", "dev": "vite start --mode development",
"dev:staging": "vite start --mode dev-staging", "dev:staging": "vite start --mode dev-staging",
"dev:prod": "vite start --mode dev-production", "dev:prod": "vite start --mode dev-production",
"build": "vite build --mode production", "build": "vite build --mode production",
@ -23,7 +23,6 @@
"core-js": "^3.40.0", "core-js": "^3.40.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"dayjs": "catalog:", "dayjs": "catalog:",
"jsrsasign": "11.1.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"p-limit": "^6.1.0", "p-limit": "^6.1.0",
"pinia": "catalog:", "pinia": "catalog:",

2
apps/y-code-v1/src/main.ts
View File

@ -49,7 +49,7 @@ function render(props: object = {}) {
app.use(router); app.use(router);
app.use(VueGridLayout); app.use(VueGridLayout);
app.use(createPinia()); app.use(createPinia());
app.mount('#app'); app.mount('#y-code-app');
} }
function setStyleSheet(styles: object = {}) { function setStyleSheet(styles: object = {}) {

103
apps/y-code-v1/src/utils/request.ts
View File

@ -2,8 +2,6 @@ import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import axios, { AxiosError } from 'axios'; import axios, { AxiosError } from 'axios';
// 导入 RSA 相关库
import { KEYUTIL, KJUR } from 'jsrsasign';
export interface ResopnseType<T> { export interface ResopnseType<T> {
reason: string; reason: string;
@ -11,55 +9,11 @@ export interface ResopnseType<T> {
data: T; data: T;
ts: string; ts: string;
} }
export const YCODE_BASEURL: string = import.meta.env.VITE_YCODE_BASEURL; // export const YCODE_BASEURL: string = import.meta.env.VITE_YCODE_BASEURL;
// RSA 签名相关配置 // https://custom-chart-pre-api.shiyue.com
const CLIENT_ID = import.meta.env.VITE_CLIENT_ID;
// 私钥配置，请在实际使用中安全存储 export const YCODE_BASEURL: string = 'https://custom-chart-pre-api.shiyue.com';
const PRIVATE_KEY = `-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAySeb8CMlvGzI8KasmiQwMCX4240e8Ap6W8Pb63iX57pBFpmV
fcOy7BAsfOEtp3TrJkssszUxdnCmsASZQNHaJtIhide7DjXjct9MQ3tqeEtc2R2K
EkauK7oLsAiQqkpb9XpWAURfoE+83kCrJuQ49frw/zz7PElTPgjAjPknyF/JJFEp
BoasWhoFBwrZWFwQKWUmFaUodG3UjtXdepYFVfdGKmgPYerm1Os3BQu6oSCKvh+p
4uaRrAyKLBdTYXHfYiJi+oRt9wSSA0eGS8IcMxWn0azzEeZoPldLRSZ4Hpxx9Amq
iNOu7FmKP5azKxmTG6dp+ZyVgpQt9FA4YYNU9wIDAQABAoIBAFZEQGIKEMLwPHTI
Zjlsz6W2gzVVHjF/rN3x7zza6PqeLA/PKgdXiEIo5Ytg3r10LOytTKxGYcITqcjP
EBJ2bQI9F9kPxc7gWX0IOqKuKQkR+O2791zDJyrljOGfqrr9TNbH8l50vjX4PF1s
inoRYkRLrFMqCeze3W47Pqi2qdMKTmb0fjAjf9pQM/lE/jAWquUQhU8efZW0+2SD
MMhXJceMS7SgkoOgsg1Qw7iEY5iMBMUOMb9bh4RxRkEZDECgm1iZsZqq004wFuVz
RKbM//jGyNDQYZKH6TCZgC4UAPXt+PrwLC0oPrL0qZgK47dJznWzLZln2efYli+I
PuAa6DECgYEA67J/XfLbyow2fLArbmiO1Gt9fQtFnd9xapMcj+xOQtP/DBmbukLK
CYluSKED8+zKdP33t0dk4FHsrshEI85NsfBjp3GiHjbcFiOjddEyY9tHZxzMlJxB
dS9u+LAfkPN8LBk4hX5YJ/oAhWcmCJ7agDPSGt+nJeTP2U3Mu5+7B+MCgYEA2ntk
s3Gmi+n6gFQq97ANsYik+81wo/TDtqTcbmekqgSelsfNFlOeN4EOWJnXdt6/lZqs
54kmlTUZzXy3I1Fe+z8FKBpulKxvVlCZ+Ks4tbjI5peJXL0mWHdbJ2Tg4AvbjQ5E
z5efQGHbuBeFMty20JnjFlUrDd4x8Mj+dwP3Qt0CgYAhje3YACUONtvi8GmedEAx
OYRJ8vrcON06oOrmCmwx02Bx5otm/u8oYGpU6KdZaJKCCU3kx8MytDcPwu8AcfRZ
qrFlOyYrSwAWHsi8kyWrVaJaqZzuYzhmaHRR7zDvP9qjpIuJZa1DM7IzS7X8cDEH
I1l7/e8b0/FLLGpDI8BKpQKBgQCJos5vlRs8bSwYB+4Bl3Eo9FIrJuLdBub8eqM7
EiPTz5Ewn7H9bLPxd2XYPyJTikPbNVPTkL0zpf4ZS4X7w9k4Ih1XhD9Bfdet4pz8
4LCbGkvFqJUqTSaI+Lf9+zkHK7EmDWUf+f6jCoLmWDrbLdwlUayTdxfmZqHDdHuJ
8n+kKQKBgA1lR4zITE1qh+eMsueYPlOs32SP9jcx5fbTPxQpaqQJXSqvVb7ZHmfx
qwzhQTzcKjSEhlD15ct5RqxD+4KmGid8bM5fewzYnORw+u2O1g74owgq0ApCVsRU
/wsYRNpoRHJxU69kzkl8rSulJjQ0rOOz0/TyDbONhmM7Bv0cQAAA
-----END RSA PRIVATE KEY-----`;
// 需要添加签名的 API 路径前缀
const NEED_SIGN_PATHS = [
'/v1/project',
'/v1/preview',
'/v1/modular',
'/v1/field',
];
// 初始化私钥
let privateKey: string;
try {
privateKey = KEYUTIL.getKey(PRIVATE_KEY);
} catch (error) {
console.error('RSA 私钥初始化失败:', error);
}
const requestType = { const requestType = {
base: YCODE_BASEURL, base: YCODE_BASEURL,
@ -71,57 +25,6 @@ const baseAxios: AxiosInstance = axios.create({
withCredentials: true, withCredentials: true,
}); });
// 创建 RSA 签名
function createSignature(message: string): string {
try {
const sig = new KJUR.crypto.Signature({ alg: 'SHA256withRSA' });
sig.init(privateKey);
sig.updateString(message);
return btoa(sig.sign());
} catch (error) {
console.error('签名创建失败:', error);
return '';
}
}
// 请求拦截器 - 添加 RSA 签名认证
baseAxios.interceptors.request.use(
(config) => {
// 检查是否需要添加签名
const needSign = NEED_SIGN_PATHS.some(
(path) => config.url && config.url.startsWith(path),
);
if (needSign && privateKey) {
// 生成当前时间戳（秒）
const timestamp = Math.floor(Date.now() / 1000).toString();
// 构建要签名的消息: clientID + timestamp
const message = CLIENT_ID + timestamp;
// 创建签名
const signature = createSignature(message);
// 设置请求头
config.headers = config.headers || {};
config.headers['X-Client-ID'] = CLIENT_ID;
config.headers['X-Timestamp'] = timestamp;
config.headers['X-Signature'] = signature;
console.log('已添加签名认证:', {
url: config.url,
clientId: CLIENT_ID,
timestamp,
});
}
return config;
},
(error) => {
return Promise.reject(error);
},
);
const errorHandle = (error: AxiosError) => { const errorHandle = (error: AxiosError) => {
if (error.response) { if (error.response) {
const status = error.response?.status; const status = error.response?.status;

13
apps/y-code-v1/start/components.d.ts vendored
View File

@ -1,13 +0,0 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
declare module 'vue' {
export interface GlobalComponents {
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}
}

2
apps/y-code-v1/vite.config.ts
View File

@ -9,7 +9,7 @@ import mkcert from 'vite-plugin-mkcert';
import qiankun from 'vite-plugin-qiankun'; import qiankun from 'vite-plugin-qiankun';
export default defineConfig(({ mode }) => { export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd()); const env = loadEnv(mode, process.cwd(), ['VITE_']);
const isDev = env.VITE_NODE_ENV === 'development'; const isDev = env.VITE_NODE_ENV === 'development';
return { return {

6
packages/renderer-adapter/wujie-vue2/CHANGELOG.md
View File

@ -1,11 +1,5 @@
# @sy/wujie-vue2-renderer-adapter # @sy/wujie-vue2-renderer-adapter
## 1.0.1
### Patch Changes
- 渲染适配器增加 props 深度监听处理
## 1.0.0 ## 1.0.0
### Patch Changes ### Patch Changes

2
packages/renderer-adapter/wujie-vue2/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sy/wujie-vue2-renderer-adapter", "name": "@sy/wujie-vue2-renderer-adapter",
"version": "1.0.1", "version": "1.0.0",
"description": "wujie-vue2 ycode renderer adapter", "description": "wujie-vue2 ycode renderer adapter",
"type": "module", "type": "module",
"scripts": { "scripts": {

86
packages/renderer-adapter/wujie-vue2/src/adapter.vue
View File

@ -9,53 +9,11 @@ import { version } from '/package.json';
export default defineComponent({ export default defineComponent({
name: 'WujieAdapter', name: 'WujieAdapter',
data() {
return {
// 使用 data 创建可变的 subAppProps
subAppPropsData: this.getInitialSubAppProps(),
};
},
computed: { computed: {
finalUrl() { finalUrl() {
return `${this.url}?fileId=${this.fileId}&projectId=${this.projectId}&applicationId=${this.applicationId}`; return `${this.url}?fileId=${this.fileId}&projectId=${this.projectId}&applicationId=${this.applicationId}`;
}, },
}, subAppProps() {
watch: {
// 监听所有 props 变化
$props: {
handler(newProps) {
console.log('props 发生变化，更新 subAppProps');
this.updateSubAppProps(newProps);
},
deep: true, // 深度监听，捕获嵌套属性变化
immediate: true, // 立即执行一次
},
// 单独监听常用的几个关键 prop，以确保它们的变化被捕获
fileId() {
this.updateSubAppProps(this.$props);
},
projectId() {
this.updateSubAppProps(this.$props);
},
applicationId() {
this.updateSubAppProps(this.$props);
},
payload: {
handler() {
this.updateSubAppProps(this.$props);
},
deep: true,
},
searchParams: {
handler() {
this.updateSubAppProps(this.$props);
},
deep: true,
},
},
methods: {
// 获取初始 subAppProps
getInitialSubAppProps() {
return { return {
...this.$props, ...this.$props,
adapterInfo: { adapterInfo: {
@ -63,26 +21,15 @@ export default defineComponent({
}, },
}; };
}, },
// 更新 subAppProps },
updateSubAppProps(props) { beforeUnmount() {
this.subAppPropsData = { const { bus } = WujieVue;
...props, bus.$off('message', this.handleMessage);
adapterInfo: { bus.$off('ready', this.handleReady);
version, bus.$off('render-success', this.handleRenderSuccess);
}, bus.$off('render-fail', this.handleRenderFail);
_timestamp: Date.now(), // 添加时间戳确保每次更新都是新对象 },
}; methods: {
// 如果子应用已加载，可以通过 bus 通知它 props 已更新
if (this.name || this.fileId) {
try {
const { bus } = WujieVue;
bus.$emit('props-updated', this.subAppPropsData);
} catch (error) {
console.error('发送 props 更新事件失败:', error);
}
}
},
afterMount(appWindow: any) { afterMount(appWindow: any) {
console.log(`${this.name || this.fileId} 加载完成`, appWindow); console.log(`${this.name || this.fileId} 加载完成`, appWindow);
}, },
@ -109,13 +56,6 @@ export default defineComponent({
bus.$on('render-success', this.handleRenderSuccess); bus.$on('render-success', this.handleRenderSuccess);
bus.$on('render-fail', this.handleRenderFail); bus.$on('render-fail', this.handleRenderFail);
}, },
beforeUnmount() {
const { bus } = WujieVue;
bus.$off('message', this.handleMessage);
bus.$off('ready', this.handleReady);
bus.$off('render-success', this.handleRenderSuccess);
bus.$off('render-fail', this.handleRenderFail);
},
props: { props: {
applicationId: { applicationId: {
required: true, required: true,
@ -150,10 +90,6 @@ export default defineComponent({
router: { router: {
type: Object, type: Object,
}, },
searchParams: {
default: () => ({}),
type: Object,
},
sync: { sync: {
default: true, default: true,
type: Boolean, type: Boolean,
@ -174,7 +110,7 @@ export default defineComponent({
width="100%" width="100%"
height="100%" height="100%"
:degrade="degrade" :degrade="degrade"
:props="subAppPropsData" :props="subAppProps"
:before-load="beforeLoad" :before-load="beforeLoad"
:after-mount="afterMount" :after-mount="afterMount"
:interceptors="interceptors" :interceptors="interceptors"

6
packages/renderer-adapter/wujie-vue3/CHANGELOG.md
View File

@ -1,11 +1,5 @@
# @sy/wujie-vue3-renderer-adapter # @sy/wujie-vue3-renderer-adapter
## 1.0.2
### Patch Changes
- 渲染适配器增加 props 深度监听处理
## 1.0.0 ## 1.0.0
### Patch Changes ### Patch Changes

2
packages/renderer-adapter/wujie-vue3/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sy/wujie-vue3-renderer-adapter", "name": "@sy/wujie-vue3-renderer-adapter",
"version": "1.0.2", "version": "1.0.0",
"description": "wujie-vue3 ycode renderer adapter", "description": "wujie-vue3 ycode renderer adapter",
"type": "module", "type": "module",
"scripts": { "scripts": {

33
packages/renderer-adapter/wujie-vue3/src/adapter.vue
View File

@ -3,7 +3,7 @@ import type { AxiosInterceptorManager } from 'axios';
import type { Router, RouteRecordRaw } from 'vue-router'; import type { Router, RouteRecordRaw } from 'vue-router';
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { computed, onBeforeUnmount, onMounted } from 'vue';
import WujieVue from 'wujie-vue3'; import WujieVue from 'wujie-vue3';
@ -41,7 +41,6 @@ const props = withDefaults(
route: undefined, route: undefined,
// 默认不使用 router // 默认不使用 router
router: undefined, router: undefined,
searchParams: () => ({}),
sync: true, sync: true,
url: 'https://y-code-renderer.shiyue.com', url: 'https://y-code-renderer.shiyue.com',
}, },
@ -63,28 +62,6 @@ const { bus } = WujieVue;
// // InstanceofPlugin(), // // InstanceofPlugin(),
// ]; // ];
// 使用 ref 创建响应式的 subAppProps
const subAppProps = ref({
...props,
adapterInfo: {
version,
},
});
// 监听 props 的所有变化
watch(
() => ({ ...props }),
(newProps) => {
subAppProps.value = {
...newProps,
adapterInfo: {
version,
},
};
},
{ deep: true },
);
// 生命周期钩子 // 生命周期钩子
const beforeLoad = (appWindow: Window) => { const beforeLoad = (appWindow: Window) => {
console.log(`${props.name} 开始加载`, appWindow); console.log(`${props.name} 开始加载`, appWindow);
@ -99,6 +76,14 @@ const handleMessage = (data: any) => {
console.log(`${props.name} 收到子应用消息:`, data); console.log(`${props.name} 收到子应用消息:`, data);
}; };
// 准备传递给子应用的数据
const subAppProps = {
...props,
adapterInfo: {
version,
},
};
const finalUrl = computed(() => { const finalUrl = computed(() => {
return `${props.url}?fileId=${props.fileId}&projectId=${props.projectId}&applicationId=${props.applicationId}`; return `${props.url}?fileId=${props.fileId}&projectId=${props.projectId}&applicationId=${props.applicationId}`;
}); });

2858
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

2
pnpm-workspace.yaml
View File

@ -166,7 +166,7 @@ catalog:
unbuild: ^3.5.0 unbuild: ^3.5.0
unplugin-element-plus: ^0.9.1 unplugin-element-plus: ^0.9.1
vee-validate: ^4.15.0 vee-validate: ^4.15.0
vite: ^6.2.2 vite: ^6.2.1
vite-plugin-compression: ^0.5.1 vite-plugin-compression: ^0.5.1
vite-plugin-dts: ^4.5.3 vite-plugin-dts: ^4.5.3
vite-plugin-html: ^3.2.2 vite-plugin-html: ^3.2.2