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

package/package.json

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

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

@@ -1,29 +1,31 @@
 <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();
@@ -31,57 +33,31 @@ 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;
-      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, "、")]
-          );
+      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 "";
+        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 "";
     },
     getChineseLength(_str) {
       _str = _.trim(_str);
@@ -93,20 +69,19 @@ 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/common/question/evaluation.vue

@@ -7,7 +7,10 @@
                         <Icon class="icon" type="ios-checkmark-circle-outline" :size="36"/>
                     </div>
                     <div class="card-content">
-                        <p class="text">{{ item.text | translate(true) }}</p>
+                        <Tooltip max-width="200">
+                            <p slot="content">{{ item.text | translate(true) }}</p>
+                            <p class="text">{{ item.text | translate(true) }}</p>
+                        </Tooltip>
                         <component :is="question.options.evaluationType" :item="item"></component>
                     </div>
                 </Card>
@@ -18,7 +21,7 @@
 
 <script lang="ts">
     import Vue from "vue";
-    import {Checkbox, Col, Row, CheckboxGroup, Card, Icon} from "view-design";
+    import {Checkbox, Col, Row, CheckboxGroup, Card, Icon, Tooltip} from "view-design";
     import LocaleMixin from "../../../mixins/locale-mixin";
     import {QuestionEvaluationModel, QuestionType} from "@wg-npm/survey-core";
     import Star from "./evaluation/star.vue";
@@ -28,7 +31,7 @@
     export default Vue.extend({
         name: "Evaluation",
         components: {
-            Row, Col, Checkbox, CheckboxGroup, Card, Icon,
+            Row, Col, Checkbox, CheckboxGroup, Card, Icon, Tooltip,
             STAR: Star,
             EXPR: Expr,
         },

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.type.SCORE') }}
+            {{t('survey_creator.question.evaluation.condition.question') }}
         </Col>
         <Col :span="5">
             <FormItem :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.scope`"

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

@@ -1,66 +1,53 @@
 <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 Score from "./score.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 {ExprConditionType} from "@wg-npm/survey-core/src/models";
 
-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);
-    },
-  },
-});
+    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);
+            }
+        }
+    })
 </script>