@cloudbase/weda-ui-mp 3.7.3 → 3.7.5

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

@@ -48,6 +48,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    staticSearchable: {
+      type: Boolean,
+      value: true,
+    },
   },
   data: {
     height: '780rpx',
@@ -80,8 +84,14 @@ Component({
     bindinput: function (event) {
       const value = event.detail.value;
 
-      const { option, loadStatus, isTurnPages, _needFetch, ignoreCase } =
-        this.properties;
+      const {
+        option,
+        loadStatus,
+        isTurnPages,
+        _needFetch,
+        ignoreCase,
+        staticSearchable,
+      } = this.properties;
       if (value === '' || value === this.data.searchValue) {
         this.setData({
           searchValue: value,
@@ -109,8 +119,9 @@ Component({
             searchValue: value,
             pageNo: 1,
           });
-        } else {
+        } else if (staticSearchable) {
           // 本地搜索
+
           const searchOption = option.filter((item) => {
             if (ignoreCase) {
               return String(item.label)
@@ -223,45 +234,54 @@ Component({
     },
   },
   observers: {
-    'option, loadStatus, searchOption, searchStatus, _needFetch': function (
-      option,
-      loadStatus,
-      searchOption,
-      searchStatus,
-      _needFetch
-    ) {
-      if (this.data.searchValue === '') {
-        // 初始化会走到这
-        const { chooseIndexValue } = this.properties;
-        let index = -1;
-        if (chooseIndexValue !== '') {
-          index = option.findIndex((item) => item.value === chooseIndexValue);
-        } else {
-          option.some((item, i) => {
-            if (!item?.disabled) {
-              index = i;
-              return true;
-            }
-          });
-        }
-        this.setData({
-          status: loadStatus,
-          showOption: option,
-          isFinish: true,
-          index: index,
-          clickIndex: index,
-        });
-      } else {
-        if (_needFetch) {
-          // 只有needFetch 才设置searchOption
+    'option, loadStatus, searchOption, searchStatus, _needFetch, staticSearchable':
+      function (
+        option,
+        loadStatus,
+        searchOption,
+        searchStatus,
+        _needFetch,
+        staticSearchable
+      ) {
+        if (this.data.searchValue === '') {
+          // 初始化会走到这
+          const { chooseIndexValue } = this.properties;
+          let index = -1;
+          if (chooseIndexValue !== '') {
+            index = option.findIndex((item) => item.value === chooseIndexValue);
+          } else {
+            option.some((item, i) => {
+              if (!item?.disabled) {
+                index = i;
+                return true;
+              }
+            });
+          }
           this.setData({
-            status: searchStatus,
-            showOption: searchOption,
+            status: loadStatus,
+            showOption: option,
             isFinish: true,
-            index: -1,
+            index: index,
+            clickIndex: index,
           });
+        } else {
+          if (_needFetch) {
+            // 只有needFetch 才设置searchOption
+            this.setData({
+              status: searchStatus,
+              showOption: searchOption,
+              isFinish: true,
+              index: -1,
+            });
+          } else if (!staticSearchable) {
+            this.setData({
+              status: searchStatus,
+              showOption: option,
+              isFinish: true,
+              index: -1,
+            });
+          }
         }
-      }
-    },
+      },
   },
 });

package/components/form/select/index.js

@@ -151,6 +151,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    staticSearchable: {
+      type: Boolean,
+      value: true,
+    },
   },
   data: {
     cls: '',

package/components/form/select/index.wxml

@@ -34,6 +34,7 @@
           <block wx:if="{{allPickerShow}}">
             <dropdownSelect
               ignoreCase="{{ignoreCase}}"
+              staticSearchable="{{staticSearchable}}"
               class="weui-picker__group weui-input"
               bindchange="onChange"
               bind:_childFetchData="_childFetchData"

package/components/form/selectMultiple/dropdown-select/index.js

@@ -36,6 +36,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    staticSearchable: {
+      type: Boolean,
+      value: true,
+    },
   },
   data: {
     height: '390px',
@@ -170,14 +174,18 @@ Component({
     },
   },
   observers: {
-    'option,searchValue': function (option, searchValue) {
+    'option,searchValue,staticSearchable': function (
+      option,
+      searchValue,
+      staticSearchable
+    ) {
       const { ignoreCase } = this.properties;
       if (searchValue === '') {
         this.setData({
           showOption: option,
           status: option.length > 0 ? 0 : 3,
         });
-      } else {
+      } else if (staticSearchable) {
         const searchRange = option.filter((item) => {
           if (ignoreCase) {
             return (
@@ -192,6 +200,10 @@ Component({
           showOption: searchRange,
           status: searchRange.length > 0 ? 0 : 3,
         });
+      } else {
+        this.setData({
+          showOption: option,
+        });
       }
     },
     option: function (option) {

package/components/form/selectMultiple/index.js

@@ -91,6 +91,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    staticSearchable: {
+      type: Boolean,
+      value: true,
+    },
   },
   data: {
     cls: '',

package/components/form/selectMultiple/index.wxml

@@ -12,7 +12,21 @@
           </block>
         </view>
         <block wx:if="{{allPickerShow}}">
-          <dropdownSelect class="weui-picker__group weui-input" bindchange="onChange" bind:_childFetchData="_childFetchData" bind:onSelectPicker="onSelectPicker" bind:onClosePicker="onClosePicker" option="{{option}}" loadStatus="{{loadStatus}}" searchStatus="{{searchStatus}}" displayLabel="{{displayLabel}}" selectedValue="{{value}}" ignoreCase="{{ignoreCase}}" bind:search="onSearch" />
+          <dropdownSelect
+            class="weui-picker__group weui-input"
+            bindchange="onChange"
+            bind:_childFetchData="_childFetchData"
+            bind:onSelectPicker="onSelectPicker"
+            bind:onClosePicker="onClosePicker"
+            option="{{option}}"
+            loadStatus="{{loadStatus}}"
+            searchStatus="{{searchStatus}}"
+            displayLabel="{{displayLabel}}"
+            selectedValue="{{value}}"
+            ignoreCase="{{ignoreCase}}"
+            staticSearchable="{{staticSearchable}}"
+            bind:search="onSearch"
+          />
         </block>
       </view>
     </view>

package/components/form/uploader/weui-uploader.js

@@ -257,17 +257,12 @@ Component({
           });
       }
     },
-    failEvent(length, invalidIndex) {
-      this.triggerEvent(
-        'fail',
-        {
-          type: 1,
-          errMsg: `chooseImage:fail size exceed ${this.data.maxSize}`,
-          total: length,
-          index: invalidIndex,
-        },
-        {}
-      );
+    failEvent() {
+      wx.showToast({
+        icon: 'none',
+        duration: 2000,
+        title: `请上传不超过 ${this.data.maxSize / (1024 * 1024)}M 的图片`,
+      });
     },
     deletePic(e) {
       const index = e.detail.index;

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

@@ -1,6 +1,5 @@
 import { validType } from './validator';
 import equal from '../../utils/deepEqual';
-// eslint-disable-next-line rulesdir/no-phantom-deps -- 小程序里面有
 import { autorun, untracked } from 'mobx';
 import {
   convertStatus,

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

@@ -379,6 +379,10 @@ export default Behavior({
       type: Boolean,
       value: true,
     },
+    staticSearchable: {
+      type: Boolean,
+      value: true,
+    },
   },
   data: {
     classPrefix: WD_PREFIX,

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

@@ -7,14 +7,9 @@
 .wd-form-obj-root {
   display: flex;
 }
-.wd-form-obj-root .wd-form-obj-root {
-  margin-top: 10px;
-}
-.wd-form-obj-root.wd-form-item--weui.wd-form-item {
-  padding: 0;
-}
 .wd-form-obj-root .wd-form-obj {
   min-width: 200px;
+  width: fit-content;
   width: 100%;
 }
 .wd-form-obj-root.size-width-sm {
@@ -43,9 +38,49 @@
 .wd-form-obj-root .wd-form-item-wrap__label.wd-form-obj__label {
   height: unset;
   line-height: unset;
-  padding: unset;
-  margin-left: var(--wd-form-item-label-mr);
 }
 .wd-form-obj-root .wd-form-item-wrap .is-nowrap.wd-form-item-wrap__label.wd-form-obj__label > label {
   line-height: unset;
+}
+.wd-form-obj-root.wd-h5-form-obj-root {
+  margin-top: calc(var(--wd-space-base) * 4);
+}
+.wd-form-obj-root.wd-h5-form-obj-root .wd-form-item--weui.wd-form-item {
+  padding: 0;
+  margin: 0;
+}
+.wd-form-obj-root.wd-h5-form-obj-root .wd-form-obj .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 {
+  border: none;
+}
+
+.wd-form.wd-form--weui .wd-h5-form-obj-root > .wd-form-item-wrap {
+  border: none;
+}
+
+.wd-form--vertical-left .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
+  padding: 0;
+}
+
+.wd-form.wd-mp-form .wd-mp-form-obj-root > .wd-form-item-wrap {
+  border: none;
+}
+
+.wd-mp-form-obj-root {
+  margin-top: calc(var(--wd-space-base) * 4);
+}
+.wd-mp-form-obj-root .wd-form-item--weui.wd-form-item {
+  padding: 0;
+  margin: 0;
+}
+.wd-mp-form-obj-root .wd-form-obj .wd-h5-card-root {
+  margin-bottom: var(--wd-form-item-pd);
+}
+.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 {
+  border: none;
 }

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

@@ -7,14 +7,9 @@
 .wd-form-obj-root {
   display: flex;
 }
-.wd-form-obj-root .wd-form-obj-root {
-  margin-top: 10px;
-}
-.wd-form-obj-root.wd-form-item--weui.wd-form-item {
-  padding: 0;
-}
 .wd-form-obj-root .wd-form-obj {
   min-width: 200px;
+  width: fit-content;
   width: 100%;
 }
 .wd-form-obj-root.size-width-sm {
@@ -43,9 +38,49 @@
 .wd-form-obj-root .wd-form-item-wrap__label.wd-form-obj__label {
   height: unset;
   line-height: unset;
-  padding: unset;
-  margin-left: var(--wd-form-item-label-mr);
 }
 .wd-form-obj-root .wd-form-item-wrap .is-nowrap.wd-form-item-wrap__label.wd-form-obj__label > label {
   line-height: unset;
+}
+.wd-form-obj-root.wd-h5-form-obj-root {
+  margin-top: calc(var(--wd-space-base) * 4);
+}
+.wd-form-obj-root.wd-h5-form-obj-root .wd-form-item--weui.wd-form-item {
+  padding: 0;
+  margin: 0;
+}
+.wd-form-obj-root.wd-h5-form-obj-root .wd-form-obj .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 {
+  border: none;
+}
+
+.wd-form.wd-form--weui .wd-h5-form-obj-root > .wd-form-item-wrap {
+  border: none;
+}
+
+.wd-form--vertical-left .wd-card__header .wd-form-item-wrap__label.wd-form-obj__label {
+  padding: 0;
+}
+
+.wd-form.wd-mp-form .wd-mp-form-obj-root > .wd-form-item-wrap {
+  border: none;
+}
+
+.wd-mp-form-obj-root {
+  margin-top: calc(var(--wd-space-base) * 4);
+}
+.wd-mp-form-obj-root .wd-form-item--weui.wd-form-item {
+  padding: 0;
+  margin: 0;
+}
+.wd-mp-form-obj-root .wd-form-obj .wd-h5-card-root {
+  margin-bottom: var(--wd-form-item-pd);
+}
+.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 {
+  border: none;
 }

package/components/wd-input-number/index.js

@@ -544,12 +544,16 @@ Component({
 
       const readValue = `${toShow}${getPercentUnit(format)}`;
 
-      this.setData({
-        readValue,
-        realValue: toReal,
-        showValue: toShow,
-        isInit: false,
-      });
+      // 避免和focus逻辑冲突，延后一个任务执行赋值
+      // eslint-disable-next-line rulesdir/no-timer
+      setTimeout(() => {
+        this.setData({
+          readValue,
+          realValue: toReal,
+          showValue: toShow,
+          isInit: false,
+        });
+      }, 0);
     },
     inputValue: function (inputValue) {
       if (equal(inputValue, this.data._oldInputValue)) return;

package/components/wd-menu-layout/wd-menu-layout.wxss

@@ -280,6 +280,11 @@
 .wd-menulayout-body__left-menu .wedatea2td-menu__item {
   padding: 7px 24px 7px 8px;
 }
+.wd-menulayout-body__left-menu .wedatea2td-menu__item .wedatea2td-menu__text {
+  max-width: unset;
+  width: 100%;
+  padding: 0;
+}
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__fold:hover .wedatea2td-menu__fold-icon,
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded:hover,
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded > .wedatea2td-menu__item {
@@ -522,6 +527,11 @@
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu__item {
   padding: 16px 48px 16px 16px;
 }
+.wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu__item .wedatea2td-menu__text {
+  max-width: unset;
+  width: 100%;
+  padding: 0;
+}
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__fold:hover .wedatea2td-menu__fold-icon,
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded:hover,
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded > .wedatea2td-menu__item {

package/components/wd-menu-list/wd-menu-list.wxss

@@ -280,6 +280,11 @@
 .wd-menulayout-body__left-menu .wedatea2td-menu__item {
   padding: 7px 24px 7px 8px;
 }
+.wd-menulayout-body__left-menu .wedatea2td-menu__item .wedatea2td-menu__text {
+  max-width: unset;
+  width: 100%;
+  padding: 0;
+}
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__fold:hover .wedatea2td-menu__fold-icon,
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded:hover,
 .wd-menulayout-body__left-menu .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded > .wedatea2td-menu__item {
@@ -522,6 +527,11 @@
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu__item {
   padding: 16px 48px 16px 16px;
 }
+.wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu__item .wedatea2td-menu__text {
+  max-width: unset;
+  width: 100%;
+  padding: 0;
+}
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__fold:hover .wedatea2td-menu__fold-icon,
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded:hover,
 .wd-menulayout-h5__drawer .wedatea2td-drawer__body .wedatea2td-menu--light .wedatea2td-menu__list li.wedatea2td-menu__submenu.is-expanded > .wedatea2td-menu__item {

package/components/wd-modal/wd-modal.wxss

@@ -174,12 +174,13 @@
 }
 .wd-modal-bd__ft-text-btn .wd-mp-btn.wd-btn--primary {
   color: var(--wd-color-brand, #0052d9);
+  background-color: transparent;
 }
-.wd-modal-bd__ft-text-btn .wd-mp-btn.wd-btn--primary:hover {
+.wd-modal-bd__ft-text-btn .wd-mp-btn.wd-btn--primary:hover:not(.is-disabled) {
   background-color: transparent;
   border-color: var(--wd-color-border-default);
 }
-.wd-modal-bd__ft-text-btn .wd-mp-btn:hover {
+.wd-modal-bd__ft-text-btn .wd-mp-btn:hover:not(.is-disabled) {
   background-color: transparent;
   border-color: var(--wd-color-border-default);
 }

package/components/wd-select/index.wxml

@@ -41,6 +41,7 @@
           version="wd"
           mode="selector"
           ignoreCase="{{ignoreCase}}"
+          staticSearchable="{{staticSearchable}}"
           bind:change="handleChange"
           bind:changeOptions="changeOptions"
           bind:search="search"

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

@@ -40,6 +40,7 @@
           mode="selector"
           version="wd"
           ignoreCase="{{ignoreCase}}"
+          staticSearchable="{{staticSearchable}}"
           bind:change="handleChange"
           bind:changeOptions="changeOptions"
           bind:changeLabel="changeLabel"

package/package.json

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