dfish-widget 1.0.74 → 1.0.76

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`,
@@ -5682,18 +5689,25 @@ const props = __props;
     return item
   };
   
-  const merge = (newList, oldList) => {
-    if (!Array.isArray(newList)) return
-    const item = newList.find(n => n[propChildren] && n[propChildren].length);
-    if (item) {
-      if (!oldList) oldList = props.children;
-      const old = oldList.find(n => n[propValue] == item[propValue]);
-      if (old) {
-        if (old[propChildren] && old[propChildren].length) {
-          merge(item[propChildren], old[propChildren]);
-        } else {
-          old[propChildren] = item[propChildren];
-          toFlat(old[propChildren], old);
+  const merge = (newList) => {
+    if (!Array.isArray(newList)) return []
+    const oldList = JSON.parse(JSON.stringify(props.children));
+    mergeChildren(newList, oldList);
+    props.children.length = 0;
+    props.children.push.apply(props.children, newList);
+    flatList.value = toFlat(newList);
+  };
+  
+  const mergeChildren = (newList, oldList) => {
+    for (let n of newList) {
+      let o = oldList.find(v => v[propValue] === n[propValue]);
+      if (o) {
+        if (o[propChildren]) {
+          if (n[propChildren]) mergeChildren(n[propChildren], o[propChildren]);
+          else n[propChildren] = o[propChildren];
+        }
+        if (o.expanded != null) {
+          n.expanded = o.expanded;
         }
       }
     }
@@ -5811,7 +5825,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))
                   }, [
@@ -6552,6 +6566,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);
@@ -6568,6 +6584,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`,
@@ -6591,8 +6611,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) => {
@@ -6700,18 +6724,25 @@ const props = __props;
     return item
   };
   
-  const merge = (newList, oldList) => {
-    if (!Array.isArray(newList)) return
-    const item = newList.find(n => n[propChildren] && n[propChildren].length);
-    if (item) {
-      if (!oldList) oldList = props.children;
-      const old = oldList.find(n => n[propValue] == item[propValue]);
-      if (old) {
-        if (old[propChildren] && old[propChildren].length) {
-          merge(item[propChildren], old[propChildren]);
-        } else {
-          old[propChildren] = item[propChildren];
-          toFlat(old[propChildren], old);
+  const merge = (newList) => {
+    if (!Array.isArray(newList)) return []
+    const oldList = JSON.parse(JSON.stringify(props.children));
+    mergeChildren(newList, oldList);
+    props.children.length = 0;
+    props.children.push.apply(props.children, newList);
+    flatList.value = toFlat(newList);
+  };
+  
+  const mergeChildren = (newList, oldList) => {
+    for (let n of newList) {
+      let o = oldList.find(v => v[propValue] === n[propValue]);
+      if (o) {
+        if (o[propChildren]) {
+          if (n[propChildren]) mergeChildren(n[propChildren], o[propChildren]);
+          else n[propChildren] = o[propChildren];
+        }
+        if (o.expanded != null) {
+          n.expanded = o.expanded;
         }
       }
     }
@@ -6806,7 +6837,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))
               }, [