cloud-web-corejs 1.0.54-dev.76 → 1.0.54-dev.761

package/src/lang/index.js

@@ -1,51 +1,56 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-import enLocale from 'element-ui/lib/locale/lang/en'
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
-import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
-import VXETable from 'vxe-table'
-import ElementLocale from 'element-ui/lib/locale'
-import settingConfig from "@/settings";
-
-Vue.use(VueI18n);
-
-const messages = {
-  en: {
-    ...enLocale,
-    ...enUS_vxe
-  },
-  zh: {
-    ...zhLocale,
-    ...zhCN_vxe
-  }
-};
-
-/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
-const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
-
-zhLocaleMine.keys().map(fileName => {
-  let comp = zhLocaleMine(fileName).default;
-  Object.assign(messages["zh"], comp);
-});
-enLocaleMine.keys().map(fileName => {
-  let comp = enLocaleMine(fileName).default;
-  Object.assign(messages["en"], comp);
-});*/
-
-// Create VueI18n instance with options
-let i18nLang = localStorage.getItem("i18n-lang");
-const i18n = new VueI18n({
-  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
-  messages, // set locale messages
-});
-
-ElementLocale.i18n((key, value) => i18n.t(key, value));
-
-VXETable.setup({
-  // 对组件内置的提示语进行国际化翻译
-  i18n: (key, args) => i18n.t(key, args)
-});
-
-export default i18n;
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+import enLocale from 'element-ui/lib/locale/lang/en'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
+import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
+import VXETable from 'vxe-table'
+import ElementLocale from 'element-ui/lib/locale'
+import settingConfig from "@/settings";
+
+import enLogin from "./locale/en/login.js"
+import zhLogin from "./locale/zh/login.js"
+
+Vue.use(VueI18n);
+
+const messages = {
+  en: {
+    ...enLocale,
+    ...enUS_vxe,
+    ...enLogin
+  },
+  zh: {
+    ...zhLocale,
+    ...zhCN_vxe,
+    ...zhLogin
+  }
+};
+
+/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
+const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
+
+zhLocaleMine.keys().map(fileName => {
+  let comp = zhLocaleMine(fileName).default;
+  Object.assign(messages["zh"], comp);
+});
+enLocaleMine.keys().map(fileName => {
+  let comp = enLocaleMine(fileName).default;
+  Object.assign(messages["en"], comp);
+});*/
+
+// Create VueI18n instance with options
+let i18nLang = localStorage.getItem("i18n-lang");
+const i18n = new VueI18n({
+  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
+  messages, // set locale messages
+});
+
+ElementLocale.i18n((key, value) => i18n.t(key, value));
+
+VXETable.setup({
+  // 对组件内置的提示语进行国际化翻译
+  i18n: (key, args) => i18n.t(key, args)
+});
+
+export default i18n;

package/src/lang/locale/en/login.js

@@ -0,0 +1,27 @@
+export default {
+  账号登录: "Account Login",
+  请输入用户名: "Please enter a username",
+  请输入密码: "Please enter a password",
+  记住密码: "Remember password",
+  登录: "Login",
+  手机登录: "Phone Login",
+  请输入手机号: "Please enter a phone number",
+  请输入验证码: "Please enter a verification code",
+  扫码登录: "Scan Login",
+  "扫一扫，登录系统": "Scan the QR code to log in to the system",
+  二维码失效: "QR code expired",
+  广州同望科技发展有限公司:
+    "Guangzhou Tongwang Technology Development Co., Ltd.",
+  获取验证码: "Get Verification Code",
+  请输入手机号和验证码: "Please enter a phone number and verification code",
+  请输入手机号: "Please enter a phone number",
+  "60秒后重新获取": "60 seconds after re-getting",
+  "{time}秒后重新获取": "{time} seconds after re-getting",
+  登录成功: "Login Successful",
+  "components.errorMsg.title": "Tips",
+  "system.button.confirm2": "Confirm",
+  "components.errorMsg.detail": "Detail",
+  "components.errorMsg.collapse": "Collapse",
+  "用户名或密码错误!": "Please enter the correct account and password.",
+  "用户名或密码错误！": "Please enter the correct account and password.",
+};

package/src/lang/locale/zh/login.js

@@ -0,0 +1,26 @@
+export default {
+  账号登录: "账号登录",
+  请输入用户名: "请输入用户名",
+  请输入密码: "请输入密码",
+  记住密码: "记住密码",
+  登录: "登录",
+  手机登录: "手机登录",
+  请输入手机号: "请输入手机号",
+  请输入验证码: "请输入验证码",
+  扫码登录: "扫码登录",
+  "扫一扫，登录系统": "扫一扫，登录系统",
+  二维码失效: "二维码失效",
+  广州同望科技发展有限公司: "广州同望科技发展有限公司",
+  获取验证码: "获取验证码",
+  请输入手机号和验证码: "请输入手机号和验证码",
+  请输入手机号: "请输入手机号",
+  "60秒后重新获取": "60秒后重新获取",
+  "{time}秒后重新获取": "{time}秒后重新获取",
+  登录成功: "登录成功",
+  "components.errorMsg.title": "提示",
+  "system.button.confirm2": "确 定",
+  "components.errorMsg.detail": "详情",
+  "components.errorMsg.collapse": "收起",
+  "用户名或密码错误!": "用户名或密码错误!",
+  "用户名或密码错误！": "用户名或密码错误！",
+};

package/src/layout/components/AppMain.vue

