Browse Source

升级element-ui到2.8.2

Mark 5 years ago
parent
commit
a5c3906888
3 changed files with 15 additions and 16 deletions
  1. 2 1
      package.json
  2. 7 1
      src/assets/scss/_base.scss
  3. 6 14
      src/views/modules/sys/menu.vue

+ 2 - 1
package.json

@ -17,7 +17,7 @@
17 17
    "axios": "0.17.1",
18 18
    "babel-plugin-component": "0.10.1",
19 19
    "babel-polyfill": "6.26.0",
20
    "element-ui": "2.3.2",
20
    "element-ui": "2.8.2",
21 21
    "gulp": "3.9.1",
22 22
    "gulp-concat": "2.6.1",
23 23
    "gulp-load-plugins": "1.5.0",
@ -25,6 +25,7 @@
25 25
    "gulp-shell": "0.6.5",
26 26
    "lodash": "4.17.5",
27 27
    "node-sass": "4.9.0",
28
    "npm": "^6.9.0",
28 29
    "sass-loader": "6.0.6",
29 30
    "svg-sprite-loader": "3.7.3",
30 31
    "vue": "2.5.2",

+ 7 - 1
src/assets/scss/_base.scss

@ -174,7 +174,7 @@ img {
174 174
    text-transform: uppercase;
175 175
    white-space: nowrap;
176 176
    color: #fff;
177
    
177
178 178
    &-lg,
179 179
    &-mini {
180 180
      margin: 0 5px;
@ -356,3 +356,9 @@ img {
356 356
    }
357 357
  }
358 358
}
359
.el-table__expand-icon {
360
  display: inline-block;
361
  width: 14px;
362
  vertical-align: middle;
363
  margin-right: 5px;
364
}

+ 6 - 14
src/views/modules/sys/menu.vue

@ -5,24 +5,18 @@
5 5
        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
6 6
      </el-form-item>
7 7
    </el-form>
8
8 9
    <el-table
9 10
      :data="dataList"
11
      row-key="menuId"
10 12
      border
11
      style="width: 100%;">
13
      style="width: 100%; ">
12 14
      <el-table-column
13
        prop="menuId"
14
        header-align="center"
15
        align="center"
16
        width="80"
17
        label="ID">
18
      </el-table-column>
19
      <table-tree-column
20 15
        prop="name"
21 16
        header-align="center"
22
        treeKey="menuId"
23
        width="150"
24
        label="名称">
25
      </table-tree-column>
17
        min-width="150"
18
        label="名称" >
19
      </el-table-column>
26 20
      <el-table-column
27 21
        prop="parentName"
28 22
        header-align="center"
@ -89,7 +83,6 @@
89 83
</template>
90 84
91 85
<script>
92
  import TableTreeColumn from '@/components/table-tree-column'
93 86
  import AddOrUpdate from './menu-add-or-update'
94 87
  import { treeDataTranslate } from '@/utils'
95 88
  export default {
@ -102,7 +95,6 @@
102 95
      }
103 96
    },
104 97
    components: {
105
      TableTreeColumn,
106 98
      AddOrUpdate
107 99
    },
108 100
    activated () {