⬆️ 升级avue至2.8.12

dev
smallchill 5 years ago
parent 97ef3f0aca
commit 3a4d2ec6b1
  1. 9
      public/cdn/avue/2.8.12/avue.min.js
  2. 1
      public/cdn/avue/2.8.12/index.css
  3. 8
      public/cdn/avue/2.8.2/avue.min.js
  4. 1
      public/cdn/avue/2.8.2/index.css
  5. 4
      public/index.html
  6. 11
      src/components/basic-container/main.vue
  7. 8
      src/styles/element-ui.scss
  8. 2
      src/views/system/menu.vue

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -15,7 +15,7 @@
<link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/index.css">
<link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/avue/iconfont.css">
<link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/saber/iconfont.css">
<link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.8.2/index.css">
<link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.8.12/index.css">
<script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.png">
@ -108,7 +108,7 @@
<script src="<%= BASE_URL %>cdn/vue-router/3.0.1/vue-router.min.js" charset="utf-8"></script>
<script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
<script src="<%= BASE_URL %>cdn/element-ui/2.15.1/index.js" charset="utf-8"></script>
<script src="<%= BASE_URL %>cdn/avue/2.8.2/avue.min.js" charset="utf-8"></script>
<script src="<%= BASE_URL %>cdn/avue/2.8.12/avue.min.js" charset="utf-8"></script>
</body>
</html>

@ -1,14 +1,15 @@
<template>
<div class="basic-container"
:style="styleName"
:class="{'basic-container--block':block}">
<el-card>
<el-card class="basic-container__card">
<slot></slot>
</el-card>
</div>
</template>
<script>
export default {
export default {
name: "basicContainer",
props: {
radius: {
@ -31,7 +32,7 @@
}
}
}
};
};
</script>
<style lang="scss">
@ -40,11 +41,11 @@
box-sizing: border-box;
&--block {
height: 100%;
.el-card {
.basic-container__card {
height: 100%;
}
}
.el-card {
&__card {
width: 100%;
}
&:first-child {

@ -3,10 +3,10 @@
line-height: 28px !important;
}
.el-card.is-always-shadow {
box-shadow: none;
border: none !important;
}
//.el-card.is-always-shadow {
// box-shadow: none;
// border: none !important;
//}
.el-scrollbar__view {
height: 100%;

@ -34,7 +34,7 @@
icon="el-icon-circle-plus-outline"
size="small"
@click.stop="handleAdd(scope.row,scope.index)"
v-if="userInfo.role_name.includes('admin')"
v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
>新增子项
</el-button>
</template>

Loading…
Cancel
Save