@cloudbase/weda-ui-mp 3.12.0 → 3.12.2

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.0",
+  "version": "3.12.2",
   "main": "./",
   "publishConfig": {
     "access": "public"

package/utils/getModelParams.js

@@ -71,9 +71,7 @@ const getSelectFields = async (props) => {
       select[name] = true;
     });
   } else if (props.selectFieldType === 'custom') {
-    const _selectFields = Array.isArray(props.selectFields)
-      ? props.selectFields
-      : [];
+    const _selectFields = Array.isArray(props.selectFields) ? props.selectFields : [];
     _selectFields.forEach((name) => {
       select[name] = true;
     });
@@ -98,6 +96,12 @@ export const getModelParams = async (props) => {
       // 支持多关联查询，需要将查询条件转换为filter
       if (props?.queryCondition?.constructor === Object) {
         params['filter'] = getFilter(props.queryCondition);
+      } else if (Array.isArray(props?.queryCondition)) {
+        params['filter'] = {
+          where: {
+            $and: props?.queryCondition,
+          },
+        };
       }
       params.select = await getSelectFields(props);
       // 处理排序字段