vue2-client 1.10.33 → 1.10.35

package/src/components/cache/AKeepAlive.js

@@ -1,179 +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
-        // 遍历所有缓存的 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])
-  }
-}
+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.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>
+<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/pages/ReportGrid/index.vue

@@ -1,76 +1,76 @@
-<template>
-  <div id="test" v-if="showReport">
-    <XReport
-      @updateImg="updateImg"
-      ref="main"
-      :use-oss-for-img="false"
-      config-name="medicineMouldCover"
-      server-name="af-his"
-      :show-img-in-cell="true"
-      :display-only="displayOnly"
-      :edit-mode="false"
-      :show-save-button="false"
-      :dont-format="true"/>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
-// eslint-disable-next-line no-unused-vars
-import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
-
-export default {
-  name: 'Example',
-  components: {
-    XReport
-  },
-  mounted () {
-    console.log(this.$route)
-  },
-  data () {
-    return {
-      test: {
-        title: {
-          type: 'titleKey',
-          value: 'f_type'
-        },
-        designMode: 'json',
-      },
-      total: 1,
-      registerMap: [],
-      displayOnly: true,
-      showReport: true
-    }
-  },
-  methods: {
-    updateImg (data) {
-      console.warn('demo', data)
-    },
-    testExport () {
-      this.showReport = false
-      this.displayOnly = true
-      this.$nextTick(() => {
-        this.showReport = true
-        setTimeout(() => {
-          exportHTMLNodeToPDF('123', '#test')
-          this.showReport = false
-          this.displayOnly = false
-          this.$nextTick(() => {
-            this.showReport = true
-          })
-        }, 500)
-      })
-    },
-    testSave () {
-      const result = []
-      this.registerMap.forEach(item => {
-        result.push(item.exportData())
-      })
-      console.warn('save', result)
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test" v-if="showReport">
+    <XReport
+      @updateImg="updateImg"
+      ref="main"
+      :use-oss-for-img="false"
+      config-name="medicineMouldCover"
+      server-name="af-his"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"/>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
+// eslint-disable-next-line no-unused-vars
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
+
+export default {
+  name: 'Example',
+  components: {
+    XReport
+  },
+  mounted () {
+    console.log(this.$route)
+  },
+  data () {
+    return {
+      test: {
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
+        },
+        designMode: 'json',
+      },
+      total: 1,
+      registerMap: [],
+      displayOnly: true,
+      showReport: true
+    }
+  },
+  methods: {
+    updateImg (data) {
+      console.warn('demo', data)
+    },
+    testExport () {
+      this.showReport = false
+      this.displayOnly = true
+      this.$nextTick(() => {
+        this.showReport = true
+        setTimeout(() => {
+          exportHTMLNodeToPDF('123', '#test')
+          this.showReport = false
+          this.displayOnly = false
+          this.$nextTick(() => {
+            this.showReport = true
+          })
+        }, 500)
+      })
+    },
+    testSave () {
+      const result = []
+      this.registerMap.forEach(item => {
+        result.push(item.exportData())
+      })
+      console.warn('save', result)
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>