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

package/dist/survey-creator.esm.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import _ from 'lodash';
-import { Dropdown, DropdownMenu, DropdownItem, Button, Row, Col, Icon, Tooltip, Radio, RadioGroup, Checkbox, CheckboxGroup, Input, Divider, Card, Form, FormItem, ButtonGroup, Select, Option, InputNumber, Table, OptionGroup, Drawer, Modal, Tabs, TabPane, Scroll } from 'view-design';
+import { Dropdown, DropdownMenu, DropdownItem, Button, Row, Col, Icon, Tooltip, Radio, RadioGroup, Checkbox, CheckboxGroup, Input, Divider, Card, Form, FormItem, ButtonGroup, Select, Option, InputNumber, Table, OptionGroup, Message, Drawer, Modal, Tabs, TabPane, Scroll } from 'view-design';
 import deepmerge from 'deepmerge';
 import draggable from 'vuedraggable';
 
@@ -150,7 +150,7 @@ var defaultLang = {
                     other: "其他",
                     assign_template: `{0} 项为 {1}  {2} {3}项`,
                     auto_template: `{0} 项为 {1}`,
-                    score_template: `总分数范围为: {0}分{1}, {2}分`,
+                    score_template: `总分数范围为: {0}分{1}{2}分`,
                 },
             },
         },
@@ -292,7 +292,7 @@ class QuestionFactory {
   }
 
   createQuestion(questionType) {
-    let creator = this.creatorHash[questionType];
+    const creator = this.creatorHash[questionType];
     return creator(this.locale);
   }
 
@@ -377,7 +377,7 @@ class BaseQuestionModel {
     } else if (question.type == "MULTI_SELECTION") {
       return _.sumBy(question.choices, item => parseFloat(_.get(item, "options.score") || 0));
     } else if (question.type == "MATRIX") {
-      let score = _.max(_.map(question.choices, choice => parseFloat(_.get(choice, "options.score", 0) || 0)));
+      const score = _.max(_.map(question.choices, choice => parseFloat(_.get(choice, "options.score", 0) || 0)));
 
       return score * question.subQuestions.length;
     }
