snail.vue 1.0.41 → 1.0.42

package/dist/snail.vue.d.ts

@@ -444,23 +444,70 @@ type ScrollOptions = {
  */
 type ScrollEvents = {
     /**
-     * 滚动条显示、隐藏事件
-     * - x轴是否展示，y轴是否显示
+     * 【x轴方向】滚动条变化时
+     * @param show 是否显示。true 滚动条显示；false 滚动条隐藏
      */
-    bar: [x: boolean, y: boolean];
+    xbar: [show: boolean];
     /**
-     * 滚动条触碰事件，到顶了、到底了
+     * 【x轴方向】滚到【最左侧】了
      */
-    touch: [type: ScrollTouchType];
+    left: [];
+    /**
+     * 【x轴方向】滚到【最右侧】了
+     */
+    right: [];
+    /**
+     * 【y轴方向】滚动条变化时
+     * @param show 是否显示。true 滚动条显示；false 滚动条隐藏
+     */
+    ybar: [show: boolean];
+    /**
+     * 【y轴方向】滚到【最顶部】了
+     */
+    top: [];
+    /**
+     * 【y轴方向】滚到【最底部】了
+     */
+    bottom: [];
 };
 /**
- * 滚动触碰类型
- * - left   最左侧
- * - right  最右侧
- * - top    最顶部
- * - bottom 最底部
+ * 滚动视图状态
+ * - 缓存起来 和下次滚动做比对，触发对应事件
  */
-type ScrollTouchType = "left" | "right" | "top" | "bottom";
+type ScrollStatus = {
+    /**
+     * 水平滚动条是否显示
+     */
+    xbar: boolean;
+    /**
+     * 垂直滚动条是否显示
+     */
+    ybar: boolean;
+    /**
+     * 滚动到【左侧】了
+     */
+    left: boolean;
+    /**
+     * 滚动到【右侧】了
+     */
+    right: boolean;
+    /**
+     * 滚动到【顶部】了
+     */
+    top: boolean;
+    /**
+     * 滚动到【底部】了
+     */
+    bottom: boolean;
+    /**
+     * 滚动视图宽度
+     */
+    scrollwidth: number;
+    /**
+     * 滚动视图高度
+     */
+    scrollheight: number;
+};
 
 /**
  * Table配置选项
@@ -544,6 +591,40 @@ type ComponentOptions = {
      */
     url?: string;
 };
+/**
+ * 提取【组件事件】类型
+ * - 将【组件事件】中的key首字母小写，追加上on前缀；key对应的value为监听函数参数
+ * - T的类型约束：Record<string, unknown[]>
+ */
+type ExtractComponentEvents<Events> = Events extends Record<string, unknown[]> ? ({
+    [key in keyof Events as `on${Capitalize<string & key>}`]?: (...args: Events[key]) => void;
+}) : never;
+/**
+ * 提取组件的props类型
+ * - 有效的 Props 类型：extends Record<string, any>
+ * - 有效类型则返回 Props 自身；否则无效，为undefined
+ */
+type ExtractComponentProps<Props> = Props extends Record<string, any> ? Props : undefined;
+/**
+ * 组件绑定 配置选项
+ * - Props、Events、Model 为可选泛型，分别约束 props、events、model 属性
+ * - 若泛型类型无效，则对应属性类型强制为undefined；详细参照对应属性说明
+ */
+type ComponentBindOptions<Props = void, Model = void> = {
+    /**
+     * 传递给组件的属性值，执行 v-bind 绑定
+     * - key为属性名称，遵循vue解析规则；若绑定事件，则key为 on事件名称 ，事件名称首字母大写
+     * - 通过泛型类型 Props 约束，有效类型：Props extends Record<string, any>
+     * @see ExtractComponentEvents<Events> 获取组件事件类型
+     */
+    props?: ExtractComponentProps<Props>;
+    /**
+     * 传递给组件的双向绑定数据，执行 v-model 绑定
+     * - 使用 ShallowRef/Ref 包裹；推荐 ShallowRef，仅和组件进行.value值交互，避免深层双向影响性能
+     * - 通过泛型类型 Model 约束，有效类型： 非void、never、null、undefined等无效类型
+     */
+    model?: Model extends (void | never | null | undefined) ? undefined : (ShallowRef<Model> | Ref<Model>);
+};
 /**
  *
  */
