jufubao-forms 1.0.4-beta3 → 1.0.4-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.4-beta3",
+  "version": "1.0.4-beta5",
   "private": false,
   "description": "聚福宝表单业务插件库",
   "main": "index.js",

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -102,11 +102,14 @@
                       :src="getServiceUrl(videoSrc)"
                       :controls="false"
                       :show-center-play-btn="false"
+                      :autoplay="false"
+                      :loop="false"
                       @pause="handleVideoPause(item)"
                       @ended="handleVideoPause(item)"
+                      @click="handleVideoPlay(item)"
                     ></video>
                     <view v-if="!formPaly[item.field_value + '_play']" class="video_cover">
-                      <image :src="formPaly[item.field_value + '_cover']" style="width: 100%;height: 100%;" mode="aspectFit"></image>
+                      <image :src="formPaly[item.field_value + '_cover']" style="width: 100%;height: 100%;" mode="aspectFill"></image>
                       <view class="video_play" @click="handleVideoPlay(item)">
                         <xd-font-icon icon="iconplayright" color="#fff" size="60"></xd-font-icon>
                       </view>
@@ -243,6 +246,7 @@
         emptyImage: getServiceUrl('/common/empty/qa.png'),
         uploadImgList: [],
         uploadVideoList: [],
+        imgHost: "",
 
         //面板
         submitPagePath: "",
@@ -290,6 +294,9 @@
     methods: {
       getServiceUrl,
       onJfbLoad(options) {
+        let imgHost = this.projectAttr['img_host'] || this.$settings.cdnUrl;
+        this.imgHost = imgHost;
+
         if (!this.isPreview){
           if(!options.form_id) {
             return uni.showToast({
@@ -481,18 +488,20 @@
             console.log('chooseImage',res);
             this.$xdShowLoading({});
             for(let i = 0; i < res.tempFiles.length; i++){
-              let file = res.tempFiles[i];
-              //文件file不能大于item.media_size(MB)
-              if(file.size > item.media_size * 1024 * 1024){
-                uni.showToast({
-                  title: '图片大小不能超过' + item.media_size + 'MB',
-                  duration: 2000,
-                  icon: "none"
-                });
-                this.$xdHideLoading();
-                return;
+              if(i < Number(item.media_count)){
+                let file = res.tempFiles[i];
+                //文件file不能大于item.media_size(MB)
+                if(file.size > item.media_size * 1024 * 1024){
+                  uni.showToast({
+                    title: '图片大小不能超过' + item.media_size + 'MB',
+                    duration: 2000,
+                    icon: "none"
+                  });
+                  this.$xdHideLoading();
+                  return;
+                }
+                await this.uploadOneImage(file, item);
               }
-              await this.uploadOneImage(file, item);
             }
             this.$xdHideLoading();
           }
@@ -505,8 +514,13 @@
       handleVideoPlay(item){
         let videoContext = uni.createVideoContext('video_' + item.field_value, this);
         if(videoContext){
-          videoContext.play();
-          this.$set(this.formPaly, item.field_value + '_play', true)
+          if(!this.formPaly[item.field_value + '_play']){
+            this.$set(this.formPaly, item.field_value + '_play', true)
+            videoContext.play();
+          }else{
+            this.$set(this.formPaly, item.field_value + '_play', false)
+            videoContext.pause();
+          }
         }
       },
       handleVideoPause(item){
@@ -531,11 +545,17 @@
               let video = await this.uploadImage(file);
               let videoUrl = getVideoUrl(video);
               console.log("videoUrl", videoUrl);
-              this.form[item.field_value].push(video);
+              this.form[item.field_value].push(videoUrl.url);
               this.formPaly[item.field_value + '_cover'] = videoUrl.url_cover;
               this.handleClearError(item);
               this.$xdHideLoading();
             }catch(err){
+              uni.showToast({
+                title: '上传失败,重新上传',
+                duration: 2000,
+                icon: "none"
+              });
+              this.form[item.field_value] = [];
               this.$xdHideLoading();
             }
           }
@@ -567,7 +587,7 @@
                 resolve(`/${res.key}`);
               },
               fail:(err)=>{
-                resolve('');
+                reject(err);
                 console.error(err)
               }
             });
@@ -630,7 +650,8 @@
             contents,
             form_id: this.form_id,
             bucket: this.bucket,
-            foreign_id: this.foreign_id
+            foreign_id: this.foreign_id,
+            domain: this.imgHost
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -910,6 +931,8 @@
           margin-bottom: 20rpx;
           position: relative;
           overflow: hidden;
+          display: flex;
+          align-items: center;
           .video_cover{
             position: absolute;
             z-index: 2;