@cloudbase/weda-ui 0.2.13 → 0.2.16

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

@@ -1,18 +1,11 @@
-import { getCloudInstance } from '../../../utils/tcb';
-// import deepEqual from '../../../utils/deepEqual';
+import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
+import SparkMD5 from '../../../utils/spark-md5';
 
 Component({
   options: {
     virtualHost: true,
   },
-  lifetimes: {
-    attached() {
-      this.setData({
-        urls: this.properties.defaultValue,
-        files: this.properties.defaultValue.map((url) => ({ url })),
-      });
-    },
-  },
+
   properties: {
     maxUploadCount: {
       type: Number,
@@ -31,8 +24,8 @@ Component({
       value: 'horizontal',
     },
     defaultValue: {
-      type: Array,
-      value: [],
+      type: Object,
+      value: '',
     },
     single: {
       type: Boolean,
@@ -45,22 +38,27 @@ Component({
   },
   data: {
     maxCount: 0,
+    cloudFile: [],
     files: [],
     urls: [],
     uploadFile: async function (files) {
       // 文件上传的函数，返回一个promise
       const uploadPath = 'weda-uploader';
-
       const tcb = await getCloudInstance();
-      const uploadPromise = files.tempFilePaths.map(async (tempFilePath) => {
-        const fileType = tempFilePath.split('.')?.[1];
-        const cloudPath = `${uploadPath}/uploader-${Date.now()}.${fileType}`;
-        const uploadRes = await tcb.uploadFile({
-          cloudPath,
-          filePath: tempFilePath,
-        });
-        return { fileID: uploadRes.fileID };
-      });
+      const uploadPromise = files.tempFilePaths.map(
+        async (tempFilePath, index) => {
+          var spark = new SparkMD5.ArrayBuffer();
+          spark.append(files.contents[index]);
+          var md5Path = spark.end(false);
+          const fileType = tempFilePath.split('.')[1];
+          const cloudPath = `${uploadPath}/${md5Path}-${Date.now()}.${fileType}`;
+          const uploadRes = await tcb.uploadFile({
+            cloudPath,
+            filePath: tempFilePath,
+          });
+          return { fileID: uploadRes.fileID };
+        }
+      );
       const uploadFileList = await Promise.all(uploadPromise);
       const cloudUrls = uploadFileList.map((file) => file.fileID);
       // 这里返回的东西会在uploadSuccess回调函数中获取到
@@ -71,7 +69,6 @@ Component({
   },
   methods: {
     uploadError: function (e) {
-      // console.log('upload error', e.detail);
       this.triggerEvent('error', e.detail);
     },
     uploadSuccess: async function (e) {
@@ -82,7 +79,7 @@ Component({
       });
       this.setData({
         files: this.data.files.concat(e.detail.urls.map((url) => ({ url }))),
-        urls: [...this.data.urls, ...urls],
+        urls: [...this.data.cloudFile, ...urls],
       });
     },
     onDelete: function (e) {
@@ -93,17 +90,24 @@ Component({
     },
   },
   observers: {
-    // 'defaultValue': function(value) {
-    //   if(!deepEqual(value, this.data.urls)) {
-    //     if(!Array.isArray(value)) {
-    //       value = [value].filter(v => v.length > 0);
-    //     }
-    //     this.setData({
-    //       files: value.map(f => ({url: f})),
-    //       urls: value
-    //     });
-    //   }
-    // },
+    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);
+      }
+      this.setData({
+        files: httpFiles,
+        cloudFile:
+          JSON.stringify(value) != JSON.stringify(this.data.cloudFile)
+            ? value
+            : [],
+      });
+    },
 
     'maxUploadCount, single': function (maxUploadCount, single) {
       const maxCount = single ? 1 : maxUploadCount;

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

@@ -1,20 +1,11 @@
 import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
-import deepEqual from '../../../utils/deepEqual';
+import SparkMD5 from '../../../utils/spark-md5';
 import { transSize } from '../../../utils/platform';
-
 Component({
   options: {
     virtualHost: true,
     multipleSlots: true,
   },
-  lifetimes: {
-    attached() {
-      this.setData({
-        urls: this.properties.defaultValue,
-        files: this.properties.defaultValue.map((url) => ({ url })),
-      });
-    },
-  },
   properties: {
     label: {
       type: String,
@@ -68,6 +59,7 @@ Component({
     maxCount: 0,
     files: [],
     urls: [],
+    cloudFile: [],
   },
   methods: {
     // 批量上传文件前置事件
@@ -103,8 +95,29 @@ Component({
     },
     //上传文件过程
     uploadFile: async function () {
+      const wxClientApi = wx;
+      const apiName = [
+        'c',
+        'h',
+        'o',
+        'o',
+        's',
+        'e',
+        'M',
+        'e',
+        's',
+        's',
+        'a',
+        'g',
+        'e',
+        'F',
+        'i',
+        'l',
+        'e',
+      ].join('');
+
       //文件上传的函数，
-      wx.chooseMessageFile({
+      wxClientApi[apiName]({
         count: this.data.maxCount,
         type: 'all',
         success: async (files) => {
@@ -120,8 +133,13 @@ Component({
       if (!this.handleBefore(files?.tempFiles)) return;
       const uploadPath = 'weda-uploader';
       const uploadPromise = files.tempFiles.map(async (tempFile) => {
-        const fileType = tempFile.path.split('.')?.[1];
-        const cloudPath = `${uploadPath}/uploader-${Date.now()}.${fileType}`;
+        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}`;
         tempFile.percent = '0';
         tempFile.cloudPath = null;
         tempFile.filePath = tempFile?.path || null;
@@ -146,7 +164,7 @@ Component({
               arr.push(res.fileID);
               _this.setData({
                 files: _this.data.files,
-                urls: [..._this.data.urls, ...arr],
+                urls: [..._this.data.cloudFile, ..._this.data.urls, ...arr],
               });
               if (_this.properties.single) {
                 _this.triggerEvent('success', {
@@ -178,13 +196,11 @@ Component({
           this.data.files[index].status = 'fail';
         }
       });
-      const uploadFileList = await Promise.all(uploadPromise);
-      const cloudUrls = uploadFileList.map((file) => file.fileID);
       this.setData({
         files: this.data.files,
-        //urls: [...this.data.urls, ...cloudUrls],
+        url: this.data.files,
       });
-      return { urls: files.tempFiles, cloudUrls };
+      return { urls: files.tempFiles };
     },
 
     onDelete: function (e) {
@@ -194,7 +210,7 @@ Component({
       this.setData({
         files: filelist,
         urls: this.data.urls.filter(
-          (v, index) => e.target.dataset.item?.cloudPath !== index
+          (v, index) => e.target.dataset.item?.cloudPath != v
         ),
       });
     },
@@ -219,23 +235,40 @@ Component({
     },
   },
   observers: {
+    defaultValue: async function (value) {
+      if (!Array.isArray(value)) {
+        value = [value].filter((v) => v.length > 0);
+      }
+      let httpFiles = [];
+      if (value.length > 0) {
+        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}-/;
+          const lastIndex = String(hf).lastIndexOf('/');
+          const name = String(hf).slice(lastIndex + 1);
+          const label = name.replace(uuidReg, '');
+          const httpFile = {
+            name: label,
+            cloudPath: f,
+            filePath: hf,
+            path: hf,
+            status: 'success',
+          };
+          httpFiles.push(httpFile);
+        }
+      }
+
+      this.setData({
+        files: httpFiles,
+        cloudFile: value,
+      });
+    },
     'maxUploadCount, single': function (maxUploadCount, single) {
       const maxCount = single ? 1 : maxUploadCount;
       this.setData({
         maxCount,
       });
     },
-    defaultValue: function (value) {
-      if (!deepEqual(value, this.data.urls)) {
-        if (!Array.isArray(value)) {
-          value = [value];
-        }
-        this.setData({
-          files: value.map((f) => ({ url: f })),
-          urls: value,
-        });
-      }
-    },
     urls: function (urls) {
       let value = urls;
       if (this.properties.single) {

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

@@ -70,6 +70,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  max-width: 200px;
 }
 .weda-uploader-files__file-status {
   margin-left: 24px;

package/src/mp/components/graphicCard/chevron-right.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.0857 7.49988L8.43938 3.85359L9.14649 3.14648L13.7878 7.78777C13.9049 7.90493 13.9049 8.09488 13.7878 8.21204L9.14649 12.8533L8.43938 12.1462L12.0857 8.49988L2 8.49971L2.00002 7.49971L12.0857 7.49988Z" fill="#0052D9"/>
+</svg>

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

@@ -0,0 +1,205 @@
+Component({
+  properties: {
+    className: {
+      type: String,
+      value: '',
+    },
+    style: {
+      type: String,
+      value: '',
+    },
+    navOption: { type: Array, value: [] },
+    titleVisible: {
+      type: Boolean,
+      value: true,
+    },
+    titleColor: {
+      type: String,
+      value: '',
+    },
+    titleFontWeight: {
+      type: String,
+      value: '',
+    },
+    titleFontSize: {
+      type: Number,
+      value: 14,
+    },
+    titleLineHeight: {
+      type: String,
+      value: '',
+    },
+    titleMaxLines: {
+      type: Number,
+      value: 1,
+    },
+    desColor: {
+      type: String,
+      value: '',
+    },
+    desFontWeight: {
+      type: String,
+      value: '',
+    },
+    desVisible: {
+      type: Boolean,
+      value: true,
+    },
+    desFontSize: {
+      type: Number,
+      value: 14,
+    },
+    desLineHeight: {
+      type: String,
+      value: '',
+    },
+    desMaxLines: {
+      type: Number,
+      value: 1,
+    },
+    buttonVisible: {
+      type: Boolean,
+      value: true,
+    },
+    buttonText: {
+      type: String,
+      value: '',
+    },
+    ColMobile: {
+      type: Number,
+      value: 2,
+    },
+    iconWidthSize: {
+      type: String,
+      value: '100',
+    },
+    iconHeightSize: {
+      type: String,
+      value: '100',
+    },
+    textAlign: {
+      type: String,
+      value: 'left',
+    },
+    titleStyle: {
+      type: String,
+      value: '',
+    },
+    desStyle: {
+      type: String,
+      value: '',
+    },
+  },
+
+  /** 页面的初始数据 */
+  data: {
+    optionList: [],
+    percentageVisible: true,
+    iconStyle: '',
+  },
+  methods: {
+    navigaTo: function (itemInfo) {
+      const item = itemInfo?.currentTarget?.dataset?.item;
+      if (item.tapStatus == 'inside') {
+        const paramObj = [];
+        if (item.withParams && item?.params) {
+          for (let info of item.params) {
+            paramObj.push(info.key + '=' + info.value);
+          }
+        }
+        item.paramObj = paramObj;
+        if (item.withParams && item.params.length > 0) {
+          wx.navigateTo({
+            url: '../' + item?.insideUrl + '/index?' + item.paramObj.join('&'),
+          });
+        } else {
+          wx.navigateTo({
+            url: '../' + item?.insideUrl + '/index',
+          });
+        }
+      }
+    },
+  },
+  observers: {
+    'iconWidthSize,iconHeightSize,ColMobile': function (
+      iconWidthSize,
+      iconHeightSize,
+      ColMobile
+    ) {
+      let standardWidth = '100%';
+      let standardHeight = ColMobile === 1 ? '200' : '98';
+      const numReg = /^\d+$/;
+      let width = numReg.test(iconWidthSize)
+        ? iconWidthSize + 'px'
+        : iconWidthSize;
+
+      let height = numReg.test(iconHeightSize)
+        ? iconHeightSize + 'px' //纯数字
+        : iconHeightSize.indexOf('%') == -1
+        ? iconHeightSize
+        : (Number(standardHeight) * parseInt(iconHeightSize)) / 100 + 'px';
+      let iconStyle = `width: ${width}; height: ${height}`;
+      this.setData({ iconStyle });
+    },
+
+    'navOption,ColMobile': function (navOption, ColMobile) {
+      let list = [];
+      list.length = Math.floor(navOption.length / ColMobile);
+      list.forEach((item, index) => {
+        list[index] = [];
+      });
+      navOption.forEach((item, index) => {
+        const _index = Math.floor(index / ColMobile);
+        if (!list[_index] || list[_index].length <= 0) {
+          // 保证每个col 的数据都是有的，列入总共7个数据，那么第二行的3， 4，5数据是undefined, 占位
+          list[_index] = Array.apply(null, Array(ColMobile));
+        }
+        list[_index][index - _index * ColMobile] = item;
+      });
+      const optionList = list;
+      this.setData({
+        optionList,
+      });
+    },
+    '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};
+      font-size: ${titleFontSize}px;
+      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 = `
+      -webkit-line-clamp:${desMaxLines ? desMaxLines : 'revert'};
+      color: ${desColor};
+      font-weight: ${desFontWeight};
+      font-size: ${desFontSize}px;
+      text-align: ${textAlign};
+      line-height: ${desLineHeight == 'auto' ? 'normal' : desLineHeight};
+      `;
+        this.setData({ desStyle });
+      },
+  },
+});

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

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "styleIsolation": "shared"
+}

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

@@ -0,0 +1,29 @@
+<view class="weda-graphic-card" style="{{style}}">
+  <view class="weda-graphic-card__wrapper">
+    <block wx:for="{{optionList}}" wx:key="colIndex" wx:for-item="row">
+      <view class="weda-grid weda-graphic-card__row">
+        <block wx:for="{{row}}" wx:key="colIndex" wx:for-item="col">
+          <view class="weda-col weda-grid__item weda-graphic-card__col weda-graphic-card__col--{{textAlign}}" style="width: {{(1 / ColMobile) * 100}}%" data-item="{{col}}" bindtap="navigaTo">
+            <view class="weda-grid__box">
+              <view class="weda-graphic-card__col-body">
+                <view class="weda-graphic-card__icon" style="{{iconStyle}}">
+                  <image src="{{col.icon}}" mode="scaleToFill" class="weda-graphic-card__img"></image>
+                </view>
+                <view class="weda-graphic-card__title" style="{{titleStyle}}" wx:if="{{titleVisible}}">
+                  {{col.title}}
+                </view>
+                <view class="weda-graphic-card__desc" style="text-align: {{textAlign}}" wx:if="{{desVisible}}" style="{{desStyle}}">
+                  {{col.des}}
+                </view>
+              </view>
+              <view class="wedatea2td-btn wedatea2td-btn--link weda-graphic-card__btn" wx:if="{{buttonVisible && col}}">
+                <text class="weda-graphic-card__btn--text">{{buttonText}}</text>
+                <image src="chevron-right.svg" class="weda-graphic-card__btn--icon wedatea2td-icon wedatea2td-icon-btnback"></image>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </block>
+  </view>
+</view>

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

@@ -0,0 +1,157 @@
+.weda-graphic-card {
+  width: 100%;
+}
+
+.weda-graphic-card .weda-graphic-card__wrapper {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+}
+
+.weda-graphic-card .weda-grid {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.weda-graphic-card .weda-graphic-card__row {
+  padding: 36rpx 0;
+  box-sizing: border-box;
+  margin: 0 -11.5rpx;
+}
+
+.weda-graphic-card .weda-grid__item {
+  flex-grow: 1;
+}
+
+.weda-graphic-card .weda-graphic-card__col {
+  padding: 0 11.5rpx;
+  box-sizing: border-box;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__col-body {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-grid__box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.weda-graphic-card
+  .weda-graphic-card__col.weda-graphic-card__col--left
+  .weda-grid__box,
+.weda-graphic-card
+  .weda-graphic-card__col.weda-graphic-card__col--left
+  .weda-graphic-card__col-body {
+  align-items: flex-start;
+}
+
+.weda-graphic-card
+  .weda-graphic-card__col.weda-graphic-card__col--right
+  .weda-grid__box,
+.weda-graphic-card
+  .weda-graphic-card__col.weda-graphic-card__col--right
+  .weda-graphic-card__col-body {
+  align-items: flex-end;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__icon {
+  width: 100%;
+  height: 400rpx;
+}
+
+.weda-graphic-card .weda-graphic-card__icon .weda-graphic-card__img {
+  width: 100%;
+  height: 100%;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__title {
+  font-size: 32rpx;
+  line-height: 48rpx;
+  text-align: center;
+  color: rgba(0, 0, 0, 0.9);
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__desc {
+  font-size: 28rpx;
+  line-height: 44rpx;
+  color: rgba(0, 0, 0, 0.4);
+  text-align: center;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__title {
+  margin-top: 32rpx;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__desc {
+  margin-top: 12rpx;
+}
+
+button:not([size='mini']) {
+  margin-left: 0;
+  margin-right: 0;
+  width: auto;
+}
+
+.weda-graphic-card .wedatea2td-btn {
+  outline: 0 none;
+  box-sizing: border-box;
+  font-size: 28rpx;
+  white-space: nowrap;
+  user-select: none;
+  display: inline-block;
+  text-align: center;
+  height: auto;
+  vertical-align: middle;
+  text-decoration: none;
+  background-color: transparent;
+  border: none;
+  color: #0052d9;
+  padding: 0;
+  line-height: 1.5;
+  font-weight: normal;
+  margin: 0;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__btn--text {
+  font-size: 28rpx;
+  line-height: 44rpx;
+  color: #0052d9;
+  margin-right: 16rpx;
+}
+
+.weda-graphic-card
+  .weda-graphic-card__col
+  .weda-graphic-card__btn
+  .weda-graphic-card__btn--icon {
+  width: 32rpx;
+  height: 32rpx;
+  display: inline-block;
+  vertical-align: middle;
+  background-repeat: no-repeat;
+  background-position: inherit;
+  font-size: 0;
+  margin-bottom: 3px;
+}
+
+.weda-graphic-card .weda-graphic-card__col .weda-graphic-card__btn {
+  margin-top: 32rpx;
+}