@cloudbase/weda-ui 2.0.8 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "2.0.8",
+  "version": "2.0.11",
   "main": "./src/index.js",
   "module": "./src/index",
   "miniprogram": "mpdist",
@@ -112,11 +112,13 @@
     "cross-env": "^7.0.3",
     "cypress": "~9.5.1",
     "eslint": "^8.9.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-config-tencent": "^1.0.3",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.1.2",
+    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-rulesdir": "^0.2.1",
     "husky": "^7.0.4",
@@ -125,6 +127,7 @@
     "less": "^4.1.2",
     "miniprogram-simulate": "^1.4.3",
     "nano-staged": "^0.5.0",
+    "prettier": "^2.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "^4.0.3",
@@ -142,7 +145,11 @@
   },
   "nano-staged": {
     "*.{js,jsx,ts,tsx}": [
-      "eslint --fix"
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{json,html,wxml,wxss}": [
+      "prettier -w"
     ]
   },
   "size-limit": [

package/src/mp/components/button/index.js

@@ -58,7 +58,7 @@ Component({
     },
     appParameter: {
       type: String,
-    }
+    },
   },
   data: {
     cls: '',

package/src/mp/components/button/index.wxml

@@ -1,22 +1,22 @@
 <button
- class="{{cls}}"
- style="{{style}}"
- size="{{size}}"
- loading="{{loading}}"
- disabled="{{disabled}}"
- open-type="{{openType}}"
- form-type="{{formType}}"
- bind:tap="tap"
- bindcontact="contact"
- bindlaunchapp="launchApp"
- bindopensetting="openSetting"
- session-from="{{sessionFrom}}"
- send-message-title="{{sendMessageTitle}}"
- send-message-path="{{sendMessagePath}}"
- send-message-img="{{sendMessageImg}}"
- show-message-card="{{showMessageCard}}"
- app-parameter="{{appParameter}}"
+  class="{{cls}}"
+  style="{{style}}"
+  size="{{size}}"
+  loading="{{loading}}"
+  disabled="{{disabled}}"
+  open-type="{{openType}}"
+  form-type="{{formType}}"
+  bind:tap="tap"
+  bindcontact="contact"
+  bindlaunchapp="launchApp"
+  bindopensetting="openSetting"
+  session-from="{{sessionFrom}}"
+  send-message-title="{{sendMessageTitle}}"
+  send-message-path="{{sendMessagePath}}"
+  send-message-img="{{sendMessageImg}}"
+  show-message-card="{{showMessageCard}}"
+  app-parameter="{{appParameter}}"
 >
-	<block>{{text ? text : ''}}</block>
-	<slot name="contentSlot" wx:if="{{!text}}" />
+  <block>{{text ? text : ''}}</block>
+  <slot name="contentSlot" wx:if="{{!text}}" />
 </button>

package/src/mp/components/calendar/index.js

@@ -7,27 +7,27 @@ Component({
   properties: {
     className: {
       type: String,
-      value: ''
+      value: '',
     },
     style: {
       type: Object,
-      value: {}
+      value: {},
     },
     // 控制器显示隐藏
     initVisible: {
       type: String,
-      value: 'true'
+      value: 'true',
     },
     // 初始化日历值
     initValue: {
       type: String,
-      value: ''
+      value: '',
     },
     // 展示配置
     configData: {
       type: Array,
       value: [],
-    }
+    },
   },
   /** 页面的初始数据 */
   data: {
@@ -45,18 +45,17 @@ Component({
     year: 0,
     month: 0,
     datalist: [],
-    headerlist: []
+    headerlist: [],
   },
 
   lifetimes: {
-    created: function () {
-    },
+    created: function () {},
     attached: function () {
-      const {initVisible, initValue} = this.properties;
-      const {firstDayOfWeek, initFormat} = this.data;
+      const { initVisible, initValue } = this.properties;
+      const { firstDayOfWeek, initFormat } = this.data;
       if (initVisible !== null) {
         this.setData({
-          visible: initVisible
+          visible: initVisible,
         });
       }
       if (initValue !== null && initValue !== '') {
@@ -67,8 +66,14 @@ Component({
           value,
           year,
           month,
-          datalist: this.getDateLis(year, month, firstDayOfWeek, value, initFormat),
-          headerlist: this.colHeaderList()
+          datalist: this.getDateLis(
+            year,
+            month,
+            firstDayOfWeek,
+            value,
+            initFormat
+          ),
+          headerlist: this.colHeaderList(),
         });
       } else {
         const _dayjsDate = dayjs(dayjs().format('YYYY-MM-DD'));
@@ -79,16 +84,28 @@ Component({
           value,
           year,
           month,
-          datalist: this.getDateLis(year, month, firstDayOfWeek, value, initFormat),
-          headerlist: this.colHeaderList()
+          datalist: this.getDateLis(
+            year,
+            month,
+            firstDayOfWeek,
+            value,
+            initFormat
+          ),
+          headerlist: this.colHeaderList(),
         });
       }
-    }
+    },
   },
   methods: {
     // 传入参数，修改展示列表
     getDateLis: function (year, month, firstDayOfWeek, value, initFormat) {
-      const datalist = this.createDateList(year, month, firstDayOfWeek, value, initFormat);
+      const datalist = this.createDateList(
+        year,
+        month,
+        firstDayOfWeek,
+        value,
+        initFormat
+      );
       return this._dataList(datalist);
     },
     // 获取一个日期是周几（1~7）
@@ -100,13 +117,7 @@ Component({
       return day;
     },
     // 获取日期数组
-    createDateList: function (
-      year,
-      month,
-      firstDayOfWeek,
-      value,
-      initFormat
-    ) {
+    createDateList: function (year, month, firstDayOfWeek, value, initFormat) {
       const createCellData = (belongTo, isCurrent, date, weekOrder) => {
         const day = this.getDay(date);
         return {
@@ -132,7 +143,8 @@ Component({
 
       // 添加上个月中会在本月显示的最后几天日期
       // getDay(monthFirstDay.toDate()) 获取每月第一天是周几
-      const lastMonthDaysCount = (this.getDay(monthFirstDay.toDate()) - firstDayOfWeek + 7) % 7;
+      const lastMonthDaysCount =
+        (this.getDay(monthFirstDay.toDate()) - firstDayOfWeek + 7) % 7;
       for (let i = 0; i < lastMonthDaysCount; i++) {
         // 获取显示在当前月的日历中，上月日期数据
         // monthFirstDay.subtract(num, 'day' | 'month' | 'year') 表示以当月第一天日期为基准，在 日|月|年 数字上减去num
@@ -144,7 +156,9 @@ Component({
       const monthDaysCount = monthFirstDay.endOf('month').daysInMonth();
       for (let i = 0; i < monthDaysCount; i++) {
         const dayObj = monthFirstDay.add(i, 'day');
-        list.push(createCellData(0, value.isSame(dayObj), dayObj.toDate(), weekCount));
+        list.push(
+          createCellData(0, value.isSame(dayObj), dayObj.toDate(), weekCount)
+        );
         if (list.length === 7) {
           rowList.push(list);
           list = [];
@@ -168,17 +182,18 @@ Component({
     },
     // 混合数据
     _dataList: function (configList) {
-      const {configData} = this.properties;
+      const { configData } = this.properties;
       const _map = new Map();
       for (const item of configData) {
         _map.set(item.matchDate, item);
       }
-      return configList.map(item => {
+      return configList.map((item) => {
         return item.reduce((res, i) => {
           if (_map.has(i.formattedDate)) {
             const _disabled = _map.get(i.formattedDate)['disabled'];
             const _marked = _map.get(i.formattedDate)['marked'];
-            i['disabled'] = _disabled !== undefined ? JSON.parse(_disabled) : false;
+            i['disabled'] =
+              _disabled !== undefined ? JSON.parse(_disabled) : false;
             i['marked'] = _marked;
           }
           res.push(i);
@@ -188,7 +203,7 @@ Component({
     },
     // 表头数组
     colHeaderList: function () {
-      const {week, firstDayOfWeek, isShowWeekend} = this.data;
+      const { week, firstDayOfWeek, isShowWeekend } = this.data;
       const list = [];
       for (let i = firstDayOfWeek; i <= 7; i++) {
         if (!isShowWeekend && i > 5) {
@@ -214,25 +229,37 @@ Component({
     },
     // 上一个月
     handlePrevMonth: function () {
-      const {year, month, firstDayOfWeek, value, initFormat} = this.data;
+      const { year, month, firstDayOfWeek, value, initFormat } = this.data;
       const _month = month == 1 ? 12 : month - 1;
       const _year = month === 1 ? year - 1 : year;
       this.setData({
         year: _year,
         month: _month,
-        datalist: this.getDateLis(_year, _month, firstDayOfWeek, value, initFormat)
+        datalist: this.getDateLis(
+          _year,
+          _month,
+          firstDayOfWeek,
+          value,
+          initFormat
+        ),
       });
     },
     // 下一个月
     handleNextMonth: function () {
-      const {year, month, firstDayOfWeek, value, initFormat} = this.data;
+      const { year, month, firstDayOfWeek, value, initFormat } = this.data;
       const _month = month == 12 ? 1 : month + 1;
       const _year = month === 12 ? year + 1 : year;
       this.setData({
         year: _year,
         month: _month,
-        datalist: this.getDateLis(_year, _month, firstDayOfWeek, value, initFormat)
-       });
-    }
+        datalist: this.getDateLis(
+          _year,
+          _month,
+          firstDayOfWeek,
+          value,
+          initFormat
+        ),
+      });
+    },
   },
-});
+});

package/src/mp/components/calendar/index.wxml

@@ -1,18 +1,32 @@
 <view class="{{className}} weda-calendar ext-class">
   <view class="weda-calendar__control">
-    <view class="weda-calendar__prevMonth" wx:if="{{visible}}" bindtap="handlePrevMonth">
-      <image class="weda-calendar__prevMonth-icon" src='arrowright--line.svg' />
+    <view
+      class="weda-calendar__prevMonth"
+      wx:if="{{visible}}"
+      bindtap="handlePrevMonth"
+    >
+      <image class="weda-calendar__prevMonth-icon" src="arrowright--line.svg" />
     </view>
     <view class="weda-calendar__current-date">{{year}}年{{month}}月</view>
-    <view class="weda-calendar__nextMonth" wx:if="{{visible}}" bindtap="handleNextMonth">
-      <image class="weda-calendar__nextMonth-icon" src='arrowright--line.svg' />
+    <view
+      class="weda-calendar__nextMonth"
+      wx:if="{{visible}}"
+      bindtap="handleNextMonth"
+    >
+      <image class="weda-calendar__nextMonth-icon" src="arrowright--line.svg" />
     </view>
   </view>
   <view class="weda-calendar__panel">
     <view class="weda-calendar__table">
       <view class="weda-calendar__table-head">
         <view class="weda-calendar__table-head-row">
-          <view class="weda-calendar__table-head-cell" wx:for="{{headerlist}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+          <view
+            class="weda-calendar__table-head-cell"
+            wx:for="{{headerlist}}"
+            wx:for-index="index"
+            wx:for-item="item"
+            wx:key="index"
+          >
             {{item.text}}
           </view>
         </view>
@@ -21,11 +35,17 @@
         <block wx:for="{{datalist}}" wx:for-item="dateRow" wx:key="index">
           <view class="weda-calendar__table-body-row">
             <block wx:for="{{dateRow}}" wx:for-item="dateCell" wx:key="index">
-              <view class="'weda-calendar__table-body-cell' {{dateCell.belongTo !== 0 ? 'is-disabled ': ''}} {{dateCell.disabled ? 'is-invalid' : ''}}{{dateCell.isNow ? 'is-now' : ''}}">
+              <view
+                class="'weda-calendar__table-body-cell' {{dateCell.belongTo !== 0 ? 'is-disabled ': ''}} {{dateCell.disabled ? 'is-invalid' : ''}}{{dateCell.isNow ? 'is-now' : ''}}"
+              >
                 <view class="weda-calendar__table-body-cell-value">
                   {{dateCell.dateDay}}
                   <view class="weda-calendar__table-body-cell-bg"></view>
-                  <view wx:if="{{dateCell.marked}}" class="weda-calendar__table-body-cell-marked" style="background: {{dateCell.marked}}"></view>
+                  <view
+                    wx:if="{{dateCell.marked}}"
+                    class="weda-calendar__table-body-cell-marked"
+                    style="background: {{dateCell.marked}}"
+                  ></view>
                 </view>
               </view>
             </block>
@@ -34,4 +54,4 @@
       </view>
     </view>
   </view>
-</view>
+</view>

package/src/mp/components/carousel/index.wxml

@@ -1,6 +1,33 @@
 <!--components/carousel/index.wxml-->
-<swiper id="{{id}}" class="weda-ui {{className}}" style="{{style}}" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" current="{{current}}" interval="{{interval}}" duration="{{duration}}" circular="{{circular}}" vertical="{{vertical}}" indicator-color="{{indicatorColor}}" indicator-active-color="{{indicatorActiveColor}}" bindchange="changeCurrent">
-  <swiper-item class="carousle-swiper-item" bindtap="tapImg" wx:for="{{images}}" wx:key="index" data-tapMode="{{item.tapMode}}" data-insideUrl="{{item.insideUrl}}" data-params="{{item.params}}" >
-    <Img class="carousle-image" src="{{item.image}}" fit="{{item.fit}}" style="{{'height:'+item.height+';'+'width:'+item.width}}" />
+<swiper
+  id="{{id}}"
+  class="weda-ui {{className}}"
+  style="{{style}}"
+  indicator-dots="{{indicatorDots}}"
+  autoplay="{{autoplay}}"
+  current="{{current}}"
+  interval="{{interval}}"
+  duration="{{duration}}"
+  circular="{{circular}}"
+  vertical="{{vertical}}"
+  indicator-color="{{indicatorColor}}"
+  indicator-active-color="{{indicatorActiveColor}}"
+  bindchange="changeCurrent"
+>
+  <swiper-item
+    class="carousle-swiper-item"
+    bindtap="tapImg"
+    wx:for="{{images}}"
+    wx:key="index"
+    data-tapMode="{{item.tapMode}}"
+    data-insideUrl="{{item.insideUrl}}"
+    data-params="{{item.params}}"
+  >
+    <img
+      class="carousle-image"
+      src="{{item.image}}"
+      fit="{{item.fit}}"
+      style="{{'height:'+item.height+';'+'width:'+item.width}}"
+    />
   </swiper-item>
 </swiper>

package/src/mp/components/chart/bar/index.js

@@ -195,7 +195,6 @@ Component({
       type: String,
       value: '',
     },
-
   },
   data: {
     ec: {},
@@ -223,7 +222,7 @@ Component({
   },
   observers: {
     // 当参数变化时
-    '**': async function() {
+    '**': async function () {
       const objEChartBar = new EchartBar();
       await objEChartBar.setOptions(this.properties);
       const options = await objEChartBar.getOptions();

package/src/mp/components/chart/bar/index.wxml

@@ -1,3 +1,8 @@
-<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}">
-    <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
+<view
+  wx:if="ec"
+  class="{{className}} ec_container"
+  style="{{style}}"
+  id="{{id}}"
+>
+  <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
 </view>

package/src/mp/components/chart/common/config/bar.js

@@ -13,7 +13,7 @@ const getConfig = () => {
       },
       type: 'category',
       data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-      inverse:false,
+      inverse: false,
     },
     yAxis: {
       type: 'value',

package/src/mp/components/chart/common/core/eChartBar.js

@@ -37,13 +37,14 @@ class EchartBar extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
       const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
       const arrXisCountEmptyIndex = []; // 记录空值的key
-      if (Object.keys(groupKey ?? {}).length === 0) { // 没有分组
+      if (Object.keys(groupKey ?? {}).length === 0) {
+        // 没有分组
         const numLine = arrSourData[0].YLabels.length;
         if (numLine > 0) {
           for (let j = 0; j < numLine; j++) {
@@ -58,16 +59,21 @@ class EchartBar extends EchartBase {
               stack: isPile ? 'pile' : null,
               data: [],
             };
-            sortedXAxisData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource, index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((!itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) && !xIsCountEmpty) {
+              if (
+                (!itemSource.YLabels[j].Value === undefined ||
+                  itemSource.YLabels[j].Value === null) &&
+                !xIsCountEmpty
+              ) {
                 arrXisCountEmptyIndex.push(index);
               } else {
-                const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
+                const value = itemSource.YLabels[j].Value
+                  ? itemSource.YLabels[j].Value
+                  : 0;
                 this.config.series[j].data.push(value);
               }
             });
-
           }
         }
         // 处理显示空值问题
@@ -103,23 +109,13 @@ class EchartBar extends EchartBase {
             label: {
               show: true,
             },
-            data: this.getSeriesDataGroup(
-              arrXaxisData,
-              objGroupKey[groupKey],
-            ),
+            data: this.getSeriesDataGroup(arrXaxisData, objGroupKey[groupKey]),
             stack: isPile ? 'pile' : null,
           };
           return serie;
         });
-        this.config.tooltip.formatter = params => (
-          `${params.data.dimensionality
-          }\r\n${
-            params.data.name
-          }\r\n${
-            params.seriesName
-          }:${
-            params.value}`
-        );
+        this.config.tooltip.formatter = (params) =>
+          `${params.data.dimensionality}\r\n${params.data.name}\r\n${params.seriesName}:${params.value}`;
       }
       console.log('sourData处理后数据bar:', this.config.series);
     }
@@ -140,19 +136,17 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = Math.max(0, decimalDigits);
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.showSymbol = isSeriesShowSymbol;
         itemSeries.label.show = isSeriesShowSymbol;
         if (isUnit) {
           itemSeries.label.formatter = (params) => {
             const objNewValue = this.getValueByUnit(params.value, unit);
-            return (
-              `${objNewValue.toFixed(decimalDigits)}${suffix}`
-            );
+            return `${objNewValue.toFixed(decimalDigits)}${suffix}`;
           };
         }
       });
@@ -166,17 +160,18 @@ class EchartBar extends EchartBase {
     }
   }
   // 设置柱状图X,Y倒转
-  setDirectionType({directionType}) {
+  setDirectionType({ directionType }) {
     let temAxis = {};
-    if (directionType === 'crosswise') { // 横向
+    if (directionType === 'crosswise') {
+      // 横向
       temAxis = this.config.xAxis;
       // @ts-ignore
       this.config.xAxis = this.config.yAxis;
       // @ts-ignore
       this.config.yAxis = temAxis;
-      this.config.yAxis.inverse =  true;
-
-    } else { // 纵向
+      this.config.yAxis.inverse = true;
+    } else {
+      // 纵向
       if (this.config.yAxis.inverse) {
         temAxis = this.config.yAxis;
         // @ts-ignore
@@ -220,7 +215,7 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     if (dataSource) {
       await this.setSourceData({
@@ -241,7 +236,7 @@ class EchartBar extends EchartBase {
     this.setIsXaxisAxisLabelShow({ isXaxisAxisLabelShow });
     this.setIsXaxisName({ isXaxisName, xAxisName });
     this.setIsXaxisAxisTickShow({ isXaxisAxisTickShow });
-    this.setIsXaxisAxisLabelRotate({ isXaxisAxisLabelRotate, xStatistics});
+    this.setIsXaxisAxisLabelRotate({ isXaxisAxisLabelRotate, xStatistics });
     this.setIsYAxisSplitlineLinestyleWidth({
       isYAxisSplitlineLinestyleWidth,
       yAxisSplitlineLinestyleType,
@@ -254,9 +249,9 @@ class EchartBar extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
-    this.setDirectionType({directionType});
+    this.setDirectionType({ directionType });
   }
 }