@wg-npm/survey-response 0.3.22713 → 0.3.22750

package/dist/survey-response.esm.js

@@ -285,6 +285,7 @@ var script$c = Vue.extend({
         Checkbox,
         Row,
         Col,
+        Input,
     },
     props: {
         question: {
@@ -341,6 +342,11 @@ var script$c = Vue.extend({
                     }
                 });
             });
+            _.forEach(this.value.inputAnswers, (input) => {
+                if (!_.includes(val, input.choiceId)) {
+                    input.inputText = null;
+                }
+            });
             this.setCheckboxStatus();
             this.answer.score = score;
             if (this.question.options.starEnabled) {
@@ -360,19 +366,36 @@ var __vue_render__$c = function () {var _vm=this;var _h=_vm.$createElement;var _
     type: 'array',
     min: 1,
     message: _vm.t('survey_response.question.question_required'),
-  }}},[_c('CheckboxGroup',{on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", $$v);},expression:"value.answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout},[_c('Checkbox',{key:choice.id,attrs:{"label":choice.id,"disabled":_vm.question.options.readonly || choice.readonly}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)};
+  }}},[_c('CheckboxGroup',{on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", $$v);},expression:"value.answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout,staticStyle:{"display":"flex"}},[_c('Checkbox',{key:choice.id,attrs:{"label":choice.id,"disabled":_vm.question.options.readonly || choice.readonly}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])]),_vm._v(" "),_vm._l((_vm.value.inputAnswers),function(inputAnswer,inputIndex){return _c('div',{key:inputIndex},[(
+              choice.id === inputAnswer.choiceId &&
+              _vm.value.answer.includes(choice.id)
+            )?_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].inputAnswers[" + inputIndex + "].inputText"),"rules":[
+              {
+                required: true,
+                message: _vm.t('survey_response.question.choice_required'),
+              },
+              {
+                type: 'string',
+                min: _vm.question.options.inputMinLength,
+                max: 999,
+                message: _vm.t('survey_response.question.input_text_limit', [
+                  _vm.question.options.inputMinLength ]),
+                trigger: 'blur',
+              } ]}},[_c('Input',{attrs:{"disabled":_vm.question.options.readonly || choice.readonly},model:{value:(inputAnswer.inputText),callback:function ($$v) {_vm.$set(inputAnswer, "inputText", (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"inputAnswer.inputText"}})],1):_vm._e()],1)})],2)}),1)],1)],1)};
 var __vue_staticRenderFns__$c = [];
 
   /* style */
-  const __vue_inject_styles__$c = undefined;
+  const __vue_inject_styles__$c = function (inject) {
+    if (!inject) return
+    inject("data-v-4799d14a_0", { source: ".ivu-row-flex-start[data-v-4799d14a]{align-items:center}.ivu-checkbox-group-item[data-v-4799d14a]{display:flex;flex-direction:row;align-items:center}.choice-title[data-v-4799d14a]{margin-left:8px;margin-right:8px}.choice-score[data-v-4799d14a]{margin-right:8px}", map: undefined, media: undefined });
+
+  };
   /* scoped */
-  const __vue_scope_id__$c = undefined;
+  const __vue_scope_id__$c = "data-v-4799d14a";
   /* module identifier */
   const __vue_module_identifier__$c = undefined;
   /* functional template */
   const __vue_is_functional_template__$c = false;
-  /* style inject */
-  
   /* style inject SSR */
   
   /* style inject shadow dom */
@@ -387,7 +410,7 @@ var __vue_staticRenderFns__$c = [];
     __vue_is_functional_template__$c,
     __vue_module_identifier__$c,
     false,
-    undefined,
+    createInjector,
     undefined,
     undefined
   );
