@cloudbase/weda-ui-mp 3.15.8 → 3.17.0

package/components/chart/ec-canvas/ec-canvas.js

@@ -1,33 +1,9 @@
 import WxCanvas from './wx-canvas';
 import * as echarts from '../common/lib/echarts.min';
+import { compareVersion } from '../../../utils/platform';
 
 let ctx;
 
-function 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;
-}
-
 Component({
   properties: {
     canvasId: {

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/uploaderFile/index.js

@@ -1,7 +1,6 @@
-import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../../utils/tcb';
-import { transSize, randomStr } from '../../../utils/platform';
+import { getTempFileURL } from '../../../utils/tcb';
 import equal from '../../../utils/deepEqual';
-
+import { upload, handleUpload, getName, initUploadInstance } from './upload';
 Component({
   options: {
     virtualHost: true,
@@ -97,214 +96,9 @@ Component({
       { text: '拍照或录像', value: 2 },
       { text: '选取聊天文件', value: 3 },
     ],
+    uploadInstance: {},
   },
   methods: {
-    // 批量上传文件前置事件
-    handleBefore: function (files = []) {
-      if (this.data.files.length + files.length > this.data.maxCount) {
-        wx.showToast({
-          title: `上传文件总数不能超过${this.data.maxCount}个`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      if (this.properties.maxSize && files.some((f) => f.size > this.properties.maxSize * 1024 * 1024)) {
-        wx.showToast({
-          title: `上传文件大小不能超过${this.properties.maxSize}M`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      if (files.some((f) => f.size > 500 * 1024 * 1024)) {
-        wx.showToast({
-          title: `上传文件大小不能超过500M`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      return true;
-    },
-    //上传文件过程
-    uploadFile: async function () {
-      //文件上传的函数，
-      wx.chooseMessageFile({
-        count: this.data.maxCount,
-        type: 'all',
-        success: async (files) => {
-          await this.handleUpload(files?.tempFiles);
-        },
-        fail(e) {
-          this.triggerEvent('error', e.detail);
-        },
-      });
-    },
-    //拍摄或从手机相册中选择图片或视频
-    chooseMedia: async function (value) {
-      wx.chooseMedia({
-        count: this.data.maxCount,
-        sourceType: value === 1 ? ['album'] : ['camera'],
-        maxDuration: 60,
-        success: async (files) => {
-          await this.handleUpload(files?.tempFiles);
-        },
-        fail(e) {
-          this.triggerEvent('error', e.detail);
-        },
-      });
-    },
-    getName: function (hf) {
-      const uuidReg = /[0-9a-f]{8}([0-9a-f]{4}){3}[0-9a-f]{12}-/;
-      const lastIndex = String(hf).lastIndexOf('/');
-      const name = String(hf).slice(lastIndex + 1);
-      const label = name.replace(uuidReg, '');
-      return label;
-    },
-    handleUpload: async function (files, reload = false) {
-      var _this = this;
-      if (!this.handleBefore(files)) return;
-
-      const callbacks = this.data.callbacks;
-      let shouldUploadToCos = true;
-      if (typeof callbacks?.beforeUpload === 'function') {
-        try {
-          const mgr = wx.getFileSystemManager();
-          const ret = await callbacks.beforeUpload({
-            tempFilePaths: files.map((f) => f.path || f.tempFilePath),
-            base64Uri: files.map((f) => {
-              const content = mgr.readFileSync(f.path || f.tempFilePath);
-              return `data:;base64,${wx.arrayBufferToBase64(content)}`;
-            }),
-          });
-          if (typeof ret === 'boolean') {
-            shouldUploadToCos = ret;
-          } else if (Array.Array(ret) && ret.every((i) => typeof i === 'string')) {
-            files = ret.map((path, idx) => {
-              files[idx].path = path;
-            });
-          }
-        } catch (err) {
-          console.error('上传前处理函数抛错', err);
-          shouldUploadToCos = false;
-        }
-      }
-      if (shouldUploadToCos === false) {
-        return false;
-      }
-
-      const initFiles = files.map((i) => ({
-        ...i,
-        percent: '0',
-        cloudPath: null,
-        name: i?.name || this.getName(i?.tempFilePath),
-        filePath: i?.path || i?.tempFilePath || null,
-        size: transSize(i?.size),
-        status: 'pending',
-      }));
-      let filelsList = reload ? this.data.files : [...this.data.files, ...initFiles];
-      this.setData({
-        files: filelsList,
-      });
-      Promise.all(
-        initFiles.map(async (tempFile) => {
-          return new Promise(function (resolve) {
-            _this.handleUploadFile({
-              _tempFile: tempFile,
-              onSuccess: (res) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.triggerEvent('success', {
-                  value: res.cloudPath,
-                  file: res,
-                });
-                resolve(res);
-              },
-              onProgressUpdate: (res) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.setData({
-                  files: filelsList,
-                });
-              },
-              onFail: (res, error) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.triggerEvent('error', error.detail);
-                resolve(res);
-              },
-            });
-          });
-        }),
-      ).then((res) => {
-        const result = filelsList.map((i) => res.find((j) => j.filePath === i.filePath) || i);
-        const cloudPathList = result.filter((i) => i.cloudPath).map((j) => j.cloudPath);
-        this.setData({
-          files: result,
-          urls: cloudPathList,
-          cloudFile: cloudPathList,
-        });
-        _this.handleChange(cloudPathList);
-      });
-    },
-    handleUploadFile: async function ({ _tempFile, onSuccess, onProgressUpdate, onFail }) {
-      const tempFile = {
-        ..._tempFile,
-      };
-      const uploadPath = 'weda-uploader';
-      const _uploadPath = await getDefaultUploadPath(uploadPath);
-      const filenameRegex = /[^a-zA-Z0-9\u4e00-\u9fff-*!_.]/g;
-      const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name?.replace(filenameRegex, '-')}`;
-      try {
-        const tcb = await getCloudInstance();
-        const uploadTask = await tcb.uploadFile({
-          cloudPath: cloudPath,
-          filePath: tempFile.path || tempFile.tempFilePath,
-          success(res) {
-            tempFile.cloudPath = res.fileID;
-            tempFile.percent = 100;
-            tempFile.status = 'success';
-            if (onSuccess) {
-              onSuccess(tempFile);
-            }
-          },
-          fail(e) {
-            tempFile.status = 'fail';
-            wx.showModal({
-              title: '上传失败，请重试',
-              content: e.message,
-              showCancel: false,
-            });
-            onFail(tempFile, {
-              detail: e,
-            });
-          },
-        });
-        if (typeof uploadTask.onProgressUpdate === 'function') {
-          uploadTask.onProgressUpdate((res) => {
-            tempFile.percent = String(res.progress);
-            tempFile.status = res.progress == 100 ? 'success' : 'uploading';
-            tempFile.uploaded = transSize(res.totalBytesSent);
-            if (onProgressUpdate) {
-              onProgressUpdate(tempFile);
-            }
-          });
-        } else {
-          tempFile.percent = '100';
-          tempFile.status = 'success';
-          tempFile.cloudPath = uploadTask.fileID;
-          onSuccess(tempFile);
-        }
-      } catch (e) {
-        tempFile.status = 'fail';
-        wx.showModal({
-          title: '上传失败，请重试',
-          content: e.message,
-          showCancel: false,
-        });
-        if (onFail) {
-          onFail(tempFile, e);
-        }
-      }
-    },
     onDelete: function (e) {
       let newUrls = [];
       if (this.data.urls.length == 0) {
@@ -332,17 +126,14 @@ Component({
     },
 
     // change 事件
-    handleChange: function (values) {
-      let value = values;
-      if (this.properties.single) {
-        value = values[0] ?? '';
-      }
+    handleChange: function (value) {
       this.setData({ oldValue: value });
       this.triggerEvent('change', { value });
     },
 
     reload: function (e) {
-      this.handleUpload([e.target.dataset.item], true);
+      const { uploadInstance } = this.data;
+      handleUpload([e.target.dataset.item], uploadInstance, true);
     },
     downloadFile: async function (e) {
       const path = e.target.dataset.item?.cloudPath;
@@ -397,19 +188,31 @@ Component({
       this.setData({
         showActionsheet: false,
       });
+      const { disabled, maxCount, files, maxSize } = this.data;
+      let config = { disabled, count: maxCount, maxSize, action: 'CHOOSE_MEDIA' };
+
       switch (e?.detail?.value) {
         // 照片图库
         case 1:
-        // 拍照或录像
-        // eslint-disable-next-line no-fallthrough
+          // 拍照或录像
+          //从手机相册中选择图片或视频
+          config.sourceType = ['album'];
+          break;
         case 2:
-          this.chooseMedia(e?.detail?.value);
+          // 拍摄
+          config.sourceType = ['camera'];
           break;
         // 选取聊天文件
         case 3:
-          this.uploadFile();
+          config.type = 'all';
+          config.action = 'CHOOSE_MESSAGE_FILE';
+          break;
+        default:
           break;
       }
+      const uploadInstance = initUploadInstance({ config, previewFile: files }, this);
+      this.setData({ uploadInstance });
+      upload(uploadInstance);
     },
   },
   observers: {
@@ -430,7 +233,7 @@ Component({
         for (let f of values) {
           if (f.startsWith('cloud:')) {
             const hf = await getTempFileURL(f);
-            const label = this.getName(hf);
+            const label = getName(hf);
             const httpFile = {
               name: label,
               cloudPath: f,