vue2-client 1.6.19 → 1.6.21

package/src/layouts/SinglePageView.vue

@@ -1,111 +1,111 @@
-<template>
-  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <template v-if="login">
-      <a-spin tip="加载中，马上好" :spinning="!isLoaded">
-        <a-card>
-          <iframe
-            ref="singlepage"
-            :src="url"
-            :name="this.fullPath"
-            class="single-page-iframe"
-            @load="load">
-          </iframe>
-        </a-card>
-      </a-spin>
-    </template>
-  </page-toggle-transition>
-</template>
-
-<script>
-import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import { mapState, mapMutations } from 'vuex'
-import { CASLogin, doOtherValidate } from '@vue2-client/services/api/cas'
-
-export default {
-  name: 'SinglePageView',
-  components: { PageToggleTransition },
-  props: {
-    singlePageUrl: {
-      type: String,
-      default: ''
-    },
-    fullPath: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      iframe: null,
-      url: '',
-      isLoaded: false,
-    }
-  },
-  computed: {
-    ...mapState('setting', ['animate', 'iframeSrc']),
-    ...mapState('account', ['login'])
-  },
-  created () {
-    this.isLoaded = false
-    if (this.singlePageUrl.indexOf('sso:') !== -1) {
-      const serviceKey = this.singlePageUrl.substring(4)
-      CASLogin(serviceKey, true).then(res => {
-        const redirectUrl = res.redirectUrl
-        if (redirectUrl.indexOf('logic@') !== -1) {
-          const logicName = redirectUrl.substring(6)
-          doOtherValidate(logicName, res.st, serviceKey).then(validateRes => {
-            this.url = validateRes.redirectUrl
-          })
-        } else {
-          const join = redirectUrl.split('?')[1] ? '&' : '?'
-          this.url = redirectUrl + join + 'ticket=' + res.st + '&timestrap=' + new Date().getTime()
-        }
-      }).catch(msg => {
-        console.warn(msg)
-        this.$message.error(msg)
-      })
-    } else {
-      this.url = this.iframeSrc
-    }
-  },
-  mounted () {
-    if (!this.login) {
-      this.setLogin(JSON.parse(sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)))
-    }
-    this.iframe = this.$refs.singlepage.contentWindow
-    this.path = this.$route.path
-  },
-  methods: {
-    ...mapMutations('account', ['setLogin']),
-    load () {
-      if (this.singlePageUrl.indexOf('sso:') === -1) {
-        const appdata = {
-          singleValues: this.$appdata.getSingleValues(),
-          params: this.$appdata.getParams()
-        }
-        const data = {
-          token: localStorage.getItem(ACCESS_TOKEN),
-          login: this.login,
-          appdata: appdata,
-          page: this.singlePageUrl
-        }
-        console.log('发送参数', data)
-        if (this.iframe) {
-          this.iframe.postMessage(data, '*')
-        }
-      }
-      this.$emit('load', this.fullPath)
-      this.isLoaded = true
-    }
-  }
-}
-</script>
-
-<style lang="less">
-.single-page-iframe {
-  width: 100%;
-  height: calc(100vh - 117px);
-  border: none;
-}
-</style>
+<template>
+  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
+    <template v-if="login">
+      <a-spin tip="加载中，马上好" :spinning="!isLoaded">
+        <a-card>
+          <iframe
+            ref="singlepage"
+            :src="url"
+            :name="this.fullPath"
+            class="single-page-iframe"
+            @load="load">
+          </iframe>
+        </a-card>
+      </a-spin>
+    </template>
+  </page-toggle-transition>
+</template>
+
+<script>
+import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import { mapState, mapMutations } from 'vuex'
+import { CASLogin, doOtherValidate } from '@vue2-client/services/api/cas'
+
+export default {
+  name: 'SinglePageView',
+  components: { PageToggleTransition },
+  props: {
+    singlePageUrl: {
+      type: String,
+      default: ''
+    },
+    fullPath: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      iframe: null,
+      url: '',
+      isLoaded: false,
+    }
+  },
+  computed: {
+    ...mapState('setting', ['animate', 'iframeSrc']),
+    ...mapState('account', ['login'])
+  },
+  created () {
+    this.isLoaded = false
+    if (this.singlePageUrl.indexOf('sso:') !== -1) {
+      const serviceKey = this.singlePageUrl.substring(4)
+      CASLogin(serviceKey, true).then(res => {
+        const redirectUrl = res.redirectUrl
+        if (redirectUrl.indexOf('logic@') !== -1) {
+          const logicName = redirectUrl.substring(6)
+          doOtherValidate(logicName, res.st, serviceKey).then(validateRes => {
+            this.url = validateRes.redirectUrl
+          })
+        } else {
+          const join = redirectUrl.split('?')[1] ? '&' : '?'
+          this.url = redirectUrl + join + 'ticket=' + res.st + '&timestrap=' + new Date().getTime()
+        }
+      }).catch(msg => {
+        console.warn(msg)
+        this.$message.error(msg)
+      })
+    } else {
+      this.url = this.iframeSrc
+    }
+  },
+  mounted () {
+    if (!this.login) {
+      this.setLogin(JSON.parse(sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)))
+    }
+    this.iframe = this.$refs.singlepage.contentWindow
+    this.path = this.$route.path
+  },
+  methods: {
+    ...mapMutations('account', ['setLogin']),
+    load () {
+      if (this.singlePageUrl.indexOf('sso:') === -1) {
+        const appdata = {
+          singleValues: this.$appdata.getSingleValues(),
+          params: this.$appdata.getParams()
+        }
+        const data = {
+          token: localStorage.getItem(ACCESS_TOKEN),
+          login: this.login,
+          appdata: appdata,
+          page: this.singlePageUrl
+        }
+        console.log('发送参数', data)
+        if (this.iframe) {
+          this.iframe.postMessage(data, '*')
+        }
+      }
+      this.$emit('load', this.fullPath)
+      this.isLoaded = true
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.single-page-iframe {
+  width: 100%;
+  height: calc(100vh - 117px);
+  border: none;
+}
+</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/AdminHeader.vue

@@ -1,104 +1,134 @@
-<template>
-  <a-layout-header :class="[headerTheme, 'admin-header']">
-    <div :class="['admin-header-wide', layout, pageWidth]">
-      <router-link v-if="isMobile || layout === 'head'" :class="['logo', isMobile ? null : 'pc', headerTheme]" to="/">
-        <img :src="logoSrc" width="32" alt="logo"/>
-        <h1 v-if="!isMobile">{{ systemName }}</h1>
-      </router-link>
-      <a-divider v-if="isMobile" type="vertical" />
-      <a-icon v-if="layout !== 'head'" :type="collapsed ? 'menu-unfold' : 'menu-fold'" class="trigger" @click="toggleCollapse"/>
-      <div v-if="layout !== 'side' && !isMobile" :style="`width: ${menuWidth};`" class="admin-header-menu">
-        <i-menu :options="menuData" :theme="headerTheme" class="head-menu" mode="horizontal" @select="onSelect"/>
-      </div>
-      <div :class="['admin-header-right', headerTheme]">
-        <header-search class="header-item" @active="val => searchActive = val" />
-        <a-tooltip class="header-item" placement="bottom" title="清理查询缓存" >
-          <a @click="handleToClearCache">
-            <a-icon type="reload" />
-          </a>
-        </a-tooltip>
-        <header-notice class="header-item"/>
-        <header-avatar class="header-item"/>
-        <a-dropdown class="lang header-item">
-          <div>
-            <a-icon type="global"/> {{ langAlias }}
-          </div>
-          <a-menu slot="overlay" :selected-keys="[lang]" @click="val => setLang(val.key)">
-            <a-menu-item v-for=" lang in langList" :key="lang.key">{{ lang.key.toLowerCase() + ' ' + lang.name }}</a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </div>
-    </div>
-  </a-layout-header>
-</template>
-
-<script>
-import HeaderSearch from './HeaderSearch'
-import HeaderNotice from './HeaderNotice'
-import HeaderAvatar from './HeaderAvatar'
-import IMenu from '@vue2-client/components/menu/menu'
-import { mapState, mapMutations } from 'vuex'
-import { Modal } from 'ant-design-vue'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'AdminHeader',
-  components: { IMenu, HeaderAvatar, HeaderNotice, HeaderSearch },
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['collapsed', 'menuData'],
-  data () {
-    return {
-      langList: [
-        { key: 'CN', name: '简体中文', alias: '简体' },
-        { key: 'HK', name: '繁體中文', alias: '繁體' },
-        { key: 'US', name: 'English', alias: 'English' }
-      ],
-      searchActive: false
-    }
-  },
-  computed: {
-    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'logoSrc', 'lang', 'pageWidth']),
-    headerTheme () {
-      if (this.layout === 'side' && this.theme.mode === 'dark' && !this.isMobile) {
-        return 'light'
-      }
-      return this.theme.mode
-    },
-    langAlias () {
-      const lang = this.langList.find(item => item.key === this.lang)
-      return lang.alias
-    },
-    menuWidth () {
-      const { layout, searchActive } = this
-      const headWidth = layout === 'head' ? '100% - 188px' : '100%'
-      const extraWidth = searchActive ? '600px' : '400px'
-      return `calc(${headWidth} - ${extraWidth})`
-    }
-  },
-  methods: {
-    toggleCollapse () {
-      this.$emit('toggleCollapse')
-    },
-    onSelect (obj) {
-      this.$emit('menuSelect', obj)
-    },
-    handleToClearCache () {
-      Modal.confirm({
-        title: '信息',
-        content: '您确定要清除查询配置缓存吗？',
-        onOk: () => {
-          indexedDB.clear(() => {
-            location.reload()
-          })
-        },
-        onCancel () {}
-      })
-    },
-    ...mapMutations('setting', ['setLang'])
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import "index";
-</style>
+<template>
+  <a-layout-header :class="[headerTheme, 'admin-header']">
+    <div :class="['admin-header-wide', layout, pageWidth]">
+      <router-link v-if="isMobile || layout === 'head'" :class="['logo', isMobile ? null : 'pc', headerTheme]" to="/">
+        <img :src="logoSrc" width="32" alt="logo"/>
+        <h1 v-if="!isMobile">{{ systemName }}</h1>
+      </router-link>
+      <a-divider v-if="isMobile" type="vertical" />
+      <a-icon v-if="layout !== 'head'" :type="collapsed ? 'menu-unfold' : 'menu-fold'" class="trigger" @click="toggleCollapse"/>
+      <div v-if="layout !== 'side' && !isMobile" :style="`width: ${menuWidth};`" class="admin-header-menu">
+        <i-menu :options="menuData" :theme="headerTheme" class="head-menu" mode="horizontal" @select="onSelect"/>
+      </div>
+      <div :class="['admin-header-right', headerTheme]">
+        <component class="header-item" :is="dynamicComponents['HeaderSearch']" @active="val => searchActive = val"/>
+        <a-tooltip class="header-item" placement="bottom" title="清理查询缓存" >
+          <a @click="handleToClearCache">
+            <a-icon type="reload" />
+          </a>
+        </a-tooltip>
+        <component class="header-item" :is="dynamicComponents['HeaderNotice']"/>
+        <header-avatar class="header-item"/>
+        <a-dropdown class="lang header-item">
+          <div>
+            <a-icon type="global"/> {{ langAlias }}
+          </div>
+          <a-menu slot="overlay" :selected-keys="[lang]" @click="val => setLang(val.key)">
+            <a-menu-item v-for=" lang in langList" :key="lang.key">{{ lang.key.toLowerCase() + ' ' + lang.name }}</a-menu-item>
+          </a-menu>
+        </a-dropdown>
+      </div>
+    </div>
+  </a-layout-header>
+</template>
+
+<script>
+import HeaderSearch from './HeaderSearch'
+import HeaderAvatar from './HeaderAvatar'
+import IMenu from '@vue2-client/components/menu/menu'
+import { mapState, mapMutations } from 'vuex'
+import { Modal } from 'ant-design-vue'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+const loadComponents = (value) => {
+  const component = {
+    HeaderSearch: import('./HeaderSearch'),
+    HeaderNotice: import('./HeaderNotice'),
+  }
+  if (!value) {
+    return component
+  }
+  for (const item in component) {
+    const path = value[item]
+    if (path) {
+      component[item] = import(`@/layouts/header/${path}`)
+    }
+  }
+  return component
+}
+
+export default {
+  name: 'AdminHeader',
+  components: { IMenu, HeaderAvatar, HeaderSearch },
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['collapsed', 'menuData'],
+  data () {
+    return {
+      langList: [
+        { key: 'CN', name: '简体中文', alias: '简体' },
+        { key: 'HK', name: '繁體中文', alias: '繁體' },
+        { key: 'US', name: 'English', alias: 'English' }
+      ],
+      searchActive: false,
+      dynamicComponents: {}
+    }
+  },
+  computed: {
+    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'logoSrc', 'lang', 'pageWidth', 'customizeComponent']),
+    headerTheme () {
+      if (this.layout === 'side' && this.theme.mode === 'dark' && !this.isMobile) {
+        return 'light'
+      }
+      return this.theme.mode
+    },
+    langAlias () {
+      const lang = this.langList.find(item => item.key === this.lang)
+      return lang.alias
+    },
+    menuWidth () {
+      const { layout, searchActive } = this
+      const headWidth = layout === 'head' ? '100% - 188px' : '100%'
+      const extraWidth = searchActive ? '600px' : '400px'
+      return `calc(${headWidth} - ${extraWidth})`
+    }
+  },
+  created () {
+    const components = loadComponents(this.customizeComponent)
+    for (const item in components) {
+      const value = components[item]
+      if (typeof value === 'function') {
+        this.$set(this.dynamicComponents, item, value)
+      } else {
+        components[item].then(result => {
+          this.$set(this.dynamicComponents, item, result.default)
+        })
+      }
+    }
+  },
+  methods: {
+    toggleCollapse () {
+      this.$emit('toggleCollapse')
+    },
+    onSelect (obj) {
+      this.$emit('menuSelect', obj)
+    },
+    handleToClearCache () {
+      Modal.confirm({
+        title: '信息',
+        content: '您确定要清除查询配置缓存吗？',
+        onOk: () => {
+          indexedDB.clear(() => {
+            location.reload()
+          })
+        },
+        onCancel () {}
+      })
+    },
+    ...mapMutations('setting', ['setLang'])
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import "index";
+</style>