@@ -499,6 +522,7 @@ var script$a = Vue.extend({
         Row,
         Col,
         Icon,
+        Input,
     },
     mixins: [OptionLayoutMixin],
     inject: ["responseStatus", "$rootComponent"],
@@ -556,6 +580,9 @@ var script$a = Vue.extend({
             if (this.responseStatus == this.$consts.STATUS_DRAFT) {
                 if (this.value.answer) {
                     this.value.answer = null;
+                    _.forEach(this.value.inputAnswers, (input) => {
+                        input.inputText = null;
+                    });
                 }
                 else {
                     this.value.answer = value;
@@ -572,19 +599,35 @@ const __vue_script__$a = script$a;
 var __vue_render__$a = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].answer"),"rules":{
     required: _vm.question.options.required,
     message: _vm.t('survey_response.question.question_required'),
-  }}},[_c('RadioGroup',{staticClass:"question-choice",on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", $$v);},expression:"value.answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout},[_c('Radio',{key:choice.id,attrs:{"disabled":_vm.question.options.readonly || choice.readonly,"label":choice.id},nativeOn:{"click":function($event){return _vm.toggleAnswer(choice.id, choice.readonly)}}},[(_vm.haveStar(choice))?_c('span',[_c('Icon',{attrs:{"type":"md-star","color":"orange","size":16}})],1):_vm._e(),_vm._v(" "),_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)};
+  }}},[_c('RadioGroup',{staticClass:"question-choice",on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", $$v);},expression:"value.answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout,staticStyle:{"display":"flex"}},[_c('Radio',{key:choice.id,attrs:{"disabled":_vm.question.options.readonly || choice.readonly,"label":choice.id},nativeOn:{"click":function($event){return _vm.toggleAnswer(choice.id, choice.readonly)}}},[(_vm.haveStar(choice))?_c('span',[_c('Icon',{attrs:{"type":"md-star","color":"orange","size":16}})],1):_vm._e(),_vm._v(" "),_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])]),_vm._v(" "),_vm._l((_vm.value.inputAnswers),function(inputAnswer,inputIndex){return _c('div',{key:inputIndex},[(
+              choice.id === inputAnswer.choiceId && choice.id === _vm.value.answer
+            )?_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].inputAnswers[" + inputIndex + "].inputText"),"rules":[
+              {
+                required: true,
+                message: _vm.t('survey_response.question.choice_required'),
+              },
+              {
+                type: 'string',
+                min: _vm.question.options.inputMinLength,
+                max: 999,
+                message: _vm.t('survey_response.question.input_text_limit', [
+                  _vm.question.options.inputMinLength ]),
+                trigger: 'blur',
+              } ]}},[_c('Input',{attrs:{"disabled":_vm.question.options.readonly || choice.readonly},model:{value:(inputAnswer.inputText),callback:function ($$v) {_vm.$set(inputAnswer, "inputText", (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"inputAnswer.inputText"}})],1):_vm._e()],1)})],2)}),1)],1)],1)};
 var __vue_staticRenderFns__$a = [];
 
   /* style */
-  const __vue_inject_styles__$a = undefined;
+  const __vue_inject_styles__$a = function (inject) {
+    if (!inject) return
+    inject("data-v-369f494a_0", { source: ".ivu-row-flex-start[data-v-369f494a]{align-items:center}.ivu-radio-group-item[data-v-369f494a]{display:flex;flex-direction:row;align-items:center}.choice-title[data-v-369f494a]{margin-left:8px;margin-right:8px}", map: undefined, media: undefined });
+
+  };
   /* scoped */
-  const __vue_scope_id__$a = undefined;
+  const __vue_scope_id__$a = "data-v-369f494a";
   /* module identifier */
   const __vue_module_identifier__$a = undefined;
   /* functional template */
   const __vue_is_functional_template__$a = false;
-  /* style inject */
-  
   /* style inject SSR */
   
   /* style inject shadow dom */
@@ -599,7 +642,7 @@ var __vue_staticRenderFns__$a = [];
     __vue_is_functional_template__$a,
     __vue_module_identifier__$a,
     false,
