@epxing/core 5.3.0-beta.2 → 5.3.0-beta.3

package/src/views/Module.vue

@@ -0,0 +1,210 @@
+<template>
+  <div ref="module" id="module" class="module">
+    <!-- 显示module页面 -->
+    <!-- <epx-router-view v-if="initRoute" :init-route="initRoute"></epx-router-view> -->
+    <!-- 创建容器 -->
+    <epx-page
+      @changeRouter="changeRouter"
+      @back="back"
+      v-if="showPage"
+      :pageId="moduleRouter.pageId"
+      :flag="moduleRouter.flag"
+      :metaId="moduleRouter.metaId"
+      :component="moduleRouter.component"
+      :router="moduleRouter"
+      :current-query="moduleRouter"
+   />
+  </div>
+</template>
+
+<script>
+// 容器页面
+import { DELETE_MODULE_ROUTER, SET_ROUTER } from '@epxing/core/src/store/actions'
+import { mapState } from 'vuex'
+export default {
+  name: 'epx-module',
+  props: {
+    router: {
+      type: Object,
+      default () {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      showPage: false,
+      moduleIndexPage: '',
+      moduleRouters: [],
+      initRoute: null
+    }
+  },
+  computed: {
+    ...mapState({
+      // routers: state => state.router.moduleRouters,
+      // route: state => state.router.moduleRoute,
+      user: state => state.user.user
+    }),
+    pageId () {
+      return this.route.pageId || this.moduleIndexPage
+    },
+    // moduleRouters () {
+    //   const { children = [] } = this.router
+    //   return children
+    // },
+    moduleRouter () {
+      return this.moduleRouters[this.moduleRouters.length - 1] || {}
+    }
+  },
+  watch: {
+    $routers: {
+      handler (routers) {
+        routers.forEach(item => {
+          if (item.key === this.router.key) {
+            const { children = [] } = item
+            this.moduleRouters = [...children]
+          }
+        })
+      },
+      deep: true
+    },
+    moduleRouter: {
+      handler (v, oldV) {
+        // 页面更改、刷新页面
+        if (!(v.pageId === oldV.pageId && v.flag === oldV.flag && v.metaId === oldV.metaId && v.component === oldV.component)) {
+          this.reloadPageDebounce()
+        }
+      },
+      deep: true
+    }
+  },
+  provide () {
+    return {
+      $changeRouter: this.changeRouter,
+      $reloadPage: this.reloadPage,
+      $backPage: this.$popModuleRoute
+    }
+  },
+  methods: {
+    reloadPage () {
+      this.showPage = false
+      this.$nextTick(() => {
+        if (this.moduleRouter.pageId || this.moduleRouter.flag || this.moduleIndexPage || this.moduleRouter.component) {
+          const timer = setTimeout(() => {
+            this.showPage = true
+            clearTimeout(timer)
+          }, 0)
+        }
+      })
+    },
+    getModule () {
+      let { moduleId } = this.$route.query
+      if (this.router.query) {
+        moduleId = this.router.query.moduleId
+      }
+      if (!moduleId) {
+        if (this.user.currentRoleEntity) {
+          const { MENU: USER_MENU } = this.user.currentRoleEntity.data
+          moduleId = USER_MENU
+        }
+      }
+      // 获取当前模块信息
+      // 如果当前模块没绑定页面，获取其子模块页面
+      this.$http.get({
+        entityId: 'FM_MODULE',
+        id: moduleId
+      })
+        .then(data => {
+          if (data) {
+            const module = data.data || {}
+            const date = new Date().getTime()
+            // 初始化模块首页
+            // this.$pushModuleRoute({
+            //   pageId: module.MAIN_PAGE
+            // })
+            if (!this.router.query) {
+              this.$createPage({
+                key: this.$routers.length === 0 ? 'nav-' + date : date,
+                moduleId: module.ID,
+                title: module.NAME,
+                openType: '1'
+              })
+              this.initRoute = {
+                key: this.$routers.length === 0 ? 'nav-' + date : date,
+                moduleId: module.ID,
+                title: module.NAME
+              }
+            } else {
+              if (!this.router.children || this.router.children.length === 0) {
+                const router = {
+                  ...this.router,
+                  children: [
+                    { key: date, pageId: module.MAIN_PAGE, moduleId: moduleId }
+                  ]
+                }
+                this.initRoute = { key: date, pageId: module.MAIN_PAGE, moduleId: moduleId }
+                this.$store.commit(SET_ROUTER, { key: this.router.key, router })
+              }
+            }
+            // this.$createPage({
+            //   pageId: module.MAIN_PAGE
+            // })
+          }
+        })
+    },
+    addListenerRouter () {
+      // ⚠️ T17 修复轮 2（定向复审 N4）：这里原来还有两行
+      //   this.$bus.on('push', this.pushModuleRoute) / this.$bus.on('pop', this.popModuleRoute)
+      // 两个 handler **在本组件里恒为 `undefined`**：它们全仓只定义在 `@epxing/core/src/Container.vue`
+      // （:204-213），而本组件**没有 mixins/extends**，globalProperties 里也没有。
+      // 往总线塞 `undefined` 只会让 `emit('push')` 抛 `h is not a function`，从来没做过事 ⇒ 删掉。
+      // （两个不带 handler 的 off 是挂载侧既有行为，本次不动。）
+      this.$bus.off('push')
+      this.$bus.off('pop')
+    },
+    removeListenerRouter () {
+      // ⚠️ T17 修复轮 2（定向复审 N4，顶回②的安全性论断被推翻）：修复轮 1 认定这里「本来就传了
+      // handler，是安全的」。计数没错（该按原修法改的确实是 5 个文件不是 6 个），**但安全性论断错了**：
+      // `this.pushModuleRoute` / `this.popModuleRoute` 都是 `undefined`，而 `vue.bus.js` 的 off
+      // 判的是 `if (!callback)` ⇒ `off(event, undefined)` 走「删光该事件全部监听」那条分支，
+      // 与裸 `off('push')` 完全等价、一样连坐删掉别人的监听。
+      // 本组件从来没有成功注册过任何 handler，没有东西可摘 ⇒ 两行 off 一并删掉，只留 commit。
+      // 把二级路由清空
+      this.$store.commit(DELETE_MODULE_ROUTER)
+    },
+    changeRouter (v) {
+      // const { mode, router } = v
+      // if (mode === 'replace') {
+      //   this.$popModuleRoute()
+      // }
+      // this.$pushModuleRoute(router)
+    },
+    back () {
+      this.$popModuleRoute()
+    }
+  },
+  created () {
+    this.getModule()
+    this.addListenerRouter()
+    this.reloadPageDebounce = this.$_.debounce(this.reloadPage, 20)
+  },
+  beforeUnmount () {
+    this.removeListenerRouter()
+  }
+}
+</script>
+
+<style scoped>
+.module {
+  width: 100%;
+  height: 100%;
+  padding: 16px;
+  box-sizing: border-box;
+  position: relative;
+}
+@media only screen and (max-width: 992px) {
+  .module{
+    padding: 0;
+  }
+}
+</style>

package/src/xss.js

@@ -1,26 +1,26 @@
-import xss from 'xss'
-export const newXss = new xss.FilterXSS({
-  whiteList: {
-    ...xss.whiteList,
-    source: ['src', 'type'],
-    style: ['type'],
-    label: ['data-name', 'data-field', 'data-express', 'data-mainsource', 'data-imgheight', 'data-imgwidth', 'data-variable'],
-    a: ['target', 'href', 'title', 'data-doc-id', 'data-doc-name'],
-    span: [
-      ...(xss.whiteList.span || []),
-      'class', 'contenteditable',
-      'data-type', 'data-value'
-    ]
-  },
-  onIgnoreTagAttr: function (tag, name, value, isWhiteAttr) {
-    if (['style', 'class'].includes(name)) {
-      return `${name}="${xss.escapeAttrValue(value)}"`
-    }
-  },
-  safeAttrValue (tag, name, value) {
-    return `${xss.escapeAttrValue(value)}`
-  }
-})
-
-// 供两个入口复用 / 对外 re-export 的单例
-export default newXss
+import xss from 'xss'
+export const newXss = new xss.FilterXSS({
+  whiteList: {
+    ...xss.whiteList,
+    source: ['src', 'type'],
+    style: ['type'],
+    label: ['data-name', 'data-field', 'data-express', 'data-mainsource', 'data-imgheight', 'data-imgwidth', 'data-variable'],
+    a: ['target', 'href', 'title', 'data-doc-id', 'data-doc-name'],
+    span: [
+      ...(xss.whiteList.span || []),
+      'class', 'contenteditable',
+      'data-type', 'data-value'
+    ]
+  },
+  onIgnoreTagAttr: function (tag, name, value, isWhiteAttr) {
+    if (['style', 'class'].includes(name)) {
+      return `${name}="${xss.escapeAttrValue(value)}"`
+    }
+  },
+  safeAttrValue (tag, name, value) {
+    return `${xss.escapeAttrValue(value)}`
+  }
+})
+
+// 供两个入口复用 / 对外 re-export 的单例
+export default newXss

package/types/app.d.ts

@@ -1,10 +1,10 @@
-export { getApp, setApp, registerComponent, resolveComponent } from './index'
-import type { App, Plugin } from 'vue'
-import { getApp, setApp, registerComponent, resolveComponent } from './index'
-export declare function useVuePlugin(plugin: Plugin & { runtime?: string }, options?: any): App | void | Promise<void>
-declare const appServices: {
-  getApp: typeof getApp; setApp: typeof setApp
-  registerComponent: typeof registerComponent; resolveComponent: typeof resolveComponent
-  useVuePlugin: typeof useVuePlugin
-}
-export default appServices
+export { getApp, setApp, registerComponent, resolveComponent } from './index'
+import type { App, Plugin } from 'vue'
+import { getApp, setApp, registerComponent, resolveComponent } from './index'
+export declare function useVuePlugin(plugin: Plugin & { runtime?: string }, options?: any): App | void | Promise<void>
+declare const appServices: {
+  getApp: typeof getApp; setApp: typeof setApp
+  registerComponent: typeof registerComponent; resolveComponent: typeof resolveComponent
+  useVuePlugin: typeof useVuePlugin
+}
+export default appServices

package/types/axios.d.ts

@@ -1 +1 @@
-export { axios as default } from './index'
+export { axios as default } from './index'

package/types/component-mixin.d.ts

@@ -1 +1 @@
-export { ComponentMixin as default } from './index'
+export { ComponentMixin as default } from './index'

package/types/field-factory.d.ts

@@ -1 +1 @@
-export { FieldFactory as default, FieldFactoryClass as FieldFactory, createFieldFactory } from './index'
+export { FieldFactory as default, FieldFactoryClass as FieldFactory, createFieldFactory } from './index'

package/types/global-mixin.d.ts

@@ -1 +1 @@
-export { GlobalMixin as default } from './index'
+export { GlobalMixin as default } from './index'

package/types/http.d.ts

@@ -1 +1 @@
-export { http as default } from './index'
+export { http as default } from './index'

package/types/index.d.ts

@@ -6,6 +6,8 @@ import type { AxiosInstance } from 'axios'
 import type { HttpClient, RuntimeUtil, mixins, routerConfig, getEventBus, createEventBus, createStoreModules, storeModules, createFrameRouter } from './product-api'
 export * from './product-api'
 
+export declare const routeComponents: Record<string, Component>
+
 export interface CoreOptions {
   store: Store<any>
   router: Router
@@ -47,6 +49,7 @@ declare const EpxCore: {
   getApp: typeof getApp
   setApp: typeof setApp; registerComponent: typeof registerComponent; resolveComponent: typeof resolveComponent
   configureRuntime: typeof configureRuntime; registerRouteComponents: typeof registerRouteComponents
+  routeComponents: typeof routeComponents
   nav: typeof nav; publishCoreRuntime: typeof publishCoreRuntime
   getSystemMeta: RuntimeUtil['getSystemMeta']; getFileUrl: RuntimeUtil['getFileUrl']; getSysId: RuntimeUtil['getSysId']
   toLogin: RuntimeUtil['toLogin']; usePlugin: RuntimeUtil['usePlugin']; runExpByScope: RuntimeUtil['runExpByScope']

package/types/meta.d.ts

@@ -1 +1 @@
-export { Meta as default } from './index'
+export { Meta as default } from './index'

package/types/navigation.d.ts

@@ -1,21 +1,21 @@
-export { nav as default, nav } from './index'
-import type { RouteLocationNormalized, RouteLocationRaw, LocationQueryRaw } from 'vue-router'
-export interface MenuRecord { ID?: string; MODULE_CODE?: string; children?: MenuRecord[]; [key: string]: any }
-export declare function getMenuKey(menu?: MenuRecord | null): string
-export declare function findMenuByKey(menus: MenuRecord[] | undefined, key: string): MenuRecord | undefined
-export declare function findMenuPath(menus: MenuRecord[] | undefined, key: string): MenuRecord[]
-export declare const roleStorage: {
-  key(client?: string, system?: string): string
-  get(client?: string, system?: string): string
-  set(client: string, system: string, role: string): void
-}
-export declare function resolveRouteRole(route?: Pick<RouteLocationNormalized, 'params'>): string | string[]
-export declare const MENU_ROUTE_ALIAS: { appMenu: 'app1'; hallMenu: 'hall' }
-export declare function effectiveRouteName(name?: string | symbol | null): string | symbol | null | undefined
-export declare function menuLocation(route: RouteLocationNormalized, key: string, query?: LocationQueryRaw): RouteLocationRaw
-export interface MenuActivationOptions { syncUrl?: boolean; replaceUrl?: boolean; query?: LocationQueryRaw }
-export declare function activateMenu(menuId: string, extraProps?: Record<string, any>, options?: MenuActivationOptions): boolean
-export declare function syncMenuUrl(menu: MenuRecord, options?: { replace?: boolean; query?: LocationQueryRaw }): void
-export declare function clearMenuUrl(options?: { replace?: boolean }): void
-export declare function activateFromRoute(route: RouteLocationNormalized): boolean
-export declare function activateHome(): boolean
+export { nav as default, nav } from './index'
+import type { RouteLocationNormalized, RouteLocationRaw, LocationQueryRaw } from 'vue-router'
+export interface MenuRecord { ID?: string; MODULE_CODE?: string; children?: MenuRecord[]; [key: string]: any }
+export declare function getMenuKey(menu?: MenuRecord | null): string
+export declare function findMenuByKey(menus: MenuRecord[] | undefined, key: string): MenuRecord | undefined
+export declare function findMenuPath(menus: MenuRecord[] | undefined, key: string): MenuRecord[]
+export declare const roleStorage: {
+  key(client?: string, system?: string): string
+  get(client?: string, system?: string): string
+  set(client: string, system: string, role: string): void
+}
+export declare function resolveRouteRole(route?: Pick<RouteLocationNormalized, 'params'>): string | string[]
+export declare const MENU_ROUTE_ALIAS: { appMenu: 'app1'; hallMenu: 'hall' }
+export declare function effectiveRouteName(name?: string | symbol | null): string | symbol | null | undefined
+export declare function menuLocation(route: RouteLocationNormalized, key: string, query?: LocationQueryRaw): RouteLocationRaw
+export interface MenuActivationOptions { syncUrl?: boolean; replaceUrl?: boolean; query?: LocationQueryRaw }
+export declare function activateMenu(menuId: string, extraProps?: Record<string, any>, options?: MenuActivationOptions): boolean
+export declare function syncMenuUrl(menu: MenuRecord, options?: { replace?: boolean; query?: LocationQueryRaw; context?: Record<string, any> }): void
+export declare function clearMenuUrl(options?: { replace?: boolean }): void
+export declare function activateFromRoute(route: RouteLocationNormalized): boolean
+export declare function activateHome(): boolean

package/types/pdf-viewer.d.ts

@@ -1 +1 @@
-export { PdfViewer as default } from './index'
+export { PdfViewer as default } from './index'

package/types/runtime.d.ts

@@ -1,13 +1,13 @@
-export { configureRuntime, registerRouteComponents } from './index'
-import type { App, Component } from 'vue'
-import type { Store } from 'vuex/types/index.d.ts'
-import type { Router } from 'vue-router'
-import type { HttpClient } from './index'
-export interface RuntimeServices { store: Store<any>; router: Router; http: HttpClient }
-export interface BusinessComponentRegistry { resolve(app: App, name: string): Promise<Component | null> }
-export declare function getConfiguredRuntimeService<K extends keyof RuntimeServices>(name: K): RuntimeServices[K] | undefined
-export declare function getRuntimeService<K extends keyof RuntimeServices>(name: K): RuntimeServices[K]
-export declare const runtimeStore: Store<any>
-export declare const runtimeRouter: Router
-export declare function runtimeRouteComponent(name: string): () => Promise<Component>
-export declare function loadBusinessComponents(app: App): Promise<BusinessComponentRegistry>
+export { configureRuntime, registerRouteComponents } from './index'
+import type { App, Component } from 'vue'
+import type { Store } from 'vuex/types/index.d.ts'
+import type { Router } from 'vue-router'
+import type { HttpClient } from './index'
+export interface RuntimeServices { store: Store<any>; router: Router; http: HttpClient }
+export interface BusinessComponentRegistry { resolve(app: App, name: string): Promise<Component | null> }
+export declare function getConfiguredRuntimeService<K extends keyof RuntimeServices>(name: K): RuntimeServices[K] | undefined
+export declare function getRuntimeService<K extends keyof RuntimeServices>(name: K): RuntimeServices[K]
+export declare const runtimeStore: Store<any>
+export declare const runtimeRouter: Router
+export declare function runtimeRouteComponent(name: string): () => Promise<Component>
+export declare function loadBusinessComponents(app: App): Promise<BusinessComponentRegistry>

package/types/store.d.ts

@@ -1 +1 @@
-export { createFrameStore, createStoreModules, storeModules } from './index'
+export { createFrameStore, createStoreModules, storeModules } from './index'

package/types/util.d.ts

@@ -1,2 +1,2 @@
-export { util as default } from './index'
-export { getSystemMeta, getFileUrl, getSysId, toLogin, usePlugin, runExpByScope } from './product-api'
+export { util as default } from './index'
+export { getSystemMeta, getFileUrl, getSysId, toLogin, usePlugin, runExpByScope } from './product-api'