@wg-npm/survey-response 0.3.22657 → 0.3.22704

package/dist/survey-response.esm.js

@@ -300,16 +300,12 @@ var script$c = Vue.extend({
     data() {
         return {
             value: this.answer,
-            isReadOnly: false,
         };
     },
     watch: {
         answer(n) {
             this.value = n;
         },
-        question(q) {
-            this.isReadOnly = !!_.find(this.question.choices, (choice) => choice.readonly);
-        },
     },
     methods: {
         setCheckboxStatus() {
@@ -360,7 +356,7 @@ const __vue_script__$c = script$c;
 
 /* template */
 var __vue_render__$c = 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 && !_vm.isReadOnly,
+    required: _vm.question.options.required,
     type: 'array',
     min: 1,
     message: _vm.t('survey_response.question.question_required'),
@@ -435,7 +431,8 @@ var script$b = Vue.extend({
         },
     },
     methods: {
-        decodeHTML(str) {
+        decodeHTML(value) {
+            const str = value.processedAnswer ? value.processedAnswer : value.answer;
             if (typeof str == "string") {
                 return str.replace(/<|>|&/g, function (matches) {
                     return {
@@ -454,7 +451,7 @@ var script$b = Vue.extend({
 const __vue_script__$b = script$b;
 
 /* template */
-var __vue_render__$b = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.readonly)?_c('div',{staticClass:"processed-answer",domProps:{"innerHTML":_vm._s(_vm.decodeHTML(_vm.value.processedAnswer))}}):_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].answer"),"rules":{
+var __vue_render__$b = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.readonly)?_c('div',{staticClass:"processed-answer",domProps:{"innerHTML":_vm._s(_vm.decodeHTML(_vm.value))}}):_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].answer"),"rules":{
       required: _vm.question.options.required,
       message: _vm.t('survey_response.question.question_required'),
     }}},[(_vm.question.options && _vm.question.options.wordLimit)?_c('Input',{attrs:{"type":"textarea","rows":4,"show-word-limit":"","placeholder":_vm.placeholder,"maxlength":_vm.question.options.wordLimit,"disabled":_vm.question.options.readonly},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"value.answer"}}):_c('Input',{attrs:{"type":"textarea","rows":4,"placeholder":_vm.placeholder,"disabled":_vm.question.options.readonly},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"value.answer"}})],1)],1)};
