@touchvue/ui 1.0.0-beta.46 → 1.0.0-beta.47

package/es/packages/components/grid/src/grid-item.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, inject, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, renderSlot } from 'vue';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, renderSlot } from 'vue';
 
 const __default__ = defineComponent({
   name: "ToGridItem"
@@ -6,41 +6,13 @@ const __default__ = defineComponent({
 var _sfc_main = /* @__PURE__ */ defineComponent({
   ...__default__,
   props: {
-    merge: { default: 1 },
     width: { default: "" },
-    side: { type: Boolean, default: false }
+    flex: { type: Boolean, default: false }
   },
   setup(__props) {
     const props = __props;
-    const grid = inject("grid", {});
-    function parseVal(val) {
-      return Number(val != null ? val : 0);
-    }
     const setStyle = computed(() => {
       const style = {};
-      const space = parseVal(grid == null ? void 0 : grid.space);
-      const spaceX = parseVal(grid == null ? void 0 : grid.spaceX);
-      const spaceY = parseVal(grid == null ? void 0 : grid.spaceY);
-      if (space > 0) {
-        style.paddingTop = `${space}em`;
-        style.paddingLeft = `${space}em`;
-      }
-      if (spaceY > 0) {
-        style.paddingTop = `${spaceY}em`;
-      }
-      if (spaceX > 0) {
-        style.paddingLeft = `${spaceX}em`;
-      }
-      if (space === -1) {
-        style.marginTop = "-1px";
-        style.marginLeft = "-1px";
-      }
-      if (spaceY === -1) {
-        style.marginTop = "-1px";
-      }
-      if (spaceX === -1) {
-        style.marginLeft = "-1px";
-      }
       if (props.width) {
         if (!isNaN(Number(props.width))) {
           style.width = `${props.width}em`;
@@ -52,29 +24,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return style;
     });
-    const setClass = computed(() => {
-      const arr = [];
-      if (Number(props.merge) > 1) {
-        arr.push(`merge-${props.merge}`);
-      }
-      if (props.side) {
-        arr.push("is-side");
-      }
-      return arr;
-    });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(
-        "div",
-        {
-          class: normalizeClass(["to-grid-item", setClass.value]),
-          style: normalizeStyle(setStyle.value)
-        },
-        [
-          renderSlot(_ctx.$slots, "default")
-        ],
-        6
-        /* CLASS, STYLE */
-      );
+      return openBlock(), createElementBlock("div", {
+        flex: _ctx.flex ? _ctx.flex : null,
+        class: "to-grid-item",
+        style: normalizeStyle(setStyle.value)
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 12, ["flex"]);
     };
   }
 });

package/es/packages/components/grid/src/grid-item.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"grid-item.vue2.mjs","sources":["../../../../../../packages/components/grid/src/grid-item.vue"],"sourcesContent":["<script lang=\"ts\">\nimport { defineComponent as DO_defineComponent } from 'vue';\nexport default /*#__PURE__*/ DO_defineComponent({\n\tname: 'ToGridItem',\n});\n</script>\n<template>\n\t<div class=\"to-grid-item\" :style=\"setStyle\" :class=\"setClass\">\n\t\t<slot></slot>\n\t</div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, inject } from 'vue'\n\n\nexport interface GridProps {\n\tspace?: number | string\n\tspaceX?: number | string\n\tspaceY?: number | string\n}\n\nexport interface Props {\n\tmerge?: number | string\n\twidth?: number | string\n\tside?: boolean\n}\n\nconst props = withDefaults(defineProps<Props>(), {\n\tmerge: 1,\n\twidth: '',\n\tside: false,\n})\n\nconst grid = inject<GridProps>('grid', {})\n\nfunction parseVal(val: number | string | undefined): number {\n\treturn Number(val ?? 0)\n}\n\nconst setStyle = computed(() => {\n\tconst style: Record<string, string> = {}\n\n\tconst space = parseVal(grid?.space)\n\tconst spaceX = parseVal(grid?.spaceX)\n\tconst spaceY = parseVal(grid?.spaceY)\n\n\tif (space > 0) {\n\t\tstyle.paddingTop = `${space}em`\n\t\tstyle.paddingLeft = `${space}em`\n\t}\n\tif (spaceY > 0) {\n\t\tstyle.paddingTop = `${spaceY}em`\n\t}\n\tif (spaceX > 0) {\n\t\tstyle.paddingLeft = `${spaceX}em`\n\t}\n\n\tif (space === -1) {\n\t\tstyle.marginTop = '-1px'\n\t\tstyle.marginLeft = '-1px'\n\t}\n\tif (spaceY === -1) {\n\t\tstyle.marginTop = '-1px'\n\t}\n\tif (spaceX === -1) {\n\t\tstyle.marginLeft = '-1px'\n\t}\n\n\tif (props.width) {\n\t\tif (!isNaN(Number(props.width))) {\n\t\t\tstyle.width = `${props.width}em`\n\t\t} else if (props.width === 'full') {\n\t\t\tstyle.width = '100%'\n\t\t} else {\n\t\t\tstyle.width = props.width.toString()\n\t\t}\n\t}\n\n\treturn style\n})\n\nconst setClass = computed(() => {\n\tconst arr: string[] = []\n\n\tif (Number(props.merge) > 1) {\n\t\tarr.push(`merge-${props.merge}`)\n\t}\n\tif (props.side) {\n\t\tarr.push('is-side')\n\t}\n\n\treturn arr\n})\n</script>\n"],"names":["DO_defineComponent","_createElementBlock","_normalizeClass","_renderSlot"],"mappings":"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"}
+{"version":3,"file":"grid-item.vue2.mjs","sources":["../../../../../../packages/components/grid/src/grid-item.vue"],"sourcesContent":["<script lang=\"ts\">\nimport { defineComponent as DO_defineComponent } from 'vue';\nexport default /*#__PURE__*/ DO_defineComponent({\n\tname: 'ToGridItem'\n});\n</script>\n<template>\n\t<div :flex=\"flex ? flex : null\" class=\"to-grid-item\" :style=\"setStyle\">\n\t\t<slot></slot>\n\t</div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed } from 'vue'\n\n\n\nexport interface Props {\n\twidth?: number | string\n\tflex?: boolean\n}\n\nconst props = withDefaults(defineProps<Props>(), {\n\twidth: '',\n\tflex: false\n})\n\nconst setStyle = computed(() => {\n\tconst style: Record<string, string> = {}\n\n\tif (props.width) {\n\t\tif (!isNaN(Number(props.width))) {\n\t\t\tstyle.width = `${props.width}em`\n\t\t} else if (props.width === 'full') {\n\t\t\tstyle.width = '100%'\n\t\t} else {\n\t\t\tstyle.width = props.width.toString()\n\t\t}\n\t}\n\n\treturn style\n})\n</script>\n"],"names":["DO_defineComponent","_createElementBlock","flex","_renderSlot"],"mappings":";;AAEA,MAAA,cAA6BA,eAAmB,CAAA;AAAA,EAC/C,IAAM,EAAA,YAAA;AACP,CAAC,CAAA,CAAA;;;;;;;;AAkBD,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAKd,IAAM,MAAA,QAAA,GAAW,SAAS,MAAM;AAC/B,MAAA,MAAM,QAAgC,EAAC,CAAA;AAEvC,MAAA,IAAI,MAAM,KAAO,EAAA;AAChB,QAAA,IAAI,CAAC,KAAM,CAAA,MAAA,CAAO,KAAM,CAAA,KAAK,CAAC,CAAG,EAAA;AAChC,UAAM,KAAA,CAAA,KAAA,GAAQ,GAAG,KAAM,CAAA,KAAA,CAAA,EAAA,CAAA,CAAA;AAAA,SACxB,MAAA,IAAW,KAAM,CAAA,KAAA,KAAU,MAAQ,EAAA;AAClC,UAAA,KAAA,CAAM,KAAQ,GAAA,MAAA,CAAA;AAAA,SACR,MAAA;AACN,UAAM,KAAA,CAAA,KAAA,GAAQ,KAAM,CAAA,KAAA,CAAM,QAAS,EAAA,CAAA;AAAA,SACpC;AAAA,OACD;AAEA,MAAO,OAAA,KAAA,CAAA;AAAA,KACP,CAAA,CAAA;;wBAlCA,EAAAC,kBAAA,CAEM,KAAA,EAAA;AAAA,QAFA,IAAMC,EAAAA,IAAAA,CAAI,IAAGA,GAAAA,IAAAA,CAAI,IAAA,GAAA,IAAA;AAAA,QAAS,KAAM,EAAA,cAAA;AAAA,QAAgB,KAAA,gBAAO,CAAA,QAAA,CAAQ,KAAA,CAAA;AAAA;QACpEC,UAAA,CAAa,IAAA,CAAA,MAAA,EAAA,SAAA,CAAA;AAAA;;;;;;;"}

package/es/packages/hooks/useDevice.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useDevice.mjs","sources":["../../../../packages/hooks/useDevice.ts"],"sourcesContent":["import { ref, computed, onMounted, onUnmounted } from 'vue';\nimport { getMedia } from '@touchvue/utils';\n\n/**\n * 设备类型\n */\nexport type DeviceType = 'pc' | 'pad' | 'phone';\n\n/**\n * 全局设备检测管理器\n * 使用单例模式避免重复注册resize事件\n */\nclass DeviceManager {\n  private static instance: DeviceManager;\n  private deviceType = ref<DeviceType>(getMedia());\n  private listeners = new Set<() => void>();\n  private resizeHandler: (() => void) | null = null;\n\n  private constructor() {\n    this.initResizeListener();\n  }\n\n  static getInstance(): DeviceManager {\n    if (!DeviceManager.instance) {\n      DeviceManager.instance = new DeviceManager();\n    }\n    return DeviceManager.instance;\n  }\n\n  private initResizeListener() {\n    if (typeof window !== 'undefined') {\n      this.resizeHandler = () => {\n        const newDeviceType = getMedia();\n        if (this.deviceType.value !== newDeviceType) {\n          this.deviceType.value = newDeviceType;\n          // 通知所有监听器\n          this.listeners.forEach(listener => listener());\n        }\n      };\n      window.addEventListener('resize', this.resizeHandler);\n    }\n  }\n\n  getDeviceType() {\n    return this.deviceType;\n  }\n\n  addListener(listener: () => void) {\n    this.listeners.add(listener);\n  }\n\n  removeListener(listener: () => void) {\n    this.listeners.delete(listener);\n\n    // 如果没有监听器了，移除resize事件\n    if (this.listeners.size === 0 && this.resizeHandler && typeof window !== 'undefined') {\n      window.removeEventListener('resize', this.resizeHandler);\n      this.resizeHandler = null;\n    }\n  }\n\n  destroy() {\n    if (this.resizeHandler && typeof window !== 'undefined') {\n      window.removeEventListener('resize', this.resizeHandler);\n    }\n    this.listeners.clear();\n    this.resizeHandler = null;\n  }\n}\n\n/**\n * 设备检测 Hook\n * 提供响应式的设备类型判断，替代 Vue2 中的 $phone、$pc、$pad\n * 使用单例模式避免重复注册resize事件监听器\n */\nexport function useDevice() {\n  const manager = DeviceManager.getInstance();\n  const deviceType = manager.getDeviceType();\n\n  // 计算属性：是否为手机\n  const isPhone = computed(() => deviceType.value === 'phone');\n\n  // 计算属性：是否为平板\n  const isPad = computed(() => deviceType.value === 'pad');\n\n  // 计算属性：是否为PC\n  const isPc = computed(() => deviceType.value === 'pc');\n\n  // 计算属性：是否为移动设备（手机或平板）\n  const isMobile = computed(() => deviceType.value === 'phone' || deviceType.value === 'pad');\n\n  // 更新设备类型的回调\n  const updateCallback = () => {\n    // 这里不需要做任何事情，因为deviceType是响应式的\n    // 当manager更新deviceType时，所有计算属性会自动更新\n  };\n\n  // 手动更新设备类型\n  const updateDeviceType = () => {\n    const newDeviceType = getMedia();\n    if (deviceType.value !== newDeviceType) {\n      // 直接更新manager中的deviceType\n      (deviceType as any).value = newDeviceType;\n    }\n  };\n\n  // 组件挂载时添加监听器\n  onMounted(() => {\n    manager.addListener(updateCallback);\n  });\n\n  // 组件卸载时移除监听器\n  onUnmounted(() => {\n    manager.removeListener(updateCallback);\n  });\n\n  return {\n    // 设备类型（响应式）\n    deviceType,\n\n    // 响应式判断\n    isPhone,\n    isPad,\n    isPc,\n    isMobile,\n\n    // 手动更新设备类型\n    updateDeviceType,\n  };\n}\n\n/**\n * 获取当前设备类型（非响应式）\n * @returns 设备类型字符串\n */\nexport function getDeviceType(): DeviceType {\n  return getMedia();\n}\n\n/**\n * 判断是否为手机设备（非响应式）\n * @returns 是否为手机\n */\nexport function isPhoneDevice(): boolean {\n  return getMedia() === 'phone';\n}\n\n/**\n * 判断是否为平板设备（非响应式）\n * @returns 是否为平板\n */\nexport function isPadDevice(): boolean {\n  return getMedia() === 'pad';\n}\n\n/**\n * 判断是否为PC设备（非响应式）\n * @returns 是否为PC\n */\nexport function isPcDevice(): boolean {\n  return getMedia() === 'pc';\n}\n\n/**\n * 判断是否为移动设备（非响应式）\n * @returns 是否为移动设备（手机或平板）\n */\nexport function isMobileDevice(): boolean {\n  const device = getMedia();\n  return device === 'phone' || device === 'pad';\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDevice.mjs","sources":["../../../../packages/hooks/useDevice.ts"],"sourcesContent":["import { ref, computed, onMounted, onUnmounted } from 'vue'\nimport { getMedia } from '@touchvue/utils'\n\n/**\n * 设备类型\n */\nexport type DeviceType = 'pc' | 'pad' | 'phone'\n\n/**\n * 全局设备检测管理器\n * 使用单例模式避免重复注册resize事件\n */\nclass DeviceManager {\n\tprivate static instance: DeviceManager\n\tprivate deviceType = ref<DeviceType>(getMedia())\n\tprivate listeners = new Set<() => void>()\n\tprivate resizeHandler: (() => void) | null = null\n\n\tprivate constructor() {\n\t\tthis.initResizeListener()\n\t}\n\n\tstatic getInstance(): DeviceManager {\n\t\tif (!DeviceManager.instance) {\n\t\t\tDeviceManager.instance = new DeviceManager()\n\t\t}\n\t\treturn DeviceManager.instance\n\t}\n\n\tprivate initResizeListener() {\n\t\tif (typeof window !== 'undefined') {\n\t\t\tthis.resizeHandler = () => {\n\t\t\t\tconst newDeviceType = getMedia()\n\t\t\t\tif (this.deviceType.value !== newDeviceType) {\n\t\t\t\t\tthis.deviceType.value = newDeviceType\n\t\t\t\t\t// 通知所有监听器\n\t\t\t\t\tthis.listeners.forEach(listener => listener())\n\t\t\t\t}\n\t\t\t}\n\t\t\twindow.addEventListener('resize', this.resizeHandler)\n\t\t}\n\t}\n\n\tgetDeviceType() {\n\t\treturn this.deviceType\n\t}\n\n\taddListener(listener: () => void) {\n\t\tthis.listeners.add(listener)\n\t}\n\n\tremoveListener(listener: () => void) {\n\t\tthis.listeners.delete(listener)\n\n\t\t// 如果没有监听器了，移除resize事件\n\t\tif (this.listeners.size === 0 && this.resizeHandler && typeof window !== 'undefined') {\n\t\t\twindow.removeEventListener('resize', this.resizeHandler)\n\t\t\tthis.resizeHandler = null\n\t\t}\n\t}\n\n\tdestroy() {\n\t\tif (this.resizeHandler && typeof window !== 'undefined') {\n\t\t\twindow.removeEventListener('resize', this.resizeHandler)\n\t\t}\n\t\tthis.listeners.clear()\n\t\tthis.resizeHandler = null\n\t}\n}\n\n/**\n * 设备检测 Hook\n * 提供响应式的设备类型判断，替代 Vue2 中的 $phone、$pc、$pad\n * 使用单例模式避免重复注册resize事件监听器\n */\nexport function useDevice() {\n\tconst manager = DeviceManager.getInstance()\n\tconst deviceType = manager.getDeviceType()\n\n\t// 计算属性：是否为手机\n\tconst isPhone = computed(() => deviceType.value === 'phone')\n\n\t// 计算属性：是否为平板\n\tconst isPad = computed(() => deviceType.value === 'pad')\n\n\t// 计算属性：是否为PC\n\tconst isPc = computed(() => deviceType.value === 'pc')\n\n\t// 计算属性：是否为移动设备（手机或平板）\n\tconst isMobile = computed(() => deviceType.value === 'phone' || deviceType.value === 'pad')\n\n\t// 更新设备类型的回调\n\tconst updateCallback = () => {\n\t\t// 这里不需要做任何事情，因为deviceType是响应式的\n\t\t// 当manager更新deviceType时，所有计算属性会自动更新\n\t}\n\n\t// 手动更新设备类型\n\tconst updateDeviceType = () => {\n\t\tconst newDeviceType = getMedia()\n\t\tif (deviceType.value !== newDeviceType) {\n\t\t\t// 直接更新manager中的deviceType\n\t\t\t;(deviceType as any).value = newDeviceType\n\t\t}\n\t}\n\n\t// 组件挂载时添加监听器\n\tonMounted(() => {\n\t\tmanager.addListener(updateCallback)\n\t})\n\n\t// 组件卸载时移除监听器\n\tonUnmounted(() => {\n\t\tmanager.removeListener(updateCallback)\n\t})\n\n\treturn {\n\t\t// 设备类型（响应式）\n\t\tdeviceType,\n\n\t\t// 响应式判断\n\t\tisPhone,\n\t\tisPad,\n\t\tisPc,\n\t\tisMobile,\n\n\t\t// 手动更新设备类型\n\t\tupdateDeviceType\n\t}\n}\n\n/**\n * 获取当前设备类型（非响应式）\n * @returns 设备类型字符串\n */\nexport function getDeviceType(): DeviceType {\n\treturn getMedia()\n}\n\n/**\n * 判断是否为手机设备（非响应式）\n * @returns 是否为手机\n */\nexport function isPhoneDevice(): boolean {\n\treturn getMedia() === 'phone'\n}\n\n/**\n * 判断是否为平板设备（非响应式）\n * @returns 是否为平板\n */\nexport function isPadDevice(): boolean {\n\treturn getMedia() === 'pad'\n}\n\n/**\n * 判断是否为PC设备（非响应式）\n * @returns 是否为PC\n */\nexport function isPcDevice(): boolean {\n\treturn getMedia() === 'pc'\n}\n\n/**\n * 判断是否为移动设备（非响应式）\n * @returns 是否为移动设备（手机或平板）\n */\nexport function isMobileDevice(): boolean {\n\tconst device = getMedia()\n\treturn device === 'phone' || device === 'pad'\n}\n"],"names":[],"mappings":"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"}

package/lib/components/float/index.d.ts

@@ -76,6 +76,10 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
             type: BooleanConstructor;
             default: boolean;
         };
+        speed: {
+            type: (NumberConstructor | StringConstructor)[];
+            default: number;
+        };
     }>> & Readonly<{}>, {
         open: (by?: any) => void;
         close: (e?: Event) => void;
@@ -101,6 +105,7 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
         mask: boolean;
         dx: string | number;
         dy: string | number;
+        speed: string | number;
     }, true, {}, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
         P: {};
         B: {};
@@ -185,6 +190,10 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
             type: BooleanConstructor;
             default: boolean;
         };
+        speed: {
+            type: (NumberConstructor | StringConstructor)[];
+            default: number;
+        };
     }>> & Readonly<{}>, {
         open: (by?: any) => void;
         close: (e?: Event) => void;
@@ -210,6 +219,7 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
         mask: boolean;
         dx: string | number;
         dy: string | number;
+        speed: string | number;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -291,6 +301,10 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
         type: BooleanConstructor;
         default: boolean;
     };
+    speed: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
 }>> & Readonly<{}>, {
     open: (by?: any) => void;
     close: (e?: Event) => void;
@@ -316,6 +330,7 @@ export declare const ToFloat: import("@touchvue/ui/lib/utils").SFCWithInstall<{
     mask: boolean;
     dx: string | number;
     dy: string | number;
+    speed: string | number;
 }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {
         default?(_: {}): any;

package/lib/components/float/src/Float.vue.d.ts

@@ -82,6 +82,10 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: BooleanConstructor;
         default: boolean;
     };
+    speed: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
 }>, {
     open: typeof open;
     close: typeof close;
@@ -164,6 +168,10 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         type: BooleanConstructor;
         default: boolean;
     };
+    speed: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
 }>> & Readonly<{}>, {
     mode: string;
     left: string | number;
@@ -184,6 +192,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     mask: boolean;
     dx: string | number;
     dy: string | number;
+    speed: string | number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/lib/components/float/src/float.d.ts

@@ -76,6 +76,10 @@ export declare const floatProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    speed: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
 };
 export type FloatProps = ExtractPropTypes<typeof floatProps>;
 export declare const floatEmits: string[];

package/lib/components/grid/src/grid-item.vue.d.ts

@@ -1,20 +1,13 @@
-export interface GridProps {
-    space?: number | string;
-    spaceX?: number | string;
-    spaceY?: number | string;
-}
 export interface Props {
-    merge?: number | string;
     width?: number | string;
-    side?: boolean;
+    flex?: boolean;
 }
 declare function __VLS_template(): {
     default?(_: {}): any;
 };
 declare const __VLS_component: import("vue").DefineComponent<Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<Props> & Readonly<{}>, {
+    flex: boolean;
     width: number | string;
-    merge: number | string;
-    side: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/lib/components/scroll/index.d.ts

@@ -88,8 +88,8 @@ export declare const ToScroll: import("@touchvue/ui/lib/utils").SFCWithInstall<{
         modelValue: string | number;
         bottom: string | number;
         top: string | number;
-        virtual: boolean;
         speed: number;
+        virtual: boolean;
         barDisplay: string;
         except: string;
     }, true, {}, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
@@ -180,8 +180,8 @@ export declare const ToScroll: import("@touchvue/ui/lib/utils").SFCWithInstall<{
         modelValue: string | number;
         bottom: string | number;
         top: string | number;
-        virtual: boolean;
         speed: number;
+        virtual: boolean;
         barDisplay: string;
         except: string;
     }>;
@@ -277,8 +277,8 @@ export declare const ToScroll: import("@touchvue/ui/lib/utils").SFCWithInstall<{
     modelValue: string | number;
     bottom: string | number;
     top: string | number;
-    virtual: boolean;
     speed: number;
+    virtual: boolean;
     barDisplay: string;
     except: string;
 }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {

package/lib/components/scroll/src/Scroll.vue.d.ts

@@ -145,8 +145,8 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     modelValue: string | number;
     bottom: string | number;
     top: string | number;
-    virtual: boolean;
     speed: number;
+    virtual: boolean;
     barDisplay: string;
     except: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/lib/packages/components/float/src/Float.vue2.js

@@ -63,6 +63,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         arr.push("is-mask");
       return arr;
     });
+    const transitionTransform = vue.computed(() => `transform ${props.speed}ms ease-out`);
     const setStyle = vue.computed(() => {
       var _a;
       const obj = {};
@@ -151,6 +152,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       } else if (link2) {
         if (wrapper.value)
           wrapper.value.style.height = "";
+        if (el.value) {
+          el.value.style.transition = "none";
+          el.value.style.transform = "";
+        }
         vue.nextTick(() => {
           var _a, _b;
           if (!props.width && el.value) {
@@ -213,71 +218,77 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }
               }
             }
-            if (el.value === null)
-              return;
-            if (iposition.value === "top") {
-              el.value.style.top = "";
-              el.value.style.bottom = bottomSpace + linkHeight - 1 - dy + "px";
-            }
-            if (iposition.value === "bottom") {
-              el.value.style.top = topSpace + linkHeight - 1 + dy + "px";
-              el.value.style.bottom = "";
-            }
-            if (iposition.value === "top" || iposition.value === "bottom") {
-              if (ialign.value === "left") {
-                el.value.style.left = leftSpace + dx + "px";
-                el.value.style.right = "";
-              } else if (ialign.value === "center") {
-                el.value.style.left = leftSpace - wrapperWidth / 2 + linkWidth / 2 + "px";
-                el.value.style.right = "";
-              } else {
-                el.value.style.right = rightSpace - dx + "px";
-                el.value.style.left = "";
-              }
-            }
-            if (iposition.value === "left") {
-              el.value.style.right = rightSpace + linkWidth - dx - 1 + "px";
-              el.value.style.left = "";
-            }
-            if (iposition.value === "right") {
-              el.value.style.left = leftSpace + linkWidth + dx - 1 + "px";
-              el.value.style.right = "";
-            }
-            if (iposition.value === "left" || iposition.value === "right") {
-              if (ialign.value === "bottom") {
+            if (el.value) {
+              if (iposition.value === "top") {
                 el.value.style.top = "";
-                el.value.style.bottom = bottomSpace - dy + "px";
-              } else {
-                el.value.style.top = topSpace + dy + "px";
+                el.value.style.bottom = bottomSpace + linkHeight - 1 - dy + "px";
+              }
+              if (iposition.value === "bottom") {
+                el.value.style.top = topSpace + linkHeight - 1 + dy + "px";
                 el.value.style.bottom = "";
               }
-            }
-            if (iposition.value === "bottom") {
-              useSpace = bottomSpace;
-              origin.value = "top";
-            } else if (iposition.value === "top") {
-              useSpace = topSpace;
-              origin.value = "bottom";
-            } else {
-              if (ialign.value === "bottom") {
-                useSpace = topSpace + linkHeight;
-                origin.value = "bottom";
-              } else if (ialign.value === "top") {
-                useSpace = bottomSpace + linkHeight;
+              if (iposition.value === "top" || iposition.value === "bottom") {
+                if (ialign.value === "left") {
+                  el.value.style.left = leftSpace + dx + "px";
+                  el.value.style.right = "";
+                } else if (ialign.value === "center") {
+                  el.value.style.left = leftSpace - wrapperWidth / 2 + linkWidth / 2 + "px";
+                  el.value.style.right = "";
+                } else {
+                  el.value.style.right = rightSpace - dx + "px";
+                  el.value.style.left = "";
+                }
+              }
+              if (iposition.value === "left") {
+                el.value.style.right = rightSpace + linkWidth - dx - 1 + "px";
+                el.value.style.left = "";
+              }
+              if (iposition.value === "right") {
+                el.value.style.left = leftSpace + linkWidth + dx - 1 + "px";
+                el.value.style.right = "";
+              }
+              if (iposition.value === "left" || iposition.value === "right") {
+                if (ialign.value === "bottom") {
+                  el.value.style.top = "";
+                  el.value.style.bottom = bottomSpace - dy + "px";
+                } else {
+                  el.value.style.top = topSpace + dy + "px";
+                  el.value.style.bottom = "";
+                }
+              }
+              if (iposition.value === "bottom") {
+                useSpace = bottomSpace;
                 origin.value = "top";
+              } else if (iposition.value === "top") {
+                useSpace = topSpace;
+                origin.value = "bottom";
               } else {
-                console.error("[ToFloat] \u6D6E\u5C42\u5BF9\u9F50\u65B9\u5F0F\u8BBE\u7F6E\u9519\u8BEF\uFF01position \u5728\u5DE6\u53F3\u4E24\u4FA7\u65F6\uFF0C\u5BF9\u9F50\u65B9\u5F0F\u5E94\u662F\u9876\u90E8\u6216\u5E95\u90E8");
+                if (ialign.value === "bottom") {
+                  useSpace = topSpace + linkHeight;
+                  origin.value = "bottom";
+                } else if (ialign.value === "top") {
+                  useSpace = bottomSpace + linkHeight;
+                  origin.value = "top";
+                } else {
+                  console.error("[ToFloat] \u6D6E\u5C42\u5BF9\u9F50\u65B9\u5F0F\u8BBE\u7F6E\u9519\u8BEF\uFF01position \u5728\u5DE6\u53F3\u4E24\u4FA7\u65F6\uFF0C\u5BF9\u9F50\u65B9\u5F0F\u5E94\u662F\u9876\u90E8\u6216\u5E95\u90E8");
+                }
+              }
+              if (useSpace < wrapperHeight && wrapper.value) {
+                isOver.value = true;
+                wrapper.value.style.height = useSpace + "px";
+              }
+              if (link2) {
+                const ratio = link2.getBoundingClientRect().width / link2.offsetWidth;
+                const ratio2 = Number(getComputedStyle(link2).fontSize.trim().toLowerCase().replace(/px$/, "")) / Number(getComputedStyle(document.body).fontSize.trim().toLowerCase().replace(/px$/, ""));
+                size.value = ratio * ratio2;
               }
             }
-            if (useSpace < wrapperHeight && wrapper.value) {
-              isOver.value = true;
-              wrapper.value.style.height = useSpace + "px";
-            }
-            if (link2) {
-              const ratio = link2.getBoundingClientRect().width / link2.offsetWidth;
-              const ratio2 = Number(getComputedStyle(link2).fontSize.trim().toLowerCase().replace(/px$/, "")) / Number(getComputedStyle(document.body).fontSize.trim().toLowerCase().replace(/px$/, ""));
-              size.value = ratio * ratio2;
-            }
+          }
+          if (el.value) {
+            setOpenStyle();
+          }
+          if (link2 && !("x" in link2) && !("touches" in link2)) {
+            setScrollStatus();
           }
         });
       }
@@ -318,7 +329,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             emit("opened");
             clearTimeout(timer);
             timer = null;
-          }, 100);
+          }, Number(props.speed));
           isOpen.value = true;
         } else {
           document.body.addEventListener("mousedown", blur);
@@ -347,10 +358,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }
           setTimeout(() => {
             set(link.value);
-            setOpenStyle();
-            if (link.value && !("x" in link.value) && !("touches" in link.value)) {
-              setScrollStatus();
-            }
           }, 0);
           if (props.afterOpen && Object.prototype.toString.call(props.afterOpen) === "[object Function]") {
             props.afterOpen();
@@ -376,22 +383,24 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           wrapper.value.style.transform = "translateX(-100%)";
         }
         setTimeout(() => {
-          wrapper.value.style.transition = "transform 100ms ease-out";
+          wrapper.value.style.transition = transitionTransform.value;
           wrapper.value.style.transform = "translateY(0)";
           setTimeout(() => {
             wrapper.value.style.transform = "";
-          }, 100);
+          }, Number(props.speed));
         }, 0);
       } else {
+        el.value.style.transition = "none";
         el.value.style.transform = "scale(1, 0)";
         el.value.style.visibility = "visible";
-        setTimeout(() => {
-          el.value.style.transition = "transform 100ms ease-out";
+        requestAnimationFrame(() => {
+          el.value.style.transition = transitionTransform.value;
           el.value.style.transform = "scale(1)";
           setTimeout(() => {
             el.value.style.transform = "";
-          }, 100);
-        }, 0);
+            el.value.style.transition = "";
+          }, Number(props.speed));
+        });
       }
       el.value.style.zIndex = (_a = window.$TouchUI) == null ? void 0 : _a.zIndex;
     }
@@ -441,7 +450,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props.afterClose && Object.prototype.toString.call(props.afterClose) === "[object Function]") {
           props.afterClose();
         }
-      }, 100);
+      }, Number(props.speed));
     }
     function setCloseStyle() {
       if (props.slide) {
@@ -458,7 +467,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           wrapper.value.style.transform = "translateX(-100%)";
         }
       } else {
-        el.value.style.transform = "scale(1,0)";
+        el.value.style.transition = transitionTransform.value;
+        el.value.style.transform = "scale(1, 0)";
       }
     }
     function toggle(by) {