vue2-client 1.10.32-alpha → 1.10.32-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.10.32-alpha",
+  "version": "1.10.32-alpha.1",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/App.vue

@@ -1,183 +1,196 @@
-<template>
-  <a-config-provider :locale="locale" :get-popup-container="popContainer">
-    <router-view/>
-  </a-config-provider>
-</template>
-
-<script>
-import { enquireScreen } from '@vue2-client/utils/util'
-import { mapState, mapMutations } from 'vuex'
-import themeUtil from '@vue2-client/utils/themeUtil'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-import { setSystemVersion } from '@vue2-client/utils/request'
-import waterMark from '@vue2-client/utils/waterMark'
-
-export default {
-  name: 'App',
-  data () {
-    return {
-      locale: {}
-    }
-  },
-  created () {
-    this.setHtmlTitle()
-    this.setLanguage(this.lang)
-    enquireScreen(isMobile => this.setDevice(isMobile))
-  },
-  mounted () {
-    this.setWeekModeTheme(this.weekMode)
-    const configStr = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
-    if (configStr) {
-      const config = JSON.parse(configStr)
-      if (config?.$globalProp?.environment === 'dev') {
-        // 设置水印
-        waterMark('开发环境')
-      }
-    }
-    // 设置系统版本
-    setSystemVersion(this.compatible)
-    // 获取基座应用的信息进行初始化
-    this.setMicroApp()
-  },
-  watch: {
-    weekMode (val) {
-      this.setWeekModeTheme(val)
-    },
-    lang (val) {
-      this.setLanguage(val)
-      this.setHtmlTitle()
-    },
-    $route () {
-      this.setHtmlTitle()
-    },
-    'theme.mode': {
-      immediate: true,
-      handler: function (val) {
-        this.changeThemeMode(val)
-      }
-    },
-    'theme.color': {
-      immediate: true,
-      handler: function (val) {
-        this.changeThemeColor(val)
-      }
-    },
-    layout: function () {
-      window.dispatchEvent(new Event('resize'))
-    }
-  },
-  computed: {
-    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang', 'compatible'])
-  },
-  methods: {
-    ...mapMutations('setting', ['setDevice']),
-    changeThemeColor (val) {
-      if (process.env.NODE_ENV === 'production') {
-        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
-      } else {
-        console.info('为保证构建性能，关闭开发环境下的主题色切换')
-      }
-    },
-    changeThemeMode (val) {
-      if (process.env.NODE_ENV === 'production') {
-        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
-      } else {
-        console.info('为保证构建性能，关闭开发环境下的主题模式切换')
-      }
-    },
-    setWeekModeTheme (weekMode) {
-      if (weekMode) {
-        document.body.classList.add('week-mode')
-      } else {
-        document.body.classList.remove('week-mode')
-      }
-    },
-    setMicroApp () {
-      const that = this
-      if (window.__MICRO_APP_ENVIRONMENT__) {
-        const data = window.microApp.getData()
-        this.setMicroAppTheme(data.themeStore)
-        window.microApp.addDataListener((_data) => {
-          that.setMicroAppTheme(_data.themeStore)
-        })
-      }
-    },
-    setMicroAppTheme (themeStore) {
-      try {
-        let themeScheme = 'dark'
-        if (themeStore && themeStore.themeColor && themeStore.themeScheme) {
-          if (themeStore.themeScheme === 'dark') {
-            themeScheme = 'night'
-          }
-          themeUtil.changeThemeColor(themeStore.themeColor, themeScheme)
-        }
-      } catch (e) {
-      }
-    },
-    setLanguage (lang) {
-      this.$i18n.locale = lang
-      switch (lang) {
-        case 'CN':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
-          break
-        case 'HK':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
-          break
-        case 'US':
-        default:
-          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
-          break
-      }
-    },
-    setHtmlTitle () {
-      // 微应用下不设置title
-      if (window.__MICRO_APP_ENVIRONMENT__) {
-        return
-      }
-      const route = this.$route
-      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
-      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
-    },
-    popContainer () {
-      return document.getElementById('popContainer')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-#id {
-}
-</style>
-<style lang="less">
-@import "./font-style/font.css";
-
-body {
-  font-family: 'PingFangSC-Regular-woff2', 'Microsoft YaHei UI', serif !important;
-}
-
-.water-mark-wrap {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  z-index: 9999;
-  pointer-events: none;
-  top: 0;
-  left: 0;
-  display: flex;
-  overflow: hidden;
-  flex-wrap: wrap;
-}
-
-.water-word {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  color: rgba(8, 8, 8, 0.1);
-  transform: rotate(-45deg);
-  user-select: none;
-}
-</style>
+<template>
+  <a-config-provider :locale="locale" :get-popup-container="popContainer">
+    <router-view/>
+  </a-config-provider>
+</template>
+
+<script>
+import { enquireScreen } from '@vue2-client/utils/util'
+import { mapState, mapMutations } from 'vuex'
+import themeUtil from '@vue2-client/utils/themeUtil'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+import { setSystemVersion } from '@vue2-client/utils/request'
+import waterMark from '@vue2-client/utils/waterMark'
+import { isMicroAppEnv } from '@vue2-client/utils/microAppUtils'
+
+export default {
+  name: 'App',
+  data () {
+    return {
+      locale: {}
+    }
+  },
+  created () {
+    this.setHtmlTitle()
+    this.setLanguage(this.lang)
+    enquireScreen(isMobile => this.setDevice(isMobile))
+  },
+  mounted () {
+    this.setWeekModeTheme(this.weekMode)
+    const configStr = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    if (configStr) {
+      const config = JSON.parse(configStr)
+      if (config?.$globalProp?.environment === 'dev') {
+        // 设置水印
+        waterMark('开发环境')
+      }
+    }
+    // 设置系统版本
+    setSystemVersion(this.compatible)
+    // 获取基座应用的信息进行初始化
+    this.setMicroApp()
+  },
+  watch: {
+    weekMode (val) {
+      this.setWeekModeTheme(val)
+    },
+    lang (val) {
+      this.setLanguage(val)
+      this.setHtmlTitle()
+    },
+    $route () {
+      this.setHtmlTitle()
+    },
+    'theme.mode': {
+      immediate: true,
+      handler: function (val) {
+        this.changeThemeMode(val)
+      }
+    },
+    'theme.color': {
+      immediate: true,
+      handler: function (val) {
+        this.changeThemeColor(val)
+      }
+    },
+    layout: function () {
+      window.dispatchEvent(new Event('resize'))
+    }
+  },
+  computed: {
+    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang', 'compatible'])
+  },
+  methods: {
+    ...mapMutations('setting', ['setDevice']),
+    changeThemeColor (val) {
+      if (process.env.NODE_ENV === 'production') {
+        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+      } else {
+        console.info('为保证构建性能，关闭开发环境下的主题色切换')
+      }
+    },
+    changeThemeMode (val) {
+      if (process.env.NODE_ENV === 'production') {
+        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
+      } else {
+        console.info('为保证构建性能，关闭开发环境下的主题模式切换')
+      }
+    },
+    setWeekModeTheme (weekMode) {
+      if (weekMode) {
+        document.body.classList.add('week-mode')
+      } else {
+        document.body.classList.remove('week-mode')
+      }
+    },
+    setMicroApp () {
+      let baseApp = '/login'
+      let queryData = {}
+      const that = this
+      if (isMicroAppEnv()) {
+        const data = window.microApp.getData() // 获取主应用下发的data数据
+        if (data.baseroute) {
+          baseApp = data.baseroute
+        } // 获取主应用下发的data数据
+        if (data.queryData) {
+          queryData = data.queryData
+        }
+        this.setMicroAppTheme(data.themeStore)
+        window.microApp.addDataListener((_data) => {
+          if (_data.baseroute) {
+            baseApp = _data.baseroute
+          }
+          that.setMicroAppTheme(_data.themeStore)
+        })
+        this.$router.replace({ path: baseApp, query: queryData })
+      }
+    },
+    setMicroAppTheme (themeStore) {
+      try {
+        let themeScheme = 'dark'
+        if (themeStore && themeStore.themeColor && themeStore.themeScheme) {
+          if (themeStore.themeScheme === 'dark') {
+            themeScheme = 'night'
+          }
+          themeUtil.changeThemeColor(themeStore.themeColor, themeScheme)
+        }
+      } catch (e) {
+      }
+    },
+    setLanguage (lang) {
+      this.$i18n.locale = lang
+      switch (lang) {
+        case 'CN':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
+          break
+        case 'HK':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
+          break
+        case 'US':
+        default:
+          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
+          break
+      }
+    },
+    setHtmlTitle () {
+      // 微应用下不设置title
+      if (window.__MICRO_APP_ENVIRONMENT__) {
+        return
+      }
+      const route = this.$route
+      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
+      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
+    },
+    popContainer () {
+      return document.getElementById('popContainer')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+#id {
+}
+</style>
+<style lang="less">
+@import "./font-style/font.css";
+
+body {
+  font-family: 'PingFangSC-Regular-woff2', 'Microsoft YaHei UI', serif !important;
+}
+
+.water-mark-wrap {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  pointer-events: none;
+  top: 0;
+  left: 0;
+  display: flex;
+  overflow: hidden;
+  flex-wrap: wrap;
+}
+
+.water-word {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  color: rgba(8, 8, 8, 0.1);
+  transform: rotate(-45deg);
+  user-select: none;
+}
+</style>

package/src/base-client/components/common/XFormCol/XFormCol.vue

@@ -108,7 +108,7 @@ export default {
   methods: {
     getFlex (parentWidth, flex = defaultFlex) {
       if (parentWidth === 0) {
-        return flex.xs
+        return flex.md
       }
       if (parentWidth < BREAKPOINTS.xs) return flex.xs
       if (parentWidth < BREAKPOINTS.sm) return flex.sm

package/src/components/cache/AKeepAlive.js

@@ -1,172 +1,179 @@
-import { isDef, isRegExp, remove } from '@vue2-client/utils/util'
-
-const patternTypes = [String, RegExp, Array]
-
-function matches (pattern, name) {
-  if (Array.isArray(pattern)) {
-    if (pattern.indexOf(name) > -1) {
-      return true
-    } else {
-      for (const item of pattern) {
-        if (isRegExp(item) && item.test(name)) {
-          return true
-        }
-      }
-      return false
-    }
-  } else if (typeof pattern === 'string') {
-    return pattern.split(',').indexOf(name) > -1
-  } else if (isRegExp(pattern)) {
-    return pattern.test(name)
-  }
-  /* istanbul ignore next */
-  return false
-}
-
-function getComponentName (opts) {
-  return opts && (opts.Ctor.options.name || opts.tag)
-}
-
-function getComponentKey (vnode) {
-  const { componentOptions, key } = vnode
-  return key == null
-    ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
-    : key + componentOptions.Ctor.cid
-}
-
-function getFirstComponentChild (children) {
-  if (Array.isArray(children)) {
-    for (let i = 0; i < children.length; i++) {
-      const c = children[i]
-      if (isDef(c) && (isDef(c.componentOptions) || c.isAsyncPlaceholder)) {
-        return c
-      }
-    }
-  }
-}
-
-function pruneCache (keepAliveInstance, filter) {
-  const { cache, keys, _vnode } = keepAliveInstance
-  for (const key in cache) {
-    const cachedNode = cache[key]
-    if (cachedNode) {
-      const name = getComponentName(cachedNode.componentOptions)
-      const componentKey = getComponentKey(cachedNode)
-      if (name && !filter(name, componentKey)) {
-        pruneCacheEntry(cache, key, keys, _vnode)
-      }
-    }
-  }
-}
-
-function pruneCacheEntry2 (cache, key, keys) {
-  const cached = cache[key]
-  if (cached) {
-    cached.componentInstance.$destroy()
-  }
-  cache[key] = null
-  remove(keys, key)
-}
-
-function pruneCacheEntry (cache, key, keys, current) {
-  const cached = cache[key]
-  if (cached && (!current || cached.tag !== current.tag)) {
-    cached.componentInstance.$destroy()
-  }
-  cache[key] = null
-  remove(keys, key)
-}
-
-export default {
-  name: 'AKeepAlive',
-  abstract: true,
-  model: {
-    prop: 'clearCaches',
-    event: 'clear'
-  },
-  props: {
-    include: patternTypes,
-    exclude: patternTypes,
-    excludeKeys: patternTypes,
-    max: [String, Number],
-    clearCaches: Array
-  },
-  watch: {
-    clearCaches: function (val) {
-      if (val && val.length > 0) {
-        const { cache, keys } = this
-        val.forEach(key => {
-          pruneCacheEntry2(cache, key, keys)
-        })
-        this.$emit('clear', [])
-      }
-    }
-  },
-
-  created () {
-    this.cache = Object.create(null)
-    this.keys = []
-  },
-
-  destroyed () {
-    for (const key in this.cache) {
-      pruneCacheEntry(this.cache, key, this.keys)
-    }
-  },
-
-  mounted () {
-    this.$watch('include', val => {
-      pruneCache(this, (name) => matches(val, name))
-    })
-    this.$watch('exclude', val => {
-      pruneCache(this, (name) => !matches(val, name))
-    })
-    this.$watch('excludeKeys', val => {
-      pruneCache(this, (name, key) => !matches(val, key))
-    })
-  },
-
-  render () {
-    const slot = this.$slots.default
-    const vnode = getFirstComponentChild(slot)
-    const componentOptions = vnode && vnode.componentOptions
-    if (componentOptions) {
-      // check pattern
-      const name = getComponentName(componentOptions)
-      const componentKey = getComponentKey(vnode)
-      const { include, exclude, excludeKeys } = this
-      if (
-        // not included
-        (include && (!name || !matches(include, name))) ||
-        // excluded
-        (exclude && name && matches(exclude, name)) ||
-        (excludeKeys && componentKey && matches(excludeKeys, componentKey))
-      ) {
-        return vnode
-      }
-
-      const { cache, keys } = this
-      const key = vnode.key == null
-        // same constructor may get registered as different local components
-        // so cid alone is not enough (#3269)
-        ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
-        : vnode.key + componentOptions.Ctor.cid
-      if (cache[key]) {
-        vnode.componentInstance = cache[key].componentInstance
-        // make current key freshest
-        remove(keys, key)
-        keys.push(key)
-      } else {
-        cache[key] = vnode
-        keys.push(key)
-        // prune oldest entry
-        if (this.max && keys.length > parseInt(this.max)) {
-          pruneCacheEntry(cache, keys[0], keys, this._vnode)
-        }
-      }
-
-      vnode.data.keepAlive = true
-    }
-    return vnode || (slot && slot[0])
-  }
-}
+import { isDef, isRegExp, remove } from '@vue2-client/utils/util'
+
+const patternTypes = [String, RegExp, Array]
+
+function matches (pattern, name) {
+  if (Array.isArray(pattern)) {
+    if (pattern.indexOf(name) > -1) {
+      return true
+    } else {
+      for (const item of pattern) {
+        if (isRegExp(item) && item.test(name)) {
+          return true
+        }
+      }
+      return false
+    }
+  } else if (typeof pattern === 'string') {
+    return pattern.split(',').indexOf(name) > -1
+  } else if (isRegExp(pattern)) {
+    return pattern.test(name)
+  }
+  /* istanbul ignore next */
+  return false
+}
+
+function getComponentName (opts) {
+  return opts && (opts.Ctor.options.name || opts.tag)
+}
+
+function getComponentKey (vnode) {
+  const { componentOptions, key } = vnode
+  return key == null
+    ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
+    : key + `::${componentOptions.Ctor.cid}`
+}
+
+function getFirstComponentChild (children) {
+  if (Array.isArray(children)) {
+    for (let i = 0; i < children.length; i++) {
+      const c = children[i]
+      if (isDef(c) && (isDef(c.componentOptions) || c.isAsyncPlaceholder)) {
+        return c
+      }
+    }
+  }
+}
+
+function pruneCache (keepAliveInstance, filter) {
+  const { cache, keys, _vnode } = keepAliveInstance
+  for (const key in cache) {
+    const cachedNode = cache[key]
+    if (cachedNode) {
+      const name = getComponentName(cachedNode.componentOptions)
+      const componentKey = getComponentKey(cachedNode)
+      if (name && !filter(name, componentKey)) {
+        pruneCacheEntry(cache, key, keys, _vnode)
+      }
+    }
+  }
+}
+
+function pruneCacheEntry2 (cache, key, keys) {
+  const cached = cache[key]
+  if (cached) {
+    cached.componentInstance.$destroy()
+  }
+  cache[key] = null
+  remove(keys, key)
+}
+
+function pruneCacheEntry (cache, key, keys, current) {
+  const cached = cache[key]
+  if (cached && (!current || cached.tag !== current.tag)) {
+    cached.componentInstance.$destroy()
+  }
+  cache[key] = null
+  remove(keys, key)
+}
+
+export default {
+  name: 'AKeepAlive',
+  abstract: true,
+  model: {
+    prop: 'clearCaches',
+    event: 'clear'
+  },
+  props: {
+    include: patternTypes,
+    exclude: patternTypes,
+    excludeKeys: patternTypes,
+    max: [String, Number],
+    clearCaches: Array
+  },
+  watch: {
+    clearCaches: function (val) {
+      if (val && val.length > 0) {
+        const { cache, keys } = this
+        // 遍历所有缓存的 keys，找到以传入的 key 开头的项进行清除
+        keys.forEach(cacheKey => {
+          val.forEach(targetKey => {
+            // 检查缓存的 key 是否以目标 key 开头
+            console.warn('clearCaches:', cacheKey, targetKey, cacheKey.includes(`${targetKey}::`) || cacheKey.startsWith(targetKey))
+            if (cacheKey.includes(`${targetKey}::`) || cacheKey.startsWith(targetKey)) {
+              pruneCacheEntry2(cache, cacheKey, keys)
+            }
+          })
+        })
+        this.$emit('clear', [])
+      }
+    }
+  },
+
+  created () {
+    this.cache = Object.create(null)
+    this.keys = []
+  },
+
+  destroyed () {
+    for (const key in this.cache) {
+      pruneCacheEntry(this.cache, key, this.keys)
+    }
+  },
+
+  mounted () {
+    this.$watch('include', val => {
+      pruneCache(this, (name) => matches(val, name))
+    })
+    this.$watch('exclude', val => {
+      pruneCache(this, (name) => !matches(val, name))
+    })
+    this.$watch('excludeKeys', val => {
+      pruneCache(this, (name, key) => !matches(val, key))
+    })
+  },
+
+  render () {
+    const slot = this.$slots.default
+    const vnode = getFirstComponentChild(slot)
+    const componentOptions = vnode && vnode.componentOptions
+    if (componentOptions) {
+      // check pattern
+      const name = getComponentName(componentOptions)
+      const componentKey = getComponentKey(vnode)
+      const { include, exclude, excludeKeys } = this
+      if (
+        // not included
+        (include && (!name || !matches(include, name))) ||
+        // excluded
+        (exclude && name && matches(exclude, name)) ||
+        (excludeKeys && componentKey && matches(excludeKeys, componentKey))
+      ) {
+        return vnode
+      }
+
+      const { cache, keys } = this
+      const key = vnode.key == null
+        // same constructor may get registered as different local components
+        // so cid alone is not enough (#3269)
+        ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
+        : vnode.key + `::${componentOptions.Ctor.cid}`
+      if (cache[key]) {
+        vnode.componentInstance = cache[key].componentInstance
+        // make current key freshest
+        remove(keys, key)
+        keys.push(key)
+      } else {
+        cache[key] = vnode
+        keys.push(key)
+        // prune oldest entry
+        if (this.max && keys.length > parseInt(this.max)) {
+          pruneCacheEntry(cache, keys[0], keys, this._vnode)
+        }
+      }
+
+      vnode.data.keepAlive = true
+    }
+    return vnode || (slot && slot[0])
+  }
+}

package/src/layouts/BlankView.vue

@@ -1,78 +1,78 @@
-<template>
-  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <a-keep-alive :exclude-keys="excludeKeys" v-if="cachePage" v-model="clearCaches">
-      <router-view v-if="!refreshing" :key="$route.fullPath" />
-    </a-keep-alive>
-    <router-view v-else-if="!refreshing" />
-  </page-toggle-transition>
-</template>
-
-<script>
-import PageToggleTransition from '../components/transition/PageToggleTransition'
-import { mapState } from 'vuex'
-import AKeepAlive from '@vue2-client/components/cache/AKeepAlive'
-
-export default {
-  name: 'BlankView',
-  components: { PageToggleTransition, AKeepAlive },
-  data () {
-    return {
-      clearCaches: [],
-      excludeKeys: [],
-      refreshing: false
-    }
-  },
-  computed: {
-    ...mapState('setting', ['cachePage', 'animate'])
-  },
-  created () {
-    this.loadCacheConfig(this.$router?.options?.routes)
-  },
-  mounted () {
-    if (window.__MICRO_APP_ENVIRONMENT__) {
-      window.microApp.addDataListener((data) => {
-        if (data.type === 'refresh') {
-          this.refresh()
-        } else if (data.type === 'clearCache') {
-          this.clearCache(data.key)
-        }
-      })
-    }
-  },
-  methods: {
-    // 加载需要排除缓存的路由配置
-    loadCacheConfig (routes, pCache = true) {
-      routes.forEach(item => {
-        const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
-        if (!cacheAble) {
-          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
-        }
-        if (item.children) {
-          this.loadCacheConfig(item.children, cacheAble)
-        }
-      })
-    },
-    // 刷新页面方法
-    refresh () {
-      this.refreshing = true
-      setTimeout(() => {
-        this.refreshing = false
-      }, 200)
-    },
-    // 清除特定页面的缓存
-    clearCache (key) {
-      this.clearCaches = [key]
-    }
-  },
-  watch: {
-    '$router.options.routes': function (val) {
-      this.excludeKeys = []
-      this.loadCacheConfig(val)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
+    <a-keep-alive :exclude-keys="excludeKeys" v-if="cachePage" v-model="clearCaches">
+      <router-view v-if="!refreshing" :key="$route.path" />
+    </a-keep-alive>
+    <router-view v-else-if="!refreshing" />
+  </page-toggle-transition>
+</template>
+
+<script>
+import PageToggleTransition from '../components/transition/PageToggleTransition'
+import { mapState } from 'vuex'
+import AKeepAlive from '@vue2-client/components/cache/AKeepAlive'
+
+export default {
+  name: 'BlankView',
+  components: { PageToggleTransition, AKeepAlive },
+  data () {
+    return {
+      clearCaches: [],
+      excludeKeys: [],
+      refreshing: false
+    }
+  },
+  computed: {
+    ...mapState('setting', ['cachePage', 'animate'])
+  },
+  created () {
+    this.loadCacheConfig(this.$router?.options?.routes)
+  },
+  mounted () {
+    if (window.__MICRO_APP_ENVIRONMENT__) {
+      window.microApp.addDataListener((data) => {
+        if (data.type === 'refresh') {
+          this.refresh()
+        } else if (data.type === 'clearCache' && data.key) {
+          this.clearCache(data.key)
+        }
+      })
+    }
+  },
+  methods: {
+    // 加载需要排除缓存的路由配置
+    loadCacheConfig (routes, pCache = true) {
+      routes.forEach(item => {
+        const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
+        if (!cacheAble) {
+          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
+        }
+        if (item.children) {
+          this.loadCacheConfig(item.children, cacheAble)
+        }
+      })
+    },
+    // 刷新页面方法
+    refresh () {
+      this.refreshing = true
+      setTimeout(() => {
+        this.refreshing = false
+      }, 200)
+    },
+    // 清除特定页面的缓存
+    clearCache (resultKeys) {
+      this.clearCaches = resultKeys
+    }
+  },
+  watch: {
+    '$router.options.routes': function (val) {
+      this.excludeKeys = []
+      this.loadCacheConfig(val)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/router/guards.js

@@ -20,7 +20,7 @@ NProgress.configure({ showSpinner: false })
  * @param form
  * @param next
  */
-const progressStart = (to, from, next) => {
+const progressStart = (to, form, next) => {
   // start progress bar
   if (!NProgress.isStarted()) {
     NProgress.start()
@@ -35,7 +35,10 @@ const progressStart = (to, from, next) => {
  * @param next
  * @param options
  */
-const loginGuard = (to, from, next, options) => {
+const loginGuard = (to, form, next, options) => {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: '子应用发送给主应用的数据', to: to.path })
+  }
   const urlParams = new URLSearchParams(window.location.search)
   const LoginTicket = urlParams.get('LoginTicket')
   // 如果是需要我们自己登陆的项目
@@ -169,12 +172,6 @@ const loginGuard = (to, from, next, options) => {
     if (!Vue.$store.state?.setting?.menuData || Vue.$store.state?.setting?.menuData?.length === 0) {
       loadRoutes(funcToRouter(v4LoginData.functions))
     }
-
-    if (window.__MICRO_APP_ENVIRONMENT__) {
-      window.microApp.forceDispatch({ type: 'microMounted', appName: window.__MICRO_APP_NAME__ })
-    }
-
-    console.warn(to.fullPath, from.fullPath)
     next()
   } else {
     const { store, message } = options
@@ -205,7 +202,7 @@ const loginGuard = (to, from, next, options) => {
  * @param next
  * @param options
  */
-const authorityGuard = (to, from, next, options) => {
+const authorityGuard = (to, form, next, options) => {
   const { store, message } = options
   const permissions = store.getters['account/permissions']
   const roles = store.getters['account/roles']
@@ -251,9 +248,6 @@ const redirectGuard = (to, from, next, options) => {
 
 /**
  * 进度条结束
- * @param to
- * @param form
- * @param options
  */
 const progressDone = () => {
   // finish progress bar

package/src/utils/microAppUtils.js

@@ -6,6 +6,15 @@ export function getWindow () {
   return window
 }
 
+/**
+ * 获取当前子应用的 name
+ * @returns {string} 子应用的 name
+ */
+export function getMicroAppName () {
+  // 如果在微前端环境中运行，返回应用名称，否则返回 undefined
+  return window.__MICRO_APP_ENVIRONMENT__ ? window.__MICRO_APP_NAME__ : undefined
+}
+
 /**
  * 判断是否处于 microApp 环境
  * @returns {boolean} 如果在 microApp 环境下返回 true，否则返回 false