@cloudbase/weda-ui-mp 3.13.5 → 3.13.6

package/components/form/select/index.js

@@ -1,13 +1,6 @@
 import classNames from '../../../utils/classnames';
 import dayjs from '../../../utils/dayjs.min.js';
-import {
-  getRegionTree,
-  buildDisplayValue,
-  provinces,
-  cities,
-  regions,
-  getAreaKey,
-} from './region/index';
+import { getRegionTree, buildDisplayValue, provinces, cities, regions, getAreaKey } from './region/index';
 import destr from '../../../utils/destr';
 import deepEqual from '../../../utils/deepEqual';
 import { callDataSourceApi, callWedaApi } from '../../../utils/tcb';
@@ -240,12 +233,8 @@ Component({
           break;
         }
         case 'time': {
-          start = startTime
-            ? this.converTime2Dayjs(startTime).format('HH:mm')
-            : undefined;
-          end = endTime
-            ? this.converTime2Dayjs(endTime).format('HH:mm')
-            : undefined;
+          start = startTime ? this.converTime2Dayjs(startTime).format('HH:mm') : undefined;
+          end = endTime ? this.converTime2Dayjs(endTime).format('HH:mm') : undefined;
           break;
         }
         case 'date': {
@@ -287,137 +276,20 @@ Component({
     },
   },
   observers: {
-    'defaultValue, defaultTime, defaultRegion,defaultMutiRegion,defaultDate,option,regionType':
-      function (
-        defaultValue,
-        defaultTime,
-        defaultRegion,
-        defaultMutiRegion,
-        defaultDate,
-        option,
-        regionType
-      ) {
-        const { range, mode, separator, placeholder, dateMode, format } =
-          this.properties;
-
-        if (
-          deepEqual(
-            {
-              defaultValue,
-              defaultTime,
-              defaultRegion,
-              defaultMutiRegion,
-              defaultDate,
-              option,
-              range,
-              mode,
-              separator,
-              placeholder,
-              dateMode,
-              format,
-              regionType,
-            },
-            this.data.__prev
-          )
-        ) {
-          return;
-        }
+    'defaultValue, defaultTime, defaultRegion,defaultMutiRegion,defaultDate,option,regionType': function (
+      defaultValue,
+      defaultTime,
+      defaultRegion,
+      defaultMutiRegion,
+      defaultDate,
+      option,
+      regionType,
+    ) {
+      const { range, mode, separator, placeholder, dateMode, format } = this.properties;
 
-        let value, displayValue;
-        switch (mode) {
-          case 'selector': {
-            // TODO: == 故意的
-            if (!isFormatNeedFetch(format)) {
-              const index = range.findIndex(
-                (item) => item.value == defaultValue
-              );
-              // 小程序picker组件，value值表示选择了 range 中的第几个（下标从 0 开始），类型为number
-              value = index < 0 ? 0 : index;
-              displayValue = index < 0 ? defaultValue : range[index].label;
-              // 更新选中值
-              this.setData({
-                chooseIndexValue: index < 0 ? defaultValue : range[index].value,
-                chooseIndexLable: displayValue,
-              });
-            } else {
-              const { chooseIndexValue } = this.data;
-              const currentValue = defaultValue;
-              const index = option.findIndex(
-                (item) => item.value == currentValue
-              );
-              if (
-                !chooseIndexValue &&
-                this.data.option.length > 0 &&
-                index === -1 &&
-                defaultValue &&
-                defaultValue.length > 0
-              ) {
-                // 没查找到，接口查找
-                this._fetchData(
-                  [
-                    {
-                      _id: {
-                        $eq: defaultValue,
-                      },
-                    },
-                  ],
-                  1,
-                  true
-                );
-                // 再次判断
-                if (
-                  this.data.chooseIndexValue &&
-                  this.data.chooseIndexValue.length > 0
-                ) {
-                  // 找到了
-                  displayValue = this.data.chooseIndexLable;
-                }
-              } else {
-                value = index < 0 ? 0 : index;
-                displayValue = index < 0 ? currentValue : option[index].label;
-              }
-              // 更新value
-              this.setData({
-                chooseIndexValue: currentValue,
-                chooseIndexLable: displayValue,
-              });
-            }
-            break;
-          }
-          case 'date': {
-            value = this._coverNumber2Date(defaultDate, dateMode);
-            displayValue = this._coverNumber2Date(defaultDate, dateMode, true);
-            break;
-          }
-          case 'time': {
-            value =
-              defaultTime == null || defaultTime === ''
-                ? ''
-                : this.converTime(`${defaultTime}`);
-            displayValue = value;
-            break;
-          }
-          case 'region': {
-            value = defaultRegion;
-            displayValue = defaultRegion.join(separator);
-            break;
-          }
-          case 'mutiRegion': {
-            displayValue = defaultMutiRegion || '';
-            this.getProvince(displayValue);
-            break;
-          }
-          default: {
-            break;
-          }
-        }
-        const data = { displayValue };
-        if (mode !== 'mutiRegion') {
-          data.value = value;
-        }
-        this.setData(data);
-        this.setData({
-          __prev: {
+      if (
+        deepEqual(
+          {
             defaultValue,
             defaultTime,
             defaultRegion,
@@ -432,8 +304,113 @@ Component({
             format,
             regionType,
           },
-        });
-      },
+          this.data.__prev,
+        )
+      ) {
+        return;
+      }
+
+      let value, displayValue;
+      switch (mode) {
+        case 'selector': {
+          // TODO: == 故意的
+          if (!isFormatNeedFetch(format)) {
+            const index = range.findIndex((item) => item.value == defaultValue);
+            // 小程序picker组件，value值表示选择了 range 中的第几个（下标从 0 开始），类型为number
+            value = index < 0 ? 0 : index;
+            displayValue = index < 0 ? defaultValue : range[index].label;
+            // 更新选中值
+            this.setData({
+              chooseIndexValue: index < 0 ? defaultValue : range[index].value,
+              chooseIndexLable: displayValue,
+            });
+          } else {
+            const { chooseIndexValue } = this.data;
+            const currentValue = defaultValue;
+            const index = option.findIndex((item) => item.value == currentValue);
+            if (
+              !chooseIndexValue &&
+              this.data.option.length > 0 &&
+              index === -1 &&
+              defaultValue &&
+              defaultValue.length > 0
+            ) {
+              // 没查找到，接口查找
+              this._fetchData(
+                [
+                  {
+                    _id: {
+                      $eq: defaultValue,
+                    },
+                  },
+                ],
+                1,
+                true,
+              );
+              // 再次判断
+              if (this.data.chooseIndexValue && this.data.chooseIndexValue.length > 0) {
+                // 找到了
+                displayValue = this.data.chooseIndexLable;
+              }
+            } else {
+              value = index < 0 ? 0 : index;
+              displayValue = index < 0 ? currentValue : option[index].label;
+            }
+            // 更新value
+            this.setData({
+              chooseIndexValue: currentValue,
+              chooseIndexLable: displayValue,
+            });
+          }
+          break;
+        }
+        case 'date': {
+          value = this._coverNumber2Date(defaultDate, dateMode);
+          displayValue = this._coverNumber2Date(defaultDate, dateMode, true);
+          break;
+        }
+        case 'time': {
+          value = defaultTime == null || defaultTime === '' ? '' : this.converTime(`${defaultTime}`);
+          displayValue = value;
+          break;
+        }
+        case 'region': {
+          value = defaultRegion;
+          displayValue = defaultRegion.join(separator);
+          break;
+        }
+        case 'mutiRegion': {
+          displayValue = defaultMutiRegion || '';
+          this.getProvince(displayValue);
+          break;
+        }
+        default: {
+          break;
+        }
+      }
+      const data = { displayValue };
+      if (mode !== 'mutiRegion') {
+        data.value = value;
+      }
+      this.setData(data);
+      this.setData({
+        __prev: {
+          defaultValue,
+          defaultTime,
+          defaultRegion,
+          defaultMutiRegion,
+          defaultDate,
+          option,
+          range,
+          mode,
+          separator,
+          placeholder,
+          dateMode,
+          format,
+          regionType,
+        },
+      });
+    },
     range: function (range) {
       // 防止range在不改变的情况下重新对option赋值，导致触发option的observer改变选中值
       if (JSON.stringify(this.data.oldRange) === JSON.stringify(range)) return;
@@ -536,23 +513,15 @@ Component({
     },
     'format,defaultValue': function (format, defaultValue) {
       if (isFormatNeedFetch(format)) {
-        this._fetchData(
-          defaultValue ? [{ _id: { $eq: defaultValue } }] : [],
-          1,
-          false
-        );
+        this._fetchData(defaultValue ? [{ _id: { $eq: defaultValue } }] : [], 1, false);
       }
     },
   },
   methods: {
     // 最终选择的日期时间
     onAllTimePicker: function (e) {
-      const show =
-        e.currentTarget.dataset.show === undefined
-          ? e.detail.show
-          : e.currentTarget.dataset.show;
-      if (!show && e?.detail?.confirm)
-        this.triggerEvent('change', { value: e.detail.dateTamp });
+      const show = e.currentTarget.dataset.show === undefined ? e.detail.show : e.currentTarget.dataset.show;
+      if (!show && e?.detail?.confirm) this.triggerEvent('change', { value: e.detail.dateTamp });
       this.setData({
         allPickerShow: typeof show === 'boolean' ? show : JSON.parse(show),
         value: e.detail.data,
@@ -589,18 +558,12 @@ Component({
       });
       const { isSearch, option, searchOption, chooseIndexValue } = this.data;
       if (chooseIndexValue && chooseIndexLable !== displayValue) {
-        const index = (isSearch ? searchOption : option)?.findIndex(
-          (item) => item.value === chooseIndexValue
-        );
+        const index = (isSearch ? searchOption : option)?.findIndex((item) => item.value === chooseIndexValue);
         this.onChange({ detail: { value: index < 0 ? 0 : index } });
       } else if (e.detail?.clear === 'true') {
         this.onChange({ detail: { value: null } });
       }
-      if (
-        searchOption.length <= 0 &&
-        (this.data.dataSourceName?.length > 0 ||
-          isFormatNeedFetch(this.data.format))
-      ) {
+      if (searchOption.length <= 0 && (this.data.dataSourceName?.length > 0 || isFormatNeedFetch(this.data.format))) {
         // this.setData({ isSearch: true });
         const param = [
           {
@@ -614,8 +577,7 @@ Component({
     },
     // 获取数据列表：关联关系和主子明细
     _fetchData: async function (param, pageNo, isUpdate = false) {
-      const { dataSourceName, viewId, records, searchRecords } =
-        this.properties;
+      const { dataSourceName, viewId, records, searchRecords } = this.properties;
 
       if (!dataSourceName) return;
       let pageSize = 50;
@@ -633,11 +595,9 @@ Component({
       console.log(results, param, 'Records');
       if (isUpdate && results && results.length > 0) {
         this.setData({
-          chooseIndexLable:
-            results[0][this.properties.primaryField] || results[0]._id,
+          chooseIndexLable: results[0][this.properties.primaryField] || results[0]._id,
           chooseIndexValue: results[0]._id,
-          displayValue:
-            results[0][this.properties.primaryField] || results[0]._id,
+          displayValue: results[0][this.properties.primaryField] || results[0]._id,
         });
         return;
       }
@@ -650,40 +610,28 @@ Component({
       const isSearch = this.data.isSearch;
       if (this.data.records.length === 0 && results?.length === 0) {
         // 当异常的时候，主要为了不引起records的observer变化变化设置默认值
-        this.setData(
-          isSearch ? { searchStatus: status } : { loadStatus: STATUS_CLOSED }
-        );
+        this.setData(isSearch ? { searchStatus: status } : { loadStatus: STATUS_CLOSED });
       } else {
         this.setData(
           isSearch
             ? {
                 searchRecords: searchRecords.concat(
-                  (results ?? []).filter(
-                    (item) =>
-                      searchRecords.findIndex((r) => r._id === item._id) < 0
-                  ) || []
+                  (results ?? []).filter((item) => searchRecords.findIndex((r) => r._id === item._id) < 0) || [],
                 ),
                 records: records.concat(
-                  (results ?? []).filter(
-                    (item) => records.findIndex((r) => r._id === item._id) < 0
-                  ) || []
+                  (results ?? []).filter((item) => records.findIndex((r) => r._id === item._id) < 0) || [],
                 ),
                 searchStatus: status,
               }
             : {
                 searchRecords: searchRecords.concat(
-                  (results ?? []).filter(
-                    (item) =>
-                      searchRecords.findIndex((r) => r._id === item._id) < 0
-                  ) || []
+                  (results ?? []).filter((item) => searchRecords.findIndex((r) => r._id === item._id) < 0) || [],
                 ),
                 records: records.concat(
-                  (results ?? []).filter(
-                    (item) => records.findIndex((r) => r._id === item._id) < 0
-                  ) || []
+                  (results ?? []).filter((item) => records.findIndex((r) => r._id === item._id) < 0) || [],
                 ),
                 loadStatus: status,
-              }
+              },
         );
       }
     },
@@ -700,9 +648,7 @@ Component({
             searchStatus: STATUS_LOADING,
           });
         }
-        const param = [
-          { [this.properties.primaryField]: { $search: searchValue } },
-        ];
+        const param = [{ [this.properties.primaryField]: { $search: searchValue } }];
         this._fetchData(param, pageNo);
       } else {
         if (pageNo === 1) {
@@ -725,10 +671,7 @@ Component({
       const provinceValue = (defaultValue || defaultArea).split(',')[0];
       const changeData = await getRegionTree(defaultMutiRegion || '');
       //限制渲染时change事件触发，否则会有初始数据被覆盖问题
-      if (
-        changeData?.result.length > 0 &&
-        !deepEqual(changeData.value, defaultMutiRegion)
-      ) {
+      if (changeData?.result.length > 0 && !deepEqual(changeData.value, defaultMutiRegion)) {
         this.triggerEvent('change', changeData);
       }
       var provinceList = [...provinces];
@@ -864,8 +807,7 @@ Component({
         column // 处理不同的逻辑
       ) {
         case 0: // 第一列更改 就是省级的更改
-          if (regionType != 'levelOne')
-            this.getCity(this.data.provinceList[e.detail.value]); // 获取当前key下面的市级数据
+          if (regionType != 'levelOne') this.getCity(this.data.provinceList[e.detail.value]); // 获取当前key下面的市级数据
           data.multiIndex[1] = 0; // 将市默认选择第一个
           data.multiIndex[2] = 0; //第一列滚动时，市区默认选中第一个
           break;
@@ -903,26 +845,20 @@ Component({
     },
 
     onChange(e) {
-      const { range, mode, separator, regionType, dateMode, format } =
-        this.properties;
+      const { range, mode, separator, regionType, dateMode, format } = this.properties;
       let displayValue;
       switch (mode) {
         case 'selector': {
           if (!isFormatNeedFetch(format)) {
-            const data =
-              e.detail?.value != null
-                ? range[e.detail.value]
-                : { label: null, value: null };
-            this.triggerEvent('change', data);
+            const data = e.detail?.value != null ? range[e.detail.value] : { label: null, value: null };
+            this.triggerEvent('change', { ...data, value: data.value, context: { option: data } });
             displayValue = data.label;
           } else {
             const { isSearch, searchOption, option } = this.data;
             const opt = isSearch ? searchOption : option;
-            const data =
-              e.detail?.value != null
-                ? opt[e.detail.value]
-                : { label: null, value: null };
-            this.triggerEvent('change', data);
+            const data = e.detail?.value != null ? opt[e.detail.value] : { label: null, value: null };
+            this.triggerEvent('change', { ...data, value: data.value, context: { option: data } });
+
             displayValue = this.properties.displayValue;
           }
           break;
@@ -953,11 +889,7 @@ Component({
             step: 1,
             multiIndex: e.detail.value, // 更新下标字段
           });
-          const value = buildDisplayValue(
-            this.data.multiArray,
-            this.data.multiIndex,
-            regionType
-          );
+          const value = buildDisplayValue(this.data.multiArray, this.data.multiIndex, regionType);
           displayValue = value?.value;
           this.triggerEvent('change', value);
           break;

package/components/form/selectMultiple/index.js

@@ -221,10 +221,7 @@ Component({
     // 最终选择的选项
     onSelectPicker: function (e) {
       if (this.data.disabled === true) return;
-      if (
-        e.detail.clear === 'true' ||
-        e.currentTarget.dataset.clear === 'true'
-      ) {
+      if (e.detail.clear === 'true' || e.currentTarget.dataset.clear === 'true') {
         let options = this.properties.option.map((item) => ({
           ...item,
           check: false,
@@ -240,8 +237,10 @@ Component({
       }
       if (!e.detail.clear) {
         const value = e.detail.map((v) => v.value);
+        const options = e.detail.map((v) => ({ label: v.label, value: v.value, extra: { ...v } }));
+
         this.setData({ value });
-        this.onChange({ detail: { value } });
+        this.onChange({ detail: { value, context: { options } } });
       }
     },
     onChange(e) {
@@ -253,11 +252,7 @@ Component({
       // eslint-disable-next-line rulesdir/no-timer
       this.data.fetchTimed = setTimeout(() => {
         const { format, dataSourceName, primaryField } = this.properties;
-        if (
-          ['many-many', 'one-many'].concat(format) &&
-          dataSourceName &&
-          primaryField
-        ) {
+        if (['many-many', 'one-many'].concat(format) && dataSourceName && primaryField) {
           this.setData({ records: [], option: [], pageNo: 1 });
           this._fetchData(1, _where, true);
         }
@@ -321,9 +316,7 @@ Component({
     },
     _childFetchData: function (e) {
       const { pageNo, searchValue } = e.detail;
-      const _where = searchValue
-        ? [{ [this.properties.primaryField]: { $search: searchValue } }]
-        : [];
+      const _where = searchValue ? [{ [this.properties.primaryField]: { $search: searchValue } }] : [];
       this._fetchData(pageNo, _where);
     },
     getLabels: function (values, options) {
@@ -357,9 +350,7 @@ Component({
       }
 
       // 接口搜索
-      const _where = searchValue
-        ? [{ [this.properties.primaryField]: { $search: searchValue } }]
-        : [];
+      const _where = searchValue ? [{ [this.properties.primaryField]: { $search: searchValue } }] : [];
       this._initFetchData(_where);
     },
   },

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

@@ -407,22 +407,12 @@ export default Behavior({
     },
     // 通用: clear 动作
     handleClear: function () {
-      const e = { detail: { value: null } };
+      const e = { detail: { value: null, context: {} } };
       this.handleChange(e);
     },
     // 通用: 输入类挂载 widgets
     updateWidgetAPI: function () {
-      const {
-        name,
-        value,
-        label,
-        required,
-        visible,
-        disabled,
-        readOnly,
-        before,
-        after,
-      } = this.data;
+      const { name, value, label, required, visible, disabled, readOnly, before, after } = this.data;
       this.setReadonlyAttributes?.({
         name,
         value,
@@ -444,10 +434,7 @@ export default Behavior({
   },
   observers: {
     'clearable,disabled,value': function (clearable, disabled, value) {
-      const truth =
-        value != null &&
-        value !== '' &&
-        (!Array.isArray(value) || value.length !== 0);
+      const truth = value != null && value !== '' && (!Array.isArray(value) || value.length !== 0);
       const hasClearIcon = !!(clearable && !disabled && truth);
       this.setData({ hasClearIcon });
     },

package/components/wd-tabs/index.js

@@ -3,7 +3,6 @@ import { WD_PREFIX } from '../../utils/constant';
 
 Component({
   options: {
-    virtualHost: true,
     multipleSlots: true,
   },
   behaviors: [commonCompBehavior],

package/package.json

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