@cloudbase/weda-ui-mp 3.15.7 → 3.16.0

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

@@ -52,6 +52,14 @@ Component({
       type: Boolean,
       value: true,
     },
+    searchable: {
+      type: Boolean,
+      value: true,
+    },
+    filterable: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     height: '780rpx',

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

@@ -4,7 +4,7 @@
     <view wx:if="{{!focus}}" class="weda-ui-custom-picker__header">
       <button class="weda-ui-custom-picker__header-btn" bindtap="cancelPicker" data-clear="false">取消</button>
     </view>
-    <view class="weda-ui-custom-search {{focus?'is-focused':''}}" style="{{focus? 'margin: 34rpx 32rpx 16rpx 32rpx':'margin: 20rpx 32rpx'}}">
+    <view wx:if="{{searchable}}" class="weda-ui-custom-search {{focus?'is-focused':''}}" style="{{focus? 'margin: 34rpx 32rpx 16rpx 32rpx':'margin: 20rpx 32rpx'}}">
       <view class="weda-ui-custom-search-box" bindtap="onFocus">
         <input class="weda-ui-input" focus="{{focus}}" bindfocus="onFocus" bindblur="onBlur" bindinput="bindinput" value="{{searchValue}}" hold-keyboard="true" bindconfirm="bindconfirm" />
         <view class="weda-ui-custom-search-box__label">

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

@@ -36,14 +36,18 @@ Component({
       type: Boolean,
       value: true,
     },
-    staticSearchable: {
-      type: Boolean,
-      value: true,
-    },
     selectedValue: {
       type: Array,
       value: [],
     },
+    searchable: {
+      type: Boolean,
+      value: true,
+    },
+    filterable: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     height: '390px',
@@ -53,18 +57,12 @@ Component({
     status: 0,
     showOption: [],
     searchPageNo: 1,
-    timeId: '',
     pageNo: 1,
     selectedCache: [], // 缓存当前选中值
   },
 
   lifetimes: {
-    detached() {
-      const id = this.data.timeId;
-      if (id !== '') {
-        clearTimeout(id);
-      }
-    },
+    detached() {},
   },
   methods: {
     cancelPicker: function (e) {
@@ -179,9 +177,13 @@ Component({
     },
   },
   observers: {
-    'option,searchValue,staticSearchable': function (option, searchValue, staticSearchable) {
+    'option,searchValue,filterable': function (option, searchValue, filterable) {
       const { ignoreCase } = this.properties;
-      if (staticSearchable) {
+      if (filterable) {
+        this.setData({
+          showOption: option,
+        });
+      } else {
         const searchRange = option.filter((item) => {
           if (ignoreCase) {
             return String(item.label).toLowerCase().indexOf(searchValue.toLowerCase()) !== -1;
@@ -192,10 +194,6 @@ Component({
           showOption: searchRange,
           status: searchRange.length > 0 ? 0 : 3,
         });
-      } else {
-        this.setData({
-          showOption: option,
-        });
       }
     },
     selectedValue: function (selectedValue) {

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

@@ -6,7 +6,7 @@
       <button class="weda-ui-custom-picker__header-btn" bindtap="closeModal" data-clear="false">取消</button>
       <button class="weda-ui-custom-picker__header-btn" bindtap="confirmModal">确定</button>
     </view>
-    <view class="weda-ui-custom-search {{focus?'is-focused':''}}" style="{{focus? 'margin: 34rpx 32rpx 16rpx 32rpx':'margin: 20rpx 32rpx'}}">
+    <view wx:if="{{searchable}}"  class="weda-ui-custom-search {{focus?'is-focused':''}}" style="{{focus? 'margin: 34rpx 32rpx 16rpx 32rpx':'margin: 20rpx 32rpx'}}">
       <view class="weda-ui-custom-search-box" bindtap="onFocus">
         <input class="weda-ui-input" focus="{{focus}}" bindfocus="onFocus" bindblur="onBlur" bindinput="bindinput" value="{{searchValue}}" hold-keyboard="true" bindconfirm="bindconfirm" />
         <view class="weda-ui-custom-search-box__label multiple">

package/components/form/selectMultiple/index.js

@@ -98,6 +98,26 @@ Component({
       type: Array,
       value: [],
     },
+    supportManyRelated: {
+      type: Boolean,
+      value: false,
+    },
+    queryCondition: {
+      type: null,
+      value: [],
+    },
+    sorter: {
+      type: Array,
+      value: [],
+    },
+    searchable: {
+      type: Boolean,
+      value: true,
+    },
+    filterable: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     cls: '',
@@ -112,15 +132,13 @@ Component({
     searchOption: [],
     width: '100%',
     isEmpty: true,
-    preWhere: [], // 对比 where 监听
-    whereEffected: [], // 每次请求都加上
     fetchTimed: null, // 防抖
     queryParam: { select: { $master: true } },
-    staticSearchable: true,
+    _filterable: false,
   },
   lifetimes: {
     attached() {
-      const { className, layout, disabled, range } = this.properties;
+      const { className, layout, disabled, range, filterable } = this.properties;
       const isFlex = layout !== 'vertical';
       const cls = classNames({
         'weda-ui': true,
@@ -144,6 +162,7 @@ Component({
         cls,
         subCls,
         displayValue,
+        _filterable: filterable,
       });
     },
     ready() {
@@ -172,9 +191,12 @@ Component({
       });
     },
     format: function (format) {
-      this.setData({
-        staticSearchable: !['many-many', 'one-many'].includes(format),
-      });
+      if (['many-many', 'one-many'].includes(format)) {
+        // 关联关系，自定义查询规则，不走前端过滤
+        this.setData({
+          _filterable: true,
+        });
+      }
     },
     'value,range': function () {
       const { range, format } = this.properties;

package/components/form/selectMultiple/index.wxml

@@ -13,6 +13,8 @@
         </view>
         <block wx:if="{{allPickerShow}}">
           <dropdownSelect
+            searchable="{{searchable}}"
+            filterable="{{_filterable}}"
             class="weui-picker__group weui-input"
             bindchange="onChange"
             bind:_childFetchData="_childFetchData"
@@ -24,7 +26,6 @@
             displayLabel="{{displayLabel}}"
             selectedValue="{{value}}"
             ignoreCase="{{ignoreCase}}"
-            staticSearchable="{{staticSearchable}}"
             bind:search="onSearch"
           />
         </block>

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

@@ -3,11 +3,7 @@ import equal from '../../utils/deepEqual';
 import { errorHandler } from '../../utils/error';
 
 import { autorun, untracked } from 'mobx';
-import {
-  convertStatus,
-  convertRules,
-  convertMethodParam,
-} from '../../utils/getFormLegacy';
+import { convertStatus, convertRules, convertMethodParam } from '../../utils/getFormLegacy';
 
 export default Behavior({
   behaviors: [],
@@ -101,14 +97,7 @@ export default Behavior({
         },
         async handleValidate(throwError = true) {
           let finalValue = that.data.value;
-          const {
-            required,
-            rules,
-            requiredMsg,
-            privateRules,
-            selfDefineRules,
-            label,
-          } = that.data;
+          const { required, rules, requiredMsg, privateRules, selfDefineRules, label } = that.data;
           const _rules = [].concat(rules, privateRules, selfDefineRules);
           if (!required && !_rules.length) return;
           if (finalValue) {
@@ -124,9 +113,7 @@ export default Behavior({
           const validPromise = [];
           if (required) {
             if (!validType.required(finalValue)) {
-              validPromise.push(
-                Promise.resolve({ format: 'required', message: requiredMsg })
-              );
+              validPromise.push(Promise.resolve({ format: 'required', message: requiredMsg }));
             }
           }
 
@@ -153,10 +140,7 @@ export default Behavior({
                     let reg;
                     if (typeof item.pattern === 'string') {
                       const m = item.pattern.match(/(\/?)(.+)\1([a-z]*)/i);
-                      if (
-                        m[3] &&
-                        !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])
-                      ) {
+                      if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])) {
                         reg = RegExp(item.pattern);
                       } else {
                         reg = new RegExp(m[2], m[3]);
@@ -225,15 +209,10 @@ export default Behavior({
       Promise.resolve().then(() => {
         this._reaction = autorun(() => {
           const form = untracked(() => {
-            return this.$widget?.closest(
-              (w) => w.getConfig?.()?.componentType === 'form'
-            );
+            return this.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
           });
 
-          if (
-            form &&
-            (this.data.layout === 'auto' || this.data.layout === '')
-          ) {
+          if (form && (this.data.layout === 'auto' || this.data.layout === '')) {
             if (form.layout !== this.data.actualLayout) {
               // 在 form 里面
               this.setData({ actualLayout: form.layout });
@@ -271,9 +250,7 @@ export default Behavior({
       // 清空嵌套表单
       this._removeFormObjItem?.();
       if (this.$widget) {
-        const form = this.$widget.closest(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
         form?.updateFormContext(this.data.name, undefined);
       }
@@ -315,10 +292,7 @@ export default Behavior({
       };
     },
     setReadOnly(val) {
-      const [originalReadOnly, originalDisabled] = [
-        this.data.readOnly,
-        this.data.disabled,
-      ];
+      const [originalReadOnly, originalDisabled] = [this.data.readOnly, this.data.disabled];
       const value = convertMethodParam(val);
       if (value !== originalReadOnly) {
         // 先用disabled属性来做
@@ -345,29 +319,20 @@ export default Behavior({
         // this.$instanceRef.current.name = newName;
         this.data._oldName = newName;
         if (typeof this.$widget !== 'object') return;
-        const form = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'form');
 
-        if (form) {
+        const formObj = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'formObj');
+
+        if (formObj) {
+          // 添加子组件到嵌套表单里面
+          this._removeFormObjItem = formObj.addFormItem(this.data.name, this.$widget);
+        } else if (form) {
           // 在 form 里面
           this._removeFormItem = form.addFormItem(this.data.name, this.$widget);
           if (!Object.prototype.hasOwnProperty.call(form?.value, newName)) {
             form?.updateFormContext(this.data.name, this.data.value);
           }
         }
-
-        const formObj = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'formObj'
-        );
-
-        if (formObj) {
-          // 添加子组件到嵌套表单里面
-          this._removeFormObjItem = formObj.addFormItem(
-            this.data.name,
-            this.$widget
-          );
-        }
       });
     },
     value: function (value) {
@@ -382,18 +347,12 @@ export default Behavior({
         this.$instanceRef.current.value = value;
 
         if (this.$widget) {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
-          const formObj = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'formObj'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
+          const formObj = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'formObj');
           // 有父级嵌套表单的不更新form值，父级嵌套表单会去更新
           !formObj && form?.updateFormContext(this.data.name, value);
           formObj?.valueChangeFromChild?.({
-            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${
-              this.data.name
-            }`,
+            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${this.data.name}`,
             value,
           });
         }
@@ -407,9 +366,7 @@ export default Behavior({
       Promise.resolve().then(() => {
         this.data._layout = layout;
         if (!layout || layout === 'auto') {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
           if (form) {
             // 在 form 里面
@@ -432,9 +389,7 @@ export default Behavior({
       this.data._status = status;
       const { disabled: _disabled, readOnly: _readOnly } = this.data;
       const statusParams = convertStatus(status, _disabled, _readOnly);
-      const form = this?.$widget?.closest(
-        (w) => w.getConfig?.()?.componentType === 'form'
-      );
+      const form = this?.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
       let disabled = statusParams.disabled;
       let readOnly = statusParams.readOnly;
       if (form) {
@@ -443,13 +398,7 @@ export default Behavior({
       }
       this.setData({ disabled, readOnly });
     },
-    'required,before,after,requiredMsg,isUnionValue': function (
-      required,
-      before,
-      after,
-      requiredMsg,
-      isUnionValue
-    ) {
+    'required,before,after,requiredMsg,isUnionValue': function (required, before, after, requiredMsg, isUnionValue) {
       const newPrivateRules = {
         required,
         before,
@@ -459,13 +408,7 @@ export default Behavior({
       };
       if (equal(newPrivateRules, this.data._privateRules)) return;
       this.data._privateRules = newPrivateRules;
-      let privateRules = convertRules(
-        required,
-        before,
-        after,
-        requiredMsg,
-        isUnionValue
-      );
+      let privateRules = convertRules(required, before, after, requiredMsg, isUnionValue);
       this.setData({ privateRules });
     },
   },

package/components/qrcode/index.wxss

@@ -2,7 +2,7 @@
   width: 200px;
   height: 200px;
   position: fixed;
-  left: 100%;
+  left: 200%;
 }
 .wd-qrcode--image {
   width: 200px;

package/components/richText/copy/index.wxss

@@ -1,49 +1,46 @@
 @font-face {
-    font-family: WdTd;
-    src: url("t.eot"), url("t_iefix.eot") format("embedded-opentype"),
-      url("t.woff") format("woff"), url("t.ttf") format("truetype"),
-      url("t.svg") format("svg"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t_iefix.eot")
-        format("embedded-opentype"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.woff")
-        format("woff"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.ttf")
-        format("truetype"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.svg")
-        format("svg");
-    font-weight: 400;
-    font-style: normal;
-  }
- .wd-markdown {
-    padding: 1rem;
-  }
-  .markdown-it-code-wrap {
-    position: relative;
-  }
-  .markdown-it-code-copy {
-    font-family: WdTd !important;
-    vertical-align: middle;
-    font-size: 14px;
-    border: none;
-    background: transparent;
-    position: absolute; top: 7.5px; right: 6px; cursor: pointer; outline: none;
-  }
-  i.markdown-it-code-copy {
-    font-style: normal;
-  }
-  .markdown-it-code-copy::before {
-    content: '\E1AC';
-    position: absolute;
-    top: 0;
-    right: 0;
-    cursor: pointer;
-    width: 20px;
-    height: 20px;
-    display: inline-block;
-    text-align: center;
-  }
-  .markdown-it-code-copy:hover::before {
-    background: #eef1f4;
-  }
-  
+  font-family: WdTd;
+  src: url('t.eot'), url('t_iefix.eot') format('embedded-opentype'), url('t.woff') format('woff'),
+    url('t.ttf') format('truetype'), url('t.svg') format('svg'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t_iefix.eot')
+      format('embedded-opentype'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.woff') format('woff'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.ttf') format('truetype'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.svg') format('svg');
+  font-weight: 400;
+  font-style: normal;
+}
+.wd-markdown {
+  padding: 1rem;
+}
+.markdown-it-code-wrap {
+  position: relative;
+}
+.markdown-it-code-copy {
+  font-family: WdTd !important;
+  vertical-align: middle;
+  font-size: 14px;
+  border: none;
+  background: transparent;
+  position: absolute;
+  top: 7.5px;
+  right: 6px;
+  outline: none;
+}
+i.markdown-it-code-copy {
+  font-style: normal;
+}
+.markdown-it-code-copy::before {
+  content: '\E1AC';
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  text-align: center;
+}
+.markdown-it-code-copy:hover::before {
+  background: #eef1f4;
+}

package/components/wd-select/index.js

@@ -3,10 +3,10 @@ import formFieldBehavior from '../form-field-behavior/form-field-behavior';
 import itemBehavior from '../form-field-behavior/item-behavior';
 import { convertFixedIcon, SELECT_ICON_H5 } from '../../utils/getFormLegacy';
 import debounce from '../../utils/debounce';
-import { safeObj, arrayToMap, getSelected } from '../../utils/tool';
+import { arrayToMap, getSelected } from '../../utils/tool';
 
 Component({
-  options: { virtualHost: true },
+  options: { virtualHost: true, styleIsolation: 'shared' },
   behaviors: [itemBehavior, commonCompBehavior, formFieldBehavior],
   properties: {
     classRoot: {
@@ -25,9 +25,16 @@ Component({
       type: Array,
       value: [],
     },
+    searchable: {
+      type: Boolean,
+      value: true,
+    },
+    filterable: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
-    options: [],
     itemMap: {},
     selectedLabel: null,
     selectedItem: null,
@@ -45,16 +52,18 @@ Component({
         });
       this.updateWidgetAPI();
     },
-    changeOptions: function (e) {
-      const { options } = safeObj(e.detail.value);
-      this.setData({ options });
-    },
     search: function (e) {
       this.debouncedTriggerSearchEvent(e.detail.value);
     },
     debouncedTriggerSearchEvent: debounce(function (value) {
       this.triggerEvent('search', { value });
     }),
+    updateSelect: function (e) {
+      const { value, option } = e.detail;
+      const itemMap = arrayToMap(option, 'value');
+      const { selectedLabel, selectedItem } = getSelected(itemMap, value, false);
+      this.setData({ selectedLabel, selectedItem });
+    },
   },
   observers: {
     'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem':
@@ -65,13 +74,8 @@ Component({
       const [_suffixType, _suffixIcon] = convertFixedIcon(suffixType, suffixIcon, SELECT_ICON_H5);
       this.setData({ _suffixType, _suffixIcon });
     },
-    options: function (options) {
-      const itemMap = arrayToMap(options, 'value');
-      this.setData({ itemMap });
-    },
-    'itemMap, value': function (itemMap, value) {
-      const { selectedLabel, selectedItem } = getSelected(itemMap, value, false);
-      this.setData({ selectedLabel, selectedItem });
+    range: function (range) {
+      this.updateSelect({ detail: { value: this.data.value, option: range } });
     },
   },
   lifetimes: {

package/components/wd-select/index.wxml

@@ -22,6 +22,9 @@
     <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}" readOnly="{{readOnly}}">
       <wd-input-wrap block="{{block}}" classRoot="{{classRoot}}" before="{{before}}" after="{{after}}" disabled="{{disabled}}" prefixType="{{prefixType}}" prefixIcon="{{prefixIcon}}" prefixSrc="{{prefixSrc}}" suffixType="{{_suffixType}}" suffixIcon="{{_suffixIcon}}" suffixSrc="{{suffixSrc}}" hasClearIcon="{{hasClearIcon}}" bind:onClear="handleClear" readOnly="{{readOnly}}">
         <old-select
+          multiple="{{false}}"
+          searchable="{{searchable}}"
+          filterable="{{filterable}}"
           supportManyRelated="{{supportManyRelated}}"
           queryCondition="{{queryCondition}}"
           sorter="{{sorter}}"
@@ -30,7 +33,7 @@
           label=""
           defaultValue="{{value}}"
           enumName="{{enumName}}"
-          format="{{format === 'many-one' ? 'father-son' : format}}"
+          format="{{format}}"
           placeholder="{{placeholder}}"
           primaryField="{{primaryField}}"
           range="{{range}}"
@@ -44,10 +47,11 @@
           version="wd"
           mode="selector"
           ignoreCase="{{ignoreCase}}"
-          staticSearchable="{{staticSearchable}}"
           bind:change="handleChange"
-          bind:changeOptions="changeOptions"
+          bind:updateSelect="updateSelect"
           bind:search="search"
+          bind:focus="handleEvent"
+          bind:blur="handleEvent"
         />
       </wd-input-wrap>
     </wd-input-group>