@@ -1145,14 +1226,9 @@ type InputEvents = {
  * 弹窗配置选项
  * - 约束弹出组件信息
  * - 弹出组件时传递的参数信息
+ * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
  */
-type PopupOptions = ComponentOptions & {
-    /**
-     * 传递给组件的属性值，执行v-bind绑定到要显示的组件
-     * - key为属性名称，遵循vue解析规则
-     * - 若为事件监听，则使用onXXX
-     */
-    props?: Record<string, any>;
+type PopupOptions<Props = void, Model = void> = ComponentOptions & ComponentBindOptions<Props, Model> & {
     /**
      * 弹窗动画名
      * - 不传则默认“snail-fade”
@@ -1259,8 +1335,9 @@ type PopupDescriptor<Options extends PopupOptions, ExtOptions> = PopupStatusOpti
 /**
  * 模态弹窗 配置选项
  * - 继承 ComponentOptions ，动态加载组件
+ * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
  */
-type DialogOptions = PopupOptions & {
+type DialogOptions<Props = void, Model = void> = PopupOptions<Props, Model> & {
     /**
      * 禁用【遮罩层】
      * - 目前没实现，先忽略
@@ -1322,8 +1399,9 @@ type ToastOptions = {
 /**
  * 跟随弹窗 配置选项
  * - 传入的组件，根据配置跟随 target 位置和大小；
+ * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
  */
-type FollowOptions = PopupOptions & {
+type FollowOptions<Props = void, Model = void> = PopupOptions<Props, Model> & {
     /**
      * 启用【宽度】跟随
      * - 为true则和 target 宽度保持一致
@@ -1477,26 +1555,29 @@ interface IPopupManager {
     /**
      * 弹出
      * - 弹窗位置位置、大小、动画效果等由组件自己完成
+     * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
      * @param options 弹窗配置选项
      * @returns 弹窗打开结果，外部可手动关闭弹窗
      */
-    popup<T>(options: PopupOptions): IAsyncScope<T>;
+    popup<T, Props = void, Model = void>(options: PopupOptions<Props, Model>): IAsyncScope<T>;
     /**
      * 对话框
      * - 支持指定模态和非模态对话框
      * - 默认垂直水平居中展示
+     * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
      * @param options 弹窗配置选项
      * @returns 弹窗打开结果，外部可手动关闭弹窗
      */
-    dialog<T>(options: DialogOptions): IAsyncScope<T>;
+    dialog<T, Props = void, Model = void>(options: DialogOptions<Props, Model>): IAsyncScope<T>;
     /**
      * 跟随弹窗
      * - 跟随指定的target对象，可跟随位置、大小
+     * @see ComponentBindOptions 了解 Props、Model 泛型参数的含义
      * @param target 跟随的目标元素
      * @param options 跟随配置选项
      * @returns 弹窗异步作用域，外部可手动关闭弹窗
      */
-    follow<T>(target: HTMLElement, options: FollowOptions): IAsyncScope<T>;
+    follow<T, Props = void, Model = void>(target: HTMLElement, options: FollowOptions<Props, Model>): IAsyncScope<T>;
     /**
      * 打开【确认】弹窗
      * @param title  弹窗标题
@@ -1686,18 +1767,18 @@ declare const components: {
         "onUpdate:modelValue"?: (value: boolean) => any;
     }>, {}, {}, {}, {}, string, vue.ComponentProvideOptions, true, {}, any>;
     Dynamic: {
-        new (...args: any[]): vue.CreateComponentPublicInstanceWithMixins<Readonly<ComponentOptions> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, vue.PublicProps, {}, true, {}, {}, vue.GlobalComponents, vue.GlobalDirectives, string, {}, any, vue.ComponentProvideOptions, {
+        new (...args: any[]): vue.CreateComponentPublicInstanceWithMixins<Readonly<ComponentOptions & Pick<ComponentBindOptions<Record<string, any>>, "props">> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, vue.PublicProps, {}, true, {}, {}, vue.GlobalComponents, vue.GlobalDirectives, string, {}, any, vue.ComponentProvideOptions, {
             P: {};
             B: {};
             D: {};
             C: {};
             M: {};
             Defaults: {};
-        }, Readonly<ComponentOptions> & Readonly<{}>, {}, {}, {}, {}, {}>;
+        }, Readonly<ComponentOptions & Pick<ComponentBindOptions<Record<string, any>>, "props">> & Readonly<{}>, {}, {}, {}, {}, {}>;
         __isFragment?: never;
         __isTeleport?: never;
         __isSuspense?: never;
-    } & vue.ComponentOptionsBase<Readonly<ComponentOptions> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
+    } & vue.ComponentOptionsBase<Readonly<ComponentOptions & Pick<ComponentBindOptions<Record<string, any>>, "props">> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
         $slots: {
             [x: string]: (props: any) => any;
             [x: number]: (props: any) => any;
@@ -1750,18 +1831,53 @@ declare const components: {
         };
     });
     Scroll: {
-        new (...args: any[]): vue.CreateComponentPublicInstanceWithMixins<Readonly<ScrollOptions> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, vue.PublicProps, {}, true, {}, {}, vue.GlobalComponents, vue.GlobalDirectives, string, {}, any, vue.ComponentProvideOptions, {
+        new (...args: any[]): vue.CreateComponentPublicInstanceWithMixins<Readonly<ScrollOptions> & Readonly<{
+            onLeft?: () => any;
+            onRight?: () => any;
+            onBottom?: () => any;
+            onTop?: () => any;
+            onXbar?: (show: boolean) => any;
+            onYbar?: (show: boolean) => any;
+        }>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
+            left: () => any;
+            right: () => any;
+            bottom: () => any;
+            top: () => any;
+            xbar: (show: boolean) => any;
+            ybar: (show: boolean) => any;
+        }, vue.PublicProps, {}, true, {}, {}, vue.GlobalComponents, vue.GlobalDirectives, string, {}, any, vue.ComponentProvideOptions, {
             P: {};
             B: {};
             D: {};
             C: {};
             M: {};
             Defaults: {};
-        }, Readonly<ScrollOptions> & Readonly<{}>, {}, {}, {}, {}, {}>;
+        }, Readonly<ScrollOptions> & Readonly<{
+            onLeft?: () => any;
+            onRight?: () => any;
+            onBottom?: () => any;
+            onTop?: () => any;
+            onXbar?: (show: boolean) => any;
+            onYbar?: (show: boolean) => any;
+        }>, {}, {}, {}, {}, {}>;
         __isFragment?: never;
         __isTeleport?: never;
         __isSuspense?: never;
-    } & vue.ComponentOptionsBase<Readonly<ScrollOptions> & Readonly<{}>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
+    } & vue.ComponentOptionsBase<Readonly<ScrollOptions> & Readonly<{
+        onLeft?: () => any;
+        onRight?: () => any;
+        onBottom?: () => any;
+        onTop?: () => any;
+        onXbar?: (show: boolean) => any;
+        onYbar?: (show: boolean) => any;
+    }>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
+        left: () => any;
+        right: () => any;
+        bottom: () => any;
+        top: () => any;
+        xbar: (show: boolean) => any;
+        ybar: (show: boolean) => any;
+    }, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
         $slots: {
             default?: (props: {}) => any;
         };
@@ -1991,4 +2107,4 @@ declare const components: {
 };
 
 export { components, getSvgDraw, mount, onAppCreated, triggerAppCreated, usePopup, useReactive, useTreeContext };
-export type { ButtonOptions, ChooseEvents, ChooseItem, ChooseOptions, ComponentMountOptions, ComponentOptions, ConfirmAreaOptions, ConfirmOptions, DialogHandle, DialogOptions, DisabledOptions, DragVerifyInfo, DragVerifyOptions, EmptyOptions, FoldEvents, FoldOptions, FoldStatus, FollowElectResult, FollowExtend, FollowHandle, FollowOptions, FollowStrategy, FollowStrategyOptions, FooterEvents, FooterOptions, HeaderEvents, HeaderOptions, IPopupManager, IReactiveManager, ISelectContext, ITreeBaseContext, IconOptions, IconType, InputEvents, InputOptions, LoadingOptions, MessageOptions, PlaceholderOptions, PopupDescriptor, PopupHandle, PopupOptions, PopupStatus, PopupStatusOptions, ReactiveVar, ReadonlyOptions, ScrollEvents, ScrollOptions, ScrollTouchType, SearchEvents, SearchOptions, SelectBaseEvents, SelectBaseOptions, SelectEvents, SelectItem, SelectNodeEvents, SelectNodeOptions, SelectOptions, SelectPopupExtend, SelectPopupOptions, SelectSlotOptions, SortEvents, SortOptions, SwitchEvents, SwitchOptions, TableColOptions, TableOptions, TableRowOptions, TitleOptions, ToastOptions, TreeEvents, TreeNode, TreeNodeEvents, TreeNodeExtend, TreeNodeModel, TreeNodeOptions, TreeNodeRenderOptions, TreeNodeSlotOptions, TreeOptions, TreeSearchResult };
+export type { ButtonOptions, ChooseEvents, ChooseItem, ChooseOptions, ComponentBindOptions, ComponentMountOptions, ComponentOptions, ConfirmAreaOptions, ConfirmOptions, DialogHandle, DialogOptions, DisabledOptions, DragVerifyInfo, DragVerifyOptions, EmptyOptions, ExtractComponentEvents, ExtractComponentProps, FoldEvents, FoldOptions, FoldStatus, FollowElectResult, FollowExtend, FollowHandle, FollowOptions, FollowStrategy, FollowStrategyOptions, FooterEvents, FooterOptions, HeaderEvents, HeaderOptions, IPopupManager, IReactiveManager, ISelectContext, ITreeBaseContext, IconOptions, IconType, InputEvents, InputOptions, LoadingOptions, MessageOptions, PlaceholderOptions, PopupDescriptor, PopupHandle, PopupOptions, PopupStatus, PopupStatusOptions, ReactiveVar, ReadonlyOptions, ScrollEvents, ScrollOptions, ScrollStatus, SearchEvents, SearchOptions, SelectBaseEvents, SelectBaseOptions, SelectEvents, SelectItem, SelectNodeEvents, SelectNodeOptions, SelectOptions, SelectPopupExtend, SelectPopupOptions, SelectSlotOptions, SortEvents, SortOptions, SwitchEvents, SwitchOptions, TableColOptions, TableOptions, TableRowOptions, TitleOptions, ToastOptions, TreeEvents, TreeNode, TreeNodeEvents, TreeNodeExtend, TreeNodeModel, TreeNodeOptions, TreeNodeRenderOptions, TreeNodeSlotOptions, TreeOptions, TreeSearchResult };

package/dist/snail.vue.js

@@ -1,7 +1,7 @@
 //@ sourceURL=/snail.vue.js
-import { defineComponent, createElementBlock, openBlock, normalizeClass, renderSlot, createTextVNode, mergeModels, useModel, computed, Fragment, renderList, normalizeStyle, unref, createElementVNode, createCommentVNode, toDisplayString, createBlock, shallowRef, withDirectives, vModelText, createVNode, createApp, Transition, withCtx, normalizeProps, guardReactiveProps, watch, ref, onErrorCaptured, resolveDynamicComponent, mergeProps, createSlots, onMounted, withModifiers, getCurrentInstance, nextTick, useTemplateRef, resolveComponent, onActivated, onDeactivated, onBeforeUnmount, getCurrentScope, onScopeDispose } from 'vue';
+import { defineComponent, createElementBlock, openBlock, normalizeClass, renderSlot, createTextVNode, mergeModels, useModel, computed, Fragment, renderList, normalizeStyle, unref, createElementVNode, createCommentVNode, toDisplayString, createBlock, shallowRef, withDirectives, vModelText, createVNode, createApp, Transition, withCtx, normalizeProps, guardReactiveProps, watch, ref, onErrorCaptured, resolveDynamicComponent, mergeProps, createSlots, onMounted, withModifiers, isRef, getCurrentInstance, nextTick, useTemplateRef, resolveComponent, onBeforeUnmount, getCurrentScope, onScopeDispose } from 'vue';
 import { isArray, newId, throwError, isArrayNotEmpty, isStringNotEmpty, mustFunction, useScope, removeFromArray, mustObject, throwIfFalse, isObject, isNumberNotNaN, mountScope, useScopes, isPromise, wait, script, delay, useTimer, defer, useAsyncScope, useHook, hasAny, throwIfTrue, isFunction, onMountScope } from 'snail.core';
-import { css, link, useObserver, useAnimation } from 'snail.view';
+import { link, css, useObserver, useAnimation } from 'snail.view';
 
 var _sfc_main$r = defineComponent({
   ...{
@@ -23,6 +23,10 @@ var _sfc_main$r = defineComponent({
   }
 });
 
+var addLink = href => setTimeout(link.register, 0, href);
+
+addLink("/styles/snail.vue.vue.css");
+
 const _hoisted_1$e = ["onClick"];
 const _hoisted_2$9 = ["type", "checked"];
 const _hoisted_3$6 = ["textContent"];
@@ -96,10 +100,6 @@ var _sfc_main$q = defineComponent({
   }
 });
 
-var addLink = href => setTimeout(link.register, 0, href);
-
-addLink("/styles/snail.vue.vue.css");
-
 var _sfc_main$p = defineComponent({
   ...{
     name: "Footer",
@@ -688,7 +688,10 @@ var _sfc_main$j = defineComponent({
   props: {
     name: {},
     component: {},
-    url: {}
+    url: {},
+    props: {
+      default: () => ({})
+    }
   },
   setup(__props) {
     const {
@@ -735,10 +738,10 @@ var _sfc_main$j = defineComponent({
       }
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, [(openBlock(), createBlock(resolveDynamicComponent(dynamicComponentRef.value), mergeProps(_ctx.$attrs, {
+      return openBlock(), createElementBlock(Fragment, null, [(openBlock(), createBlock(resolveDynamicComponent(dynamicComponentRef.value), mergeProps({
         ref_key: "componentRef",
         ref: componentRef
-      }), createSlots({
+      }, _ctx.props, _ctx.$attrs), createSlots({
         _: 2
       }, [renderList(_ctx.$slots, (_, name) => {
         return {
@@ -772,6 +775,10 @@ var _sfc_main$i = defineComponent({
     popupTransition: {}
   },
   setup(__props) {
+    const {
+      props,
+      model = shallowRef(void 0)
+    } = __props.options;
     const {
       closePopup,
       onBeforeClose
@@ -795,15 +802,19 @@ var _sfc_main$i = defineComponent({
         style: normalizeStyle({
           "z-index": _ctx.zIndex
         }),
-        onClick: _cache[0] || (_cache[0] = withModifiers($event => {
+        onClick: _cache[1] || (_cache[1] = withModifiers($event => {
           _ctx.options.closeOnMask && unref(closePopup)();
         }, ["self"]))
       }, [createVNode(_sfc_main$j, mergeProps({
         class: "dialog-body",
         name: _ctx.options.name,
         component: _ctx.options.component,
-        url: _ctx.options.url
-      }, _ctx.options.props, unref(dialogExtend)), null, 16, ["name", "component", "url"])], 6);
+        url: _ctx.options.url,
+        props: unref(props)
+      }, unref(dialogExtend), {
+        modelValue: unref(model),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => isRef(model) ? model.value = $event : null)
+      }), null, 16, ["name", "component", "url", "props", "modelValue"])], 6);
     };
   }
 });
@@ -823,6 +834,10 @@ var _sfc_main$h = defineComponent({
     popupTransition: {}
   },
   setup(__props) {
+    const {
+      props,
+      model = shallowRef(void 0)
+    } = __props.options;
     const {
       closePopup
     } = __props.extOptions;
@@ -921,8 +936,12 @@ var _sfc_main$h = defineComponent({
         },
         name: _ctx.options.name,
         component: _ctx.options.component,
-        url: _ctx.options.url
-      }, _ctx.options.props, unref(followExt)), null, 16, ["class", "style", "name", "component", "url"]);
+        url: _ctx.options.url,
+        props: unref(props)
+      }, unref(followExt), {
+        modelValue: unref(model),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => isRef(model) ? model.value = $event : null)
+      }), null, 16, ["class", "style", "name", "component", "url", "props", "modelValue"]);
     };
   }
 });
@@ -942,8 +961,10 @@ var _sfc_main$g = defineComponent({
     popupTransition: {}
   },
   setup(__props) {
-    const loadingRef = shallowRef(false);
-    onMounted(() => loadingRef.value = true);
+    const {
+      props,
+      model = shallowRef(void 0)
+    } = __props.options;
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$j, mergeProps({
         class: ["snail-popup", [_ctx.popupStatus.value, _ctx.popupTransition.value]],
@@ -952,11 +973,12 @@ var _sfc_main$g = defineComponent({
         },
         name: _ctx.options.name,
         component: _ctx.options.component,
-        url: _ctx.options.url
-      }, _ctx.options.props, {
-        "in-popup": true,
-        "close-popup": _ctx.extOptions.closePopup
-      }), null, 16, ["class", "style", "name", "component", "url", "close-popup"]);
+        url: _ctx.options.url,
+        props: unref(props)
+      }, _ctx.extOptions, {
+        modelValue: unref(model),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => isRef(model) ? model.value = $event : null)
+      }), null, 16, ["class", "style", "name", "component", "url", "props", "modelValue"]);
     };
   }
 });
@@ -1279,7 +1301,7 @@ var _sfc_main$c = defineComponent({
     followY: {},
     pinned: {}
   },
-  emits: ["change", "search"],
+  emits: ["change"],
   setup(__props, _ref) {
     let {
       emit: __emit
@@ -1615,16 +1637,15 @@ var _sfc_main$b = defineComponent({
         closeOnMask: true,
         closeOnResize: true,
         closeOnTarget: true,
-        props: Object.freeze(Object.assign({
+        props: {
           items: props.items,
           context,
           level: 1,
           search: props.search,
           multiple: props.multiple,
-          popupStyle: props.popupStyle
-        }, {
+          popupStyle: props.popupStyle,
           onChange: onSelectItemChange
-        }))
+        }
       });
       await followScope;
       followScope = void 0;
@@ -1825,18 +1846,81 @@ var _sfc_main$8 = defineComponent({
       type: Boolean
     }
   },
-  setup(__props) {
+  emits: ["xbar", "left", "right", "ybar", "top", "bottom"],
+  setup(__props, _ref) {
+    let {
+      emit: __emit
+    } = _ref;
     const props = __props;
-    console.warn("scroll 的事件还没实现");
-    onActivated(() => console.log("onActivated"));
-    onDeactivated(() => console.log("onDeactivated"));
+    const emits = __emit;
+    const rootDom = useTemplateRef("scroll-root");
+    const {
+      onSize
+    } = useObserver();
+    const {
+      onInterval
+    } = useTimer();
+    const classRef = computed(() => ({
+      "scroll-x": props.scrollX == true,
+      "scroll-y": props.scrollY == true
+    }));
+    var preStatus = void 0;
+    function refreshScrollInfo() {
+      const status = {
+        xbar: rootDom.value.scrollWidth > rootDom.value.clientWidth,
+        ybar: rootDom.value.scrollHeight > rootDom.value.clientHeight,
+        left: false,
+        right: false,
+        top: false,
+        bottom: false,
+        scrollwidth: rootDom.value.scrollWidth,
+        scrollheight: rootDom.value.scrollHeight
+      };
+      if (status.xbar == true) {
+        status.left = rootDom.value.scrollLeft == 0;
+        status.right = rootDom.value.scrollLeft + rootDom.value.clientWidth == rootDom.value.scrollWidth;
+      }
+      if (status.ybar == true) {
+        status.top = rootDom.value.scrollTop == 0;
+        status.bottom = rootDom.value.scrollTop + rootDom.value.clientHeight == rootDom.value.scrollHeight;
+      }
+      Object.freeze(status);
+      const events = Object.create(null);
+      if (preStatus != void 0) {
+        preStatus.xbar != status.xbar && (events.xbar = [status.xbar]);
+        preStatus.ybar != status.ybar && (events.ybar = [status.ybar]);
+        if (preStatus.xbar == true && status.xbar == true) {
+          status.left && preStatus.left !== status.left && (events.left = []);
+          status.right && preStatus.right !== status.right && (events.right = []);
+        }
+        if (preStatus.ybar == true && status.ybar == true) {
+          status.top && preStatus.top !== status.top && (events.top = []);
+          status.bottom && preStatus.bottom !== status.bottom && (events.bottom = []);
+        }
+      }
+      preStatus = status;
+      preStatus = Object.freeze(status);
+      events.xbar && emits("xbar", ...events.xbar);
+      events.left && emits("left");
+      events.right && emits("right");
+      events.ybar && emits("ybar", ...events.ybar);
+      events.top && emits("top");
+      events.bottom && emits("bottom");
+    }
+    onMounted(() => {
+      refreshScrollInfo();
+      onSize(rootDom.value, refreshScrollInfo);
+      onInterval(() => {
+        const isChange = preStatus.scrollwidth != rootDom.value.scrollWidth || preStatus.scrollheight != rootDom.value.scrollHeight;
+        isChange && refreshScrollInfo();
+      }, 100);
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(["snail-scroll", {
-          "scroll-x": props.scrollX == true,
-          "scroll-y": props.scrollY == true
-        }])
-      }, [renderSlot(_ctx.$slots, "default")], 2);
+        class: normalizeClass(["snail-scroll", classRef.value]),
+        ref: "scroll-root",
+        onScroll: refreshScrollInfo
+      }, [renderSlot(_ctx.$slots, "default")], 34);
     };
   }
 });

package/dist/snail.vue.umd.js

@@ -25,6 +25,10 @@
     }
   });
 
+  var addLink = href => setTimeout(snail_view.link.register, 0, href);
+
+  addLink("/styles/snail.vue.vue.css");
+
   const _hoisted_1$e = ["onClick"];
   const _hoisted_2$9 = ["type", "checked"];
   const _hoisted_3$6 = ["textContent"];
@@ -98,10 +102,6 @@
     }
   });
 
-  var addLink = href => setTimeout(snail_view.link.register, 0, href);
-
-  addLink("/styles/snail.vue.vue.css");
-
   var _sfc_main$p = vue.defineComponent({
     ...{
       name: "Footer",
@@ -690,7 +690,10 @@
     props: {
       name: {},
       component: {},
-      url: {}
+      url: {},
+      props: {
+        default: () => ({})
+      }
     },
     setup(__props) {
       const {
@@ -737,10 +740,10 @@
         }
       });
       return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [(vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(dynamicComponentRef.value), vue.mergeProps(_ctx.$attrs, {
+        return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [(vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(dynamicComponentRef.value), vue.mergeProps({
           ref_key: "componentRef",
           ref: componentRef
-        }), vue.createSlots({
+        }, _ctx.props, _ctx.$attrs), vue.createSlots({
           _: 2
         }, [vue.renderList(_ctx.$slots, (_, name) => {
           return {
@@ -774,6 +777,10 @@
       popupTransition: {}
     },
     setup(__props) {
+      const {
+        props,
+        model = vue.shallowRef(void 0)
+      } = __props.options;
       const {
         closePopup,
         onBeforeClose
@@ -797,15 +804,19 @@
           style: vue.normalizeStyle({
             "z-index": _ctx.zIndex
           }),
-          onClick: _cache[0] || (_cache[0] = vue.withModifiers($event => {
+          onClick: _cache[1] || (_cache[1] = vue.withModifiers($event => {
             _ctx.options.closeOnMask && vue.unref(closePopup)();
           }, ["self"]))
         }, [vue.createVNode(_sfc_main$j, vue.mergeProps({
           class: "dialog-body",
           name: _ctx.options.name,
           component: _ctx.options.component,
-          url: _ctx.options.url
-        }, _ctx.options.props, vue.unref(dialogExtend)), null, 16, ["name", "component", "url"])], 6);
+          url: _ctx.options.url,
+          props: vue.unref(props)
+        }, vue.unref(dialogExtend), {
+          modelValue: vue.unref(model),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => vue.isRef(model) ? model.value = $event : null)
+        }), null, 16, ["name", "component", "url", "props", "modelValue"])], 6);
       };
     }
   });
@@ -825,6 +836,10 @@
       popupTransition: {}
     },
     setup(__props) {
+      const {
+        props,
+        model = vue.shallowRef(void 0)
+      } = __props.options;
       const {
         closePopup
       } = __props.extOptions;
@@ -923,8 +938,12 @@
           },
           name: _ctx.options.name,
           component: _ctx.options.component,
-          url: _ctx.options.url
-        }, _ctx.options.props, vue.unref(followExt)), null, 16, ["class", "style", "name", "component", "url"]);
+          url: _ctx.options.url,
+          props: vue.unref(props)
+        }, vue.unref(followExt), {
+          modelValue: vue.unref(model),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => vue.isRef(model) ? model.value = $event : null)
+        }), null, 16, ["class", "style", "name", "component", "url", "props", "modelValue"]);
       };
     }
   });
@@ -944,8 +963,10 @@
       popupTransition: {}
     },
     setup(__props) {
-      const loadingRef = vue.shallowRef(false);
-      vue.onMounted(() => loadingRef.value = true);
+      const {
+        props,
+        model = vue.shallowRef(void 0)
+      } = __props.options;
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(_sfc_main$j, vue.mergeProps({
           class: ["snail-popup", [_ctx.popupStatus.value, _ctx.popupTransition.value]],
@@ -954,11 +975,12 @@
           },
           name: _ctx.options.name,
           component: _ctx.options.component,
-          url: _ctx.options.url
-        }, _ctx.options.props, {
-          "in-popup": true,
-          "close-popup": _ctx.extOptions.closePopup
-        }), null, 16, ["class", "style", "name", "component", "url", "close-popup"]);
+          url: _ctx.options.url,
+          props: vue.unref(props)
+        }, _ctx.extOptions, {
+          modelValue: vue.unref(model),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => vue.isRef(model) ? model.value = $event : null)
+        }), null, 16, ["class", "style", "name", "component", "url", "props", "modelValue"]);
       };
     }
   });
@@ -1281,7 +1303,7 @@
       followY: {},
       pinned: {}
     },
-    emits: ["change", "search"],
+    emits: ["change"],
     setup(__props, _ref) {
       let {
         emit: __emit
@@ -1617,16 +1639,15 @@
           closeOnMask: true,
           closeOnResize: true,
           closeOnTarget: true,
-          props: Object.freeze(Object.assign({
+          props: {
             items: props.items,
             context,
             level: 1,
             search: props.search,
             multiple: props.multiple,
-            popupStyle: props.popupStyle
-          }, {
+            popupStyle: props.popupStyle,
             onChange: onSelectItemChange
-          }))
+          }
         });
         await followScope;
         followScope = void 0;
@@ -1827,18 +1848,81 @@
         type: Boolean
       }
     },
-    setup(__props) {
+    emits: ["xbar", "left", "right", "ybar", "top", "bottom"],
+    setup(__props, _ref) {
+      let {
+        emit: __emit
+      } = _ref;
       const props = __props;
-      console.warn("scroll 的事件还没实现");
-      vue.onActivated(() => console.log("onActivated"));
-      vue.onDeactivated(() => console.log("onDeactivated"));
+      const emits = __emit;
+      const rootDom = vue.useTemplateRef("scroll-root");
+      const {
+        onSize
+      } = snail_view.useObserver();
+      const {
+        onInterval
+      } = snail_core.useTimer();
+      const classRef = vue.computed(() => ({
+        "scroll-x": props.scrollX == true,
+        "scroll-y": props.scrollY == true
+      }));
+      var preStatus = void 0;
+      function refreshScrollInfo() {
+        const status = {
+          xbar: rootDom.value.scrollWidth > rootDom.value.clientWidth,
+          ybar: rootDom.value.scrollHeight > rootDom.value.clientHeight,
+          left: false,
+          right: false,
+          top: false,
+          bottom: false,
+          scrollwidth: rootDom.value.scrollWidth,
+          scrollheight: rootDom.value.scrollHeight
+        };
+        if (status.xbar == true) {
+          status.left = rootDom.value.scrollLeft == 0;
+          status.right = rootDom.value.scrollLeft + rootDom.value.clientWidth == rootDom.value.scrollWidth;
+        }
+        if (status.ybar == true) {
+          status.top = rootDom.value.scrollTop == 0;
+          status.bottom = rootDom.value.scrollTop + rootDom.value.clientHeight == rootDom.value.scrollHeight;
+        }
+        Object.freeze(status);
+        const events = Object.create(null);
+        if (preStatus != void 0) {
+          preStatus.xbar != status.xbar && (events.xbar = [status.xbar]);
+          preStatus.ybar != status.ybar && (events.ybar = [status.ybar]);
+          if (preStatus.xbar == true && status.xbar == true) {
+            status.left && preStatus.left !== status.left && (events.left = []);
+            status.right && preStatus.right !== status.right && (events.right = []);
+          }
+          if (preStatus.ybar == true && status.ybar == true) {
+            status.top && preStatus.top !== status.top && (events.top = []);
+            status.bottom && preStatus.bottom !== status.bottom && (events.bottom = []);
+          }
+        }
+        preStatus = status;
+        preStatus = Object.freeze(status);
+        events.xbar && emits("xbar", ...events.xbar);
+        events.left && emits("left");
+        events.right && emits("right");
+        events.ybar && emits("ybar", ...events.ybar);
+        events.top && emits("top");
+        events.bottom && emits("bottom");
+      }
+      vue.onMounted(() => {
+        refreshScrollInfo();
+        onSize(rootDom.value, refreshScrollInfo);
+        onInterval(() => {
+          const isChange = preStatus.scrollwidth != rootDom.value.scrollWidth || preStatus.scrollheight != rootDom.value.scrollHeight;
+          isChange && refreshScrollInfo();
+        }, 100);
+      });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", {
-          class: vue.normalizeClass(["snail-scroll", {
-            "scroll-x": props.scrollX == true,
-            "scroll-y": props.scrollY == true
-          }])
-        }, [vue.renderSlot(_ctx.$slots, "default")], 2);
+          class: vue.normalizeClass(["snail-scroll", classRef.value]),
+          ref: "scroll-root",
+          onScroll: refreshScrollInfo
+        }, [vue.renderSlot(_ctx.$slots, "default")], 34);
       };
     }
   });

package/dist/styles/snail.vue.vue.css

@@ -1,15 +1,15 @@
-/* src:base\choose.vue 	 index:0 */
-.snail-choose{align-items:center;display:flex;flex-wrap:wrap;overflow-x:hidden}.snail-choose>div.choose-item{align-items:center;cursor:pointer;display:flex;flex-shrink:0;margin:0 8px;position:relative;-webkit-user-select:none;-moz-user-select:none;user-select:none}.snail-choose>div.choose-item:after{content:"";height:100%;left:0;overflow:hidden;position:absolute;top:0;width:100%}.snail-choose>div.choose-item>input::checkmark{background-color:#2196f3;border-color:#2196f3}.snail-choose>div.choose-item>span{margin-left:4px}.snail-choose.readonly>div.choose-item{cursor:not-allowed}
 /* src:base\button.vue 	 index:0 */
 .snail-button{align-items:center;border-radius:2px;cursor:pointer;display:flex;display:inline-flex;justify-content:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;white-space:nowrap}.snail-button.max{height:40px;width:120px}.snail-button.middle{height:32px;width:90px}.snail-button.normal{height:28px;width:54px}.snail-button.small{height:20px;width:30px}.snail-button.primary{background-color:#5ca3ff;color:#fff}.snail-button.default{background-color:#fff;border:1px solid #dddfed;color:#2e2f33}.snail-button.link{color:#4c9aff}
 /* src:base\footer.vue 	 index:0 */
 .snail-footer{align-items:center;background-color:#fff;display:flex;flex-shrink:0;height:72px;padding:0 40px;width:100%}.snail-footer>.snail-button:nth-child(n+2){margin-left:20px}.snail-footer.start-divider{border-top:1px solid #dddfed}.snail-footer.left{justify-content:left}.snail-footer.center{justify-content:center}.snail-footer.right{justify-content:right}
+/* src:base\choose.vue 	 index:0 */
+.snail-choose{align-items:center;display:flex;flex-wrap:wrap;overflow-x:hidden}.snail-choose>div.choose-item{align-items:center;cursor:pointer;display:flex;flex-shrink:0;margin:0 8px;position:relative;-webkit-user-select:none;-moz-user-select:none;user-select:none}.snail-choose>div.choose-item:after{content:"";height:100%;left:0;overflow:hidden;position:absolute;top:0;width:100%}.snail-choose>div.choose-item>input::checkmark{background-color:#2196f3;border-color:#2196f3}.snail-choose>div.choose-item>span{margin-left:4px}.snail-choose.readonly>div.choose-item{cursor:not-allowed}
+/* src:base\icon.vue 	 index:0 */
+.snail-icon{cursor:pointer;opacity:1}
 /* src:base\header.vue 	 index:0 */
 .snail-header{align-items:center;background-color:#fff;display:flex;flex-shrink:0;position:relative;width:100%}.snail-header>.header-title{color:#2e3033;flex:1;line-height:48px;overflow:hidden;padding:0 30px;text-overflow:ellipsis;white-space:nowrap;width:100%}.snail-header>.header-title.left{text-align:left}.snail-header>.header-title.center{text-align:center}.snail-header>.header-title.right{text-align:right}.snail-header.start-divider{border-bottom:1px solid #dddfed}.snail-header.page{height:48px}.snail-header.page>.header-title{font-size:16px;font-weight:bold}.snail-header.page>.close-icon{margin-right:18px}.snail-header.dialog{height:64px;padding-top:16px}.snail-header.dialog>.header-title{font-size:20px}.snail-header.dialog>.close-icon{position:absolute;right:8px;top:8px}
 /* src:base\search.vue 	 index:0 */
 .snail-search{align-items:center;background:#fff;display:flex;flex-shrink:0;height:34px}.snail-search>input{border-radius:0!important;flex:1;height:100%}.snail-search>div{align-items:center;border:1px solid #dddfed;border-left:none;display:flex;flex-shrink:0;height:100%;justify-content:center;width:34px}
-/* src:base\icon.vue 	 index:0 */
-.snail-icon{cursor:pointer;opacity:1}
 /* src:base\select.vue 	 index:0 */
 .snail-select{align-items:center;background-color:#fff;border:1px solid #dddfed;border-radius:4px;color:#2e3033;cursor:pointer;display:flex;height:32px;width:100%}.snail-select>div.select-result{align-items:center;display:flex;flex:1;flex-wrap:nowrap;height:30px;overflow:hidden;padding:0 10px 0 6px}.snail-select>div.select-result>div.select-text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}.snail-select>svg.snail-icon{flex-shrink:0;margin-right:4px}.snail-select>div.no-items{cursor:text;padding:0 8px}.snail-select.readonly{cursor:auto}.snail-select.readonly>svg.snail-icon{display:none}
 /* src:base\switch.vue 	 index:0 */
@@ -24,10 +24,10 @@
 .snail-sort-drag{background:#fff;border:1px solid #4c9aff;border-radius:4px;cursor:move}.snail-sort-ghost{border:1px dashed #4c9aff;border-radius:4px}
 /* src:container\table.vue 	 index:0 */
 .snail-table{display:flex;flex-direction:column}.snail-table>div.table-footer,.snail-table>div.table-header{align-items:center;display:flex;flex-shrink:0;width:100%}.snail-table>div.table-header{background-color:#fff;position:sticky!important;top:0;z-index:1}.snail-table>div.table-body{flex:1;width:100%}.snail-table.start-border>div.table-body>.table-row>.table-col:nth-child(n+2),.snail-table.start-border>div.table-footer>.table-col:nth-child(n+2),.snail-table.start-border>div.table-header>.table-col:nth-child(n+2){border-left:none!important}.snail-table.start-border>div.table-body>.table-row>.table-col,.snail-table.start-border>div.table-footer>.table-col{border-top:none!important}
-/* src:container\components\table-col.vue 	 index:0 */
-.table-col{align-items:center;display:flex;height:100%;white-space:nowrap}.table-col.left{justify-content:left}.table-col.center{justify-content:center}.table-col.right{justify-content:right}
 /* src:container\components\table-row.vue 	 index:0 */
 .table-row{align-items:center;display:flex}
+/* src:container\components\table-col.vue 	 index:0 */
+.table-col{align-items:center;display:flex;height:100%;white-space:nowrap}.table-col.left{justify-content:left}.table-col.center{justify-content:center}.table-col.right{justify-content:right}
 /* src:container\tree.vue 	 index:0 */
 .snail-tree{background-color:#fff;display:flex;flex-direction:column}.snail-tree .snail-search{flex-shrink:0;margin:12px}.snail-tree .snail-scroll{flex:1}
 /* src:form\input.vue 	 index:0 */
@@ -42,10 +42,10 @@
 .snail-confirm{background-color:#fff;border-radius:4px;color:#2e2f33;display:flex;flex-direction:column;max-height:350px;max-width:548px;min-width:348px}.snail-confirm>div.confirm-body{flex:1;margin:20px 40px;overflow:auto;word-wrap:break-word}
 /* src:popup\components\dialog-container.vue 	 index:0 */
 .snail-dialog{align-items:center;display:flex;height:100%;justify-content:center;left:0;position:fixed;top:0;width:100%}.snail-dialog:before{background-color:rgba(24,27,33,.45);content:"";height:100%;opacity:1;position:absolute;transition:opacity .4s ease-in-out;width:100%}.snail-dialog>.dialog-body{background-color:#fff;border-radius:4px;box-shadow:0 0 15px rgba(0,0,0,.3);position:relative}.snail-dialog.unactive:before{opacity:0}.snail-dialog.unactive>.dialog-body{box-shadow:0 0 4px rgba(0,0,0,.3)}
-/* src:popup\components\popup-container.vue 	 index:0 */
-.snail-popup{left:0;position:fixed;top:0}
 /* src:popup\components\follow-container.vue 	 index:0 */
 .snail-follow{background-color:#fff;display:inline-block;max-height:100%;max-width:100%;position:fixed;transition-duration:.5s;transition-property:left,top;transition-timing-function:ease}
+/* src:popup\components\popup-container.vue 	 index:0 */
+.snail-popup{left:0;position:fixed;top:0}
 /* src:popup\components\toast-container.vue 	 index:0 */
 .snail-toast{background:rgba(0,0,0,.7);border-radius:10px;color:#fff;display:flex;left:50%;max-height:200px;max-width:400px;min-width:200px;overflow:hidden;padding:20px 35px 20px 15px;position:fixed;top:50%;transform:translate(-50%,-50%)}.snail-toast>svg.close-icon{position:absolute;right:10px;top:12px}.snail-toast>div.icon{align-items:center;align-self:center;background:hsla(0,0%,100%,.15);border-radius:50%;display:flex;height:26px;justify-content:center;margin-right:6px;width:26px}.snail-toast>div.icon>svg{background:#fff;border-radius:50%;cursor:none!important}.snail-toast>div.message{flex:1;line-height:24px;overflow:hidden;word-break:break-all}
 /* src:container\components\tree-node.vue 	 index:0 */

package/package.json

@@ -3,7 +3,7 @@
   "description": "依赖【snail】，基于vue封装常用UI组件",
   "author": "snail_dev@163.com",
   "license": "MIT",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "type": "module",
   "main": "dist/snail.vue.js",
   "module": "dist/snail.vue.js",