@@ -401,7 +401,7 @@ class BaseQuestionModel {
 
   static calculationAllQuestionCount(questions) {
     let count = 0;
-    let exclude = ["TEXT_TITLE"];
+    const exclude = ["TEXT_TITLE"];
 
     _.forEach(questions, question => {
       if (!_.includes(exclude, question.type)) {
@@ -491,7 +491,7 @@ class QuestionMatrixModel extends BaseQuestionModel {
   }
 
   static getNumber(preNumber, question) {
-    let number = preNumber + 1;
+    const number = preNumber + 1;
 
     _.forEach(question.subQuestions, (sq, index) => {
       sq.number = index + 1;
@@ -509,17 +509,17 @@ const EN_US = _.camelCase("en-US");
 const ZH_TW = _.camelCase("zh-TW");
 
 function getValue(obj, locale) {
-  let value = _.get(obj, _.camelCase(locale), '');
+  const value = _.get(obj, _.camelCase(locale), "");
 
   if (!_.isEmpty(value)) {
     return value;
   }
 
-  return _.get(obj, locale, '');
+  return _.get(obj, locale, "");
 }
 
 function translate(obj, locale, prettyMath = false) {
-  let value = getValue(obj, locale);
+  const value = getValue(obj, locale);
 
   if (!_.isEmpty(value) || !prettyMath) {
     return value;
@@ -3102,17 +3102,17 @@ var script$e = Vue.extend({
 const __vue_script__$e = script$e;
 
 /* template */
-var __vue_render__$e = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Row',{attrs:{"type":"flex","justify":"start","gutter":6,"align":"middle"}},[_c('Col',{staticClass:"label"},[_vm._v("\n        "+_vm._s(_vm.t('survey_creator.question.evaluation.condition.type.SCORE'))+"\n    ")]),_vm._v(" "),_c('Col',{attrs:{"span":5}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.scope"),"rules":{ required: true, type: 'array', trigger: 'change', min: 1, message: _vm.t('survey_creator.question.notEmpty') }}},[_c('question-select',{attrs:{"question":_vm.question},model:{value:(_vm.value.scope),callback:function ($$v) {_vm.$set(_vm.value, "scope", $$v);},expression:"value.scope"}})],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_vm._v("\n        "+_vm._s(_vm.t('survey_creator.question.evaluation.condition.question_result'))+"\n    ")]),_vm._v(" "),_c('Col',{attrs:{"span":8}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.values"),"rules":{ required: true, type: 'array', trigger: 'change', min: 1, message: _vm.t('survey_creator.question.notEmpty') }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.evaluation.condition.choose_result'),"max-tag-count":1,"multiple":""},model:{value:(_vm.value.values),callback:function ($$v) {_vm.$set(_vm.value, "values", $$v);},expression:"value.values"}},_vm._l((_vm.choices),function(choice,index){return _c('Option',{key:index,attrs:{"value":choice}},[_vm._v("\n                    "+_vm._s(choice)+"\n                ")])}),1)],1)],1)],1)};
+var __vue_render__$e = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Row',{attrs:{"type":"flex","justify":"start","gutter":6,"align":"middle"}},[_c('Col',{staticClass:"label"},[_vm._v("\n        "+_vm._s(_vm.t('survey_creator.question.evaluation.condition.question'))+"\n    ")]),_vm._v(" "),_c('Col',{attrs:{"span":5}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.scope"),"rules":{ required: true, type: 'array', trigger: 'change', min: 1, message: _vm.t('survey_creator.question.notEmpty') }}},[_c('question-select',{attrs:{"question":_vm.question},model:{value:(_vm.value.scope),callback:function ($$v) {_vm.$set(_vm.value, "scope", $$v);},expression:"value.scope"}})],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_vm._v("\n        "+_vm._s(_vm.t('survey_creator.question.evaluation.condition.question_result'))+"\n    ")]),_vm._v(" "),_c('Col',{attrs:{"span":8}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.values"),"rules":{ required: true, type: 'array', trigger: 'change', min: 1, message: _vm.t('survey_creator.question.notEmpty') }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.evaluation.condition.choose_result'),"max-tag-count":1,"multiple":""},model:{value:(_vm.value.values),callback:function ($$v) {_vm.$set(_vm.value, "values", $$v);},expression:"value.values"}},_vm._l((_vm.choices),function(choice,index){return _c('Option',{key:index,attrs:{"value":choice}},[_vm._v("\n                    "+_vm._s(choice)+"\n                ")])}),1)],1)],1)],1)};
 var __vue_staticRenderFns__$e = [];
 
   /* style */
   const __vue_inject_styles__$e = function (inject) {
     if (!inject) return
-    inject("data-v-1b7846c4_0", { source: ".label[data-v-1b7846c4]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
+    inject("data-v-647dceac_0", { source: ".label[data-v-647dceac]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$e = "data-v-1b7846c4";
+  const __vue_scope_id__$e = "data-v-647dceac";
   /* module identifier */
   const __vue_module_identifier__$e = undefined;
   /* functional template */
@@ -3138,6 +3138,7 @@ var __vue_staticRenderFns__$e = [];
 
   var Auto = __vue_component__$e;
 
+Vue.prototype.$Message = Message;
 var script$d = Vue.extend({
     name: "score",
     mixins: [ExprMixin, LocaleMixin],
@@ -3147,28 +3148,145 @@ var script$d = Vue.extend({
         Select,
         Option,
         FormItem,
-        InputNumber,
+        InputNumber
     },
     data() {
         return {
-            operators: ["<=", "<"],
+            leftMin: 0,
+            leftMax: 0,
+            rightMin: 0,
+            rightMax: 0,
+            operators: ["<=", "<"]
         };
     },
+    created() {
+        this.leftMax = this.totalScore - 1;
+        this.rightMax = this.totalScore;
+    },
     computed: {
         totalScore() {
             return this.$rootComponent.currentSurvey.statistics.maxScore;
         },
+        otherConditions() {
+            let otherEvaluationItems = _.filter(_.map(this.evaluationItems, (item, index) => {
+                return _.extend({}, item, { index: index });
+            }), (item) => item.index != this.itemIndex);
+            return _.filter(_.flatMap(otherEvaluationItems, "conditions"), (item) => item.type == "SCORE");
+        },
+        otherMin() {
+            _.min(_.map(this.otherConditions, (item) => _.get(item, "payload.minScore", 0)));
+        },
+        otherMax() {
+            _.max(_.map(this.otherConditions, (item) => _.get(item, "payload.maxScore", 0)));
+        },
     },
     methods: {
+        checkValueInOtherRange(value, conditions) {
+            let otherRange = _.map(conditions, (item) => {
+                return {
+                    min: _.get(item, "payload.minScore"),
+                    max: _.get(item, "payload.maxScore"),
+                };
+            });
+            return _.some(otherRange, function (o) {
+                return value >= o.min && value <= o.max;
+            });
+        },
         generateExpr() {
             let minScore = this.value.minScore;
             let maxScore = this.value.maxScore;
-            return `$totalScore ${minScore} ${this.value.operator} ${maxScore}`;
+            return `${minScore} ${this.value.operator} score and score ${this.value.operator} ${maxScore}`;
         },
-        rangeChange() {
-            console.log("222");
+        leftChange(value) {
+            this.rangeChange(value, "left");
         },
-    },
+        rightChange(value) {
+            this.rangeChange(value, "right");
+        },
+        rangeChange(value, type) {
+            let valueInOtherRange = this.checkValueInOtherRange(value, this.otherConditions);
+            let usableRanges = this.getUsableRanges();
+            let firstUsableRange = usableRanges[0];
+            let valueInRange = this.getSelectedRangeByValue(value, usableRanges);
+            let currentRange = valueInOtherRange ? firstUsableRange : valueInRange;
+            let min = valueInOtherRange ? firstUsableRange[0] : _.get(valueInRange, 'min', 0);
+            let max = valueInOtherRange ? firstUsableRange[1] : _.get(currentRange, 'max', this.totalScore);
+            if (valueInOtherRange) {
+                this.$Message.error("该值在其他区间范围内,请重新输入");
+                this.$set(this.value, "minScore", min);
+                this.$set(this.value, "maxScore", max);
+                this.rightMin = min;
+                this.rightMax = max;
+                this.leftMin = min;
+                this.leftMax = max;
+            }
+            else {
+                if (type == "left") {
+                    this.rightMin = value + 1;
+                    this.rightMax = max;
+                }
+                if (type == "right") {
+                    this.leftMin = min;
+                    this.leftMax = value - 1;
+                }
+            }
+        },
+        getSelectedRangeByValue(value, ranges) {
+            let otherRange = _.map(ranges, (item) => {
+                return {
+                    min: _.get(item, "payload.minScore"),
+                    max: _.get(item, "payload.maxScore"),
+                };
+            });
+            return _.head(_.filter(otherRange, function (o) {
+                return value > o.min && value < o.max;
+            }));
+        },
+        getUsableRanges() {
+            let usedRange = _.map(this.otherConditions, (item) => {
+                return [item.payload.minScore, item.payload.maxScore];
+            });
+            let globalMin = 0;
+            let globalMax = this.totalScore;
+            let usableRange = new Array();
+            if (usedRange.length == 1) {
+                let first = usedRange[0][0] - 1;
+                if (usedRange[0][0] !== 0) {
+                    let item = [0, first];
+                    usableRange.push(item);
+                }
+            }
+            else {
+                let other = usedRange.reduce((a, v) => {
+                    if (typeof a[0] == "number") {
+                        if (a[0] != globalMin) {
+                            return [
+                                [0, a[0]],
+                                [a[1], v[0]],
+                                [v[1], v[1]],
+                            ];
+                        }
+                        else {
+                            return [
+                                [a[1], v[0]],
+                                [v[1], v[1]],
+                            ];
+                        }
+                    }
+                    else {
+                        a[a.length - 1][1] = v[0];
+                        if (a.length != usedRange.length)
+                            a.push([v[1], v[1]]);
+                    }
+                    return a;
+                });
+                if (usedRange[length - 1][1] != globalMax) {
+                    other.push([usedRange[length - 1][1], globalMax]);
+                }
+            }
+            return usableRange;
+        },
+    }
 });
 
 /* script */
@@ -3176,34 +3294,34 @@ const __vue_script__$d = script$d;
 
 /* template */
 var __vue_render__$d = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Row',{attrs:{"type":"flex","justify":"start","gutter":6,"align":"middle"}},[_c('Col',{staticClass:"label"},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.evaluation.condition.score_condition_title"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.minScore"),"rules":{
-        required: true,
-        type: 'number',
-        trigger: 'change',
-        min: 0,
-        max: this.totalScore,
-        message: _vm.t('分值不能为空'),
-      }}},[_c('InputNumber',{attrs:{"min":0,"max":_vm.value.maxScore},on:{"on-change":_vm.rangeChange},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}})],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_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.operator"),"rules":{
+          min:_vm.leftMin,
+          max:_vm.leftMax,
+          required: true,
+          type: 'number',
+          trigger: 'change',
+          message: _vm.t('分值不正确'),
+        }}},[_c('InputNumber',{attrs:{"active-change":false,"min":_vm.leftMin,"max":_vm.leftMax,"formatter":function (value) { return ("" + value + (_vm.t('survey_creator.question.scores'))); },"parser":function (value) { return value.replace(("" + (_vm.t('survey_creator.question.scores'))), ''); }},on:{"on-change":_vm.leftChange},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}})],1)],1),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.operator"),"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.operator),callback:function ($$v) {_vm.$set(_vm.value, "operator", $$v);},expression:"value.operator"}},_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',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.maxScore"),"rules":{
+      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.evaluation.condition.operator')},model:{value:(_vm.value.operator),callback:function ($$v) {_vm.$set(_vm.value, "operator", $$v);},expression:"value.operator"}},_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',{attrs:{"span":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.maxScore"),"rules":{
+        min:_vm.rightMin,
+        max:_vm.rightMax,
         required: true,
         type: 'number',
         trigger: 'change',
-        min: 0,
-        max: this.totalScore,
-        message: _vm.t('分值不能为空'),
-      }}},[_c('InputNumber',{attrs:{"min":_vm.value.minScore,"max":_vm.totalScore},on:{"on-change":_vm.rangeChange},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}})],1)],1),_vm._v(" "),_c('Col',{staticClass:"label"},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")])],1)};
+        message: _vm.t('分值不正确'),
+      }}},[_c('InputNumber',{attrs:{"active-change":false,"min":_vm.rightMin,"max":_vm.rightMax,"formatter":function (value) { return ("" + value + (_vm.t('survey_creator.question.scores'))); },"parser":function (value) { return value.replace(("" + (_vm.t('survey_creator.question.scores'))), ''); }},on:{"on-change":_vm.rightChange},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}})],1)],1)],1)};
 var __vue_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-595ef9bc_0", { source: ".label[data-v-595ef9bc]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
