dfish-widget 1.0.73 → 1.0.75

package/lib/index.esm.js

@@ -3894,12 +3894,12 @@ const {icon} = __props;
     error: '.f-i .f-i-alert-error'
   };
   
-  const save = () => {
-    emit('save');
+  const save = (e) => {
+    emit('save', e);
   };
   
-  const close = () => {
-    emit('close');
+  const close = (e) => {
+    emit('close', e);
   };
   
   const typeIcon = computed(() => {
@@ -4019,13 +4019,25 @@ var script$18 = {
           title: $$1.loc.opertip
         }
       },
-      onSave() {
-        this.x.yes && this.x.yes();
-        this.resolve();
+      async onSave(e) {
+        let r;
+        if (this.x.yes) {
+          try {
+            r = await this.x.yes(e);
+          } catch(e) {
+            console.error(e);
+          }
+        }
+        this.resolve(r);
         this.close();
       },
-      onClose() {
-        this.onSave();
+      async onClose(e) {
+        let r;
+        if (this.x.no) {
+          r = await this.x.no(e);
+        }
+        this.resolve(r);
+        this.close();
       },
       html_slots_default() {
         return h(
@@ -4070,12 +4082,12 @@ const {icon} = __props;
     error: '.f-i .f-i-alert-error'
   };
   
-  const save = () => {
-    emit('save');
+  const save = (e) => {
+    emit('save', e);
   };
   
-  const close = () => {
-    emit('close');
+  const close = (e) => {
+    emit('close', e);
   };
   
   const typeIcon = computed(() => {
@@ -4202,13 +4214,24 @@ var script$16 = {
           title: $$1.loc.opertip
         }
       },
-      onSave() {
-        this.x.yes && this.x.yes();
-        this.resolve();
+      async onSave(e) {
+        let r;
+        if (this.x.yes) {
+          try {
+            r = await this.x.yes(e);
+          } catch(e) {
+            console.error(e);
+          }
+        }
+        this.resolve(r);
         this.close();
       },
-      onClose() {
-        this.x.no && this.x.no();
+      async onClose(e) {
+        let r;
+        if (this.x.no) {
+          r = await this.x.no(e);
+        }
+        this.resolve(r);
         this.close();
       },
       html_slots_default() {
@@ -5659,18 +5682,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;
         }
       }
     }
@@ -6677,18 +6707,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;
         }
       }
     }