cloud-web-corejs 1.0.258 → 1.0.259

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

@@ -17,7 +17,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('搜索') }}
@@ -351,7 +351,7 @@ export default {
         treeNodeUrl: USER_PREFIX + '/menu/listChildren',
         editSaveUrl: USER_PREFIX + '/menu/save',
         editDefaultRow: () => {
-          return {enabled: true, type: this.menuType,checkPermission: 0};
+          return {enabled: true, type: this.menuType,checkPermission: 0, repeatOpen: false};
         },
         param: () => {
           return this.formData;
@@ -476,6 +476,29 @@ export default {
               }
             }
           },
+          {
+            field: 'repeatOpen',
+            title: this.$t1('是否可重复打开'),
+            width: 150,
+            editRender: {},
+            slots: {
+              default: ({row}) => {
+                if (row.repeatOpen) {
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
+                }
+              },
+              edit: ({row}) => {
+                return [
+                  <el-select v-model={row.repeatOpen}>
+                      <el-option value={true} label={this.$t1('启用')}></el-option>
+                      <el-option value={false} label={this.$t1('禁用')}></el-option>
+                  </el-select>
+                ]
+              }
+            }
+          },
           // { field: 'treePathName', title: '上级菜单', width: 200 },
           {field: 'orders', title: this.$t1('序号'), width: 100, editRender: {name: 'input'}},
           {

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

@@ -0,0 +1,123 @@
+<template>
+  <div class="menu-fallback">
+    <div class="menu-fallback-box">
+      <i
+        class="menu-fallback-icon"
+        :class="foreignApp ? 'el-icon-position' : 'el-icon-warning-outline'"
+      ></i>
+      <div class="menu-fallback-title">{{ menuTitle }}</div>
+      <div class="menu-fallback-msg">{{ message }}</div>
+      <div v-if="detail" class="menu-fallback-detail">{{ detail }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import settings from "@/settings";
+import { getOwnerSegment, BASE_SEGMENT } from "@base/utils/menuAdapter";
+
+export default {
+  name: "menuFallback",
+  props: {
+    componentPath: String,
+    loadError: String,
+  },
+  computed: {
+    menuTitle() {
+      let meta = (this.$route && this.$route.meta) || {};
+      return meta.title || (this.$route && this.$route.path) || "";
+    },
+    ownerSegment() {
+      return getOwnerSegment((this.$route && this.$route.path) || "");
+    },
+    registryAppCodes() {
+      let permission = (this.$store && this.$store.state.permission) || {};
+      return permission.registryAppCodes || [];
+    },
+    foreignApp() {
+      // 只有 /micro/<appCode> 命中注册表里的别家 appCode 才算"归属别家应用"；
+      // 未命中（含注册表未配置）一律按组件加载失败处理，不误导去主平台
+      let seg = this.ownerSegment;
+      let own = settings.appCode || "";
+      return (
+        !!seg &&
+        seg !== BASE_SEGMENT &&
+        seg !== own &&
+        this.registryAppCodes.indexOf(seg) !== -1
+      );
+    },
+    message() {
+      if (this.foreignApp) {
+        if (!(settings.appCode || "")) {
+          // 主站视角：归属子应用的菜单本应委派 qiankun 渲染，走到本地加载即为注册/部署异常
+          return (
+            this.$t1("该菜单归属子应用") +
+            "「" +
+            this.ownerSegment +
+            "」" +
+            this.$t1("，加载失败，请检查应用注册表与子应用部署")
+          );
+        }
+        return (
+          this.$t1("该菜单归属应用") +
+          "「" +
+          this.ownerSegment +
+          "」" +
+          this.$t1("，当前应用未部署对应页面，请在主平台中访问")
+        );
+      }
+      return this.$t1("页面组件加载失败，请检查菜单配置或应用注册表");
+    },
+    detail() {
+      let parts = [];
+      if (this.componentPath) {
+        parts.push(this.componentPath);
+      }
+      if (this.loadError && !this.foreignApp) {
+        parts.push(this.loadError);
+      }
+      return parts.join("  |  ");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.menu-fallback {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 320px;
+  height: 100%;
+
+  .menu-fallback-box {
+    text-align: center;
+    padding: 32px;
+    color: #606266;
+  }
+
+  .menu-fallback-icon {
+    font-size: 48px;
+    color: #c0c4cc;
+  }
+
+  .menu-fallback-title {
+    margin-top: 16px;
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .menu-fallback-msg {
+    margin-top: 8px;
+    font-size: 14px;
+  }
+
+  .menu-fallback-detail {
+    margin-top: 12px;
+    font-size: 12px;
+    color: #909399;
+    word-break: break-all;
+  }
+}
+</style>

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

@@ -14,7 +14,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/notify_message/dialog.vue

@@ -25,11 +25,21 @@
         :parent-target="_self"
         @reload="$reloadHandle"
       ></component>
+      <micro-view-host
+        v-else-if="showWfContent && remoteView"
+        :owner="remoteView.owner"
+        :target-path="remoteView.targetPath"
+        :biz-params="remoteView.bizParams"
+        :view-meta="remoteView.viewMeta"
+        @reload="$reloadHandle"
+        @close="showWfContent = false"
+      ></micro-view-host>
     </div>
   </el-dialog>
 </template>
 
 <script>
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 export default {
   props: {},
   data() {
@@ -38,6 +48,7 @@ export default {
       wfUrl2: "",
       showWfContent: true,
       wfContent: null,
+      remoteView: null,
       wfDataId: "",
       param: {},
     };
@@ -102,7 +113,17 @@ export default {
           this.wfDataId = !id || typeof id == "object" ? 0 : id;
           // this.showWfDialog = true;
           this.showWfContent = true;
-          this.wfContent = require("@/views" + url).default;
+          let res = loadViewComponent(url);
+          this.remoteView =
+            res.kind === "remote"
+              ? {
+                  owner: res.owner,
+                  targetPath: res.targetPath,
+                  bizParams: this.param,
+                  viewMeta: { visibleKey: "showWfContent", _isNotifyMessage: true },
+                }
+              : null;
+          this.wfContent = res.component;
         }
         this.showWfDialog2 = true;
 

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

@@ -48,7 +48,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/notify_template/list.vue

@@ -20,7 +20,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/notify_template/list2.vue

@@ -20,7 +20,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/oplog/list.vue

@@ -17,7 +17,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/outLink/form_view.vue

@@ -9,6 +9,7 @@
 
 <script>
 import indexUtil from "@base/utils/index.js"
+import { loadViewComponent } from "@base/utils/resolveViewComponent"
 import {
   setReportGlobalParam
 } from "@base/components/xform/utils/util";
@@ -93,23 +94,13 @@ export default {
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
-      // this.wfContent = require('@/views' + url).default;
-      let t = "@base/views";
-      let urlArr = [
-        '/user/bill_setting/h5_view.vue',
-        '/user/form/view/list.vue',
-        '/user/form/view/edit.vue'
-      ]
       this.initUserInfo(async () => {
         await this.initI18n();
-        if (urlArr.includes(url)) {
-          this.wfContent = require('@base/views' + url).default;
-        } else if (url.startsWith(t)) {
-          let path = url.slice(t.length);
-          this.wfContent = require('@base/views' + path).default;
-        } else {
-          this.wfContent = require('@/views' + url).default;
+        let res = loadViewComponent(url);
+        if (res.kind === "remote") {
+          this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
         }
+        this.wfContent = res.component;
       })
     },
     initUserInfo(callback) {

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

@@ -13,6 +13,7 @@
 
 <script>
 import { getToken } from "@base/utils/auth";
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: "outLink",
@@ -27,7 +28,11 @@ export default {
     let url = this.$route.query.url;
     let route = this.$route.query.route;
     if (route) {
-      this.content = require("@/views" + route).default;
+      let res = loadViewComponent(route);
+      if (res.kind === "remote") {
+        this.$message({ message: "该页面归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.content = res.component;
       this.type = 2;
     } else {
       let params = this.getCustomReqUrlAndCleanUrl(url);

package/src/views/user/outLink/view.vue

@@ -9,6 +9,7 @@
 
 <script>
 import indexUtil from "@base/utils/index.js"
+import { loadViewComponent } from "@base/utils/resolveViewComponent"
 
 export default {
   data() {
@@ -85,22 +86,13 @@ export default {
       this.queryParam = queryParam;
       this.showWfContent = true;
 
-      let t = "@base/views";
-      let urlArr = [
-        '/user/bill_setting/h5_view.vue',
-        '/user/form/view/list.vue',
-        '/user/form/view/edit.vue'
-      ]
       this.initUserInfo(() => {
         this.initI18n();
-        if (urlArr.includes(url)) {
-          this.wfContent = require('@base/views' + url).default;
-        } else if (url.startsWith(t)) {
-          let path = url.slice(t.length);
-          this.wfContent = require('@base/views' + path).default;
-        } else {
-          this.wfContent = require('@/views' + url).default;
+        let res = loadViewComponent(url);
+        if (res.kind === "remote") {
+          this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
         }
+        this.wfContent = res.component;
       })
     },
     initUserInfo(callback) {

package/src/views/user/position/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/position/list.vue

@@ -19,7 +19,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/project_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/project_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/push_setting/list.vue

@@ -18,7 +18,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/request_setting/list.vue

@@ -17,7 +17,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/role/dialog.vue

@@ -33,7 +33,7 @@
                 type="text"
                 status="primary"
                 plain
-                >{{ $t1("重置") }}
+                >{{ $t1("刷新") }}
               </vxe-button>
               <vxe-button
                 status="warning"

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

@@ -20,7 +20,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/sale_org/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/sale_org/list.vue

@@ -13,7 +13,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/system_notice/list.vue

@@ -20,7 +20,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/system_parameter/list.vue

@@ -20,7 +20,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/user/dialog.vue

@@ -27,7 +27,7 @@
           <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
             <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('搜索') }}