- {{ action.eventName }}{{ state.componentEvents[action.eventName].label.zh_CN }}
+ {{ action.eventName }}{{ renderEventList[action.eventName]?.label?.[locale] }}
{{ action.linkedEventName }}
{{ action.ref }}
@@ -78,7 +78,7 @@
@@ -88,6 +88,7 @@
import { computed, reactive, watchEffect } from 'vue'
import { Popover, Button } from '@opentiny/vue'
import { useCanvas, useModal, useLayout, useBlock, useResource } from '@opentiny/tiny-engine-controller'
+import i18n from '@opentiny/tiny-engine-controller/js/i18n'
import { BlockLinkEvent, SvgButton } from '@opentiny/tiny-engine-common'
import { iconHelpQuery, iconChevronDown } from '@opentiny/vue-icon'
import BindEventsDialog, { open as openDialog } from './BindEventsDialog.vue'
@@ -112,6 +113,7 @@ export default {
const { getBlockEvents, getCurrentBlock, removeEventLink } = useBlock()
const { getMaterial } = useResource()
const { confirm } = useModal()
+ const locale = i18n.global.locale.value
const { highlightMethod } = getPluginApi(PLUGIN_NAME.PageController)
@@ -119,25 +121,25 @@ export default {
eventName: '', // 事件名称
eventBinding: null, // 事件绑定的处理方法对象
componentEvent: {},
- componentEvents: commonEvents,
+ customEvents: commonEvents,
bindActions: {},
showBindEventDialog: false
})
const isBlock = computed(() => Boolean(pageState.isBlock))
const isEmpty = computed(() => Object.keys(state.bindActions).length === 0)
+ const renderEventList = computed(() => ({ ...state.componentEvent, ...state.customEvents }))
watchEffect(() => {
const componentName = pageState?.currentSchema?.componentName
const componentSchema = getMaterial(componentName)
state.componentEvent = componentSchema?.content?.schema?.events || componentSchema?.schema?.events || {}
- Object.assign(state.componentEvents, state.componentEvent)
const props = pageState?.currentSchema?.props || {}
const keys = Object.keys(props)
state.bindActions = {}
// 遍历组件事件元数据
- Object.entries(state.componentEvents).forEach(([eventName, componentEvent]) => {
+ Object.entries(renderEventList.value).forEach(([eventName, componentEvent]) => {
// 查找组件已添加的事件
if (keys.indexOf(eventName) > -1) {
const event = props[eventName]
@@ -225,7 +227,7 @@ export default {
const handleAddEvent = (params) => {
const { eventName, eventDescription } = params
- Object.assign(state.componentEvents, {
+ Object.assign(state.customEvents, {
[eventName]: {
label: {
zh_CN: eventDescription
@@ -253,7 +255,9 @@ export default {
openCodePanel,
openActionDialog,
handleAddEvent,
- handleToggleAddEventDialog
+ handleToggleAddEventDialog,
+ renderEventList,
+ locale
}
}
}
diff --git a/packages/settings/events/src/components/BindEventsDialog.vue b/packages/settings/events/src/components/BindEventsDialog.vue
index e7fbc838e5..079f2e8d2a 100644
--- a/packages/settings/events/src/components/BindEventsDialog.vue
+++ b/packages/settings/events/src/components/BindEventsDialog.vue
@@ -1,6 +1,6 @@
props.style,
() => {
- state.isUpdateFromProps = true
- borderRadius.BorderRadius = parseInt(props.style.borderRadius || 0)
- borderRadius.BorderTopLeftRadius = parseInt(props.style.borderTopLeftRadius || 0)
- borderRadius.BorderTopRightRadius = parseInt(props.style.borderTopRightRadius || 0)
- borderRadius.BorderBottomLeftRadius = parseInt(props.style.borderBottomLeftRadius || 0)
- borderRadius.BorderBottomRightRadius = parseInt(props.style.borderBottomRightRadius || 0)
+ borderRadius.BorderRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderRadius] || 0)
+ borderRadius.BorderTopLeftRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderTopLeftRadius] || 0)
+ borderRadius.BorderTopRightRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderTopRightRadius] || 0)
+ borderRadius.BorderBottomLeftRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderBottomLeftRadius] || 0)
+ borderRadius.BorderBottomRightRadius = parseInt(
+ props.style[BORDER_RADIUS_PROPERTY.BorderBottomRightRadius] || 0
+ )
},
{ immediate: true }
)
@@ -386,12 +385,13 @@ export default {
* 1. 用户在 monacoEditor 更新了样式 border-radius: 9px 然后保存，该组件接收并同步改值
* 2. 用户在 monacoEditor 删除了 border-radius: 9px 的样式，然后 watch 函数（props.style），重新计算得到值 0
* 3. 0 更新后，会再触发改函数更新，导致自动加上了 border-radius: 0px 的样式
- * 所以从 props 来的更新不需要再调用一遍 updateStyle（更新 props 数据）
+ * 所以从如果当前值为 0 且 props.style[BORDER_RADIUS_PROPERTY.BorderRadius] 不存在值，不需要触发更新
*/
- if (state.isUpdateFromProps) {
- state.isUpdateFromProps = false
+
+ if (!value && !props.style[BORDER_RADIUS_PROPERTY.BorderRadius]) {
return
}
+
borderRadius.BorderRadius = value
updateStyle({
diff --git a/packages/settings/styles/src/components/spacing/SpacingGroup.vue b/packages/settings/styles/src/components/spacing/SpacingGroup.vue
index 9379bcee4a..aee7a17927 100644
--- a/packages/settings/styles/src/components/spacing/SpacingGroup.vue
+++ b/packages/settings/styles/src/components/spacing/SpacingGroup.vue
@@ -429,7 +429,7 @@ export default {
properties[name] = {
value,
- text: value === 'auto' ? 'auto' : String(Number.parseInt(value || 0)), // 界面 box 中显示的数值
+ text: value === 'auto' ? 'auto' : String(Number.parseInt(value) || 0), // 界面 box 中显示的数值
setting: Boolean(value) // 属性是否已设置值
}
})
diff --git a/packages/settings/styles/src/components/spacing/SpacingSetting.vue b/packages/settings/styles/src/components/spacing/SpacingSetting.vue
index af11937bd0..1e950ae87f 100644
--- a/packages/settings/styles/src/components/spacing/SpacingSetting.vue
+++ b/packages/settings/styles/src/components/spacing/SpacingSetting.vue
@@ -61,6 +61,10 @@ export default {
props.property.value?.indexOf('px') > -1 ? Number.parseInt(props.property.value) : props.property.value
)
+ const updateStyle = (value) => {
+ emit('update', { [props.property.name]: value })
+ }
+
const sliderChange = () => {
if (sliderFlag) {
updateStyle(`${sliderValue.value}px`)
@@ -83,11 +87,7 @@ export default {
const reset = () => {
sliderFlag = false
- updateStyle('')
- }
-
- const updateStyle = (value) => {
- emit('update', { [props.property.name]: value })
+ updateStyle(null)
}
const inputChange = (property) => {
diff --git a/packages/settings/styles/src/js/parser.js b/packages/settings/styles/src/js/parser.js
index b56a9f6684..ee54e7d824 100644
--- a/packages/settings/styles/src/js/parser.js
+++ b/packages/settings/styles/src/js/parser.js
@@ -231,7 +231,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
if (key.includes('comment')) {
str += `${value.value}\n`
} else {
- str += `${key}: ${value.value};\n`
+ str += `${key}: ${value.value === '' ? "''" : value.value};\n`
}
}
} else {
@@ -249,7 +249,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
// 在 styleObject 的，可能有改动，所以需要用 styleObject 拼接
for (const [key, value] of Object.entries(styleObject[item.selectors].rules)) {
if (![null, undefined].includes(value)) {
- str += `${key}: ${value};\n`
+ str += `${key}: ${value === '' ? "''" : value};\n`
}
}
}
@@ -266,7 +266,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
str += `${selector} {\n`
for (const [declKey, declValue] of Object.entries(value.rules)) {
- str += `${declKey}: ${declValue};\n`
+ str += `${declKey}: ${declValue === '' ? "''" : declValue};\n`
}
str += '}\n'
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index ba718cc286..6776c07218 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-svgs",
- "version": "1.0.4",
+ "version": "1.0.7",
"publishConfig": {
"access": "public"
},
@@ -23,7 +23,6 @@
"author": "OpenTiny Team",
"license": "MIT",
"homepage": "https://opentiny.design/tiny-engine",
- "dependencies": {},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index 6ed0f215ab..ffb62ea1d4 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-theme-dark",
- "version": "1.0.4",
+ "version": "1.0.7",
"publishConfig": {
"access": "public"
},
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index 375eaf92e8..f1b2770c36 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-theme-light",
- "version": "1.0.5",
+ "version": "1.0.8",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index 8060d7254a..f1feee0390 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-toolbar-breadcrumb",
- "version": "1.0.3",
+ "version": "1.0.6",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index 103fd3e47d..b94534eafa 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-toolbar-clean",
- "version": "1.0.3",
+ "version": "1.0.6",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index f8c668d3f8..4ef4a7e201 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-toolbar-collaboration",
- "version": "1.0.3",
+ "version": "1.0.6",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index 3aeda8aa21..6050de0c78 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-toolbar-fullscreen",
- "version": "1.0.3",
+ "version": "1.0.6",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/generate-vue/package.json b/packages/toolbars/generate-vue/package.json
index 23c53ddcbf..6005336b78 100644
--- a/packages/toolbars/generate-vue/package.json
+++ b/packages/toolbars/generate-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-toolbar-generate-vue",
- "version": "1.0.3",
+ "version": "1.0.6",
"publishConfig": {
"access": "public"
},
diff --git a/packages/toolbars/generate-vue/src/Main.vue b/packages/toolbars/generate-vue/src/Main.vue
index 54d25cf2f1..344e44f007 100644
--- a/packages/toolbars/generate-vue/src/Main.vue
+++ b/packages/toolbars/generate-vue/src/Main.vue
@@ -1,23 +1,14 @@
-
+
-
+
+
diff --git a/packages/vue-generator/test/testcases/sfc/case06/page.schema.json b/packages/vue-generator/test/testcases/sfc/case06/page.schema.json
new file mode 100644
index 0000000000..7b5ec4ff03
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/case06/page.schema.json
@@ -0,0 +1,143 @@
+{
+ "state": {},
+ "methods": {},
+ "componentName": "Page",
+ "fileName": "createVm",
+ "css": "",
+ "props": {},
+ "lifeCycles": {},
+ "children": [
+ {
+ "componentName": "TinyTree",
+ "props": {
+ "data": [
+ {
+ "label": "一级 1",
+ "children": [
+ {
+ "label": "二级 1-1",
+ "children": [
+ {
+ "label": "三级 1-1-1"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "label": "一级 2",
+ "children": [
+ {
+ "label": "二级 2-1",
+ "children": [
+ {
+ "label": "三级 2-1-1"
+ }
+ ]
+ },
+ {
+ "label": "二级 2-2",
+ "children": [
+ {
+ "label": "三级 2-2-1"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "id": "33f52342",
+ "children": [
+ {
+ "componentName": "Template",
+ "props": {
+ "slot": {
+ "name": "default",
+ "params": ["data"]
+ }
+ },
+ "children": [
+ {
+ "componentName": "Text",
+ "props": {
+ "text": {
+ "type": "JSExpression",
+ "value": "data.label"
+ }
+ },
+ "id": "c225d165"
+ }
+ ],
+ "id": "415d5f65"
+ }
+ ]
+ },
+ {
+ "componentName": "TinyTree",
+ "props": {
+ "data": [
+ {
+ "label": "一级 1",
+ "children": [
+ {
+ "label": "二级 1-1",
+ "children": [
+ {
+ "label": "三级 1-1-1"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "label": "一级 2",
+ "children": [
+ {
+ "label": "二级 2-1",
+ "children": [
+ {
+ "label": "三级 2-1-1"
+ }
+ ]
+ },
+ {
+ "label": "二级 2-2",
+ "children": [
+ {
+ "label": "三级 2-2-1"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "id": "33f52342",
+ "children": [
+ {
+ "componentName": "Template",
+ "props": {
+ "slot": {
+ "name": "default",
+ "params": "data"
+ }
+ },
+ "children": [
+ {
+ "componentName": "Text",
+ "props": {
+ "text": {
+ "type": "JSExpression",
+ "value": "data.label"
+ }
+ },
+ "id": "c225d165"
+ }
+ ],
+ "id": "415d5f65"
+ }
+ ]
+ }
+ ]
+}
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json b/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json
new file mode 100644
index 0000000000..88f7765261
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json
@@ -0,0 +1,23 @@
+[
+ {
+ "componentName": "TinyGrid",
+ "exportName": "Grid",
+ "package": "@opentiny/vue",
+ "version": "^3.10.0",
+ "destructuring": true
+ },
+ {
+ "componentName": "TinyNumeric",
+ "exportName": "Numeric",
+ "package": "@opentiny/vue",
+ "version": "^3.10.0",
+ "destructuring": true
+ },
+ {
+ "componentName": "TinyInput",
+ "exportName": "Input",
+ "package": "@opentiny/vue",
+ "version": "^3.10.0",
+ "destructuring": true
+ }
+]
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue b/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue
new file mode 100644
index 0000000000..7d5e5f083a
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json b/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json
new file mode 100644
index 0000000000..e5da94f0cc
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json
@@ -0,0 +1,150 @@
+{
+ "state": {},
+ "methods": {
+ "onChangeInput": {
+ "type": "JSFunction",
+ "value": "function onChangeInput(eventArgs,args0,args1,args2) {\n console.log('onChangeInput', eventArgs);\n}"
+ },
+ "onChangeNumber": {
+ "type": "JSFunction",
+ "value": "function onChangeNumber(eventArgs, args0, args1, args2) {\n console.log('onChangeNumber', eventArgs)\n}"
+ }
+ },
+ "componentName": "Page",
+ "css": "",
+ "props": {},
+ "lifeCycles": {},
+ "children": [
+ {
+ "componentName": "div",
+ "props": {},
+ "id": "85375559",
+ "children": [
+ {
+ "componentName": "TinyGrid",
+ "props": {
+ "editConfig": {
+ "trigger": "click",
+ "mode": "cell",
+ "showStatus": true
+ },
+ "columns": [
+ {
+ "type": "index",
+ "width": 60
+ },
+ {
+ "type": "selection",
+ "width": 60
+ },
+ {
+ "field": "employees",
+ "title": "员工数",
+ "slots": {
+ "default": {
+ "type": "JSSlot",
+ "value": [
+ {
+ "componentName": "div",
+ "id": "44523622",
+ "children": [
+ {
+ "componentName": "TinyNumeric",
+ "props": {
+ "allow-empty": true,
+ "placeholder": "请输入",
+ "controlsPosition": "right",
+ "step": 1,
+ "modelValue": {
+ "type": "JSExpression",
+ "value": "row.employees",
+ "model": true
+ },
+ "onChange": {
+ "type": "JSExpression",
+ "value": "this.onChangeNumber",
+ "params": ["row", "column", "rowIndex"]
+ }
+ },
+ "id": "62166343"
+ }
+ ]
+ }
+ ],
+ "params": ["row", "column", "rowIndex"]
+ }
+ }
+ },
+ {
+ "field": "created_date",
+ "title": "创建日期"
+ },
+ {
+ "field": "city",
+ "title": "城市",
+ "slots": {
+ "default": {
+ "type": "JSSlot",
+ "value": [
+ {
+ "componentName": "div",
+ "id": "66326314",
+ "children": [
+ {
+ "componentName": "TinyInput",
+ "props": {
+ "placeholder": "请输入",
+ "modelValue": {
+ "type": "JSExpression",
+ "value": "row.city",
+ "model": true
+ },
+ "onChange": {
+ "type": "JSExpression",
+ "value": "this.onChangeInput",
+ "params": ["row", "column", "rowIndex"]
+ }
+ },
+ "id": "22396a2a"
+ }
+ ]
+ }
+ ],
+ "params": ["row", "column", "rowIndex"]
+ }
+ }
+ }
+ ],
+ "data": [
+ {
+ "id": "1",
+ "name": "GFD科技有限公司",
+ "city": "福州",
+ "employees": 800,
+ "created_date": "2014-04-30 00:56:00",
+ "boole": false
+ },
+ {
+ "id": "2",
+ "name": "WWW科技有限公司",
+ "city": "深圳",
+ "employees": 300,
+ "created_date": "2016-07-08 12:36:22",
+ "boole": true
+ }
+ ]
+ },
+ "id": "63623253"
+ }
+ ]
+ }
+ ],
+ "dataSource": {
+ "list": []
+ },
+ "utils": [],
+ "bridge": [],
+ "inputs": [],
+ "outputs": [],
+ "fileName": "slotModelValueTest"
+}
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js b/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js
new file mode 100644
index 0000000000..c1e48b6f01
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js
@@ -0,0 +1,12 @@
+import { expect, test } from 'vitest'
+import { genSFCWithDefaultPlugin } from '@/generator/vue/sfc'
+import schema from './page.schema.json'
+import componentsMap from './components-map.json'
+import { formatCode } from '@/utils/formatCode'
+
+test('should generate onUpdate:modelValue event', async () => {
+ const res = genSFCWithDefaultPlugin(schema, componentsMap)
+ const formattedCode = formatCode(res, 'vue')
+
+ await expect(formattedCode).toMatchFileSnapshot('./expected/slotModelValueTest.vue')
+})
diff --git a/packages/vue-generator/vite.config.mjs b/packages/vue-generator/vite.config.mjs
index 60005cb536..3c12566794 100644
--- a/packages/vue-generator/vite.config.mjs
+++ b/packages/vue-generator/vite.config.mjs
@@ -17,7 +17,7 @@ import { viteStaticCopy } from 'vite-plugin-static-copy'
// https://vitejs.dev/config/
export default defineConfig({
test: {
- exclude: ['**/result/**'],
+ exclude: ['**/result/**', 'node_modules'],
watchExclude: ['**/result/**']
},
resolve: {
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 6c6476fa57..c311abad71 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-webcomponent-core",
- "version": "1.0.4",
+ "version": "1.0.7",
"publishConfig": {
"access": "public"
},
diff --git a/scripts/buildMaterials.mjs b/scripts/buildMaterials.mjs
index 01e768b195..dd6e4e9f72 100644
--- a/scripts/buildMaterials.mjs
+++ b/scripts/buildMaterials.mjs
@@ -12,7 +12,10 @@ const materialsDir = 'materials'
const bundlePath = path.join(process.cwd(), '/packages/design-core/public/mock/bundle.json')
// mockServer应用数据
const appInfoPath = path.join(process.cwd(), '/mockServer/src/services/appinfo.json')
+const appSchemaPath = path.join(process.cwd(), 'mockServer/src/mock/get/app-center/v1/apps/schema/918.json')
+
const appInfo = fsExtra.readJSONSync(appInfoPath)
+const appSchema = fsExtra.readJSONSync(appSchemaPath)
const connection = new MysqlConnection()
@@ -22,6 +25,7 @@ const connection = new MysqlConnection()
const write = (bundle) => {
fsExtra.outputJSONSync(bundlePath, bundle, { spaces: 2 })
fsExtra.outputJSONSync(appInfoPath, appInfo, { spaces: 2 })
+ fsExtra.outputJSONSync(appSchemaPath, appSchema, { spaces: 2 })
}
/**
@@ -36,13 +40,13 @@ const validateComponent = (file, component) => {
const requiredList = requiredFields.filter((field) => !fields.includes(field))
if (requiredList.length) {
- logger.error(`组件文件 ${file} 缺少必要字段：${requiredList.join('、')}。`)
+ logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`)
return false
}
if (!component.npm) {
- logger.warn(`组件文件 ${file} 缺少 npm 字段，出码时将不能通过import语句导入组件。`)
+ logger.warn(`missing the \`npm\` field, and it cannot be imported when coding at ${file}.`)
return false
}
@@ -62,7 +66,7 @@ const validateBlock = (file, block) => {
const requiredList = requiredFields.filter((field) => !fields.includes(field))
if (requiredList.length) {
- logger.error(`区块文件 ${file} 缺少必要字段：${requiredList.join('、')}。`)
+ logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`)
return false
}
@@ -80,7 +84,7 @@ const generateComponents = () => {
try {
fg([`${materialsDir}/**/*.json`]).then((files) => {
if (!files.length) {
- logger.warn('物料文件夹为空，请先执行`pnpm splitMaterials`命令拆分物料资产包')
+ logger.warn('please execute `pnpm splitMaterials` first to split the materials.')
}
const bundle = {
@@ -95,6 +99,7 @@ const generateComponents = () => {
}
const { components = [], snippets = [], blocks = [] } = bundle.data.materials
const componentsMap = []
+ const packagesMap = []
const appInfoBlocksLabels = appInfo.blockHistories.map((item) => item.label)
files.forEach((file) => {
@@ -103,7 +108,7 @@ const generateComponents = () => {
if (!material) {
const fileFullPath = path.join(process.cwd(), file)
- logger.error(`文件格式有误 (${fileFullPath})`)
+ logger.error(`incorrect file format at ${fileFullPath}.`)
return
}
@@ -151,13 +156,31 @@ const generateComponents = () => {
appInfo.materialHistory.components = componentsMap
- write(bundle)
+ const { package: packageName = '', version = '', exportName = '' } = npm || {}
+
+ const mapItem = {
+ componentName: component,
+ package: packageName,
+ version,
+ exportName
+ }
+
+ if (typeof npm.destructuring === 'boolean') {
+ mapItem.destructuring = npm.destructuring
+ }
+
+ if (npm.package) {
+ packagesMap.push(mapItem)
+ }
})
+
+ appSchema.data.componentsMap = packagesMap
+ write(bundle)
})
- logger.success('物料资产包构建成功')
+ logger.success('materials built.')
} catch (error) {
- logger.error(`物料资产包构建失败：${error}`)
+ logger.error(`failed to build materials: ${error}.`)
}
}
@@ -166,13 +189,13 @@ const watcher = chokidar.watch(`${materialsDir}/**/*.json`, { ignoreInitial: tru
watcher.on('all', (event, file) => {
const eventMap = {
- add: '新增',
- change: '更新',
- unlink: '删除'
+ add: 'added',
+ change: 'changed',
+ unlink: 'deleted'
}
const fileFullPath = path.join(process.cwd(), file)
- logger.info(`${eventMap[event]}组件文件 (${fileFullPath})`)
+ logger.info(`${fileFullPath} ${eventMap[event]}, rebuilding materials...`)
// 监听物料文件变化，更新物料资产包
generateComponents()
diff --git a/scripts/connection.mjs b/scripts/connection.mjs
index 016f856895..a06c5623ee 100644
--- a/scripts/connection.mjs
+++ b/scripts/connection.mjs
@@ -38,10 +38,10 @@ class MysqlConnection {
return new Promise((resolve, reject) => {
this.connection.connect((error) => {
if (error) {
- logger.warn('未能连接到数据库，请查看数据库配置是否正确')
+ logger.warn('unable to connect to the database, please check the database configuration is correct.')
reject()
} else {
- logger.success('数据库连接成功')
+ logger.success('database connected.')
this.connected = true
resolve()
}
@@ -100,11 +100,11 @@ class MysqlConnection {
* @returns boolean 校验组件字段是否失败，false-有字段出错
*/
isValid(component, file) {
- const longtextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata']
+ const longTextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata']
return Object.entries(component).every(([key, value]) => {
- if (longtextFields.includes(key) && value !== null && typeof value !== 'object') {
- logger.error(`"${key}" 的值不是有效的JSON (${file})`)
+ if (longTextFields.includes(key) && value !== null && typeof value !== 'object') {
+ logger.error(`the value of "${key}" is not valid JSON at ${file}.`)
return false
}
@@ -193,10 +193,10 @@ class MysqlConnection {
this.query(sqlContent, component.component)
.then(() => {
- logger.success(`组件 ${component.component} 数据更新成功`)
+ logger.success(`${component.component} updated.`)
})
.catch((error) => {
- logger.error(`组件 ${component.component} 数据更新失败 ${error}`)
+ logger.error(`failed to update ${component.component}: ${error}.`)
})
}
@@ -322,11 +322,11 @@ class MysqlConnection {
.then((result) => {
const id = result.insertId
- logger.success(`组件 ${component.component} 数据新增成功`)
+ logger.success(`${component.component} added.`)
this.relationMaterialHistory(id)
})
.catch((error) => {
- logger.success(`组件 ${component.component} 数据新增失败：${error}`)
+ logger.error(`add ${component.component} failed：${error}.`)
})
}
@@ -344,7 +344,7 @@ class MysqlConnection {
}
})
.catch((error) => {
- logger.success(`查询组件 ${component.component} 失败：${error}`)
+ logger.error(`query ${component.component} failed：${error}.`)
})
}
@@ -395,11 +395,11 @@ class MysqlConnection {
return new Promise((resolve, reject) => {
this.query(sqlContent)
.then((result) => {
- logger.success(`表 ${componentsTableName} 创建成功`)
+ logger.success(`table ${componentsTableName} created.`)
resolve(result)
})
.catch((error) => {
- logger.success(`表 ${componentsTableName} 创建失败：${error}`)
+ logger.error(`create table ${componentsTableName} failed：${error}.`)
reject(error)
})
})
diff --git a/scripts/splitMaterials.mjs b/scripts/splitMaterials.mjs
index e81143c0b1..867fb73d73 100644
--- a/scripts/splitMaterials.mjs
+++ b/scripts/splitMaterials.mjs
@@ -51,9 +51,9 @@ const splitMaterials = () => {
fs.outputJsonSync(blockPath, block, { spaces: 2 })
})
- logger.success('拆分物料资产包完成')
+ logger.success('materials splitted.')
} catch (error) {
- logger.error(`拆分物料资产包失败： ${error}`)
+ logger.error(`failed to split materials: ${error}.`)
}
}