更新: 升级开发环境至 vue-cli3; 更新依赖库版本；解决 IE11 下不能正确显示问题；

2020-06-15 18:24:31 +08:00
parent 9eaf0962c6
commit e1da650eb1
57 changed files with 6424 additions and 6745 deletions
--- a/src/components/analysis/HotSearch.vue
+++ b/src/components/analysis/HotSearch.vue
@@ -26,6 +26,7 @@
      :dataSource="searchData"
      :columns="columns" size="small"
      :pagination="{style: { marginBottom: 0 }, pageSize: 5}"
+      rowKey="index"
    >
      <a href="#/" slot="keyword" slot-scope="text">{{text}}</a>
      <span slot="rang" slot-scope="text">{{text}} %<a-icon type="caret-up" /> </span>
--- a/src/components/chart/MiniArea.vue
+++ b/src/components/chart/MiniArea.vue
@@ -18,7 +18,7 @@ const beginDay = new Date().getTime()
 const fakeY = [7, 5, 4, 2, 4, 7, 5, 6, 5, 9, 6, 3, 1, 5, 3, 6, 5]
 for (let i = 0; i < fakeY.length; i += 1) {
  data.push({
-    x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'YYYY-MM-DD'),
+    x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
    y: fakeY[i]
  })
 }
--- a/src/components/chart/MiniBar.vue
+++ b/src/components/chart/MiniBar.vue
@@ -18,7 +18,7 @@ const beginDay = new Date().getTime()
 const fakeY = [7, 5, 4, 2, 4, 7, 5, 6, 5, 9, 6, 3, 1, 5, 3, 6, 5]
 for (let i = 0; i < fakeY.length; i += 1) {
  data.push({
-    x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'YYYY-MM-DD'),
+    x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
    y: fakeY[i]
  })
 }
