@cloudbase/weda-ui-mp 3.8.2 → 3.9.1

package/components/dataView/index.js

@@ -49,6 +49,18 @@ Component({
       type: Object,
       value: {},
     },
+    selectFieldType: {
+      type: String,
+      value: 'main',
+    },
+    selectFields: {
+      type: Array,
+      value: [],
+    },
+    supportManyRelated: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     innerBeforeDataChange: function (values) {
@@ -93,6 +105,7 @@ Component({
         record: this.data._oldData,
         refresh,
         deleteOne,
+        dataSourceVersion: this.properties.supportManyRelated ? 'v2' : 'v1',
       });
     },
   },

package/components/dataView/index.wxml

@@ -20,6 +20,9 @@
   bindattached="handleEvent"
   isRecords="{{false}}"
   refType="dataView"
+  supportManyRelated="{{supportManyRelated}}"
+  selectFields="{{selectFields}}"
+  selectFieldType="{{selectFieldType}}"
 >
   <slot></slot>
 </list-view>

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,7 +497,14 @@ 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;
     },
   },

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() {
@@ -434,6 +459,9 @@ Component({
         isMapChooseVisible: false,
       });
     },
+    handleError: function (e) {
+      this.triggerEvent('error', e.detail);
+    },
   },
   observers: {
     value: function (value) {

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}}" 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

