From 43506e049b490ce0345c901dae811fcae8ae6497 Mon Sep 17 00:00:00 2001 From: yaoyun8 Date: Mon, 20 Nov 2023 18:40:39 -0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=BB=84=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=BB=91=E5=AE=9A=E5=B7=A5=E5=85=B7=E7=B1=BButils?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88=E5=87=BA=E7=A0=81?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../get/app-center/apps/extension/list.json | 2 +- .../get/app-center/v1/apps/schema/918.json | 2 +- mockServer/src/services/appinfo.json | 2 +- .../preview/src/preview/srcFiles/lowcode.js | 2 +- packages/vue-generator/src/generator/page.js | 6 ++++- .../test/testcases/full/index.js | 22 +++++++++---------- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/mockServer/src/mock/get/app-center/apps/extension/list.json b/mockServer/src/mock/get/app-center/apps/extension/list.json index 67a3ac8a3f..d3f2008dd4 100644 --- a/mockServer/src/mock/get/app-center/apps/extension/list.json +++ b/mockServer/src/mock/get/app-center/apps/extension/list.json @@ -102,7 +102,7 @@ "type": "function", "content": { "type": "JSFunction", - "value": "function util() {\r\n console.log(3211)\r\n}" + "value": "function test() {\r\n return 'test'\r\n}" }, "app": 918, "category": "utils", 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 7df5f36e39..92e9376214 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 @@ -1404,7 +1404,7 @@ "type": "function", "content": { "type": "JSFunction", - "value": "function util() {\r\n console.log(3211)\r\n}" + "value": "function test() {\r\n return 'test'\r\n}" } }, { diff --git a/mockServer/src/services/appinfo.json b/mockServer/src/services/appinfo.json index 72f04d5803..ccd0654d88 100644 --- a/mockServer/src/services/appinfo.json +++ b/mockServer/src/services/appinfo.json @@ -1057,7 +1057,7 @@ "type": "function", "content": { "type": "JSFunction", - "value": "function util() {\r\n console.log(3211)\r\n}" + "value": "function test() {\r\n return 'test'\r\n}" }, "app": 918, "category": "utils", diff --git a/packages/design-core/src/preview/src/preview/srcFiles/lowcode.js b/packages/design-core/src/preview/src/preview/srcFiles/lowcode.js index 99491ac237..22d96c1b60 100644 --- a/packages/design-core/src/preview/src/preview/srcFiles/lowcode.js +++ b/packages/design-core/src/preview/src/preview/srcFiles/lowcode.js @@ -88,5 +88,5 @@ export default () => { const stores = useStores() - return { t: i18n.global.t, stores, lowcodeWrap, utils } + return { t: i18n.global.t, stores, lowcodeWrap } } diff --git a/packages/vue-generator/src/generator/page.js b/packages/vue-generator/src/generator/page.js index 2bf835f818..8fe6b41eff 100644 --- a/packages/vue-generator/src/generator/page.js +++ b/packages/vue-generator/src/generator/page.js @@ -40,6 +40,10 @@ function recurseChildren(children, state, description, result) { result.push(subTemplate) } else if (children?.type === 'JSExpression') { result.push(`{{ ${children.value.replace(/this\.(props\.)?/g, '')} }}`) + + for (const key in description.jsResource) { + description.jsResource[key] = description.jsResource[key] || children.value.includes(`.${key}.`) + } } else if (children?.type === 'i18n') { result.push(`{{ t('${children.key}') }}`) } else { @@ -397,7 +401,7 @@ ${imports.join('\n')} const props = defineProps({${propsArr.join(',\n')}}) const emit = defineEmits(${JSON.stringify(emitsArr)}) -const { t, lowcodeWrap, stores, utils } = vue.inject(I18nInjectionKey).lowcode() +const { t, lowcodeWrap, stores } = vue.inject(I18nInjectionKey).lowcode() const wrap = lowcodeWrap(props, { emit }, t) ${iconStatement} diff --git a/packages/vue-generator/test/testcases/full/index.js b/packages/vue-generator/test/testcases/full/index.js index bddead5472..e88d2fa1dc 100644 --- a/packages/vue-generator/test/testcases/full/index.js +++ b/packages/vue-generator/test/testcases/full/index.js @@ -1,20 +1,20 @@ /** -* Copyright (c) 2023 - present TinyEngine Authors. -* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. -* -* Use of this source code is governed by an MIT-style license. -* -* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, -* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR -* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. -* -*/ + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ const path = require('path') const fs = require('fs-extra') const prettier = require('prettier') const { execSync } = require('child_process') -const { generateCode } = require('../../../dist/lowcode-dsl-vue.cjs.js') +const { generateCode } = require('../../../dist/tiny-engine-dsl-vue.cjs.js') const { logger } = require('../../utils/logger') const getPageData = (testCaseFile) => {