@cloudbase/weda-ui-mp 3.18.3 → 3.18.5

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-input-number/index.js

@@ -7,13 +7,7 @@ import { convertSize } from '../../utils/getFormLegacy';
 import classNames from '../../utils/classnames';
 import { commonCompBehavior } from '../../utils/common-behavior';
 import formFieldBehavior from '../form-field-behavior/form-field-behavior';
-import {
-  dealDecimals,
-  strNumAddCalc,
-  isNumber,
-  dealPercent,
-  getPercentUnit,
-} from './number';
+import { dealDecimals, strNumAddCalc, isNumber, dealPercent, getPercentUnit } from './number';
 import equal from '../../utils/deepEqual';
 
 const getHasClearIcon = (clearable, focus, disabled, readOnly, realValue) =>
@@ -26,12 +20,7 @@ const getRealValue = ({ value, format }) => {
   return Number(v.replace(/,/g, ''));
 };
 
-const judgeRule = ({
-  value = undefined,
-  max = undefined,
-  min = undefined,
-  resultType = 'boolean',
-} = {}) => {
+const judgeRule = ({ value = undefined, max = undefined, min = undefined, resultType = 'boolean' } = {}) => {
   let maxFit = true;
   let minFit = true;
   if (isNumber(max)) {
@@ -45,12 +34,7 @@ const judgeRule = ({
   return resultType === 'boolean' ? maxFit && minFit : { maxFit, minFit };
 };
 
-const getRuleMessage = ({
-  value = undefined,
-  max = undefined,
-  min = undefined,
-  validMsgObj = {},
-} = {}) => {
+const getRuleMessage = ({ value = undefined, max = undefined, min = undefined, validMsgObj = {} } = {}) => {
   const { maxFit, minFit } = judgeRule({
     value,
     max,
@@ -129,7 +113,7 @@ Component({
     inputWrap: `${WD_PREFIX}-form-input-wrap`,
     inputCls: `${WD_PREFIX}-form-input-wrap__input`,
     inputGroup: `${WD_PREFIX}-form-input-group`,
-    placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder`,
+    placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder weui-input__placeholder`,
     cls: '',
     formClass: '',
 
@@ -147,21 +131,8 @@ Component({
   },
   methods: {
     updateWidgetAPI: function () {
-      const {
-        name,
-        label,
-        required,
-        visible,
-        disabled,
-        readOnly,
-        before,
-        after,
-        min,
-        max,
-        step,
-        format,
-        value,
-      } = this.data;
+      const { name, label, required, visible, disabled, readOnly, before, after, min, max, step, format, value } =
+        this.data;
       this.setReadonlyAttributes?.({
         name,
         value,
@@ -186,20 +157,12 @@ Component({
     },
     onRealChange(e, type = '', { needSetData = true, value = '' } = {}) {
       const { readOnly, disabled, status, format, step } = this.properties;
-      if (readOnly || disabled || (status && status !== 'edit'))
-        return this.data.realValue;
+      if (readOnly || disabled || (status && status !== 'edit')) return this.data.realValue;
 
-      const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(
-        null,
-        this.data.realValue
-      );
+      const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(null, this.data.realValue);
 
       if (['plus', 'minus'].includes(type)) {
-        if (
-          !isNumber(step) ||
-          (type === 'plus' && stepPlusDisabled) ||
-          (type === 'minus' && stepMinusDisabled)
-        ) {
+        if (!isNumber(step) || (type === 'plus' && stepPlusDisabled) || (type === 'minus' && stepMinusDisabled)) {
           needSetData &&
             this.setData({
               stepPlusDisabled,
@@ -263,10 +226,7 @@ Component({
         return;
       }
 
-      const reg = new RegExp(
-        `^\\D*(\\d*(?:\\.\\d{0,${Math.max(0, 10000)}})?).*$`,
-        'g'
-      );
+      const reg = new RegExp(`^\\D*(\\d*(?:\\.\\d{0,${Math.max(0, 10000)}})?).*$`, 'g');
       value = value.replace(reg, '$1');
 
       if (e.detail.value.startsWith('-')) {
@@ -313,10 +273,8 @@ Component({
         stepPlusDisabled = true;
         stepMinusDisabled = true;
       } else {
-        stepPlusDisabled =
-          isNumber(+realValue) && isNumber(max) && max <= +realValue;
-        stepMinusDisabled =
-          isNumber(+realValue) && isNumber(min) && min >= +realValue;
+        stepPlusDisabled = isNumber(+realValue) && isNumber(max) && max <= +realValue;
+        stepMinusDisabled = isNumber(+realValue) && isNumber(min) && min >= +realValue;
       }
 
       return { stepPlusDisabled, stepMinusDisabled };
@@ -334,7 +292,7 @@ Component({
 
       const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(
         { readOnly, disabled, status, max, min, format },
-        toReal
+        toReal,
       );
 
       const readValue = `${toShow}${getPercentUnit(format)}`;
@@ -342,17 +300,7 @@ Component({
       return { toShow, toReal, stepPlusDisabled, stepMinusDisabled, readValue };
     },
     // 获取显示在输入框的值，非真实值
-    getShowValue({
-      value,
-      thousandShow,
-      decimals,
-      step,
-      max,
-      min,
-      format,
-      type = '',
-      needSetData = true,
-    }) {
+    getShowValue({ value, thousandShow, decimals, step, max, min, format, type = '', needSetData = true }) {
       if (value === '' && !['plus', 'minus'].includes(type)) return '';
 
       if (value === 'null' || value === 'undefined') return '';
@@ -362,9 +310,7 @@ Component({
       let res = `${value}`;
 
       if (isNumber(value) && res.includes('e')) {
-        res = `${res.startsWith('-') ? '-' : ''}${res
-          .replace(/^-/, '')
-          .toLocaleString()}`;
+        res = `${res.startsWith('-') ? '-' : ''}${res.replace(/^-/, '').toLocaleString()}`;
       }
 
       res = res.replace(/ /g, '').replace(/,/g, '');
@@ -383,11 +329,7 @@ Component({
       }
 
       const validMsgObj = getValidMsgObj(format, max, min);
-      const rules = getRules(
-        validMsgObj,
-        this.properties.max,
-        this.properties.min
-      );
+      const rules = getRules(validMsgObj, this.properties.max, this.properties.min);
 
       if (isNumber(this.properties.max) && Number(res) > max) {
         validState = 'error';
@@ -406,9 +348,7 @@ Component({
       // 千分符转换
       if (thousandShow && res !== 'Infinity' && res !== '-Infinity') {
         const temp = res.split('.');
-        res = `${temp[0].replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}${
-          temp[1] ? `.${temp[1]}` : ''
-        }`;
+        res = `${temp[0].replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}${temp[1] ? `.${temp[1]}` : ''}`;
       }
 
       needSetData &&
@@ -422,118 +362,89 @@ Component({
     },
   },
   observers: {
-    'name,value,label,required,visible,disabled,readOnly,before,after,min,max,step,format':
-      function () {
-        this.updateWidgetAPI();
-      },
-    'disabled,readOnly,clearable,isFocus': function (
+    'name,value,label,required,visible,disabled,readOnly,before,after,min,max,step,format': function () {
+      this.updateWidgetAPI();
+    },
+    'disabled,readOnly,clearable,isFocus': function (disabled, readOnly, clearable, isFocus) {
+      const hasClearIcon = getHasClearIcon(clearable, isFocus, disabled, readOnly, this.data.realValue);
+      this.setData({ hasClearIcon });
+    },
+    'disabled,size,wrapClassName,before,after,classRoot,className,stepOption': function (
       disabled,
-      readOnly,
-      clearable,
-      isFocus
+      size,
+      wrapClassName,
+      before,
+      after,
+      classRoot,
+      className,
+      stepOption,
     ) {
-      const hasClearIcon = getHasClearIcon(
-        clearable,
-        isFocus,
-        disabled,
-        readOnly,
-        this.data.realValue
+      const _size = convertSize(size);
+      const { classPrefix, inputWrap } = this.data;
+      const root = `${classPrefix}-${classRoot}`;
+      const cls = classNames(
+        root,
+        inputWrap,
+        this.data.inputGroup,
+        wrapClassName,
+        `size-width-${_size}`,
+        `size-font-${_size}`,
+        `size-height-${_size}`,
+        `${root}-${classRoot}`,
+        {
+          'is-not-h5': true,
+          'size-width-hundred': true,
+          'is-disabled': disabled,
+          [`${classPrefix}-input-number-input-number`]: true,
+          [`${classPrefix}-form-input-wrap--no-border`]: stepOption !== 'both',
+          [`${inputWrap}--no-radius-left`]: before,
+          [`${inputWrap}--no-radius-right`]: after,
+          [`${inputWrap}--no-radius`]: before && after,
+          [`${classPrefix}-form-input-wrap`]: true,
+        },
       );
-      this.setData({ hasClearIcon });
+      const formClass = classNames(className, `${root}--row`, stepOption !== 'both' ? 'input-number-step-right' : '');
+
+      this.setData({ cls, root, _size, formClass });
     },
-    'disabled,size,wrapClassName,before,after,classRoot,className,stepOption':
-      function (
-        disabled,
-        size,
-        wrapClassName,
-        before,
-        after,
-        classRoot,
-        className,
-        stepOption
-      ) {
-        const _size = convertSize(size);
-        const { classPrefix, inputWrap } = this.data;
-        const root = `${classPrefix}-${classRoot}`;
-        const cls = classNames(
-          root,
-          inputWrap,
-          this.data.inputGroup,
-          wrapClassName,
-          `size-width-${_size}`,
-          `size-font-${_size}`,
-          `size-height-${_size}`,
-          `${root}-${classRoot}`,
-          {
-            'is-not-h5': true,
-            'size-width-hundred': true,
-            'is-disabled': disabled,
-            [`${classPrefix}-input-number-input-number`]: true,
-            [`${classPrefix}-form-input-wrap--no-border`]:
-              stepOption !== 'both',
-            [`${inputWrap}--no-radius-left`]: before,
-            [`${inputWrap}--no-radius-right`]: after,
-            [`${inputWrap}--no-radius`]: before && after,
-            [`${classPrefix}-form-input-wrap`]: true,
-          }
-        );
-        const formClass = classNames(
-          className,
-          `${root}--row`,
-          stepOption !== 'both' ? 'input-number-step-right' : ''
-        );
-
-        this.setData({ cls, root, _size, formClass });
-      },
-    'inputValue,format,decimals,min,max,status,readOnly,disabled,after,before,thousandShow,step':
-      function (
-        inputValue,
+    'inputValue,format,decimals,min,max,status,readOnly,disabled,after,before,thousandShow,step': function (
+      inputValue,
+      format,
+      decimals,
+      min,
+      max,
+      status,
+      readOnly,
+      disabled,
+      after,
+      before,
+      thousandShow,
+      step,
+    ) {
+      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } = this.getRealAndShowData({
+        value: this.data.isInit ? (isNumber(inputValue) ? inputValue : '') : this.data.realValue,
         format,
         decimals,
         min,
         max,
-        status,
         readOnly,
         disabled,
-        after,
+        status,
         before,
+        after,
         thousandShow,
-        step
-      ) {
-        const {
-          toReal,
-          toShow,
-          stepPlusDisabled,
-          stepMinusDisabled,
-          readValue,
-        } = this.getRealAndShowData({
-          value: this.data.isInit
-            ? isNumber(inputValue)
-              ? inputValue
-              : ''
-            : this.data.realValue,
-          format,
-          decimals,
-          min,
-          max,
-          readOnly,
-          disabled,
-          status,
-          before,
-          after,
-          thousandShow,
-          step,
-        });
+        step,
+      });
 
-        this.setData({
-          readValue,
-          realValue: toReal,
-          showValue: readOnly ? readValue : toShow,
-          stepPlusDisabled,
-          stepMinusDisabled,
-        });
-        this.changeForm({ value: toReal });
-      },
+      this.setData({
+        readValue,
+        realValue: toReal,
+        showValue: readOnly ? readValue : toShow,
+        stepPlusDisabled,
+        stepMinusDisabled,
+      });
+      this.changeForm({ value: toReal });
+    },
     // 监听非输入引起的value变化，比如调用 setValue, clearValue
     value: function (value) {
       const { format } = this.properties;
@@ -573,8 +484,9 @@ Component({
     },
     inputValue: function (inputValue) {
       if (equal(inputValue, this.data._oldInputValue)) return;
-      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } =
-        this.getRealAndShowData({ value: inputValue });
+      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } = this.getRealAndShowData({
+        value: inputValue,
+      });
 
       this.setData({
         readValue,

package/components/wd-modal/index.js

@@ -125,11 +125,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 +151,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({
@@ -165,17 +162,12 @@ Component({
         modalBdClasses,
       });
     },
-    defaultShow: function (defaultShow) {
-      this.dealShow(defaultShow);
-    },
     '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/components/wd-time/index.wxml

@@ -25,7 +25,7 @@
   >
     <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}">
       <wd-input-wrap block="{{block}}" classRoot="{{classRoot}}" before="{{before}}" after="{{after}}" disabled="{{disabled}}" prefixType="{{prefixType}}" prefixIcon="{{prefixIcon}}" prefixSrc="{{prefixSrc}}" suffixType="{{suffixType}}" suffixIcon="{{suffixIcon}}" suffixSrc="{{suffixSrc}}" hasClearIcon="{{clearable && !disabled && (value != null)}}" bind:onClear="handleClear">
-        <input class="{{classPrefix}}-form-select_input" placeholder="{{placeholder}}" value="{{readValue}}" disabled="true" name="{{name}}" bindtap="setPickerVisible" />
+        <input placeholder-class="weui-input__placeholder" class="{{classPrefix}}-form-select_input" placeholder="{{placeholder}}" value="{{readValue}}" disabled="true" name="{{name}}" bindtap="setPickerVisible" />
       </wd-input-wrap>
     </wd-input-group>
   </wd-form-item>

package/package.json

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