dfish-widget 1.0.76 → 1.0.78

package/lib/index.esm.js

@@ -2237,10 +2237,22 @@ var script$1l = {
       // 表单验证。如果检测到错误，将返回一个包含错误信息的数组 /@r -> range, n -> validate group name
       async getValidError(range) {
         let e, q = this.getFormList(range);
+        const group = {};
         for (let i = 0, l = q.length, c, v; i < l; i++) {
-          if ((c = $$1(q[i])) && c.isFormWidget && (v = await c.getValidError())) {
-            if (!e) e = [];
-            if (!e.find(n => n.wid == v.wid)) e.push(v);
+          if ((c = $$1(q[i])) && c.isFormWidget) {
+            if (q[i].name in group) {
+              v = group[q[i].name] && $$1.extend({wid: c.uid}, group[q[i].name]);
+            } else {
+              v = await c.getValidError();
+            }
+            if (v) {
+              if (!e) e = [];
+              if (!e.find(n => n.wid == v.wid)) e.push(v);
+            }
+          }
+          // checkbox 和 radio 只需验证一个
+          if (q[i].type === 'checkbox' || q[i].type === 'radio') {
+            group[q[i].name] = v;
           }
         }
         return e
@@ -4299,6 +4311,11 @@ let inst$1 = null;
     name: 'w-tip',
     mixins: [script$1a],
     props: ['face', 'text', 'escape'],
+    provide() {
+      return {
+        provideView: this.provideView
+      }
+    },
     methods: {
       x_default() {
         return {
@@ -5728,25 +5745,32 @@ const props = __props;
     showCount.value = Math.ceil(flow.value.height / itemHeight) + 1;
   };
   
+  const focus = async (id) => {
+    if (!showList.value.find(n => id === n[propValue])) {
+      expandTo(id);
+    }
+    const showIndex = showList.value.findIndex(n => id === n[propValue]);
+    if (showIndex === -1 || showIndex === showList.value.length - 1) {
+      const item = find(id);
+      const i = flatList.value.indexOf(item);
+      if (i > -1) {
+        await nextTick();
+        root.value.scrollToY(((i + 1) * itemHeight) - (flow.value.height / 2));
+      }
+    }
+  };
+  
   const watchCurrent = async (val) => {
     await nextTick();
     current = val;
     val = val && $$1.array(val);
     if (!val || !val.length) return
     for (let v of val) {
-      if (!showList.value.find(n => v == n[propValue])) {
+      if (!showList.value.find(n => v === n[propValue])) {
         expandTo(v);
       }
     }
-    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));
-      }
-    }
+    focus(val[0]);
   };
   
   onMounted(async () => {
@@ -5770,7 +5794,7 @@ const props = __props;
     }
   });
   
-  expose({toggle, expandTo, find, merge});
+  expose({toggle, focus, find, merge});
   
 
 return (_ctx, _cache) => {
@@ -6763,19 +6787,14 @@ const props = __props;
     showCount.value = Math.ceil(flow.value.height / itemHeight) + 1;
   };
   
-  const watchCurrent = async (val) => {
+  const focus = async (id) => {
     await nextTick();
-    current = 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);
-      }
+    if (!showList.value.find(n => id === n[propValue])) {
+      expandTo(id);
     }
-    const showIndex = showList.value.findIndex(n => val[0] == n[propValue]);
+    const showIndex = showList.value.findIndex(n => id === n[propValue]);
     if (showIndex === -1 || showIndex === showList.value.length - 1) {
-      const item = find(val[0]);
+      const item = find(id);
       const i = flatList.value.indexOf(item);
       if (i > -1) {
         await nextTick();
@@ -6784,6 +6803,20 @@ const props = __props;
     }
   };
   
+  const watchCurrent = async (val) => {
+    await nextTick();
+    current = 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);
+      }
+    }
+    console.log('watchCurrent');
+    focus(val[0]);
+  };
+  
   onMounted(async () => {
     watch(() => root.value.wScrollSizeY, (ssy) => {
       initShowCount();
@@ -6805,7 +6838,7 @@ const props = __props;
     }
   });
   
-  expose({toggle, expandTo, find, merge});
+  expose({toggle, focus, find, merge});
   
 
 return (_ctx, _cache) => {