jufubao-forms 1.0.0-beta10 → 1.0.0-beta12

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -188,6 +188,7 @@
         dynamicFormList: [],
         renderForm: "renderForm",
         form_id: "",
+        foreign_id: "",
         isShowDialog: false,
         validImageAPIUrl: "",
         valid_token: "",
@@ -236,6 +237,7 @@
             });
           }
           this.form_id = options.form_id;
+          this.foreign_id = options.foreign_id;
         }else{
           this.form_id = 1;
         }
@@ -247,7 +249,8 @@
           vm: this,
           data: {
             form_id: this.form_id,
-            bucket: this.bucket
+            bucket: this.bucket,
+            foreign_id: this.foreign_id
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -429,6 +432,7 @@
             contents,
             form_id: this.form_id,
             bucket: this.bucket,
+            foreign_id: this.foreign_id
           }
         }).then(res => {
           this.$xdHideLoading();

package/src/components/JfbFormsList/Attr.js

@@ -18,6 +18,17 @@ export default {
           { label: 'saas系统', value: 'saas'}
         ]
       },
+      {
+        label: "表单类型",
+        ele: "xd-radio",
+        valueKey: "base_type",
+        value: data['base_type'] || '',
+        groupKey:'content',
+        list: [
+          { label: "员工调研", value: "form"},
+          { label: '知识竞赛', value: 'answer'}
+        ]
+      },
       {
         label: "列表外边距设置",
         groupKey:'style',

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -75,6 +75,7 @@
         detailPath: "",
         bucket: "default",
         qaDetailPath: "",
+        base_type: "",
       }
     },
     computed: {
@@ -124,6 +125,7 @@
         this.listPadding = getContainerPropsValue(container, 'content.listPadding', {});
         this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', 0);
         this.bucket = getContainerPropsValue(container, 'content.bucket', 'default');
+        this.base_type = getContainerPropsValue(container, 'content.base_type', '');
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
         this.qaDetailPath = getContainerPropsValue(container, 'content.qaDetailPath', {value: ""}).value;
       },
@@ -131,7 +133,8 @@
         let data = {
           page_token: this.page_token+'',
           page_size: this.page_size,
-          bucket: this.bucket
+          bucket: this.bucket,
+          base_type: this.base_type
         }
         jfbRootExec("getSaasFormList", {
           vm: this,

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -119,6 +119,7 @@
     data() {
       return {
         form_id: '',
+        foreign_id: "",
         loaded: false,
         isPreview: false,
         form_status: "content",
@@ -240,12 +241,14 @@
           this.form_id = '123';
         }else{
           this.form_id = options.form_id;
+          this.foreign_id = options.foreign_id;
         }
         this.$xdShowLoading({});
         jfbRootExec("getDynamicForm", {
           vm: this,
           data: {
             form_id: this.form_id,
+            foreign_id: this.foreign_id
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -302,6 +305,7 @@
                 vm: this,
                 data: {
                   form_id: this.form_id,
+                  foreign_id: this.foreign_id,
                   contents: this.formList.map(item => {
                     let content = Array.isArray(item.value) ? item.value : (item.value ? [item.value] : []);
                     return {
@@ -330,7 +334,7 @@
         if(url){
           if(this.marketing_tool === 'prize') url = url + '?id=' + this.activity_id;
           if(this.marketing_tool === 'coupon') url = url + '?activity_id=' + this.activity_id;
-          else url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}`;
+          else url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}&foreign_id=${this.foreign_id}`;
           this.$xdUniHelper.navigateTo({
             url: url
           })