mooho-base-admin-plus 0.4.3 → 0.4.4

package/package.json

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

package/src/libs/request/index.js

@@ -50,8 +50,8 @@ const tParam = str => {
 
   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]));
+      result = result.replace('[' + i + ']', array[i + 1]);
+      result = result.replace('{' + i + '}', window.$t('Model_' + array[i + 1]));
     }
   }
 

package/src/mixins/page.js

@@ -533,7 +533,7 @@ export default {
     // 确认框
     confirm(title, onConfirm) {
       let swal = this.$swal.fire({
-        title: this.$t(title),
+        title: this.tParam(title),
         icon: 'question',
         confirmButtonText: this.$t('Front_Btn_OK'),
         cancelButtonText: this.$t('Front_Btn_Cancel'),
@@ -553,7 +553,7 @@ export default {
     // 带输入的确认框
     confirmInput(title, inputLabel, onConfirm, preConfirm) {
       let swal = this.$swal.fire({
-        title: this.$t(title),
+        title: this.tParam(title),
         input: 'text',
         confirmButtonText: this.$t('Front_Btn_OK'),
         cancelButtonText: this.$t('Front_Btn_Cancel'),
@@ -576,7 +576,7 @@ export default {
     // 成功提示
     success(message, onConfirm) {
       var swal = this.$swal.fire({
-        title: this.$t(message),
+        title: this.tParam(message),
         icon: 'success',
         confirmButtonText: this.$t('Front_Btn_OK')
       });
@@ -592,7 +592,7 @@ export default {
     // 警告提示
     warning(message, onConfirm) {
       var swal = this.$swal.fire({
-        title: this.$t(message),
+        title: this.tParam(message),
         icon: 'warning',
         confirmButtonText: this.$t('Front_Btn_OK')
       });
@@ -608,7 +608,7 @@ export default {
     // 失败提示
     error(message, onConfirm) {
       var swal = this.$swal.fire({
-        title: this.$t(message),
+        title: this.tParam(message),
         icon: 'error',
         confirmButtonText: this.$t('Front_Btn_OK')
       });
@@ -703,12 +703,13 @@ export default {
     },
     // 解析多语言带参数
     tParam(str) {
+      console.log('str', str);
       let array = str.split('|');
       let result = this.$t(array[0]);
 
       if (array.length > 1) {
         for (let i = 0; i < array.length - 1; i++) {
-          result = result.replace('{' + i + '}', array[i + 1]);
+          result = result.replace('[' + i + ']', array[i + 1]);
         }
       }
 

package/src/styles/css/default.css

@@ -310,6 +310,7 @@
 .ivu-btn > .ivu-icon {
   width: 16px;
   line-height: normal;
+  /* margin: auto 2px; */
 }
 
 .ivu-btn > .ivu-icon + span,