@cloudbase/weda-ui-mp 3.9.8 → 3.10.1

package/components/form/form/wd-form.wxss

@@ -125,6 +125,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -137,6 +139,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/form/uploaderFile/index.js

@@ -69,6 +69,14 @@ Component({
       type: Object,
       value: null,
     },
+    uploadTipText: {
+      type: String,
+      value: '支持批量上传',
+    },
+    uploadButtonText: {
+      type: String,
+      value: '点击上传',
+    },
   },
   data: {
     maxCount: 0,

package/components/form/uploaderFile/index.wxml

@@ -6,9 +6,9 @@
         {{label}}
       </view>
       <view class="weda-uploader-files__btn-contain">
-        <button class="weui-btn weda-uploader-files__btn" bindtap="onButtonTap" disabled="{{disabled}}">上传文件</button>
+        <button class="weui-btn weda-uploader-files__btn" bindtap="onButtonTap" disabled="{{disabled}}">{{uploadButtonText}}</button>
 
-        <view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips">支持批量上传</view>
+        <view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips">{{uploadTipText}}</view>
         <view wx:else>
           <slot name="tips"></slot>
         </view>

package/components/listView/index.js

@@ -142,6 +142,14 @@ Component({
       type: Boolean,
       value: false,
     },
+    isSupportMultipleSort: {
+      type: Boolean,
+      value: false,
+    },
+    sorter: {
+      type: Array,
+      value: [],
+    },
   },
   data: {
     pageNo: 1,
@@ -208,9 +216,6 @@ Component({
         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;
     },

package/components/wd-form/wd-form.wxss

@@ -125,6 +125,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -137,6 +139,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-form-item/wd-form-item.wxss

@@ -125,6 +125,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -137,6 +139,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-form-item-obj/wd-form-item.wxss

@@ -125,6 +125,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -137,6 +139,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-input/inner-input/wd-input.wxss

@@ -287,6 +287,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -299,6 +301,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-menu-layout/index.js

@@ -33,6 +33,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    selectedMenuKey: {
+      type: String,
+      value: '',
+    },
   },
   data: {
     classPrefix: WD_PREFIX,

package/components/wd-menu-layout/index.wxml

@@ -50,7 +50,7 @@
 
       <view class="{{classPrefix + '-menulayout-h5__drawer'}} {{classPrefix + '-menulayout-menu'}}">
         <view hidden="{{!visible}}">
-          <wd-menu-list menu="{{menu}}" defaultOpened="{{defaultOpened}}" bind:menuClick="menuClick" />
+          <wd-menu-list menu="{{menu}}" defaultOpened="{{defaultOpened}}" selectedMenuKey="{{selectedMenuKey}}" bind:menuClick="menuClick" />
         </view>
         <view hidden="{{!visible}}" class="{{classPrefix + '-menulayout-h5__drawer-slot'}} is-not-content">
           <view class="{{classPrefix + '-menulayout__slot'}} {{classPrefix + '-menulayout-body__footer'}}">

package/components/wd-menu-list/index.js

@@ -42,6 +42,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    selectedMenuKey: {
+      type: String,
+      value: '',
+    },
   },
   data: {
     classPrefix: WD_PREFIX,
@@ -52,6 +56,8 @@ Component({
     attached() {
       this.updateWidgetAPI();
       this.init();
+      this.properties.selectedMenuKey &&
+        this.setData({ selectedKey: this.properties.selectedMenuKey });
     },
   },
   observers: {
@@ -62,6 +68,9 @@ Component({
       this.findSelectItem(menuData);
       this.init(menu, defaultOpened);
     },
+    selectedMenuKey: function (selectedMenuKey) {
+      selectedMenuKey && this.setData({ selectedKey: selectedMenuKey });
+    },
   },
   methods: {
     updateWidgetAPI() {
@@ -84,6 +93,7 @@ Component({
             : this.data.menuData) || [];
         selectItem = this.findSelectItem(menuData, key) || {};
       }
+      if (!selectItem) return;
       this.setData({ selectedKey: selectItem?.key });
       isNavigate && this.navigateTo(selectItem);
     },

package/components/wd-progress/wd-progress.wxss

@@ -157,6 +157,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -169,6 +171,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-rating/wd-rating.wxss

@@ -150,6 +150,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -162,6 +164,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-side-tab/index.js

@@ -24,6 +24,10 @@ Component({
       type: Boolean,
       value: false,
     },
+    isSlotAuto: {
+      type: Boolean,
+      value: false,
+    },
     selectedValue: {
       type: String,
       value: '1',
@@ -38,6 +42,7 @@ Component({
     classPrefix: WD_PREFIX,
     currentIndex: 0,
     tabsData: [],
+    slotKey: '1',
   },
   lifetimes: {
     attached() {
@@ -80,6 +85,7 @@ Component({
       if (index !== this.data.currentIndex) {
         this.setData({
           currentIndex: index,
+          slotKey: this.properties.list[index]?.slotKey || '1',
         });
       }
     },
@@ -107,6 +113,7 @@ Component({
       });
       this.setData({
         tabsData: tabData,
+        slotKey: this.properties.list[currentIndex]?.slotKey || '1',
       });
       this.updateWidgetAPI();
     },

package/components/wd-side-tab/index.wxml

@@ -1,6 +1,7 @@
 <view id="{{id}}" style="{{style}}" class="{{classPrefix + '-side-tab-root'}} {{classPrefix + '-mp-side-tab-root'}} {{className}}">
   <wd-tabs list="{{tabsData}}" selectedIndex="{{selectedValue}}" direction="vertical" bind:onCurrent="getCurrent" bind:change="change">
-    <slot wx:if="{{isMultipleSlot}}" name="panel{{currentIndex + 1}}"></slot>
+    <slot wx:if="{{isSlotAuto}}" name="autoPanel_{{isMultipleSlot?slotKey:'1'}}"></slot>
+    <slot wx:elif="{{isMultipleSlot}}" name="panel{{currentIndex + 1}}"></slot>
     <slot wx:else name="panel1"></slot>
   </wd-tabs>
 </view>

package/components/wd-switch/wd-switch.wxss

@@ -246,6 +246,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -258,6 +260,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-tag-select/wd-tag-select.wxss

@@ -287,6 +287,8 @@
   display: flex;
 }
 .wd-form-item-wrap__label {
+  display: flex;
+  align-items: center;
   word-break: break-all;
   width: var(--wd-form-item-label-width);
   margin-right: var(--wd-form-item-label-mr);
@@ -299,6 +301,9 @@
 .wd-form-item-wrap__label.is-disabled {
   color: var(--wd-form-item-label-color-disabled);
 }
+.wd-form-item-wrap__label-content {
+  flex: 1;
+}
 .wd-form-item-wrap__label > label {
   display: inline-block;
   line-height: var(--wd-font-line-height-default);

package/components/wd-textarea/index.js

@@ -37,6 +37,9 @@ Component({
     handleBlur: function (e) {
       this.triggerEvent('blur', e.detail);
     },
+    handleConfirm: function (e) {
+      this.triggerEvent('confirm', e.detail);
+    },
     updateWidgetAPI: function () {
       const { name, value, label, required, visible, disabled, readOnly } =
         this.data;

package/components/wd-textarea/index.wxml

@@ -22,7 +22,7 @@
     borderedH5="{{borderedH5}}"
   >
     <view class="{{cls}}" wx:if="{{!readOnly}}">
-      <textarea placeholder-class="{{placeholderCls}}" auto-focus="{{focus}}" auto-height="{{autoHeight}}" cursor-spacing="{{cursorSpacing}}" focus="{{focus}}" placeholder="{{placeholder}}" value="{{value}}" disabled="{{disabled}}" maxlength="{{maxLength}}" bind:input="handleChange" bind:focus="handleFocus" bind:blur="handleBlur"></textarea>
+      <textarea placeholder-class="{{placeholderCls}}" auto-focus="{{focus}}" auto-height="{{autoHeight}}" cursor-spacing="{{cursorSpacing}}" focus="{{focus}}" placeholder="{{placeholder}}" value="{{value}}" disabled="{{disabled}}" maxlength="{{maxLength}}" bind:input="handleChange" bind:focus="handleFocus" bind:blur="handleBlur" bindconfirm="handleConfirm"></textarea>
       <block wx:if="{{counterVisible}}">
         <label class="{{countCls}}">{{counter}}/{{maxLength}}</label>
       </block>

package/components/wd-top-tab/index.js

@@ -24,6 +24,10 @@ Component({
       type: Boolean,
       value: false,
     },
+    isSlotAuto: {
+      type: Boolean,
+      value: false,
+    },
     selectedValue: {
       type: String,
       value: '1',
@@ -38,6 +42,7 @@ Component({
     classPrefix: WD_PREFIX,
     currentIndex: 0,
     tabsData: [],
+    slotKey: '1',
   },
   lifetimes: {
     attached() {
@@ -50,6 +55,10 @@ Component({
       this.setData({
         currentIndex: e.detail,
       });
+      const idx = e.detail;
+      this.triggerEvent('change', {
+        value: this.data.tabsData?.[idx]?.value,
+      });
     },
     choooseTab: function (params) {
       const value = params?.value;
@@ -91,7 +100,7 @@ Component({
     ]),
   },
   observers: {
-    selectedValue: function (selectedValue) {
+    'selectedValue, list': function (selectedValue) {
       this.setCurrentIndex(selectedValue);
     },
     'currentIndex, list': function (currentIndex, list) {
@@ -103,14 +112,10 @@ Component({
       });
       this.setData({
         tabsData: tabData,
+        slotKey: this.properties.list[currentIndex]?.slotKey || '1',
       });
 
       this.updateWidgetAPI();
     },
-    currentIndex: function (currentIndex) {
-      this.triggerEvent('change', {
-        value: this.properties.list[currentIndex]?.value,
-      });
-    },
   },
 });

package/components/wd-top-tab/index.wxml

@@ -1,6 +1,6 @@
 <view id="{{id}}" style="{{style}}" class="{{classPrefix + '-top-tab-root'}} {{classPrefix + '-mp-top-tab-root'}} {{className}}">
   <wd-tabs list="{{tabsData}}" selectedIndex="{{selectedValue}}" direction="horizontal" bind:onCurrent="getCurrent" bind:change="change" currentIndex="{{currentIndex}}">
-    <slot wx:if=" {{isMultipleSlot}}" name="panel{{currentIndex + 1}}"> </slot>
-    <slot wx:else name="panel1"></slot>
+    <slot wx:if="{{isSlotAuto}}" name="autoPanel_{{isMultipleSlot?slotKey:'1'}}"></slot>
+    <slot wx:elif="{{isMultipleSlot}}" name="panel{{currentIndex + 1}}"></slot>
   </wd-tabs>
 </view>

package/components/wd-upload-file/index.js

@@ -22,6 +22,14 @@ Component({
       type: Object,
       value: null,
     },
+    uploadTipText: {
+      type: String,
+      value: '支持批量上传',
+    },
+    uploadButtonText: {
+      type: String,
+      value: '点击上传',
+    },
   },
   methods: {
     initValue: function () {

package/components/wd-upload-file/index.wxml

@@ -34,6 +34,8 @@
       bind:success="handleEvent"
       bind:error="handleEvent"
       callbacks="{{callbacks}}"
+      uploadButtonText="{{uploadButtonText}}"
+      uploadTipText="{{uploadTipText}}"
     />
   </wd-form-item>
 </block>

package/components/wedaVideo/index.js

@@ -2,7 +2,7 @@ import { getTempFileURL } from '../../utils/tcb';
 import handleEvents from '../../utils/handleEvents';
 import { commonCompBehavior } from '../../utils/common-behavior';
 import { getWedaAPI } from '../../utils/getWedaApi';
-
+import { errorHandler } from '../../utils/error';
 // component/videojs.js
 Component({
   /**
@@ -160,7 +160,11 @@ Component({
           .then((res) => {
             this.setData({ realSrc: res || '' });
           })
-          .catch(() => {
+          .catch((e) => {
+            errorHandler({
+              code: 'WedaVideo.GetVideoDataSourceError',
+              error: e,
+            });
             this.setData({
               realSrc: videoDataSource,
             });

package/package.json

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

package/style/wd-design.wxss

@@ -5,7 +5,8 @@
 }
 
 :root,
-page {
+page,
+:host {
   --wd-font-size-1: 0.625rem;
   --wd-font-size-2: 0.75rem;
   --wd-font-size-3: 0.875rem;
@@ -254,6 +255,7 @@ page {
 
 :root,
 page,
+:host,
 :root[theme-mode=light],
 page[theme-mode=light],
 .wd-theme-light {

package/utils/color.js

@@ -1,3 +1,4 @@
+import { errorHandler } from './error';
 /**
  * 十六进制、rgba、rgb、hsl、hsla 都换算成 rgba
  */
@@ -47,6 +48,10 @@ export function colorToRgba(color, alpha = 1) {
     a = a * alpha;
     return `rgba(${r},${g},${b},${a})`;
   } catch (e) {
+    errorHandler({
+      code: 'ColorToRgbaError',
+      error: e,
+    });
     return color;
   }
 }

package/utils/date.js

@@ -1,5 +1,5 @@
 import dayjs from './dayjs.min.js';
-
+import { errorHandler } from './error.js';
 export const isDateNil = (v) => v === '' || v == null;
 
 // 将时间值转 dayjs 类型
@@ -11,6 +11,10 @@ export const convertDayjs = (val) => {
     if (!m?.isValid()) return null;
   } catch (e) {
     console.warn('[function convertDayjs]: ', e);
+    errorHandler({
+      code: 'ConvertDayjsError',
+      error: e,
+    });
   }
   return m;
 };

package/utils/error.js

@@ -13,12 +13,12 @@ export class WdCompError extends Error {
 
 export const errorHandler = ({ id = '', code, error }) => {
   const comErrorInfo = {
-    code: error?.code || 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);
+  console.error(`${comErrorInfo.code}:`, comErrorInfo);
   return { compError, comErrorInfo };
 };

package/utils/getModelParams.js

@@ -1,7 +1,7 @@
 import { getWhereList, getParseValue } from './platform';
 import { getDataSourceByName } from './tcb';
 import { isNil } from './lodash';
-
+import { errorHandler } from './error';
 /**
  * 兼容新旧查询条件协议
  */
@@ -10,7 +10,12 @@ export const convertWhere = (props) => {
   try {
     where = props.queryCondition || getWhereList(props.where);
     where = getParseValue(where);
-  } catch (e) {}
+  } catch (e) {
+    errorHandler({
+      code: 'ConvertQueryError',
+      error: e,
+    });
+  }
   return Array.isArray(where) ? where : [];
 };
 
@@ -95,6 +100,14 @@ export const getModelParams = async (props) => {
         params['filter'] = getFilter(props.queryCondition);
       }
       params.select = await getSelectFields(props);
+      // 处理排序字段
+      if (params.orderBy && ['asc', 'desc'].includes(params.orderType)) {
+        params.orderBy = [{ [params.orderBy]: params.orderType }];
+      }
+      // 支持多字段排序
+      if (props.isSupportMultipleSort) {
+        params.orderBy = transformSorter(props.sorter);
+      }
     } else {
       const where = convertWhere(props);
       if (Array.isArray(where) && where.length > 0) {
@@ -102,7 +115,10 @@ export const getModelParams = async (props) => {
       }
     }
   } catch (e) {
-    console.error('getModelParams error', e);
+    errorHandler({
+      code: 'GetModelParamsError',
+      error: e,
+    });
   }
   return params;
 };
@@ -115,3 +131,19 @@ export const getPageParams = (pageNo, pageSize) => {
   }
   return tcbParams;
 };
+
+const transformSorter = (sorter = []) => {
+  return sorter
+    ?.filter((n) => (n.orderBy && n.orderType) || n.relationalTableName)
+    ?.map((i) => {
+      if (i.relationalTableName) {
+        return {
+          [i.relationalTableName]: i.sorter
+            ?.filter((j) => j.orderBy && j.orderType)
+            ?.map((k) => ({ [k.orderBy]: k.orderType })),
+        };
+      } else {
+        return { [i.orderBy]: i.orderType };
+      }
+    });
+};

package/utils/platform.js

@@ -1,5 +1,5 @@
 import { REL_DICT } from './constant';
-
+import { errorHandler } from './error';
 /**
  * 文件字节转换
  */
@@ -88,6 +88,10 @@ export const getWhereList = (where) => {
     }
     return [];
   } catch (error) {
+    errorHandler({
+      code: 'GetWhereListError',
+      error,
+    });
     return [];
   }
 };

package/utils/tcb.js

@@ -1,6 +1,6 @@
 import { getWedaAPI } from './getWedaApi';
 import { deepClone } from './lodash';
-
+import { errorHandler } from './error';
 // 默认使用swr的methodName
 const SWR_METHOD_DEFAULT = ['wedaGetItem', 'wedaGetRecords', 'getApiKey'];
 // 默认使用swr的action
@@ -51,7 +51,12 @@ export async function getTempFileURL(data) {
     if (/^cloud:\/\//.test(data)) {
       return await getWedaAPI()?.app.cloud.getTempFileURL?.(data);
     }
-  } catch (e) {}
+  } catch (e) {
+    errorHandler({
+      code: 'GetTempFileURLError',
+      error: e,
+    });
+  }
   return data;
 }
 
@@ -76,7 +81,10 @@ export async function getAppCustomNav() {
     });
     return res;
   } catch (error) {
-    console.error('错误', error);
+    errorHandler({
+      code: 'GetAppCustomNavError',
+      error,
+    });
     return {};
   }
 }
@@ -129,7 +137,10 @@ export async function callDataSourceApi(param) {
   try {
     return await callDataSource(param);
   } catch (error) {
-    console.error('错误', error);
+    errorHandler({
+      code: 'CallDataSourceError',
+      error,
+    });
     return {};
   }
 }
@@ -143,6 +154,10 @@ export const resolveStaticResourceUrl = (path) => {
       getWedaAPI()?.app?.__internal__?.resolveStaticResourceUrl(path);
     return resourceUrl;
   } catch (error) {
+    errorHandler({
+      code: 'ResolveStaticResourceUrlError',
+      error,
+    });
     return '';
   }
 };