@cloudbase/weda-ui-mp 3.12.1 → 3.12.3

package/components/form/uploaderFile/index.js

@@ -1,5 +1,6 @@
 import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
 import { transSize, randomStr } from '../../../utils/platform';
+import equal from '../../../utils/deepEqual';
 
 Component({
   options: {
@@ -24,6 +25,9 @@ Component({
     defaultValue: {
       type: null,
     },
+    oldValue: {
+      type: null,
+    },
     maxUploadCount: {
       type: Number,
       value: 9,
@@ -105,10 +109,7 @@ Component({
         });
         return false;
       }
-      if (
-        this.properties.maxSize &&
-        files.some((f) => f.size > this.properties.maxSize * 1024 * 1024)
-      ) {
+      if (this.properties.maxSize && files.some((f) => f.size > this.properties.maxSize * 1024 * 1024)) {
         wx.showToast({
           title: `上传文件大小不能超过${this.properties.maxSize}M`,
           icon: 'none',
@@ -154,6 +155,13 @@ Component({
         },
       });
     },
+    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;
@@ -172,10 +180,7 @@ Component({
           });
           if (typeof ret === 'boolean') {
             shouldUploadToCos = ret;
-          } else if (
-            Array.Array(ret) &&
-            ret.every((i) => typeof i === 'string')
-          ) {
+          } else if (Array.Array(ret) && ret.every((i) => typeof i === 'string')) {
             files = ret.map((path, idx) => {
               files[idx].path = path;
             });
@@ -193,14 +198,12 @@ Component({
         ...i,
         percent: '0',
         cloudPath: null,
-        name: i?.name || i?.tempFilePath.slice(9),
+        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];
+      let filelsList = reload ? this.data.files : [...this.data.files, ...initFiles];
       this.setData({
         files: filelsList,
       });
@@ -210,9 +213,7 @@ Component({
             _this.handleUploadFile({
               _tempFile: tempFile,
               onSuccess: (res) => {
-                filelsList = filelsList.map((i) =>
-                  i.filePath === res.filePath ? res : i
-                );
+                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
                 _this.triggerEvent('success', {
                   value: res.cloudPath,
                   file: res,
@@ -220,30 +221,22 @@ Component({
                 resolve(res);
               },
               onProgressUpdate: (res) => {
-                filelsList = filelsList.map((i) =>
-                  i.filePath === res.filePath ? res : i
-                );
+                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
-                );
+                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);
+        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,
@@ -252,12 +245,7 @@ Component({
         _this.handleChange(cloudPathList);
       });
     },
-    handleUploadFile: async function ({
-      _tempFile,
-      onSuccess,
-      onProgressUpdate,
-      onFail,
-    }) {
+    handleUploadFile: async function ({ _tempFile, onSuccess, onProgressUpdate, onFail }) {
       const tempFile = {
         ..._tempFile,
       };
@@ -324,20 +312,15 @@ Component({
           }
         });
         this.setData({
-          files: this.data.files.filter(
-            (v) => e.target.dataset.item.cloudPath !== v.cloudPath
-          ),
+          files: this.data.files.filter((v) => e.target.dataset.item.cloudPath !== v.cloudPath),
           urls: newUrls,
         });
       } else {
         const filelist = this.data.files.filter(
           (item) =>
-            e.target.dataset.item?.path != item?.path ||
-            e.target.dataset.item?.tempFilePath != item?.tempFilePath
-        );
-        newUrls = this.data.urls.filter(
-          (v) => e.target.dataset.item?.cloudPath != v
+            e.target.dataset.item?.path != item?.path || e.target.dataset.item?.tempFilePath != item?.tempFilePath,
         );
+        newUrls = this.data.urls.filter((v) => e.target.dataset.item?.cloudPath != v);
         this.setData({
           files: filelist,
           urls: newUrls,
@@ -352,6 +335,7 @@ Component({
       if (this.properties.single) {
         value = values[0] ?? '';
       }
+      this.setData({ oldValue: value });
       this.triggerEvent('change', { value });
     },
 
@@ -428,6 +412,9 @@ Component({
   },
   observers: {
     defaultValue: async function (value) {
+      if (equal(this.data.oldValue, value)) {
+        return;
+      }
       //当单图片上传且默认值为空数组时，初次渲染更新value，以避免空串提交类型不匹配问题
       if (Array.isArray(value) && !this.data.singleFlag) {
         this.setData({
@@ -441,10 +428,7 @@ Component({
         for (let f of values) {
           if (f.startsWith('cloud:')) {
             const hf = await getTempFileURL(f);
-            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, '');
+            const label = this.getName(hf);
             const httpFile = {
               name: label,
               cloudPath: f,
@@ -455,19 +439,14 @@ Component({
             httpFiles.push(httpFile);
           }
         }
-        const files = this.data.files;
-        // 文件上传成功也会触发defaultValue变化，此情况不执行初始化文件列表
-        if (!files?.length) {
-          this.setData({
-            files: httpFiles,
-            cloudFile:
-              JSON.stringify(value) != JSON.stringify(this.data.cloudFile)
-                ? [].concat(value)
-                : [],
-          });
-        }
+        this.setData({
+          oldValue: value,
+          files: httpFiles,
+          cloudFile: JSON.stringify(value) != JSON.stringify(this.data.cloudFile) ? [].concat(value) : [],
+        });
       } else {
         this.setData({
+          oldValue: value,
           files: [],
           cloudFile: [],
         });
@@ -481,8 +460,7 @@ Component({
     },
     'layout,extClass': function (layout, extClass) {
       const temp = `weda-formcells weui-cells weui-cells_forms ${extClass}`;
-      const layoutCls =
-        layout !== 'vertical' ? ` weui-flex ${temp}` : `${temp}`;
+      const layoutCls = layout !== 'vertical' ? ` weui-flex ${temp}` : `${temp}`;
       this.setData({ layoutCls });
     },
   },

package/components/form/uploaderFile/index.wxss

@@ -31,7 +31,7 @@
 /* theme */
 .weda-uploader-files__btn {
   margin: 0;
-  width: 88px;
+  width: auto;
   height: 32px;
   padding: 0;
   display: flex;
@@ -132,27 +132,19 @@
 }
 
 /* 标准化样式适配 start */
-.wd-form-item.wd-mp-upload-file-root
-  .weda-uploader-files
-  .weda-uploader-files__btn-contain {
+.wd-form-item.wd-mp-upload-file-root .weda-uploader-files .weda-uploader-files__btn-contain {
   padding: 0;
 }
 
-.wd-form-item.wd-mp-upload-file-root
-  .weda-uploader-files
-  .weda-uploader-files__file-status {
+.wd-form-item.wd-mp-upload-file-root .weda-uploader-files .weda-uploader-files__file-status {
   width: auto;
 }
 
-.wd-form-item.wd-mp-upload-file-root
-  .weda-uploader-files
-  .weda-uploader-files__file-foot {
+.wd-form-item.wd-mp-upload-file-root .weda-uploader-files .weda-uploader-files__file-foot {
   margin: 0;
 }
 
-.wd-form-item.wd-mp-upload-file-root
-  .weda-uploader-files
-  .weda-uploader-files__item {
+.wd-form-item.wd-mp-upload-file-root .weda-uploader-files .weda-uploader-files__item {
   padding: 0;
 }
 

package/components/listView/index.js

@@ -179,14 +179,7 @@ Component({
   methods: {
     // 数据列表设置表达式: 区分前后端分页
     setExpression: function () {
-      const {
-        dataSourceData,
-        enableTotal,
-        total: _total,
-        isRecords,
-        pageSize,
-        pagination,
-      } = this.properties;
+      const { dataSourceData, enableTotal, total: _total, isRecords, pageSize, pagination } = this.properties;
       const { pageNo } = this.data;
       let records = [];
       let total = 0;
@@ -207,7 +200,7 @@ Component({
       const pageStr = this.getPageStr(total, pageNo, pageSize);
       this.data.delayRef.current.initExpr = true;
       this.setData({ records, listTotal: total, pageStr }, () =>
-        this.onSuccessCb({ records, total, isTriggerEmpty: isRecords })
+        this.onSuccessCb({ records, total, isTriggerEmpty: isRecords }),
       );
     },
     // 更新参数
@@ -246,13 +239,8 @@ Component({
       });
       if (dataSourceType === 'expression') {
         this.setData({ _status: 'loading' });
-        this.data.delayRef.current.exprTimer = setTimeout(
-          () => this.setData({ _status: '' }),
-          3000
-        );
-        !enableTotal &&
-          this.data.delayRef.current.initExpr &&
-          this.setExpression();
+        this.data.delayRef.current.exprTimer = setTimeout(() => this.setData({ _status: '' }), 3000);
+        !enableTotal && this.data.delayRef.current.initExpr && this.setExpression();
         return;
       }
 
@@ -266,10 +254,7 @@ Component({
       if (isModel) {
         dataSourceName = datasource?.name;
         extra = datasource?.extra;
-        methodName =
-          typeof extra?.methodName === 'string'
-            ? extra?.methodName
-            : 'wedaGetRecords';
+        methodName = typeof extra?.methodName === 'string' ? extra?.methodName : 'wedaGetRecords';
         eventDataSource = datasource;
         const modelParams = await getModelParams({
           ...this.properties,
@@ -289,10 +274,7 @@ Component({
         return;
       }
       // select为空时，不触发请求
-      if (
-        methodName === 'wedaGetRecordsV2' &&
-        !Object.keys(tcbParams?.select)?.length
-      ) {
+      if (methodName === 'wedaGetRecordsV2' && !Object.keys(tcbParams?.select)?.length) {
         console.warn(`当前请求缺少必要参数 select`);
         return;
       }
@@ -308,7 +290,7 @@ Component({
               params: tcbParams,
               swr: { forceClear },
             },
-            this.data.records.length
+            this.data.records.length,
           );
         } else {
           data = await callDataSource(
@@ -321,7 +303,7 @@ Component({
               }),
               swr: { forceClear },
             },
-            true
+            true,
           );
         }
         if (fetchVersion !== this.data.delayRef.current.version) return;
@@ -346,7 +328,7 @@ Component({
               total: listTotal,
               isTriggerEmpty: !isDataViewApis,
               datasource: eventDataSource,
-            })
+            }),
         );
       } catch (e) {
         const obj = this.onFailCb(e);
@@ -393,10 +375,7 @@ Component({
 
     // 下一页
     handleNext: function () {
-      if (
-        this.data.status === 'loading' ||
-        !(this.properties.pageSize * this.data.pageNo < this.data.listTotal)
-      ) {
+      if (this.data.status === 'loading' || !(this.properties.pageSize * this.data.pageNo < this.data.listTotal)) {
         return;
       }
       this.fetchData({ pageNo: this.data.pageNo + 1 });
@@ -413,9 +392,7 @@ Component({
     // 加载成功(包含为空)事件
     onSuccessCb: function ({ records, total, isTriggerEmpty, datasource }) {
       const beforeDataChange = this.properties.beforeDataChange || ((v) => v);
-      const isDelay = ['loadMoreButton', 'bottomLoad'].includes(
-        this.properties.pagination
-      );
+      const isDelay = ['loadMoreButton', 'bottomLoad'].includes(this.properties.pagination);
       this.triggerEvent('onDataChange', {
         data: beforeDataChange(records),
         state: this.getContextState(),
@@ -452,10 +429,7 @@ Component({
     onFailCb: function (e) {
       this.setData({ _status: 'fail' });
       const code =
-        e?.code ||
-        (this.properties.refType === 'dataView'
-          ? 'WdDataView.QueryError'
-          : 'WdListView.QueryError');
+        e?.code || (this.properties.refType === 'dataView' ? 'WdDataView.QueryError' : 'WdListView.QueryError');
       const obj = {
         code,
         message: `${e?.message}`,
@@ -479,11 +453,9 @@ Component({
     _observerSign: function () {
       setTimeout(() => {
         this.signObserver = this.createIntersectionObserver();
-        this.signObserver
-          .relativeToViewport()
-          .observe('#weda-list-view_sign', (res) => {
-            this.setData({ isVisiableSign: res?.intersectionRatio > 0 });
-          });
+        this.signObserver.relativeToViewport().observe('#weda-list-view_sign', (res) => {
+          this.setData({ isVisiableSign: res?.intersectionRatio > 0 });
+        });
       }, 500);
     },
 
@@ -509,16 +481,13 @@ Component({
         const { pageNo, listTotal } = this.data;
         const { pageSize } = this.properties;
         if (this.properties.pagination === 'pagination') {
-          const pageNoRaw =
-            (pageNo - 1) * pageSize + 1 === listTotal ? pageNo - 1 : pageNo;
+          const pageNoRaw = (pageNo - 1) * pageSize + 1 === listTotal ? pageNo - 1 : pageNo;
           await this.fetchData({
             pageNo: pageNoRaw,
             records: [],
             forceClear: true,
           });
-        } else if (
-          ['loadMoreButton', 'bottomLoad'].includes(this.properties.pagination)
-        ) {
+        } else if (['loadMoreButton', 'bottomLoad'].includes(this.properties.pagination)) {
           await this.fetchData({
             records: [],
             isFetchCurrent: true,
@@ -562,29 +531,15 @@ Component({
     methodDeleteOne: async function (params) {
       try {
         if (!this.data.isModel) {
-          throw new WdCompError(
-            `${LISTVIEW_MESSAGE.methods_no_support}` || '',
-            {
-              code: `${
-                this.properties.refType === 'dataView'
-                  ? 'WdDataView'
-                  : 'WdListView'
-              }.ActionNotSupport`,
-            }
-          );
+          throw new WdCompError(`${LISTVIEW_MESSAGE.methods_no_support}` || '', {
+            code: `${this.properties.refType === 'dataView' ? 'WdDataView' : 'WdListView'}.ActionNotSupport`,
+          });
         }
         const _id = params?._id;
         if (!_id || typeof _id !== 'string') {
-          throw new WdCompError(
-            `${LISTVIEW_MESSAGE.deleteOne_param_error}` || '',
-            {
-              code: `${
-                this.properties.refType === 'dataView'
-                  ? 'WdDataView'
-                  : 'WdListView'
-              }.DeleteOneParamError`,
-            }
-          );
+          throw new WdCompError(`${LISTVIEW_MESSAGE.deleteOne_param_error}` || '', {
+            code: `${this.properties.refType === 'dataView' ? 'WdDataView' : 'WdListView'}.DeleteOneParamError`,
+          });
         }
         const { app } = getWedaAPI();
         await app?.cloud?.callDataSource(
@@ -593,7 +548,7 @@ Component({
             methodName: 'wedaDelete',
             params: { _id },
           },
-          true
+          true,
         );
         await this._methodRefreshKeepPage();
       } catch (e) {
@@ -631,13 +586,12 @@ Component({
           refresh: this.methodRefresh.bind(this),
           deleteOne: this.methodDeleteOne.bind(this),
           error: errorObj,
-          dataSourceVersion:
-            datasource?.extra?.methodName === 'wedaGetRecordsV2' ? 'v2' : 'v1',
+          dataSourceVersion: datasource?.extra?.methodName === 'wedaGetRecordsV2' ? 'v2' : 'v1',
         });
     },
   },
   observers: {
-    'datasource,bindConnectMetadata,connectorMethod,orderBy,orderType,selectFieldType,selectFields,pageIndex,pageSize,pagination,where,queryCondition,connectorParams,dataSourceType':
+    'datasource,bindConnectMetadata,connectorMethod,orderBy,orderType,selectFieldType,selectFields,pageIndex,pageSize,pagination,where,queryCondition,connectorParams,dataSourceType,sorter':
       function (...rest) {
         if (isEqual(this.data.paramRef, rest)) return;
         this.data.paramRef = rest;
@@ -656,19 +610,11 @@ Component({
       }
     },
     'isVisiableSign,status': function (dIsVisiableSign, dStatus) {
-      if (
-        dIsVisiableSign &&
-        ['', 'success'].includes(dStatus) &&
-        this.properties.pagination === 'bottomLoad'
-      ) {
+      if (dIsVisiableSign && ['', 'success'].includes(dStatus) && this.properties.pagination === 'bottomLoad') {
         this.handleNext();
       }
     },
-    'dataSourceType,isRecords,loadButtonText': function (
-      dataSourceType,
-      isRecords,
-      loadButtonText
-    ) {
+    'dataSourceType,isRecords,loadButtonText': function (dataSourceType, isRecords, loadButtonText) {
       const isModel = dataSourceType === 'data-model';
       const isDataViewApis = !isRecords && !isModel;
       const loadButtonTextFinal = textToString(loadButtonText) || '加载更多';

package/package.json

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