@cloudbase/weda-ui-mp 3.14.2 → 3.15.0

package/components/chart/bar/index.js

@@ -220,10 +220,6 @@ Component({
   },
   data: {
     ec: {},
-    canvas_id: {
-      type: String,
-      value: `canvas_line_${Date.now()}_${Math.random() * 100}`,
-    },
   },
   lifetimes: {
     attached() {
@@ -269,22 +265,11 @@ Component({
         return options ?? [];
       } else {
         if (this.properties.dataSourceType === 'variable') {
-          const result = transform(
-            'bar',
-            this.properties.datasourceVariable,
-            this.properties
-          );
+          const result = transform('bar', this.properties.datasourceVariable, this.properties);
           return result ?? [];
         } else if (this.properties.dataSourceType === 'custom-connector') {
-          const { connector, connectorMethod, connectorParams } =
-            this.properties;
-          if (
-            !(
-              connector?.datasource?.name &&
-              connectorMethod?.name &&
-              connectorParams
-            )
-          ) {
+          const { connector, connectorMethod, connectorParams } = this.properties;
+          if (!(connector?.datasource?.name && connectorMethod?.name && connectorParams)) {
             console.warn('Chart 参数不完整');
           }
           const res = await callDataSource({
@@ -299,6 +284,7 @@ Component({
     },
     initData() {
       this.setData({
+        id: this.id,
         ec: {
           onInit: this.initChart.bind(this),
         },
@@ -312,7 +298,6 @@ Component({
       });
       canvas.setChart(objEchart);
       const options = await this.getData();
-      console.log('设置前参数bar', options);
       objEchart.setOption(options, true);
       this._chart = objEchart;
       return objEchart;
@@ -324,7 +309,6 @@ Component({
       const canvas = this.selectComponent(`#canvas_${this.properties.id}`);
       canvas?.init();
       const options = await this.getData();
-      console.log('设置前参数bar', options);
       this._chart && this._chart.setOption(options, true);
     },
   },

package/components/chart/bar/index.wxml

@@ -1 +1 @@
-<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvas-id="{{canvas_id}}" ec="{{ ec }}" /> </view>
+<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvasId="{{'canvas_'+id}}" ec="{{ ec }}" /> </view>

package/components/chart/common/data-transform.js

@@ -2,10 +2,7 @@ import lodashSet from 'lodash.set';
 import { isNil } from '../../../utils/lodash';
 
 export const checkIsNewData = (props) => {
-  return (
-    Object.keys(props.dataSource ?? {}).length === 0 &&
-    Object.keys(props['dataModel'] ?? {}).length > 0
-  );
+  return Object.keys(props.dataSource ?? {}).length === 0 && Object.keys(props['dataModel'] ?? {}).length > 0;
 };
 
 export function transform(chartType, dataInput, chartInput) {
@@ -56,9 +53,7 @@ export function transform(chartType, dataInput, chartInput) {
 
   const finalDataInput = (dataInput ?? [])?.filter((item) => {
     if (!chartInput.xIsCountEmpty) {
-      return (
-        item.XLabel['Value'] !== undefined && item.XLabel['Value'] !== null
-      );
+      return item.XLabel['Value'] !== undefined && item.XLabel['Value'] !== null;
     }
 
     return true;
@@ -100,13 +95,9 @@ export function transform(chartType, dataInput, chartInput) {
         if (!series[idx]) {
           series[idx] = {
             type: chartType,
-            name:
-              chartType === 'pie'
-                ? undefined
-                : eachYaxis.Cn_Name ?? eachYaxis.Name,
+            name: chartType === 'pie' ? undefined : eachYaxis.Cn_Name ?? eachYaxis.Name,
             stack: chartInput.isPile ? 'pile' : undefined,
-            showSymbol:
-              chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
+            showSymbol: chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
             label: {
               show: chartInput.isSeriesShowSymbol, // 老逻辑这么来的
             },
@@ -166,8 +157,7 @@ export function transform(chartType, dataInput, chartInput) {
         type: chartType,
         name: groupName,
         stack: chartInput.isPile ? 'pile' : undefined,
-        showSymbol:
-          chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
+        showSymbol: chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
         label: {
           show: chartInput.isSeriesShowSymbol, // 老逻辑这么来的
         },
@@ -201,7 +191,7 @@ export function transform(chartType, dataInput, chartInput) {
     });
   }
 
-  console.log(dataInput, chartInput, 'TRANSFORM');
+  // console.log(dataInput, chartInput, 'TRANSFORM');
 
   if (chartType === 'bar' || chartType === 'line') {
     const xAxis = {

package/components/chart/ec-canvas/ec-canvas.js

@@ -48,7 +48,7 @@ Component({
   data: {
     isUseNewCanvas: false,
   },
-
+  domObserver: null,
   ready: function () {
     // Disable prograssive because drawImage doesn't support DOM as parameter
     // See https://developers.weixin.qq.com/miniprogram/dev/api/canvas/CanvasContext.drawImage.html
@@ -67,14 +67,10 @@ Component({
     if (!this.data.ec) {
       console.warn(
         '组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" ' +
-          'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>'
+          'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>',
       );
       return;
     }
-
-    if (!this.data.ec.lazyLoad) {
-      this.init();
-    }
   },
 
   methods: {
@@ -100,13 +96,11 @@ Component({
           console.error(
             '微信基础库版本过低，需大于等于 1.9.91。' +
               '参见：https://github.com/ecomfe/echarts-for-weixin' +
-              '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82'
+              '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82',
           );
           return;
         } else {
-          console.warn(
-            '建议将微信基础库调整大于等于2.9.0版本。升级后绘图将有更好性能'
-          );
+          console.warn('建议将微信基础库调整大于等于2.9.0版本。升级后绘图将有更好性能');
           this.initByOldWay(callback);
         }
       }
@@ -128,16 +122,8 @@ Component({
         .boundingClientRect(async (res) => {
           if (typeof callback === 'function') {
             this.chart = callback(canvas, res.width, res.height, canvasDpr);
-          } else if (
-            this.data.ec &&
-            typeof this.data.ec.onInit === 'function'
-          ) {
-            this.chart = await this.data.ec.onInit(
-              canvas,
-              res.width,
-              res.height,
-              canvasDpr
-            );
+          } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+            this.chart = await this.data.ec.onInit(canvas, res.width, res.height, canvasDpr);
           } else {
             this.triggerEvent('init', {
               canvas: canvas,
@@ -154,7 +140,7 @@ Component({
       // version >= 2.9.0：使用新的方式初始化
       const query = wx.createSelectorQuery().in(this);
       query
-        .select('.ec-canvas')
+        .select(`#${this.data.canvasId}`)
         .fields({ node: true, size: true })
         .exec(async (res) => {
           const canvasNode = res[0].node;
@@ -166,28 +152,15 @@ Component({
 
           const ctx = canvasNode.getContext('2d');
 
-          const canvas = new WxCanvas(
-            ctx,
-            this.data.canvasId,
-            true,
-            canvasNode
-          );
+          const canvas = new WxCanvas(ctx, this.data.canvasId, true, canvasNode);
           echarts.setCanvasCreator(() => {
             return canvas;
           });
 
           if (typeof callback === 'function') {
             this.chart = callback(canvas, canvasWidth, canvasHeight, canvasDpr);
-          } else if (
-            this.data.ec &&
-            typeof this.data.ec.onInit === 'function'
-          ) {
-            this.chart = await this.data.ec.onInit(
-              canvas,
-              canvasWidth,
-              canvasHeight,
-              canvasDpr
-            );
+          } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+            this.chart = await this.data.ec.onInit(canvas, canvasWidth, canvasHeight, canvasDpr);
           } else {
             this.triggerEvent('init', {
               canvas: canvas,
@@ -196,6 +169,8 @@ Component({
               dpr: canvasDpr,
             });
           }
+
+          this.domObserver && this.domObserver.disconnect();
         });
     },
     canvasToTempFilePath(opt) {
@@ -264,6 +239,29 @@ Component({
         handler.processGesture(wrapTouch(e), 'end');
       }
     },
+
+    // 监听模块曝光
+    observeModuleExpose() {
+      this.domObserver && this.domObserver.disconnect();
+      this.domObserver = wx.createIntersectionObserver(this);
+      this.domObserver.relativeToViewport().observe(`#${this.data.canvasId}`, (res) => {
+        // 当页面出现图表时再绘制图表，避免出现白屏
+        if (res.intersectionRatio) {
+          this.init();
+        }
+      });
+    },
+  },
+  lifetimes: {
+    attached() {
+      // 在组件实例进入页面节点树时执行
+      if (!this.data.ec.lazyLoad) {
+        this.observeModuleExpose();
+      }
+    },
+    detached() {
+      this.domObserver && this.domObserver.disconnect();
+    },
   },
 });
 

package/components/chart/ec-canvas/ec-canvas.wxml

@@ -1,4 +1,4 @@
 <!-- 新的：接口对齐了H5 -->
-<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" id="{{canvasId}}" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
 <!-- 旧的 -->
 <canvas wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>

package/components/chart/line/index.js

@@ -215,10 +215,6 @@ Component({
   },
   data: {
     ec: {},
-    canvas_id: {
-      type: String,
-      value: `canvas_line_${Date.now()}_${Math.random() * 100}`,
-    },
   },
   lifetimes: {
     attached() {
@@ -264,22 +260,11 @@ Component({
         return options ?? [];
       } else {
         if (this.properties.dataSourceType === 'variable') {
-          const result = transform(
-            'line',
-            this.properties.datasourceVariable,
-            this.properties
-          );
+          const result = transform('line', this.properties.datasourceVariable, this.properties);
           return result ?? [];
         } else if (this.properties.dataSourceType === 'custom-connector') {
-          const { connector, connectorMethod, connectorParams } =
-            this.properties;
-          if (
-            !(
-              connector?.datasource?.name &&
-              connectorMethod?.name &&
-              connectorParams
-            )
-          ) {
+          const { connector, connectorMethod, connectorParams } = this.properties;
+          if (!(connector?.datasource?.name && connectorMethod?.name && connectorParams)) {
             console.warn('Chart 参数不完整');
           }
           const res = await callDataSource({
@@ -294,6 +279,7 @@ Component({
     },
     initData() {
       this.setData({
+        id: this.id,
         ec: {
           onInit: this.initChart.bind(this),
         },
@@ -307,7 +293,6 @@ Component({
       });
       canvas.setChart(objEchart);
       const options = await this.getData();
-      console.log('设置前参数line', options);
       objEchart.setOption(options, true);
       this._chart = objEchart;
       return objEchart;
@@ -319,7 +304,6 @@ Component({
       const canvas = this.selectComponent(`#canvas_${this.properties.id}`);
       canvas?.init();
       const options = await this.getData();
-      console.log('设置前参数line', options);
       this._chart && this._chart.setOption(options, true);
     },
   },

package/components/chart/line/index.wxml

@@ -1 +1 @@
-<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvas-id="{{canvas_id}}" ec="{{ ec }}" /> </view>
+<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvasId="{{'canvas_'+id}}" ec="{{ ec }}" /> </view>

package/components/chart/pie/index.js

@@ -145,10 +145,6 @@ Component({
   },
   data: {
     ec: {},
-    canvas_id: {
-      type: String,
-      value: `canvas_pie_${Date.now()}_${Math.random() * 100}`,
-    },
   },
   lifetimes: {
     attached() {
@@ -173,7 +169,6 @@ Component({
       const canvas = this.selectComponent(`#canvas_${this.properties.id}`);
       canvas?.init();
       const options = await this.getData();
-      console.log('设置前参数pie', options);
       this._chart && this._chart.setOption(options, true);
     },
   },
@@ -204,22 +199,11 @@ Component({
         return options ?? [];
       } else {
         if (this.properties.dataSourceType === 'variable') {
-          const result = transform(
-            'pie',
-            this.properties.datasourceVariable,
-            this.properties
-          );
+          const result = transform('pie', this.properties.datasourceVariable, this.properties);
           return result ?? [];
         } else if (this.properties.dataSourceType === 'custom-connector') {
-          const { connector, connectorMethod, connectorParams } =
-            this.properties;
-          if (
-            !(
-              connector?.datasource?.name &&
-              connectorMethod?.name &&
-              connectorParams
-            )
-          ) {
+          const { connector, connectorMethod, connectorParams } = this.properties;
+          if (!(connector?.datasource?.name && connectorMethod?.name && connectorParams)) {
             console.warn('Chart 参数不完整');
           }
           const res = await callDataSource({
@@ -234,6 +218,7 @@ Component({
     },
     initData() {
       this.setData({
+        id: this.id,
         ec: {
           onInit: this.initChart.bind(this),
         },
@@ -248,7 +233,6 @@ Component({
       canvas.setChart(objEchart);
       const options = await this.getData();
       // objEchart.clear();
-      console.log('设置前参数pie', options);
       objEchart.setOption(options, true);
       this._chart = objEchart;
       return objEchart;

package/components/chart/pie/index.wxml

@@ -1 +1 @@
-<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvas-id="{{canvas_id}}" ec="{{ ec }}" /> </view>
+<view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}"> <ec-canvas id="{{'canvas_'+id}}" canvasId="{{'canvas_'+id}}" ec="{{ ec }}" /> </view>

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

@@ -1109,4 +1109,19 @@ textarea {
 }
 .wd-mp-form-item-obj .wd-form-item--weui.wd-form-item {
   width: 100%;
+}
+
+.wd-input-password-icon {
+  padding: 0 5px;
+  display: flex;
+  cursor: pointer;
+}
+
+.wd-pc-input-password-icon {
+  position: absolute;
+  right: -30px;
+}
+
+.password-input .wd-form-item-wrap__control-wrap {
+  position: relative;
 }

package/components/form/select/dropdown-select/index.js

@@ -59,7 +59,7 @@ Component({
     searchValue: '',
     disabledIndex: -1, // 预留参数，暂时无用
     clickIndex: 0,
-    index: 0,
+    index: -1,
     status: 0,
     showOption: [],
     isFinish: false,
@@ -84,14 +84,7 @@ Component({
     bindinput: function (event) {
       const value = event.detail.value;
 
-      const {
-        option,
-        loadStatus,
-        isTurnPages,
-        _needFetch,
-        ignoreCase,
-        staticSearchable,
-      } = this.properties;
+      const { option, loadStatus, isTurnPages, _needFetch, ignoreCase, staticSearchable } = this.properties;
       if (value === '' || value === this.data.searchValue) {
         this.setData({
           searchValue: value,
@@ -124,9 +117,7 @@ Component({
 
           const searchOption = option.filter((item) => {
             if (ignoreCase) {
-              return String(item.label)
-                .toLowerCase()
-                .includes(value.toLowerCase());
+              return String(item.label).toLowerCase().includes(value.toLowerCase());
             }
             return item.label.includes(value);
           });
@@ -182,7 +173,7 @@ Component({
       }
       const { isFinish, searchValue, searchPageNo } = this.data;
       if (searchValue === '') {
-        if (this.properties.loadStatus === 1 && isFinish) {
+        if (isFinish) {
           this.setData({
             pageNo: this.properties.pageNo + 1,
             isFinish: false,
@@ -193,7 +184,7 @@ Component({
           });
         }
       } else {
-        if (this.properties.searchStatus === 1 && isFinish) {
+        if (isFinish) {
           this.setData({
             searchPageNo: this.data.searchPageNo + 1,
             isFinish: false,
@@ -234,54 +225,46 @@ Component({
     },
   },
   observers: {
-    'option, loadStatus, searchOption, searchStatus, _needFetch, staticSearchable':
-      function (
-        option,
-        loadStatus,
-        searchOption,
-        searchStatus,
-        _needFetch,
-        staticSearchable
-      ) {
-        if (this.data.searchValue === '') {
-          // 初始化会走到这
-          const { chooseIndexValue } = this.properties;
-          let index = -1;
-          if (chooseIndexValue !== '') {
-            index = option.findIndex((item) => item.value === chooseIndexValue);
-          } else {
-            option.some((item, i) => {
-              if (!item?.disabled) {
-                index = i;
-                return true;
-              }
-            });
-          }
+    'option, loadStatus, searchOption, searchStatus, _needFetch, staticSearchable': function (
+      option,
+      loadStatus,
+      searchOption,
+      searchStatus,
+      _needFetch,
+      staticSearchable,
+    ) {
+      if (this.data.searchValue === '') {
+        // 初始化会走到这
+        const { chooseIndexValue } = this.properties;
+        let index = -1;
+        if (chooseIndexValue !== '') {
+          index = option.findIndex((item) => item.value === chooseIndexValue);
+        }
+        this.setData({
+          status: loadStatus,
+          showOption: option,
+          isFinish: true,
+          index: index,
+          clickIndex: index,
+        });
+      } else {
+        if (_needFetch) {
+          // 只有needFetch 才设置searchOption
           this.setData({
-            status: loadStatus,
+            status: searchStatus,
+            showOption: searchOption,
+            isFinish: true,
+            index: -1,
+          });
+        } else if (!staticSearchable) {
+          this.setData({
+            status: searchStatus,
             showOption: option,
             isFinish: true,
-            index: index,
-            clickIndex: index,
+            index: -1,
           });
-        } else {
-          if (_needFetch) {
-            // 只有needFetch 才设置searchOption
-            this.setData({
-              status: searchStatus,
-              showOption: searchOption,
-              isFinish: true,
-              index: -1,
-            });
-          } else if (!staticSearchable) {
-            this.setData({
-              status: searchStatus,
-              showOption: option,
-              isFinish: true,
-              index: -1,
-            });
-          }
         }
-      },
+      }
+    },
   },
 });

package/components/form/select/dropdown-select/index.wxml

@@ -26,7 +26,7 @@
             加载失败
             <text class="weda-ui-custom-picker__btn weda-ui-custom-picker__btn--link" bindtap="onRetry">重试</text>
           </view>
-          <view wx:if="{{status === 3}}" class="weda-ui-custom-picker__status"> 暂无数据 </view>
+          <view wx:if="{{status === 3&&!showOption.length}}" class="weda-ui-custom-picker__status"> 暂无数据 </view>
         </view>
       </view>
     </scroll-view>

package/components/form/select/dropdown-select/index.wxss

@@ -280,8 +280,7 @@
   transform: translateX(0);
 }
 
-.weda-ui-custom-search.is-focused
-  .weda-ui-custom-search-box__search-placeholder {
+.weda-ui-custom-search.is-focused .weda-ui-custom-search-box__search-placeholder {
   display: none;
 }
 

package/components/form/select/index.js

@@ -592,7 +592,7 @@ Component({
         },
       });
       const results = data?.records;
-      console.log(results, param, 'Records');
+      // console.log(results, param, 'Records');
       if (isUpdate && results && results.length > 0) {
         this.setData({
           chooseIndexLable: results[0][this.properties.primaryField] || results[0]._id,

package/components/form/selectMultiple/dropdown-select/index.js

@@ -124,10 +124,7 @@ Component({
       const { selectedCache } = this.data;
       const index = selectedCache.findIndex((v) => v.value === item.value);
       if (index > -1) {
-        return [
-          ...selectedCache.slice(0, index),
-          ...selectedCache.slice(index + 1),
-        ];
+        return [...selectedCache.slice(0, index), ...selectedCache.slice(index + 1)];
       }
 
       return [...selectedCache, item];
@@ -182,11 +179,7 @@ Component({
     },
   },
   observers: {
-    'option,searchValue,staticSearchable': function (
-      option,
-      searchValue,
-      staticSearchable
-    ) {
+    'option,searchValue,staticSearchable': function (option, searchValue, staticSearchable) {
       const { ignoreCase } = this.properties;
       if (searchValue === '') {
         this.setData({
@@ -196,11 +189,7 @@ Component({
       } else if (staticSearchable) {
         const searchRange = option.filter((item) => {
           if (ignoreCase) {
-            return (
-              String(item.label)
-                .toLowerCase()
-                .indexOf(searchValue.toLowerCase()) !== -1
-            );
+            return String(item.label).toLowerCase().indexOf(searchValue.toLowerCase()) !== -1;
           }
           return item.label.indexOf(searchValue) !== -1;
         });
@@ -215,17 +204,18 @@ Component({
       }
     },
     selectedValue: function (selectedValue) {
-      const data = Array.isArray(selectedValue)
-        ? selectedValue
-        : [selectedValue];
+      const data = Array.isArray(selectedValue) ? selectedValue : [selectedValue];
       const optionMap = this.properties.option.reduce((pre, cur) => {
         pre[cur.value] = cur;
         return pre;
       }, {});
-      const selectedCache = data
-        .map((d) => optionMap[d])
-        .filter((item) => !!item);
+      const selectedCache = data.map((d) => optionMap[d]).filter((item) => !!item);
       this.setData({ selectedCache });
     },
+    loadStatus: function (loadStatus) {
+      this.setData({
+        status: loadStatus,
+      });
+    },
   },
 });