@cloudbase/weda-ui-mp 3.15.8 → 3.17.0

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

@@ -1,25 +1,25 @@
  <wd-form-item-read-only version="{{version}}" readOnly="{{readOnly}}" readValue="{{displayValue}}">
       <view class="wd-select">
-          <view class="wd-select-input-group"  bindchange="onChange" bindtap="onSelectPicker" data-show="true">
+          <view class="wd-select-input-group"  bindchange="onChange" bindtap="onOpenPicker" data-show="true">
             <label class="wd-select-input {{displayValue ? '' : 'weui-input__placeholder'}}">{{displayValue || placeholder}}</label>
           </view>
           <block wx:if="{{allPickerShow}}">
             <dropdownSelect
-              ignoreCase="{{ignoreCase}}"
-              staticSearchable="{{staticSearchable}}"
-              class="weui-picker__group weui-input"
-              bindchange="onChange"
-              bind:_childFetchData="_childFetchData"
-              bind:onSelectPicker="onSelectPicker"
-              option="{{option}}"
-              loadStatus="{{loadStatus}}"
-              searchOption="{{searchOption}}"
-              searchStatus="{{searchStatus}}"
-              chooseIndexValue="{{chooseIndexValue}}"
-              isTurnPages="{{isTurnPages}}"
-              pageNo="{{pageNo}}"
-              _needFetch="{{formatNeedFetch}}"
-              bind:search="onSearch"
+            multiple="{{multiple}}"
+            searchable="{{searchable}}"
+            filterable="{{_filterable}}"
+            currentPageNo="{{currentPageNo}}"
+            class="weui-picker__group weui-input"
+            bindchange="onChange"
+            bind:_childFetchData="_childFetchData"
+            bind:onSelectPicker="onSelectPicker"
+            bind:onClosePicker="onClosePicker"
+            option="{{option}}"
+            loadStatus="{{loadStatus}}"
+            searchStatus="{{searchStatus}}"
+            selectedValue="{{value}}"
+            ignoreCase="{{ignoreCase}}"
+            bind:search="onSearch"
             />
            </block>
     </view>

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

@@ -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,
@@ -55,6 +62,12 @@ Component({
     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, true);
+      this.setData({ selectedLabel, selectedItem });
+    },
   },
   observers: {
     'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem':
@@ -65,13 +78,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, true);
-      this.setData({ selectedLabel, selectedItem });
+    range: function (range) {
+      this.updateSelect({ detail: { value: this.data.value, option: range } });
     },
   },
   lifetimes: {

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

@@ -5,6 +5,6 @@
     "wd-form-item": "../wd-form-item/index",
     "wd-input-group": "../wd-input-group/index",
     "wd-input-wrap": "../wd-input-wrap/index",
-    "old-select": "../form/selectMultiple"
+    "old-select": "../wd-select/select/index"
   }
 }

package/components/wd-select-multiple/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="{{true}}"
+          searchable="{{searchable}}"
+          filterable="{{filterable}}"
           supportManyRelated="{{supportManyRelated}}"
           queryCondition="{{queryCondition}}"
           sorter="{{sorter}}"
@@ -43,11 +46,12 @@
           mode="selector"
           version="wd"
           ignoreCase="{{ignoreCase}}"
-          staticSearchable="{{staticSearchable}}"
           bind:change="handleChange"
-          bind:changeOptions="changeOptions"
+          bind:updateSelect="updateSelect"
           bind:changeLabel="changeLabel"
           bind:search="search"
+          bind:focus="handleEvent"
+          bind:blur="handleEvent"
         />
       </wd-input-wrap>
     </wd-input-group>

package/components/wd-upload-image/index.js

@@ -3,6 +3,7 @@ import formFieldBehavior from '../form-field-behavior/form-field-behavior';
 import itemBehavior from '../form-field-behavior/item-behavior';
 import isEqual from '../../utils/deepEqual';
 import { convertSingleValue } from '../../utils/platform';
