cloud-web-corejs 1.0.21 → 1.0.23

package/src/views/user/fieldTranslation/list.vue

@@ -50,7 +50,7 @@
                   </template>
                   <template #buttonRight>
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{$t1('重置')}}
+                                plain>{{ $t1('重置') }}
                     </vxe-button>
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                     </vxe-button>
@@ -239,9 +239,14 @@ export default {
         tableName: 'user_fieldTranslation_list-m1',
         path: USER_PREFIX + '/fieldTranslation/listPage',
         param: () => {
+          let tagCodes = null;
+          if (this.checkTags.length) {
+            tagCodes = this.checkTags.map(item => item.tagCode);
+          }
           return {
             ...this.formData,
-            dataTypeCode: this.currentDataType.dataTypeCode
+            dataTypeCode: this.currentDataType.dataTypeCode,
+            tagCodes
           };
         },
         config: {
@@ -304,7 +309,7 @@ export default {
                         this.openFieldTranslationEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                   popper-class="tooltip-skin">
                         <i class="el-icon-edit"/>
                       </el-tooltip>

package/src/views/user/user/form_edit.vue

@@ -4,13 +4,11 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看') : $t1('新增') }} 用户
+          {{ dataId ? $t1('查看') : $t1('新增') }} {{ $t1('用户') }}
         </div>
         <div class="fr">
-          <!--          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>-->
-          <base-input-export :option="exportOption" :parent-target="_self" v-if="dataId"/>
           <el-button type="primary" plain class="button-sty" icon="el-icon-unlock" @click="unlock" v-if="user.locked"
-                     v-hasPermi="'user:unlock'">解锁
+                     v-hasPermi="'user:unlock'">{{ $t1('解锁') }}
           </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
@@ -27,7 +25,7 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  登录名
+                  {{ $t1('登录名') }}
                 </th>
                 <td colspan="3">
                   <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
@@ -42,13 +40,13 @@
                   </el-form-item>
                 </td>
                 <td colspan="4">
-                  <span class="tips">注：登录名必须以“dev_”开头</span>
+                  <span class="tips">{{ $t1('注：登录名必须以“dev_”开头') }}</span>
                 </td>
               </tr>
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  姓名
+                  {{ $t1('姓名') }}
                 </th>
                 <td colspan="3">
                   <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -61,7 +59,7 @@
 
                 <th>
                   <em class="f-red" v-if="!dataId">*</em>
-                  密码
+                  {{ $t1('密码') }}
                 </th>
                 <td>
                   <el-form-item prop="password" :rules="passRules">
@@ -71,7 +69,7 @@
                 </td>
                 <th>
                   <em class="f-red" v-if="!dataId">*</em>
-                  确认密码
+                  {{ $t1('确认密码') }}
                 </th>
                 <td>
                   <el-form-item prop="rePassword" :rules="pass2Rules">
@@ -90,9 +88,9 @@
                 </td>
               </tr>
               <tr>
-                <th>设置</th>
+                <th>{{ $t1('设置') }}</th>
                 <td>
-                  <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
+                  <el-checkbox :label="$t1('是否启用')" v-model="user.enabled"></el-checkbox>
                 </td>
               </tr>
               <tr>
@@ -116,8 +114,6 @@
 
 <script>
 import xeUtils from "xe-utils";
-/*import tempStorageButton from "@base/components/tempStorage/index.vue";*/
-
 
 export default {
   name: 'UserEdit',
@@ -127,7 +123,7 @@ export default {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
       if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error('密码不能为空'));
+        callback(new Error(this.$t1('密码不能为空')));
       } else {
         callback();
       }
@@ -139,9 +135,9 @@ export default {
       const password = this.user.password != undefined ? this.user.password : '';
 
       if (isPassRequired && rePassword == '') {
-        callback(new Error('确认密码不能为空'));
+        callback(new Error(this.$t1('确认密码不能为空')));
       } else if (rePassword != password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error(this.$t1('两次输入密码不一致!')));
       } else {
         callback();
       }
@@ -179,7 +175,7 @@ export default {
       showCustomerDialog: false,
       exportOption: {
         prefix: USER_PREFIX,
-        title: '用户',
+        title: this.$t1('用户'),
         codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT"],
         param: () => {
           return [{id: this.dataId}];
@@ -263,7 +259,7 @@ export default {
             let loginAccount = this.user.loginAccount;
             if (!loginAccount.startsWith('dev_')) {
               this.$message({
-                message: '登录名必须以“dev_”开头',
+                message: this.$t1('登录名必须以“dev_”开头'),
                 type: 'error',
                 duration: 2000,
               });
@@ -463,7 +459,7 @@ export default {
       }
     },
     unlock() {
-      this.$baseConfirm('您确定要解锁吗？').then(() => {
+      this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
         this.$http({
           url: url,