Ver Fonte

:arrow_up: 升级avue至2.8.12

smallchill há 5 anos atrás
pai
commit
3a4d2ec6b1

Diff do ficheiro suprimidas por serem muito extensas
+ 6 - 0
public/cdn/avue/2.8.12/avue.min.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
public/cdn/avue/2.8.12/index.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 6
public/cdn/avue/2.8.2/avue.min.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
public/cdn/avue/2.8.2/index.css


+ 2 - 2
public/index.html

@@ -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>

+ 25 - 24
src/components/basic-container/main.vue

@@ -1,37 +1,38 @@
 <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 {
-    name: "basicContainer",
-    props: {
-      radius: {
-        type: [String, Number],
-        default: 10
-      },
-      background: {
-        type: String
-      },
-      block: {
-        type: Boolean,
-        default: false
-      }
+export default {
+  name: "basicContainer",
+  props: {
+    radius: {
+      type: [String, Number],
+      default: 10
+    },
+    background: {
+      type: String
     },
-    computed: {
-      styleName () {
-        return {
-          borderRadius: this.setPx(this.radius),
-          background: this.background,
-        }
+    block: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    styleName () {
+      return {
+        borderRadius: this.setPx(this.radius),
+        background: this.background,
       }
     }
-  };
+  }
+};
 </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 {

+ 4 - 4
src/styles/element-ui.scss

@@ -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%;

+ 1 - 1
src/views/system/menu.vue

@@ -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>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff