@cloudbase/weda-ui-mp 3.15.6 → 3.15.8

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

@@ -3,11 +3,7 @@ import equal from '../../utils/deepEqual';
 import { errorHandler } from '../../utils/error';
 
 import { autorun, untracked } from 'mobx';
-import {
-  convertStatus,
-  convertRules,
-  convertMethodParam,
-} from '../../utils/getFormLegacy';
+import { convertStatus, convertRules, convertMethodParam } from '../../utils/getFormLegacy';
 
 export default Behavior({
   behaviors: [],
@@ -101,14 +97,7 @@ export default Behavior({
         },
         async handleValidate(throwError = true) {
           let finalValue = that.data.value;
-          const {
-            required,
-            rules,
-            requiredMsg,
-            privateRules,
-            selfDefineRules,
-            label,
-          } = that.data;
+          const { required, rules, requiredMsg, privateRules, selfDefineRules, label } = that.data;
           const _rules = [].concat(rules, privateRules, selfDefineRules);
           if (!required && !_rules.length) return;
           if (finalValue) {
@@ -124,9 +113,7 @@ export default Behavior({
           const validPromise = [];
           if (required) {
             if (!validType.required(finalValue)) {
-              validPromise.push(
-                Promise.resolve({ format: 'required', message: requiredMsg })
-              );
+              validPromise.push(Promise.resolve({ format: 'required', message: requiredMsg }));
             }
           }
 
@@ -153,10 +140,7 @@ export default Behavior({
                     let reg;
                     if (typeof item.pattern === 'string') {
                       const m = item.pattern.match(/(\/?)(.+)\1([a-z]*)/i);
-                      if (
-                        m[3] &&
-                        !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])
-                      ) {
+                      if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])) {
                         reg = RegExp(item.pattern);
                       } else {
                         reg = new RegExp(m[2], m[3]);
@@ -225,15 +209,10 @@ export default Behavior({
       Promise.resolve().then(() => {
         this._reaction = autorun(() => {
           const form = untracked(() => {
-            return this.$widget?.closest(
-              (w) => w.getConfig?.()?.componentType === 'form'
-            );
+            return this.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
           });
 
-          if (
-            form &&
-            (this.data.layout === 'auto' || this.data.layout === '')
-          ) {
+          if (form && (this.data.layout === 'auto' || this.data.layout === '')) {
             if (form.layout !== this.data.actualLayout) {
               // 在 form 里面
               this.setData({ actualLayout: form.layout });
@@ -271,9 +250,7 @@ export default Behavior({
       // 清空嵌套表单
       this._removeFormObjItem?.();
       if (this.$widget) {
-        const form = this.$widget.closest(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
         form?.updateFormContext(this.data.name, undefined);
       }
@@ -315,10 +292,7 @@ export default Behavior({
       };
     },
     setReadOnly(val) {
-      const [originalReadOnly, originalDisabled] = [
-        this.data.readOnly,
-        this.data.disabled,
-      ];
+      const [originalReadOnly, originalDisabled] = [this.data.readOnly, this.data.disabled];
       const value = convertMethodParam(val);
       if (value !== originalReadOnly) {
         // 先用disabled属性来做
@@ -345,29 +319,20 @@ export default Behavior({
         // this.$instanceRef.current.name = newName;
         this.data._oldName = newName;
         if (typeof this.$widget !== 'object') return;
-        const form = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'form');
 
-        if (form) {
+        const formObj = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'formObj');
+
+        if (formObj) {
+          // 添加子组件到嵌套表单里面
+          this._removeFormObjItem = formObj.addFormItem(this.data.name, this.$widget);
+        } else if (form) {
           // 在 form 里面
           this._removeFormItem = form.addFormItem(this.data.name, this.$widget);
           if (!Object.prototype.hasOwnProperty.call(form?.value, newName)) {
             form?.updateFormContext(this.data.name, this.data.value);
           }
         }
-
-        const formObj = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'formObj'
-        );
-
-        if (formObj) {
-          // 添加子组件到嵌套表单里面
-          this._removeFormObjItem = formObj.addFormItem(
-            this.data.name,
-            this.$widget
-          );
-        }
       });
     },
     value: function (value) {
@@ -382,18 +347,12 @@ export default Behavior({
         this.$instanceRef.current.value = value;
 
         if (this.$widget) {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
-          const formObj = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'formObj'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
+          const formObj = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'formObj');
           // 有父级嵌套表单的不更新form值，父级嵌套表单会去更新
           !formObj && form?.updateFormContext(this.data.name, value);
           formObj?.valueChangeFromChild?.({
-            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${
-              this.data.name
-            }`,
+            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${this.data.name}`,
             value,
           });
         }
@@ -407,9 +366,7 @@ export default Behavior({
       Promise.resolve().then(() => {
         this.data._layout = layout;
         if (!layout || layout === 'auto') {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
           if (form) {
             // 在 form 里面
@@ -432,9 +389,7 @@ export default Behavior({
       this.data._status = status;
       const { disabled: _disabled, readOnly: _readOnly } = this.data;
       const statusParams = convertStatus(status, _disabled, _readOnly);
-      const form = this?.$widget?.closest(
-        (w) => w.getConfig?.()?.componentType === 'form'
-      );
+      const form = this?.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
       let disabled = statusParams.disabled;
       let readOnly = statusParams.readOnly;
       if (form) {
@@ -443,13 +398,7 @@ export default Behavior({
       }
       this.setData({ disabled, readOnly });
     },
-    'required,before,after,requiredMsg,isUnionValue': function (
-      required,
-      before,
-      after,
-      requiredMsg,
-      isUnionValue
-    ) {
+    'required,before,after,requiredMsg,isUnionValue': function (required, before, after, requiredMsg, isUnionValue) {
       const newPrivateRules = {
         required,
         before,
@@ -459,13 +408,7 @@ export default Behavior({
       };
       if (equal(newPrivateRules, this.data._privateRules)) return;
       this.data._privateRules = newPrivateRules;
-      let privateRules = convertRules(
-        required,
-        before,
-        after,
-        requiredMsg,
-        isUnionValue
-      );
+      let privateRules = convertRules(required, before, after, requiredMsg, isUnionValue);
       this.setData({ privateRules });
     },
   },

package/components/qrcode/index.wxss

@@ -2,7 +2,7 @@
   width: 200px;
   height: 200px;
   position: fixed;
-  left: 100%;
+  left: 200%;
 }
 .wd-qrcode--image {
   width: 200px;

package/components/wd-form-arr/index.js

@@ -195,20 +195,29 @@ Component({
      * @returns
      */
     getTempValue(value) {
+      // 处理数组
       if (Array.isArray(value)) {
-        return value.map((i = {}) => {
-          const item = {};
-          Object.keys(i).forEach((j) => {
-            if (j) {
-              item[j] = i[j] || null;
-            }
-          });
-          return item;
+        return value.map((element) => {
+          if (typeof element === 'object' && element !== null) {
+            const obj = typeof element === 'object' && element !== null ? element : {};
+            const cleaned = {};
+            Object.keys(obj).forEach((key) => {
+              cleaned[key] = obj[key] === null || obj[key] === undefined || obj[key] === '' ? null : obj[key];
+            });
+            return cleaned;
+          }
+          return element;
         });
       }
+      // 处理单个对象
+
+      // 非数组/对象直接返回
       return value;
     },
     change(params, { isUpdateParentForm = false, isUpdateChildValue = true } = {}) {
+      if (this.data.disabled || this.data.readOnly) {
+        return;
+      }
       const { objValue, name, addDefaultValue } = this.data;
       let value = deepClone(params.value);
 

package/components/wd-form-arr/index.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{visible}}">
-  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
+  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}" status="{{status}}">
     <slot></slot>
   </wd-form-item-obj>
 </block>

package/components/wd-form-item-obj/index.js

@@ -2,12 +2,7 @@ import { WD_PREFIX } from '../../utils/constant';
 import { textToString } from '../../utils/platform';
 import classNames from '../../utils/classnames';
 import itemBehavior from '../form-field-behavior/item-behavior';
-import {
-  convertSize,
-  convertLayout,
-  convertLabelAlign,
-  convertPx,
-} from '../../utils/getFormLegacy';
+import { convertSize, convertLayout, convertLabelAlign, convertPx } from '../../utils/getFormLegacy';
 
 Component({
   options: { virtualHost: true, styleIsolation: 'shared' },
@@ -36,13 +31,12 @@ Component({
   methods: {
     setIconName() {
       this.setData({
-        iconName:
-          this.data.iconName === 'chevrondown' ? 'chevronup' : 'chevrondown',
+        iconName: this.data.iconName === 'chevrondown' ? 'chevronup' : 'chevrondown',
       });
     },
   },
   observers: {
-    'className,labelWidth,labelAlign,labelWrap,layout,required,requiredFlag,size,classRoot,borderedH5,disabled,controlAlign':
+    'className,labelWidth,labelAlign,labelWrap,layout,required,requiredFlag,size,classRoot,borderedH5,disabled,controlAlign,status':
       function (
         className,
         _labelWidth,
@@ -55,7 +49,8 @@ Component({
         classRoot,
         borderedH5,
         disabled,
-        controlAlign
+        controlAlign,
+        status,
       ) {
         const { item, itemWrap, classPrefix } = this.data;
         const sizeTemp = convertSize(_size);
@@ -66,26 +61,20 @@ Component({
         const labelRoot = `${root}__label`;
         const labelWidth = convertPx(_labelWidth);
         const labelStyle = labelWidth ? `width:${labelWidth}` : '';
-        const itemLayout = this.properties.isWdFormDetail
-          ? `${classPrefix}-form-item--detail`
-          : `${item}-`;
+        const itemLayout = this.properties.isWdFormDetail ? `${classPrefix}-form-item--detail` : `${item}-`;
         const cls = classNames(
           item,
           className,
-          `${classPrefix}-mp-form-item ${item}--weui item-size-height-${size} ${root}-root ${classPrefix}-mp-${classRoot}-root ${classPrefix}-mp-form-item-obj`,
+          `${classPrefix}-mp-form-item ${item}--weui item-size-height-${size} ${root}-root ${classPrefix}-mp-${classRoot}-root ${classPrefix}-mp-form-item-obj ${classPrefix}-mp-form-obj-${status}`,
           {
             'is-required': requiredFlag && required,
             'is-borderless': !borderedH5,
-            [`${itemLayout}-horizontal-left`]:
-              layout === 'horizontal' && labelAlign === 'left',
-            [`${itemLayout}-horizontal-right`]:
-              layout === 'horizontal' && labelAlign === 'right',
-            [`${itemLayout}-vertical-left`]:
-              layout === 'vertical' && labelAlign === 'left',
-            [`${itemLayout}-vertical-right`]:
-              layout === 'vertical' && labelAlign === 'right',
+            [`${itemLayout}-horizontal-left`]: layout === 'horizontal' && labelAlign === 'left',
+            [`${itemLayout}-horizontal-right`]: layout === 'horizontal' && labelAlign === 'right',
+            [`${itemLayout}-vertical-left`]: layout === 'vertical' && labelAlign === 'left',
+            [`${itemLayout}-vertical-right`]: layout === 'vertical' && labelAlign === 'right',
             [`${item}--label-${labelAlign}`]: !!labelAlign,
-          }
+          },
         );
         const labelCls = classNames(`${itemWrap}__label`, labelRoot, {
           'is-nowrap': !labelWrap,
@@ -104,12 +93,7 @@ Component({
           controlWrapCls,
         });
       },
-    'readBeforeAfter,before,after,readValue': function (
-      readBeforeAfter,
-      before,
-      after,
-      readValue
-    ) {
+    'readBeforeAfter,before,after,readValue': function (readBeforeAfter, before, after, readValue) {
       const _readValue = textToString(readValue);
       const _before = readBeforeAfter && textToString(before);
       const _after = readBeforeAfter && textToString(after);

package/components/wd-form-item-obj/index.wxss

@@ -1,2 +1,7 @@
 @import '../../style/wd-design.wxss';
 @import './wd-form-item.wxss';
+
+.wd-mp-form-obj-readOnly,
+.wd-mp-form-obj-disabled {
+  pointer-events: none;
+}

package/components/wd-form-obj/index.js

@@ -15,8 +15,7 @@ import equal from '../../utils/deepEqual';
  * @param currentName 当前表单项名称
  * @returns
  */
-const getValueName = (operateName, currentName) =>
-  operateName.replace(new RegExp(`^${currentName}(\\.)?`), '');
+const getValueName = (operateName, currentName) => operateName.replace(new RegExp(`^${currentName}(\\.)?`), '');
 
 Component({
   options: { virtualHost: true },
@@ -86,14 +85,10 @@ Component({
          * @returns
          */
         addFormItem(childName, formItem) {
-          if (
-            isNil(childName) ||
-            !formItem ||
-            (typeof childName === 'string' && childName.length === 0)
-          ) {
+          if (isNil(childName) || !formItem || (typeof childName === 'string' && childName.length === 0)) {
             // childName 没设置或为空串的时候不受表单容器控制
             console.warn(
-              `组件 #${formItem?.id} 表单key(表单输入类组件 childName 属性)没设置或为空串的时候不受表单容器控制`
+              `组件 #${formItem?.id} 表单key(表单输入类组件 childName 属性)没设置或为空串的时候不受表单容器控制`,
             );
             return noop;
           }
@@ -105,9 +100,7 @@ Component({
           }
           that.setData({ formsItemMap });
           return () => {
-            const removedArr = formsItemMap[childName].filter(
-              (item) => item !== formItem
-            );
+            const removedArr = formsItemMap[childName].filter((item) => item !== formItem);
             if (removedArr.length <= 0) {
               delete formsItemMap[childName];
             } else {
@@ -121,8 +114,7 @@ Component({
   },
   methods: {
     updateWidgetAPI(apis = {}) {
-      const { name, objValue, label, visible, readOnly, disabled, status } =
-        this.data;
+      const { name, objValue, label, visible, readOnly, disabled, status } = this.data;
       this.setReadonlyAttributes?.({
         ...apis,
         label,
@@ -140,16 +132,12 @@ Component({
     },
     // 父级普通表单对象
     getParentForm() {
-      const parent = this?.$widget?.closest(
-        (w) => w.getConfig?.().componentType === 'form'
-      );
+      const parent = this?.$widget?.closest((w) => w.getConfig?.().componentType === 'form');
       return parent;
     },
     // 父级嵌套表单对象
     getParentFormObj() {
-      const parent = this?.$widget?.closest(
-        (w) => w.getConfig?.().componentType === 'formObj'
-      );
+      const parent = this?.$widget?.closest((w) => w.getConfig?.().componentType === 'formObj');
       return parent;
     },
     /**
@@ -169,10 +157,7 @@ Component({
         if (!Array.isArray(items)) {
           items = [items];
         }
-        const newValue = lodashGet(
-          value,
-          getValueName(childName, this.data.name)
-        );
+        const newValue = lodashGet(value, getValueName(childName, this.data.name));
         items.forEach((item) => {
           if (item?.setValue && !equal(item.value, newValue)) {
             item.setValue(newValue);
@@ -189,10 +174,10 @@ Component({
      * @param param1.isUpdateChildValue 是否更新子组件值, 因子组件值变化调用change时不去触发updateChildValueWithoutForm；因为外部设置了值，则触发updateChildValueWithoutForm去更新子组件值
      * @returns
      */
-    change(
-      params,
-      { isUpdateParentForm = false, isUpdateChildValue = true } = {}
-    ) {
+    change(params, { isUpdateParentForm = false, isUpdateChildValue = true } = {}) {
+      if (this.data.disabled || this.data.readOnly) {
+        return;
+      }
       const { objValue, name } = this.data;
       let value = deepClone(params.value);
 
@@ -260,9 +245,7 @@ Component({
 
       if (params.name) {
         // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
-        const nameTemp = `${
-          !params.name.startsWith(name) && name ? `${name}.` : ''
-        }${params.name}`;
+        const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
         // 将值同步给父级嵌套表单
         parentFormObj?.__setValueImmediate__?.({
           name: nameTemp,

package/components/wd-form-obj/index.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{visible}}">
-  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
+  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}" status="{{status}}">
     <slot></slot>
   </wd-form-item-obj>
 </block>

package/package.json

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