fix：修复国际化参数配置 (opentiny#106)

MomoPoppy · Dec 7, 2023 · 0478258 · 0478258
1 parent 0cc2993
commit 0478258
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/canvas/src/components/render/render.js b/packages/canvas/src/components/render/render.js
@@ -160,7 +160,7 @@ const parseI18n = (i18n, scope, ctx) => {
   return parseExpression(
     {
       type: 'JSExpression',
-      value: `this.i18n('${i18n.key}')`
+      value: `this.i18n('${i18n.key}', ${JSON.stringify(i18n.params)})`
     },
     scope,
     { i18n: i18nHost.global.t, ...ctx }

diff --git a/packages/common/component/BindI18n.vue b/packages/common/component/BindI18n.vue
@@ -96,7 +96,7 @@ export default {
         const params = []
         const data = props?.data?.params || {}
 
-        curValue.replace(/\$\{(.+?)\}/g, (substr, key) => {
+        curValue.replace(/\{(.+?)\}/g, (substr, key) => {
           key && params.push({ name: key, value: data[key] || '' })
         })
         paramsForm.value = params

diff --git a/packages/vue-generator/src/generator/page.js b/packages/vue-generator/src/generator/page.js
@@ -164,7 +164,12 @@ function handleBinding(props, attrsArr, description, state) {
     }
 
     if (propType === 'i18n') {
-      return attrsArr.push(`:${key}="t('${item.key}')"`)
+      const tArguments = [`'${item.key}'`]
+      const i18nParams = JSON.stringify(item.params)?.replace(/"/g, "'")
+
+      i18nParams && tArguments.push(i18nParams)
+
+      return attrsArr.push(`:${key}="t(${tArguments.join(',')})"`)
     }
 
     return attrsArr