cloud-web-corejs 1.0.18 → 1.0.20

package/src/views/user/language_setting/edit.vue

@@ -1,166 +1,167 @@
-<template>
-  <div class="detail-wrap">
-    <el-form ref="editForm" :model="languageSetting">
-      <div class="d-header clearfix">
-        <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? '查看' : '新增' }}语种
-        </div>
-        <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">重置
-          </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">保存</el-button>
-        </div>
-      </div>
-      <baseTabs>
-        <baseTabPane label="基本信息">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  语言名称
-                </th>
-                <td>
-                  <el-form-item prop="languageName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="languageSetting.languageName" clearable/>
-                  </el-form-item>
-                </td>
-                <th>
-                  <em class="f-red">*</em>
-                  对应翻译字段
-                </th>
-                <td>
-                  <el-form-item prop="translationField" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="languageSetting.translationField" clearable/>
-                  </el-form-item>
-                </td>
-                <th>
-                  <em class="f-red">*</em>
-                  语言编码
-                </th>
-                <td>
-                  <el-form-item prop="languageCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="languageSetting.languageCode" clearable/>
-                  </el-form-item>
-                </td>
-                <th>
-                  是否启用
-                </th>
-                <td>
-                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-radio-group v-model="languageSetting.enabled">
-                      <el-radio :label="true">启用</el-radio>
-                      <el-radio :label="false">禁用</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>备注</th>
-                <td colspan="5">
-                  <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small" v-model="languageSetting.remark"
-                            clearable></el-input>
-                </td>
-              </tr>
-              <tr>
-                <th>创建人</th>
-                <td>{{ languageSetting.createBy }}</td>
-                <th>创建时间</th>
-                <td>{{ languageSetting.createDate }}</td>
-                <th>更新人</th>
-                <td>{{ languageSetting.modifyBy }}</td>
-                <th>更新时间</th>
-                <td>{{ languageSetting.modifyDate }}</td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-      </baseTabs>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'languageSettingEdit',
-  props: {
-    _dataId: [String, Number]
-  },
-  components: {},
-  data() {
-    return {
-      isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
-      languageSetting: {
-        enabled: true
-      }
-    };
-  },
-  created() {
-    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
-  },
-  mounted() {
-    this.getData();
-  },
-  methods: {
-    getData() {
-      if (this.dataId && !isNaN(this.dataId)) {
-        this.isEdit = true;
-        this.$http({
-          url: USER_PREFIX + `/language_setting/get`,
-          method: `post`,
-          data: {
-            id: this.dataId
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.languageSetting = res.objx || {};
-          }
-        });
-      } else {
-        this.languageSetting = {
-          enabled: true
-        };
-      }
-    },
-    saveData() {
-      this.$refs.editForm.validate(valid => {
-        if (valid) {
-          this.$baseConfirm('您确定要保存吗？').then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/language_setting/update` : `/language_setting/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.languageSetting,
-              isLoading: true,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    if (this.isEdit) {
-                      this.$baseReload();
-                    } else {
-                      this.$baseReload({
-                        updateParam: {
-                          _dataId: res.objx
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="languageSetting">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info"/>
+          {{ dataId ? $t1('查看') : $t1('新增') }} 语种
+        </div>
+        <div class="fr">
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
+        </div>
+      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  语言名称
+                </th>
+                <td>
+                  <el-form-item prop="languageName" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="languageSetting.languageName" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  对应翻译字段
+                </th>
+                <td>
+                  <el-form-item prop="translationField" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="languageSetting.translationField" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  语言编码
+                </th>
+                <td>
+                  <el-form-item prop="languageCode" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="languageSetting.languageCode" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  是否启用
+                </th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="languageSetting.enabled">
+                      <el-radio :label="true">启用</el-radio>
+                      <el-radio :label="false">禁用</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('备注') }}</th>
+                <td colspan="5">
+                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                            v-model="languageSetting.remark"
+                            clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ languageSetting.createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ languageSetting.createDate }}</td>
+                <th>{{ $t1('更新人') }}</th>
+                <td>{{ languageSetting.modifyBy }}</td>
+                <th>{{ $t1('更新时间') }}</th>
+                <td>{{ languageSetting.modifyDate }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'languageSettingEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      languageSetting: {
+        enabled: true
+      }
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$http({
+          url: USER_PREFIX + `/language_setting/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.languageSetting = res.objx || {};
+          }
+        });
+      } else {
+        this.languageSetting = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.validate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + (this.isEdit ? `/language_setting/update` : `/language_setting/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.languageSetting,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>

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

@@ -1,11 +1,11 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="常规" name="first">
+      <el-tab-pane :label="$t1('常规')" name="first">
         <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
                   @reload="$reloadHandle"></editView>
       </el-tab-pane>
-      <el-tab-pane label="列表" name="second">
+      <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
           <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                     @custom="$vxeTableUtil.customHandle">
@@ -21,7 +21,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>重置
+                              plain>{{$t1('重置')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                   </vxe-button>
@@ -127,7 +127,7 @@ export default {
           },
           {
             field: 'enabled',
-            title: '是否启用',
+            title: this.$t1('是否启用'),
             width: 150,
             slots: {
               default: ({row}) => {
@@ -148,13 +148,13 @@ export default {
             }
           },
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'remark',
             width: 150,
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -173,7 +173,7 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content="查看" 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/ledger_library/list.vue

@@ -16,8 +16,8 @@ export default {
   data() {
     return {
       fileLibraryOption: {
-        isCategoryEdit:true,
-        mouseCheck:true,
+        isCategoryEdit: true,
+        mouseCheck: true,
         storeAreaCode: "company_profile2",
         current_prefix: USER_PREFIX
       }

package/src/views/user/ledger_library/private_list.vue

@@ -16,9 +16,9 @@ export default {
   data() {
     return {
       fileLibraryOption: {
-        private:true,
-        isCategoryEdit:true,
-        mouseCheck:true,
+        private: true,
+        isCategoryEdit: true,
+        mouseCheck: true,
         storeAreaCode: "private_profile",
         current_prefix: USER_PREFIX
       }

package/src/views/user/login/auth-redirect.vue

@@ -8,7 +8,7 @@ export default {
       window.close()
     }
   },
-  render: function(h) {
+  render: function (h) {
     return h() // avoid warning message
   }
 }

package/src/views/user/login/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-container" :class="backgroundClass" ref="login-container">
+  <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
     <div class="login-main" style="height: auto;">
       <el-tabs v-model="activeName">
         <el-tab-pane label="账号登录" name="first">

package/src/views/user/login/indexMixin.js

@@ -53,7 +53,8 @@ export default {
         smsCode: null
       },
       activeName: "first",
-      searchParam: {}
+      searchParam: {},
+      showContent: true
     };
   },
   watch: {
@@ -97,6 +98,7 @@ export default {
         //小熊单点登录
         this.bearSsoLogin();
       } else if (searchParam.gatewayToken) {
+        this.showContent = false
         this.handleGatewayTokenLogin();
       } else {
         //正常登陆
@@ -367,6 +369,7 @@ export default {
         if (prefix && prefix !== window.WEB_PREFIX) {
           location.href = prefix + '/index.html' + path
         } else if (!!ssotoken) {
+          prefix = prefix || window.WEB_PREFIX;
           location.href = prefix + '/index.html' + path
         } else {
           this.$router.push({

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

@@ -1,7 +1,7 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="列表" name="second">
+      <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
           <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                     @custom="$vxeTableUtil.customHandle">
@@ -16,7 +16,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>重置
+                              plain>{{$t1('重置')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                   </vxe-button>
@@ -79,26 +79,26 @@
             <template #operate="obj">
               <div class="cell-operate">
                 <template v-if="$refs['table-m1'].isActiveByRow(obj.row)">
-                  <a @click="saveRowEvent(obj)" class="a-link" data-tit="保存">
-                    <el-tooltip :enterable="false" effect="dark" content="保存" placement="top"
+                  <a @click="saveRowEvent(obj)" class="a-link">
+                    <el-tooltip :enterable="false" effect="dark" :content="$t1('保存')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-circle-check"></i></el-tooltip>
                   </a>
-                  <a @click="cancleRowEvent(obj)" class="a-link" data-tit="取消行编辑" v-if="hasSaveRow(obj.row)">
-                    <el-tooltip :enterable="false" effect="dark" content="取消行编辑" placement="top"
+                  <a @click="cancleRowEvent(obj)" class="a-link" v-if="hasSaveRow(obj.row)">
+                    <el-tooltip :enterable="false" effect="dark" :content="$t1('取消行编辑')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-circle-close"></i></el-tooltip>
                   </a>
-                  <a @click="removeRowEvent(obj)" class="a-link" data-tit="删除" v-if="!hasSaveRow(obj.row)">
-                    <el-tooltip :enterable="false" effect="dark" content="删除" placement="top"
+                  <a @click="removeRowEvent(obj)" class="a-link" v-if="!hasSaveRow(obj.row)">
+                    <el-tooltip :enterable="false" effect="dark" :content="$t1('删除')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-delete"></i></el-tooltip>
                   </a>
                 </template>
                 <template v-else>
                   <a class="a-link" data-tit="新增" @click="addMenu(0, obj)" v-if="obj.row && obj.row.type != 2">
-                    <el-tooltip :enterable="false" effect="dark" content="新增" placement="top"
+                    <el-tooltip :enterable="false" effect="dark" :content="$t1('新增')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-circle-plus-outline"></i></el-tooltip>
                   </a>
                   <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑" v-if="obj.row && !obj.row.is_top">
-                    <el-tooltip :enterable="false" effect="dark" content="行编辑" placement="top"
+                    <el-tooltip :enterable="false" effect="dark" :content="$t1('行编辑')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-edit-outline"></i></el-tooltip>
                   </a>
                 </template>
@@ -411,7 +411,7 @@ export default {
           },
           {
             field: 'enabled',
-            title: '是否启用',
+            title: this.$t1('是否启用'),
             width: 150,
             editRender: {
               name: '$select',
@@ -422,11 +422,11 @@ export default {
               },
               options: [
                 {
-                  label: '启用',
+                  label: this.$t1('启用'),
                   value: true
                 },
                 {
-                  label: '禁用',
+                  label: this.$t1('禁用'),
                   value: false
                 }
               ]
@@ -434,15 +434,15 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">启用</div>];
+                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
                 } else {
-                  return [<div class="txt-status s-3">禁用</div>];
+                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
                 }
               }
             }
           },
           // { field: 'treePathName', title: '上级菜单', width: 200 },
-          {field: 'orders', title: '序号', width: 100, editRender: {name: 'input'}},
+          {field: 'orders', title: this.$t1('序号'), width: 100, editRender: {name: 'input'}},
           {
             field: 'type',
             title: '类型',
@@ -506,9 +506,9 @@ export default {
             width: 100,
             editRender: {name: 'input'}
           },
-          {title: '创建时间', field: 'createDate', width: 150},
-          // { title: '更新人', field: 'modifyBy', width: 100 },
-          { title: '更新时间', field: 'modifyDate', width: 150 },
+          {title: this.$t1('创建时间'), field: 'createDate', width: 150},
+          // { title: this.$t1('更新人'), field: 'modifyBy', width: 100 },
+          {title: this.$t1('更新时间'), field: 'modifyDate', width: 150},
           {
             width: 100,
             title: '',