jufubao-forms 1.0.0-beta7 → 1.0.0-beta9

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -78,7 +78,7 @@
                   :end="item.end_time"
                   :border="false"
                   placeholder="请选择日期"
-                  @change="handleClearError(item)">
+                  @change="e => handleDateTimePicker(e, item)">
                 </uni-datetime-picker>
               </template>
               <!-- <xd-form-date v-if="item.field_type === 'calendar'"
@@ -600,6 +600,10 @@
         this.$set(this.form, item.field_value, value);
         this.$set(item, "error", "")
       },
+      handleDateTimePicker(time, item){
+        this.$set(this.form, item.field_value, time);
+        this.$set(item, "error", "")
+      },
       doClose(){
         this.$xdUniHelper.navigateTo({
           url: this.submitPagePath

package/src/components/JfbFormsDynamicForm/uni-datetime-picker/calendar.vue

@@ -595,6 +595,9 @@
 					this.tempRange.before = this.cale.multipleStatus.before
 					this.tempRange.after = this.cale.multipleStatus.after
 				}
+        if(this.hasTime && !this.time) {
+          this.time = getTime(new Date(), this.hideSecond)
+        }
 				this.change()
 			},
       changeMonth(type) {

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

@@ -21,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>
@@ -68,6 +68,7 @@
         itemRadius: 0,
         detailPath: "",
         bucket: "default",
+        qaDetailPath: "",
       }
     },
     computed: {
@@ -118,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 = {
@@ -144,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/JfbFormsQuestionAndAnswer/Attr.js

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

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -18,6 +18,7 @@
     <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'">
@@ -80,10 +81,11 @@
           </view>
         </view>
         <view v-if="form_status === 'error'" class="form_status form_error">
-          <xd-font-icon icon="iconshibai" color="#ff5235" :size="64"></xd-font-icon>
-          <view class="status_tip error_tip">{{ err_msg }}</view>
-          <view class="status_name">{{ formName }}</view>
-          <view class="status_btn" @click="doClose" style="border-radius: 8rpx;">关闭</view>
+          <!-- <xd-font-icon icon="iconshibai" color="#ff5235" :size="64"></xd-font-icon> -->
+          <image class="empty_image" :src="emptyImage" mode="widthFix"></image>
+          <view class="status_tip error_tip" style="color: #333333;">{{ err_msg }}</view>
+          <!-- <view class="status_name">{{ formName }}</view> -->
+          <view class="status_btn" @click="toQaList" style="border-radius: 8rpx;margin-top: 100rpx;">返回列表</view>
         </view>
       </view>
 
@@ -102,6 +104,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import Color from "color"
+  import getServiceUrl from '@/common/getServiceUrl'
   export default {
     name: "JfbFormsQuestionAndAnswer",
     components: {
@@ -124,7 +127,8 @@
         marketing_tool: "",
         activity_page_url: "",
         activity_id: "",
-
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
+        
         value: [],
         qaValue: "",
 
@@ -135,6 +139,7 @@
         //todo
 
         qaResultPath: "",
+        qaListPath: "",
       }
     },
     computed: {
@@ -221,8 +226,6 @@
       this.init(this.container);
       this.mainColorAlpha = Color(this.mainColor).alpha(0.15).string();
       this.isPreview = this.$configProject['isPreview'];
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -264,6 +267,7 @@
        */
       init(container) {
         this.qaResultPath = getContainerPropsValue(container, 'content.qaResultPath', {value: ''}).value;
+        this.qaListPath = getContainerPropsValue(container, 'content.qaListPath', {value: ""}).value;
       },
       handlePrev(){
         if(this.curIndex > 0){
@@ -283,6 +287,11 @@
         window.location.href = 'about:blank';
         window.close();
       },
+      toQaList(){
+        this.$xdUniHelper.redirectTo({
+          url: this.qaListPath
+        })
+      },
       p_submitQaForm(){
         uni.showModal({
           title: '提示',
@@ -495,6 +504,13 @@
         flex-direction: column;
         align-items: center;
         padding-top: 100rpx;
+        .empty_image{
+          width: 500rpx;
+
+          image{
+            width: 100%;
+          }
+        }
         .status_tip{
           color: #06bc85;
           margin-top: 32rpx;