vue2-client 1.4.56 → 1.4.58

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.4.58 -2022-11-29 @江超**
+- 修复一些小问题
+
+**1.4.57 -2022-11-27 @江超**
+- 优化登录态和未登录态的页面跳转方式
+
 **1.4.54 - 1.4.56 -2022-11-25 @江超**
 - 现在登录时会清除indexedDB缓存了
 - 增加查询系统访问记录的接口

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.56",
+  "version": "1.4.58",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -523,6 +523,7 @@ export default {
         pathKey: undefined,
         accept: undefined,
         selectType: undefined,
+        groupIndex: undefined,
         groupIndexView: undefined,
         addOrEdit: 'all',
         selectKeyName: undefined,
@@ -555,7 +556,7 @@ export default {
           this.lowerPath = this.stockList.filter(item => item.id === _item.resUploadStock)[0]?.f_lower_path_json ?? []
         }
       }
-      if (_item.selectKey && _item.selectType === 'logic' && _item.selectKey.substring(0, 6) === 'logic@') {
+      if (_item.selectKey && _item.selectKey.length >= 6 && _item.selectType === 'logic' && _item.selectKey.substring(0, 6) === 'logic@') {
         _item.selectKey = _item.selectKey.substring(6)
       }
       if (_item.formType === 'selects') {

package/src/base-client/components/common/FormGroupEdit/FormGroupEdit.vue

@@ -1,149 +1,151 @@
-<template>
-  <a-drawer
-    title="选择参数组"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <x-add-form
-      business-title="参数设置"
-      business-type="编辑"
-      :visible.sync="editQueryVisible"
-      :json-data="formObj.formJson"
-      :modify-model-data="this.modifyModelData[this.formObj.groupName]"
-      :loading="loading"
-      @onSubmit="submit"/>
-    <a-list
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="columnJson.groups"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <a-card :hoverable="true" @click="toEdit(item)">
-          <a-card-meta >
-            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
-            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
-            <div class="meta-content" slot="description">{{ item.describe }}</div>
-          </a-card-meta>
-        </a-card>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi, post } from '@vue2-client/services/api'
-
-export default {
-  name: 'FormGroupEdit',
-  components: {
-    XAddForm
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示参数下发抽屉
-      editQueryVisible: false,
-      targetIndex: 0,
-      columnJson: {},
-      editIndex: -1,
-      formObj: {
-        groupName: '',
-        formJson: []
-      },
-      // 参数设置业务执行状态
-      loading: false
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    modifyModelData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$emit('getColumnJson', val => {
-        this.columnJson = val
-      })
-    },
-    toEdit (item) {
-      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
-        this.formObj = res
-        this.editQueryVisible = true
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    submit (res) {
-      if (res.valid) {
-        this.loading = true
-        const requestParameters = {
-          paramsJson: {}
-        }
-        requestParameters.paramsJson[this.formObj.groupName] = {}
-        for (const key of Object.keys(res.form)) {
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
-        }
-        this.$emit('onSubmit', requestParameters, result => {
-          if (result) {
-            this.$message.success('参数设置成功！')
-          } else {
-            this.$message.error('参数设置失败！')
-          }
-          this.loading = false
-          this.editQueryVisible = false
-        })
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    title="选择参数组"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <x-add-form
+      business-title="参数设置"
+      business-type="编辑"
+      :visible.sync="editQueryVisible"
+      :json-data="formObj.formJson"
+      :modify-model-data="modifyModelDataItem"
+      :loading="loading"
+      @onSubmit="submit"/>
+    <a-list
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+      :dataSource="columnJson.groups"
+    >
+      <a-list-item slot="renderItem" slot-scope="item">
+        <a-card :hoverable="true" @click="toEdit(item)">
+          <a-card-meta >
+            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
+            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
+            <div class="meta-content" slot="description">{{ item.describe }}</div>
+          </a-card-meta>
+        </a-card>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import { commonApi, post } from '@vue2-client/services/api'
+
+export default {
+  name: 'FormGroupEdit',
+  components: {
+    XAddForm
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示参数下发抽屉
+      editQueryVisible: false,
+      targetIndex: 0,
+      columnJson: {},
+      editIndex: -1,
+      formObj: {
+        groupName: '',
+        formJson: []
+      },
+      modifyModelDataItem: {},
+      // 参数设置业务执行状态
+      loading: false
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    modifyModelData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
+    },
+    toEdit (item) {
+      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
+        this.formObj = res
+        this.modifyModelDataItem = { data: this.modifyModelData[this.formObj.groupName] }
+        this.editQueryVisible = true
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    submit (res) {
+      if (res.valid) {
+        this.loading = true
+        const requestParameters = {
+          paramsJson: {}
+        }
+        requestParameters.paramsJson[this.formObj.groupName] = {}
+        for (const key of Object.keys(res.form)) {
+          const realKey = key.substring(key.indexOf('_') + 1)
+          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
+        }
+        this.$emit('onSubmit', requestParameters, result => {
+          if (result) {
+            this.$message.success('参数设置成功！')
+          } else {
+            this.$message.error('参数设置失败！')
+          }
+          this.loading = false
+          this.editQueryVisible = false
+        })
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -220,6 +220,11 @@ export default {
     },
     fixedQueryForm: {
       handler () {
+        if (this.queryParamsName) {
+          this.getColumnsJson()
+        } else if (this.queryParamsJson) {
+          this.getColumnsJsonBySource()
+        }
         this.form = {}
       },
       deep: true
@@ -229,6 +234,11 @@ export default {
         this.getColumnsJsonBySource()
       },
       deep: true
+    },
+    queryParamsName: {
+      handler () {
+        this.getColumnsJson()
+      }
     }
   },
   created () {

package/src/base-client/components/common/XTreeOne/XTreeOne.vue

@@ -1,105 +1,109 @@
-<template>
-  <div id="XTreeOne">
-    <component-layout-one :siderProps="{width: leftWidth,collapsible: collapsible,collapsedWidth: collapsedWidth,theme: 'light'}">
-      <template slot="left">
-        <div class="bg-white pd-20" :style="{height: treeHeight}">
-          <a-input-search style="margin-bottom: 8px" placeholder="Search" allow-clear @change="onChange" />
-          <a-tree
-            :tree-data="searchData"
-            @select="onSelect">
-            <template #title="{ title }">
-              <span v-if="title.indexOf(searchValue) > -1">
-                {{ title.substr(0, title.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-              </span>
-              <span v-else>{{ title }}</span>
-            </template>
-          </a-tree>
-        </div>
-      </template>
-      <slot></slot>
-    </component-layout-one>
-  </div>
-</template>
-
-<script>
-  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
-  export default {
-    name: 'XTreeOne',
-    components: { ComponentLayoutOne },
-    props: {
-      // 左侧宽度
-      leftWidth: {
-        type: [Number, String],
-        default: () => {
-          return 200
-        }
-      },
-      // 左侧是否可收起
-      collapsible: {
-        type: Boolean,
-        default: true
-      },
-      // 左侧收起后宽度
-      collapsedWidth: {
-        type: Number,
-        default: 0
-      },
-      // Tree 树形控件数据
-      // array<{key, title, children, [disabled, selectable]}>
-      treeData: {
-        type: Array,
-        required: true
-      },
-      treeHeight: {
-        type: String,
-        default: '85vh'
-      }
-    },
-    data () {
-      return {
-        // 用于展示筛选出的数据
-        searchData: [],
-        // 查询值
-        searchValue: ''
-      }
-    },
-    created () {
-    },
-    mounted () {
-    },
-    watch: {
-      'treeData' () {
-        // 添加title插槽
-        for (const index of this.treeData.keys()) {
-          this.treeData[index].scopedSlots = { title: 'title' }
-        }
-        this.searchData = Object.assign([], this.treeData)
-      }
-    },
-    methods: {
-      onChange (e) {
-        const name = e.target.value
-        this.searchValue = name
-        this.searchData = []
-        for (const row of this.treeData) {
-          if (row.title.indexOf(name) > -1) {
-            this.searchData.push(row)
-          }
-        }
-      },
-      onSelect (selectedKeys, e) {
-        this.$emit('onSelect', selectedKeys, e)
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  #XTreeOne {
-    .pd-20 {
-      padding: 20px;
-    }
-  }
-</style>
+<template>
+  <div id="XTreeOne">
+    <component-layout-one :siderProps="{width: leftWidth,collapsible: collapsible,collapsedWidth: collapsedWidth,theme: 'light'}">
+      <template slot="left">
+        <div class="bg-white pd-20" :style="{height: treeHeight}">
+          <a-input-search style="margin-bottom: 8px" placeholder="Search" allow-clear @change="onChange" />
+          <a-tree
+            :tree-data="searchData"
+            @select="onSelect">
+            <template #title="{ title }">
+              <span v-if="title.indexOf(searchValue) > -1">
+                {{ title.substr(0, title.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+              </span>
+              <span v-else>{{ title }}</span>
+            </template>
+          </a-tree>
+        </div>
+      </template>
+      <slot></slot>
+    </component-layout-one>
+  </div>
+</template>
+
+<script>
+  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
+  export default {
+    name: 'XTreeOne',
+    components: { ComponentLayoutOne },
+    props: {
+      // 左侧宽度
+      leftWidth: {
+        type: [Number, String],
+        default: () => {
+          return 200
+        }
+      },
+      // 左侧是否可收起
+      collapsible: {
+        type: Boolean,
+        default: true
+      },
+      // 左侧收起后宽度
+      collapsedWidth: {
+        type: Number,
+        default: 0
+      },
+      // Tree 树形控件数据
+      // array<{key, title, children, [disabled, selectable]}>
+      treeData: {
+        type: Array,
+        required: true
+      },
+      treeHeight: {
+        type: String,
+        default: '85vh'
+      }
+    },
+    data () {
+      return {
+        // 用于展示筛选出的数据
+        searchData: [],
+        // 查询值
+        searchValue: ''
+      }
+    },
+    created () {
+      this.init()
+    },
+    mounted () {
+    },
+    watch: {
+      'treeData' () {
+        this.init()
+      }
+    },
+    methods: {
+      init () {
+        // 添加title插槽
+        for (const index of this.treeData.keys()) {
+          this.treeData[index].scopedSlots = { title: 'title' }
+        }
+        this.searchData = Object.assign([], this.treeData)
+      },
+      onChange (e) {
+        const name = e.target.value
+        this.searchValue = name
+        this.searchData = []
+        for (const row of this.treeData) {
+          if (row.title.indexOf(name) > -1) {
+            this.searchData.push(row)
+          }
+        }
+      },
+      onSelect (selectedKeys, e) {
+        this.$emit('onSelect', selectedKeys, e)
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  #XTreeOne {
+    .pd-20 {
+      padding: 20px;
+    }
+  }
+</style>

package/src/components/exception/ExceptionPage.vue

@@ -1,70 +1,70 @@
-<template>
-  <div class="exception-page">
-    <div class="img">
-      <img :src="config[type].img" alt=""/>
-    </div>
-    <div class="content">
-      <h1>{{ config[type].title }}</h1>
-      <div class="desc">{{ config[type].desc }}</div>
-      <div class="action">
-        <a-button type="primary" @click="backHome">返回登录页</a-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Config from './typeConfig'
-
-export default {
-  name: 'ExceptionPage',
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['type', 'homeRoute'],
-  data () {
-    return {
-      config: Config
-    }
-  },
-  methods: {
-    backHome () {
-      if (this.homeRoute) {
-        this.$router.push('/login')
-      }
-      this.$emit('backHome', this.type)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .exception-page{
-    border-radius: 4px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: @base-bg-color;
-    .img{
-      padding-right: 52px;
-      zoom: 1;
-      img{
-        max-width: 430px;
-      }
-    }
-    .content{
-      h1{
-        color: #434e59;
-        font-size: 72px;
-        font-weight: 600;
-        line-height: 72px;
-        margin-bottom: 24px;
-      }
-      .desc{
-        color: @text-color-second;
-        font-size: 20px;
-        line-height: 28px;
-        margin-bottom: 16px;
-      }
-    }
-  }
-
-</style>
+<template>
+  <div class="exception-page">
+    <div class="img">
+      <img :src="config[type].img" alt=""/>
+    </div>
+    <div class="content">
+      <h1>{{ config[type].title }}</h1>
+      <div class="desc">{{ config[type].desc }}</div>
+      <div class="action">
+        <a-button type="primary" @click="backHome">返回首页</a-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Config from './typeConfig'
+
+export default {
+  name: 'ExceptionPage',
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['type', 'homeRoute'],
+  data () {
+    return {
+      config: Config
+    }
+  },
+  methods: {
+    backHome () {
+      if (this.homeRoute) {
+        this.$router.push(this.homeRoute)
+      }
+      this.$emit('backHome', this.type)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .exception-page{
+    border-radius: 4px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: @base-bg-color;
+    .img{
+      padding-right: 52px;
+      zoom: 1;
+      img{
+        max-width: 430px;
+      }
+    }
+    .content{
+      h1{
+        color: #434e59;
+        font-size: 72px;
+        font-weight: 600;
+        line-height: 72px;
+        margin-bottom: 24px;
+      }
+      .desc{
+        color: @text-color-second;
+        font-size: 20px;
+        line-height: 28px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+
+</style>

package/src/layouts/ComponentLayoutOne.vue

@@ -1,46 +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;
-      }
-    }
-  }
-</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: 9999;
+      }
+    }
+  }
+</style>

package/src/pages/exception/404.vue

@@ -1,21 +1,25 @@
-<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>
+<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>

package/src/router/async/router.map.js

@@ -1,67 +1,68 @@
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 报表测试用页面
-routerResource.testPage = () => import('@vue2-client/pages/ReportView.vue')
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: '/login',
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 报表测试用页面
+routerResource.testPage = () => import('@vue2-client/pages/ReportView.vue')
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    component: view.tabs
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/router/guards.js

@@ -1,104 +1,104 @@
-import { hasAuthority } from '@vue2-client/utils/authority-utils'
-import { loginIgnore } from '@vue2-client/router/index'
-import { checkAuthorization } from '@vue2-client/utils/request'
-import NProgress from 'nprogress'
-
-NProgress.configure({ showSpinner: false })
-
-/**
- * 进度条开始
- * @param to
- * @param form
- * @param next
- */
-const progressStart = (to, from, next) => {
-  // start progress bar
-  if (!NProgress.isStarted()) {
-    NProgress.start()
-  }
-  next()
-}
-
-/**
- * 登录守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const loginGuard = (to, from, next, options) => {
-  const { message } = options
-  if (!loginIgnore.includes(to) && !checkAuthorization()) {
-    message.warning('登录已失效，请重新登录')
-    next({ path: '/login' })
-  } else {
-    next()
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const authorityGuard = (to, from, next, options) => {
-  const { store, message } = options
-  const permissions = store.getters['account/permissions']
-  const roles = store.getters['account/roles']
-  if (!hasAuthority(to, permissions, roles)) {
-    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
-    next({ path: '/403' })
-    // NProgress.done()
-  } else {
-    next()
-  }
-}
-
-/**
- * 混合导航模式下一级菜单跳转重定向
- * @param to
- * @param from
- * @param next
- * @param options
- * @returns {*}
- */
-const redirectGuard = (to, from, next, options) => {
-  const { store } = options
-  const getFirstChild = (routes) => {
-    const route = routes[0]
-    if (!route.children || route.children.length === 0) {
-      return route
-    }
-    return getFirstChild(route.children)
-  }
-  if (store.state.setting.layout === 'mix') {
-    const firstMenu = store.getters['setting/firstMenu']
-    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
-      store.commit('setting/setActivatedFirst', to.fullPath)
-      const subMenu = store.getters['setting/subMenu']
-      if (subMenu.length > 0) {
-        const redirect = getFirstChild(subMenu)
-        return next({ path: redirect.fullPath })
-      }
-    }
-  }
-  next()
-}
-
-/**
- * 进度条结束
- * @param to
- * @param form
- * @param options
- */
-const progressDone = () => {
-  // finish progress bar
-  NProgress.done()
-}
-
-export default {
-  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone]
-}
+import { hasAuthority } from '@vue2-client/utils/authority-utils'
+import { loginIgnore } from '@vue2-client/router/index'
+import { checkAuthorization } from '@vue2-client/utils/request'
+import NProgress from 'nprogress'
+
+NProgress.configure({ showSpinner: false })
+
+/**
+ * 进度条开始
+ * @param to
+ * @param form
+ * @param next
+ */
+const progressStart = (to, from, next) => {
+  // start progress bar
+  if (!NProgress.isStarted()) {
+    NProgress.start()
+  }
+  next()
+}
+
+/**
+ * 登录守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const loginGuard = (to, from, next, options) => {
+  const { message } = options
+  if ((!loginIgnore.includes(to) || to.name === '404') && !checkAuthorization()) {
+    message.warning('登录已失效，请重新登录')
+    next({ path: '/login' })
+  } else {
+    next()
+  }
+}
+
+/**
+ * 权限守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const authorityGuard = (to, from, next, options) => {
+  const { store, message } = options
+  const permissions = store.getters['account/permissions']
+  const roles = store.getters['account/roles']
+  if (!hasAuthority(to, permissions, roles)) {
+    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
+    next({ path: '/403' })
+    // NProgress.done()
+  } else {
+    next()
+  }
+}
+
+/**
+ * 混合导航模式下一级菜单跳转重定向
+ * @param to
+ * @param from
+ * @param next
+ * @param options
+ * @returns {*}
+ */
+const redirectGuard = (to, from, next, options) => {
+  const { store } = options
+  const getFirstChild = (routes) => {
+    const route = routes[0]
+    if (!route.children || route.children.length === 0) {
+      return route
+    }
+    return getFirstChild(route.children)
+  }
+  if (store.state.setting.layout === 'mix') {
+    const firstMenu = store.getters['setting/firstMenu']
+    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
+      store.commit('setting/setActivatedFirst', to.fullPath)
+      const subMenu = store.getters['setting/subMenu']
+      if (subMenu.length > 0) {
+        const redirect = getFirstChild(subMenu)
+        return next({ path: redirect.fullPath })
+      }
+    }
+  }
+  next()
+}
+
+/**
+ * 进度条结束
+ * @param to
+ * @param form
+ * @param options
+ */
+const progressDone = () => {
+  // finish progress bar
+  NProgress.done()
+}
+
+export default {
+  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
+  afterEach: [progressDone]
+}