vue2-client 1.2.41 → 1.2.44

package/src/components/menu/SideMenu.vue

@@ -8,7 +8,7 @@
     :trigger="null">
     <div :class="['logo', theme]">
       <router-link to="/dashboard/workplace">
-        <img src="@/assets/img/logo.png">
+        <img src="@vue2-client/assets/img/logo.png">
         <h1 style="font-weight: bold">{{ systemName }}</h1>
       </router-link>
     </div>

package/src/config/default/setting.config.js

@@ -31,5 +31,7 @@ module.exports = {
     direction: 'left' // 动画方向，切换页面时动画的方向，参考 ./animate.config.js
   },
   footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
-  ]
+  ],
+  // 兼容V2版本系统 true:启用, false:禁用
+  compatibleV2: true
 }

package/src/layouts/SinglePageView.vue

@@ -4,6 +4,7 @@
       <iframe
         ref="singlepage"
         :src="iframeSrc"
+        :name="this.fullPath"
         class="single-page-iframe"
         @load="load">
       </iframe>
@@ -23,6 +24,10 @@ export default {
     singlePageUrl: {
       type: String,
       default: ''
+    },
+    fullPath: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -40,6 +45,7 @@ export default {
       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']),
@@ -55,7 +61,10 @@ export default {
         page: this.singlePageUrl
       }
       console.log('发送参数', data)
-      this.iframe?.postMessage(data, '*')
+      if (this.iframe) {
+        this.iframe.postMessage(data, '*')
+      }
+      this.$emit('load', this.fullPath)
     }
   }
 }

package/src/layouts/header/AdminHeader.vue

@@ -2,7 +2,7 @@
   <a-layout-header :class="[headerTheme, 'admin-header']">
     <div :class="['admin-header-wide', layout, pageWidth]">
       <router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
-        <img width="32" src="@/assets/img/logo.png" />
+        <img width="32" src="@vue2-client/assets/img/logo.png" />
         <h1 v-if="!isMobile">{{ systemName }}</h1>
       </router-link>
       <a-divider v-if="isMobile" type="vertical" />

package/src/layouts/tabs/TabsView.vue

@@ -1,27 +1,34 @@
 <template>
-  <admin-layout>
-    <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
-    <tabs-head
-      v-if="multiPage"
-      :active="activePage"
-      :page-list="pageList"
-      @change="changePage"
-      @close="remove"
-      @refresh="refresh"
-      @contextmenu="onContextmenu"
-    />
-    <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
-      <page-toggle-transition v-show="!$route.meta.singlePage" :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-        <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
-          <router-view v-if="!refreshing" ref="tabContent" :key="$route.path" />
-        </a-keep-alive>
-        <router-view ref="tabContent" v-else-if="!refreshing" />
-      </page-toggle-transition>
-      <template v-for="page in single">
-        <single-page-view v-show="page.meta.singlePage === $route.meta.singlePage" :single-page-url="page.meta.singlePage" :key="page.meta.singlePage" />
-      </template>
-    </div>
-  </admin-layout>
+  <div id="TabsView">
+    <admin-layout>
+      <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
+      <tabs-head
+        v-if="multiPage"
+        :active="activePage"
+        :page-list="pageList"
+        @change="changePage"
+        @close="remove"
+        @refresh="refresh"
+        @contextmenu="onContextmenu"
+      />
+      <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
+        <page-toggle-transition v-show="!$route.meta.singlePage" :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
+          <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
+            <router-view v-if="!refreshing" ref="tabContent" :key="$route.path" />
+          </a-keep-alive>
+          <router-view ref="tabContent" v-else-if="!refreshing" />
+        </page-toggle-transition>
+        <template v-for="page in single">
+          <single-page-view
+            v-show="page.meta.singlePage === $route.meta.singlePage"
+            :single-page-url="page.meta.singlePage"
+            :full-path="page.fullPath"
+            :key="page.meta.singlePage"
+            @load="onSinglePageLoad" />
+        </template>
+      </div>
+    </admin-layout>
+  </div>
 </template>
 
 <script>
@@ -144,6 +151,12 @@ export default {
     refresh (key, page) {
       page = page || this.pageList.find(item => item.path === key)
       page.loading = true
+      // 单页面刷新
+      const singlePage = this.allSinglePages.find(item => item.fullPath === key)
+      if (singlePage) {
+        window.frames[singlePage.fullPath].location.reload()
+        return
+      }
       this.clearCache(page)
       if (key === this.activePage) {
         // eslint-disable-next-line no-return-assign
@@ -154,6 +167,10 @@ export default {
         setTimeout(() => page.loading = false, 500)
       }
     },
+    onSinglePageLoad (fullPath) {
+      const page = this.pageList.find(item => item.fullPath === fullPath)
+      page.loading = false
+    },
     onContextmenu (pageKey, e) {
       if (pageKey) {
         e.preventDefault()
@@ -336,24 +353,23 @@ export default {
 }
 </script>
 
-<style scoped lang="less">
-  .tabs-view{
-    margin: -16px auto 8px;
-    &.head.fixed{
-      max-width: 1400px;
+<style lang="less">
+  #TabsView {
+    .tabs-view {
+      margin: -16px auto 8px;
+      &.head.fixed {
+        max-width: 1400px;
+      }
     }
-  }
-  .tabs-view-content{
-    position: relative;
-    &.head.fixed{
-      width: 1400px;
-      margin: 0 auto;
+    .tabs-view-content {
+      position: relative;
+      &.head.fixed {
+        width: 1400px;
+        margin: 0 auto;
+      }
+      .ant-card:only-of-type {
+        min-height: calc(100vh - 64px - 56px - 16px);
+      }
     }
   }
 </style>
-
-<style scoped>
-  .tabs-view-content >>> .ant-card:only-of-type {
-    min-height: calc(100vh - 64px - 56px - 16px);
-  }
-</style>

package/src/pages/exception/403.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="403" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp403',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="403" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp403',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>

package/src/pages/exception/404.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="404" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp404',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="404" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp404',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>

package/src/pages/exception/500.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="500" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp500',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="500" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp500',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>