@wg-npm/survey-creator 0.3.13 → 0.3.377-8.develop

package/package.json

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

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

@@ -1,31 +1,29 @@
 <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 = 60;
 import Vue from "vue";
-import {ExprConditionType} from "@wg-npm/survey-core/src/models";
+import { ExprConditionType } from "@wg-npm/survey-core/src/models";
 import LocaleMixin from "../../../../mixins/locale-mixin";
 import _ from "lodash";
-import {Tooltip} from "view-design";
-import {ExprEvaluationQuestion} from "@wg-npm/survey-core/src/expr-evaluation-question";
-
+import { Tooltip } from "view-design";
+import { ExprEvaluationQuestion } from "@wg-npm/survey-core/src/expr-evaluation-question";
 
 export default Vue.extend({
   name: "expr-if",
   mixins: [LocaleMixin],
-  components: {Tooltip},
+  components: { Tooltip },
   inject: ["$rootComponent"],
   data() {
     return {
       desc: "",
-      descTitle: ""
-    }
+      descTitle: "",
+    };
   },
   created() {
     this.initialDesc();
@@ -33,31 +31,57 @@ export default Vue.extend({
   props: {
     conditions: {
       type: Array,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     questions() {
       return _.cloneDeep(this.$rootComponent.currentSurvey.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.operator, 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, "、"), _.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 "";
       }
-      return "";
     },
     getChineseLength(_str) {
       _str = _.trim(_str);
@@ -69,19 +93,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>

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

@@ -1,7 +1,7 @@
 <template>
     <Row type="flex" justify="start" :gutter="6" align="middle">
         <Col class="label">
-            {{t('survey_creator.question.evaluation.condition.question') }}
+            {{t('survey_creator.question.evaluation.condition.type.SCORE') }}
         </Col>
         <Col :span="5">
             <FormItem :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.scope`"

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

@@ -1,53 +1,66 @@
 <template>
-    <component :is="type" v-model="value" :question="question" @expr="expr" :evaluation-items="evaluationItems"
-               :item-index="itemIndex" :index="index"/>
+  <component
+    :is="type"
+    v-model="value"
+    :question="question"
+    @expr="expr"
+    :evaluation-items="evaluationItems"
+    :item-index="itemIndex"
+    :index="index"
+  />
 </template>
 <script lang="ts">
-    import Vue from "vue";
-    import QuestionFormMixin from "../../../../../mixins/question-form-mixin";
-    import Assign from "./assign.vue"
-    import Auto from "./auto.vue"
-    import {ExprConditionType} from "@wg-npm/survey-core/src/models";
+import Vue from "vue";
+import QuestionFormMixin from "../../../../../mixins/question-form-mixin";
+import Assign from "./assign.vue";
+import Auto from "./auto.vue";
+import Score from "./score.vue";
+import { ExprConditionType } from "@wg-npm/survey-core/src/models";
 
-    export default Vue.extend({
-        name: "condition",
-        mixins: [QuestionFormMixin],
-        components: {
-            ASSIGN: Assign,
-            AUTO: Auto
-        },
-        props: {
-            type: {
-                type: String,
-                required: true
-            },
-            value: {
-                type: Object,
-                required: true
-            },
-            index: {
-                type: Number,
-                required: true
-            },
-            evaluationItems: {
-                type: Array,
-                required: true
-            },
-            itemIndex: {
-                type: Number,
-                required: true
-            }
-        },
-        data() {
-            return {
-                exprConditionType: ExprConditionType.AUTO,
-                exprConditionTypes: [ExprConditionType.AUTO, ExprConditionType.ASSIGN]
-            };
-        },
-        methods: {
-            expr(value) {
-                this.$emit("expr", this.index, value);
-            }
-        }
-    })
+export default Vue.extend({
+  name: "condition",
+  mixins: [QuestionFormMixin],
+  components: {
+    ASSIGN: Assign,
+    AUTO: Auto,
+    SCORE: Score,
+  },
+  props: {
+    type: {
+      type: String,
+      required: true,
+    },
+    value: {
+      type: Object,
+      required: true,
+    },
+    index: {
+      type: Number,
+      required: true,
+    },
+    evaluationItems: {
+      type: Array,
+      required: true,
+    },
+    itemIndex: {
+      type: Number,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      exprConditionType: ExprConditionType.AUTO,
+      exprConditionTypes: [
+        ExprConditionType.AUTO,
+        ExprConditionType.ASSIGN,
+        ExprConditionType.SCORE,
+      ],
+    };
+  },
+  methods: {
+    expr(value) {
+      this.$emit("expr", this.index, value);
+    },
+  },
+});
 </script>