vue2-client 1.15.86 → 1.15.88

package/src/layouts/BlankView.vue

@@ -1,79 +1,79 @@
-<template>
-  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <a-keep-alive :exclude-keys="excludeKeys" v-model="clearCaches">
-      <router-view v-if="!refreshing" :key="$route.path" />
-    </a-keep-alive>
-  </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,
-      isMicroAppEnv: false
-    }
-  },
-  computed: {
-    ...mapState('setting', ['cachePage', 'animate'])
-  },
-  created () {
-    this.loadCacheConfig(this.$router?.options?.routes)
-  },
-  mounted () {
-    if (window.__MICRO_APP_ENVIRONMENT__) {
-      this.isMicroAppEnv = true
-      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-model="clearCaches">
+      <router-view v-if="!refreshing" :key="$route.path" />
+    </a-keep-alive>
+  </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,
+      isMicroAppEnv: false
+    }
+  },
+  computed: {
+    ...mapState('setting', ['cachePage', 'animate'])
+  },
+  created () {
+    this.loadCacheConfig(this.$router?.options?.routes)
+  },
+  mounted () {
+    if (window.__MICRO_APP_ENVIRONMENT__) {
+      this.isMicroAppEnv = true
+      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/layouts/ComponentLayoutOne.vue

@@ -1,47 +1,47 @@
-<template>
-  <div id="ComponentLayoutOne">
-    <a-layout>
-      <a-layout-sider v-bind="siderProps">
-        <slot name="left"></slot>
-      </a-layout-sider>
-      <a-layout>
-        <slot></slot>
-      </a-layout>
-    </a-layout>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'ComponentLayoutOne',
-    props: {
-      // Layout.Sider props对象
-      siderProps: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {}
-    },
-    created () {
-    },
-    mounted () {
-    },
-    methods: {}
-  }
-</script>
-
-<style lang="less">
-  #ComponentLayoutOne {
-    .ant-layout-sider {
-      .ant-layout-sider-zero-width-trigger {
-        top: 50%;
-        background-color: @shadow-color;
-        z-index: 2;
-      }
-    }
-  }
-</style>
+<template>
+  <div id="ComponentLayoutOne">
+    <a-layout>
+      <a-layout-sider v-bind="siderProps">
+        <slot name="left"></slot>
+      </a-layout-sider>
+      <a-layout>
+        <slot></slot>
+      </a-layout>
+    </a-layout>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'ComponentLayoutOne',
+    props: {
+      // Layout.Sider props对象
+      siderProps: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+  #ComponentLayoutOne {
+    .ant-layout-sider {
+      .ant-layout-sider-zero-width-trigger {
+        top: 50%;
+        background-color: @shadow-color;
+        z-index: 2;
+      }
+    }
+  }
+</style>

package/src/layouts/GridView.vue

