dfish-widget 1.0.75 → 1.0.77

package/lib/index.esm.js

@@ -712,7 +712,9 @@ const frag = function(s) {
 
 const el = function(o) {
   if (o) {
-    return o.isWidget ? o.el() : (o.$el || o)
+    const d = o.$el;
+    if (d) return d.nodeType === 1 ? d : d.nextElementSibling
+    return o.isWidget ? o.el() : o
   }
 };
 // o -> el, s -> html string/object, r -> where[`after`, `prepend`, `before`, `append`]
@@ -1546,7 +1548,7 @@ $$1.ease = function(fn, ms, count) {
 
 // @a -> widget|HTMLElement, y -> {print: T/F(是否打印), head: "head标签", input2text: T/F(把表单值转为文本)
 $$1.print = function(a, y) {
-		let d = a.el ? a.el() : (a.$el || a), w = d.ownerDocument, b = $$1.q('link[media=print]', w), c = [];
+		let d = $$1.el(a), w = d.ownerDocument, b = $$1.q('link[media=print]', w), c = [];
     y = y || {};
 		$$1.q('meta', w).each(function() {c.push(this.outerHTML);});
 		(b.length > 0 ? b : $$1.q('link', w)).each(function() {c.push('<link rel="stylesheet" type="text/css" href="' + this.getAttribute('href') + '"/>');});
@@ -5518,6 +5520,7 @@ const props = __props;
   const propValue = alias.value || 'id';
   alias.text || 'text';
   const propChildren = alias.children || 'children';
+  const propClass = alias.class || 'class';
   
   const leafSymbol = Symbol('leaf');
   const showCount = ref(0);
@@ -5546,6 +5549,10 @@ const props = __props;
     return s
   };
   
+  const itemClass = (item) => {
+    return typeof propClass === 'function' ? propClass(item) : item[propClass]
+  };
+  
   const itemStyle = (item) => {
     return {
       top: `${item[leafSymbol].showIndex * itemHeight}px`,
@@ -5721,25 +5728,32 @@ const props = __props;
     showCount.value = Math.ceil(flow.value.height / itemHeight) + 1;
   };
   
+  const focus = async (id) => {
+    if (!showList.value.find(n => id === n[propValue])) {
+      expandTo(id);
+    }
+    const showIndex = showList.value.findIndex(n => id === n[propValue]);
+    if (showIndex === -1 || showIndex === showList.value.length - 1) {
+      const item = find(id);
+      const i = flatList.value.indexOf(item);
+      if (i > -1) {
+        await nextTick();
+        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
+      }
+    }
+  };
+  
   const watchCurrent = async (val) => {
     await nextTick();
     current = val;
     val = val && $$1.array(val);
     if (!val || !val.length) return
     for (let v of val) {
-      if (!showList.value.find(n => v == n[propValue])) {
+      if (!showList.value.find(n => v === n[propValue])) {
         expandTo(v);
       }
     }
-    const showIndex = showList.value.findIndex(n => val[0] == n[propValue]);
-    if (showIndex === -1 || showIndex === showList.value.length - 1) {
-      const item = find(val[0]);
-      const i = flatList.value.indexOf(item);
-      if (i > -1) {
-        await nextTick();
-        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
-      }
-    }
+    focus(val[0]);
   };
   
   onMounted(async () => {
@@ -5763,7 +5777,7 @@ const props = __props;
     }
   });
   
-  expose({toggle, expandTo, find, merge});
+  expose({toggle, focus, find, merge});
   
 
 return (_ctx, _cache) => {
@@ -5818,7 +5832,7 @@ return (_ctx, _cache) => {
                 (openBlock(true), createElementBlock(Fragment, null, renderList(unref(showList), (item, index) => {
                   return (openBlock(), createElementBlock("div", {
                     key: index,
-                    class: normalizeClass(['w-table-v2-tr', {'z-on': isCurrent(item)}]),
+                    class: normalizeClass(['w-table-v2-tr', itemClass(item), {'z-on': isCurrent(item)}]),
                     style: normalizeStyle(itemStyle(item)),
                     onClick: $event => (clickItem($event, item))
                   }, [
@@ -6559,6 +6573,8 @@ const props = __props;
   const propValue = alias.value || 'id';
   const propText = alias.text || 'text';
   const propChildren = alias.children || 'children';
+  const propClass = alias.class || 'class';
+  const propDisabled = alias.disabled || 'disabled';
   
   const leafSymbol = Symbol('leaf');
   const showCount = ref(0);
@@ -6575,6 +6591,10 @@ const props = __props;
     }
   });
   
+  const itemClass = (item, index) => {
+    return typeof propClass === 'function' ? propClass(item, index) : item[propClass]
+  };
+  
   const itemStyle = (item) => {
     return {
       top: `${item[leafSymbol].showIndex * itemHeight}px`,
@@ -6598,8 +6618,12 @@ const props = __props;
     return Array.isArray(props.current) ? props.current.includes(item[propValue]) : (props.current === item[propValue])
   };
   
+  const isDisabled = (item, index) => {
+    return typeof propDisabled === 'function' ? propDisabled(item, index) : item[propDisabled]
+  };
+
   const clickItem = (e, item) => {
-    emits('click:item', e, item);
+    if (!isDisabled(item)) emits('click:item', e, item);
   };
   
   const clickToggle = (e, item) => {
@@ -6746,25 +6770,32 @@ const props = __props;
     showCount.value = Math.ceil(flow.value.height / itemHeight) + 1;
   };
   
+  const focus = async (id) => {
+    if (!showList.value.find(n => id === n[propValue])) {
+      expandTo(id);
+    }
+    const showIndex = showList.value.findIndex(n => id === n[propValue]);
+    if (showIndex === -1 || showIndex === showList.value.length - 1) {
+      const item = find(id);
+      const i = flatList.value.indexOf(item);
+      if (i > -1) {
+        await nextTick();
+        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
+      }
+    }
+  };
+  
   const watchCurrent = async (val) => {
     await nextTick();
     current = val;
     val = val && $$1.array(val);
     if (!val || !val.length) return
     for (let v of val) {
-      if (!showList.value.find(n => v == n[propValue])) {
+      if (!showList.value.find(n => v === n[propValue])) {
         expandTo(v);
       }
     }
-    const showIndex = showList.value.findIndex(n => val[0] == n[propValue]);
-    if (showIndex === -1 || showIndex === showList.value.length - 1) {
-      const item = find(val[0]);
-      const i = flatList.value.indexOf(item);
-      if (i > -1) {
-        await nextTick();
-        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
-      }
-    }
+    focus(val[0]);
   };
   
   onMounted(async () => {
@@ -6788,7 +6819,7 @@ const props = __props;
     }
   });
   
-  expose({toggle, expandTo, find, merge});
+  expose({toggle, focus, find, merge});
   
 
 return (_ctx, _cache) => {
@@ -6820,7 +6851,7 @@ return (_ctx, _cache) => {
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(showList), (item, index) => {
               return (openBlock(), createElementBlock("div", {
                 key: index,
-                class: normalizeClass(['w-leaf w-leaf-v2', {'z-folder': isFolder(item), 'z-on': isCurrent(item)}]),
+                class: normalizeClass(['w-leaf w-leaf-v2', itemClass(item, index), {'z-folder': isFolder(item), 'z-on': isCurrent(item), 'z-ds': isDisabled(item, index)}]),
                 style: normalizeStyle(itemStyle(item)),
                 onClick: $event => (clickItem($event, item))
               }, [