@xtdev/xt-miniprogram-ui 1.2.73 → 1.2.75

package/libs/xt-uploader/index.js

@@ -26,6 +26,10 @@ Component({
       type: String,
       value: "",
     },
+    icon: {
+      type: String,
+      value: "https://img.tanjiu.cn/home/DDDsrH7PpNhneQsXGFmGGPcSM3QYXG8N.png",
+    },
     fileList: {
       type: Array,
       value: [],
@@ -43,6 +47,10 @@ Component({
       type: Array,
       value: ["album", "camera"],
     },
+    fileType: {
+      type: String,
+      value: "image",
+    },
     customUpload: {
       type: Boolean,
       value: false,
@@ -55,6 +63,17 @@ Component({
       type: Object,
       value: {},
     },
+    /**
+     * 打水印参数
+     * {
+     *  content: '',
+     *  postion: ''
+     * }
+     */
+    waterData: {
+      type: Object | null,
+      value: null
+    },
   },
 
   /**
@@ -104,6 +123,8 @@ Component({
         max,
         sourceType,
         fileList,
+        fileType,
+        waterData,
       } = this.properties;
       if (customUpload) {
         this.triggerEvent("upload", {});
@@ -119,20 +140,26 @@ Component({
       // ios企微环境下不支持该API
       const { platform, environment } = this.getSystemInfo();
       console.log(platform, environment);
-      let chooseImgApi = (environment !== "wxwork" || platform !== "ios") ? wx.chooseMedia : wx.chooseImage;
+      let chooseImgApi = (environment !== "wxwork" || platform !== "ios") ? wx.chooseMedia : fileType == 'video' ? wx.chooseVideo : wx.chooseImage;
       chooseImgApi({
         count: max - fileList.length,
         mediaType: ["image"],
+        mediaType: fileType == "video" ? ["video"] : ["image"],
         sizeType: ["compressed"],
         sourceType,
         success(res) {
           console.log(res, "0000");
+          if (fileType == "video" && res.tempFiles[0].size / 1024 / 1024 > 100) {
+            // 视频上传不允许超过100M
+            wx.showToast({title: '视频大小不可超过100M', icon: "none"});
+            return;
+          }
           // tempFilePath可以作为img标签的src属性显示图片
           const tempFilePaths = res.tempFiles;
           if (Array.isArray(tempFilePaths) && tempFilePaths.length) {
             Promise.allSettled(
               tempFilePaths.map((temp) =>
-                _this.uploadImage_v(temp.tempFilePath || temp.path)
+                _this[waterData?'uploadWaterFile' : 'uploadImage_v'](temp.tempFilePath || temp.path, waterData)
               )
             ).then((uploadRes) => {
               wx.hideLoading();
@@ -169,6 +196,43 @@ Component({
         platform,
       };
     },
+    /** 上传水印照片 */
+    async uploadWaterFile(
+      path,
+      data = {},
+      url = "core/file/upload/multiV2",
+      baseUrl = "https://gateway.tanjiu.cn/",
+    ) {
+      return new Promise((reslove, reject) => {
+        let fullUrl = baseUrl + url;
+        wx.showLoading("上传中");
+        wx.uploadFile({
+          url: fullUrl,
+          filePath: path,
+          name: "file",
+          formData: data,
+          header: {
+            "Content-Type": "multipart/form-data",
+            "wow-token": "c9fbecb5fdeecb78e8745db9225d88e1",
+          },
+          success: (res) => {
+            let result = JSON.parse(res.data);
+            if (result.code == "0000") {
+              reslove(result.data[0]);
+            } else {
+              reject(result.msg)
+            }
+          },
+          fail: (err) => {
+            wx.showToast({
+              title: '上传失败',
+              icon: "error",
+            })
+            reject(err);
+          },
+        });
+      });
+    },
     // 上传文件
     uploadImage_v(filePaths) {
       return new Promise((resolve, reject) => {

package/libs/xt-uploader/index.wxml

@@ -3,12 +3,19 @@
   <view class="title_text" wx:if="{{title}}">{{title}}</view>
   <view class="file_box">
     <view wx:for="{{fileList}}" wx:key="index" class="file_item">
-      <image class="file_img" src="{{item}}" mode="aspectFit" bindtap="onPreviewImage" data-url="{{item}}" data-index="{{index}}" />
-      <!-- 删除 -->
-      <xt-icon icon="shanchu" size="48" class="close_box" bindtap="onDelete" data-url="{{item}}" data-index="{{index}}" wx:if="{{!disabled}}"></xt-icon>
+      <block wx:if="{{fileType == 'video'}}">
+        <video class="file_img" src="{{item}}" mode="aspectFill" data-url="{{item}}" data-index="{{index}}" />
+        <!-- 删除 -->
+        <image src="https://img.tanjiu.cn/home/idzQXfttSiQryeX3jYEfc5xjWhZPdwY4.png" class="close_box" mode="aspectFill" bindtap="onDelete" data-url="{{item}}" data-index="{{index}}" wx:if="{{!disabled}}"></image>
+      </block>
+      <block wx:else>
+        <image class="file_img" src="{{item}}" mode="aspectFit" bindtap="onPreviewImage" data-url="{{item}}" data-index="{{index}}" />
+        <!-- 删除 -->
+        <xt-icon icon="shanchu" size="48" class="close_box" bindtap="onDelete" data-url="{{item}}" data-index="{{index}}" wx:if="{{!disabled}}"></xt-icon>
+      </block>
     </view>
     <view class="file_item" wx:if="{{!disabled && fileList.length<max}}" bindtap="startTakePhoto">
-      <image src="https://img.tanjiu.cn/home/DDDsrH7PpNhneQsXGFmGGPcSM3QYXG8N.png" class="camera_icon" />
+      <image src="{{icon}}" class="camera_icon" />
       <view wx:if="{{uploadDesc}}" class="upload_desc">{{uploadDesc}}</view>
     </view>
   </view>

package/libs/xt-uploader/index.wxss

@@ -52,6 +52,8 @@
 .close_box {
   position   : absolute;
   line-height: 48rpx;
+  width      : 48rpx;
+  height     : 48rpx;
   top        : 0;
   right      : 0;
   color      : rgba(0, 0, 0, 0.5);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtdev/xt-miniprogram-ui",
-  "version": "1.2.73",
+  "version": "1.2.75",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {