dfish-widget 1.0.52 → 1.0.54

package/lib/index.esm.js

@@ -696,7 +696,7 @@ const frag = function(s) {
 
 const el = function(o) {
   if (o) {
-    return o.isWidget ? o.el() : o
+    return o.isWidget ? o.el() : (o.$el || o)
   }
 };
 // o -> el, s -> html string/object, r -> where[`after`, `prepend`, `before`, `append`]
@@ -2175,7 +2175,7 @@ var script$1k = {
           if (e = e.join())
             r = $$1.q(d ? `${f}:not(${e})` : e, this.el());
         } else {
-          r = $$1.q(f, a ? (a.isWidget ? a.el() : a) : this.el());
+          r = $$1.q(f, a ? $$1.el(a) : this.el());
         }
         return r ? $$1.lodash.map(r.not('[w-form-ignore] :input')) : []
       },
@@ -6243,6 +6243,23 @@ 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 showList = computed(() => {
     const topCount = Math.floor(scrollTop.value / itemHeight);
@@ -6290,7 +6307,7 @@ const props = __props;
     }
   });
   
-  expose({toggle, expandTo, find});
+  expose({toggle, expandTo, find, merge});
   
 
 return (_ctx, _cache) => {