@@ -463,11 +460,11 @@ var __vue_staticRenderFns__$b = [];
   /* style */
   const __vue_inject_styles__$b = function (inject) {
     if (!inject) return
-    inject("data-v-2e1e51e4_0", { source: ".processed-answer[data-v-2e1e51e4]{background-color:#f3f3f3;opacity:1;cursor:not-allowed;color:#ccc;width:100%;min-height:94px;border:1px solid #dcdee2;border-radius:4px;padding:4px 8px;line-height:1.5}", map: undefined, media: undefined });
+    inject("data-v-484436b8_0", { source: ".processed-answer[data-v-484436b8]{background-color:#f3f3f3;opacity:1;cursor:not-allowed;color:#ccc;width:100%;min-height:94px;border:1px solid #dcdee2;border-radius:4px;padding:4px 8px;line-height:1.5}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$b = "data-v-2e1e51e4";
+  const __vue_scope_id__$b = "data-v-484436b8";
   /* module identifier */
   const __vue_module_identifier__$b = undefined;
   /* functional template */
@@ -520,7 +517,6 @@ var script$a = Vue.extend({
         return {
             value: this.answer,
             choiceClasses: this.buildChoiceClasses(),
-            isReadOnly: false,
         };
     },
     watch: {
@@ -530,9 +526,6 @@ var script$a = Vue.extend({
         answer(n) {
             this.value = n;
         },
-        question(q) {
-            this.isReadOnly = !!_.find(this.question.choices, (choice) => choice.readonly);
-        },
     },
     methods: {
         selChange(id) {
@@ -577,7 +570,7 @@ const __vue_script__$a = script$a;
 
 /* template */
 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 && !_vm.isReadOnly,
+    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)};
 var __vue_staticRenderFns__$a = [];
@@ -799,7 +792,8 @@ var script$7 = Vue.extend({
         },
     },
     methods: {
-        decodeHTML(str) {
+        decodeHTML(value) {
+            const str = value.processedAnswer ? value.processedAnswer : value.answer;
             if (typeof str == "string") {
                 return str.replace(/<|>|&/g, function (matches) {
                     return {
@@ -818,7 +812,7 @@ var script$7 = Vue.extend({
 const __vue_script__$7 = script$7;
 
 /* template */
-var __vue_render__$7 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.readonly)?_c('div',{staticClass:"processed-answer",domProps:{"innerHTML":_vm._s(_vm.decodeHTML(_vm.value.processedAnswer))}}):_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].answer"),"rules":{
+var __vue_render__$7 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.readonly)?_c('div',{staticClass:"processed-answer",domProps:{"innerHTML":_vm._s(_vm.decodeHTML(_vm.value))}}):_c('FormItem',{attrs:{"prop":("answers[" + _vm.index + "].answer"),"rules":{
       required: _vm.question.options.required,
       message: _vm.t('survey_response.question.question_required'),
     }}},[_c('Input',{attrs:{"placeholder":_vm.placeholder,"disabled":_vm.question.options.readonly},model:{value:(_vm.value.answer),callback:function ($$v) {_vm.$set(_vm.value, "answer", (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"value.answer"}})],1)],1)};
@@ -827,11 +821,11 @@ var __vue_staticRenderFns__$7 = [];
   /* style */
   const __vue_inject_styles__$7 = function (inject) {
     if (!inject) return
-    inject("data-v-5f054d94_0", { source: ".processed-answer[data-v-5f054d94]{background-color:#f3f3f3;opacity:1;cursor:not-allowed;color:#ccc;width:100%;height:32px;border:1px solid #dcdee2;border-radius:4px;padding:4px 8px;line-height:1.5}", map: undefined, media: undefined });
+    inject("data-v-0a565942_0", { source: ".processed-answer[data-v-0a565942]{background-color:#f3f3f3;opacity:1;cursor:not-allowed;color:#ccc;width:100%;height:32px;border:1px solid #dcdee2;border-radius:4px;padding:4px 8px;line-height:1.5}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$7 = "data-v-5f054d94";
+  const __vue_scope_id__$7 = "data-v-0a565942";
   /* module identifier */
   const __vue_module_identifier__$7 = undefined;
   /* functional template */
@@ -1555,6 +1549,7 @@ var script = Vue.extend({
                 item.choices.forEach((_item) => {
                     this.$set(_item, "readonly", disabled);
                 });
+                this.$set(item.options, "required", !disabled);
             }
             else {
                 this.$set(item.options, "readonly", disabled);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-response",
-  "version": "0.3.22657",
+  "version": "0.3.22704",
   "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.22657",
-    "@wg-npm/survey-service-api": "0.3.22657",
+    "@wg-npm/survey-core": "0.3.22704",
+    "@wg-npm/survey-service-api": "0.3.22704",
     "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.22657",
-    "@wg-npm/survey-service-api": "0.3.22657",
+    "@wg-npm/survey-core": "0.3.22704",
+    "@wg-npm/survey-service-api": "0.3.22704",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",

package/src/components/question/type/fill-blank.vue

@@ -3,7 +3,7 @@
     <div
       v-if="readonly"
       class="processed-answer"
-      v-html="decodeHTML(value.processedAnswer)"
+      v-html="decodeHTML(value)"
     />
     <FormItem
       v-else
@@ -63,7 +63,8 @@ export default Vue.extend({
     },
   },
   methods: {
-    decodeHTML(str) {
+    decodeHTML(value) {
+      const str = value.processedAnswer ? value.processedAnswer: value.answer;
       if (typeof str == "string") {
         return str.replace(/&lt;|&gt;|&amp;/g, function (matches) {
           return {

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

@@ -2,7 +2,7 @@
   <FormItem
     :prop="`answers[${index}].answer`"
     :rules="{
-      required: question.options.required && !isReadOnly,
+      required: question.options.required,
       type: 'array',
       min: 1,
       message: t('survey_response.question.question_required'),
@@ -58,17 +58,12 @@ export default Vue.extend({
   data() {
     return { 
       value: this.answer,
-      isReadOnly: false,
     };
   },
   watch: {
     answer(n) {
       this.value = n;
     },
-    question(q) {
-      // @ts-ignore
-      this.isReadOnly = !!_.find(this.question.choices, (choice) => choice.readonly);
-    },
   },
   methods: {
     setCheckboxStatus() {

package/src/components/question/type/short-answer.vue

@@ -3,7 +3,7 @@
     <div
       v-if="readonly"
       class="processed-answer"
-      v-html="decodeHTML(value.processedAnswer)"
+      v-html="decodeHTML(value)"
     />
     <FormItem
       v-else
@@ -76,7 +76,8 @@ export default Vue.extend({
     },
   },
   methods: {
-    decodeHTML(str) {
+    decodeHTML(value) {
+      const str = value.processedAnswer ? value.processedAnswer: value.answer;
       if (typeof str == "string") {
         return str.replace(/&lt;|&gt;|&amp;/g, function (matches) {
           return {

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

@@ -2,7 +2,7 @@
   <FormItem
     :prop="`answers[${index}].answer`"
     :rules="{
-      required: question.options.required && !isReadOnly,
+      required: question.options.required,
       message: t('survey_response.question.question_required'),
     }"
   >
@@ -69,7 +69,6 @@ export default Vue.extend({
       value: this.answer,
       // @ts-ignore
       choiceClasses: this.buildChoiceClasses(),
-      isReadOnly: false,
     };
   },
   watch: {
@@ -78,10 +77,6 @@ export default Vue.extend({
     },
     answer(n) {
       this.value = n;
-    },
-        question(q) {
-      // @ts-ignore
-      this.isReadOnly = !!_.find(this.question.choices, (choice) => choice.readonly);
     },
   },
   methods: {

package/src/components/survey-response.vue

@@ -115,6 +115,7 @@ export default Vue.extend({
         item.choices.forEach((_item) => {
           this.$set(_item, "readonly", disabled);
         });
+        this.$set(item.options, "required", !disabled);
       } else {
         this.$set(item.options, "readonly", disabled);
       }