@wg-npm/survey-creator 0.3.3861 → 0.3.4067

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';
 
@@ -64,6 +64,8 @@ var defaultLang = {
             sub_questions: "子题",
             score: "分值",
             scores: "分",
+            totalScores: "总分",
+            selectScore: "请选择分值",
             questionRequired: "此题必填",
             titleRequiredTip: "请填写题目名称",
             textTitleRequiredTip: "请填写文字说明",
@@ -150,7 +152,7 @@ var defaultLang = {
                     other: "其他",
                     assign_template: `{0} 项为 {1}  {2} {3}项`,
                     auto_template: `{0} 项为 {1}`,
-                    score_template: `总分数范围为: {0}分{1}{2}分`,
+                    score_template: `总分数范围为: {0}{1} 总分 {2}{3}`,
                 },
             },
         },
@@ -1800,7 +1802,12 @@ var script$t = Vue.extend({
         getDesc(condition) {
             let payload = condition.payload;
             if (condition.type == "SCORE") {
-                return this.t("survey_creator.question.evaluation.condition.score_template", [payload.minScore, payload.operator, payload.maxScore]);
+                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();
@@ -3138,6 +3145,7 @@ var __vue_staticRenderFns__$e = [];
 
   var Auto = __vue_component__$e;
 
+Vue.prototype.$Message = Message;
 var script$d = Vue.extend({
     name: "score",
     mixins: [ExprMixin, LocaleMixin],
@@ -3154,19 +3162,110 @@ var script$d = Vue.extend({
             operators: ["<=", "<"],
         };
     },
+    created() { },
     computed: {
         totalScore() {
             return this.$rootComponent.currentSurvey.statistics.maxScore;
         },
+        scores() {
+            return _.range(1, this.totalScore + 1, 1);
+        },
+        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");
+        },
     },
     methods: {
+        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);
+                }
+                if (usedRange[length - 1][1] != globalMax) {
+                    usableRange.push([usedRange[length - 1][1], globalMax]);
+                }
+                return usableRange;
+            }
+            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 other;
+            }
+        },
+        disabledScoreOption(value, type) {
+            if (this.checkValueInOtherRange(value)) {
+                return true;
+            }
+            let currentMin = _.get(this.value, "minScore", 0);
+            let currentMax = _.get(this.value, "maxScore", this.totalScore);
+            _.get(this.value, "maxScore", this.totalScore);
+            if (type == "left" && value >= currentMax) {
+                return true;
+            }
+            if (type == "right" && value <= currentMin) {
+                return true;
+            }
+        },
+        checkValueInOtherRange(value) {
+            let otherRange = _.map(this.otherConditions, (item) => {
+                return {
+                    min: _.get(item, "payload.minScore", 0),
+                    max: _.get(item, "payload.maxScore", 0),
+                };
+            });
+            return _.some(otherRange, function (o) {
+                return value >= o.min && value <= o.max;
+            });
+        },
         generateExpr() {
             let minScore = this.value.minScore;
             let maxScore = this.value.maxScore;
-            return `${minScore} ${this.value.operator} score ${this.value.operator} ${maxScore}`;
-        },
-        rangeChange() {
-            console.log("222");
+            return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
         },
     },
 });
