snail.vue 1.0.40 → 1.0.41

package/dist/snail.vue.d.ts

@@ -399,15 +399,15 @@ type TreeNodeRenderOptions = {
 /**
  * 树节点 插槽配置选项
  */
-type TreeNodeSlotOptions<T> = {
+type TreeNodeSlotOptions<Node> = {
     /**
          * 当前节点
          */
-    node: TreeNodeModel<T>;
+    node: Node;
     /**
      * 父节点
      */
-    parent?: TreeNodeModel<T>;
+    parent?: Node;
     /**
      * 所处层级
      */
@@ -623,19 +623,13 @@ type SelectEvents<T> = SelectBaseEvents<T> & {};
 /**
  * 选项菜单 组件的Slot配置选项
  */
-type SelectSlotOptions<T> = {
-    /**
-     * 关闭Follow弹窗
-     * - 将隐藏已弹出的选项 follow 弹窗
-     * @returns 已弹出则销毁成功返回true；未弹出则销毁失败返回false
-     */
-    closeFollow(): boolean;
+type SelectSlotOptions = {
     /**
-     * 停止事件冒泡
-     * - 解决问题：插槽内元素需要处理自定义click事件，此时不希望Select组件响应click事件
-     * @param delay 在此延迟时间内，停止事件冒泡
+     * 清空已选【选择项】
+     * @param closeFollow 是否关闭【选择项】Follow弹窗
+     * @param stopPropagation 是否停止事件冒泡
      */
-    stopPropagation(delay: number): any;
+    clear(closeFollow: boolean, stopPropagation: boolean): void;
 };
 /**
  * 【选项菜单】 组件上下文
@@ -1676,8 +1670,7 @@ declare const components: {
     }, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
         $slots: {
             default?: (props: {
-                closeFollow: () => boolean;
-                stopPropagation: (delay: number) => any;
+                clear: (closeFollow: boolean, stopPropagation: boolean) => void;
             }) => any;
         };
     });
@@ -1927,8 +1920,8 @@ declare const components: {
     }, string, {}, {}, string, {}, vue.GlobalComponents, vue.GlobalDirectives, string, vue.ComponentProvideOptions> & vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps & (new () => {
         $slots: {
             default?: (props: {
-                node: TreeNodeModel<any>;
-                parent?: TreeNodeModel<any>;
+                node: any;
+                parent?: any;
                 level: number;
                 click(): void;
                 toggle(): void;

package/dist/snail.vue.js

@@ -1,6 +1,6 @@
 //@ 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 { 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, getType } from 'snail.core';
+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';
 
 var _sfc_main$r = defineComponent({
@@ -751,7 +751,7 @@ var _sfc_main$j = defineComponent({
       }, _ctx.$attrs), [_cache[0] || (_cache[0] = createTextVNode(" load component error：")), createElementVNode("span", null, toDisplayString(dynamicErrorRef.value), 1)], 16)) : dynamicComponentRef.value == void 0 ? (openBlock(), createBlock(_sfc_main$k, {
         key: 1,
         show: true,
-        "disabled-mask": true
+        "mask-disabled": true
       })) : createCommentVNode("", true)], 64);
     };
   }
@@ -1495,7 +1495,6 @@ function searchPath(nodes, target) {
 }
 
 function useSelectContext(items, selectsRef) {
-  const treeContxt = useTreeContext(items);
   function selected(multiple, item) {
     if (selectsRef.value) {
       return multiple == true ? selectsRef.value.includes(item) : selectsRef.value[selectsRef.value.length - 1] == item;
@@ -1508,11 +1507,18 @@ function useSelectContext(items, selectsRef) {
     }
     return "";
   }
-  return Object.freeze({
-    ...treeContxt,
-    selected,
-    selectedText
-  });
+  const context = Object.create(null);
+  {
+    const treeContxt = useTreeContext(items);
+    Object.assign(context, treeContxt, {
+      selected,
+      selectedText
+    });
+    mountScope(context, "ISelectContext");
+    treeContxt.onDestroy(() => context.destroyed || context.destroy());
+    context.onDestroy(() => treeContxt.destroyed || treeContxt.destroy());
+  }
+  return Object.freeze(context);
 }
 
 const _hoisted_1$6 = {
@@ -1572,12 +1578,11 @@ var _sfc_main$b = defineComponent({
     const context = useSelectContext(props.items, valuesModel);
     const selectTextRef = computed(() => context.selectedText(props.multiple, props.showPath));
     const slotOptions = Object.freeze({
-      closeFollow,
-      stopPropagation
+      clear
     });
     var followScope = void 0;
     var stopPropagationScope = void 0;
-    function closeFollow() {
+    function destroyFollow() {
       if (followScope != void 0) {
         followScope.destroy();
         followScope = void 0;
@@ -1585,15 +1590,17 @@ var _sfc_main$b = defineComponent({
       }
       return false;
     }
-    function stopPropagation(delay) {
+    function clear(closeFollow, stopPropagation) {
+      valuesModel.value = [];
+      closeFollow && destroyFollow();
       stopPropagationScope && stopPropagationScope.destroy();
-      stopPropagationScope = onTimeout(() => stopPropagationScope = void 0, delay);
+      stopPropagationScope = stopPropagation ? onTimeout(() => stopPropagationScope = void 0, 200) : void 0;
     }
     async function onClick() {
       if (props.readonly == true || rootDom.value == void 0) {
         return;
       }
-      if (closeFollow() == true || stopPropagationScope != void 0) {
+      if (destroyFollow() == true || stopPropagationScope != void 0) {
         return;
       }
       const values = valuesModel.value && valuesModel.value.length > 0 ? [...valuesModel.value] : [];
@@ -1634,16 +1641,16 @@ var _sfc_main$b = defineComponent({
         }]),
         onClick: _cache[0] || (_cache[0] = $event => onClick()),
         ref: "select"
-      }, [unref(hasAny)(props.items) == true ? (openBlock(), createElementBlock(Fragment, {
+      }, [props.items && props.items.length > 0 ? (openBlock(), createElementBlock(Fragment, {
         key: 0
-      }, [unref(hasAny)(valuesModel.value) ? (openBlock(), createElementBlock("div", _hoisted_1$6, [renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(unref(slotOptions))), () => [createElementVNode("div", {
+      }, [valuesModel.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_1$6, [renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(unref(slotOptions))), () => [createElementVNode("div", {
         class: "select-text",
         title: selectTextRef.value,
         textContent: toDisplayString(selectTextRef.value)
       }, null, 8, _hoisted_2$3)])])) : (openBlock(), createElementBlock("div", {
         key: 1,
         class: "select-result text-tips",
-        textContent: toDisplayString(props.placeholder || "请选择")
+        textContent: toDisplayString(props.readonly ? "" : props.placeholder || "请选择")
       }, null, 8, _hoisted_3$3)), createVNode(_sfc_main$o, {
         type: "arrow",
         size: 24,
@@ -2441,12 +2448,7 @@ const components = {
 };
 
 onMountScope(scope => {
-  const type = getType(scope);
-  console.log(`%c${type}:`, "color:green", "scope mounted");
-  getCurrentScope() && onScopeDispose(() => {
-    console.log(`%c${type}:`, "color:blue", "scope auto destroyed");
-    scope.destroy();
-  });
+  getCurrentScope() && onScopeDispose(scope.destroy);
 });
 
 export { components, getSvgDraw, mount, onAppCreated, triggerAppCreated, usePopup, useReactive, useTreeContext };

package/dist/snail.vue.umd.js

@@ -753,7 +753,7 @@
         }, _ctx.$attrs), [_cache[0] || (_cache[0] = vue.createTextVNode(" load component error：")), vue.createElementVNode("span", null, vue.toDisplayString(dynamicErrorRef.value), 1)], 16)) : dynamicComponentRef.value == void 0 ? (vue.openBlock(), vue.createBlock(_sfc_main$k, {
           key: 1,
           show: true,
-          "disabled-mask": true
+          "mask-disabled": true
         })) : vue.createCommentVNode("", true)], 64);
       };
     }
@@ -1497,7 +1497,6 @@
   }
 
   function useSelectContext(items, selectsRef) {
-    const treeContxt = useTreeContext(items);
     function selected(multiple, item) {
       if (selectsRef.value) {
         return multiple == true ? selectsRef.value.includes(item) : selectsRef.value[selectsRef.value.length - 1] == item;
@@ -1510,11 +1509,18 @@
       }
       return "";
     }
-    return Object.freeze({
-      ...treeContxt,
-      selected,
-      selectedText
-    });
+    const context = Object.create(null);
+    {
+      const treeContxt = useTreeContext(items);
+      Object.assign(context, treeContxt, {
+        selected,
+        selectedText
+      });
+      snail_core.mountScope(context, "ISelectContext");
+      treeContxt.onDestroy(() => context.destroyed || context.destroy());
+      context.onDestroy(() => treeContxt.destroyed || treeContxt.destroy());
+    }
+    return Object.freeze(context);
   }
 
   const _hoisted_1$6 = {
@@ -1574,12 +1580,11 @@
       const context = useSelectContext(props.items, valuesModel);
       const selectTextRef = vue.computed(() => context.selectedText(props.multiple, props.showPath));
       const slotOptions = Object.freeze({
-        closeFollow,
-        stopPropagation
+        clear
       });
       var followScope = void 0;
       var stopPropagationScope = void 0;
-      function closeFollow() {
+      function destroyFollow() {
         if (followScope != void 0) {
           followScope.destroy();
           followScope = void 0;
@@ -1587,15 +1592,17 @@
         }
         return false;
       }
-      function stopPropagation(delay) {
+      function clear(closeFollow, stopPropagation) {
+        valuesModel.value = [];
+        closeFollow && destroyFollow();
         stopPropagationScope && stopPropagationScope.destroy();
-        stopPropagationScope = onTimeout(() => stopPropagationScope = void 0, delay);
+        stopPropagationScope = stopPropagation ? onTimeout(() => stopPropagationScope = void 0, 200) : void 0;
       }
       async function onClick() {
         if (props.readonly == true || rootDom.value == void 0) {
           return;
         }
-        if (closeFollow() == true || stopPropagationScope != void 0) {
+        if (destroyFollow() == true || stopPropagationScope != void 0) {
           return;
         }
         const values = valuesModel.value && valuesModel.value.length > 0 ? [...valuesModel.value] : [];
@@ -1636,16 +1643,16 @@
           }]),
           onClick: _cache[0] || (_cache[0] = $event => onClick()),
           ref: "select"
-        }, [vue.unref(snail_core.hasAny)(props.items) == true ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+        }, [props.items && props.items.length > 0 ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
           key: 0
-        }, [vue.unref(snail_core.hasAny)(valuesModel.value) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$6, [vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps(vue.unref(slotOptions))), () => [vue.createElementVNode("div", {
+        }, [valuesModel.value.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$6, [vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps(vue.unref(slotOptions))), () => [vue.createElementVNode("div", {
           class: "select-text",
           title: selectTextRef.value,
           textContent: vue.toDisplayString(selectTextRef.value)
         }, null, 8, _hoisted_2$3)])])) : (vue.openBlock(), vue.createElementBlock("div", {
           key: 1,
           class: "select-result text-tips",
-          textContent: vue.toDisplayString(props.placeholder || "请选择")
+          textContent: vue.toDisplayString(props.readonly ? "" : props.placeholder || "请选择")
         }, null, 8, _hoisted_3$3)), vue.createVNode(_sfc_main$o, {
           type: "arrow",
           size: 24,
@@ -2443,12 +2450,7 @@
   };
 
   snail_core.onMountScope(scope => {
-    const type = snail_core.getType(scope);
-    console.log(`%c${type}:`, "color:green", "scope mounted");
-    vue.getCurrentScope() && vue.onScopeDispose(() => {
-      console.log(`%c${type}:`, "color:blue", "scope auto destroyed");
-      scope.destroy();
-    });
+    vue.getCurrentScope() && vue.onScopeDispose(scope.destroy);
   });
 
   exports.components = components;

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

@@ -4,16 +4,16 @@
 .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\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 */
-.snail-switch{border-radius:10px 10px 10px 10px;cursor:pointer;height:20px!important;overflow:hidden;position:relative;width:36px!important}.snail-switch>div{height:100%;width:100%}.snail-switch>div.on{background-color:#5ca3ff}.snail-switch>div.off{background-color:#c4c8cc;position:absolute;transition:left .2s ease}.snail-switch>div.status{background:#fff;border-radius:10px 10px 10px 10px;height:16px;position:absolute;top:2px;transition:left .2s ease;width:16px}.snail-switch.on>div.off{left:100%;top:0}.snail-switch.on>div.status{left:calc(100% - 18px)}.snail-switch.off>div.off{left:0;top:0}.snail-switch.off>div.status{left:2px}.snail-switch.readonly{cursor:default}
+.snail-switch{border-radius:10px 10px 10px 10px;cursor:pointer;height:20px!important;overflow:hidden;position:relative;width:36px!important}.snail-switch>div{height:100%;width:100%}.snail-switch>div.on{background-color:#5ca3ff}.snail-switch>div.off{background-color:#c4c8cc;position:absolute;transition:left .2s ease}.snail-switch>div.status{background:#fff;border-radius:10px 10px 10px 10px;height:16px;position:absolute;top:2px;transition:left .2s ease;width:16px}.snail-switch.on>div.off{left:100%;top:0}.snail-switch.on>div.status{left:calc(100% - 18px)}.snail-switch.off>div.off{left:0;top:0}.snail-switch.off>div.status{left:2px}.snail-switch.readonly{cursor:not-allowed}
 /* src:container\dynamic.vue 	 index:0 */
 .snail-dynamic-error{color:red}.snail-dynamic-error>span{color:gray}
 /* src:container\fold.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-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\components\table-row.vue 	 index:0 */
+.table-row{align-items:center;display:flex}
 /* 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 */
@@ -40,12 +40,12 @@
 .snail-loading{height:100%;left:0;position:absolute;top:0;width:100%;z-index:10000}.snail-loading.show-mask{background-color:rgba(0,0,0,.15)}.snail-loading:after,.snail-loading:before{animation:snail-loading-stretch 1s ease-in-out infinite;border-radius:50%;content:"";display:block;display:inline-block;height:10px;left:50%;margin-left:-18px;margin-top:-6px;position:absolute;top:50%;width:10px}.snail-loading:before{background-color:#279bf1}.snail-loading:after{animation-delay:-.5s;background:#64d214;margin-left:0;margin-right:-18px}@keyframes snail-loading-stretch{0%,to{transform:scale(1)}50%{transform:scale(2)}}.snail-loading-enter-active,.snail-loading-leave-active{transition:opacity .5s ease-in-out}.snail-loading-enter-from,.snail-loading-leave-to{opacity:0}
 /* src:popup\components\confirm-container.vue 	 index:0 */
 .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\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\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\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.40",
+  "version": "1.0.41",
   "type": "module",
   "main": "dist/snail.vue.js",
   "module": "dist/snail.vue.js",