vue2-client 1.4.63 → 1.5.0

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/PageLayout.vue

@@ -1,151 +1,151 @@
-<template>
-  <div class="page-layout">
-    <page-header
-      ref="pageHeader"
-      :style="`margin-top: ${multiPage ? 0 : -24}px`"
-      :breadcrumb="breadcrumb"
-      :title="pageTitle"
-      :logo="logo"
-      :avatar="avatar">
-      <slot name="action" slot="action"></slot>
-      <slot slot="content" name="headerContent"></slot>
-      <div slot="content" v-if="!this.$slots.headerContent && desc">
-        <p>{{ desc }}</p>
-        <div v-if="this.linkList" class="link">
-          <template v-for="(link, index) in linkList">
-            <a :key="index" :href="link.href"><a-icon :type="link.icon" />{{ link.title }}</a>
-          </template>
-        </div>
-      </div>
-      <slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
-    </page-header>
-    <div ref="page" :class="['page-content', layout, pageWidth]" >
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-import PageHeader from '@vue2-client/components/page/header/PageHeader'
-import { mapState, mapMutations } from 'vuex'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-
-export default {
-  name: 'PageLayout',
-  components: { PageHeader },
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['desc', 'logo', 'title', 'avatar', 'linkList', 'extraImage'],
-  data () {
-    return {
-      page: {},
-      pageHeaderHeight: 0
-    }
-  },
-  watch: {
-    $route () {
-      this.page = this.$route.meta.page
-    }
-  },
-  updated () {
-    if (!this._inactive) {
-      this.updatePageHeight()
-    }
-  },
-  activated () {
-    this.updatePageHeight()
-  },
-  deactivated () {
-    this.updatePageHeight(0)
-  },
-  mounted () {
-    this.updatePageHeight()
-  },
-  created () {
-    this.page = this.$route.meta.page
-  },
-  beforeDestroy () {
-    this.updatePageHeight(0)
-  },
-  computed: {
-    ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth', 'customTitles']),
-    pageTitle () {
-      const pageTitle = this.page && this.page.title
-      return this.customTitle || (pageTitle && this.$t(pageTitle)) || this.title || this.routeName
-    },
-    routeName () {
-      const route = this.$route
-      return this.$t(getI18nKey(route.matched[route.matched.length - 1].path))
-    },
-    breadcrumb () {
-      const page = this.page
-      const breadcrumb = page && page.breadcrumb
-      if (breadcrumb) {
-        const i18nBreadcrumb = []
-        breadcrumb.forEach(item => {
-          i18nBreadcrumb.push(this.$t(item))
-        })
-        return i18nBreadcrumb
-      } else {
-        return this.getRouteBreadcrumb()
-      }
-    },
-    marginCorrect () {
-      return this.multiPage ? 24 : 0
-    }
-  },
-  methods: {
-    ...mapMutations('setting', ['correctPageMinHeight']),
-    getRouteBreadcrumb () {
-      const routes = this.$route.matched
-      const path = this.$route.path
-      const breadcrumb = []
-      routes.filter(item => path.includes(item.path))
-        .forEach(route => {
-        const path = route.path.length === 0 ? '/home' : route.path
-        breadcrumb.push(this.$t(getI18nKey(path)))
-      })
-      const pageTitle = this.page && this.page.title
-      if (this.customTitle || pageTitle) {
-        breadcrumb[breadcrumb.length - 1] = this.customTitle || pageTitle
-      }
-      return breadcrumb
-    },
-    /**
-     * 用于计算页面内容最小高度
-     * @param newHeight
-     */
-    updatePageHeight (newHeight = this.$refs.pageHeader.$el.offsetHeight + this.marginCorrect) {
-      this.correctPageMinHeight(this.pageHeaderHeight - newHeight)
-      this.pageHeaderHeight = newHeight
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .page-header{
-    margin: 0 -24px 0;
-  }
-  .link{
-    /*margin-top: 16px;*/
-    line-height: 24px;
-    a{
-      font-size: 14px;
-      margin-right: 32px;
-      i{
-        font-size: 22px;
-        margin-right: 8px;
-      }
-    }
-  }
-  .page-content{
-    position: relative;
-    padding: 24px 0 0;
-    &.side{
-    }
-    &.head.fixed{
-      margin: 0 auto;
-      max-width: 100%;
-    }
-  }
-</style>
+<template>
+  <div class="page-layout">
+    <page-header
+      ref="pageHeader"
+      :style="`margin-top: ${multiPage ? 0 : -24}px`"
+      :breadcrumb="breadcrumb"
+      :title="pageTitle"
+      :logo="logo"
+      :avatar="avatar">
+      <slot name="action" slot="action"></slot>
+      <slot slot="content" name="headerContent"></slot>
+      <div slot="content" v-if="!this.$slots.headerContent && desc">
+        <p>{{ desc }}</p>
+        <div v-if="this.linkList" class="link">
+          <template v-for="(link, index) in linkList">
+            <a :key="index" :href="link.href"><a-icon :type="link.icon" />{{ link.title }}</a>
+          </template>
+        </div>
+      </div>
+      <slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
+    </page-header>
+    <div ref="page" :class="['page-content', layout, pageWidth]" >
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageHeader from '@vue2-client/components/page/header/PageHeader'
+import { mapState, mapMutations } from 'vuex'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+
+export default {
+  name: 'PageLayout',
+  components: { PageHeader },
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['desc', 'logo', 'title', 'avatar', 'linkList', 'extraImage'],
+  data () {
+    return {
+      page: {},
+      pageHeaderHeight: 0
+    }
+  },
+  watch: {
+    $route () {
+      this.page = this.$route.meta.page
+    }
+  },
+  updated () {
+    if (!this._inactive) {
+      this.updatePageHeight()
+    }
+  },
+  activated () {
+    this.updatePageHeight()
+  },
+  deactivated () {
+    this.updatePageHeight(0)
+  },
+  mounted () {
+    this.updatePageHeight()
+  },
+  created () {
+    this.page = this.$route.meta.page
+  },
+  beforeDestroy () {
+    this.updatePageHeight(0)
+  },
+  computed: {
+    ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth', 'customTitles']),
+    pageTitle () {
+      const pageTitle = this.page && this.page.title
+      return this.customTitle || (pageTitle && this.$t(pageTitle)) || this.title || this.routeName
+    },
+    routeName () {
+      const route = this.$route
+      return this.$t(getI18nKey(route.matched[route.matched.length - 1].path))
+    },
+    breadcrumb () {
+      const page = this.page
+      const breadcrumb = page && page.breadcrumb
+      if (breadcrumb) {
+        const i18nBreadcrumb = []
+        breadcrumb.forEach(item => {
+          i18nBreadcrumb.push(this.$t(item))
+        })
+        return i18nBreadcrumb
+      } else {
+        return this.getRouteBreadcrumb()
+      }
+    },
+    marginCorrect () {
+      return this.multiPage ? 24 : 0
+    }
+  },
+  methods: {
+    ...mapMutations('setting', ['correctPageMinHeight']),
+    getRouteBreadcrumb () {
+      const routes = this.$route.matched
+      const path = this.$route.path
+      const breadcrumb = []
+      routes.filter(item => path.includes(item.path))
+        .forEach(route => {
+        const path = route.path.length === 0 ? '/home' : route.path
+        breadcrumb.push(this.$t(getI18nKey(path)))
+      })
+      const pageTitle = this.page && this.page.title
+      if (this.customTitle || pageTitle) {
+        breadcrumb[breadcrumb.length - 1] = this.customTitle || pageTitle
+      }
+      return breadcrumb
+    },
+    /**
+     * 用于计算页面内容最小高度
+     * @param newHeight
+     */
+    updatePageHeight (newHeight = this.$refs.pageHeader.$el.offsetHeight + this.marginCorrect) {
+      this.correctPageMinHeight(this.pageHeaderHeight - newHeight)
+      this.pageHeaderHeight = newHeight
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .page-header{
+    margin: 0 -24px 0;
+  }
+  .link{
+    /*margin-top: 16px;*/
+    line-height: 24px;
+    a{
+      font-size: 14px;
+      margin-right: 32px;
+      i{
+        font-size: 22px;
+        margin-right: 8px;
+      }
+    }
+  }
+  .page-content{
+    position: relative;
+    padding: 24px 0 0;
+    &.side{
+    }
+    &.head.fixed{
+      margin: 0 auto;
+      max-width: 100%;
+    }
+  }
+</style>

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
-        }
-      }).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>