vue2-client 1.4.29 → 1.4.30

package/src/layouts/AdminLayout.vue

@@ -1,174 +1,174 @@
-<template>
-  <a-layout :class="['admin-layout', 'beauty-scroll']">
-    <drawer v-if="isMobile" v-model="drawerOpen">
-      <side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
-    </drawer>
-    <side-menu
-      :class="[fixedSideBar ? 'fixed-side' : '']"
-      :theme="theme.mode"
-      v-else-if="layout === 'side' || layout === 'mix'"
-      :menuData="sideMenuData"
-      :collapsed="collapsed"
-      :collapsible="true" />
-    <div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
-    <drawer v-if="!hideSetting" v-model="showSetting" placement="right">
-      <div class="setting" slot="handler">
-        <a-icon :type="showSetting ? 'close' : 'setting'"/>
-      </div>
-      <setting />
-    </drawer>
-    <a-layout class="admin-layout-main beauty-scroll">
-      <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
-      <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
-      <a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
-        <div style="position: relative">
-          <slot></slot>
-        </div>
-      </a-layout-content>
-      <a-layout-footer style="padding: 0">
-        <page-footer :link-list="footerLinks" :copyright="copyright" />
-      </a-layout-footer>
-    </a-layout>
-  </a-layout>
-</template>
-
-<script>
-import AdminHeader from './header/AdminHeader'
-import PageFooter from './footer/PageFooter'
-import Drawer from '../components/tool/Drawer'
-import SideMenu from '../components/menu/SideMenu'
-import Setting from '../components/setting/Setting'
-import { mapState, mapMutations, mapGetters } from 'vuex'
-
-// const minHeight = window.innerHeight - 64 - 122
-
-export default {
-  name: 'AdminLayout',
-  components: { Setting, SideMenu, Drawer, PageFooter, AdminHeader },
-  data () {
-    return {
-      minHeight: window.innerHeight - 64 - 1,
-      collapsed: false,
-      showSetting: false,
-      drawerOpen: false
-    }
-  },
-  provide () {
-    return {
-      adminLayout: this
-    }
-  },
-  watch: {
-    $route (val) {
-      this.setActivated(val)
-    },
-    layout () {
-      this.setActivated(this.$route)
-    },
-    isMobile (val) {
-      if (!val) {
-        this.drawerOpen = false
-      }
-    }
-  },
-  computed: {
-    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar',
-      'fixedTabs', 'hideSetting', 'multiPage']),
-    ...mapGetters('setting', ['firstMenu', 'subMenu', 'menuData']),
-    sideMenuWidth () {
-      return this.collapsed ? '80px' : '256px'
-    },
-    headerStyle () {
-      const width = (this.fixedHeader && this.layout !== 'head' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
-      const position = this.fixedHeader ? 'fixed' : 'static'
-      return `width: ${width}; position: ${position};`
-    },
-    headMenuData () {
-      const { layout, menuData, firstMenu } = this
-      return layout === 'mix' ? firstMenu : menuData
-    },
-    sideMenuData () {
-      const { layout, menuData, subMenu } = this
-      return layout === 'mix' ? subMenu : menuData
-    }
-  },
-  methods: {
-    ...mapMutations('setting', ['correctPageMinHeight', 'setActivatedFirst']),
-    toggleCollapse () {
-      this.collapsed = !this.collapsed
-    },
-    onMenuSelect () {
-      this.toggleCollapse()
-    },
-    setActivated (route) {
-      if (this.layout === 'mix') {
-        let matched = route.matched
-        matched = matched.slice(0, matched.length - 1)
-        const { firstMenu } = this
-        for (const menu of firstMenu) {
-          if (matched.findIndex(item => item.path === menu.fullPath) !== -1) {
-            this.setActivatedFirst(menu.fullPath)
-            break
-          }
-        }
-      }
-    }
-  },
-  created () {
-    this.correctPageMinHeight(this.minHeight - 24)
-    this.setActivated(this.$route)
-  },
-  beforeDestroy () {
-    this.correctPageMinHeight(-this.minHeight + 24)
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .admin-layout{
-    .side-menu{
-      &.fixed-side{
-        position: fixed;
-        height: 100vh;
-        left: 0;
-        top: 0;
-      }
-    }
-    .virtual-side{
-      transition: all 0.2s;
-    }
-    .virtual-header{
-      transition: all 0.2s;
-      opacity: 0;
-      &.fixed-tabs.multi-page:not(.fixed-header){
-        height: 0;
-      }
-    }
-    .admin-layout-main{
-      .admin-header{
-        top: 0;
-        right: 0;
-        overflow: hidden;
-        transition: all 0.2s;
-        &.fixed-tabs.multi-page:not(.fixed-header){
-          height: 0;
-        }
-      }
-    }
-    .admin-layout-content{
-      padding: 24px;
-      /*overflow-x: hidden;*/
-      /*min-height: calc(100vh - 64px - 122px);*/
-    }
-    .setting{
-      background-color: @primary-color;
-      color: @base-bg-color;
-      border-radius: 5px 0 0 5px;
-      line-height: 40px;
-      font-size: 22px;
-      width: 40px;
-      height: 40px;
-      box-shadow: -2px 0 8px @shadow-color;
-    }
-  }
-</style>
+<template>
+  <a-layout :class="['admin-layout', 'beauty-scroll']">
+    <drawer v-if="isMobile" v-model="drawerOpen">
+      <side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
+    </drawer>
+    <side-menu
+      :class="[fixedSideBar ? 'fixed-side' : '']"
+      :theme="theme.mode"
+      v-else-if="layout === 'side' || layout === 'mix'"
+      :menuData="sideMenuData"
+      :collapsed="collapsed"
+      :collapsible="true" />
+    <div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
+    <drawer v-if="!hideSetting" v-model="showSetting" placement="right">
+      <div class="setting" slot="handler">
+        <a-icon :type="showSetting ? 'close' : 'setting'"/>
+      </div>
+      <setting />
+    </drawer>
+    <a-layout class="admin-layout-main beauty-scroll">
+      <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
+      <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
+      <a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
+        <div style="position: relative">
+          <slot></slot>
+        </div>
+      </a-layout-content>
+      <a-layout-footer style="padding: 0">
+        <page-footer :link-list="footerLinks" :copyright="copyright" />
+      </a-layout-footer>
+    </a-layout>
+  </a-layout>
+</template>
+
+<script>
+import AdminHeader from './header/AdminHeader'
+import PageFooter from './footer/PageFooter'
+import Drawer from '../components/tool/Drawer'
+import SideMenu from '../components/menu/SideMenu'
+import Setting from '../components/setting/Setting'
+import { mapState, mapMutations, mapGetters } from 'vuex'
+
+// const minHeight = window.innerHeight - 64 - 122
+
+export default {
+  name: 'AdminLayout',
+  components: { Setting, SideMenu, Drawer, PageFooter, AdminHeader },
+  data () {
+    return {
+      minHeight: window.innerHeight - 64 - 1,
+      collapsed: false,
+      showSetting: false,
+      drawerOpen: false
+    }
+  },
+  provide () {
+    return {
+      adminLayout: this
+    }
+  },
+  watch: {
+    $route (val) {
+      this.setActivated(val)
+    },
+    layout () {
+      this.setActivated(this.$route)
+    },
+    isMobile (val) {
+      if (!val) {
+        this.drawerOpen = false
+      }
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar',
+      'fixedTabs', 'hideSetting', 'multiPage']),
+    ...mapGetters('setting', ['firstMenu', 'subMenu', 'menuData']),
+    sideMenuWidth () {
+      return this.collapsed ? '80px' : '256px'
+    },
+    headerStyle () {
+      const width = (this.fixedHeader && this.layout !== 'head' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
+      const position = this.fixedHeader ? 'fixed' : 'static'
+      return `width: ${width}; position: ${position};`
+    },
+    headMenuData () {
+      const { layout, menuData, firstMenu } = this
+      return layout === 'mix' ? firstMenu : menuData
+    },
+    sideMenuData () {
+      const { layout, menuData, subMenu } = this
+      return layout === 'mix' ? subMenu : menuData
+    }
+  },
+  methods: {
+    ...mapMutations('setting', ['correctPageMinHeight', 'setActivatedFirst']),
+    toggleCollapse () {
+      this.collapsed = !this.collapsed
+    },
+    onMenuSelect () {
+      this.toggleCollapse()
+    },
+    setActivated (route) {
+      if (this.layout === 'mix') {
+        let matched = route.matched
+        matched = matched.slice(0, matched.length - 1)
+        const { firstMenu } = this
+        for (const menu of firstMenu) {
+          if (matched.findIndex(item => item.path === menu.fullPath) !== -1) {
+            this.setActivatedFirst(menu.fullPath)
+            break
+          }
+        }
+      }
+    }
+  },
+  created () {
+    this.correctPageMinHeight(this.minHeight - 24)
+    this.setActivated(this.$route)
+  },
+  beforeDestroy () {
+    this.correctPageMinHeight(-this.minHeight + 24)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .admin-layout{
+    .side-menu{
+      &.fixed-side{
+        position: fixed;
+        height: 100vh;
+        left: 0;
+        top: 0;
+      }
+    }
+    .virtual-side{
+      transition: all 0.2s;
+    }
+    .virtual-header{
+      transition: all 0.2s;
+      opacity: 0;
+      &.fixed-tabs.multi-page:not(.fixed-header){
+        height: 0;
+      }
+    }
+    .admin-layout-main{
+      .admin-header{
+        top: 0;
+        right: 0;
+        overflow: hidden;
+        transition: all 0.2s;
+        &.fixed-tabs.multi-page:not(.fixed-header){
+          height: 0;
+        }
+      }
+    }
+    .admin-layout-content{
+      padding: 24px;
+      /*overflow-x: hidden;*/
+      /*min-height: calc(100vh - 64px - 122px);*/
+    }
+    .setting{
+      background-color: @primary-color;
+      color: @base-bg-color;
+      border-radius: 5px 0 0 5px;
+      line-height: 40px;
+      font-size: 22px;
+      width: 40px;
+      height: 40px;
+      box-shadow: -2px 0 8px @shadow-color;
+    }
+  }
+</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>