dfish-widget 1.0.70 → 1.0.72

package/lib/index.esm.js

@@ -2282,22 +2282,21 @@ var script$1l = {
       /*
         @options: {
           mode: {
-            'default': 一个template只有一个实例，且每次都是新实例
+            'multiple': 默认值，一个template可以多个实例
+            'single': 一个template只有一个实例，且每次都是新实例
             'component': 一个template只有一个实例
-            'multiple': 一个template可以多个实例
-          }, 
-          init(pop): Function, 对话框mounted后执行
+          }
         }
       */
       createPop(commander, template, props, options = {}) {
         return new Promise((resolve, reject) => {
-          const mode = options.mode || 'default';
+          const mode = options.mode || 'multiple';
           const pop = this.getPops(template)[0];
           if (pop) {
             if (mode === 'component') {
               Object.assign(pop, {props, options, resolve, reject});
               return
-            } else if (mode === 'default') {
+            } else if (mode === 'single') {
               let index = this.pops.indexOf(pop);
               this.pops.splice(index, 1);
             }
@@ -3861,10 +3860,6 @@ const O = {},
         if (this.x.timeout) {
           setTimeout(this.close, this.x.timeout);
         }
-        let o = this.getPop();
-        if (o && o.options && o.options.init) {
-          o.options.init(this);
-        }
       });
     },
     unmounted() {
@@ -5699,18 +5694,21 @@ const props = __props;
   const watchCurrent = async (val) => {
     await nextTick();
     current = val;
-    if (!val) return
-    val = $$1.array(val);
+    val = val && $$1.array(val);
+    if (!val || !val.length) return
     for (let v of val) {
       if (!showList.value.find(n => v == n[propValue])) {
         expandTo(v);
       }
     }
-    const item = find(val[0]);
-    const i = flatList.value.indexOf(item);
-    if (i > -1) {
-      await nextTick();
-      wrap.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
+    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));
+      }
     }
   };
   
@@ -5724,7 +5722,7 @@ const props = __props;
         watchCurrent(props.current);
       }
     }, {immediate: true});
-    watch(() => props.current, watchCurrent);
+    watch(() => props.current, watchCurrent, {deep: true});
     if (!props.children || props.children.length == 0) {
       const src = props.src && props.src();
       if (src) {
@@ -6714,18 +6712,22 @@ const props = __props;
   const watchCurrent = async (val) => {
     await nextTick();
     current = val;
-    if (!val) return
-    val = $$1.array(val);
+    console.log(val);
+    val = val && $$1.array(val);
+    if (!val || !val.length) return
     for (let v of val) {
       if (!showList.value.find(n => v == n[propValue])) {
         expandTo(v);
       }
     }
-    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));
+    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));
+      }
     }
   };
   
@@ -6739,7 +6741,7 @@ const props = __props;
         watchCurrent(props.current);
       }
     }, {immediate: true});
-    watch(() => props.current, watchCurrent);
+    watch(() => props.current, watchCurrent, {deep: true});
     if (!props.children || props.children.length == 0) {
       const src = props.src && props.src();
       if (src) {
@@ -7440,10 +7442,10 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
           }, h('i', {
             class: this.input_icon
           })),
-          this.x.text ?
+          this.$slots.text || this.x.text ?
           h('span', {
-            class: this.$options.name + '-text'
-          }, this.x.text) : null
+            class: this.$options.name + '-text',
+          }, this.$slots.text ? this.$slots.text() : this.x.text) : null
         ]
       },
       html_main() {
@@ -11574,8 +11576,9 @@ var script$8 = {
 				}
         if (Array.isArray(v)) {
           return v.map(item => item.text).join(', ')
-        } else
-          return v && String(v.text)
+        } else {
+          return (v && v.text) || ''
+        }
       }
     }
   };