vue2-client 1.11.5 → 1.11.6-alpha

package/src/layouts/CommonLayout.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="common-layout">
-    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
-    <div class="content"><slot></slot></div>
-    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
-  </div>
-</template>
-
-<script>
-import PageFooter from '@vue2-client/layouts/footer/PageFooter'
-import { mapState } from 'vuex'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'CommonLayout',
-  components: { PageFooter },
-  computed: {
-    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
-  },
-  methods: {
-    clearCache () {
-      indexedDB.clearCache()
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.common-layout{
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow: auto;
-  background-color: @layout-body-background;
-  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
-  background-repeat: no-repeat;
-  background-position-x: center;
-  background-position-y: 110px;
-  background-size: 100%;
-  .top {
-    padding: 5px 10px;
-    text-align: right;
-    .clearCacheBtn {
-      color: #fff !important;
-    }
-  }
-  .content{
-    padding: 32px 0;
-    flex: 1;
-    @media (min-width: 768px){
-
-      padding: 112px 0 24px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="common-layout">
+    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
+    <div class="content"><slot></slot></div>
+    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
+  </div>
+</template>
+
+<script>
+import PageFooter from '@vue2-client/layouts/footer/PageFooter'
+import { mapState } from 'vuex'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'CommonLayout',
+  components: { PageFooter },
+  computed: {
+    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
+  },
+  methods: {
+    clearCache () {
+      indexedDB.clearCache()
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.common-layout{
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow: auto;
+  background-color: @layout-body-background;
+  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: 110px;
+  background-size: 100%;
+  .top {
+    padding: 5px 10px;
+    text-align: right;
+    .clearCacheBtn {
+      color: #fff !important;
+    }
+  }
+  .content{
+    padding: 32px 0;
+    flex: 1;
+    @media (min-width: 768px){
+
+      padding: 112px 0 24px;
+    }
+  }
+}
+</style>

package/src/layouts/GridView.vue

@@ -1,45 +1,45 @@
-<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"
-        :show-save-button="false"
-        :no-padding="true"
-        :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"
+        :show-save-button="false"
+        :no-padding="true"
+        :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/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']" >
-      <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) || item.regex.test(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']" >
+      <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) || item.regex.test(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>