@cloudbase/weda-ui-mp 3.15.2 → 3.15.3

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

@@ -16,8 +16,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 },
@@ -64,10 +63,7 @@ Component({
           that.change({ type: 'add' }, { isUpdateParentForm: false });
         },
         remove({ index = -1 } = {}) {
-          that.change(
-            { type: 'remove', value: index },
-            { isUpdateParentForm: false }
-          );
+          that.change({ type: 'remove', value: index }, { isUpdateParentForm: false });
         },
         change(params) {
           that.change(params, { isUpdateParentForm: true });
@@ -100,14 +96,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;
           }
@@ -119,9 +111,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 {
@@ -144,8 +134,7 @@ Component({
       });
     },
     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,
@@ -163,16 +152,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;
     },
     /**
@@ -192,10 +177,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);
@@ -226,10 +208,7 @@ Component({
       }
       return value;
     },
-    change(
-      params,
-      { isUpdateParentForm = false, isUpdateChildValue = true } = {}
-    ) {
+    change(params, { isUpdateParentForm = false, isUpdateChildValue = true } = {}) {
       const { objValue, name, addDefaultValue } = this.data;
       let value = deepClone(params.value);
 
@@ -244,10 +223,7 @@ Component({
         // 触发删除操作，则删除对应索引的值
         if (params.type === 'remove') {
           value = deepClone(objValue);
-          value = [
-            ...value.slice(0, params.value),
-            ...value.slice(params.value + 1),
-          ];
+          value = [...value.slice(0, params.value), ...value.slice(params.value + 1)];
         }
       }
 
@@ -294,8 +270,6 @@ Component({
         // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
         parentFormObj?.__setValueImmediate__?.({ name, value });
       }
-
-      this.triggerOnDataChange(value);
     },
     /**
      * 子组件默认值变更，触发嵌套表单值更新
@@ -320,9 +294,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,
@@ -361,7 +333,7 @@ Component({
         this.change({ value }, { isUpdateParentForm: true });
       });
     },
-    objValue: function () {
+    objValue: function (value) {
       this.updateWidgetAPI();
       // 更新子组件的值需要主动去调用，不被动执行
       // 如果是最顶层的嵌套表单，则去更新子组件的值，否则自己的值更新不去触发子组件值更新，因为父级普通表单会去更新
@@ -369,6 +341,10 @@ Component({
       // if (!parentFormObj) {
       //   // this.updateChildValue(objValue);
       // }
+      const tempValue = this.getTempValue(value);
+      if (equal(tempValue, this.data.objValue)) {
+        this.triggerOnDataChange(value);
+      }
     },
   },
 });

package/package.json

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