@wg-npm/survey-creator 0.3.4004 → 0.3.4075

package/dist/survey-creator.esm.js

@@ -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();
@@ -3148,89 +3155,29 @@ var script$d = Vue.extend({
         Select,
         Option,
         FormItem,
-        InputNumber
+        InputNumber,
     },
     data() {
         return {
-            leftMin: 0,
-            leftMax: 0,
-            rightMin: 0,
-            rightMax: 0,
-            operators: ["<=", "<"]
+            operators: ["<=", "<"],
         };
     },
-    created() {
-        this.leftMax = this.totalScore - 1;
-        this.rightMax = this.totalScore;
-    },
+    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");
         },
-        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 `${minScore} ${this.value.operator} score and score ${this.value.operator} ${maxScore}`;
-        },
-        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 {
@@ -3255,6 +3202,10 @@ var script$d = Vue.extend({
                     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) => {
@@ -3283,10 +3234,40 @@ var script$d = Vue.extend({
                 if (usedRange[length - 1][1] != globalMax) {
                     other.push([usedRange[length - 1][1], globalMax]);
                 }
+                return other;
             }
-            return usableRange;
         },
-    }
+        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.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
+        },
+    },
 });
 
 /* script */
@@ -3294,34 +3275,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":{
-          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,
+        type: 'number',
+        trigger: 'change',
+        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.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,
+      }}},[_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.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',
-        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)};
+        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-2e725872_0", { source: ".label[data-v-2e725872]{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-2e725872";
+  const __vue_scope_id__$d = "data-v-0d3d3556";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -3469,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);
         },
@@ -3503,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 {
@@ -3539,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 */
@@ -4539,7 +4524,7 @@ var script = Vue.extend({
     components: { Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer },
     provide() {
         return {
-            $rootComponent: this
+            $rootComponent: this.$rootComponent
         };
     },
     props: {
@@ -4620,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.4004",
+  "version": "0.3.4075",
   "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.4004",
-    "@wg-npm/survey-service-api": "0.3.4004",
+    "@wg-npm/survey-core": "0.3.4075",
+    "@wg-npm/survey-service-api": "0.3.4075",
     "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.4004",
-    "@wg-npm/survey-service-api": "0.3.4004",
+    "@wg-npm/survey-core": "0.3.4075",
+    "@wg-npm/survey-service-api": "0.3.4075",
     "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

@@ -7,94 +7,130 @@
     </Col>
     <Col :span="3">
       <FormItem
-          :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
-          :rules="{
-            min:leftMin,
-            max:leftMax,
-            required: true,
-            type: 'number',
-            trigger: 'change',
-            message: t('分值不正确'),
-          }"
+        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
+        :rules="{
+          required: true,
+          type: 'number',
+          trigger: 'change',
+          message: t('survey_creator.question.scoreRequiredTip'),
+        }"
       >
-        <InputNumber
-            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>
+        <Select
+          v-model="value.minScore"
+          :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`"
-          :rules="{
+        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
+        :rules="{
           required: true,
           trigger: 'change',
           message: t('survey_creator.question.notEmpty'),
         }"
       >
         <Select
-            v-model="value.operator"
-            :placeholder="
+          v-model="value.leftOperator"
+          :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 class="label">
+      {{ t("survey_creator.question.totalScores") }}
+    </Col>
     <Col :span="2">
       <FormItem
-          :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
-          :rules="{
-          min:rightMin,
-          max:rightMax,
+        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
+        :rules="{
           required: true,
-          type: 'number',
           trigger: 'change',
-          message: t('分值不正确'),
+          message: t('survey_creator.question.notEmpty'),
         }"
       >
-        <InputNumber
-            :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')}`, '')
+        <Select
+          v-model="value.rightOperator"
+          :placeholder="
+            t('survey_creator.question.evaluation.condition.operator')
           "
-            @on-change="rightChange"
-        ></InputNumber>
+        >
+          <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',
+          message: t('survey_creator.question.scoreRequiredTip'),
+        }"
+      >
+        <Select
+          v-model="value.maxScore"
+          :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 {Col, FormItem, InputNumber, Message, Option, Row, Select} 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";
+import { ExprConditionType } from "@wg-npm/survey-core/src/models";
 
 Vue.prototype.$Message = Message;
 
@@ -107,120 +143,35 @@ 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 {
-      leftMin: 0,
-      leftMax: 0,
-      rightMin: 0,
-      rightMax: 0,
-      operators: ["<=", "<"]
+      operators: ["<=", "<"],
     };
   },
-  created() {
-    this.leftMax = this.totalScore - 1;
-    this.rightMax = this.totalScore;
-  },
+  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
+        _.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))
+        _.flatMap(otherEvaluationItems, "conditions"),
+        (item) => item.type == ExprConditionType.SCORE
       );
     },
   },
   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 `${minScore} ${this.value.operator} score and score ${this.value.operator} ${maxScore}`;
-    },
-    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 {
@@ -228,9 +179,11 @@ export default Vue.extend({
           max: _.get(item, "payload.maxScore"),
         };
       });
-      return _.head(_.filter(otherRange, function (o) {
-        return value > o.min && value < o.max;
-      }));
+      return _.head(
+        _.filter(otherRange, function (o) {
+          return value > o.min && value < o.max;
+        })
+      );
     },
     getUsableRanges() {
       let usedRange = _.map(this.otherConditions, (item) => {
@@ -241,11 +194,15 @@ export default Vue.extend({
       // arr must sorted asc
       let usableRange = new Array();
       if (usedRange.length == 1) {
-        let first = usedRange[0][0] -1
+        let first = usedRange[0][0] - 1;
         if (usedRange[0][0] !== 0) {
-          let item = [0, first]
-          usableRange.push(item)
+          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") {
@@ -270,10 +227,40 @@ export default Vue.extend({
         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;
       }
-      return usableRange;
     },
-  }
+    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.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
+    },
+  },
 });
 </script>
 <style scoped lang="less">

package/src/components/survey-previewer.vue

@@ -36,7 +36,7 @@
         components: {Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer},
         provide() {
             return {
-                $rootComponent: this
+                $rootComponent: this.$rootComponent
             };
         },
         props: {

package/src/index.ts

@@ -1,5 +1,6 @@
 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 {
@@ -14,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}`,
         },
       },
     },