cloud-web-corejs 1.0.258 → 1.0.259

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

@@ -13,6 +13,7 @@
 <script>
 import corejsConfig from "@/corejsConfig";
 import settingConfig from "@/settings";
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: 'home',
@@ -79,9 +80,6 @@ export default {
           let userInfo = this.userInfo;
           let flag = userInfo.flag;
 
-          let str1 = "@base/views";
-          let str2 = "@/views";
-
           if (menuUrl && flag !== 1) {
             //超级管理员不使用角色首页
             url = menuUrl + '.vue';
@@ -89,13 +87,8 @@ export default {
             let defaultHomePage = this.userInfo.defaultHomePage;
             url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
           }
-          if (url.startsWith(str1)) {
-            this.homeContent = require('@base/views' + url.slice(str1.length)).default;
-          } else if (url.startsWith(str2)) {
-            this.homeContent = require('@/views' + url.slice(str2.length)).default;
-          } else {
-            this.homeContent = require('@/views' + url).default;
-          }
+          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
+          this.homeContent = loadViewComponent(url).component;
 
           this.showHomeContent = true;
           this.flag = 1;

package/src/views/user/lang_tag/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <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">{{
                   $t1('搜索')

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

@@ -20,7 +20,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">
                     {{ $t1('搜索') }}

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

@@ -22,7 +22,7 @@
                 </div>
                 <div class="fr">
                   <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">
                     {{ $t1('搜索') }}

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

@@ -169,14 +169,6 @@ export default {
   background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
 }
 
-.login-container.chigo {
-  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
-}
-
-.login-container.pcp {
-  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
-}
-
 .el-select-dropdown {
   right: 5px;
   top: 25px;