vben преди 4 години
родител
ревизия
f96d6b221c

+ 1 - 2
src/components/Icon/index.tsx

@@ -53,8 +53,6 @@ export default defineComponent({
       }
     };
 
-    watch(() => props.icon, update, { flush: 'post' });
-
     const wrapStyleRef = computed((): any => {
       const { size, color } = props;
       let fs = size;
@@ -68,6 +66,7 @@ export default defineComponent({
       };
     });
 
+    watch(() => props.icon, update, { flush: 'post' });
     onMounted(update);
 
     return () => (

+ 0 - 2
src/components/Loading/BasicLoading.vue

@@ -15,8 +15,6 @@
   // components
   import { defineComponent, computed } from 'vue';
 
-  // hook
-
   import { SizeEnum, sizeMap } from '/@/enums/sizeEnum';
 
   import { BasicLoadingProps } from './type';

+ 1 - 1
src/components/Loading/FullLoading.vue

@@ -21,7 +21,6 @@
       absolute: Boolean as PropType<boolean>,
     },
     setup(props) {
-      // 样式前缀
       const getStyle = computed((): any => {
         return props.absolute
           ? {
@@ -32,6 +31,7 @@
             }
           : {};
       });
+
       return { getStyle, SizeEnum };
     },
   });

+ 0 - 1
src/components/Markdown/src/index.vue

@@ -29,7 +29,6 @@
     setup(props, { attrs, emit }) {
       const wrapRef = ref<Nullable<HTMLDivElement>>(null);
       const vditorRef = ref<Nullable<Vditor>>(null);
-
       const initedRef = ref(false);
 
       function init() {

+ 1 - 1
src/components/Menu/src/BasicMenu.tsx

@@ -66,7 +66,7 @@ export default defineComponent({
         offset += 54;
       }
       return {
-        height: `calc(100% - ${offset}px)`,
+        height: `calc(100% - ${offset - 30}px)`,
         position: 'relative',
         overflow: 'auto',
       };

+ 5 - 0
src/layouts/default/index.less

@@ -417,3 +417,8 @@
   padding: 0 16px;
   flex-grow: 1;
 }
+
+.ant-layout-sider-trigger {
+  height: 30px;
+  line-height: 30px;
+}