+    inject("data-v-2e725872_0", { source: ".label[data-v-2e725872]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-595ef9bc";
+  const __vue_scope_id__$d = "data-v-2e725872";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -3385,20 +3503,16 @@ var script$b = Vue.extend({
         buildPayloadByType(type) {
             if (type == "SCORE") {
                 return {
-                    payload: {
-                        minScore: 0,
-                        operator: "<",
-                        maxScore: 0,
-                    },
+                    minScore: 0,
+                    operator: "<",
+                    maxScore: 0,
                 };
             }
             return {
-                payload: {
-                    scope: [],
-                    operator: "=",
-                    values: [],
-                    size: 0,
-                },
+                scope: [],
+                operator: "=",
+                values: [],
+                size: 0,
             };
         },
         removeCondition(index) {
@@ -3425,11 +3539,11 @@ var __vue_staticRenderFns__$b = [];
   /* style */
   const __vue_inject_styles__$b = function (inject) {
     if (!inject) return
-    inject("data-v-25df9b0d_0", { source: ".mt-base[data-v-25df9b0d]{margin-top:12px}.action[data-v-25df9b0d]{float:right}.input[data-v-25df9b0d]{width:100px}.label[data-v-25df9b0d]{text-align:right;padding-right:4px}.text[data-v-25df9b0d]{background-color:#ebf7ff;height:32px;padding:8px 18px;font-weight:500;color:#515a6e}[data-v-25df9b0d] .ivu-card .ivu-form-item{margin-bottom:4px;margin-top:0}[data-v-25df9b0d] .ivu-card .ivu-form-item-error{margin-bottom:24px;margin-top:0}", map: undefined, media: undefined });
+    inject("data-v-199a51dd_0", { source: ".mt-base[data-v-199a51dd]{margin-top:12px}.action[data-v-199a51dd]{float:right}.input[data-v-199a51dd]{width:100px}.label[data-v-199a51dd]{text-align:right;padding-right:4px}.text[data-v-199a51dd]{background-color:#ebf7ff;height:32px;padding:8px 18px;font-weight:500;color:#515a6e}[data-v-199a51dd] .ivu-card .ivu-form-item{margin-bottom:4px;margin-top:0}[data-v-199a51dd] .ivu-card .ivu-form-item-error{margin-bottom:24px;margin-top:0}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$b = "data-v-25df9b0d";
+  const __vue_scope_id__$b = "data-v-199a51dd";
   /* module identifier */
   const __vue_module_identifier__$b = undefined;
   /* functional template */
@@ -3583,11 +3697,17 @@ var __vue_staticRenderFns__$9 = [];
 var script$8 = Vue.extend({
     name: "evaluation-form",
     components: {
-        Form, FormItem, Row,
-        Col, draggable, Option,
-        Select, Checkbox, Input,
+        Form,
+        FormItem,
+        Row,
+        Col,
+        draggable,
+        Option,
+        Select,
+        Checkbox,
+        Input,
         ["STAR"]: Star,
-        ["EXPR"]: Expr
+        ["EXPR"]: Expr,
     },
     mixins: [questionFormMixin],
     data() {
@@ -3595,7 +3715,7 @@ var script$8 = Vue.extend({
             labelWidth: 80,
             layoutOptions: ["HORIZONTAL", "VERTICAL"],
             evaluationTypes: ["STAR", "EXPR"],
-            realColumns: []
+            realColumns: [],
         };
     },
     created() {
@@ -3603,33 +3723,41 @@ var script$8 = Vue.extend({
     },
     methods: {
         initData() {
-            this.editQuestion.evaluationItems || this.$set(this.editQuestion, "evaluationItems", []);
-            this.editQuestion.options.evaluationType || this.$set(this.editQuestion.options, "evaluationType", "STAR");
+            this.editQuestion.evaluationItems ||
+                this.$set(this.editQuestion, "evaluationItems", []);
+            this.editQuestion.options.evaluationType ||
+                this.$set(this.editQuestion.options, "evaluationType", "STAR");
         },
         onChange(value) {
             if (value == "EXPR") {
-                _.forEach(this.editQuestion.evaluationItems, item => _.set(item, "type", "IF"));
+                _.forEach(this.editQuestion.evaluationItems, (item, index) => {
+                    _.set(item, "type", "IF");
+                    _.set(item, "index", index);
+                });
                 _.set(this.editQuestion.evaluationItems[_.size(this.editQuestion.evaluationItems) - 1], "type", "ELSE");
             }
-        }
-    }
+        },
+    },
 });
 
 /* script */
 const __vue_script__$8 = script$8;
 
 /* template */
-var __vue_render__$8 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Form',{ref:"questionForm",attrs:{"model":_vm.editQuestion,"label-colon":false}},[_c('Row',[_c('Form-item',{attrs:{"prop":'header.text.' + _vm.primaryLanguage,"rules":{required: true, message: _vm.t('survey_creator.question.titleRequiredTip')},"label":_vm.t('survey_creator.page.question')}},[_c('Checkbox',{model:{value:(_vm.editQuestion.options.required),callback:function ($$v) {_vm.$set(_vm.editQuestion.options, "required", $$v);},expression:"editQuestion.options.required"}},[_vm._v(_vm._s(_vm.t('survey_creator.question.questionRequired'))+"\n            ")]),_vm._v(" "),_c('Row',[_c('Col',{attrs:{"span":23,"offset":-1}},[_c('Input',{attrs:{"placeholder":_vm.t('survey_creator.question.titleRequiredTip')},model:{value:(_vm.editQuestion.header.text[_vm.primaryLanguage]),callback:function ($$v) {_vm.$set(_vm.editQuestion.header.text, _vm.primaryLanguage, (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"editQuestion.header.text[primaryLanguage]"}})],1)],1)],1)],1),_vm._v(" "),_c('Row',[_c('Form-item',{attrs:{"label":_vm.t('survey_creator.question.evaluation.selectedType'),"label-width":_vm.labelWidth}},[_c('Select',{staticStyle:{"width":"200px"},on:{"on-change":_vm.onChange},model:{value:(_vm.editQuestion.options.evaluationType),callback:function ($$v) {_vm.$set(_vm.editQuestion.options, "evaluationType", $$v);},expression:"editQuestion.options.evaluationType"}},_vm._l((_vm.evaluationTypes),function(item){return _c('Option',{key:item,attrs:{"value":item}},[_vm._v(_vm._s(_vm.t(("survey_creator.question.evaluation.type." + item)))+"\n                ")])}),1)],1)],1),_vm._v(" "),_c(_vm.editQuestion.options.evaluationType,{tag:"component",attrs:{"question":_vm.question},model:{value:(_vm.editQuestion.evaluationItems),callback:function ($$v) {_vm.$set(_vm.editQuestion, "evaluationItems", $$v);},expression:"editQuestion.evaluationItems"}})],1)};
+var __vue_render__$8 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('Form',{ref:"questionForm",attrs:{"model":_vm.editQuestion,"label-colon":false}},[_c('Row',[_c('Form-item',{attrs:{"prop":'header.text.' + _vm.primaryLanguage,"rules":{
+        required: true,
+        message: _vm.t('survey_creator.question.titleRequiredTip'),
+      },"label":_vm.t('survey_creator.page.question')}},[_c('Checkbox',{model:{value:(_vm.editQuestion.options.required),callback:function ($$v) {_vm.$set(_vm.editQuestion.options, "required", $$v);},expression:"editQuestion.options.required"}},[_vm._v(_vm._s(_vm.t("survey_creator.question.questionRequired"))+"\n      ")]),_vm._v(" "),_c('Row',[_c('Col',{attrs:{"span":23,"offset":-1}},[_c('Input',{attrs:{"placeholder":_vm.t('survey_creator.question.titleRequiredTip')},model:{value:(_vm.editQuestion.header.text[_vm.primaryLanguage]),callback:function ($$v) {_vm.$set(_vm.editQuestion.header.text, _vm.primaryLanguage, (typeof $$v === 'string'? $$v.trim(): $$v));},expression:"editQuestion.header.text[primaryLanguage]"}})],1)],1)],1)],1),_vm._v(" "),_c('Row',[_c('Form-item',{attrs:{"label":_vm.t('survey_creator.question.evaluation.selectedType'),"label-width":_vm.labelWidth}},[_c('Select',{staticStyle:{"width":"200px"},on:{"on-change":_vm.onChange},model:{value:(_vm.editQuestion.options.evaluationType),callback:function ($$v) {_vm.$set(_vm.editQuestion.options, "evaluationType", $$v);},expression:"editQuestion.options.evaluationType"}},_vm._l((_vm.evaluationTypes),function(item){return _c('Option',{key:item,attrs:{"value":item}},[_vm._v(_vm._s(_vm.t(("survey_creator.question.evaluation.type." + item)))+"\n        ")])}),1)],1)],1),_vm._v(" "),_c(_vm.editQuestion.options.evaluationType,{tag:"component",attrs:{"question":_vm.question},model:{value:(_vm.editQuestion.evaluationItems),callback:function ($$v) {_vm.$set(_vm.editQuestion, "evaluationItems", $$v);},expression:"editQuestion.evaluationItems"}})],1)};
 var __vue_staticRenderFns__$8 = [];
 
   /* style */
   const __vue_inject_styles__$8 = function (inject) {
     if (!inject) return
-    inject("data-v-09a54a16_0", { source: "[data-v-09a54a16] .ivu-table-cell-slot .ivu-form-item{margin-bottom:4px;margin-top:0}[data-v-09a54a16] .ivu-table-cell-slot .ivu-form-item-error{margin-bottom:24px;margin-top:0}", map: undefined, media: undefined });
+    inject("data-v-bed219c8_0", { source: "[data-v-bed219c8] .ivu-table-cell-slot .ivu-form-item{margin-bottom:4px;margin-top:0}[data-v-bed219c8] .ivu-table-cell-slot .ivu-form-item-error{margin-bottom:24px;margin-top:0}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$8 = "data-v-09a54a16";
+  const __vue_scope_id__$8 = "data-v-bed219c8";
   /* module identifier */
   const __vue_module_identifier__$8 = undefined;
   /* functional template */

package/package.json

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

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/if.vue

@@ -202,20 +202,16 @@ export default Vue.extend({
     buildPayloadByType(type) {
       if (type == ExprConditionType.SCORE) {
         return {
-          payload: {
-            minScore: 0,
-            operator: "<",
-            maxScore: 0,
-          },
+          minScore: 0,
+          operator: "<",
+          maxScore: 0,
         };
       }
       return {
-        payload: {
-          scope: [],
-          operator: "=",
-          values: [],
-          size: 0,
-        },
+        scope: [],
+        operator: "=",
+        values: [],
+        size: 0,
       };
     },
     removeCondition(index) {

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

@@ -7,83 +7,96 @@
     </Col>
     <Col :span="3">
       <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
-        :rules="{
-          required: true,
-          type: 'number',
-          trigger: 'change',
-          min: 0,
-          max: this.totalScore,
-          message: t('分值不能为空'),
-        }"
+          :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
+          :rules="{
+            min:leftMin,
+            max:leftMax,
+            required: true,
+            type: 'number',
+            trigger: 'change',
+            message: t('分值不正确'),
+          }"
       >
         <InputNumber
-          v-model="value.minScore"
-          :min="0"
-          :max="value.maxScore"
-          @on-change="rangeChange"
+            v-model="value.minScore"
+            :active-change="false"
+            :min="leftMin"
+            :max="leftMax"
+            :formatter="
+            (value) => `${value}${t('survey_creator.question.scores')}`
+          "
+            :parser="
+            (value) =>
+              value.replace(`${t('survey_creator.question.scores')}`, '')
+          "
+            @on-change="leftChange"
         ></InputNumber>
       </FormItem>
     </Col>
-    <Col class="label">
-      {{ t("survey_creator.question.scores") }}
-    </Col>
     <Col :span="3">
       <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.operator`"
-        :rules="{
+          :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.operator`"
+          :rules="{
           required: true,
           trigger: 'change',
           message: t('survey_creator.question.notEmpty'),
         }"
       >
         <Select
-          v-model="value.operator"
-          :placeholder="
+            v-model="value.operator"
+            :placeholder="
             t('survey_creator.question.evaluation.condition.operator')
           "
         >
           <Option
-            v-for="(operator, index) in operators"
-            :value="operator"
-            :key="index"
+              v-for="(operator, index) in operators"
+              :value="operator"
+              :key="index"
           >
             {{ operator }}
           </Option>
         </Select>
       </FormItem>
     </Col>
-    <Col :span="3">
+    <Col :span="2">
       <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
-        :rules="{
+          :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
+          :rules="{
+          min:rightMin,
+          max:rightMax,
           required: true,
           type: 'number',
           trigger: 'change',
-          min: 0,
-          max: this.totalScore,
-          message: t('分值不能为空'),
+          message: t('分值不正确'),
         }"
       >
         <InputNumber
-          v-model="value.maxScore"
-          :min="value.minScore"
-          :max="totalScore"
-          @on-change="rangeChange"
+            :active-change="false"
+            v-model="value.maxScore"
+            :min="rightMin"
+            :max="rightMax"
+            :formatter="
+            (value) => `${value}${t('survey_creator.question.scores')}`
+          "
+            :parser="
+            (value) =>
+              value.replace(`${t('survey_creator.question.scores')}`, '')
+          "
+            @on-change="rightChange"
         ></InputNumber>
       </FormItem>
     </Col>
-    <Col class="label">
-      {{ t("survey_creator.question.scores") }}
-    </Col>
   </Row>
 </template>
 <script lang="ts">
 import Vue from "vue";
-import { Row, Col, Select, Option, FormItem, InputNumber } from "view-design";
+import {Col, FormItem, InputNumber, Message, Option, Row, Select} from "view-design";
 import _ from "lodash";
 import ExprMixin from "./expr-mixin";
 import LocaleMixin from "../../../../../mixins/locale-mixin";
+import {ExprConditionType} from "@wg-npm/survey-core/src/models";
+
+Vue.prototype.$Message = Message;
 
 export default Vue.extend({
   name: "score",
@@ -94,37 +107,173 @@ export default Vue.extend({
     Select,
     Option,
     FormItem,
-    InputNumber,
+    InputNumber
   },
   data() {
+    const validateScore = (rule, value, callback) => {
+      let checkfunc = function checkValueInRange(value) {
+        let otherRange = _.map(this.otherConditions, (item) => {
+          return {
+            min: _.get(item, "payload.minScore"),
+            max: _.get(item, "payload.maxScore"),
+          };
+        });
+        return _.some(otherRange, function (o) {
+          return value > o.min && value < o.max;
+        });
+      };
+      let rangeInValid = checkfunc(value);
+      if (value === "") {
+        callback(new Error("分值不能为空"));
+      } else {
+        if (rangeInValid) {
+          callback(new Error("分值在别的条件中已存在"));
+        }
+        callback();
+      }
+    };
     return {
-      operators: ["<=", "<"],
+      leftMin: 0,
+      leftMax: 0,
+      rightMin: 0,
+      rightMax: 0,
+      operators: ["<=", "<"]
     };
   },
+  created() {
+    this.leftMax = this.totalScore - 1;
+    this.rightMax = this.totalScore;
+  },
   computed: {
     totalScore() {
       return this.$rootComponent.currentSurvey.statistics.maxScore;
     },
+    otherConditions() {
+      let otherEvaluationItems = _.filter(
+          _.map(this.evaluationItems, (item, index) => {
+            return _.extend({}, item, {index: index});
+          }),
+          (item) => item.index != this.itemIndex
+      );
+      return _.filter(
+          _.flatMap(otherEvaluationItems, "conditions"),
+          (item) => item.type == ExprConditionType.SCORE
+      );
+    },
+    otherMin() {
+      _.min(
+          _.map(this.otherConditions, (item) => _.get(item, "payload.minScore", 0))
+      );
+    },
+    otherMax() {
+      _.max(
+          _.map(this.otherConditions, (item) => _.get(item, "payload.maxScore", 0))
+      );
+    },
   },
   methods: {
+    checkValueInOtherRange(value, conditions) {
+      let otherRange = _.map(conditions, (item) => {
+        return {
+          min: _.get(item, "payload.minScore"),
+          max: _.get(item, "payload.maxScore"),
+        };
+      });
+      return _.some(otherRange, function (o) {
+        return value >= o.min && value <= o.max;
+      });
+    },
     generateExpr() {
-      // let ids = `${_.map(this.value.scope, (e) => {
-      //   return `"` + e + `"`;
-      // })}`;
-      // let answers = `${_.map(this.value.values, (e) => {
-      //   return `"` + e + `"`;
-      // })}`;
-      // return `$count($[id in [${ids}]][answer in [${answers}]]) = ${_.size(
-      //   this.value.scope
-      // )}`;
       let minScore = this.value.minScore;
       let maxScore = this.value.maxScore;
-      return `$totalScore ${minScore} ${this.value.operator} ${maxScore}`;
+      return `${minScore} ${this.value.operator} score and score ${this.value.operator} ${maxScore}`;
     },
-    rangeChange() {
-      console.log("222");
+    leftChange(value) {
+      this.rangeChange(value, "left");
     },
-  },
+    rightChange(value) {
+      this.rangeChange(value, "right");
+    },
+    rangeChange(value, type) {
+      let valueInOtherRange = this.checkValueInOtherRange(value, this.otherConditions);
+      let usableRanges = this.getUsableRanges();
+      let firstUsableRange = usableRanges[0];
+      let valueInRange = this.getSelectedRangeByValue(value, usableRanges);
+      let currentRange = valueInOtherRange ? firstUsableRange : valueInRange;
+      let min = valueInOtherRange ? firstUsableRange[0] : _.get(valueInRange, 'min', 0);
+      let max = valueInOtherRange ? firstUsableRange[1] : _.get(currentRange, 'max', this.totalScore);
+      if (valueInOtherRange) {
+        this.$Message.error("该值在其他区间范围内,请重新输入");
+        this.$set(this.value, "minScore", min);
+        this.$set(this.value, "maxScore", max);
+        this.rightMin = min;
+        this.rightMax = max;
+        this.leftMin = min;
+        this.leftMax = max;
+      } else {
+        if (type == "left") {
+          this.rightMin = value + 1;
+          this.rightMax = max;
+        }
+        if (type == "right") {
+          this.leftMin = min;
+          this.leftMax = value - 1;
+        }
+      }
+    },
+    getSelectedRangeByValue(value, ranges) {
+      let otherRange = _.map(ranges, (item) => {
+        return {
+          min: _.get(item, "payload.minScore"),
+          max: _.get(item, "payload.maxScore"),
+        };
+      });
+      return _.head(_.filter(otherRange, function (o) {
+        return value > o.min && value < o.max;
+      }));
+    },
+    getUsableRanges() {
+      let usedRange = _.map(this.otherConditions, (item) => {
+        return [item.payload.minScore, item.payload.maxScore];
+      });
+      let globalMin = 0;
+      let globalMax = this.totalScore;
+      // arr must sorted asc
+      let usableRange = new Array();
+      if (usedRange.length == 1) {
+        let first = usedRange[0][0] -1
+        if (usedRange[0][0] !== 0) {
+          let item = [0, first]
+          usableRange.push(item)
+        }
+      } else {
+        let other = usedRange.reduce((a, v) => {
+          if (typeof a[0] == "number") {
+            if (a[0] != globalMin) {
+              return [
+                [0, a[0]],
+                [a[1], v[0]],
+                [v[1], v[1]],
+              ];
+            } else {
+              return [
+                [a[1], v[0]],
+                [v[1], v[1]],
+              ];
+            }
+          } else {
+            a[a.length - 1][1] = v[0];
+            if (a.length != usedRange.length) a.push([v[1], v[1]]);
+          }
+          return a;
+        });
+        if (usedRange[length - 1][1] != globalMax) {
+          other.push([usedRange[length - 1][1], globalMax]);
+        }
+      }
+      return usableRange;
+    },
+  }
 });
 </script>
 <style scoped lang="less">
@@ -132,4 +281,4 @@ export default Vue.extend({
   text-align: right;
   margin-bottom: 24px;
 }
-</style>
+</style>

package/src/components/editor/forms/evaluation-form.vue

@@ -1,103 +1,135 @@
 <template>
-    <Form ref="questionForm" :model="editQuestion" :label-colon="false">
+  <Form ref="questionForm" :model="editQuestion" :label-colon="false">
+    <Row>
+      <Form-item
+          :prop="'header.text.' + primaryLanguage"
+          :rules="{
+          required: true,
+          message: t('survey_creator.question.titleRequiredTip'),
+        }"
+          :label="t('survey_creator.page.question')"
+      >
+        <Checkbox v-model="editQuestion.options.required"
+        >{{ t("survey_creator.question.questionRequired") }}
+        </Checkbox>
         <Row>
-            <Form-item
-                    :prop="'header.text.' + primaryLanguage"
-                    :rules="{required: true, message: t('survey_creator.question.titleRequiredTip')}"
-                    :label="t('survey_creator.page.question')"
-            >
-                <Checkbox
-                        v-model="editQuestion.options.required"
-                >{{t('survey_creator.question.questionRequired')}}
-                </Checkbox>
-                <Row>
-                    <Col :span="23" :offset="-1">
-                        <Input
-                                v-model.trim="editQuestion.header.text[primaryLanguage]"
-                                :placeholder="t('survey_creator.question.titleRequiredTip')"
-                        />
-                    </Col>
-                </Row>
-            </Form-item>
+          <Col :span="23" :offset="-1">
+            <Input
+                v-model.trim="editQuestion.header.text[primaryLanguage]"
+                :placeholder="t('survey_creator.question.titleRequiredTip')"
+            />
+          </Col>
         </Row>
-        <Row>
-            <Form-item :label="t('survey_creator.question.evaluation.selectedType')" :label-width="labelWidth">
-                <Select v-model="editQuestion.options.evaluationType" style="width:200px" @on-change="onChange">
-                    <Option v-for="item in evaluationTypes" :value="item" :key="item">{{
-                        t(`survey_creator.question.evaluation.type.${item}`)
-                        }}
-                    </Option>
-                </Select>
-            </Form-item>
-        </Row>
-        <component
-                :is="editQuestion.options.evaluationType"
-                v-model="editQuestion.evaluationItems"
-                :question="question"
-        ></component>
-    </Form>
+      </Form-item>
+    </Row>
+    <Row>
+      <Form-item
+          :label="t('survey_creator.question.evaluation.selectedType')"
+          :label-width="labelWidth"
+      >
+        <Select
+            v-model="editQuestion.options.evaluationType"
+            style="width: 200px"
+            @on-change="onChange"
+        >
+          <Option v-for="item in evaluationTypes" :value="item" :key="item"
+          >{{ t(`survey_creator.question.evaluation.type.${item}`) }}
+          </Option>
+        </Select>
+      </Form-item>
+    </Row>
+    <component
+        :is="editQuestion.options.evaluationType"
+        v-model="editQuestion.evaluationItems"
+        :question="question"
+    ></component>
+  </Form>
 </template>
 <script lang="ts">
-    import Vue from "vue";
-    import _ from "lodash";
-    import {
-        Col, Form, FormItem,
-        Row, Select, Checkbox,
-        Option, Input
-    } from "view-design";
-    import {SurveyLayout, EvaluationType,} from "@wg-npm/survey-core";
-    import draggable from "vuedraggable";
-    import questionFormMixin from "../../../mixins/question-form-mixin";
-    import Star from "./evaluation/star.vue";
-    import Expr from "./evaluation/expr.vue";
-    import {ExprEvaluationItemType} from "@wg-npm/survey-core/src/models";
+import Vue from "vue";
+import _ from "lodash";
+import {
+  Col,
+  Form,
+  FormItem,
+  Row,
+  Select,
+  Checkbox,
+  Option,
+  Input,
+} from "view-design";
+import {SurveyLayout, EvaluationType} from "@wg-npm/survey-core";
+import draggable from "vuedraggable";
+import questionFormMixin from "../../../mixins/question-form-mixin";
+import Star from "./evaluation/star.vue";
+import Expr from "./evaluation/expr.vue";
+import {ExprEvaluationItemType} from "@wg-npm/survey-core/src/models";
 
-    export default Vue.extend({
-        name: "evaluation-form",
-        components: {
-            Form, FormItem, Row,
-            Col, draggable, Option,
-            Select, Checkbox, Input,
-            [EvaluationType.STAR]: Star,
-            [EvaluationType.EXPR]: Expr
-        },
-        mixins: [questionFormMixin],
-        data() {
-            return {
-                labelWidth: 80,
-                layoutOptions: [SurveyLayout.HORIZONTAL, SurveyLayout.VERTICAL],
-                evaluationTypes: [EvaluationType.STAR, EvaluationType.EXPR],
-                realColumns: []
-            };
-        },
-        created() {
-            this.initData();
-        },
-        methods: {
-            initData() {
-                this.editQuestion.evaluationItems || this.$set(this.editQuestion, "evaluationItems", []);
-                this.editQuestion.options.evaluationType || this.$set(this.editQuestion.options, "evaluationType", EvaluationType.STAR);
-            },
-            onChange(value) {
-                if (value == EvaluationType.EXPR) {
-                    _.forEach(this.editQuestion.evaluationItems, item => _.set(item, "type", ExprEvaluationItemType.IF));
-                    _.set(this.editQuestion.evaluationItems[_.size(this.editQuestion.evaluationItems) - 1], "type", ExprEvaluationItemType.ELSE);
-                }
-            }
-        }
-    })
-    ;
+export default Vue.extend({
+  name: "evaluation-form",
+  components: {
+    Form,
+    FormItem,
+    Row,
+    Col,
+    draggable,
+    Option,
+    Select,
+    Checkbox,
+    Input,
+    [EvaluationType.STAR]: Star,
+    [EvaluationType.EXPR]: Expr,
+  },
+  mixins: [questionFormMixin],
+  data() {
+    return {
+      labelWidth: 80,
+      layoutOptions: [SurveyLayout.HORIZONTAL, SurveyLayout.VERTICAL],
+      evaluationTypes: [EvaluationType.STAR, EvaluationType.EXPR],
+      realColumns: [],
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      this.editQuestion.evaluationItems ||
+      this.$set(this.editQuestion, "evaluationItems", []);
+      this.editQuestion.options.evaluationType ||
+      this.$set(
+          this.editQuestion.options,
+          "evaluationType",
+          EvaluationType.STAR
+      );
+    },
+    onChange(value) {
+      if (value == EvaluationType.EXPR) {
+        _.forEach(this.editQuestion.evaluationItems, (item, index) => {
+          _.set(item, "type", ExprEvaluationItemType.IF);
+          _.set(item, "index", index);
+        });
+        _.set(
+            this.editQuestion.evaluationItems[
+            _.size(this.editQuestion.evaluationItems) - 1
+                ],
+            "type",
+            ExprEvaluationItemType.ELSE
+        );
+      }
+    },
+  },
+});
 </script>
 
 <style scoped lang="less">
-    /deep/ .ivu-table-cell-slot .ivu-form-item {
-        margin-bottom: 4px;
-        margin-top: 0;
-    }
-
-    /deep/ .ivu-table-cell-slot .ivu-form-item-error {
-        margin-bottom: 24px;
-        margin-top: 0;
+/deep/ .ivu-table-cell-slot .ivu-form-item {
+  margin-bottom: 4px;
+  margin-top: 0;
+}
 
-    }
+/deep/ .ivu-table-cell-slot .ivu-form-item-error {
+  margin-bottom: 24px;
+  margin-top: 0;
+}
 </style>

package/src/index.ts

@@ -2,7 +2,6 @@ import {VueConstructor as _Vue} from 'vue';
 import SurveyCreator from './components/survey-creator.vue';
 import SurveyPreviewer from './components/survey-previewer.vue';
 import locale from './locale';
-
 export class SurveyCreatorOptions {
   locale: any;
   i18n: any;

package/src/locale/lang/zh-CN.ts

@@ -144,7 +144,7 @@ export default {
           other: "其他",
           assign_template: `{0} 项为 {1}  {2} {3}项`,
           auto_template: `{0} 项为 {1}`,
-          score_template: `总分数范围为: {0}分{1}, {2}分`,
+          score_template: `总分数范围为: {0}分{1}{2}分`,
         },
       },
     },