@@ -1,43 +1,43 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        v-if="configName"
-        :use-oss-for-img="false"
-        :config-name="configName"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :dont-format="true"/>
-      <a-empty v-else/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
-
-export default {
-  name: 'GridView',
-  components: {
-    XReport
-  },
-  mounted () {
-    // 获取当前路由中的meta
-    this.configName = this.$router.currentRoute.meta.configName
-    this.nothing = !this.configName
-  },
-  data () {
-    return {
-      configName: '',
-      nothing: false
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        v-if="configName"
+        :use-oss-for-img="false"
+        :config-name="configName"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+      <a-empty v-else/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
+
+export default {
+  name: 'GridView',
+  components: {
+    XReport
+  },
+  mounted () {
+    // 获取当前路由中的meta
+    this.configName = this.$router.currentRoute.meta.configName
+    this.nothing = !this.configName
+  },
+  data () {
+    return {
+      configName: '',
+      nothing: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/layouts/PageView.vue

@@ -1,55 +1,55 @@
-<template>
-  <page-layout :desc="desc" :linkList="linkList">
-    <div v-if="this.extraImage && !isMobile" slot="extra" class="extraImg">
-      <img :src="extraImage" alt="extraImage"/>
-    </div>
-    <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-      <router-view ref="page" />
-    </page-toggle-transition>
-  </page-layout>
-</template>
-
-<script>
-import PageLayout from './PageLayout'
-import PageToggleTransition from '../components/transition/PageToggleTransition'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'PageView',
-  components: { PageToggleTransition, PageLayout },
-  data () {
-    return {
-      page: {}
-    }
-  },
-  computed: {
-    ...mapState('setting', ['isMobile', 'multiPage', 'animate']),
-    desc () {
-      return this.page.desc
-    },
-    linkList () {
-      return this.page.linkList
-    },
-    extraImage () {
-      return this.page.extraImage
-    }
-  },
-  mounted () {
-    this.page = this.$refs.page
-  },
-  updated () {
-    this.page = this.$refs.page
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .extraImg{
-    margin-top: -60px;
-    text-align: center;
-    width: 195px;
-    img{
-      width: 100%;
-    }
-  }
-</style>
+<template>
+  <page-layout :desc="desc" :linkList="linkList">
+    <div v-if="this.extraImage && !isMobile" slot="extra" class="extraImg">
+      <img :src="extraImage" alt="extraImage"/>
+    </div>
+    <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
+      <router-view ref="page" />
+    </page-toggle-transition>
+  </page-layout>
+</template>
+
+<script>
+import PageLayout from './PageLayout'
+import PageToggleTransition from '../components/transition/PageToggleTransition'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'PageView',
+  components: { PageToggleTransition, PageLayout },
+  data () {
+    return {
+      page: {}
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile', 'multiPage', 'animate']),
+    desc () {
+      return this.page.desc
+    },
+    linkList () {
+      return this.page.linkList
+    },
+    extraImage () {
+      return this.page.extraImage
+    }
+  },
+  mounted () {
+    this.page = this.$refs.page
+  },
+  updated () {
+    this.page = this.$refs.page
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .extraImg{
+    margin-top: -60px;
+    text-align: center;
+    width: 195px;
+    img{
+      width: 100%;
+    }
+  }
+</style>

package/src/layouts/footer/PageFooter.vue

@@ -1,49 +1,49 @@
-<template>
-  <div class="footer">
-    <div class="links">
-      <a target="_blank" :key="index" :href="item.link ? item.link : 'javascript: void(0)'" v-for="(item, index) in linkList">
-        <a-icon v-if="item.icon" :type="item.icon"/>{{ item.name }}
-      </a>
-    </div>
-    <div class="copyright" v-if="!copyrightStyle">
-      Copyright<a-icon type="copyright" />{{ copyright }}
-    </div>
-    <div class="copyright2" :style="copyrightStyle" v-else>
-      {{ copyright }}
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'PageFooter',
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['copyright', 'linkList', 'copyrightStyle']
-}
-</script>
-
-<style lang="less" scoped>
-  .footer{
-    padding: 48px 16px 24px;
-    /*margin: 48px 0 24px;*/
-    text-align: center;
-    .copyright{
-      color: @text-color-second;
-      font-size: 14px;
-      i {
-          margin: 0 4px;
-      }
-    }
-    .links{
-      margin-bottom: 8px;
-      a:not(:last-child) {
-        margin-right: 40px;
-      }
-      a{
-        color: @text-color-second;
-        -webkit-transition: all .3s;
-        transition: all .3s;
-      }
-    }
-  }
-</style>
+<template>
+  <div class="footer">
+    <div class="links">
+      <a target="_blank" :key="index" :href="item.link ? item.link : 'javascript: void(0)'" v-for="(item, index) in linkList">
+        <a-icon v-if="item.icon" :type="item.icon"/>{{ item.name }}
+      </a>
+    </div>
+    <div class="copyright" v-if="!copyrightStyle">
+      Copyright<a-icon type="copyright" />{{ copyright }}
+    </div>
+    <div class="copyright2" :style="copyrightStyle" v-else>
+      {{ copyright }}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PageFooter',
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['copyright', 'linkList', 'copyrightStyle']
+}
+</script>
+
+<style lang="less" scoped>
+  .footer{
+    padding: 48px 16px 24px;
+    /*margin: 48px 0 24px;*/
+    text-align: center;
+    .copyright{
+      color: @text-color-second;
+      font-size: 14px;
+      i {
+          margin: 0 4px;
+      }
+    }
+    .links{
+      margin-bottom: 8px;
+      a:not(:last-child) {
+        margin-right: 40px;
+      }
+      a{
+        color: @text-color-second;
+        -webkit-transition: all .3s;
+        transition: all .3s;
+      }
+    }
+  }
+</style>

package/src/layouts/header/HeaderAvatar.vue

@@ -1,64 +1,64 @@
-<template>
-  <a-dropdown>
-    <div class="header-avatar" style="cursor: pointer">
-      <a-avatar class="avatar" size="small" shape="circle" :src="user.avatar"/>
-      <span class="name">{{ user.name }}</span>
-    </div>
-    <a-menu :class="['avatar-menu']" slot="overlay">
-      <a-menu-item>
-        <a-icon type="user" />
-        <span>个人中心</span>
-      </a-menu-item>
-      <a-menu-item @click="handleToSettings">
-        <a-icon type="setting"/>
-        <span>设置</span>
-      </a-menu-item>
-      <a-menu-divider />
-      <a-menu-item @click="logout">
-        <a-icon style="margin-right: 8px;" type="poweroff" />
-        <span>退出登录</span>
-      </a-menu-item>
-    </a-menu>
-  </a-dropdown>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { logout } from '@vue2-client/services/user'
-
-export default {
-  name: 'HeaderAvatar',
-  computed: {
-    ...mapGetters('account', ['user'])
-  },
-  methods: {
-    handleToSettings () {
-      this.$router.push({ path: '/system/settings' })
-    },
-    logout () {
-      logout().finally(res => {
-        location.href = '/login'
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-avatar{
-    display: inline-flex;
-    .avatar, .name{
-      align-self: center;
-    }
-    .avatar{
-      margin-right: 8px;
-    }
-    .name{
-      font-weight: 500;
-    }
-  }
-  .avatar-menu{
-    width: 150px;
-  }
-
-</style>
+<template>
+  <a-dropdown>
+    <div class="header-avatar" style="cursor: pointer">
+      <a-avatar class="avatar" size="small" shape="circle" :src="user.avatar"/>
+      <span class="name">{{ user.name }}</span>
+    </div>
+    <a-menu :class="['avatar-menu']" slot="overlay">
+      <a-menu-item>
+        <a-icon type="user" />
+        <span>个人中心</span>
+      </a-menu-item>
+      <a-menu-item @click="handleToSettings">
+        <a-icon type="setting"/>
+        <span>设置</span>
+      </a-menu-item>
+      <a-menu-divider />
+      <a-menu-item @click="logout">
+        <a-icon style="margin-right: 8px;" type="poweroff" />
+        <span>退出登录</span>
+      </a-menu-item>
+    </a-menu>
+  </a-dropdown>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { logout } from '@vue2-client/services/user'
+
+export default {
+  name: 'HeaderAvatar',
+  computed: {
+    ...mapGetters('account', ['user'])
+  },
+  methods: {
+    handleToSettings () {
+      this.$router.push({ path: '/system/settings' })
+    },
+    logout () {
+      logout().finally(res => {
+        location.href = '/login'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .header-avatar{
+    display: inline-flex;
+    .avatar, .name{
+      align-self: center;
+    }
+    .avatar{
+      margin-right: 8px;
+    }
+    .name{
+      font-weight: 500;
+    }
+  }
+  .avatar-menu{
+    width: 150px;
+  }
+
+</style>