@cloudbase/weda-ui-mp 3.17.7 → 3.18.1

package/components/wd-select/index.js

@@ -33,6 +33,10 @@ Component({
       type: Boolean,
       value: false,
     },
+    selectFieldLabel: {
+      type: String,
+      value: '',
+    },
   },
   data: {
     itemMap: {},
@@ -40,14 +44,15 @@ Component({
     selectedItem: null,
     _suffixType: '',
     _suffixIcon: '',
+    showLabel: '',
   },
   methods: {
     finalUpdateWidgetAPI: function () {
-      const { selectedLabel, primaryField, selectedItem } = this.properties;
+      const { selectedLabel, primaryField, selectFieldLabel, selectedItem } = this.properties;
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
           selectedLabel,
-          selectFields: [primaryField],
+          selectFields: [selectFieldLabel || primaryField],
           item: selectedItem,
         });
       this.updateWidgetAPI();
@@ -66,7 +71,7 @@ Component({
     },
   },
   observers: {
-    'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem':
+    'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem,selectFieldLabel':
       function () {
         this.finalUpdateWidgetAPI();
       },
@@ -77,9 +82,18 @@ Component({
     range: function (range) {
       this.updateSelect({ detail: { value: this.data.value, option: range } });
     },
+    selectFieldLabel: function (selectFieldLabel) {
+      this.setData({
+        showLabel: selectFieldLabel || this.data.primaryField,
+      });
+    },
   },
   lifetimes: {
     attached: function () {
+      const { selectFieldLabel, primaryField } = this.data;
+      this.setData({
+        showLabel: selectFieldLabel || primaryField,
+      });
       this.finalUpdateWidgetAPI();
     },
   },

package/components/wd-select/index.wxml

@@ -35,7 +35,7 @@
           enumName="{{enumName}}"
           format="{{format}}"
           placeholder="{{placeholder}}"
-          primaryField="{{primaryField}}"
+          primaryField="{{showLabel}}"
           range="{{range}}"
           size="full"
           tipBlock="{{tipBlock}}"

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

@@ -47,7 +47,7 @@ Component({
   },
   data: {
     height: '390px',
-    focus: false,
+    focus: false, // 聚焦在搜索框
     searchValue: '',
     index: -1,
     status: 0,
@@ -57,12 +57,18 @@ Component({
   },
 
   methods: {
-    cancelPicker: function (e) {
-      if (this.data.multiple) {
-        const { option } = this.properties;
-        this.setData({ selectedCache: option.filter((item) => item.check) });
+    cancelPicker: function () {
+      if (this.data.focus) {
+        this.setData({
+          focus: false,
+        });
+      } else {
+        if (this.data.multiple) {
+          const { option } = this.properties;
+          this.setData({ selectedCache: option.filter((item) => item.check) });
+        }
+        this.triggerEvent('onClosePicker');
       }
-      this.triggerEvent('onClosePicker');
     },
     // 监听输入
     bindinput: function (event) {
@@ -116,11 +122,13 @@ Component({
     },
     // 选中项
     onItemClick: function (e) {
-      const item = e.currentTarget.dataset.value;
+      const item = e.currentTarget?.dataset?.value ? Object.assign({}, e.currentTarget.dataset.value) : {};
       if (item.disabled) return;
+      item.check = true;
       if (this.data.multiple) {
         this.setData({
           selectedCache: this.dealSelectedValue(item),
+          focus: false,
         });
       } else {
         this.triggerEvent('onSelectPicker', item);

package/components/wd-select/select/dropdown-select/index.wxml

@@ -21,7 +21,7 @@
       <view class="weda-ui-custom-picker__columns">
         <view class="weda-ui-custom-picker__column">
           <view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-picker__column-item {{multiple?'multiple':''}} {{ tools.includes(selectedCache, item) ? 'is-selected':''}} {{ (item.disabled) ? 'is-disabled':''}}" bindtap="onItemClick" data-value="{{item}}">
-            <text class="weda-ui-custom-picker__column-item-text {{multiple?'multiple':''}}">{{item.label}}</text>
+            <text class="weda-ui-custom-picker__column-item-text {{multiple?'multiple':''}}">{{item.label||item.value}}</text>
           </view>
           <view wx:if="{{status === 1}}" class="weda-ui-custom-picker__status weda-ui-custom-picker__status--loading"> <i class="weda-ui-custom-picker__loading-icon"></i>加载中... </view>
           <view wx:if="{{status === 2}}" class="weda-ui-custom-picker__status">

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

@@ -113,12 +113,6 @@ Component({
     attached() {
       const { range, filterable, format, defaultValue } = this.properties;
       const label = this.getLabels(defaultValue, range);
-      console.log(filterable, format);
-      if (this.data.value?.[0] === '1') {
-        console.log(filterable);
-        console.log('99');
-      }
-
       this.setData({
         option: range,
         _filterable: format && isFormatWithFilterable(format) ? true : filterable,
@@ -216,6 +210,7 @@ Component({
         this.setData({ value: [].concat(e.detail.value), allPickerShow: false });
         this.onChange({ detail: { value: e.detail.value, context: { option: e.detail } } });
       }
+      this._initFetchData({ searchValue: '' });
     },
     // 获取数据列表：关联关系和主子明细
     _fetchData: async function ({ queryParam = this.data.queryParam, searchValue = '', pageNo = 1, _init = false }) {
@@ -300,7 +295,7 @@ Component({
         });
       }
       if (this.data.multiple) {
-        return labels.join(',');
+        return labels && labels.join(',');
       } else {
         return labels?.[0];
       }
@@ -310,9 +305,8 @@ Component({
       const _options = Array.isArray(options) ? options : [];
       const stringRange = _options.map((item) => {
         const obj = _values.find((el) => el === item.value);
-        const check = !!obj;
-        const value = String(item.value);
-        return { ...item, value, check };
+        const check = typeof obj === 'number' || !!obj;
+        return { ...item, check };
       });
       return stringRange;
     },
@@ -320,7 +314,7 @@ Component({
       const { queryParam, dataSourceName, primaryField } = this.data;
       const _filter = {
         where: {
-          $and: [{ $or: values.map((i) => ({ _id: { $search: i } })) }],
+          $and: [{ $or: values.map((i) => ({ _id: { $eq: i } })) }],
         },
       };
       let data = await callDataSourceApi({

package/components/wd-select/select.wxss

@@ -194,7 +194,7 @@
 .wd-custom-backdrop {
   position: fixed;
   /* 与weui-mask 一致 */
-  z-index: 1000;
+  z-index: 1002;
   top: 0;
   left: 0;
   bottom: 0;
@@ -311,7 +311,7 @@
   position: fixed;
   bottom: 0;
   left: 0;
-  z-index: 1001;
+  z-index: 1002;
 }
 .wd-custom-picker__inner.is-full {
   height: 100vh;

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

@@ -33,6 +33,10 @@ Component({
       type: Boolean,
       value: false,
     },
+    selectFieldLabel: {
+      type: String,
+      value: '',
+    },
   },
   data: {
     itemMap: {},
@@ -43,11 +47,11 @@ Component({
   },
   methods: {
     finalUpdateWidgetAPI: function () {
-      const { selectedLabel, primaryField, selectedItem } = this.properties;
+      const { selectedLabel, primaryField, selectedItem, selectFieldLabel } = this.properties;
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
           selectedLabel,
-          selectFields: [primaryField],
+          selectFields: [selectFieldLabel || primaryField],
           item: selectedItem,
         });
       this.updateWidgetAPI();
@@ -70,7 +74,7 @@ Component({
     },
   },
   observers: {
-    'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem':
+    'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem,selectFieldLabel':
       function () {
         this.finalUpdateWidgetAPI();
       },
@@ -81,9 +85,18 @@ Component({
     range: function (range) {
       this.updateSelect({ detail: { value: this.data.value, option: range } });
     },
+    selectFieldLabel: function (selectFieldLabel) {
+      this.setData({
+        showLabel: selectFieldLabel || this.data.primaryField,
+      });
+    },
   },
   lifetimes: {
     attached: function () {
+      const { selectFieldLabel, primaryField } = this.data;
+      this.setData({
+        showLabel: selectFieldLabel || primaryField,
+      });
       this.finalUpdateWidgetAPI();
     },
   },

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

@@ -36,7 +36,7 @@
           enumName="{{enumName}}"
           format="{{format}}"
           placeholder="{{placeholder}}"
-          primaryField="{{primaryField}}"
+          primaryField="{{showLabel}}"
           range="{{range}}"
           size="full"
           tipBlock="{{tipBlock}}"

package/package.json

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