@@ -3179,31 +3278,31 @@ var __vue_render__$d = function () {var _vm=this;var _h=_vm.$createElement;var _
         required: true,
         type: 'number',
         trigger: 'change',
-        min: 0,
-        max: this.totalScore,
-        message: _vm.t('分值不能为空'),
-      }}},[_c('InputNumber',{attrs:{"min":0,"max":_vm.value.maxScore,"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.rangeChange},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":{
+        message: _vm.t('survey_creator.question.scoreRequiredTip'),
+      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.scores),function(score){return _c('Option',{key:score,attrs:{"value":score,"disabled":_vm.disabledScoreOption(score, 'left')}},[_vm._v("\n          "+_vm._s(score)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"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.leftOperator),callback:function ($$v) {_vm.$set(_vm.value, "leftOperator", $$v);},expression:"value.leftOperator"}},_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',{staticClass:"label"},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.totalScores"))+"\n  ")]),_vm._v(" "),_c('Col',{attrs:{"span":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.rightOperator"),"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":2}},[_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.rightOperator),callback:function ($$v) {_vm.$set(_vm.value, "rightOperator", $$v);},expression:"value.rightOperator"}},_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":{
         required: true,
         type: 'number',
         trigger: 'change',
-        min: 0,
-        max: this.totalScore,
-        message: _vm.t('分值不能为空'),
-      }}},[_c('InputNumber',{attrs:{"min":_vm.value.minScore,"max":_vm.totalScore,"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.rangeChange},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}})],1)],1)],1)};
+        message: _vm.t('survey_creator.question.scoreRequiredTip'),
+      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}},_vm._l((_vm.scores),function(score){return _c('Option',{key:score,attrs:{"value":score,"disabled":_vm.disabledScoreOption(score, 'right')}},[_vm._v("\n          "+_vm._s(score)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")])],1)};
 var __vue_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-0801239e_0", { source: ".label[data-v-0801239e]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
+    inject("data-v-0d3d3556_0", { source: ".label[data-v-0d3d3556]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-0801239e";
+  const __vue_scope_id__$d = "data-v-0d3d3556";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -3351,6 +3450,9 @@ var script$b = Vue.extend({
         };
     },
     computed: {
+        totalScore() {
+            return this.$rootComponent.currentSurvey.statistics.maxScore;
+        },
         deletable() {
             return (_.size(_.filter(this.evaluationItems, (item) => item.type == "IF")) > 1);
         },
@@ -3385,9 +3487,10 @@ var script$b = Vue.extend({
         buildPayloadByType(type) {
             if (type == "SCORE") {
                 return {
-                    minScore: 0,
-                    operator: "<",
-                    maxScore: 0,
+                    minScore: null,
+                    leftOperator: "<",
+                    rightOperator: "<",
+                    maxScore: null,
                 };
             }
             return {
@@ -3421,11 +3524,11 @@ var __vue_staticRenderFns__$b = [];
   /* style */
   const __vue_inject_styles__$b = function (inject) {
     if (!inject) return
-    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 });
+    inject("data-v-bb232856_0", { source: ".mt-base[data-v-bb232856]{margin-top:12px}.action[data-v-bb232856]{float:right}.input[data-v-bb232856]{width:100px}.label[data-v-bb232856]{text-align:right;padding-right:4px}.text[data-v-bb232856]{background-color:#ebf7ff;height:32px;padding:8px 18px;font-weight:500;color:#515a6e}[data-v-bb232856] .ivu-card .ivu-form-item{margin-bottom:4px;margin-top:0}[data-v-bb232856] .ivu-card .ivu-form-item-error{margin-bottom:24px;margin-top:0}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$b = "data-v-199a51dd";
+  const __vue_scope_id__$b = "data-v-bb232856";
   /* module identifier */
   const __vue_module_identifier__$b = undefined;
   /* functional template */
@@ -3579,11 +3682,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() {
@@ -3591,7 +3700,7 @@ var script$8 = Vue.extend({
             labelWidth: 80,
             layoutOptions: ["HORIZONTAL", "VERTICAL"],
             evaluationTypes: ["STAR", "EXPR"],
-            realColumns: []
+            realColumns: [],
         };
     },
     created() {
@@ -3599,33 +3708,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 */
@@ -4488,6 +4605,7 @@ class SurveyCreatorPlugin {
         Vue.$surveyLanguage = options.locale;
         Vue.component('survey-creator', SurveyCreator);
         Vue.component('survey-previewer', SurveyPreviewer);
+        Vue.component("question-edit-drawer", QuestionEditDrawer);
     }
 }
 

package/package.json

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

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

@@ -45,7 +45,12 @@ export default Vue.extend({
       if (condition.type == ExprConditionType.SCORE) {
         return this.t(
           "survey_creator.question.evaluation.condition.score_template",
-          [payload.minScore, payload.operator, payload.maxScore]
+          [
+            payload.minScore,
+            payload.leftOperator,
+            payload.rightOperator,
+            payload.maxScore,
+          ]
         );
       } else {
         let numbers = new ExprEvaluationQuestion(

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

@@ -157,6 +157,9 @@ export default Vue.extend({
     };
   },
   computed: {
+    totalScore() {
+      return this.$rootComponent.currentSurvey.statistics.maxScore;
+    },
     deletable() {
       return (
         _.size(
@@ -202,9 +205,10 @@ export default Vue.extend({
     buildPayloadByType(type) {
       if (type == ExprConditionType.SCORE) {
         return {
-          minScore: 0,
-          operator: "<",
-          maxScore: 0,
+          minScore: null,
+          leftOperator: "<",
+          rightOperator: "<",
+          maxScore: null,
         };
       }
       return {

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

@@ -12,29 +12,30 @@
           required: true,
           type: 'number',
           trigger: 'change',
-          min: 0,
-          max: this.totalScore,
-          message: t('分值不能为空'),
+          message: t('survey_creator.question.scoreRequiredTip'),
         }"
       >
-        <InputNumber
+        <Select
           v-model="value.minScore"
-          :min="0"
-          :max="value.maxScore"
-          :formatter="
-            (value) => `${value}${t('survey_creator.question.scores')}`
-          "
-          :parser="
-            (value) =>
-              value.replace(`${t('survey_creator.question.scores')}`, '')
-          "
-          @on-change="rangeChange"
-        ></InputNumber>
+          :placeholder="t('survey_creator.question.selectScore')"
+        >
+          <Option
+            v-for="score in scores"
+            :value="score"
+            :key="score"
+            :disabled="disabledScoreOption(score, 'left')"
+          >
+            {{ score }}
+          </Option>
+        </Select>
       </FormItem>
     </Col>
-    <Col :span="3">
+    <Col class="label" :span="1">
+      {{ t("survey_creator.question.scores") }}
+    </Col>
+    <Col :span="2">
       <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.operator`"
+        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
         :rules="{
           required: true,
           trigger: 'change',
@@ -42,7 +43,7 @@
         }"
       >
         <Select
-          v-model="value.operator"
+          v-model="value.leftOperator"
           :placeholder="
             t('survey_creator.question.evaluation.condition.operator')
           "
@@ -57,41 +58,81 @@
         </Select>
       </FormItem>
     </Col>
+    <Col class="label">
+      {{ t("survey_creator.question.totalScores") }}
+    </Col>
     <Col :span="2">
+      <FormItem
+        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
+        :rules="{
+          required: true,
+          trigger: 'change',
+          message: t('survey_creator.question.notEmpty'),
+        }"
+      >
+        <Select
+          v-model="value.rightOperator"
+          :placeholder="
+            t('survey_creator.question.evaluation.condition.operator')
+          "
+        >
+          <Option
+            v-for="(operator, index) in operators"
+            :value="operator"
+            :key="index"
+          >
+            {{ operator }}
+          </Option>
+        </Select>
+      </FormItem>
+    </Col>
+    <Col :span="3">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
         :rules="{
           required: true,
           type: 'number',
           trigger: 'change',
-          min: 0,
-          max: this.totalScore,
-          message: t('分值不能为空'),
+          message: t('survey_creator.question.scoreRequiredTip'),
         }"
       >
-        <InputNumber
+        <Select
           v-model="value.maxScore"
-          :min="value.minScore"
-          :max="totalScore"
-          :formatter="
-            (value) => `${value}${t('survey_creator.question.scores')}`
-          "
-          :parser="
-            (value) =>
-              value.replace(`${t('survey_creator.question.scores')}`, '')
-          "
-          @on-change="rangeChange"
-        ></InputNumber>
+          :placeholder="t('survey_creator.question.selectScore')"
+        >
+          <Option
+            v-for="score in scores"
+            :value="score"
+            :key="score"
+            :disabled="disabledScoreOption(score, 'right')"
+          >
+            {{ score }}
+          </Option>
+        </Select>
       </FormItem>
     </Col>
+    <Col class="label" :span="1">
+      {{ 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",
@@ -109,19 +150,115 @@ export default Vue.extend({
       operators: ["<=", "<"],
     };
   },
+  created() {},
   computed: {
     totalScore() {
       return this.$rootComponent.currentSurvey.statistics.maxScore;
     },
+    scores() {
+      return _.range(1, this.totalScore + 1, 1);
+    },
+    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
+      );
+    },
   },
   methods: {
+    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);
+        }
+        if (usedRange[length - 1][1] != globalMax) {
+          usableRange.push([usedRange[length - 1][1], globalMax]);
+        }
+        return usableRange;
+      } 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 other;
+      }
+    },
+    disabledScoreOption(value, type) {
+      if (this.checkValueInOtherRange(value)) {
+        return true;
+      }
+      let currentMin = _.get(this.value, "minScore", 0);
+      let currentMax = _.get(this.value, "maxScore", this.totalScore);
+      _.get(this.value, "maxScore", this.totalScore);
+      if (type == "left" && value >= currentMax) {
+        return true;
+      }
+      if (type == "right" && value <= currentMin) {
+        return true;
+      }
+    },
+    checkValueInOtherRange(value) {
+      let otherRange = _.map(this.otherConditions, (item) => {
+        return {
+          min: _.get(item, "payload.minScore", 0),
+          max: _.get(item, "payload.maxScore", 0),
+        };
+      });
+      return _.some(otherRange, function (o) {
+        return value >= o.min && value <= o.max;
+      });
+    },
     generateExpr() {
       let minScore = this.value.minScore;
       let maxScore = this.value.maxScore;
-      return `${minScore} ${this.value.operator} score ${this.value.operator} ${maxScore}`;
-    },
-    rangeChange() {
-      console.log("222");
+      return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
     },
   },
 });
@@ -131,4 +268,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

@@ -1,8 +1,8 @@
 import {VueConstructor as _Vue} from 'vue';
 import SurveyCreator from './components/survey-creator.vue';
+import QuestionEditDrawer from "./components/editor/question-edit-drawer.vue";
 import SurveyPreviewer from './components/survey-previewer.vue';
 import locale from './locale';
-
 export class SurveyCreatorOptions {
   locale: any;
   i18n: any;
@@ -15,6 +15,7 @@ export default class SurveyCreatorPlugin {
     Vue.$surveyLanguage = options.locale;
     Vue.component('survey-creator', SurveyCreator);
     Vue.component('survey-previewer', SurveyPreviewer);
+    Vue.component("question-edit-drawer", QuestionEditDrawer)
   }
 }
 

package/src/locale/lang/en-US.ts

@@ -58,6 +58,8 @@ export default {
       sub_questions: "Sub Question",
       score: "Score",
       scores: "Score",
+      totalScores: "Total Score",
+      selectScore: "Please Input Score",
       questionRequired: "Required",
       titleRequiredTip: "Please Input Question Title",
       scoreRequiredTip: "Score Required",
@@ -144,7 +146,7 @@ export default {
           other: "Other",
           assign_template: `{0} questions answer is {1} count {2} {3}`,
           auto_template: `{0} questions answer is {1}`,
-          score_template: `总分数范围为:{0}{1}, {2}`,
+          score_template: `Total Score Range: {0}{1} Total Score {2}{3}`,
         },
       },
     },

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

@@ -58,6 +58,8 @@ export default {
       sub_questions: "子题",
       score: "分值",
       scores: "分",
+      totalScores: "总分",
+      selectScore: "请选择分值",
       questionRequired: "此题必填",
       titleRequiredTip: "请填写题目名称",
       textTitleRequiredTip: "请填写文字说明",
@@ -144,7 +146,7 @@ export default {
           other: "其他",
           assign_template: `{0} 项为 {1}  {2} {3}项`,
           auto_template: `{0} 项为 {1}`,
-          score_template: `总分数范围为: {0}分{1}{2}分`,
+          score_template: `总分数范围为: {0}{1} 总分 {2}{3}`,
         },
       },
     },