@cloudbase/weda-ui-mp 3.18.4 → 3.18.6

package/components/form-field-behavior/form-field-behavior.js

@@ -97,9 +97,23 @@ export default Behavior({
         },
         async handleValidate(throwError = true) {
           let finalValue = that.data.value;
+          const validPromise = [];
+          if (that.data?.formsItemMap && Object.values(that.data?.formsItemMap)?.length) {
+            Object.values(that.data?.formsItemMap).forEach((field) => {
+              field?.forEach((item) => {
+                if (item.handleValidate) {
+                  const validate = item.handleValidate(false);
+                  if (validate) {
+                    validPromise.push(validate);
+                  }
+                }
+              });
+            });
+          }
+
           const { required, rules, requiredMsg, privateRules, selfDefineRules, label } = that.data;
           const _rules = [].concat(rules, privateRules, selfDefineRules);
-          if (!required && !_rules.length) return;
+          if (!required && !_rules.length && !validPromise.length) return;
           if (finalValue) {
             if (typeof finalValue === 'string') {
               if (finalValue.trim) {
@@ -110,7 +124,6 @@ export default Behavior({
             }
           }
 
-          const validPromise = [];
           if (required) {
             if (!validType.required(finalValue)) {
               validPromise.push(Promise.resolve({ format: 'required', message: requiredMsg }));
@@ -171,10 +184,12 @@ export default Behavior({
               }
             }
           }
-          const errorArr = await Promise.all(validPromise).then((arr) => {
-            return arr.filter((item) => item !== void 0);
+          const errorArr = await Promise.all(validPromise?.flat()).then((arr) => {
+            return arr
+              ?.filter((item) => item !== void 0)
+              ?.filter((i) => (Array.isArray(i) ? i.length > 0 : i))
+              ?.map((i) => ({ ...i, label }));
           });
-
           if (errorArr.length > 0) {
             that.setData({
               validateState: 'error',

package/components/wd-modal/index.js

@@ -76,7 +76,7 @@ Component({
      * 控制弹窗打开/关闭
      * @param {Boolean} isOpen
      */
-    dealShow(isOpen, params) {
+    dealShow(isOpen, params, isTrigger = true) {
       let setImmediately = {
         maskPreToShow: true,
         isMaskShow: !isOpen,
@@ -92,8 +92,9 @@ Component({
       }
 
       this.setData(setImmediately);
-
-      this.triggerEvent(isOpen ? 'open' : 'close', params);
+      if (isTrigger) {
+        this.triggerEvent(isOpen ? 'open' : 'close', params);
+      }
     },
     /**
      * 关闭弹窗
@@ -125,11 +126,9 @@ Component({
       position,
       isMaskShow,
       defaultMaskShow,
-      isBdShow
+      isBdShow,
     ) {
-      const defaultWidth = { center: 'calc(100% - 4.57rem)', bottom: '100%' }[
-        position
-      ];
+      const defaultWidth = { center: 'calc(100% - 4.57rem)', bottom: '100%' }[position];
       const styleShow = `width: ${defaultWidth};` + style;
       const styleMain = style?.match(/(display:).*?(;)/g)?.join('');
 
@@ -153,8 +152,7 @@ Component({
         'weda-modal-new': true,
         [`${WD_PREFIX}-modal-bd`]: true,
         [`${WD_PREFIX}-modal-bd__toggle`]: isBdShow,
-        [`${WD_PREFIX}-modal-bd__box`]:
-          !defaultMaskShow && position === 'center',
+        [`${WD_PREFIX}-modal-bd__box`]: !defaultMaskShow && position === 'center',
       });
 
       this.setData({
@@ -166,16 +164,14 @@ Component({
       });
     },
     defaultShow: function (defaultShow) {
-      this.dealShow(defaultShow);
+      this.dealShow(defaultShow, {}, false);
     },
     'isBdShow,openInfo,closeInfo': function () {
       this.updateWidgetAPI();
     },
     template: function (template) {
       const modalFtClasses = classNames({
-        [`${WD_PREFIX}-modal-bd__ft-text-btn`]: ['confirm', 'notice'].includes(
-          template
-        ),
+        [`${WD_PREFIX}-modal-bd__ft-text-btn`]: ['confirm', 'notice'].includes(template),
         [`${WD_PREFIX}-modal-bd__ft-text-btn--vertical`]: template === 'notice',
       });
       this.setData({ modalFtClasses });

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.18.4",
+  "version": "3.18.6",
   "main": "./",
   "publishConfig": {
     "access": "public"