cloud-web-corejs 1.0.18 → 1.0.20

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

@@ -45,11 +45,11 @@
       <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="showDialog=false">
         <i class="el-icon-close el-icon"></i>
-        取 消
+        {{$t1('取 消')}}
       </el-button>
       <el-button type="primary" @click="saveData" class="button-sty" v-if="isDev">
         <i class="el-icon-check el-icon"></i>
-        确 定
+        {{$t1('确 定')}}
       </el-button>
     </span>
     </el-dialog>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import projectTagDialog from "../../../views/user/project_tag/dialog.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
 
@@ -170,7 +170,7 @@ export default {
     saveData() {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
-          this.$baseConfirm('您确定要保存吗？').then(() => {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/fieldTranslation/update` : `/fieldTranslation/save`);
             this.$http({
               url: url,
@@ -219,9 +219,9 @@ export default {
       })
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

package/src/views/user/fieldTranslation/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="tree-box fl">
           <div class="tit"><b>数据类型</b></div>
           <el-tree
@@ -50,7 +50,7 @@
                   </template>
                   <template #buttonRight>
                     <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>
@@ -104,7 +104,7 @@
 <script>
 import fieldTranslationEditDialog from "../../../views/user/fieldTranslation/editDialog.vue";
 import {treeScollx} from '@base/utils/global.js';
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import tableForm from "@base/components/table/tableForm.vue";
 import projectTagDialog from "../../../views/user/project_tag/dialog.vue";
 import projectTagAddButton from "@base/components/projectTag/addButton.vue";
@@ -115,7 +115,8 @@ export default {
   name: 'fieldTranslation:list',
   components: {
     projectTagView,
-    projectTagDialog, tableForm, fieldTranslationEditDialog, projectTagAddButton, projectTagDeleteButton},
+    projectTagDialog, tableForm, fieldTranslationEditDialog, projectTagAddButton, projectTagDeleteButton
+  },
   data() {
     return {
       activeName: 'second',
@@ -284,7 +285,7 @@ export default {
           },
           {
             field: 'modifyDate',
-            title: '更新时间',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {
@@ -303,7 +304,7 @@ export default {
                         this.openFieldTranslationEditDialog(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>
@@ -453,9 +454,9 @@ export default {
       return this.checkTags.map(item => item.tagName).join(",");
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

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

@@ -3,98 +3,100 @@
     <el-form ref="editForm" :model="fieldValuesInvisible">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info" />
-          {{ dataId ? '查看' : '新增' }}字段值隐藏定义
+          <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">重置</el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">保存</el-button>
+          <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>
       <div class="d-cont">
         <div class="d-item">
-          <div class="title first"><b>基本信息</b></div>
+          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
           <table class="table-detail">
             <tbody>
-              <tr>
-                <th>隐藏定义编码</th>
-                <td>{{ fieldValuesInvisible.fvvCode }}</td>
-                <th>
-                  <em class="f-red">*</em>
-                  是否启用
-                </th>
-                <td>
-                  <el-radio-group v-model="fieldValuesInvisible.enabled">
-                    <el-radio :label="true">启用</el-radio>
-                    <el-radio :label="false">禁用</el-radio>
-                  </el-radio-group>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  服务名
-                </th>
-                <td>
-                  <el-form-item prop="applicationName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.applicationName" clearable />
-                  </el-form-item>
-                </td>
-                <th>
-                  <em class="f-red">*</em>
-                  组织编码
-                </th>
-                <td>
-                  <el-form-item prop="fvvCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.fvvCompanyCode" clearable />
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  定义Url地址
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.url" clearable />
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  隐藏的字段名
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="fieldNames" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.fieldNames" clearable />
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">注：区分大小写，多个用逗号","隔开</span></td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  涉及的角色名
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="roleNames" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.roleNames" clearable />
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">注：多个用逗号","隔开</span></td>
-              </tr>
-              <tr>
-                <th>创建人</th>
-                <td>{{ fieldValuesInvisible.createBy }}</td>
-                <th>创建时间</th>
-                <td>{{ fieldValuesInvisible.createDate }}</td>
-                <th>更新人</th>
-                <td>{{ fieldValuesInvisible.modifyBy }}</td>
-                <th>更新时间</th>
-                <td>{{ fieldValuesInvisible.modifyDate }}</td>
-              </tr>
+            <tr>
+              <th>隐藏定义编码</th>
+              <td>{{ fieldValuesInvisible.fvvCode }}</td>
+              <th>
+                <em class="f-red">*</em>
+                是否启用
+              </th>
+              <td>
+                <el-radio-group v-model="fieldValuesInvisible.enabled">
+                  <el-radio :label="true">启用</el-radio>
+                  <el-radio :label="false">禁用</el-radio>
+                </el-radio-group>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                服务名
+              </th>
+              <td>
+                <el-form-item prop="applicationName" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.applicationName" clearable/>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                组织编码
+              </th>
+              <td>
+                <el-form-item prop="fvvCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.fvvCompanyCode" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                定义Url地址
+              </th>
+              <td colspan="5">
+                <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.url" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                隐藏的字段名
+              </th>
+              <td colspan="5">
+                <el-form-item prop="fieldNames" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.fieldNames" clearable/>
+                </el-form-item>
+              </td>
+              <td colspan="2"><span class="tips_1">注：区分大小写，多个用逗号","隔开</span></td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                涉及的角色名
+              </th>
+              <td colspan="5">
+                <el-form-item prop="roleNames" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="fieldValuesInvisible.roleNames" clearable/>
+                </el-form-item>
+              </td>
+              <td colspan="2"><span class="tips_1">注：多个用逗号","隔开</span></td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ fieldValuesInvisible.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ fieldValuesInvisible.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ fieldValuesInvisible.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ fieldValuesInvisible.modifyDate }}</td>
+            </tr>
             </tbody>
           </table>
         </div>
@@ -149,7 +151,7 @@ export default {
     saveData() {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
-          this.$baseConfirm('您确定要保存吗？').then(() => {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/field_values_invisible/update` : `/field_values_invisible/save`);
             this.$http({
               url: url,

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

@@ -1,52 +1,61 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="常规" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self" @reload="$reloadHandle"></editView>
+      <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">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增</vxe-button>
-                  <base-table-export :option="{ title: '字段值隐藏定义导出', targetRef: 'table-m1'}" :parent-target="_self" />
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                  </vxe-button>
+                  <base-table-export :option="{ title: '字段值隐藏定义导出', targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
                 </div>
                 <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary" plain>重置</vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{$t1('重置')}}
+                  </vxe-button>
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{$t1('搜索')}}
+                  </vxe-button>
                 </div>
               </div>
-              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent" @reset="searchEvent">
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
                 <vxe-form-item title="隐藏定义编码:" field="fvvCode">
                   <template v-slot>
-                    <el-input v-model="formData.fvvCode" size="small" clearable />
+                    <el-input v-model="formData.fvvCode" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="组织编码:" field="fvvCompanyCode">
                   <template v-slot>
-                    <el-input v-model="formData.fvvCompanyCode" size="small" clearable />
+                    <el-input v-model="formData.fvvCompanyCode" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="服务名:" field="applicationName">
                   <template v-slot>
-                    <el-input v-model="formData.applicationName" size="small" clearable />
+                    <el-input v-model="formData.applicationName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="定义Url地址:" field="url">
                   <template v-slot>
-                    <el-input v-model="formData.url" size="small" clearable />
+                    <el-input v-model="formData.url" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="隐藏的字段名:" field="fieldNames">
                   <template v-slot>
-                    <el-input v-model="formData.fieldNames" size="small" clearable />
+                    <el-input v-model="formData.fieldNames" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="涉及的角色名:" field="roleNames">
                   <template v-slot>
-                    <el-input v-model="formData.roleNames" size="small" clearable />
+                    <el-input v-model="formData.roleNames" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="是否启用:" field="enabled">
@@ -68,9 +77,10 @@
 
 <script>
 import editView from './edit.vue';
+
 export default {
   name: 'field_values_invisible:list',
-  components: { editView },
+  components: {editView},
   data() {
     return {
       activeName: 'second',
@@ -107,7 +117,7 @@ export default {
           return this.formData;
         },
         columns: [
-          { type: 'checkbox', width: 48, resizable: false, fixed: 'left' },
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
             title: '隐藏定义编码',
             field: 'fvvCode',
@@ -121,14 +131,14 @@ export default {
           },
           {
             field: 'enabled',
-            title: '是否启用',
+            title: this.$t1('是否启用'),
             width: 150,
             slots: {
-              default: ({ row }) => {
+              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>];
                 }
               }
             }
@@ -156,7 +166,7 @@ export default {
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -165,7 +175,7 @@ export default {
             title: '',
             sortable: false,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 return [
                   <div>
                     <a
@@ -175,8 +185,9 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content="查看" placement="top" popper-class="tooltip-skin">
-                        <i class="el-icon-edit" />
+                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
                       </el-tooltip>
                     </a>
                   </div>

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

@@ -4,17 +4,17 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? '查看' : '新增' }}文档工作区
+          {{ dataId ? $t1('查看') : $t1('新增') }} 文档工作区
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">重置
+          <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">保存</el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">
         <div class="d-item">
-          <div class="title first"><b>基本信息</b></div>
+          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
           <table class="table-detail">
             <tbody>
             <tr>
@@ -67,20 +67,20 @@
               </td>
             </tr>
             <tr>
-              <th>备注</th>
+              <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small" v-model="fileStoreArea.note"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="fileStoreArea.note"
                           clearable></el-input>
               </td>
             </tr>
             <tr>
-              <th>创建人</th>
+              <th>{{ $t1('创建人') }}</th>
               <td>{{ fileStoreArea.createBy }}</td>
-              <th>创建时间</th>
+              <th>{{ $t1('创建时间') }}</th>
               <td>{{ fileStoreArea.createDate }}</td>
-              <th>更新人</th>
+              <th>{{ $t1('更新人') }}</th>
               <td>{{ fileStoreArea.modifyBy }}</td>
-              <th>更新时间</th>
+              <th>{{ $t1('更新时间') }}</th>
               <td>{{ fileStoreArea.modifyDate }}</td>
             </tr>
             </tbody>
@@ -133,7 +133,7 @@ export default {
     saveData() {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
-          this.$baseConfirm('您确定要保存吗？').then(() => {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = this.isEdit ? USER_PREFIX + '/file_store_area/update' : USER_PREFIX + '/file_store_area/save';
             this.$http({
               url: url,

package/src/views/user/file_type/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"
@@ -21,12 +21,15 @@
                     新增
                   </vxe-button>
                   <div class="txt-name el-icon-house" style="font-weight: unset;"
-                       v-if="showFileSpaceInfo">文件服务磁盘空间总量：<span class="f-red">{{ fileSpaceInfo.totalSpace }}</span>，已用：<span class="f-red">{{ fileSpaceInfo.usedSpace }}</span>，剩余：<span class="f-red">{{ fileSpaceInfo.freeSpace }}</span>
+                       v-if="showFileSpaceInfo">文件服务磁盘空间总量：<span class="f-red">{{
+                      fileSpaceInfo.totalSpace
+                    }}</span>，已用：<span class="f-red">{{ fileSpaceInfo.usedSpace }}</span>，剩余：<span
+                    class="f-red">{{ fileSpaceInfo.freeSpace }}</span>
                   </div>
                 </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>
@@ -167,12 +170,12 @@ export default {
             }
           },
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'note',
             width: 150
           },
           {
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             field: 'createDate',
             width: 150
           },
@@ -191,7 +194,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>