dfish-widget 1.0.49 → 1.0.51

package/lib/index.esm.js

@@ -6092,7 +6092,7 @@ const props = __props;
 
   
   
-  const {alias, itemHeight} = props;
+  let {alias, itemHeight, current} = props;
   
   const propValue = alias.value || 'id';
   const propText = alias.text || 'text';
@@ -6237,9 +6237,9 @@ const props = __props;
           a = p;
         }
       }
-      a && toggle(a, true);
-      return item
+      a && doToggle(a, true);
     }
+    return item
   };
   
   const showList = computed(() => {
@@ -6256,24 +6256,30 @@ const props = __props;
     showCount.value = Math.ceil(flow.value.height / itemHeight);
   };
   
+  const watchCurrent = async (val) => {
+    await nextTick();
+    current = val;
+    if (!showList.value.find(n => n[propValue] === val)) {
+      const item = expandTo(val);
+      const i = flatList.value.indexOf(item);
+      if (i > -1) {
+        await nextTick();
+        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
+      }
+    }
+  };
+  
   onMounted(async () => {
     watch(() => root.value.wScrollSizeY, (ssy) => {
       initShowCount();
     }, {immediate: true});
-    watch(() => props.children, (children) => {
+    watch(() => props.children, async (children) => {
       flatList.value = toFlat(children);
-    }, {immediate: true});
-    watch(() => props.current, (current) => {
-      if (!showList.value.find(n => n[propValue] === current)) {
-        const item = expandTo(current);
-        const i = flatList.value.indexOf(item);
-        if (i > -1) {
-          nextTick(() => {
-            root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
-          });
-        }
+      if (current && current == props.current) { // 避免重复聚焦
+        watchCurrent(props.current);
       }
-    });
+    }, {immediate: true});
+    watch(() => props.current, watchCurrent);
     const src = props.src && props.src();
     if (src) {
       loading.value = true;