cloud-web-corejs 1.0.54-dev.77 → 1.0.54-dev.771

package/src/index.js

@@ -1,190 +1,366 @@
-/**version-1.0*/
-import Vue from 'vue';
-import Cookies from 'js-cookie';
-import 'normalize.css/normalize.css'; // a modern alternative to CSS resets
-import Element from 'element-ui';
-import '@/styles/element-variables.scss';
-import '@/styles/index.scss'; // global css
-
-import App from '@base/App';
-import store from '@base/store';
-import router from '@base/router';
-
-import '@/icons'; // icon
-import '@base/permission'; // permission control
-
-import * as filters from '@base/filters'; // global filters
-
-// main.js 文件添加以下代码
-
-import BaseKeepAlive from '@base/utils/keepAlive.js'
-
-Vue.component('BaseKeepAlive', BaseKeepAlive)
-
-import VXETable from 'vxe-table';
-import 'vxe-table/lib/style.css';
-
-import Vab from '@base/utils/vab';
-
-Vue.use(Vab);
-
-Vue.use(VXETable);
-
-import '@base/components/table/index.js';
-
-import drag from '@base/directive/el-drag-dialog/index.js';
-
-Vue.use(drag.install);
-
-import elDialogCenter from '@base/directive/el-dialog-center/index.js';
-
-Vue.use(elDialogCenter.install);
-
-import ErroreBox from '@base/components/errorMsg/index.js';
-
-Vue.use(ErroreBox);
-
-import ExcelExport from '@base/components/excelExport/index.js';
-
-Vue.use(ExcelExport);
-
-import ExcelImport from '@base/components/excelImport/index.js';
-
-Vue.use(ExcelImport);
-
-import ConfirmDialog from '@base/components/confirmDialog/index.js';
-
-Vue.use(ConfirmDialog);
-
-import baseAlert from '@base/components/baseAlert/index.js';
-
-Vue.use(baseAlert);
-
-import permission from '@base/directive/permission';
-
-Vue.use(permission);
-
-import VabUpload from '@base/components/VabUpload/index.js';
-
-Vue.use(VabUpload);
-
-Vue.component('baseUpload', () => import('@base/components/VabUpload/view.vue'));
-
-import baseAttachment from '@base/components/baseAttachment/install';
-
-Vue.use(baseAttachment);
-Vue.component('attachmentShowList', () => import('@base/components/baseAttachment/showList'));
-
-import '@base/resources/js/base/common.js';
-
-import vxeFilter from '@base/components/table/vxeFilter/index.js';
-
-Vue.use(vxeFilter);
-
-import baseTableExport from "@base/components/excelExport/button";
-
-Vue.component(baseTableExport.name, baseTableExport);
-
-
-/* Vue.component('extendedProperties', () => import('@base/components/extendedProperties/view.vue')); */
-
-import LimitNumber from '@base/directive/LimitNumber/index.js';
-
-Vue.use(LimitNumber);
-
-import baseInputNumber from '@base/components/baseInputNumber/index.vue'
-
-Vue.component(baseInputNumber.name, baseInputNumber);
-
-import elReadonly from '@base/directive/el-readonly/index.js';
-
-Vue.use(elReadonly);
-
-/*import cnPrint from "@base/components/cnPrint/index.js"
-
-Vue.use(cnPrint);*/
-
-/* Vue.component('oplogTable', () => import('@base/components/oplogTable/index.vue')); */
-import oplogTable from '@base/components/oplogTable/index.vue'
-
-Vue.component(oplogTable.name, oplogTable);
-
-import baseInputBatch from '@base/components/baseInputBatch/index.vue'
-
-Vue.component(baseInputBatch.name, baseInputBatch);
-
-Vue.component('baseInputExport', () => import('@base/components/baseInputExport/index.vue'));
-
-Vue.component('advancedSearchDialog', () => import('@base/components/advancedSearchDialog/index.vue'));
-
-import baseTabs from '@base/components/baseTabs/index.vue'
-
-Vue.component(baseTabs.name, baseTabs);
-
-import baseTabPane from '@base/components/baseTabs/baseTabPane.vue'
-
-Vue.component(baseTabPane.name, baseTabPane);
-
-import vb_tabs from "@base/components/vb-tabs/index.vue";
-import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";
-import xTabs from "@base/components/vb-tabs/x-tabs.vue";
-
-Vue.component(vb_tabs.name, vb_tabs);
-Vue.component(vb_tab_pane.name, vb_tab_pane);
-Vue.component(xTabs.name, xTabs);
-
-Vue.component('status-tag', () => import('@base/components/statusTag/index.vue'));
-
-Vue.component('CodeEditor', () => import('@base/components/code-editor/index.vue'));
-
-Vue.component('scriptDescriptionButton', () => import('@base/components/scriptDescription/button'));
-
-Vue.component('scriptTestButton', () => import('@base/components/scriptTest/button'));
-
-import jsonImport from '@base/components/jsonImport/index.js';
-
-Vue.use(jsonImport);
-
-import langImport from '@base/components/langImport/index.js';
-
-Vue.use(langImport);
-
-//vform
-import '@base/components/xform/utils/directive'
-
-
-import i18n from '@base/lang/index.js'
-
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online ! ! !
- */
-if (process.env.NODE_ENV === 'production') {
-  /* const { mockXHR } = require('../mock')
-  mockXHR() */
-}
-
-Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-  // locale: enLang // 如果使用中文，无需设置，请删除
-});
-
-// register global utility filters
-Object.keys(filters).forEach(key => {
-  Vue.filter(key, filters[key]);
-});
-
-Vue.config.productionTip = false;
-
-let vue = new Vue({
-  el: '#app',
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-});
-window.$vueRoot = vue;
+/**version-1.0*/
+import "./public-path"; // qiankun publicPath 修正，必须保持第一行
+import Vue from "vue";
+import Cookies from "js-cookie";
+import "normalize.css/normalize.css"; // a modern alternative to CSS resets
+import Element from "element-ui";
+import "@/styles/element-variables.scss";
+import "@/styles/index.scss"; // global css
+
+import App from "@base/App";
+import store from "@base/store";
+import router, { resetRouter } from "@base/router";
+import settings from "@/settings";
+import { setToken as setAuthToken } from "@base/utils/auth";
+
+import "@/icons"; // icon
+import "@base/permission"; // permission control
+
+import * as filters from "@base/filters"; // global filters
+
+// main.js 文件添加以下代码
+
+import BaseKeepAlive from "@base/utils/keepAlive.js";
+
+Vue.component("BaseKeepAlive", BaseKeepAlive);
+
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
+
+// 引入扩展插件
+// import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js";
+// import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css";
+
+/* // 设置授权信息
+VXETable.setup({
+  // showAuthLog: true, // 是否在控制台显示授权信息，专业版支持关闭
+  // authId: 'gbeumewkoyt2rhf9', // 获取授权后在官网登录后进入“用户中心”查看
+  authId: 'gbeumewkoyt2rhft', // 获取授权后在官网登录后进入“用户中心”查看
+  // onAuth (e) {
+  //   // 打印授权状态
+  //   console.log(e)
+  // }
+}) */
+
+import Vab from "@base/utils/vab";
+
+Vue.use(Vab);
+
+Vue.use(VXETable);
+
+/* import tablePluns from "@/mixins/table/index.js"
+VXETable.use(tablePluns) */
+
+import "@base/components/table/index.js";
+
+import drag from "@base/directive/el-drag-dialog/index.js";
+
+Vue.use(drag.install);
+
+import elDialogCenter from "@base/directive/el-dialog-center/index.js";
+
+Vue.use(elDialogCenter.install);
+
+import ErroreBox from "@base/components/errorMsg/index.js";
+
+Vue.use(ErroreBox);
+
+import ExcelExport from "@base/components/excelExport/index.js";
+
+Vue.use(ExcelExport);
+
+import ExcelImport from "@base/components/excelImport/index.js";
+
+Vue.use(ExcelImport);
+
+import ConfirmDialog from "@base/components/confirmDialog/index.js";
+
+Vue.use(ConfirmDialog);
+
+import baseAlert from "@base/components/baseAlert/index.js";
+
+Vue.use(baseAlert);
+
+import FormDialog from "@base/components/formDialog/index.js";
+
+Vue.use(FormDialog);
+
+import permission from "@base/directive/permission";
+
+Vue.use(permission);
+
+import VabUpload from "@base/components/VabUpload/index.js";
+
+Vue.use(VabUpload);
+
+Vue.component("baseUpload", () =>
+  import("@base/components/VabUpload/view.vue")
+);
+
+import baseAttachment from "@base/components/baseAttachment/install";
+
+Vue.use(baseAttachment);
+Vue.component("attachmentShowList", () =>
+  import("@base/components/baseAttachment/showList")
+);
+
+import "@base/resources/js/base/common.js";
+
+import vxeFilter from "@base/components/table/vxeFilter/index.js";
+
+Vue.use(vxeFilter);
+
+import baseTableExport from "@base/components/excelExport/button.vue";
+
+Vue.component(baseTableExport.name, baseTableExport);
+
+/* Vue.component('extendedProperties', () => import('@base/components/extendedProperties/view.vue')); */
+
+import LimitNumber from "@base/directive/LimitNumber/index.js";
+
+Vue.use(LimitNumber);
+
+import baseInputNumber from "@base/components/baseInputNumber/index.vue";
+
+Vue.component(baseInputNumber.name, baseInputNumber);
+
+import elReadonly from "@base/directive/el-readonly/index.js";
+
+Vue.use(elReadonly);
+
+/*import cnPrint from "@base/components/cnPrint/index.js"
+
+Vue.use(cnPrint);*/
+
+/* Vue.component('oplogTable', () => import('@base/components/oplogTable/index.vue')); */
+import oplogTable from "@base/components/oplogTable/index.vue";
+
+Vue.component(oplogTable.name, oplogTable);
+
+import baseInputBatch from "@base/components/baseInputBatch/index.vue";
+
+Vue.component(baseInputBatch.name, baseInputBatch);
+
+import baseArea from "@base/components/baseArea/index.vue";
+
+Vue.component(baseArea.name, baseArea);
+
+Vue.component("baseInputExport", () =>
+  import("@base/components/baseInputExport/index.vue")
+);
+
+Vue.component("advancedSearchDialog", () =>
+  import("@base/components/advancedSearchDialog/index.vue")
+);
+
+import baseTabs from "@base/components/baseTabs/index.vue";
+
+Vue.component(baseTabs.name, baseTabs);
+
+import baseTabPane from "@base/components/baseTabs/baseTabPane.vue";
+
+Vue.component(baseTabPane.name, baseTabPane);
+
+import vb_tabs from "@base/components/vb-tabs/index.vue";
+import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";
+import xTabs from "@base/components/vb-tabs/x-tabs.vue";
+
+Vue.component(vb_tabs.name, vb_tabs);
+Vue.component(vb_tab_pane.name, vb_tab_pane);
+Vue.component(xTabs.name, xTabs);
+
+Vue.component("status-tag", () =>
+  import("@base/components/statusTag/index.vue")
+);
+
+Vue.component("CodeEditor", () =>
+  import("@base/components/code-editor/index.vue")
+);
+
+Vue.component("scriptDescriptionButton", () =>
+  import("@base/components/scriptDescription/button")
+);
+
+Vue.component("scriptTestButton", () =>
+  import("@base/components/scriptTest/button")
+);
+
+import baseTextarea from "@base/components/base-textarea/index.vue";
+
+Vue.component(baseTextarea.name, baseTextarea);
+
+import jsonImport from "@base/components/jsonImport/index.js";
+
+Vue.use(jsonImport);
+
+import langImport from "@base/components/langImport/index.js";
+
+Vue.use(langImport);
+
+//vform
+// import '@base/components/xform/utils/directive'
+
+import i18n from "@base/lang/index.js";
+
+/**
+ * If you don't want to use mock-server
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
+ *
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online ! ! !
+ */
+if (process.env.NODE_ENV === "production") {
+  /* const { mockXHR } = require('../mock')
+  mockXHR() */
+}
+
+Vue.use(Element, {
+  size: Cookies.get("size") || "medium", // set element-ui default size
+  // locale: enLang // 如果使用中文，无需设置，请删除
+});
+
+// register global utility filters
+Object.keys(filters).forEach((key) => {
+  Vue.filter(key, filters[key]);
+});
+
+Vue.config.productionTip = false;
+
+let instance = null;
+
+function render(props = {}) {
+  const { container } = props;
+  instance = new Vue({
+    router,
+    store,
+    i18n,
+    render: (h) => h(App),
+  }).$mount(container ? container.querySelector("#app") : "#app");
+  window.$vueRoot = instance;
+}
+
+if (!window.__POWERED_BY_QIANKUN__) {
+  // 独立运行 / 主应用形态：行为与拆分前一致
+  render();
+}
+
+/**
+ * qiankun 子应用生命周期。
+ * 引包子应用入口 re-export 即可：export * from "cloud-web-corejs/src/index";
+ * 主子通信协议见 docs/qiankun微前端改造-实现方案.md 3.3。
+ */
+export async function bootstrap() {}
+
+export async function mount(props = {}) {
+  if (props.appCode) {
+    // 主应用可经 props 覆盖，子应用也可在自身 settings.js 里声明
+    settings.appCode = props.appCode;
+  }
+  if (props.token) {
+    // token 存 sessionStorage，按 origin 隔离——跨域/跨端口主应用的登录态子应用天然拿不到，
+    // 主应用显式下发 token 即可免登（写入自身登录态后守卫按已登录走 getInfo2）
+    setAuthToken(props.token);
+    store.commit("user/SET_TOKEN", props.token);
+  }
+  store.commit("micro/SET_MICRO_CONTEXT", {
+    appCode: props.appCode || settings.appCode,
+    // 非数组（null/未传）= 自治嵌入模式：子应用自拉菜单、保留自身壳（micro store 据此置 selfManaged）
+    menus: Array.isArray(props.menus) ? props.menus : null,
+    mainAdapter: props.mainAdapter || null,
+    // 主应用经本地调试覆盖装载：允许 URL 直达未配菜单的页面
+    debug: !!props.microDebug,
+  });
+  // 再次挂载时 unmount 已重置路由，而 roles 仍在会使守卫跳过路由生成，这里主动补一次
+  if (store.getters.roles && store.getters.roles.length > 0) {
+    if (store.state.micro.selfManaged) {
+      await store.dispatch("permission/generateRoutes2", {
+        flag: store.state.user.userFlag,
+      });
+    } else {
+      await store.dispatch(
+        "permission/generateRoutesFromProps",
+        props.menus || []
+      );
+    }
+  }
+  render(props);
+}
+
+/**
+ * 保活协议（主应用 loadMicroApp 模式）：
+ * update({ microActive: false }) —— 容器被隐藏：暂停路由监听（守卫 next(false) +
+ *   ensureURL 置空，防止对主应用的 URL 变化做出反应、回写 URL 互相打架）；
+ * update({ microActive: true })  —— 容器重新显示：恢复监听并把当前 hash 同步进路由
+ *   （含主应用在隐藏期间切到本应用另一菜单的深导航场景）。
+ */
+let pausedEnsureURL = null;
+
+function pauseSubRouter() {
+  if (store.state.micro.routerPaused) return;
+  store.commit("micro/SET_ROUTER_PAUSED", true);
+  const history = router.history;
+  if (history && typeof history.ensureURL === "function") {
+    pausedEnsureURL = history.ensureURL;
+    history.ensureURL = function () {};
+  }
+}
+
+function resumeSubRouter() {
+  if (store.state.micro.routerPaused) {
+    store.commit("micro/SET_ROUTER_PAUSED", false);
+    if (pausedEnsureURL) {
+      router.history.ensureURL = pausedEnsureURL;
+      pausedEnsureURL = null;
+    }
+  }
+  syncSubRouter();
+}
+
+function syncSubRouter() {
+  const current = window.location.hash.replace(/^#/, "") || "/";
+  if (router.currentRoute.fullPath !== current) {
+    router.push(current).catch(() => {});
+  }
+}
+
+/**
+ * 主应用页签"刷新"转发过来时在子应用内部重建当前页组件。
+ * 不能套用主应用那招（delCachedView + 跳 /redirect）：子应用与主应用共用同一个
+ * 浏览器 hash，跳 /redirect 会被主应用 afterEach 判成"离开子应用路由"，
+ * 容器随即隐藏并暂停子应用路由，重建被掐断——表现就是点刷新没反应。
+ * 改为自增序号通知 AppMain 原地销毁重建，全程不碰 URL。
+ */
+function refreshCurrentView() {
+  store.commit("micro/BUMP_RELOAD_SEQ");
+}
+
+export async function update(props = {}) {
+  if (props.microActive === false) {
+    pauseSubRouter();
+  } else if (props.microActive === true) {
+    resumeSubRouter();
+  }
+  if (props.microRefresh) {
+    refreshCurrentView();
+  }
+}
+
+export async function unmount() {
+  if (store.state.micro.routerPaused && pausedEnsureURL) {
+    router.history.ensureURL = pausedEnsureURL;
+    pausedEnsureURL = null;
+  }
+  if (instance) {
+    instance.$destroy();
+    if (instance.$el) {
+      instance.$el.innerHTML = "";
+    }
+    instance = null;
+  }
+  if (window.$vueRoot) {
+    window.$vueRoot = null;
+  }
+  store.commit("micro/CLEAR_MICRO_CONTEXT");
+  resetRouter();
+}

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;