@cloudbase/weda-ui 0.2.16 → 0.2.17

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

@@ -0,0 +1,178 @@
+import * as echarts from '../common/lib/echarts.min';
+import EchartPie from '../common/core/eChartPie';
+Component({
+  options: {
+    virtualHost: true,
+    multipleSlots: true,
+  },
+  properties: {
+    id: {
+      type: String,
+      value: '',
+    },
+    className: {
+      type: String,
+      value: '',
+    },
+    style: {
+      type: String,
+      value: '',
+    },
+    chartType: {
+      // 图形类型
+      type: String,
+      value: 'bight',
+    },
+    title: {
+      // 图表标题
+      type: String,
+    },
+    isTitle: {
+      // 是否显示标题
+      type: Boolean,
+      value: false,
+    },
+    titleLocation: {
+      type: String,
+      value: 'top',
+    },
+    dataSource: {
+      // 数据源
+      type: Object,
+    },
+    filterData: {
+      // 数据筛选
+      type: Array,
+      value: [],
+    },
+    setColor: {
+      // 设置颜色
+      type: Array,
+      value: [],
+    },
+    xField: {
+      // x轴字段选择
+      type: Object,
+      value: {
+        format: '',
+        type: '', // 数据源字段 类型
+        title: '', // 字段名中文
+        name: '', // 字段名英文
+      },
+    },
+    xStatistics: {
+      // x轴统计维度
+      type: String,
+      value: '', // 统计纬度, 只有选择时间类型才有，y 年，m月，d 日，w周，h时，min 分，s秒
+    },
+    xIsCountEmpty: {
+      // x轴 是否统计空值
+      type: Boolean,
+      value: false,
+    },
+    yField: {
+      // Y轴字段，分组字段，是否分组
+      type: Object,
+      value: {
+        numValue: [{ key: '', operationType: '' }],
+        groupKey: '',
+      },
+    },
+    isLegend: {
+      // 是否显示图例
+      type: Boolean,
+      value: false,
+    },
+    legend: {
+      // 图例
+      type: String,
+      value: 'bottom', // 左 left 右right, 上top，下 bottom
+    },
+
+    // 高级属性
+    isSeriesShowSymbol: {
+      // 是否显示数据标签 开启后 属性 series.label.show 要同时设置为true
+      type: Boolean,
+      value: true,
+    },
+    isPercent: {
+      // 百分比
+      type: Boolean,
+      value: false,
+    },
+    isUnit: {
+      // 显示单位
+      type: Boolean,
+      value: false,
+    },
+    unit: {
+      // 数字显示的单位 百分比，千分比，千，万，百万，亿，十亿
+      type: String,
+      value: '%',
+    },
+    decimalDigits: {
+      // 小数位数
+      type: Number,
+      value: 0,
+    },
+    suffix: {
+      // 后缀
+      type: String,
+      value: '',
+    },
+  },
+  data: {
+    ec: {},
+    canvas_id: {
+      type: String,
+      value: `canvas_pie_${Date.now()}_${Math.random() * 100}`,
+    },
+  },
+  lifetimes: {
+    attached() {
+      // 在组件实例进入页面节点树时执行
+      this.initData();
+    },
+    detached() {
+      // 在组件实例被从页面节点树移除时执行
+    },
+  },
+  // 以下是旧式的定义方式，可以保持对 <2.2.3 版本基础库的兼容
+  attached() {
+    // 在组件实例进入页面节点树时执行
+    this.initData();
+  },
+  detached() {
+    // 在组件实例被从页面节点树移除时执行
+  },
+  observers: {
+    // 当参数变化时
+    option() {
+      this.initData();
+    },
+  },
+  methods: {
+    initData() {
+      this.setData({
+        ec: {
+          onInit: this.initChart.bind(this),
+        },
+      });
+    },
+    async initChart(canvas, width, height, dpr) {
+      const objEchart = echarts.init(canvas, null, {
+        width,
+        height,
+        devicePixelRatio: dpr,
+      });
+      canvas.setChart(objEchart);
+      const objEChartPie = new EchartPie();
+      await objEChartPie.setOptions(this.properties);
+      const options = await objEChartPie.getOptions();
+      // objEchart.clear();
+      console.log('设置前参数pie', options);
+      objEchart.setOption(options);
+      return objEchart;
+    },
+  },
+});

