diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx index 0a9a98d5310a5cb6292cc58c8fe0d3ad3c266665..500c4a09da3d7071260fbdf206b9102073eea656 100644 --- a/src/components/Icon/index.tsx +++ b/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 () => ( diff --git a/src/components/Loading/BasicLoading.vue b/src/components/Loading/BasicLoading.vue index 1015257de562c26ced209344a35bcdb96d28d029..f0afa908b1a00bbf0e7ada9e073adaa1bfc32f2f 100644 --- a/src/components/Loading/BasicLoading.vue +++ b/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'; diff --git a/src/components/Loading/FullLoading.vue b/src/components/Loading/FullLoading.vue index a2b436f9058ab5ff0e448889924a331ff3f1c427..4b0dcc871478ada5e594d9ad782f40e6418ad5a8 100644 --- a/src/components/Loading/FullLoading.vue +++ b/src/components/Loading/FullLoading.vue @@ -21,7 +21,6 @@ absolute: Boolean as PropType, }, setup(props) { - // 样式前缀 const getStyle = computed((): any => { return props.absolute ? { @@ -32,6 +31,7 @@ } : {}; }); + return { getStyle, SizeEnum }; }, }); diff --git a/src/components/Markdown/src/index.vue b/src/components/Markdown/src/index.vue index b90234443b1b17b33b3c9333073e43e2c09fc2b2..86142a2fe7b1ff20c452da3218942e01d9ccea4f 100644 --- a/src/components/Markdown/src/index.vue +++ b/src/components/Markdown/src/index.vue @@ -29,7 +29,6 @@ setup(props, { attrs, emit }) { const wrapRef = ref>(null); const vditorRef = ref>(null); - const initedRef = ref(false); function init() { diff --git a/src/components/Menu/src/BasicMenu.tsx b/src/components/Menu/src/BasicMenu.tsx index 538bbb56c1f03713e65d660777d650f22ea9b41f..650b9becc14896fabe89b6ea32623a7abf5ae174 100644 --- a/src/components/Menu/src/BasicMenu.tsx +++ b/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', }; diff --git a/src/layouts/default/index.less b/src/layouts/default/index.less index e293c79b559525dbc77bee7f9b6de21dce0b0e8d..c1bdfeacc68b2bd485cccfbbaad1e3021320be77 100644 --- a/src/layouts/default/index.less +++ b/src/layouts/default/index.less @@ -417,3 +417,8 @@ padding: 0 16px; flex-grow: 1; } + +.ant-layout-sider-trigger { + height: 30px; + line-height: 30px; +}