@@ -126,6 +126,22 @@ Component({
       type: Boolean,
       value: false,
     },
+    selectFieldType: {
+      type: String,
+      value: 'main',
+    },
+    selectFields: {
+      type: Array,
+      value: [],
+    },
+    pageIndex: {
+      type: Number,
+      value: 1,
+    },
+    supportManyRelated: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     pageNo: 1,
@@ -186,7 +202,18 @@ Component({
         this.onSuccessCb({ records, total, isTriggerEmpty: isRecords })
       );
     },
-
+    // 更新参数
+    getQueryParams: function ({ methodName, params }) {
+      if (methodName === 'wedaGetRecordsV2') {
+        params.getCount = true;
+        params.compatibleWithV1 = true;
+        params.pageNumber = params.pageNo;
+        if (params.orderBy && ['asc', 'desc'].includes(params.orderType)) {
+          params.orderBy = [{ [params.orderBy]: params.orderType }];
+        }
+      }
+      return params;
+    },
     // 列表容器拉取数据
     fetchData: async function (param = {}) {
       const {
@@ -239,7 +266,7 @@ Component({
             ? extra?.methodName
             : 'wedaGetRecords';
         eventDataSource = datasource;
-        const modelParams = getModelParams(this.properties);
+        const modelParams = await getModelParams(this.properties);
         tcbParams = { ...tcbParams, ...modelParams };
       } else {
         dataSourceName = bindConnectMetadata?.datasource?.name;
@@ -253,6 +280,14 @@ Component({
         console.warn(`当前请求缺少必要参数 dataSourceName或methodName`);
         return;
       }
+      // select为空时，不触发请求
+      if (
+        methodName === 'wedaGetRecordsV2' &&
+        !Object.keys(tcbParams?.select)?.length
+      ) {
+        console.warn(`当前请求缺少必要参数 select`);
+        return;
+      }
       this.setData({ _status: 'loading' });
 
       // tcb 请求
@@ -272,7 +307,10 @@ Component({
             {
               dataSourceName,
               methodName,
-              params: tcbParams,
+              params: this.getQueryParams({
+                methodName,
+                params: tcbParams,
+              }),
               swr: { forceClear },
             },
             true
@@ -325,7 +363,10 @@ Component({
           const temp = await app?.cloud?.callDataSource({
             dataSourceName,
             methodName,
-            params: tcbParams,
+            params: this.getQueryParams({
+              methodName,
+              params: tcbParams,
+            }),
             swr,
           });
           records = records.concat(temp.records || []);
@@ -572,7 +613,7 @@ Component({
     },
     updateWidgetAPI() {
       const { records, listTotal, pageNo, errorObj } = this.data;
-      let { pageSize } = this.properties;
+      let { pageSize, supportManyRelated } = this.properties;
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
           records,
@@ -582,17 +623,21 @@ Component({
           refresh: this.methodRefresh.bind(this),
           deleteOne: this.methodDeleteOne.bind(this),
           error: errorObj,
+          dataSourceVersion: supportManyRelated ? 'v2' : 'v1',
         });
     },
   },
   observers: {
-    'datasource,bindConnectMetadata,connectorMethod,orderBy,orderType,pageSize,pagination,where,queryCondition,connectorParams,dataSourceType':
+    'datasource,bindConnectMetadata,connectorMethod,orderBy,orderType,selectFieldType,selectFields,pageIndex,pageSize,pagination,where,queryCondition,connectorParams,dataSourceType':
       function (...rest) {
         if (isEqual(this.data.paramRef, rest)) return;
         this.data.paramRef = rest;
         this._clearDelay();
         this.data.delayRef.current.initTimer = setTimeout(() => {
-          this.fetchData({ pageNo: 1, records: [] });
+          this.fetchData({
+            pageNo: this.properties.pageIndex || 1,
+            records: [],
+          });
         }, 500);
       },
     'dataSourceType,dataSourceData,total,enableTotal': function () {

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

@@ -0,0 +1,99 @@
+import MarkdownIt from './utils/markdown-it.min.js';
+import highlight from './utils/highlight.min.js';
+import hljsJs from './utils/hljs_javascript.min.js';
+import hljsCss from './utils/hljs_css.min.js';
+Component({
+  options: {
+    virtualHost: true,
+  },
+  properties: {
+    className: {
+      type: String,
+      value: '',
+    },
+    style: {
+      type: String,
+      value: '',
+    },
+    id: {
+      type: String,
+      value: '',
+    },
+    value: {
+      type: String,
+      value: '这是一个markdown',
+    },
+    options: {
+      type: Object,
+      value: {},
+    },
+  },
+  data: {
+    __html: '',
+    mdInstance: null,
+  },
+  methods: {
+    init() {
+      const { options } = this.data;
+
+      const hljs = highlight();
+      const javascript = hljsJs();
+      const css = hljsCss();
+      hljs.registerLanguage('javascript', javascript);
+      hljs.registerLanguage('css', css);
+      const md = new MarkdownIt({
+        // 默认开启高亮
+        highlight: function (str, lang) {
+          if (lang && hljs.getLanguage(lang)) {
+            try {
+              return (
+                '<pre><code class="hljs">' +
+                hljs.highlight(str, { language: lang, ignoreIllegals: true })
+                  .value +
+                '</code></pre>'
+              );
+            } catch (__) {}
+          }
+          return '<pre><code class="hljs">' + str + '</code></pre>';
+        },
+        ...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 () {
+      const { mdInstance } = this.data;
+      if (!mdInstance) return;
+      console.log(this.data.value);
+      this.setData({
+        __html: mdInstance.render(this.data.value),
+      });
+    },
+    options: function () {
+      this.init();
+    },
+    'value,mdInstance': function () {
+      this.updateWidgetAPI();
+    },
+  },
+  lifetimes: {
+    attached() {
+      this.init();
+      this.updateWidgetAPI();
+    },
+  },
+});

package/components/wd-markdown/index.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "styleIsolation": "shared",
+  "usingComponents": {
+    "richText": "../richText/index"
+  }
+}

package/components/wd-markdown/index.wxml

@@ -0,0 +1,3 @@
+<view class="wd-markdown wd-mp-markdown {{className}}" style="{{style}}" id="id">
+  <richText value="{{__html}}" />
+</view>

package/components/wd-markdown/index.wxss

@@ -0,0 +1,128 @@
+@import '../../style/wd-design.wxss';
+
+/*light*/
+.wd-markdown {
+  padding: 1rem;
+}
+.pre ._code.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 1em;
+}
+._code.hljs {
+  padding: 3px 5px;
+  word-break: normal;
+  /* white-space: pre; */
+  background-color: transparent;
+  border: 0;
+}
+
+/*!
+    Theme: GitHub
+    Description: Light theme as seen on github.com
+    Author: github.com
+    Maintainer: @Hirse
+    Updated: 2021-05-15
+
+    Outdated base version: https://github.com/primer/github-syntax-light
+    Current colors taken from GitHub's CSS
+  */
+.hljs {
+  color: #24292e;
+  background: #ffffff;
+}
+.hljs-doctag,
+.hljs-keyword,
+.hljs-meta .hljs-keyword,
+.hljs-template-tag,
+.hljs-template-variable,
+.hljs-type,
+.hljs-variable.language_ {
+  /* prettylights-syntax-keyword */
+  color: #d73a49;
+}
+.hljs-title,
+.hljs-title.class_,
+.hljs-title.class_.inherited__,
+.hljs-title.function_ {
+  /* prettylights-syntax-entity */
+  color: #6f42c1;
+}
+.hljs-attr,
+.hljs-attribute,
+.hljs-literal,
+.hljs-meta,
+.hljs-number,
+.hljs-operator,
+.hljs-variable,
+.hljs-selector-attr,
+.hljs-selector-class,
+.hljs-selector-id {
+  /* prettylights-syntax-constant */
+  color: #005cc5;
+}
+.hljs-regexp,
+.hljs-string,
+.hljs-meta .hljs-string {
+  /* prettylights-syntax-string */
+  color: #032f62;
+}
+.hljs-built_in,
+.hljs-symbol {
+  /* prettylights-syntax-variable */
+  color: #e36209;
+}
+.hljs-comment,
+.hljs-code,
+.hljs-formula {
+  /* prettylights-syntax-comment */
+  color: #6a737d;
+}
+.hljs-name,
+.hljs-quote,
+.hljs-selector-tag,
+.hljs-selector-pseudo {
+  /* prettylights-syntax-entity-tag */
+  color: #22863a;
+}
+.hljs-subst {
+  /* prettylights-syntax-storage-modifier-import */
+  color: #24292e;
+}
+.hljs-section {
+  /* prettylights-syntax-markup-heading */
+  color: #005cc5;
+  font-weight: bold;
+}
+.hljs-bullet {
+  /* prettylights-syntax-markup-list */
+  color: #735c0f;
+}
+.hljs-emphasis {
+  /* prettylights-syntax-markup-italic */
+  color: #24292e;
+  font-style: italic;
+}
+.hljs-strong {
+  /* prettylights-syntax-markup-bold */
+  color: #24292e;
+  font-weight: bold;
+}
+.hljs-addition {
+  /* prettylights-syntax-markup-inserted */
+  color: #22863a;
+  background-color: #f0fff4;
+}
+.hljs-deletion {
+  /* prettylights-syntax-markup-deleted */
+  color: #b31d28;
+  background-color: #ffeef0;
+}
+.hljs-char.escape_,
+.hljs-link,
+.hljs-params,
+.hljs-property,
+.hljs-punctuation,
+.hljs-tag {
+  /* purposely ignored */
+}