package/src/mp/components/chart/pie/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "ec-canvas": "../ec-canvas/ec-canvas"
+  }
+}

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

@@ -0,0 +1,4 @@
+<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/pie/index.wxss

@@ -0,0 +1,9 @@
+/**index.wxss**/
+ec-canvas {
+  width: 100%;
+  height: 100%;
+}
+.ec_container {
+  width: 100%;
+  height: 380px;
+}

package/src/mp/components/dataView/index.json

@@ -2,6 +2,6 @@
   "component": true,
   "styleIsolation": "shared",
   "usingComponents": {
-    "list-view": "../listView"
+    "list-view": "../internals/listView"
   }
 }

package/src/mp/components/form/radio/index.js

@@ -75,4 +75,9 @@ Component({
       },
     ]),
   },
+  observers: {
+    range: function (range) {
+      this.setData({ defaultRange: range });
+    },
+  },
 });

package/src/mp/components/form/select/index.wxml

@@ -1,5 +1,5 @@
-<formcell 
-	className="{{cls}}" 
+<formcell
+	className="{{cls}}"
 	style="{{style}}"
 	label="{{labelVisible ? label : null}}"
 	layout="{{layout}}"
@@ -9,7 +9,7 @@
 	<view class="{{subCls}}">
 		<view class="weui-cell__bd">
 			<picker
-			 class="weui-picker__group"
+			 class="weui-picker__group weui-input"
 			 bindchange="onChange"
 			 bindcancel="onCancel"
 			 mode="{{mode}}"
@@ -22,4 +22,4 @@
 			</picker>
 		</view>
 	</view>
-</formcell>
+</formcell>

package/src/mp/components/form/textarea/index.wxml

@@ -1,5 +1,5 @@
-<formcell 
-	className="{{cls}}" 
+<formcell
+	className="{{cls}}"
 	style="{{style}}"
 	label="{{labelVisible ? label : null}}"
 	layout="{{layout}}"
@@ -8,15 +8,16 @@
 >
   <view class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}">
     <view class="weui-cell__bd">
-      <textarea 
-        class="weui-textarea" 
+      <textarea
+        class="weui-textarea"
         placeholder="{{placeholder}}"
         placeholder-class="weui-input__placeholder"
         bindinput="handleChange"
         value="{{value}}"
+        disable="{{disabled}}"
         maxlength="{{maxLength}}"
       ></textarea>
       <view wx:if="{{counterVisible}}" class="weui-textarea-counter"><span>{{!!value ? value.length : 0}}</span>/{{maxLength}}</view>
     </view>
   </view>
-</formcell>
+</formcell>

package/src/mp/components/form/uploader/index.js