--- a/src/components/checkbox/ColorCheckbox.vue
+++ b/src/components/checkbox/ColorCheckbox.vue
@@ -102,7 +102,7 @@ export default {
  },
  inject: ['groupContext'],
  watch: {
-    'sChecked': function (val) {
+    'sChecked': function () {
      const value = {
        value: this.value,
        color: this.color,
--- a/src/components/checkbox/ImgCheckbox.vue
+++ b/src/components/checkbox/ImgCheckbox.vue
@@ -94,7 +94,7 @@ export default {
  },
  inject: ['groupContext'],
  watch: {
-    'sChecked': function (val) {
+    'sChecked': function () {
      const option = {
        value: this.value,
        checked: this.sChecked
--- a/src/components/menu/SiderMenu.vue
+++ b/src/components/menu/SiderMenu.vue
@@ -2,7 +2,7 @@
  <a-layout-sider :class="[theme, 'sider', isMobile ? null : 'shadow']" width="256px" :collapsible="collapsible" v-model="collapsed" :trigger="null">
    <div :class="['logo', theme]">
      <router-link to="/dashboard/workplace">
-        <img src="static/img/vue-antd-logo.png">
+        <img src="@/assets/img/vue-antd-logo.png">
        <h1>{{systemName}}</h1>
      </router-link>
    </div>
--- a/src/components/menu/menu.js
+++ b/src/components/menu/menu.js
@@ -98,8 +98,9 @@ export default {
        },
        [
          h(
-            'a',
-            {attrs: {href: '#' + menu.path}},
+            'RouterLink',
+            // {attrs: {href: '#' + menu.path}},
+            {attrs: {to: menu.path}},
            [
              this.renderIcon(h, menu.icon),
              h('span', [menu.name])
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -68,7 +68,6 @@

 <script>
 import SettingItem from './SettingItem'
-import StyleItem from './StyleItem'
 import ColorCheckbox from '../checkbox/ColorCheckbox'
 import ImgCheckbox from '../checkbox/ImgCheckbox'
 import Clipboard from 'clipboard'
@@ -78,7 +77,7 @@ const ImgCheckboxGroup = ImgCheckbox.Group

 export default {
  name: 'Setting',
-  components: {ImgCheckboxGroup, ImgCheckbox, ColorCheckboxGroup, ColorCheckbox, StyleItem, SettingItem},
+  components: {ImgCheckboxGroup, ImgCheckbox, ColorCheckboxGroup, ColorCheckbox, SettingItem},
  computed: {
    multipage () {
      return this.$store.state.setting.multipage
--- a/src/components/table/StandardTable.vue
+++ b/src/components/table/StandardTable.vue
@@ -4,12 +4,14 @@
      <a-alert type="info" :show-icon="true">
        <div slot="message">
          已选择&nbsp;<a style="font-weight: 600">{{selectedRows.length}}</a>&nbsp;项&nbsp;&nbsp;
-          <template  v-for="(item, index) in needTotalList" v-if="item.needTotal">
-            {{item.title}}总计&nbsp;
-            <a :key="index" style="font-weight: 600">
-            {{item.customRender ? item.customRender(item.total) : item.total}}
-            </a>&nbsp;&nbsp;
-          </template>
+          <div  v-for="(item, index) in needTotalList" :key="index">
+            <div v-if="item.needTotal">
+              {{item.title}}总计&nbsp;
+              <a :key="index" style="font-weight: 600">
+                {{item.customRender ? item.customRender(item.total) : item.total}}
+              </a>&nbsp;&nbsp;
+            </div>
+          </div>
          <a style="margin-left: 24px">清空</a>
        </div>
      </a-alert>
--- a/src/components/tool/Drawer.vue
+++ b/src/components/tool/Drawer.vue
@@ -2,10 +2,10 @@
  <div >
    <div :class="['mask', openDrawer ? 'open' : 'close']" @click="close"></div>
    <div :class="['drawer', placement, openDrawer ? 'open' : 'close']">
-      <div ref="drawer" style="position: relative; height: 100%;">
+      <div ref="drawer" class="content">
        <slot></slot>
      </div>
-      <div v-if="showHandler" :class="['handler-container', placement]" ref="handler" @click="handle">
+      <div v-if="showHandler" :class="['handler-container', placement, openDrawer ? 'open' : 'close']" ref="handler" @click="handle">
        <slot v-if="$slots.handler" name="handler"></slot>
        <div v-else class="handler">
          <a-icon :type="openDrawer ? 'close'  : 'bars'" />
@@ -44,11 +44,11 @@ export default {
    this.drawerWidth = this.getDrawerWidth()
  },
  watch: {
-    'drawerWidth': function (val) {
+    'drawerWidth': function () {
      if (this.placement === 'left') {
-        this.$refs.handler.style.left = val + 'px'
+        //this.$refs.handler.style.left = val + 'px'
      } else {
-        this.$refs.handler.style.right = val + 'px'
+        //this.$refs.handler.style.right = val + 'px'
      }
    }
  },
@@ -92,36 +92,48 @@ export default {
    &.left{
      left: 0px;
      &.open{
-        box-shadow: 2px 0 8px rgba(0,0,0,.15);
+        .content{
+          box-shadow: 2px 0 8px rgba(0,0,0,.15);
+        }
      }
      &.close{
-        transform: translateX(-100%);
+        transform: translateX(-100%) translateX(40px);
      }
    }
    &.right{
      right: 0px;
+      .content{
+        float: right;
+      }
      &.open{
-        box-shadow: -2px 0 8px rgba(0,0,0,.15);
+        .content{
+          box-shadow: -2px 0 8px rgba(0,0,0,.15);
+        }
      }
      &.close{
-        transform: translateX(100%);
+        transform: translateX(100%) translateX(-40px);
      }
    }
    .sider{
      height: 100%;
    }
  }
+  .content{
+    display: inline-block;
+    height: 100%;
+  }
  .handler-container{
-    position: fixed;
-    top: 200px;
+    display: inline-block;
    text-align: center;
    transition: all 0.5s;
    cursor: pointer;
+    vertical-align: top;
+    margin-top: 200px;
+    z-index: 100;
    .handler {
      height: 40px;
      width: 40px;
      background-color: #fff;
-      z-index: 100;
      font-size: 26px;
      box-shadow: 2px 0 8px rgba(0, 0, 0, 0.15);
      line-height: 40px;