cloud-web-corejs 1.0.19 → 1.0.20

package/src/layout/components/Sidebar/default.vue

@@ -16,17 +16,17 @@
     <div class="fase-box" ref="fase" @mouseleave="$emit('selfClose')" @mouseenter="$emit('selfEnter')">
       <langTool v-if="userInfo.flag!==8"></langTool>
       <div class="item" @click="openCompanyDialog" v-if="userInfo.flag!==8">
-        <el-tooltip :enterable="false" effect="dark" content="切换组织" :placement="direction">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('切换组织')" :placement="direction">
           <i class="el-icon-set-up"/>
         </el-tooltip>
       </div>
       <div class="item" v-if="userInfo.flag!==8">
-        <el-tooltip :enterable="false" effect="dark" content="流程待办" :placement="direction">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('流程待办')" :placement="direction">
           <i class="iconfont icon-liuchengdaiban" @click="$router.push('/basic/wf/wf_manage/list')"/>
         </el-tooltip>
       </div>
       <div class="item" @click="logout()">
-        <el-tooltip :enterable="false" effect="dark" content="退出" :placement="direction">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('退出')" :placement="direction">
           <i class="el-icon-switch-button"/>
         </el-tooltip>
       </div>
@@ -67,7 +67,8 @@
       ref="seconMenus"
     >
       <el-scrollbar wrap-class="scrollbar-wrapper" id="menuUl">
-        <el-submenu v-for="menuModule in menuModules" :index="''+menuModule.id" :key="'menuModule'+menuModule.id" @click.native="rourteTo(menuModule)">
+        <el-submenu v-for="menuModule in menuModules" :index="''+menuModule.id" :key="'menuModule'+menuModule.id"
+                    @click.native="rourteTo(menuModule)">
           <template slot="title">
             <i :class="getMenuClass(menuModule,1)"></i>
             <span>{{ getMenuName(menuModule) }}</span>