-    undefined,
+    createInjector,
     undefined,
     undefined
   );
@@ -870,6 +913,8 @@ var defaultLang = {
             question_required: "此题必填",
             survey_confirm_content: "确认要提交问卷？",
             noQuestion: "还未添加题目！",
+            input_text_limit: "输入项字数不少于{0}字",
+            choice_required: "此项必填",
         },
     },
 };
@@ -1575,10 +1620,10 @@ var script = Vue.extend({
                 if (Array.isArray(currentSingleQuestion.jumps) &&
                     currentSingleQuestion.jumps.length > 0) {
                     let target = currentSingleQuestion.jumps.find((item) => item.choiceId === selected.choiceId);
-                    let disabledArr = currentSingleQuestion.jumps
-                        .filter((item) => item.choiceId !== selected.choiceId)
-                        .filter((item) => target.toQuestionId !== item.toQuestionId);
                     if (target) {
+                        let disabledArr = currentSingleQuestion.jumps
+                            .filter((item) => item.choiceId !== selected.choiceId)
+                            .filter((item) => target.toQuestionId !== item.toQuestionId);
                         if (this.recordQuestionId === selected.questionId) {
                             let resetItem = this.sortQuestions.find((item) => item.id === target.toQuestionId);
                             this.setDisabled(resetItem, false);
@@ -1638,7 +1683,20 @@ var script = Vue.extend({
             });
             _.set(this.response, "answers", []);
             _.each(this.sortQuestions, (question) => {
+                let input_answers = [];
+                let questionInputtedEnabled = question.options.inputtedEnabled;
                 let answer = _.get(this.answers, question.id);
+                if (!answer) {
+                    _.forEach(question.choices, (choice) => {
+                        let choiceInputEnabled = choice.options.inputEnabled;
+                        if (questionInputtedEnabled && choiceInputEnabled) {
+                            input_answers.push({
+                                choiceId: choice.id,
+                                inputText: null,
+                            });
+                        }
+                    });
+                }
                 answer = answer
                     ? answer
                     : {
@@ -1647,6 +1705,7 @@ var script = Vue.extend({
                         question_type: question.type,
                         score: null,
                         star: null,
+                        inputAnswers: input_answers,
                     };
                 this.response.answers.push(answer);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-response",
-  "version": "0.3.22713",
+  "version": "0.3.22750",
   "description": "",
   "license": "MIT",
   "scripts": {
@@ -12,8 +12,8 @@
     "lint-fix": "eslint \"**/*.ts\"  \"**/*.vue\" --fix --no-error-on-unmatched-pattern"
   },
   "peerDependencies": {
-    "@wg-npm/survey-core": "0.3.22713",
-    "@wg-npm/survey-service-api": "0.3.22713",
+    "@wg-npm/survey-core": "0.3.22750",
+    "@wg-npm/survey-service-api": "0.3.22750",
     "axios": "^0.19.2",
     "deepmerge": "^4.2.2",
     "lodash": "^4.17.15",
@@ -34,8 +34,8 @@
     "@typescript-eslint/parser": "^3.6.0",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@wg-npm/survey-core": "0.3.22713",
-    "@wg-npm/survey-service-api": "0.3.22713",
+    "@wg-npm/survey-core": "0.3.22750",
+    "@wg-npm/survey-service-api": "0.3.22750",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",

package/src/components/question/type/multi-selection.vue

@@ -14,6 +14,7 @@
           v-for="choice in question.choices"
           :key="choice.id"
           :class="optionLayout"
+          style="display: flex"
         >
           <Checkbox
             :label="choice.id"
@@ -22,6 +23,39 @@
           >
             <span>{{ i18nText(choice.text) }}</span>
           </Checkbox>
+
+          <div
+            v-for="(inputAnswer, inputIndex) in value.inputAnswers"
+            :key="inputIndex"
+          >
+            <FormItem
+              v-if="
+                choice.id === inputAnswer.choiceId &&
+                value.answer.includes(choice.id)
+              "
+              :prop="`answers[${index}].inputAnswers[${inputIndex}].inputText`"
+              :rules="[
+                {
+                  required: true,
+                  message: t('survey_response.question.choice_required'),
+                },
+                {
+                  type: 'string',
+                  min: question.options.inputMinLength,
+                  max: 999,
+                  message: t('survey_response.question.input_text_limit', [
+                    question.options.inputMinLength,
+                  ]),
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <Input
+                :disabled="question.options.readonly || choice.readonly"
+                v-model.trim="inputAnswer.inputText"
+              />
+            </FormItem>
+          </div>
         </Col>
       </Row>
     </CheckboxGroup>
@@ -31,7 +65,14 @@
 import Vue from "vue";
 import _ from "lodash";
 import OptionLayoutMixin from "../../../mixins/option-layout-mixin";
-import { FormItem, CheckboxGroup, Checkbox, Row, Col } from "view-design";
+import {
+  FormItem,
+  CheckboxGroup,
+  Checkbox,
+  Row,
+  Col,
+  Input,
+} from "view-design";
 
 export default Vue.extend({
   name: "multi-selection",
@@ -43,6 +84,7 @@ export default Vue.extend({
     Checkbox,
     Row,
     Col,
+    Input,
   },
   props: {
     question: {
@@ -56,7 +98,7 @@ export default Vue.extend({
     },
   },
   data() {
-    return { 
+    return {
       value: this.answer,
     };
   },
@@ -103,6 +145,13 @@ export default Vue.extend({
           }
         });
       });
+
+      //处理输入题
+      _.forEach(this.value.inputAnswers, (input) => {
+        if (!_.includes(val, input.choiceId)) {
+          input.inputText = null;
+        }
+      });
       this.setCheckboxStatus();
 
       // @ts-ignore
@@ -115,3 +164,23 @@ export default Vue.extend({
   },
 });
 </script>
+
+<style lang="less" scoped>
+.ivu-row-flex-start {
+  align-items: center;
+}
+.ivu-checkbox-group-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.choice-title {
+  margin-left: 8px;
+  margin-right: 8px;
+}
+
+.choice-score {
+  margin-right: 8px;
+}
+</style>

package/src/components/question/type/single-selection.vue

@@ -16,6 +16,7 @@
           v-for="choice in question.choices"
           :key="choice.id"
           :class="optionLayout"
+          style="display: flex"
         >
           <Radio
             :disabled="question.options.readonly || choice.readonly"
@@ -28,6 +29,37 @@
             </span>
             <span>{{ i18nText(choice.text) }}</span>
           </Radio>
+          <div
+            v-for="(inputAnswer, inputIndex) in value.inputAnswers"
+            :key="inputIndex"
+          >
+            <FormItem
+              v-if="
+                choice.id === inputAnswer.choiceId && choice.id === value.answer
+              "
+              :prop="`answers[${index}].inputAnswers[${inputIndex}].inputText`"
+              :rules="[
+                {
+                  required: true,
+                  message: t('survey_response.question.choice_required'),
+                },
+                {
+                  type: 'string',
+                  min: question.options.inputMinLength,
+                  max: 999,
+                  message: t('survey_response.question.input_text_limit', [
+                    question.options.inputMinLength,
+                  ]),
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <Input
+                :disabled="question.options.readonly || choice.readonly"
+                v-model.trim="inputAnswer.inputText"
+              />
+            </FormItem>
+          </div>
         </Col>
       </Row>
     </RadioGroup>
@@ -37,7 +69,15 @@
 <script lang="ts">
 import Vue from "vue";
 import OptionLayoutMixin from "../../../mixins/option-layout-mixin";
-import { Col, FormItem, Icon, Radio, RadioGroup, Row } from "view-design";
+import {
+  Col,
+  FormItem,
+  Icon,
+  Radio,
+  RadioGroup,
+  Row,
+  Input,
+} from "view-design";
 import _ from "lodash";
 import { SurveyLayout } from "@wg-npm/survey-core";
 
@@ -50,6 +90,7 @@ export default Vue.extend({
     Row,
     Col,
     Icon,
+    Input,
   },
   mixins: [OptionLayoutMixin],
   inject: ["responseStatus", "$rootComponent"],
@@ -112,6 +153,9 @@ export default Vue.extend({
       if (this.responseStatus == this.$consts.STATUS_DRAFT) {
         if (this.value.answer) {
           this.value.answer = null;
+          _.forEach(this.value.inputAnswers, (input) => {
+            input.inputText = null;
+          });
         } else {
           this.value.answer = value;
         }
@@ -120,3 +164,19 @@ export default Vue.extend({
   },
 });
 </script>
+
+<style lang="less" scoped>
+.ivu-row-flex-start {
+  align-items: center;
+}
+.ivu-radio-group-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.choice-title {
+  margin-left: 8px;
+  margin-right: 8px;
+}
+</style>

package/src/components/survey-response.vue

@@ -146,10 +146,10 @@ export default Vue.extend({
           let target = currentSingleQuestion.jumps.find(
             (item) => item.choiceId === selected.choiceId
           );
-          let disabledArr = currentSingleQuestion.jumps
-            .filter((item) => item.choiceId !== selected.choiceId)
-            .filter((item) => target.toQuestionId !== item.toQuestionId);
           if (target) {
+            let disabledArr = currentSingleQuestion.jumps
+              .filter((item) => item.choiceId !== selected.choiceId)
+              .filter((item) => target.toQuestionId !== item.toQuestionId);
             if (this.recordQuestionId === selected.questionId) {
               let resetItem = this.sortQuestions.find(
                 (item) => item.id === target.toQuestionId
@@ -234,7 +234,21 @@ export default Vue.extend({
       });
       _.set(this.response, "answers", []);
       _.each(this.sortQuestions, (question) => {
+        let input_answers: any = [];
+        let questionInputtedEnabled = question.options.inputtedEnabled;
+
         let answer: any = _.get(this.answers, question.id);
+        if (!answer) {
+          _.forEach(question.choices, (choice) => {
+            let choiceInputEnabled = choice.options.inputEnabled;
+            if (questionInputtedEnabled && choiceInputEnabled) {
+              input_answers.push({
+                choiceId: choice.id,
+                inputText: null,
+              });
+            }
+          });
+        }
         answer = answer
           ? answer
           : {
@@ -243,6 +257,7 @@ export default Vue.extend({
               question_type: question.type,
               score: null,
               star: null,
+              inputAnswers: input_answers,
             };
         this.response.answers.push(answer);
       });

package/src/locale/lang/en-US.ts

@@ -17,6 +17,9 @@ export default {
       question_required: "Can Not Blank",
       survey_confirm_content: "Confirm Submit Survey？",
       noQuestion: "No Question！",
+      input_text_limit:
+        "The number of characters in the entry should not be less than{0}",
+      choice_required: "This item is required",
     },
   },
 };

package/src/locale/lang/zh-CN.ts

@@ -17,6 +17,8 @@ export default {
       question_required: "此题必填",
       survey_confirm_content: "确认要提交问卷？",
       noQuestion: "还未添加题目！",
+      input_text_limit: "输入项字数不少于{0}字",
+      choice_required: "此项必填",
     },
   },
 };

package/src/locale/lang/zh-TW.ts

@@ -16,6 +16,8 @@ export default {
       please_enter: "請填寫",
       question_required: "此題必填",
       survey_confirm_content: "確認要提交問卷？",
+      input_text_limit: "輸入項字數不少於{0}字",
+      choice_required: "此項必填",
     },
   },
 };