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

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

174
    text-transform: uppercase;
174
    text-transform: uppercase;
175
    white-space: nowrap;
175
    white-space: nowrap;
176
    color: #fff;
176
    color: #fff;
177
    
177
178
    &-lg,
178
    &-lg,
179
    &-mini {
179
    &-mini {
180
      margin: 0 5px;
180
      margin: 0 5px;
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
        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
5
        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
6
      </el-form-item>
6
      </el-form-item>
7
    </el-form>
7
    </el-form>
8
8
    <el-table
9
    <el-table
9
      :data="dataList"
10
      :data="dataList"
11
      row-key="menuId"
10
      border
12
      border
11
      style="width: 100%;">
13
      style="width: 100%; ">
12
      <el-table-column
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
        prop="name"
15
        prop="name"
21
        header-align="center"
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
      <el-table-column
20
      <el-table-column
27
        prop="parentName"
21
        prop="parentName"
28
        header-align="center"
22
        header-align="center"
89
</template>
83
</template>
90
84
91
<script>
85
<script>
92
  import TableTreeColumn from '@/components/table-tree-column'
93
  import AddOrUpdate from './menu-add-or-update'
86
  import AddOrUpdate from './menu-add-or-update'
94
  import { treeDataTranslate } from '@/utils'
87
  import { treeDataTranslate } from '@/utils'
95
  export default {
88
  export default {
102
      }
95
      }
103
    },
96
    },
104
    components: {
97
    components: {
105
      TableTreeColumn,
106
      AddOrUpdate
98
      AddOrUpdate
107
    },
99
    },
108
    activated () {
100
    activated () {