@wg-npm/survey-creator 0.3.7744 → 0.3.7753

package/dist/survey-creator.esm.js

@@ -3242,12 +3242,17 @@ var script$d = Vue.extend({
             let currentTotalScore = this.totalScore;
             _.forEach(options, function (o) {
                 o.disabled = _.some(otherRange, function (or) {
-                    let condition_a = o >= or.min && o <= or.max;
+                    let condition_a = o.value >= or.min && o.value <= or.max;
                     let condition_b = type == "left" ? o.value >= _.get(currentValue, "minScore", 0) : o.value <= _.get(currentValue, "maxScore", currentTotalScore);
                     return condition_a && condition_b;
                 });
             });
         },
+        generateExpr() {
+            let minScore = this.value.minScore;
+            let maxScore = this.value.maxScore;
+            return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
+        }
     },
 });
 
@@ -3260,7 +3265,7 @@ 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')},on:{"on-change":function($event){return _vm.resetScoreOptions(_vm.leftScores,'left')}},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.leftScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n                    "+_vm._s(score.value)+"\n                ")])}),1)],1)],1),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"rules":{
+    }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.resetScoreOptions(_vm.leftScores,'left')}},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.leftScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n                    "+_vm._s(score.value)+"\n                ")])}),1)],1)],1),_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'),
@@ -3273,17 +3278,17 @@ 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')},on:{"on-change":function($event){return _vm.resetScoreOptions(_vm.rightScores,'right')}},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}},_vm._l((_vm.rightScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n                    "+_vm._s(score.value)+"\n                ")])}),1)],1)],1)],1)};
+    }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.resetScoreOptions(_vm.rightScores,'right')}},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}},_vm._l((_vm.rightScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n                    "+_vm._s(score.value)+"\n                ")])}),1)],1)],1)],1)};
 var __vue_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-b6aa713e_0", { source: ".label[data-v-b6aa713e]{text-align:right;margin-bottom:24px}[data-v-b6aa713e] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
+    inject("data-v-7ce84d0b_0", { source: ".label[data-v-7ce84d0b]{text-align:right;margin-bottom:24px}[data-v-7ce84d0b] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-b6aa713e";
+  const __vue_scope_id__$d = "data-v-7ce84d0b";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */

package/package.json

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

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

@@ -18,7 +18,7 @@
                 <Select
                         v-model="value.minScore"
                         :placeholder="t('survey_creator.question.selectScore')"
-                        @on-change="resetScoreOptions(leftScores,'left')"
+                        @on-open-change="resetScoreOptions(leftScores,'left')"
                 >
                     <Option
                             v-for="score in leftScores"
@@ -99,7 +99,7 @@
                 <Select
                         v-model="value.maxScore"
                         :placeholder="t('survey_creator.question.selectScore')"
-                        @on-change="resetScoreOptions(rightScores,'right')"
+                        @on-open-change="resetScoreOptions(rightScores,'right')"
                 >
                     <Option
                             v-for="score in rightScores"
@@ -216,12 +216,17 @@
 
                 _.forEach(options, function (o) {
                     o.disabled = _.some(otherRange, function (or) {
-                        let condition_a = o >= or.min && o <= or.max;
+                        let condition_a = o.value >= or.min && o.value <= or.max;
                         let condition_b = type == "left" ? o.value >= _.get(currentValue, "minScore", 0) : o.value <= _.get(currentValue, "maxScore", currentTotalScore)
                         return condition_a && condition_b;
                     })
                 })
             },
+            generateExpr() {
+                let minScore = this.value.minScore;
+                let maxScore = this.value.maxScore;
+                return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
+            }
         },
     });
 </script>