@cloudbase/weda-ui-mp 3.20.4 → 3.20.6

package/components/wd-select/index.js

@@ -4,6 +4,7 @@ import itemBehavior from '../form-field-behavior/item-behavior';
 import { convertFixedIcon, SELECT_ICON_H5 } from '../../utils/getFormLegacy';
 import debounce from '../../utils/debounce';
 import { arrayToMap, getSelected } from '../../utils/tool';
+import { isFormatNeedFetch } from './select/formats-util';
 
 Component({
   options: { virtualHost: true, styleIsolation: 'shared' },
@@ -80,7 +81,9 @@ Component({
       this.setData({ _suffixType, _suffixIcon });
     },
     range: function (range) {
-      this.updateSelect({ detail: { value: this.data.value, option: range } });
+      if (!isFormatNeedFetch(this.data.format)) {
+        this.updateSelect({ detail: { value: this.data.value, option: range } });
+      }
     },
     selectFieldLabel: function (selectFieldLabel) {
       this.setData({

package/components/wd-select/select/index.js

@@ -6,6 +6,7 @@ import deepEqual from '../../../utils/deepEqual';
 import { getDefaultQuery } from '../../../utils/getModelParams';
 import { isFormatNeedFetch, isFormatWithFilterable } from './formats-util';
 import { textToString } from '../../../utils/platform';
+import { errorHandler } from '../../../utils/error';
 
 const STATUS_CLOSED = 0;
 const STATUS_LOADING = 1;
@@ -108,6 +109,7 @@ Component({
     currentPageNo: 1,
     _filterable: false,
     hasNextPage: true,
+    preDisplayValue: '',
   },
   lifetimes: {
     attached() {
@@ -154,6 +156,15 @@ Component({
         displayValue: label,
       });
     },
+    displayValue: function (displayValue) {
+      if (!deepEqual(this.data.preDisplayValue, displayValue)) {
+        const { value, option } = this.data;
+        this.triggerEvent('updateSelect', { value, option });
+        this.setData({
+          preDisplayValue: displayValue,
+        });
+      }
+    },
     enumName: function (enumName) {
       if (this.properties.format === 'x-enum' && enumName) {
         this._fetchEnumData();
@@ -276,7 +287,6 @@ Component({
         currentPageNo: pageNo,
         hasNextPage: stringRange?.length < res?.total,
       });
-      this.triggerEvent('updateSelect', { value: value, option: stringRange });
     },
     _childFetchData: function (data) {
       if (this.data.hasNextPage) {
@@ -337,28 +347,43 @@ Component({
     },
     // 获取通用选项集列表
     _fetchEnumData: async function () {
-      let data = await callWedaApi({
-        action: 'DescribeGeneralOptionsDetailList',
-        data: {
-          OptNameList: [this.properties.enumName],
-          PageIndex: 1,
-          PageSize: 10,
-        },
-      });
+      try {
+        let data = await callWedaApi({
+          action: 'DescribeGeneralOptionsDetailList',
+          data: {
+            OptNameList: [this.properties.enumName],
+            PageIndex: 1,
+            PageSize: 10,
+          },
+        });
 
-      const config = destr(data?.Items?.[0]?.Config) ?? [];
-      const option = config.map((item) => {
-        return {
-          label: item.value,
-          value: item.key,
-          name: item.value,
-        };
-      });
-      this.setData({
-        selectRange: option.map((item) => item.label),
-        option,
-        loadStatus: option.length > 0 ? 0 : STATUS_EMPTY,
-      });
+        const config = destr(data?.Items?.[0]?.Config) ?? [];
+        const option = config.map((item) => {
+          return {
+            label: item.value,
+            value: item.key,
+            name: item.value,
+          };
+        });
+        const label = this.getLabels(this.data.value, option);
+        this.setData({
+          selectRange: option.map((item) => item.label),
+          option,
+          loadStatus: option.length > 0 ? 0 : STATUS_EMPTY,
+          displayValue: label,
+        });
+      } catch (error) {
+        errorHandler({
+          code: 'wdSelect.GetEnumDataError',
+          error: error,
+        });
+        this.setData({
+          loadStatus: STATUS_FAILED,
+          selectRange: [],
+          option: [],
+          displayValue: '',
+        });
+      }
     },
     getUniqueOption: function (option) {
       const optionMap = option.reduce((acc, item) => {

package/components/wd-select-multiple/index.js

@@ -4,6 +4,7 @@ import itemBehavior from '../form-field-behavior/item-behavior';
 import { convertFixedIcon, SELECT_ICON_H5 } from '../../utils/getFormLegacy';
 import { safeObj, arrayToMap, getSelected } from '../../utils/tool';
 import debounce from '../../utils/debounce';
+import { isFormatNeedFetch } from '../wd-select/select/formats-util';
 
 Component({
   options: { virtualHost: true, styleIsolation: 'shared' },
@@ -83,7 +84,9 @@ Component({
       this.setData({ _suffixType, _suffixIcon });
     },
     range: function (range) {
-      this.updateSelect({ detail: { value: this.data.value, option: range } });
+      if (!isFormatNeedFetch(this.data.format)) {
+        this.updateSelect({ detail: { value: this.data.value, option: range } });
+      }
     },
     selectFieldLabel: function (selectFieldLabel) {
       this.setData({

package/package.json

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