@@ -244,8 +245,8 @@ export default {
       if (!enTitle || locale !== "en") {
         title = zhTitle
       }
-      if (this.$t) {
-        title = this.$t(title)
+      if (this.$t1) {
+        title = this.$t1(title)
       }
 
       return title;
@@ -623,13 +624,12 @@ export default {
     },
     handleRoute() {
       let flag = this.userInfo.flag
-      if (flag !== 8 && flag !== 7) return;
-      let menus = [];
-      if(flag === 7){
-        menus = sidebarConfig.bdadmin7Menus
-      }else if(flag === 8){
-        menus = sidebarConfig.bdadmin8Menus
+      let userFlagMenuMap = sidebarConfig.userFlagMenuMap;
+      let keys = Object.keys(userFlagMenuMap).map(item => Number(item));
+      if (!keys.length || !keys.includes(flag)) {
+        return
       }
+      let menus = userFlagMenuMap[flag] || []
       this.$store.dispatch('permission/setSidebarRoute', menus)
 
     }

package/src/layout/components/TagsView/index.vue

@@ -19,18 +19,18 @@
       </router-link>
     </scroll-pane>
     <div class="tags-operBox">
-      <el-tooltip :enterable="false" class="item" effect="dark" content="左移" placement="bottom">
+      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('左移')" placement="bottom">
         <i class="el-icon-arrow-left" layadmin-event="leftPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollLeft()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" content="右移" placement="bottom" l>
+      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('右移')" placement="bottom" l>
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" content="刷新" placement="bottom">
+      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
         <i class="el-icon-refresh" @click="refreshSelectedTag($route)"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" content="全部关闭" placement="bottom">
+      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('全部关闭')" placement="bottom">
         <i class="el-icon-close" @click="closeAllTags(selectedTag)"/>
       </el-tooltip>
     </div>
@@ -97,8 +97,8 @@ export default {
       if (!enTitle || locale !== "en") {
         title = zhTitle
       }
-      if (this.$t) {
-        title = this.$t(title)
+      if (this.$t1) {
+        title = this.$t1(title)
       }
       return title;
     },

package/src/layout/components/notify_message/unreadDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="消息列表"
+      :title="$t1('消息列表')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="falseValue"

package/src/views/bd/setting/bd_attach_setting/dialog.vue

@@ -45,7 +45,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top">
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top">
         <a class="allDel icon-quanbushanchu" @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
@@ -123,13 +123,13 @@ export default {
           },
           {title: '表单分类', field: 'menuKindName', width: 150},
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'remark',
             width: 250
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -142,7 +142,7 @@ export default {
         searchColumns: [
           {title: "模板文件名称", field: "name", type: "input", common: true},
           {title: "模板文件编码", field: "code", type: "input", common: true},
-          {title: "备注", field: "remark", type: "input", common: true},
+          {title: this.$t1('备注'), field: "remark", type: "input", common: true},
         ],
         config: {
           checkboxConfig: {

package/src/views/bd/setting/bd_attach_setting/edit.vue

@@ -17,7 +17,7 @@
       </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>
@@ -70,9 +70,9 @@
               </td>
             </tr>
             <tr>
-              <th>备注</th>
+              <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                           v-model="bdAttachSetting.remark"
                           clearable></el-input>
               </td>
@@ -90,13 +90,13 @@
               </td>
             </tr>
             <tr>
-              <th>创建人</th>
+              <th>{{ $t1('创建人') }}</th>
               <td>{{ bdAttachSetting.createBy }}</td>
-              <th>创建时间</th>
+              <th>{{ $t1('创建时间') }}</th>
               <td>{{ bdAttachSetting.createDate }}</td>
-              <th>更新人</th>
+              <th>{{ $t1('更新人') }}</th>
               <td>{{ bdAttachSetting.modifyBy }}</td>
-              <th>更新时间</th>
+              <th>{{ $t1('更新时间') }}</th>
               <td>{{ bdAttachSetting.modifyDate }}</td>
             </tr>
             </tbody>
@@ -168,7 +168,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 ? `/bd_attach_setting/update` : `/bd_attach_setting/save`);
             this.$http({
               url: url,

package/src/views/bd/setting/bd_attach_setting/list.vue

@@ -177,13 +177,13 @@ export default {
           },
           {title: '表单分类', field: 'menuKindName', width: 150},
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'remark',
             width: 250
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -202,7 +202,7 @@ export default {
                         this.openEditDialog(row);
                       }}
                     >
-                      <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>
@@ -225,7 +225,7 @@ export default {
           },
           {title: "模板文件名称", field: "name", type: "input", common: true},
           {title: "模板文件编码", field: "code", type: "input", common: true},
-          {title: "备注", field: "remark", type: "input", common: true},
+          {title: this.$t1('备注'), field: "remark", type: "input", common: true},
         ],
         config: {
           proxyConfig: {

package/src/views/bd/setting/form_script/dialog.vue

@@ -76,7 +76,7 @@
             </div>
           </label>
           <div class="multipleChoice">
-            <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a
+            <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
               class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
             <div class="list">
               <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -201,7 +201,7 @@ export default {
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -220,7 +220,7 @@ export default {
                         this.openEditDialog(row);
                       }}
                     >
-                      <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/bd/setting/form_script/edit.vue

@@ -8,17 +8,18 @@
         </div>
         <div class="fr">
           <el-form>
-            <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
+            <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"
-                       v-if="isDev && !readonly">{{$t1('保存')}}
+                       v-if="isDev && !readonly">{{ $t1('保存') }}
             </el-button>
           </el-form>
         </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>
@@ -50,7 +51,7 @@
             <tr>
               <th>脚本说明</th>
               <td colspan="7">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                           v-model="formScript.scriptRemark"
                           clearable></el-input>
               </td>
@@ -74,13 +75,13 @@
               <td colspan="7">{{ formScript.sid }}</td>
             </tr>
             <tr>
-              <th>创建人</th>
+              <th>{{ $t1('创建人') }}</th>
               <td>{{ formScript.createBy }}</td>
-              <th>创建时间</th>
+              <th>{{ $t1('创建时间') }}</th>
               <td>{{ formScript.createDate }}</td>
-              <th>更新人</th>
+              <th>{{ $t1('更新人') }}</th>
               <td>{{ formScript.modifyBy }}</td>
-              <th>更新时间</th>
+              <th>{{ $t1('更新时间') }}</th>
               <td>{{ formScript.modifyDate }}</td>
             </tr>
             </tbody>
@@ -94,7 +95,7 @@
 </template>
 
 <script>
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
 
 export default {
@@ -206,9 +207,9 @@ export default {
       this.saveDataHandle(preformData);
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

package/src/views/bd/setting/form_script/edit1.vue

@@ -15,7 +15,7 @@
       </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>
@@ -112,7 +112,7 @@
             <tr>
               <th>脚本说明</th>
               <td colspan="7">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                           v-model="formScript.scriptRemark"
                           clearable></el-input>
               </td>
@@ -136,13 +136,13 @@
               <td colspan="7">{{ formScript.sid }}</td>
             </tr>
             <tr>
-              <th>创建人</th>
+              <th>{{ $t1('创建人') }}</th>
               <td>{{ formScript.createBy }}</td>
-              <th>创建时间</th>
+              <th>{{ $t1('创建时间') }}</th>
               <td>{{ formScript.createDate }}</td>
-              <th>更新人</th>
+              <th>{{ $t1('更新人') }}</th>
               <td>{{ formScript.modifyBy }}</td>
-              <th>更新时间</th>
+              <th>{{ $t1('更新时间') }}</th>
               <td>{{ formScript.modifyDate }}</td>
             </tr>
             </tbody>
@@ -162,7 +162,7 @@
 </template>
 
 <script>
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog";
 import projectTagView from "@base/components/projectTag/view.vue";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
@@ -289,9 +289,9 @@ export default {
       }
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

package/src/views/bd/setting/form_script/form_list.vue

@@ -83,7 +83,7 @@ import scriptDialog from "./dialog.vue";
 import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog.vue";
 import projectTagDialog from "../../../../views/user/project_tag/dialog.vue";
 import tableForm from "@base/components/table/tableForm.vue";
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import projectTagDeleteButton from "@base/components/projectTag/deleteButton.vue";
 import projectTagAddButton from "@base/components/projectTag/addButton.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
@@ -246,7 +246,7 @@ export default {
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -265,7 +265,7 @@ export default {
                         this.openEditDialog(row);
                       }}
                     >
-                      <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>
@@ -331,9 +331,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/bd/setting/form_script/list.vue

@@ -50,7 +50,7 @@
 <script>
 import editView from './edit.vue';
 import tableForm from "@base/components/table/tableForm.vue";
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 
 export default {
   name: 'form_script:list',
@@ -157,7 +157,7 @@ export default {
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -176,7 +176,7 @@ export default {
                         this.openEditDialog(row);
                       }}
                     >
-                      <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>
@@ -214,9 +214,9 @@ export default {
       })
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

package/src/views/bd/setting/form_script/list1.vue

@@ -115,7 +115,7 @@ import {treeScollx} from "@base/utils/global";
 import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog.vue";
 import projectTagDialog from "../../../../views/user/project_tag/dialog.vue";
 import tableForm from "@base/components/table/tableForm.vue";
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import projectTagDeleteButton from "@base/components/projectTag/deleteButton.vue";
 import projectTagAddButton from "@base/components/projectTag/addButton.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
@@ -310,7 +310,7 @@ export default {
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -329,7 +329,7 @@ export default {
                         this.openEditDialog(row);
                       }}
                     >
-                      <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>
@@ -447,9 +447,9 @@ export default {
       })
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     }

package/src/views/bd/setting/form_template/dialog.vue

@@ -72,7 +72,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -159,7 +159,7 @@ export default {
             width: 150
           },
           {
-            title: '是否启用',
+            title: this.$t1('是否启用'),
             field: 'enabled',
             width: 150,
             slots: {
@@ -181,7 +181,7 @@ export default {
             }
           },
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'remark',
             width: 150
           },
@@ -191,7 +191,7 @@ export default {
             width: 200
           },
           {
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             field: 'createDate',
             width: 150
           },

package/src/views/bd/setting/form_template/edit.vue

@@ -18,7 +18,7 @@
       </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>
@@ -89,9 +89,9 @@
               </td>
             </tr>
             <tr>
-              <th>备注</th>
+              <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" size="small" v-model="formTemplate.remark"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="formTemplate.remark"
                           clearable></el-input>
               </td>
             </tr>
@@ -113,13 +113,13 @@
               </td>
             </tr>
             <tr>
-              <th>创建人</th>
+              <th>{{ $t1('创建人') }}</th>
               <td>{{ formTemplate.createBy }}</td>
-              <th>创建时间</th>
+              <th>{{ $t1('创建时间') }}</th>
               <td>{{ formTemplate.createDate }}</td>
-              <th>更新人</th>
+              <th>{{ $t1('更新人') }}</th>
               <td>{{ formTemplate.modifyBy }}</td>
-              <th>更新时间</th>
+              <th>{{ $t1('更新时间') }}</th>
               <td>{{ formTemplate.modifyDate }}</td>
             </tr>
             <tr>
@@ -166,7 +166,7 @@
 
 <script>
 import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog";
-import {getBdEnv} from "@base/api/user";
+import {getBdFlag} from "@base/api/user";
 import projectTagView from "@base/components/projectTag/view.vue";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
 
@@ -289,9 +289,9 @@ export default {
       }
     },
     getBdEnv() {
-      getBdEnv({
+      getBdFlag({
         success: res => {
-          this.isDev = res.content == "dev"
+          this.isDev = res.objx == 1
         }
       });
     },

package/src/views/bd/setting/form_template/editWfObjConfigDialog.vue

@@ -92,7 +92,7 @@ export default {
     saveData() {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
-          this.$baseConfirm('您确定要保存吗？').then(() => {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = this.current_prefix + (this.isEdit ? `/wf_obj_config/update` : `/wf_obj_config/save`);
             this.$http({
               url: url,

package/src/views/bd/setting/form_template/ftHistoryDialog.vue

@@ -52,7 +52,7 @@
         </div>
       </label>
       <div class="multipleChoice">
-        <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top">
           <a class="allDel icon-quanbushanchu" @click="clearChecked()"></a>
         </el-tooltip>
         <div class="list">
@@ -142,12 +142,12 @@ export default {
             width: 150,
           },
           {
-            title: '备注',
+            title: this.$t1('备注'),
             field: 'remark',
             width: 150
           },
           {
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             field: 'createDate',
             width: 150
           },