@cloudbase/weda-ui-mp 3.7.12 → 3.8.0

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

@@ -40,6 +40,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    selectedValue: {
+      type: Array,
+      value: [],
+    },
   },
   data: {
     height: '390px',
@@ -74,6 +78,7 @@ Component({
       const value = event.detail.value;
       this.setData({
         searchValue: value,
+        pageNo: 1,
       });
       this.triggerEvent('search', { value });
     },
@@ -82,6 +87,7 @@ Component({
       this.setData({
         searchValue: '',
         showOption: this.properties.option,
+        pageNo: 1,
       });
       this.triggerEvent('search', { value: '' });
     },
@@ -91,8 +97,10 @@ Component({
         height: '390px',
         focus: false,
         searchValue: '',
+        pageNo: 1,
         showOption: this.properties.option,
       });
+      this.triggerEvent('search', { value: '', noEvent: true });
     },
     closeModal: function () {
       const { option } = this.properties;
@@ -151,12 +159,11 @@ Component({
     // 滚动到底部
     bindscrolltolower: function () {
       if (this.properties.loadStatus === 0) {
-        const pgNum = this.data.pageNo;
-        this.setData({
-          pageNo: pgNum + 1,
-        });
+        const pageNo = this.data.pageNo + 1;
+        this.setData({ pageNo });
         this.triggerEvent('_childFetchData', {
-          pageNo: this.data.pageNo,
+          pageNo,
+          searchValue: this.data.searchValue,
         });
       }
     },
@@ -169,6 +176,7 @@ Component({
         });
         this.triggerEvent('_childFetchData', {
           pageNo: pageNo,
+          searchValue: this.data.searchValue,
         });
       }
     },
@@ -206,8 +214,17 @@ Component({
         });
       }
     },
-    option: function (option) {
-      const selectedCache = option.filter((item) => item.check);
+    selectedValue: function (selectedValue) {
+      const data = Array.isArray(selectedValue)
+        ? selectedValue
+        : [selectedValue];
+      const optionMap = this.properties.option.reduce((pre, cur) => {
+        pre[cur.value] = cur;
+        return pre;
+      }, {});
+      const selectedCache = data
+        .map((d) => optionMap[d])
+        .filter((item) => !!item);
       this.setData({ selectedCache });
     },
   },

package/components/form/selectMultiple/index.js

@@ -3,6 +3,8 @@ import { isNil } from '../../../utils/lodash';
 import { callDataSourceApi } from '../../../utils/tcb';
 import { arrayToMap } from '../../../utils/tool';
 import lodashGet from 'lodash.get';
+import deepEqual from '../../../utils/deepEqual';
+import { getWhereList } from '../../../utils/platform';
 
 // 判断值为空，展示placeholder
 export const isEmpty = (v) => {
@@ -95,6 +97,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    where: {
+      type: Array,
+      value: [],
+    },
   },
   data: {
     cls: '',
@@ -109,6 +115,9 @@ Component({
     searchOption: [],
     width: '100%',
     isEmpty: true,
+    preWhere: [], // 对比 where 监听
+    whereEffected: [], // 每次请求都加上
+    fetchTimed: null, // 防抖
   },
   lifetimes: {
     attached() {
@@ -181,19 +190,7 @@ Component({
       });
     },
     dataSourceName: function () {
-      const { format, dataSourceName, primaryField } = this.properties;
-      if (
-        (format === 'one-many' || format === 'many-many') &&
-        dataSourceName &&
-        primaryField
-      ) {
-        this.setData({
-          records: [],
-          option: [],
-          pageNo: 1,
-        });
-        this._fetchData(1);
-      }
+      this._initFetchData();
     },
     displayLabel: function (displayLabel) {
       this.setData({ isEmpty: isEmpty(displayLabel) });
@@ -201,6 +198,13 @@ Component({
     option: function (options) {
       this.triggerEvent('changeOptions', { value: { options } });
     },
+    where: function (where) {
+      if (deepEqual(where, this.data.preWhere)) return;
+      const whereEffected = [].concat(getWhereList(where));
+      this.setData({ preWhere: where, whereEffected }, () => {
+        this._initFetchData();
+      });
+    },
   },
   methods: {
     onClosePicker: function () {
@@ -243,28 +247,44 @@ Component({
     onChange(e) {
       this.triggerEvent('change', e.detail);
     },
+    // 初始化搜索数据，包括属性变化/搜索值变化
+    _initFetchData: function (_where = []) {
+      clearTimeout(this.data.fetchTimed);
+      // 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
+        ) {
+          this.setData({ records: [], option: [], pageNo: 1 });
+          this._fetchData(1, _where, true);
+        }
+      }, 300);
+    },
     // 获取数据列表：一对多，多对多
-    _fetchData: async function (pageNo) {
+    _fetchData: async function (_pageNo, _where = [], _init = false) {
       const { dataSourceName, primaryField } = this.properties;
       if (!dataSourceName) return;
 
-      const { records } = this.data;
-      let pageSize = 200;
-      let data = await callDataSourceApi({
+      const records = _init ? [] : this.data.records;
+      const pageSize = 200;
+      const res = await callDataSourceApi({
         dataSourceName: dataSourceName,
         methodName: 'wedaGetRecords',
         params: {
-          pageNo: pageNo,
-          pageSize: pageSize,
+          where: [{ $and: [...this.data.whereEffected, ..._where] }],
+          _pageNo,
+          pageSize,
         },
       });
-      const results = data?.records.map((item) => {
-        return {
-          ...item,
-          label: item[primaryField],
-          value: item._id,
-        };
-      });
+
+      const results = res?.records.map((item) => ({
+        ...item,
+        label: item[primaryField],
+        value: item._id,
+      }));
       if (this.data.records.length === 0 && results?.length === 0) {
         // 当异常的时候，主要为了不引起records的observer变化变化设置默认值
         this.setData({
@@ -300,8 +320,11 @@ Component({
       }
     },
     _childFetchData: function (e) {
-      const { pageNo } = e.detail;
-      this._fetchData(pageNo);
+      const { pageNo, searchValue } = e.detail;
+      const _where = searchValue
+        ? [{ [this.properties.primaryField]: { $search: searchValue } }]
+        : [];
+      this._fetchData(pageNo, _where);
     },
     getLabels: function (values, options) {
       let labels = values;
@@ -326,7 +349,18 @@ Component({
       return stringRange;
     },
     onSearch(event) {
-      this.triggerEvent('search', { value: event.detail.value });
+      const { noEvent, value: searchValue } = event.detail;
+
+      // 取消不触发搜索事件
+      if (!noEvent) {
+        this.triggerEvent('search', { value: searchValue });
+      }
+
+      // 接口搜索
+      const _where = searchValue
+        ? [{ [this.properties.primaryField]: { $search: searchValue } }]
+        : [];
+      this._initFetchData(_where);
     },
   },
 });

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

@@ -129,7 +129,8 @@ export default Behavior({
               const isPass = _rules.some((item) => {
                 if (!item.format && !item.pattern && !item.func) {
                   // console.log(item)
-                  throw new Error('验证规则必须配置 format/pattern');
+                  // throw new Error('验证规则必须配置 format/pattern');
+                  return true;
                 }
                 if (item.format) {
                   const typeFunc = validType[item.format];

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

@@ -435,6 +435,12 @@ export default Behavior({
         after,
       });
     },
+    // 点击前后缀文字/图标
+    inputAdornmentClick: function (e) {
+      this.triggerEvent('inputAdornmentClick', {
+        type: e.currentTarget.dataset.type,
+      });
+    },
   },
   observers: {
     'clearable,disabled,value': function (clearable, disabled, value) {

package/components/wd-input/index.wxml

@@ -54,4 +54,5 @@
   template="{{template}}"
   cursorSpacing="{{cursorSpacing}}"
   isConvert="{{isConvert}}"
+  bind:inputAdornmentClick="handleEvent"
 ></inner-input>

package/components/wd-input/inner-input/index.wxml

@@ -24,11 +24,11 @@
     after="{{after}}"
     readBeforeAfter="{{!isUnionValue}}"
   >
-    <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}">
+    <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}" bind:inputAdornmentClick="handleEvent">
       <view class="{{cls}} {{template === 'greySearchBox'?'wd-input-input-search template search-box color-grey is-pc-bordered is-h5-borderless':''}} {{template === 'whiteSearchBox'?'wd-input-input-search template search-box color-white is-pc-bordered is-h5-borderless':''}}">
         <!-- 前缀图标 -->
         <block wx:if="{{prefixType}}">
-          <view class="{{inputWrap}}__before">
+          <view class="{{inputWrap}}__before" data-type="prefix" bind:tap="inputAdornmentClick">
             <wd-icon name="{{prefixIcon}}" type="{{prefixType}}" src="{{prefixSrc}}" size="{{iconSize}}" className="{{root}}__icon-before"></wd-icon>
           </view>
         </block>
@@ -64,7 +64,7 @@
 
         <!-- 后缀图标 -->
         <block wx:if="{{!hasClearIcon && suffixType}}">
-          <view class="{{inputWrap}}__after">
+          <view class="{{inputWrap}}__after" data-type="suffix" bind:tap="inputAdornmentClick">
             <wd-icon name="{{suffixIcon}}" type="{{suffixType}}" src="{{suffixSrc}}" size="{{iconSize}}" className="{{root}}__icon-after"></wd-icon>
           </view>
         </block>

package/components/wd-input-email/index.wxml

@@ -44,6 +44,7 @@
   bind:clear="handleEvent"
   bind:confirm="handleEvent"
   bind:changeForm="changeForm"
+  bind:inputAdornmentClick="handleEvent"
   classRoot="{{classRoot}}"
   visible="{{visible}}"
   validateState="{{validateState}}"

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

@@ -54,4 +54,12 @@ Component({
       this.setData({ inputGroupCls, root });
     },
   },
+  methods: {
+    // 点击前后缀文字/图标
+    inputAdornmentClick: function (e) {
+      this.triggerEvent('inputAdornmentClick', {
+        type: e.currentTarget.dataset.type,
+      });
+    },
+  },
 });

package/components/wd-input-group/index.wxml

@@ -1,13 +1,13 @@
 <block wx:if="{{!readOnly && (!!before || !!after)}}">
   <view class="{{inputGroupCls}}">
     <block wx:if="{{before}}">
-      <view class="{{inputGroup}}__addon {{inputGroup}}__addon-left {{root}}__text-before">{{before}}</view>
+      <view class="{{inputGroup}}__addon {{inputGroup}}__addon-left {{root}}__text-before" data-type="beforeText" bind:tap="inputAdornmentClick">{{before}}</view>
     </block>
     <view class="{{inputGroup}}__content">
       <slot></slot>
     </view>
     <block wx:if="{{after}}">
-      <view class="{{inputGroup}}__addon {{inputGroup}}__addon-right {{root}}__text-after">{{after}}</view>
+      <view class="{{inputGroup}}__addon {{inputGroup}}__addon-right {{root}}__text-after" data-type="afterText" bind:tap="inputAdornmentClick">{{after}}</view>
     </block>
   </view>
 </block>

package/components/wd-input-phone/index.wxml

@@ -44,6 +44,7 @@
   bind:clear="handleEvent"
   bind:confirm="handleEvent"
   bind:changeForm="changeForm"
+  bind:inputAdornmentClick="handleEvent"
   classRoot="{{classRoot}}"
   visible="{{visible}}"
   validateState="{{validateState}}"

package/components/wd-input-url/index.wxml

@@ -43,6 +43,7 @@
   bind:change="handleEvent"
   bind:clear="handleEvent"
   bind:confirm="handleEvent"
+  bind:inputAdornmentClick="handleEvent"
   bind:changeForm="changeForm"
   classRoot="{{classRoot}}"
   visible="{{visible}}"

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

@@ -22,7 +22,6 @@
     <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
-          name="{{name}}"
           labelVisible="{{false}}"
           label=""
           readOnly="{{readOnly}}"
@@ -36,6 +35,7 @@
           size="full"
           tipBlock="{{tipBlock}}"
           viewId="{{viewId}}"
+          where="{{where}}"
           dataSourceName="{{dataSourceName}}"
           mode="selector"
           version="wd"

package/package.json

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

package/utils/enum.js

@@ -978,6 +978,8 @@ export const WD_SELECT_FORMAT = [
   { label: 'related', value: 'related' },
   { label: 'x-enum', value: 'x-enum' },
   { label: 'many-one', value: 'many-one' },
+  { label: 'one-one', value: 'one-one' },
+  { label: 'one-one-r', value: 'one-one-r' },
 ];
 
 // 地区选择
@@ -1252,6 +1254,8 @@ export const WD_CODE_EDITOR_LANGUAGE = [
   { label: 'MongoDB', value: 'mongodb' },
   { label: 'SQL', value: 'sql' },
   { label: 'MySQL', value: 'mysql' },
+  { label: 'JSON', value: 'json' },
+  { label: 'Markdown', value: 'markdown' },
 ];
 
 export const WD_CODE_EDITOR_THEME = [