@@ -24,8 +24,7 @@ Component({
       value: 'horizontal',
     },
     defaultValue: {
-      type: Object,
-      value: '',
+      type: null,
     },
     single: {
       type: Boolean,
@@ -75,7 +74,7 @@ Component({
       const urls = e.detail.cloudUrls; // uploadFile 获取返回值
       // 小程序自带tempURL 不需要调用 tcb.getTempFileURL 获取
       this.triggerEvent('success', {
-        value: urls[0],
+        value: urls,
       });
       this.setData({
         files: this.data.files.concat(e.detail.urls.map((url) => ({ url }))),
@@ -83,30 +82,51 @@ Component({
       });
     },
     onDelete: function (e) {
-      this.setData({
-        files: this.data.files.filter((v, index) => e.detail.index !== index),
-        urls: this.data.urls.filter((v, index) => e.detail.index !== index),
-      });
+      if (this.data.urls.length == 0) {
+        var storgeUrls = [];
+        this.data.cloudFile.forEach((v, index) => {
+          if (e.detail.index != index) {
+            storgeUrls.push(v);
+          }
+        });
+        this.setData({
+          files: this.data.files.filter((v, index) => e.detail.index !== index),
+          urls: storgeUrls,
+        });
+      } else {
+        this.setData({
+          files: this.data.files.filter((v, index) => e.detail.index !== index),
+          urls: this.data.urls.filter((v, index) => e.detail.index !== index),
+        });
+      }
     },
   },
   observers: {
     defaultValue: async function (value) {
-      if (!Array.isArray(value)) {
-        value = [value].filter((v) => v.length > 0);
-      }
-      let httpFiles = [];
-      for (let f of value) {
-        const hf = await getTempFileURL(f);
-        const httpFile = { url: hf };
-        httpFiles.push(httpFile);
+      // if (!Array.isArray(value)) {
+      //   value = [value].filter((v) => v.length > 0);
+      //  //value = [value]
+      // }
+      if (value) {
+        let httpFiles = [];
+        for (let f of value) {
+          const hf = await getTempFileURL(f);
+          const httpFile = { url: hf };
+          httpFiles.push(httpFile);
+        }
+        this.setData({
+          files: httpFiles,
+          cloudFile:
+            JSON.stringify(value) != JSON.stringify(this.data.cloudFile)
+              ? value
+              : [],
+        });
+      } else {
+        this.setData({
+          files: [],
+          cloudFile: [],
+        });
       }
-      this.setData({
-        files: httpFiles,
-        cloudFile:
-          JSON.stringify(value) != JSON.stringify(this.data.cloudFile)
-            ? value
-            : [],
-      });
     },
 
     'maxUploadCount, single': function (maxUploadCount, single) {

package/src/mp/components/form/uploader/index.wxml

@@ -1,6 +1,18 @@
 <mp-cells>
     <mp-cell>
-        <mp-uploader max-size="{{maxSize  * 1024 * 1024}}" files="{{files}}" showDelete="{{true}}" ext-class="{{layout}}" bindfail="uploadError" bindsuccess="uploadSuccess" select="{{selectFile}}" upload="{{uploadFile}}" maxCount="{{maxCount}}" title="{{title}}" tips="{{tips}}" binddelete="onDelete"></mp-uploader>
+        <mp-uploader
+        max-size="{{maxSize  * 1024 * 1024}}"
+        files="{{files}}"
+        showDelete="{{true}}"
+        ext-class="{{layout}}"
+        bindfail="uploadError"
+        bindsuccess="uploadSuccess"
+        select="{{selectFile}}"
+        upload="{{uploadFile}}"
+        maxCount="{{maxCount}}"
+        title="{{title}}"
+        binddelete="onDelete">
+        </mp-uploader>
     </mp-cell>
 </mp-cells>
 <!-- uploader delete 实际代码接受 showDelete
@@ -9,7 +21,7 @@
 
  <!-- bind开头的是事件handler，wxml模版中不能带 `{{}}`
 ```
-<mp-uploader files="{{files}}" showDelete="{{true}}" ext-class="{{layout}}" bindfail="uploadError" bindsuccess="uploadSuccess" select="{{selectFile}}" upload="{{uploadFile}}" maxCount="{{maxUploadCount}}" title="{{title}}" tips="{{tips}}" binddelete="onDelete"></mp-uploader>
+<mp-uploader files="{{files}}" showDelete="{{true}}" ext-class="{{layout}}" bindfail="uploadError" bindsuccess="uploadSuccess" select="{{selectFile}}" upload="{{uploadFile}}" maxCount="{{maxUploadCount}}" title="{{title}}" binddelete="onDelete"></mp-uploader>
 ```
-upload 是函数带{{}}， bindtelete直接传函数名字符串 
+upload 是函数带{{}}， bindtelete直接传函数名字符串
 -->

package/src/mp/components/form/uploaderFile/index.js

@@ -1,6 +1,6 @@
 import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
 import SparkMD5 from '../../../utils/spark-md5';
-import { transSize } from '../../../utils/platform';
+import { transSize, uuid } from '../../../utils/platform';
 Component({
   options: {
     virtualHost: true,
@@ -22,8 +22,7 @@ Component({
       value: false,
     },
     defaultValue: {
-      type: Array,
-      value: [],
+      type: null,
     },
     maxUploadCount: {
       type: Number,
@@ -60,6 +59,7 @@ Component({
     files: [],
     urls: [],
     cloudFile: [],
+    strogeUrls: [],
   },
   methods: {
     // 批量上传文件前置事件
@@ -133,13 +133,9 @@ Component({
       if (!this.handleBefore(files?.tempFiles)) return;
       const uploadPath = 'weda-uploader';
       const uploadPromise = files.tempFiles.map(async (tempFile) => {
-        const res = wx
-          .getFileSystemManager()
-          .readFileSync(tempFile?.path, 'utf8', 0);
-        var spark = new SparkMD5.ArrayBuffer();
-        spark.append(res);
-        var md5Path = spark.end(false);
-        const cloudPath = `${uploadPath}/${md5Path}-${tempFile.name}`;
+        const cloudPath = `${uploadPath}/${uuid().replaceAll('-', '')}-${
+          tempFile.name
+        }`;
         tempFile.percent = '0';
         tempFile.cloudPath = null;
         tempFile.filePath = tempFile?.path || null;
@@ -162,9 +158,18 @@ Component({
               _this.data.files[index].status = 'success';
               const arr = [];
               arr.push(res.fileID);
+              let strogeUrls = [];
+              //为了避免死循环 在组件接到默认值后用cloudFile做暂存，造成urls跟cloudFile不同步，根据暂存状态来处理更新urls
+              if (_this.data.cloudFile.length > 0) {
+                strogeUrls = [..._this.data.cloudFile, ...arr];
+              } else {
+                strogeUrls = [..._this.data.urls, ...arr];
+              }
+              //同步urls cloudFile
               _this.setData({
-                files: _this.data.files,
-                urls: [..._this.data.cloudFile, ..._this.data.urls, ...arr],
+                files: [..._this.data.files],
+                urls: [...strogeUrls],
+                cloudFile: [...strogeUrls],
               });
               if (_this.properties.single) {
                 _this.triggerEvent('success', {
@@ -188,6 +193,7 @@ Component({
             this.data.files[index].uploaded = transSize(res.totalBytesSent);
             this.setData({
               files: this.data.files,
+              //cloudFile:this.data.cloudFile.concat(this.data.files)
             });
           });
           return { fileID: uploadTask.fileID };
@@ -204,15 +210,30 @@ Component({
     },
 
     onDelete: function (e) {
-      const filelist = this.data.files.filter(
-        (item) => e.target.dataset.item?.path != item?.path
-      );
-      this.setData({
-        files: filelist,
-        urls: this.data.urls.filter(
-          (v, index) => e.target.dataset.item?.cloudPath != v
-        ),
-      });
+      if (this.data.urls.length == 0) {
+        var storgeUrls = [];
+        this.data.cloudFile.forEach((v, index) => {
+          if (e.target.dataset.item.cloudPath != v) {
+            storgeUrls.push(v);
+          }
+        });
+        this.setData({
+          files: this.data.files.filter(
+            (v, index) => e.target.dataset.item.cloudPath !== v.cloudPath
+          ),
+          urls: storgeUrls,
+        });
+      } else {
+        const filelist = this.data.files.filter(
+          (item) => e.target.dataset.item?.path != item?.path
+        );
+        this.setData({
+          files: filelist,
+          urls: this.data.urls.filter(
+            (v, index) => e.target.dataset.item?.cloudPath != v
+          ),
+        });
+      }
     },
     reload: function (e) {
       this.handleUpload(e.target.dataset.item);
@@ -236,11 +257,11 @@ Component({
   },
   observers: {
     defaultValue: async function (value) {
-      if (!Array.isArray(value)) {
-        value = [value].filter((v) => v.length > 0);
-      }
+      // if (!Array.isArray(value)) {
+      //   value = [value].filter((v) => v.length > 0);
+      // }
       let httpFiles = [];
-      if (value.length > 0) {
+      if (value && JSON.stringify(value) != '[]') {
         for (let f of value) {
           const hf = await getTempFileURL(f);
           const uuidReg = /[0-9a-f]{8}([0-9a-f]{4}){3}[0-9a-f]{12}-/;
@@ -256,12 +277,19 @@ Component({
           };
           httpFiles.push(httpFile);
         }
+        this.setData({
+          files: httpFiles,
+          cloudFile:
+            JSON.stringify(value) != JSON.stringify(this.data.cloudFile)
+              ? value
+              : [],
+        });
+      } else {
+        this.setData({
+          files: [],
+          cloudFile: [],
+        });
       }
-
-      this.setData({
-        files: httpFiles,
-        cloudFile: value,
-      });
     },
     'maxUploadCount, single': function (maxUploadCount, single) {
       const maxCount = single ? 1 : maxUploadCount;

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

@@ -109,11 +109,11 @@ Component({
         }
         item.paramObj = paramObj;
         if (item.withParams && item.params.length > 0) {
-          wx.navigateTo({
+          wx.redirectTo({
             url: '../' + item?.insideUrl + '/index?' + item.paramObj.join('&'),
           });
         } else {
-          wx.navigateTo({
+          wx.redirectTo({
             url: '../' + item?.insideUrl + '/index',
           });
         }
@@ -161,17 +161,16 @@ Component({
         optionList,
       });
     },
-    'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight':
-      function (
-        titleMaxLines,
-        titleColor,
-        titleFontWeight,
-        titleFontSize,
-        textAlign,
-        titleLineHeight
-      ) {
-        let titleStyle = this.properties.titleStyle;
-        titleStyle = `
+    'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight': function (
+      titleMaxLines,
+      titleColor,
+      titleFontWeight,
+      titleFontSize,
+      textAlign,
+      titleLineHeight
+    ) {
+      let titleStyle = this.properties.titleStyle;
+      titleStyle = `
       -webkit-line-clamp:${titleMaxLines ? titleMaxLines : 'revert'};
       color: ${titleColor};
       font-weight: ${titleFontWeight};
@@ -179,19 +178,18 @@ Component({
       text-align: ${textAlign};
       line-height: ${titleLineHeight == 'auto' ? 'normal' : titleLineHeight};
       `;
-        this.setData({ titleStyle });
-      },
-    'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight':
-      function (
-        desMaxLines,
-        desColor,
-        desFontWeight,
-        desFontSize,
-        textAlign,
-        desLineHeight
-      ) {
-        let desStyle = this.properties.desStyle;
-        desStyle = `
+      this.setData({ titleStyle });
+    },
+    'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight': function (
+      desMaxLines,
+      desColor,
+      desFontWeight,
+      desFontSize,
+      textAlign,
+      desLineHeight
+    ) {
+      let desStyle = this.properties.desStyle;
+      desStyle = `
       -webkit-line-clamp:${desMaxLines ? desMaxLines : 'revert'};
       color: ${desColor};
       font-weight: ${desFontWeight};
@@ -199,7 +197,7 @@ Component({
       text-align: ${textAlign};
       line-height: ${desLineHeight == 'auto' ? 'normal' : desLineHeight};
       `;
-        this.setData({ desStyle });
-      },
+      this.setData({ desStyle });
+    },
   },
 });

package/src/mp/components/internals/listView/arrow-right-line.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.1719 12.0002L8.22192 7.05023L9.63592 5.63623L15.9999 12.0002L9.63592 18.3642L8.22192 16.9502L13.1719 12.0002Z" fill="#09121F"/>
+</svg>