jufubao-forms 1.0.0-beta6 → 1.0.0-beta8

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-dynamic-form__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-dynamic-form__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-dynamic-form__body">
@@ -108,8 +110,8 @@
           <view class="status_name">{{ formName }}</view>
         </view>
       </view>
-      
-      
+
+
       <xd-dialog :show.sync="isShowDialog" title="请输入验证码" :showCloseIcon="false">
         <xd-form
           label-align="left"
@@ -129,7 +131,7 @@
             </view>
           </xd-form-item>
         </xd-form>
-        
+
         <view slot="btn">
           <xd-button type="primary" width="400rpx" @click="doCheckValidCode">提交</xd-button>
         </view>
@@ -253,7 +255,7 @@
           }
           this.dynamicFormList = res.list.map((item, i) => {
             item.error = "";
-            
+
             if(item.is_show_explain !== 'Y'){
               item.explain = "";
             }
@@ -569,7 +571,7 @@
             return this.getDecimalTip(item);
           }
         }
-        
+
         //开始验证限制范围
         if(fieldValue && !showRange) return errTip;
         max = Number(max);
@@ -665,7 +667,7 @@
           text-align: center;
         }
       }
-     
+
       .align-center{
         display: flex;
         align-items: center;
@@ -740,7 +742,7 @@
         }
         .uni-easyinput__content-input{
           font-size: 24rpx;
-          
+
           .uni-easyinput__placeholder-class{
             font-size: 24rpx;
           }
@@ -752,7 +754,7 @@
           font-size: 24rpx !important;
           border: none !important;
         }
-        
+
       }
       .description{
         color: #666666;

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicFormLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFormsList/Attr.js

@@ -75,6 +75,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: "问答详情跳转路径",
+        ele: 'xd-select-pages-path',
+        valueKey: 'qaDetailPath',
+        groupKey:'advanced',
+        placeholder: '请选择问卷详情跳转路径',
+        value: data['qaDetailPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-list__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-list__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-list__body">
@@ -19,7 +21,7 @@
           <view class="activity_item"
             v-for="(item,i) in list" :key="item.id"
             :style="listItemBoxStyle"
-            @click="toDetail(item.form_id)"
+            @click="toDetail(item)"
           >
             <view class="item_img">
               <image :src="item.cover" mode="aspectFill"></image>
@@ -66,6 +68,7 @@
         itemRadius: 0,
         detailPath: "",
         bucket: "default",
+        qaDetailPath: "",
       }
     },
     computed: {
@@ -116,6 +119,7 @@
         this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', 0);
         this.bucket = getContainerPropsValue(container, 'content.bucket', 'default');
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
+        this.qaDetailPath = getContainerPropsValue(container, 'content.qaDetailPath', {value: ""}).value;
       },
       getList(){
         let data = {
@@ -142,10 +146,17 @@
           this.hasNext = !!res.next_page_token;
         })
       },
-      toDetail(form_id){
-        this.$xdUniHelper.navigateTo({
+      toDetail(item){
+        let form_id = item.form_id;
+        if(item.base_type=='form'){
+          this.$xdUniHelper.navigateTo({
           url: this.detailPath + `?form_id=${form_id}`
         })
+        }else{
+          this.$xdUniHelper.navigateTo({
+            url: this.qaDetailPath + `?form_id=${form_id}`
+          })
+        }
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)

package/src/components/JfbFormsList/JfbFormsListLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-qa-result__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-qa-result__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-qa-result__body" :style="{
@@ -26,7 +28,7 @@
           <view v-if="is_show_error_answer_analysis==='Y'" class="btn primary" @click="isShowAnalysis=true">答案解析</view>
         </view>
       </view>
-      
+
       <template v-if="isShowAnalysis">
         <view class="analysis_head">
           <view class="_left">答案解析</view>
@@ -390,7 +392,7 @@
                 &.a_right{
                   color: #FFFFFF;
                   background: var(--main-color);
-                } 
+                }
                 // &.a_error{
                 //   color: #FF7063;
                 //   background: #FFE3E0;

package/src/components/JfbFormsQaResult/JfbFormsQaResultLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -10,12 +10,15 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-question-and-answer__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-question-and-answer__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-question-and-answer__body" :style="{
       '--main-color': mainColor,
       '--main-color-alpha': mainColorAlpha,
+      'min-height': layoutInfo.bodyMinHeight
     }">
       <view v-if="loaded">
         <view v-if="form_status === 'content'">
@@ -122,7 +125,7 @@
         marketing_tool: "",
         activity_page_url: "",
         activity_id: "",
-        
+
         value: [],
         qaValue: "",
 
@@ -219,8 +222,6 @@
       this.init(this.container);
       this.mainColorAlpha = Color(this.mainColor).alpha(0.15).string();
       this.isPreview = this.$configProject['isPreview'];
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswerLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);