+import { upload } from '../form/uploaderFile/upload';
 
 Component({
   options: {
@@ -39,6 +40,15 @@ Component({
       type: Object,
       value: null,
     },
+    template: {
+      type: String,
+      value: 'normal',
+    },
+  },
+  data: {
+    files: [],
+    uploadInstance: {},
+    config: { count: 9, maxDuration: 60 },
   },
   methods: {
     initValue: function () {
@@ -48,17 +58,151 @@ Component({
         this.setData({ value: v });
       }
     },
+    mapPreviewFile: function (files) {
+      return files.map((i) => ({
+        ...i,
+        progress: i.percent,
+        loading: i.status !== 'success',
+        cloudId: i.cloudId || i.cloudPath,
+        tempUrl: i.tempFilePath,
+      }));
+    },
+    initUploadInstance: function ({ action, config }) {
+      const { files } = this.data;
+      const _this = this;
+      let uploadInstance = {
+        action,
+        config: { ...config },
+        previewFile: files,
+        updatePreviewFile(files) {
+          _this.setData({ files: _this.mapPreviewFile(files) });
+        },
+        getPreviewFile() {
+          const { files } = _this.data;
+          return files;
+        },
+        onComplete(result) {
+          const files = _this.mapPreviewFile(result);
+          _this.setData({
+            files,
+          });
+          const cloudPathList = files.map((i) => i.cloudId).filter((j) => !!j);
+          let _value = cloudPathList;
+          if (_this.data.single) {
+            _value = cloudPathList[0] ?? '';
+          }
+          _this.handleChange({ detail: { value: _value } });
+        },
+        onSuccess(res) {
+          _this.triggerEvent('success', {
+            value: res.cloudPath,
+            file: res,
+          });
+        },
+        onFail(e) {
+          _this.triggerEvent('error', e);
+        },
+        beforeUpload: _this.data.callbacks?.beforeUpload,
+      };
+
+      return uploadInstance;
+    },
+    setConfig: function (_config) {
+      const { single, maxUploadCount, config } = this.data;
+      const _maxUploadCount = _config.maxUploadCount ?? maxUploadCount;
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+      const maxCount = single ? 1 : _maxUploadCount;
+      const res = { ...config, count: maxCount, ..._config };
+      this.setData({ config: res });
+    },
+    deleteHandle: function ({ cloudId }) {
+      const { files, single } = this.data;
+      const fileList = files.filter((d) => d.cloudId !== cloudId);
+      this.setData({ files: fileList });
+
+      let value = fileList.map((i) => i?.cloudId).filter((j) => !!j);
+
+      value = single ? value[0] || '' : value;
+
+      this.handleChange({ detail: { value: value } });
+    },
+    setConfigHandle: function ({ config }) {
+      this.setConfig(config);
+    },
+    init: function () {
+      const { config } = this.data;
+      const uploadInstance = this.initUploadInstance({ action: 'CHOOSE_MEDIA', config });
+      this.setData({ uploadInstance });
+
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
+          upload: (_uploadInstance = uploadInstance) => {
+            upload(_uploadInstance);
+          },
+          delete: this.deleteHandle.bind(this),
+          uploadInstance,
+          setConfig: this.setConfigHandle.bind(this),
+        });
+    },
+    updatePreviewFile: function () {
+      const { files } = this.data;
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
+          previewFile: files,
+        });
+    },
   },
   observers: {
-    'name, value, label, required, visible, disabled, readOnly, sourceType':
-      function () {
-        this.updateWidgetAPI();
-      },
+    'name, value, label, required, visible, disabled, readOnly, sourceType': function () {
+      this.updateWidgetAPI();
+    },
+    'disabled,sourceType,maxUploadCount,sizeType,single': function (disabled, sourceType, maxUploadCount, sizeType) {
+      const config = {
+        disabled,
+        sourceType,
+        maxUploadCount,
+        sizeType,
+      };
+      this.setConfig(config);
+    },
+    config: function () {
+      this.init();
+    },
+    files: function () {
+      this.updatePreviewFile();
+    },
+    value: function (value) {
+      const _value = [].concat(value).filter((d) => typeof d === 'string' && d !== '');
+
+      const previewFileMap = this.data.files.reduce((acc, obj) => {
+        acc[obj?.cloudId] = obj; // 使用 cloudId 作为新对象的 key
+        return acc;
+      }, {});
+      if (_value.some((i) => !previewFileMap[i])) {
+        const previewFile = _value?.length
+          ? _value.map((i) => ({
+              progress: 100,
+              loading: false,
+              cloudId: i,
+              tempUrl: '',
+            }))
+          : [];
+        this.setData({ files: previewFile });
+      }
+    },
   },
   lifetimes: {
     attached: function () {
       this.initValue();
+      const { disabled, sourceType, sizeType } = this.data;
+      this.setConfig({ disabled, maxDuration: 60, sourceType, sizeType });
+
       this.updateWidgetAPI();
     },
+    ready: function () {
+      this.triggerEvent('onReady', {
+        uploadInstance: this.data.uploadInstance,
+      });
+    },
   },
 });

package/components/wd-upload-image/index.wxml

@@ -19,6 +19,10 @@
     size="{{size}}"
     borderedH5="{{borderedH5}}"
   >
+  <block wx:if="{{template==='custom'}}">
+  <slot></slot>
+  </block>
+  <block wx:else>
     <old-image-uploader
       labelVisible="{{false}}"
       acceptTypes="{{acceptTypes}}"
@@ -41,5 +45,6 @@
       bind:success="handleEvent"
       bind:error="handleEvent"
     />
+</block>
   </wd-form-item>
 </block>

package/package.json

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

package/utils/platform.js

@@ -58,11 +58,7 @@ export const getWhereList = (where) => {
             }
             let [rel, val] = [REL_DICT[item2?.rel] || item2?.rel, item2?.value];
             // 去掉空字符串、undefined(接口不支持)、对象类型(接口不支持)
-            if (
-              val === '' ||
-              val === undefined ||
-              Object.prototype.toString.call(val) === '[object Object]'
-            ) {
+            if (val === '' || val === undefined || Object.prototype.toString.call(val) === '[object Object]') {
               return;
             }
             if ('_begin_with' === rel) {
@@ -115,9 +111,7 @@ export const randomStr = (len = 32) => {
  * 转换枚举值
  */
 export const convertLegacyEnum = (prop, enumObj, defaultValue) => {
-  const enumValue = enumObj.map((i) => i.value).includes(prop)
-    ? prop
-    : enumObj[0].value;
+  const enumValue = enumObj.map((i) => i.value).includes(prop) ? prop : enumObj[0].value;
   if (defaultValue !== undefined) return enumValue || defaultValue;
   return enumValue;
 };
@@ -160,3 +154,28 @@ export const convertSingleValue = (value, single) => {
   }
   return v;
 };
+
+export const compareVersion = (v1, v2) => {
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  const len = Math.max(v1.length, v2.length);
+
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i]);
+    const num2 = parseInt(v2[i]);
+
+    if (num1 > num2) {
+      return 1;
+    } else if (num1 < num2) {
+      return -1;
+    }
+  }
+  return 0;
+};