mooho-base-admin-plus 0.4.5 → 0.4.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/libs/request/index.js

@@ -46,13 +46,13 @@ const service = axios.create({
 // 解析多语言带参数
 const tParam = str => {
   let array = str.split('|');
-  let result = window.$t(array[0]);
+  let key = array[0];
+  array.shift();
 
-  if (array.length > 1) {
-    for (let i = 0; i < array.length - 1; i++) {
-      result = result.replace('[' + i + ']', array[i + 1]);
-      result = result.replace('{' + i + '}', window.$t('Model_' + array[i + 1]));
-    }
+  let result = window.$t(key, array);
+
+  for (let i = 0; i < array.length; i++) {
+    result = result.replace('[' + i + ']', array[i]);
   }
 
   return result;

package/src/mixins/page.js

@@ -703,17 +703,11 @@ export default {
     },
     // 解析多语言带参数
     tParam(str) {
-      console.log('str', str);
       let array = str.split('|');
-      let result = this.$t(array[0]);
+      let key = array[0];
+      array.shift();
 
-      if (array.length > 1) {
-        for (let i = 0; i < array.length - 1; i++) {
-          result = result.replace('[' + i + ']', array[i + 1]);
-        }
-      }
-
-      return result;
+      return this.$t(key, array);
     }
   }
 };