Merge branch 'main' into pages

src/components/ReSegmented/src/index.tsx

@@ -127,7 +127,9 @@ export default defineComponent({
       }
     );
 
-    watch(() => props.size, handleResizeInit);
+    watch(() => props.size, handleResizeInit, {
+      immediate: true
+    });
 
     const rendLabel = () => {
       return props.options.map((option, index) => {

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -4,7 +4,7 @@ import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";
 
-const props = defineProps({
+defineProps({
   noticeItem: {
     type: Object as PropType<ListItem>,
     default: () => {}

src/layout/components/lay-search/components/SearchFooter.vue

@@ -6,7 +6,7 @@ import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
 import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 
-const props = withDefaults(defineProps<{ total: number }>(), {
+withDefaults(defineProps<{ total: number }>(), {
   total: 0
 });
 

src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue

@@ -10,7 +10,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue

@@ -2,7 +2,7 @@
 import { toRaw } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 
-const props = defineProps({
+defineProps({
   extraIcon: {
     type: String,
     default: ""

src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue

@@ -10,7 +10,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/layout/components/lay-sidebar/components/SidebarLogo.vue

@@ -2,7 +2,7 @@
 import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-const props = defineProps({
+defineProps({
   collapse: Boolean
 });
 

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -7,7 +7,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/views/schema-form/form/base.vue

@@ -127,7 +127,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/dialog.vue

@@ -180,7 +180,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/drawer.vue

@@ -180,7 +180,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/steps.vue

@@ -197,7 +197,7 @@ const next = (actives: number, values: any) => {
     v-model="active"
     simple
     class="w-[800px] m-auto"
-    :data="stepForm"
+    :data="stepForm as any"
     align-center
     @next="next"
   />