@wg-npm/survey-creator 0.3.4062 → 0.3.4107

package/dist/survey-creator.esm.js

@@ -3162,7 +3162,10 @@ var script$d = Vue.extend({
             operators: ["<=", "<"],
         };
     },
-    created() { },
+    created() {
+        this.value.leftOperator = _.unescape(this.value.leftOperator);
+        this.value.rightOperator = _.unescape(this.value.rightOperator);
+    },
     computed: {
         totalScore() {
             return this.$rootComponent.currentSurvey.statistics.maxScore;
@@ -3241,13 +3244,12 @@ var script$d = Vue.extend({
             if (this.checkValueInOtherRange(value)) {
                 return true;
             }
-            let currentMin = _.get(this.value, "minScore", 0);
-            let currentMax = _.get(this.value, "maxScore", this.totalScore);
-            _.get(this.value, "maxScore", this.totalScore);
-            if (type == "left" && value >= currentMax) {
+            let leftScore = _.get(this.value, "minScore", 0);
+            let rightScore = _.get(this.value, "maxScore", this.totalScore);
+            if (leftScore != null && type == "left" && value >= rightScore) {
                 return true;
             }
-            if (type == "right" && value <= currentMin) {
+            if (type == "right" && value <= leftScore) {
                 return true;
             }
         },
@@ -3279,11 +3281,11 @@ var __vue_render__$d = function () {var _vm=this;var _h=_vm.$createElement;var _
         type: 'number',
         trigger: 'change',
         message: _vm.t('survey_creator.question.scoreRequiredTip'),
-      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.scores),function(score){return _c('Option',{key:score,attrs:{"value":score,"disabled":_vm.disabledScoreOption(score, 'left')}},[_vm._v("\n          "+_vm._s(score)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"rules":{
+      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.scores),function(score){return _c('Option',{key:score,attrs:{"value":score,"disabled":_vm.disabledScoreOption(score, 'left')}},[_vm._v("\n          "+_vm._s(score)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"rules":{
         required: true,
         trigger: 'change',
         message: _vm.t('survey_creator.question.notEmpty'),
-      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.evaluation.condition.operator')},model:{value:(_vm.value.leftOperator),callback:function ($$v) {_vm.$set(_vm.value, "leftOperator", $$v);},expression:"value.leftOperator"}},_vm._l((_vm.operators),function(operator,index){return _c('Option',{key:index,attrs:{"value":operator}},[_vm._v("\n          "+_vm._s(operator)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.totalScores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.rightOperator"),"rules":{
+      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.evaluation.condition.operator')},model:{value:(_vm.value.leftOperator),callback:function ($$v) {_vm.$set(_vm.value, "leftOperator", $$v);},expression:"value.leftOperator"}},_vm._l((_vm.operators),function(operator,index){return _c('Option',{key:index,attrs:{"value":operator}},[_vm._v("\n          "+_vm._s(operator)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.totalScores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.rightOperator"),"rules":{
         required: true,
         trigger: 'change',
         message: _vm.t('survey_creator.question.notEmpty'),
@@ -3298,11 +3300,11 @@ var __vue_staticRenderFns__$d = [];
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-0d3d3556_0", { source: ".label[data-v-0d3d3556]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
+    inject("data-v-0dd6faab_0", { source: ".label[data-v-0dd6faab]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-0d3d3556";
+  const __vue_scope_id__$d = "data-v-0dd6faab";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -4524,7 +4526,7 @@ var script = Vue.extend({
     components: { Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer },
     provide() {
         return {
-            $rootComponent: this
+            $rootComponent: this.$rootComponent
         };
     },
     props: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-creator",
-  "version": "0.3.4062",
+  "version": "0.3.4107",
   "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.4062",
-    "@wg-npm/survey-service-api": "0.3.4062",
+    "@wg-npm/survey-core": "0.3.4107",
+    "@wg-npm/survey-service-api": "0.3.4107",
     "axios": "^0.19.2",
     "camelcase": "^6.0.0",
     "deepmerge": "^4.2.2",
@@ -38,8 +38,8 @@
     "@typescript-eslint/eslint-plugin": "^3.6.0",
     "@typescript-eslint/parser": "^3.6.0",
     "@vue/eslint-config-prettier": "^6.0.0",
-    "@wg-npm/survey-core": "0.3.4062",
-    "@wg-npm/survey-service-api": "0.3.4062",
+    "@wg-npm/survey-core": "0.3.4107",
+    "@wg-npm/survey-service-api": "0.3.4107",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",

package/src/components/editor/forms/evaluation/expr/score.vue

@@ -33,7 +33,7 @@
     <Col class="label" :span="1">
       {{ t("survey_creator.question.scores") }}
     </Col>
-    <Col :span="2">
+    <Col :span="3">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
         :rules="{
@@ -61,7 +61,7 @@
     <Col class="label">
       {{ t("survey_creator.question.totalScores") }}
     </Col>
-    <Col :span="2">
+    <Col :span="3">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
         :rules="{
@@ -150,7 +150,10 @@ export default Vue.extend({
       operators: ["<=", "<"],
     };
   },
-  created() {},
+  created() {
+    this.value.leftOperator = _.unescape(this.value.leftOperator);
+    this.value.rightOperator = _.unescape(this.value.rightOperator);
+  },
   computed: {
     totalScore() {
       return this.$rootComponent.currentSurvey.statistics.maxScore;
@@ -234,13 +237,12 @@ export default Vue.extend({
       if (this.checkValueInOtherRange(value)) {
         return true;
       }
-      let currentMin = _.get(this.value, "minScore", 0);
-      let currentMax = _.get(this.value, "maxScore", this.totalScore);
-      _.get(this.value, "maxScore", this.totalScore);
-      if (type == "left" && value >= currentMax) {
+      let leftScore = _.get(this.value, "minScore", 0);
+      let rightScore = _.get(this.value, "maxScore", this.totalScore);
+      if (leftScore != null && type == "left" && value >= rightScore) {
         return true;
       }
-      if (type == "right" && value <= currentMin) {
+      if (type == "right" && value <= leftScore) {
         return true;
       }
     },

package/src/components/survey-previewer.vue

@@ -36,7 +36,7 @@
         components: {Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer},
         provide() {
             return {
-                $rootComponent: this
+                $rootComponent: this.$rootComponent
             };
         },
         props: {