@@ -1,111 +1,148 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
-
-      <BaseKeepAlive :include="cachedViews">
-        <router-view :key="$route.path" v-if="$route.name !== 'outLink'" />
-      </BaseKeepAlive>
-
-    </transition>
-    <template v-for="item in outVisitedViews">
-      <outLink
-        :ref="'ref_'+$route.path"
-        :key="item.path"
-        v-show="$route.path === item.path"
-        v-if="$route.path !== item.path || reflushFlag"
-        visible-key="reflushFlag"
-        :parent-target="_self"
-        @reload="$reloadHandle"
-      ></outLink>
-    </template>
-    <unreadDialog></unreadDialog>
-  </section>
-</template>
-
-<script>
-import outLink from '@base/views/user/outLink/index.vue';
-import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
-
-export default {
-  name: 'AppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
-    },
-    key() {
-      return this.$route.path;
-    },
-    outVisitedViews() {
-      let visitedViews = this.$store.state.tagsView.visitedViews;
-      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
-    }
-  },
-  components: {
-    outLink,
-    unreadDialog
-  },
-  data() {
-    return {
-      rIndex: -1,
-      reflushFlag: true
-    };
-  },
-  methods: {
-    reflushIframe(path) {
-      this.outVisitedViews.findIndex(item => item.full);
-    }
-  },
-  created() {
-    this.$baseEventBus.$on("reflushRouteView",(view)=>{
-      if(this.$route.name=="outLink"){
-        let t = this.$refs["ref_"+this.$route.path][0];
-        t.$baseReload();
-      }else{
-        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-          const { fullPath } = view
-          this.$nextTick(() => {
-            this.$router.replace({
-              path: '/redirect' + fullPath
-            })
-          })
-        })
-      }
-    })
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 45= navbar  45  */
-  min-height: calc(100vh - 45px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-
-.fixed-header + .app-main {
-  padding-top: 32px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 45 + 34 */
-    min-height: calc(100vh - 79px);
-  }
-
-  .fixed-header + .app-main {
-    padding-top: 79px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
+
+      <BaseKeepAlive :include="cachedViews">
+        <router-view :key="key" v-if="microReloadFlag && $route.name !== 'outLink'" />
+      </BaseKeepAlive>
+
+    </transition>
+    <template v-for="item in outVisitedViews">
+      <outLink
+        :ref="'ref_'+$route.path"
+        :key="item.path"
+        v-show="$route.path === item.path"
+        v-if="$route.path !== item.path || reflushFlag"
+        visible-key="reflushFlag"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+      ></outLink>
+    </template>
+    <!-- 挂载子应用 开始 -->
+    <section id="Appmicro" />
+    <!-- 挂载子应用 结束 -->
+    <unreadDialog></unreadDialog>
+    <watermark></watermark>
+  </section>
+</template>
+
+<script>
+import outLink from '@base/views/user/outLink/index.vue';
+import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+import { isRepeatable } from "@base/utils/repeatOpen";
+import { refreshMicroApp } from "@base/microRouter";
+
+
+export default {
+  name: 'AppMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
+    },
+    key() {
+      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
+      // 其余保持按 path，行为与原来一致。
+      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
+    },
+    outVisitedViews() {
+      let visitedViews = this.$store.state.tagsView.visitedViews;
+      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
+    }
+  },
+  components: {
+    outLink,
+    unreadDialog,
+    watermark
+  },
+  data() {
+    return {
+      rIndex: -1,
+      reflushFlag: true,
+      // 子应用模式下由 micro.reloadSeq 驱动的重建开关，见下方 watch
+      microReloadFlag: true
+    };
+  },
+  methods: {},
+  watch: {
+    // 主应用页签刷新经 update({microRefresh}) 传到子应用后自增该序号。
+    // 这里不走 /redirect 重建：子应用与主应用共用同一个浏览器 hash，
+    // 跳 /redirect 会被主应用 afterEach 判成"离开子应用路由"从而隐藏容器并暂停子应用路由，
+    // 重建被掐断，表现为刷新无反应。改为原地销毁重建组件，完全不碰 URL。
+    "$store.state.micro.reloadSeq"() {
+      let view = this.$route;
+      this.$store.dispatch("tagsView/delCachedView", view).then(() => {
+        this.microReloadFlag = false;
+        this.$nextTick(() => {
+          this.microReloadFlag = true;
+        });
+      });
+    }
+  },
+  created() {
+    // handler 存实例属性并在销毁时 $off：事件总线是应用级单例，
+    // 不解绑会在登出重建布局后累积 handler 并钉住旧实例（内存泄露）
+    this.reflushRouteViewHandler = (view) => {
+      let meta = this.$route.meta || {};
+      // 子应用页面不在本 router-view 内（由 qiankun 挂独立容器），
+      // 走本地 /redirect 重建只会隐藏再显示容器、实例不变，须转发给子应用自己重建
+      if (meta.isMicroApp && refreshMicroApp(meta.appCode)) {
+        return;
+      }
+      if(this.$route.name=="outLink"){
+        let t = this.$refs["ref_"+this.$route.path][0];
+        t.$baseReload();
+      }else{
+        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
+          const { fullPath } = view
+          this.$nextTick(() => {
+            this.$router.replace({
+              path: '/redirect' + fullPath
+            })
+          })
+        })
+      }
+    };
+    this.$baseEventBus.$on("reflushRouteView", this.reflushRouteViewHandler);
+  },
+  beforeDestroy() {
+    this.$baseEventBus.$off("reflushRouteView", this.reflushRouteViewHandler);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 45= navbar  45  */
+  //min-height: calc(100vh - 45px);
+  height:calc(100vh - 10px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header + .app-main {
+  padding-top: 32px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 45 + 34 */
+    min-height: calc(100vh - 79px);
+  }
+
+  .fixed-header + .app-main {
+    padding-top: 79px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+</style>