@cloudbase/weda-ui-mp 3.9.0 → 3.9.2

package/components/dataView/index.js

@@ -26,7 +26,7 @@ Component({
       value: [],
     },
     queryCondition: {
-      type: Array,
+      type: null,
       value: [],
     },
     bindConnectMetadata: {
@@ -105,7 +105,10 @@ Component({
         record: this.data._oldData,
         refresh,
         deleteOne,
-        dataSourceVersion: this.properties.supportManyRelated ? 'v2' : 'v1',
+        dataSourceVersion:
+          this.properties.datasource?.extra?.methodName === 'wedaGetRecordsV2'
+            ? 'v2'
+            : 'v1',
       });
     },
   },

package/components/form/location/components/mapChoose/index.js

@@ -1,5 +1,7 @@
 import debounce from '../../../../../utils/debounce';
 import { getCurrentLocation } from '../../../../../utils/getCustomInfo';
+import { errorHandler } from '../../../../../utils/error';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 let QQMapWX = require('../../../../../utils/qqmap-wx-jssdk1.2/qqmap-wx-jssdk');
 let qqmapsdk;
@@ -9,6 +11,10 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    id: {
+      Type: String,
+      value: '',
+    },
     location: {
       type: Object,
       value: {
@@ -44,6 +50,7 @@ Component({
   lifetimes: {
     attached: function () {
       this.getInitialization();
+      this.setData({ id: this.id });
     },
   },
 
@@ -273,7 +280,12 @@ Component({
             });
           },
           fail: function (error) {
-            console.log('error search', error);
+            const { comErrorInfo } = errorHandler({
+              id: this.id,
+              code: 'WdLocation.SearchError',
+              error: error,
+            });
+            this.triggerEvent('error', { error: comErrorInfo });
             _this.setData({
               searchLoadingStatus: false,
             });
@@ -297,11 +309,12 @@ Component({
             }
           },
           fail: function (error) {
-            console.log(error);
-            wx.showToast({
-              icon: 'none',
-              title: error.message,
+            const { comErrorInfo } = errorHandler({
+              id: this.id,
+              code: 'WdLocation.GetSuggestionError',
+              error: error,
             });
+            this.triggerEvent('error', { error: comErrorInfo });
           },
         });
       }
@@ -332,7 +345,12 @@ Component({
           }
         },
         fail: (error) => {
-          console.log('reverseGeocoder error', error);
+          const { comErrorInfo } = errorHandler({
+            id: this.id,
+            code: 'WdLocation.ReverseGeocoderError',
+            error: error,
+          });
+          this.triggerEvent('error', { error: comErrorInfo });
           let item = {
             id: 'current-location',
             location: {
@@ -479,15 +497,19 @@ Component({
           latitude: Number(latitude.toFixed(6)),
           longitude: Number(longitude.toFixed(6)),
         };
-      } catch (e) {}
+      } catch (e) {
+        const { comErrorInfo } = errorHandler({
+          id: this.id,
+          code: 'WdLocation.GetLatestLocationError',
+          error: e,
+        });
+        this.triggerEvent('error', { error: comErrorInfo });
+      }
       return location;
     },
   },
   observers: {
-    apiKey: function () {
-      this.getInitialization();
-    },
-    location: function () {
+    'apiKey,location': function () {
       this.getInitialization();
     },
   },

package/components/form/location/index.js

@@ -1,6 +1,8 @@
 import { callDataSource } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import customInfo from '../../../utils/getCustomInfo';
+import { errorHandler } from '../../../utils/error';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 let QQMapWX = require('../../../utils/qqmap-wx-jssdk1.2/qqmap-wx-jssdk');
 let qqmapsdk;
@@ -17,6 +19,10 @@ Component({
       type: String,
       value: '',
     },
+    id: {
+      Type: String,
+      value: '',
+    },
     style: {
       type: String,
       value: '',
@@ -97,6 +103,7 @@ Component({
 
   lifetimes: {
     attached: function () {
+      this.setData({ id: this.id });
       const { locationType, dataSource } = this.properties;
       const getReverseGeocoder = async (location) => {
         const { isApikeyStatus } = this.data;
@@ -182,7 +189,12 @@ Component({
           }
           getReverseGeocoder(location);
         } catch (err) {
-          console.log('drowMapMarks err', err);
+          const { comErrorInfo } = errorHandler({
+            id: this.id,
+            code: 'WdLocation.DrowMapMarksError',
+            error: err,
+          });
+          this.triggerEvent('error', { error: comErrorInfo });
         }
       };
       const getCustomInfoLocation = () => {
@@ -206,6 +218,12 @@ Component({
                 },
                 currentLocations: {},
               });
+              const { comErrorInfo } = errorHandler({
+                id: this.id,
+                code: 'WdLocation.GetCurrentLocationError',
+                error,
+              });
+              this.triggerEvent('error', { error: comErrorInfo });
             });
         } else {
           drowMapMarks(customInfoLocation);
@@ -225,7 +243,6 @@ Component({
                   getCustomInfoLocation();
                 },
                 fail: (err) => {
-                  console.log('authorize fail', err);
                   this.setData({
                     currentPosition: {
                       status: false,
@@ -236,10 +253,12 @@ Component({
                   this.triggerEvent('change', {
                     value: {},
                   });
-                  wx.showToast({
-                    icon: 'none',
-                    title: err.errMsg,
+                  const { comErrorInfo } = errorHandler({
+                    id: this.id,
+                    code: 'WdLocation.AuthorizeFail',
+                    error: err,
                   });
+                  this.triggerEvent('error', { error: comErrorInfo });
                 },
               });
             } else {
@@ -248,11 +267,12 @@ Component({
             }
           },
           fail: (err) => {
-            console.log('getSetting fail', err);
-            wx.showToast({
-              icon: 'none',
-              title: 'getSetting fail',
+            const { comErrorInfo } = errorHandler({
+              id: this.id,
+              code: 'WdLocation.GetSettingFail',
+              error: err,
             });
+            this.triggerEvent('error', { error: comErrorInfo });
           },
         });
       }
@@ -336,7 +356,6 @@ Component({
           });
         }
       } catch (error) {
-        console.log('getApikey error', error);
         this.setData({
           isApikeyStatus: {
             status: false,
@@ -344,6 +363,12 @@ Component({
             apiKey: '',
           },
         });
+        const { comErrorInfo } = errorHandler({
+          id: this.id,
+          code: 'WdLocation.GetApikeyError',
+          error,
+        });
+        this.triggerEvent('error', { error: comErrorInfo });
       }
     },
     chooseLocation() {
@@ -424,15 +449,16 @@ Component({
       });
     },
     mapChooseOnConfirm(event) {
+      this.setData({ isMapChooseVisible: false });
       const value = event.detail;
       this.changeLocation({
         ...value,
         poiname: value.address,
         detailedAddress: value.detailedAddress,
       });
-      this.setData({
-        isMapChooseVisible: false,
-      });
+    },
+    handleError: function (e) {
+      this.triggerEvent('error', e.detail);
     },
   },
   observers: {

package/components/form/location/index.wxml

@@ -24,6 +24,6 @@
     <view style="padding-left: 16px; padding-right: 16px; margin-top: 16px; padding-bottom: 16px" wx:if="{{showMap&&isAddrShow}}">
       <map id="map" longitude="{{location.longitude}}" latitude="{{location.latitude}}" markers="{{markers}}" scale="16" enable-zoom="{{zoom}}" enable-scroll="{{drag}}" style="width: 100%; height: 200px"></map>
     </view>
-    <mapChoose isVisible="{{isMapChooseVisible}}" bindonClose="mapChooseOnClose" bindonConfirm="mapChooseOnConfirm" location="{{location}}" apiKey="{{isApikeyStatus.apiKey}}" circleRadius="{{locationRange}}" customRange="{{customRange}}" currentLocations="{{currentLocations}}" />
+    <mapChoose id="{{id}}" wx:if="{{isMapChooseVisible}}" isVisible="{{isMapChooseVisible}}" bindonClose="mapChooseOnClose" bindonConfirm="mapChooseOnConfirm" location="{{location}}" apiKey="{{isApikeyStatus.apiKey}}" circleRadius="{{locationRange}}" customRange="{{customRange}}" currentLocations="{{currentLocations}}" bind:error="handleError" />
   </view>
 </formcell>

package/components/listView/index.js

@@ -68,7 +68,7 @@ Component({
       value: [],
     },
     queryCondition: {
-      type: Array,
+      type: null,
       value: [],
     },
     pageSize: {
@@ -266,7 +266,10 @@ Component({
             ? extra?.methodName
             : 'wedaGetRecords';
         eventDataSource = datasource;
-        const modelParams = await getModelParams(this.properties);
+        const modelParams = await getModelParams({
+          ...this.properties,
+          supportManyRelated: methodName === 'wedaGetRecordsV2',
+        });
         tcbParams = { ...tcbParams, ...modelParams };
       } else {
         dataSourceName = bindConnectMetadata?.datasource?.name;
@@ -613,7 +616,7 @@ Component({
     },
     updateWidgetAPI() {
       const { records, listTotal, pageNo, errorObj } = this.data;
-      let { pageSize, supportManyRelated } = this.properties;
+      let { pageSize, datasource } = this.properties;
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
           records,
@@ -623,7 +626,8 @@ Component({
           refresh: this.methodRefresh.bind(this),
           deleteOne: this.methodDeleteOne.bind(this),
           error: errorObj,
-          dataSourceVersion: supportManyRelated ? 'v2' : 'v1',
+          dataSourceVersion:
+            datasource?.extra?.methodName === 'wedaGetRecordsV2' ? 'v2' : 'v1',
         });
     },
   },

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

@@ -28,6 +28,9 @@ Component({
       type: Boolean,
       value: true,
     },
+    inputPattern: {
+      type: null,
+    },
   },
   data: {
     root: '',
@@ -76,9 +79,14 @@ Component({
       this.setData({ isFocus: false });
     },
     handleChange: function (e) {
-      const currentInputValue = e.detail.value;
+      const text = e.detail.value;
+      const reg = new RegExp(this.properties.inputPattern);
+      if (this.properties.inputPattern && !reg.test(text)) {
+        this.setData({ currentInputValue: this.data.currentInputValue });
+        return;
+      }
       const detail = this.convertDetail(e);
-      this.setData({ currentInputValue });
+      this.setData({ currentInputValue: text });
       this.changeForm(detail);
       this.triggerEvent('change', detail);
     },

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

@@ -23,6 +23,9 @@ Component({
       ],
     },
   },
+  data: {
+    pattern: '^[()\\d\\s+\\-ext]{0,20}$',
+  },
   methods: {
     convertValueToString(val) {
       // 数据源认string

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

@@ -19,6 +19,7 @@
   after="{{after}}"
   isUnionValue="{{isUnionValue}}"
   prefixType="{{prefixType}}"
+  inputPattern="{{pattern}}"
   prefixIcon="{{prefixIcon}}"
   prefixSrc="{{prefixSrc}}"
   suffixType="{{suffixType}}"
@@ -26,13 +27,12 @@
   suffixSrc="{{suffixSrc}}"
   extra="{{extra}}"
   password="{{false}}"
-  type="number"
   counterVisible="{{counterVisible}}"
   focus="{{focus}}"
   borderedH5="{{borderedH5}}"
   borderedPc="{{borderedPc}}"
   isNickNameType="{{false}}"
-  maxLength="11"
+  maxLength="20"
   rules="{{rules}}"
   status="{{status}}"
   required="{{required}}"

package/components/wd-location/index.js

@@ -14,6 +14,10 @@ Component({
     customLocation: {
       type: null,
     },
+    id: {
+      Type: String,
+      value: '',
+    },
   },
   data: {
     _oldLocationValue: null,
@@ -30,6 +34,9 @@ Component({
       const e = { detail: { value: null } };
       this.handleChange(e);
     },
+    handleError: function (e) {
+      this.triggerEvent('error', e.detail);
+    },
   },
   observers: {
     'name, value, label, required, visible, disabled, readOnly, before, after':
@@ -44,6 +51,7 @@ Component({
   lifetimes: {
     attached: function () {
       this.updateWidgetAPI();
+      this.setData({ id: this.id });
     },
   },
 });

package/components/wd-location/index.wxml

@@ -24,6 +24,7 @@
     <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}">
       <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">
         <old-location
+          id="{{id}}"
           name="{{name}}"
           labelVisible="{{false}}"
           value="{{value}}"
@@ -40,6 +41,7 @@
           readOnly="{{readOnly}}"
           disabled="{{disabled || readOnly}}"
           bind:change="handleChange"
+          bind:error="handleError"
         />
       </wd-input-wrap>
     </wd-input-group>

package/components/wd-markdown/index.js

@@ -59,10 +59,20 @@ Component({
         ...options,
       });
       this.setData({ mdInstance: md });
+      this.triggerEvent('onReady', { markdownInstance: md });
       this.setData({
         __html: md.render(this.data.value),
       });
     },
+    updateWidgetAPI() {
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
+          value: this.properties.value,
+          markdownInstance: this.data.mdInstance,
+          updateMarkdownInstance: ({ markdownInstance }) =>
+            this.setData({ mdInstance: markdownInstance }),
+        });
+    },
   },
   observers: {
     value: function () {
@@ -76,10 +86,14 @@ Component({
     options: function () {
       this.init();
     },
+    'value,mdInstance': function () {
+      this.updateWidgetAPI();
+    },
   },
   lifetimes: {
     attached() {
       this.init();
+      this.updateWidgetAPI();
     },
   },
 });

package/components/web-view/index.js

@@ -39,9 +39,6 @@ Component({
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
           link,
-          postMessage: (message) => {
-            wx?.miniProgram?.postMessage(message);
-          },
         });
     },
 

package/package.json

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

package/utils/error.js

@@ -10,3 +10,15 @@ export class WdCompError extends Error {
     this.original = context ? context.original : {};
   }
 }
+
+export const errorHandler = ({ id = '', code, error }) => {
+  const comErrorInfo = {
+    code: error?.code || code,
+    requestId: error?.requestId,
+    original: error,
+    message: `[组件${id}:${code}]${error?.message || error?.errMsg || code}`,
+  };
+  const compError = new WdCompError(comErrorInfo.message, comErrorInfo);
+  console.error(comErrorInfo);
+  return { compError, comErrorInfo };
+};