@wg-npm/survey-response 0.3.3791 → 0.3.4060

package/dist/survey-response.esm.js

@@ -1013,14 +1013,14 @@ var script$5 = Vue.extend({
     data() {
         return {
             desc: "",
-            descTitle: ""
+            descTitle: "",
         };
     },
     props: {
         conditions: {
             type: Array,
-            required: true
-        }
+            required: true,
+        },
     },
     created() {
         this.initialDesc();
@@ -1028,23 +1028,39 @@ var script$5 = Vue.extend({
     computed: {
         questions() {
             return _.clone(this.survey.questions);
-        }
+        },
     },
     methods: {
         getDesc(condition) {
             let payload = condition.payload;
-            let numbers = new ExprEvaluationQuestion(this.questions, payload.scope).calculateNumbers();
-            let scope = _.join(_.map(numbers, number => {
-                if (_.isArray(_.head(number))) {
-                    return _.join(_.map(number, e => _.join(e, "-")), ", ");
-                }
-                return _.join(number, "-");
-            }), ", ");
-            if (condition.type == "ASSIGN") {
-                return this.t('survey_creator.question.evaluation.condition.assign_template', [scope, _.join(payload.values, "、"), payload.operator, payload.size]);
+            if (condition.type == "SCORE") {
+                return this.t("survey_creator.question.evaluation.condition.score_template", [
+                    payload.minScore,
+                    payload.leftOperator,
+                    payload.rightOperator,
+                    payload.maxScore,
+                ]);
             }
-            else if (condition.type == "AUTO") {
-                return this.t('survey_creator.question.evaluation.condition.auto_template', [scope, _.join(payload.values, "、")]);
+            else {
+                let numbers = new ExprEvaluationQuestion(this.questions, payload.scope).calculateNumbers();
+                let scope = _.join(_.map(numbers, (number) => {
+                    if (_.isArray(_.head(number))) {
+                        return _.join(_.map(number, (e) => _.join(e, "-")), ", ");
+                    }
+                    return _.join(number, "-");
+                }), ", ");
+                if (condition.type == "ASSIGN") {
+                    return this.t("survey_creator.question.evaluation.condition.assign_template", [
+                        scope,
+                        _.join(payload.values, "、"),
+                        _.unescape(payload.operator),
+                        payload.size,
+                    ]);
+                }
+                else if (condition.type == "AUTO") {
+                    return this.t("survey_creator.question.evaluation.condition.auto_template", [scope, _.join(payload.values, "、")]);
+                }
+                return "";
             }
         },
         getChineseLength(_str) {
@@ -1057,20 +1073,21 @@ var script$5 = Vue.extend({
             return chinese ? chinese.length : 0;
         },
         initialDesc() {
-            let desc = '';
+            let desc = "";
             let ds = _.map(this.conditions, (c) => {
                 return this.getDesc(c);
             });
-            desc = _.join(ds, '</br>');
+            desc = _.join(ds, "</br>");
             this.desc = desc;
             let strLength = desc.length;
             let cLength = this.getChineseLength(desc.substring(0, SPLIT_LENGTH));
             if (strLength > SPLIT_LENGTH) {
-                this.desc = desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "...";
+                this.desc =
+                    desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "...";
             }
             this.descTitle = desc;
-        }
-    }
+        },
+    },
 });
 
 /* script */

package/package.json

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

package/src/components/question/type/evaluation/expr-if.vue

@@ -1,36 +1,35 @@
 <template>
   <Tooltip max-width="200">
     <span v-html="this.descTitle" slot="content"></span>
-    <span v-html="this.desc" class="desc">
-    </span>
+    <span v-html="this.desc" class="desc"> </span>
   </Tooltip>
 </template>
 
 <script lang="ts">
 const SPLIT_LENGTH = 50;
 import Vue from "vue";
-import {Tooltip} from "view-design";
-import {ExprConditionType} from "@wg-npm/survey-core/src/models";
+import { Tooltip } from "view-design";
+import { ExprConditionType } from "@wg-npm/survey-core/src/models";
 import LocaleMixin from "../../../../mixins/locale-mixin";
 import _ from "lodash";
-import {ExprEvaluationQuestion} from "@wg-npm/survey-core/src/expr-evaluation-question";
+import { ExprEvaluationQuestion } from "@wg-npm/survey-core/src/expr-evaluation-question";
 
 export default Vue.extend({
   name: "expr-if",
-  components: {Tooltip},
+  components: { Tooltip },
   mixins: [LocaleMixin],
   inject: ["survey"],
   data() {
     return {
       desc: "",
-      descTitle: ""
-    }
+      descTitle: "",
+    };
   },
   props: {
     conditions: {
       type: Array,
-      required: true
-    }
+      required: true,
+    },
   },
   created() {
     this.initialDesc();
@@ -38,23 +37,55 @@ export default Vue.extend({
   computed: {
     questions() {
       return _.clone(this.survey.questions);
-    }
+    },
   },
   methods: {
     getDesc(condition) {
       let payload = condition.payload;
-      let numbers = new ExprEvaluationQuestion(this.questions, payload.scope).calculateNumbers();
-      let scope = _.join(_.map(numbers, number => {
-        if (_.isArray(_.head(number))) {
-          return _.join(_.map(number, e => _.join(e, "-")), ", ");
+      if (condition.type == ExprConditionType.SCORE) {
+        return this.t(
+          "survey_creator.question.evaluation.condition.score_template",
+          [
+            payload.minScore,
+            payload.leftOperator,
+            payload.rightOperator,
+            payload.maxScore,
+          ]
+        );
+      } else {
+        let numbers = new ExprEvaluationQuestion(
+          this.questions,
+          payload.scope
+        ).calculateNumbers();
+        let scope = _.join(
+          _.map(numbers, (number) => {
+            if (_.isArray(_.head(number))) {
+              return _.join(
+                _.map(number, (e) => _.join(e, "-")),
+                ", "
+              );
+            }
+            return _.join(number, "-");
+          }),
+          ", "
+        );
+        if (condition.type == ExprConditionType.ASSIGN) {
+          return this.t(
+            "survey_creator.question.evaluation.condition.assign_template",
+            [
+              scope,
+              _.join(payload.values, "、"),
+              _.unescape(payload.operator),
+              payload.size,
+            ]
+          );
+        } else if (condition.type == ExprConditionType.AUTO) {
+          return this.t(
+            "survey_creator.question.evaluation.condition.auto_template",
+            [scope, _.join(payload.values, "、")]
+          );
         }
-        return _.join(number, "-");
-      }), ", ");
-
-      if (condition.type == ExprConditionType.ASSIGN) {
-        return this.t('survey_creator.question.evaluation.condition.assign_template', [scope, _.join(payload.values, "、"), payload.operator, payload.size]);
-      } else if (condition.type == ExprConditionType.AUTO) {
-        return this.t('survey_creator.question.evaluation.condition.auto_template', [scope, _.join(payload.values, "、")]);
+        return "";
       }
     },
     getChineseLength(_str) {
@@ -67,19 +98,20 @@ export default Vue.extend({
       return chinese ? chinese.length : 0;
     },
     initialDesc() {
-      let desc = '';
+      let desc = "";
       let ds = _.map(this.conditions, (c) => {
         return this.getDesc(c);
       });
-      desc = _.join(ds, '</br>')
+      desc = _.join(ds, "</br>");
       this.desc = desc;
       let strLength = desc.length;
-      let cLength = this.getChineseLength(desc.substring(0, SPLIT_LENGTH))
+      let cLength = this.getChineseLength(desc.substring(0, SPLIT_LENGTH));
       if (strLength > SPLIT_LENGTH) {
-        this.desc = desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "..."
+        this.desc =
+          desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "...";
       }
       this.descTitle = desc;
-    }
-  }
+    },
+  },
 });
 </script>