@cloudbase/weda-ui-mp 3.7.10 → 3.7.11

package/components/formdetail/index.js

@@ -229,11 +229,12 @@ Component({
       );
       return parent;
     },
-    updateWidgetAPI() {
+    updateWidgetAPI(apis = {}) {
       const { name, preValue, label, visible, readOnly, disabled } = this.data;
       const that = this;
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
+          ...apis,
           name,
           value: preValue,
           label,
@@ -287,7 +288,22 @@ Component({
   },
   lifetimes: {
     attached: function () {
-      this.updateWidgetAPI();
+      this.updateWidgetAPI({
+        getConfig: () => {
+          return {
+            componentType: 'formdetail',
+          };
+        },
+        addition: () => {
+          this.onChange('add', null);
+        },
+        remove: (params) => {
+          this.onChange('remove', params);
+        },
+        change: (params) => {
+          this.onChange('change', params);
+        },
+      });
       this.setData({ id: this.id });
       const { value } = this.data;
       const childFormItem = this.getChildFormItem(value);
@@ -302,24 +318,6 @@ Component({
           data: [],
         });
       }
-      this.triggerEvent('attached', {
-        methods: {
-          getConfig: () => {
-            return {
-              componentType: 'formdetail',
-            };
-          },
-          addition: () => {
-            this.onChange('add', null);
-          },
-          remove: (params) => {
-            this.onChange('remove', params);
-          },
-          change: (params) => {
-            this.onChange('change', params);
-          },
-        },
-      });
     },
     detached: function () {
       this.triggerEvent('onDataChange', {

package/components/lottery/index.js

@@ -1,6 +1,9 @@
 import { getTempFileURL } from '../../utils/tcb';
+import { commonCompBehavior } from '../../utils/common-behavior';
 
 Component({
+  behaviors: [commonCompBehavior],
+
   /** 页面的初始数据 */
   data: {
     lotteryList: [
@@ -138,11 +141,10 @@ Component({
   },
   lifetimes: {
     attached() {
-      this.triggerEvent('attached', {
-        methods: {
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
           start: this.start.bind(this),
-        },
-      });
+        });
     },
   },
   methods: {

package/components/modal/index.js

@@ -1,6 +1,8 @@
 import handleEvents from '../../utils/handleEvents';
+import { commonCompBehavior } from '../../utils/common-behavior';
 
 Component({
+  behaviors: [commonCompBehavior],
   options: {
     virtualHost: true,
     multipleSlots: true,
@@ -46,13 +48,12 @@ Component({
   },
   lifetimes: {
     attached() {
-      this.triggerEvent('attached', {
-        methods: {
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
           toggle: this.toggle.bind(this),
           open: this.toggle.bind(this, true),
           close: this.toggle.bind(this, false),
-        },
-      });
+        });
     },
   },
   observers: {

package/components/wd-cascader/index.js

@@ -128,9 +128,12 @@ Component({
       const initData = transformTabData(data);
       const tabData = initTabData(initData, _value || [], placeholderItem);
       const listOptions = initListOptions(initData, _value || []);
-      const selectedOptions = _value?.map((i) => getSelectedOptions(data, i));
-      const displayValue =
-        selectedOptions?.map((i) => i.label)?.join(' / ') || _value.join(' / ');
+      const selectedOptions = _value?.map(
+        (i) => getSelectedOptions(data, i) || { label: i, value: i }
+      );
+      const displayValue = selectedOptions
+        ?.map((i) => i?.label || i?.value)
+        ?.join(' / ');
       this.setData({
         tabData,
         listOptions,

package/components/wd-cascader/utils.js

@@ -28,21 +28,24 @@ export const transformTabData = (data, pid = 'root', level = 0) => {
 export const setSelectedValue = (data, value) => {
   if (!Array.isArray(data)) return [];
   const _value = [].concat(value);
-  return data.map((item) => {
-    item.selected = !!_value.find((i) => i === item?.value);
-    if (item.children) {
-      item.children = setSelectedValue(item.children, value);
-    }
-    return item;
-  });
+  return data
+    .map((item) => {
+      if (!item) return null;
+      item.selected = !!_value.find((i) => i === item?.value);
+      if (item.children) {
+        item.children = setSelectedValue(item.children, value);
+      }
+      return { ...item };
+    })
+    .filter((i) => i);
 };
 
 export const initTabData = (data, value, placeholderItem) => {
   if (!Array.isArray(data)) return [];
   let tabDataRes = [placeholderItem];
-  if (value.length) {
-    const selectedOptions =
-      value?.map((i) => getSelectedOptions(data, i)) || [];
+  const selectedOptions =
+    value?.map((i) => getSelectedOptions(data, i)).filter((i) => i) || [];
+  if (value.length && selectedOptions.length) {
     const selectedItem = selectedOptions[selectedOptions.length - 1];
 
     tabDataRes = setSelectedValue(selectedOptions, selectedItem?.value);
@@ -53,12 +56,12 @@ export const initTabData = (data, value, placeholderItem) => {
 export const initListOptions = (data, value) => {
   if (!Array.isArray(data)) return [];
   let listOptionsRes = deepClone(data);
-  if (value.length) {
-    const selectedOptions =
-      value?.map((i) => getSelectedOptions(data, i)) || [];
+  const selectedOptions =
+    value?.map((i) => getSelectedOptions(data, i)).filter((i) => i) || [];
+  if (value.length && selectedOptions.length) {
     const selectedItem = selectedOptions[selectedOptions.length - 1];
     listOptionsRes =
-      getSelectedOptions(data, selectedItem.pid)?.children || data;
+      getSelectedOptions(data, selectedItem?.pid)?.children || data;
   }
   return listOptionsRes;
 };

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

@@ -27,6 +27,10 @@ Component({
       type: String,
       value: 'form-obj',
     },
+    addDefaultValue: {
+      type: null,
+      value: {},
+    },
   },
   data: {
     status: 'edit',
@@ -126,6 +130,15 @@ Component({
     },
   },
   methods: {
+    sleep(cb, time = 100) {
+      return new Promise((resolve) => {
+        // eslint-disable-next-line rulesdir/no-timer
+        setTimeout(() => {
+          cb?.();
+          resolve(true);
+        }, time);
+      });
+    },
     updateWidgetAPI(apis = {}) {
       const { name, objValue, label, visible, readOnly, disabled, status } =
         this.data;
@@ -199,7 +212,7 @@ Component({
       params,
       { isUpdateParentForm = false, isUpdateChildValue = true } = {}
     ) {
-      const { objValue, name } = this.data;
+      const { objValue, name, addDefaultValue } = this.data;
       let value = deepClone(params.value);
 
       // 顶层为数组类型
@@ -207,7 +220,7 @@ Component({
         // 触发添加操作，则增加一个undefined值
         if (params.type === 'add') {
           value = deepClone(objValue);
-          value.push(undefined);
+          value.push(addDefaultValue);
         }
 
         // 触发删除操作，则删除对应索引的值
@@ -234,7 +247,8 @@ Component({
 
       if (isUpdateChildValue) {
         // 外部设置数据，同时去更新子组件的值
-        this.updateChildValue(value);
+        // 延迟更新，避免子组件默认值覆盖当前值
+        this.sleep(() => this.updateChildValue(value));
       }
 
       const parentForm = this.getParentForm();
@@ -317,6 +331,10 @@ Component({
     value: function (value) {
       this.setData({ objValue: value });
       this.updateWidgetAPI();
+      // 避免初始化的时候，整个数组值被子组件初始值覆盖
+      this.sleep(() => {
+        this.change({ value }, { isUpdateParentForm: true });
+      });
     },
     objValue: function (objValue) {
       this.updateWidgetAPI();

package/components/wd-form-arr/wd-form-obj.wxss

@@ -49,20 +49,30 @@
   padding: 0;
   margin: 0;
 }
-.wd-form-obj-root.wd-h5-form-obj-root .wd-form-obj .wd-h5-card-root {
+.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-card-root {
   margin-bottom: var(--wd-form-item-pd);
 }
-.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-form-obj > div > .wd-form-item > .wd-form-item-wrap {
+.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-form-obj > div > .wd-form-obj-item > .wd-form-item-wrap {
   border: none;
 }
+.wd-form-obj-root .wd-card__header .wd-icon {
+  cursor: pointer;
+}
+.wd-form-obj-root .wd-card__header .wd-icon:hover {
+  box-shadow: inset 0 -100vh var(--wd-color-bg-active);
+}
+.wd-form-obj-root .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
+  padding: 0;
+}
 
 .wd-form.wd-form--weui .wd-h5-form-obj-root > .wd-form-item-wrap {
   border: none;
 }
 
-.wd-form .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
-  padding: 0;
+.wd-form-item--weui.wd-form-obj-root > .wd-form-item-wrap {
+  border: none;
 }
+
 .wd-form.wd-pc-form .wd-form-obj-root .wd-form-obj > div > .wd-form-item {
   padding-top: 0;
   margin-top: calc(var(--wd-space-base) * 2.5);
@@ -88,6 +98,6 @@
 .wd-mp-form-obj-root .wd-mp-card-root {
   margin-bottom: var(--wd-form-item-pd);
 }
-.wd-mp-form-obj-root .wd-mp-form-obj > view > .wd-form-item > .wd-form-item-wrap {
+.wd-mp-form-obj-root .wd-mp-form-item-obj > .wd-form-item-wrap {
   border: none;
 }

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

@@ -49,20 +49,30 @@
   padding: 0;
   margin: 0;
 }
-.wd-form-obj-root.wd-h5-form-obj-root .wd-form-obj .wd-h5-card-root {
+.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-card-root {
   margin-bottom: var(--wd-form-item-pd);
 }
-.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-form-obj > div > .wd-form-item > .wd-form-item-wrap {
+.wd-form-obj-root.wd-h5-form-obj-root .wd-h5-form-obj > div > .wd-form-obj-item > .wd-form-item-wrap {
   border: none;
 }
+.wd-form-obj-root .wd-card__header .wd-icon {
+  cursor: pointer;
+}
+.wd-form-obj-root .wd-card__header .wd-icon:hover {
+  box-shadow: inset 0 -100vh var(--wd-color-bg-active);
+}
+.wd-form-obj-root .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
+  padding: 0;
+}
 
 .wd-form.wd-form--weui .wd-h5-form-obj-root > .wd-form-item-wrap {
   border: none;
 }
 
-.wd-form .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
-  padding: 0;
+.wd-form-item--weui.wd-form-obj-root > .wd-form-item-wrap {
+  border: none;
 }
+
 .wd-form.wd-pc-form .wd-form-obj-root .wd-form-obj > div > .wd-form-item {
   padding-top: 0;
   margin-top: calc(var(--wd-space-base) * 2.5);
@@ -88,6 +98,6 @@
 .wd-mp-form-obj-root .wd-mp-card-root {
   margin-bottom: var(--wd-form-item-pd);
 }
-.wd-mp-form-obj-root .wd-mp-form-obj > view > .wd-form-item > .wd-form-item-wrap {
+.wd-mp-form-obj-root .wd-mp-form-item-obj > .wd-form-item-wrap {
   border: none;
 }

package/package.json

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