@wg-npm/survey-creator 1.78.3051745 → 1.78.4031900

package/dist/survey-creator.esm.js

@@ -92,6 +92,9 @@ var defaultLang = {
             inputEnabledTip: "用户选中该项后可输入",
             textTitleRequiredTip: "请填写文字说明",
             scoreRequiredTip: "分值不能为空",
+            scoreExceedTotalTip: "分数不能超过总分",
+            minScoreGreaterThanMaxTip: "最小分值不能大于最大分值",
+            maxScoreLessThanMinTip: "最大分值不能小于最小分值",
             subQuestionRequiredTip: "子題不能为空",
             optionalRequiredTip: "选项不能为空",
             commitRequiredTip: "描述不能为空",
@@ -20383,7 +20386,6 @@ var script$z = Vue.extend({
         Select,
         Option,
         FormItem,
-        InputNumber,
     },
     data() {
         return {
@@ -20438,7 +20440,101 @@ var script$z = Vue.extend({
                 };
             });
         },
-        resetScoreOptions(options) {
+        resetLeftScoreOptions() {
+            this.resetScoreOptions(this.leftScores, "left");
+        },
+        resetRightScoreOptions() {
+            this.resetScoreOptions(this.rightScores, "right");
+        },
+        getScoreOptions(type) {
+            return type === "left" ? this.leftScores : this.rightScores;
+        },
+        getScoreValue(type) {
+            return type === "left" ? this.value.minScore : this.value.maxScore;
+        },
+        getScoreSelectRef(type) {
+            return type === "left"
+                ? this.$refs.leftScoreSelect
+                : this.$refs.rightScoreSelect;
+        },
+        findAvailableScoreOptionByValue(options, value) {
+            return _$1.find(options, (option) => {
+                return !option.disabled && option.value === value;
+            });
+        },
+        findMatchedScoreOption(options, query) {
+            const normalizedQuery = String(query == null ? "" : query).trim();
+            const enabledOptions = _$1.filter(options, (option) => !option.disabled);
+            if (!enabledOptions.length) {
+                return null;
+            }
+            if (!normalizedQuery) {
+                return enabledOptions[0];
+            }
+            return (_$1.find(enabledOptions, (option) => String(option.value) === normalizedQuery) ||
+                _$1.find(enabledOptions, (option) => String(option.value).indexOf(normalizedQuery) === 0) ||
+                null);
+        },
+        updateScoreSelectFocus(type, targetValue, fallbackToFirst = false) {
+            const select = this.getScoreSelectRef(type);
+            if (!select) {
+                return;
+            }
+            const matchedOption = targetValue;
+            if (!matchedOption) {
+                if (!fallbackToFirst) {
+                    select.focusIndex = -1;
+                    return;
+                }
+                const firstEnabledOption = _$1.find(this.getScoreOptions(type), (option) => !option.disabled);
+                if (!firstEnabledOption) {
+                    select.focusIndex = -1;
+                    return;
+                }
+                return this.updateScoreSelectFocus(type, firstEnabledOption, false);
+            }
+            const focusIndex = _$1.findIndex(select.flatOptions, (option) => {
+                const propsData = option &&
+                    option.componentOptions &&
+                    option.componentOptions.propsData;
+                return propsData && propsData.value === matchedOption.value;
+            });
+            if (focusIndex === -1) {
+                if (fallbackToFirst) {
+                    const firstEnabledOption = _$1.find(this.getScoreOptions(type), (option) => !option.disabled);
+                    const matchedValue = matchedOption ? matchedOption.value : null;
+                    if (firstEnabledOption && firstEnabledOption.value !== matchedValue) {
+                        this.updateScoreSelectFocus(type, firstEnabledOption, false);
+                    }
+                }
+                return;
+            }
+            select.focusIndex = focusIndex;
+        },
+        handleScoreSelectOpenChange(type, visible) {
+            if (type === "left") {
+                this.resetLeftScoreOptions();
+            }
+            else {
+                this.resetRightScoreOptions();
+            }
+            if (!visible) {
+                return;
+            }
+            const currentValue = this.getScoreValue(type);
+            const currentOption = this.findAvailableScoreOptionByValue(this.getScoreOptions(type), currentValue);
+            this.$nextTick(() => {
+                this.updateScoreSelectFocus(type, currentOption, true);
+            });
+        },
+        handleScoreQueryChange(type, query) {
+            const options = this.getScoreOptions(type);
+            const matchedOption = this.findMatchedScoreOption(options, query);
+            this.$nextTick(() => {
+                this.updateScoreSelectFocus(type, matchedOption, false);
+            });
+        },
+        resetScoreOptions(options, type) {
             let otherRange = _$1.map(this.otherConditions, (item) => {
                 return {
                     min: _$1.get(item, "payload.minScore", 0),
@@ -20448,11 +20544,19 @@ var script$z = Vue.extend({
             let currentMinScore = this.value.minScore == null ? 0 : this.value.minScore;
             let currentMaxScore = this.value.maxScore == null ? this.totalScore : this.value.maxScore;
             _$1.forEach(options, function (o) {
-                o.disabled = _$1.some(otherRange, function (or) {
+                let disabledByOtherRange = _$1.some(otherRange, function (or) {
                     let condition_a = o.value >= or.min && o.value <= or.max;
                     let condition_b = o.value >= currentMinScore && o.value <= currentMaxScore;
                     return condition_a && condition_b;
                 });
+                let disabledByCurrentRange = false;
+                if (type === "left" && currentMaxScore != null) {
+                    disabledByCurrentRange = o.value > currentMaxScore;
+                }
+                if (type === "right" && currentMinScore != null) {
+                    disabledByCurrentRange = o.value < currentMinScore;
+                }
+                o.disabled = disabledByOtherRange || disabledByCurrentRange;
             });
         },
         generateExpr() {
@@ -20460,6 +20564,58 @@ var script$z = Vue.extend({
             let maxScore = this.value.maxScore;
             return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
         },
+        validateMinScore(rule, value, callback) {
+            if (value == null || value === '') {
+                callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+                return;
+            }
+            if (value < 1) {
+                callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+                return;
+            }
+            if (value > this.totalScore) {
+                callback(new Error(`${this.t('survey_creator.question.scoreExceedTotalTip')} ${this.totalScore}`));
+                return;
+            }
+            if (this.value.maxScore != null && value > this.value.maxScore) {
+                callback(new Error(this.t('survey_creator.question.minScoreGreaterThanMaxTip')));
+                return;
+            }
+            callback();
+        },
+        validateMaxScore(rule, value, callback) {
+            if (value == null || value === '') {
+                callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+                return;
+            }
+            if (value < 1) {
+                callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+                return;
+            }
+            if (value > this.totalScore) {
+                callback(new Error(`${this.t('survey_creator.question.scoreExceedTotalTip')} ${this.totalScore}`));
+                return;
+            }
+            if (this.value.minScore != null && value < this.value.minScore) {
+                callback(new Error(this.t('survey_creator.question.maxScoreLessThanMinTip')));
+                return;
+            }
+            callback();
+        },
+        handleMinScoreChange(value) {
+            if (this.value.maxScore != null && value > this.value.maxScore) {
+                this.value.maxScore = value;
+            }
+            this.resetLeftScoreOptions();
+            this.resetRightScoreOptions();
+        },
+        handleMaxScoreChange(value) {
+            if (this.value.minScore != null && value < this.value.minScore) {
+                this.value.maxScore = this.value.minScore;
+            }
+            this.resetLeftScoreOptions();
+            this.resetRightScoreOptions();
+        },
     },
 });
 
@@ -20467,12 +20623,18 @@ var script$z = Vue.extend({
 const __vue_script__$z = script$z;
 
 /* template */
-var __vue_render__$y = 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":4}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.minScore"),"rules":{
-        required: true,
-        type: 'number',
-        trigger: 'change',
-        message: _vm.t('survey_creator.question.scoreRequiredTip'),
-      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.resetScoreOptions(_vm.leftScores)}},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.leftScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n          "+_vm._s(score.value)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"rules":{
+var __vue_render__$y = 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":4}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.minScore"),"rules":[
+        {
+          required: true,
+          type: 'number',
+          trigger: 'change',
+          message: _vm.t('survey_creator.question.scoreRequiredTip'),
+        },
+        {
+          validator: _vm.validateMinScore,
+          trigger: 'change',
+        }
+      ]}},[_c('Select',{ref:"leftScoreSelect",attrs:{"filterable":"","placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.handleScoreSelectOpenChange('left', $event)},"on-change":_vm.handleMinScoreChange,"on-query-change":function($event){return _vm.handleScoreQueryChange('left', $event)}},model:{value:(_vm.value.minScore),callback:function ($$v) {_vm.$set(_vm.value, "minScore", $$v);},expression:"value.minScore"}},_vm._l((_vm.leftScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"label":String(score.value),"disabled":score.disabled}},[_vm._v("\n          "+_vm._s(score.value)+"\n        ")])}),1)],1)],1),_vm._v(" "),_c('Col',{attrs:{"span":3}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.leftOperator"),"rules":{
         required: true,
         trigger: 'change',
         message: _vm.t('survey_creator.question.notEmpty'),
@@ -20480,22 +20642,28 @@ var __vue_render__$y = function () {var _vm=this;var _h=_vm.$createElement;var _
         required: true,
         trigger: 'change',
         message: _vm.t('survey_creator.question.notEmpty'),
-      }}},[_c('Select',{staticClass:"operator",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":4}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.maxScore"),"rules":{
-        required: true,
-        type: 'number',
-        trigger: 'change',
-        message: _vm.t('survey_creator.question.scoreRequiredTip'),
-      }}},[_c('Select',{attrs:{"placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.resetScoreOptions(_vm.rightScores)}},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}},_vm._l((_vm.rightScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"disabled":score.disabled}},[_vm._v("\n          "+_vm._s(score.value)+"\n        ")])}),1)],1)],1)],1)};
+      }}},[_c('Select',{staticClass:"operator",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":4}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.maxScore"),"rules":[
+        {
+          required: true,
+          type: 'number',
+          trigger: 'change',
+          message: _vm.t('survey_creator.question.scoreRequiredTip'),
+        },
+        {
+          validator: _vm.validateMaxScore,
+          trigger: 'change',
+        }
+      ]}},[_c('Select',{ref:"rightScoreSelect",attrs:{"filterable":"","placeholder":_vm.t('survey_creator.question.selectScore')},on:{"on-open-change":function($event){return _vm.handleScoreSelectOpenChange('right', $event)},"on-change":_vm.handleMaxScoreChange,"on-query-change":function($event){return _vm.handleScoreQueryChange('right', $event)}},model:{value:(_vm.value.maxScore),callback:function ($$v) {_vm.$set(_vm.value, "maxScore", $$v);},expression:"value.maxScore"}},_vm._l((_vm.rightScores),function(score){return _c('Option',{key:score.value,attrs:{"value":score.value,"label":String(score.value),"disabled":score.disabled}},[_vm._v("\n          "+_vm._s(score.value)+"\n        ")])}),1)],1)],1)],1)};
 var __vue_staticRenderFns__$y = [];
 
   /* style */
   const __vue_inject_styles__$z = function (inject) {
     if (!inject) return
-    inject("data-v-794d462e_0", { source: ".label[data-v-794d462e]{text-align:right;margin-bottom:24px}[data-v-794d462e] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
+    inject("data-v-514fa778_0", { source: ".label[data-v-514fa778]{text-align:right;margin-bottom:24px}[data-v-514fa778] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$z = "data-v-794d462e";
+  const __vue_scope_id__$z = "data-v-514fa778";
   /* module identifier */
   const __vue_module_identifier__$z = undefined;
   /* functional template */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-creator",
-  "version": "1.78.03051745",
+  "version": "1.78.04031900",
   "description": "",
   "license": "MIT",
   "scripts": {
@@ -12,8 +12,8 @@
     "lint-fix": "eslint \"**/*.ts\"  \"**/*.vue\" --fix --no-error-on-unmatched-pattern"
   },
   "peerDependencies": {
-    "@wg-npm/survey-core": "1.78.03051745",
-    "@wg-npm/survey-service-api": "1.78.03051745",
+    "@wg-npm/survey-core": "1.78.04031900",
+    "@wg-npm/survey-service-api": "1.78.04031900",
     "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": "1.78.03051745",
-    "@wg-npm/survey-service-api": "1.78.03051745",
+    "@wg-npm/survey-core": "1.78.04031900",
+    "@wg-npm/survey-service-api": "1.78.04031900",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",
@@ -79,7 +79,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2bb69a9df666ef82610fcd9d3dc54b2f51f1bb74",
+  "gitHead": "6ffca5612664222a83c5f7cc934558799eeeb523",
   "rollup": {
     "external": [
       "vue",

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

@@ -8,22 +8,33 @@
     <Col :span="4">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
-        :rules="{
-          required: true,
-          type: 'number',
-          trigger: 'change',
-          message: t('survey_creator.question.scoreRequiredTip'),
-        }"
+        :rules="[
+          {
+            required: true,
+            type: 'number',
+            trigger: 'change',
+            message: t('survey_creator.question.scoreRequiredTip'),
+          },
+          {
+            validator: validateMinScore,
+            trigger: 'change',
+          }
+        ]"
       >
         <Select
+          ref="leftScoreSelect"
           v-model="value.minScore"
+          filterable
           :placeholder="t('survey_creator.question.selectScore')"
-          @on-open-change="resetScoreOptions(leftScores)"
+          @on-open-change="handleScoreSelectOpenChange('left', $event)"
+          @on-change="handleMinScoreChange"
+          @on-query-change="handleScoreQueryChange('left', $event)"
         >
           <Option
             v-for="score in leftScores"
             :value="score.value"
             :key="score.value"
+            :label="String(score.value)"
             :disabled="score.disabled"
           >
             {{ score.value }}
@@ -89,22 +100,33 @@
     <Col :span="4">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
-        :rules="{
-          required: true,
-          type: 'number',
-          trigger: 'change',
-          message: t('survey_creator.question.scoreRequiredTip'),
-        }"
+        :rules="[
+          {
+            required: true,
+            type: 'number',
+            trigger: 'change',
+            message: t('survey_creator.question.scoreRequiredTip'),
+          },
+          {
+            validator: validateMaxScore,
+            trigger: 'change',
+          }
+        ]"
       >
         <Select
+          ref="rightScoreSelect"
           v-model="value.maxScore"
+          filterable
           :placeholder="t('survey_creator.question.selectScore')"
-          @on-open-change="resetScoreOptions(rightScores)"
+          @on-open-change="handleScoreSelectOpenChange('right', $event)"
+          @on-change="handleMaxScoreChange"
+          @on-query-change="handleScoreQueryChange('right', $event)"
         >
           <Option
             v-for="score in rightScores"
             :value="score.value"
             :key="score.value"
+            :label="String(score.value)"
             :disabled="score.disabled"
           >
             {{ score.value }}
@@ -116,15 +138,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
-import {
-  Col,
-  FormItem,
-  InputNumber,
-  Message,
-  Option,
-  Row,
-  Select,
-} from "view-design";
+import { Col, FormItem, Message, Option, Row, Select } from "view-design";
 import _ from "lodash";
 import ExprMixin from "./expr-mixin";
 import LocaleMixin from "../../../../../mixins/locale-mixin";
@@ -141,7 +155,6 @@ export default Vue.extend({
     Select,
     Option,
     FormItem,
-    InputNumber,
   },
   data() {
     return {
@@ -216,7 +229,130 @@ export default Vue.extend({
         }
       );
     },
-    resetScoreOptions(options) {
+    resetLeftScoreOptions() {
+      this.resetScoreOptions(this.leftScores, "left");
+    },
+    resetRightScoreOptions() {
+      this.resetScoreOptions(this.rightScores, "right");
+    },
+    getScoreOptions(type): any[] {
+      return type === "left" ? this.leftScores : this.rightScores;
+    },
+    getScoreValue(type) {
+      return type === "left" ? this.value.minScore : this.value.maxScore;
+    },
+    getScoreSelectRef(type) {
+      return type === "left"
+        ? this.$refs.leftScoreSelect
+        : this.$refs.rightScoreSelect;
+    },
+    findAvailableScoreOptionByValue(options: any[], value) {
+      return _.find(options, (option: any) => {
+        return !option.disabled && option.value === value;
+      });
+    },
+    findMatchedScoreOption(options: any[], query) {
+      const normalizedQuery = String(query == null ? "" : query).trim();
+      const enabledOptions = _.filter(options, (option: any) => !option.disabled);
+
+      if (!enabledOptions.length) {
+        return null;
+      }
+
+      if (!normalizedQuery) {
+        return enabledOptions[0];
+      }
+
+      return (
+        _.find(
+          enabledOptions,
+          (option: any) => String(option.value) === normalizedQuery
+        ) ||
+        _.find(
+          enabledOptions,
+          (option: any) => String(option.value).indexOf(normalizedQuery) === 0
+        ) ||
+        null
+      );
+    },
+    updateScoreSelectFocus(type, targetValue: any, fallbackToFirst = false) {
+      const select = this.getScoreSelectRef(type);
+      if (!select) {
+        return;
+      }
+
+      const matchedOption = targetValue;
+
+      if (!matchedOption) {
+        if (!fallbackToFirst) {
+          select.focusIndex = -1;
+          return;
+        }
+
+        const firstEnabledOption = _.find(
+          this.getScoreOptions(type),
+          (option: any) => !option.disabled
+        );
+        if (!firstEnabledOption) {
+          select.focusIndex = -1;
+          return;
+        }
+        return this.updateScoreSelectFocus(type, firstEnabledOption, false);
+      }
+
+      const focusIndex = _.findIndex(select.flatOptions, (option) => {
+        const propsData =
+          option &&
+          option.componentOptions &&
+          option.componentOptions.propsData;
+        return propsData && propsData.value === matchedOption.value;
+      });
+
+      if (focusIndex === -1) {
+        if (fallbackToFirst) {
+          const firstEnabledOption: any = _.find(
+            this.getScoreOptions(type),
+            (option: any) => !option.disabled
+          );
+          const matchedValue = matchedOption ? matchedOption.value : null;
+          if (firstEnabledOption && firstEnabledOption.value !== matchedValue) {
+            this.updateScoreSelectFocus(type, firstEnabledOption, false);
+          }
+        }
+        return;
+      }
+
+      select.focusIndex = focusIndex;
+    },
+    handleScoreSelectOpenChange(type, visible) {
+      if (type === "left") {
+        this.resetLeftScoreOptions();
+      } else {
+        this.resetRightScoreOptions();
+      }
+
+      if (!visible) {
+        return;
+      }
+
+      const currentValue = this.getScoreValue(type);
+      const currentOption = this.findAvailableScoreOptionByValue(
+        this.getScoreOptions(type),
+        currentValue
+      );
+
+      this.$nextTick(() => {
+        this.updateScoreSelectFocus(type, currentOption, true);
+      });
+    },
+    handleScoreQueryChange(type, query) {
+      const options = this.getScoreOptions(type);
+      const matchedOption = this.findMatchedScoreOption(options, query);
+      this.$nextTick(() => {
+        this.updateScoreSelectFocus(type, matchedOption, false);
+      });
+    },
+    resetScoreOptions(options, type) {
       let otherRange = _.map(this.otherConditions, (item) => {
         return {
           // @ts-ignore
@@ -232,13 +368,23 @@ export default Vue.extend({
         this.value.maxScore == null ? this.totalScore : this.value.maxScore;
 
       _.forEach(options, function (o) {
-        o.disabled = _.some(otherRange, function (or) {
+        let disabledByOtherRange = _.some(otherRange, function (or) {
           let condition_a = o.value >= or.min && o.value <= or.max;
           let condition_b =
             o.value >= currentMinScore && o.value <= currentMaxScore;
 
           return condition_a && condition_b;
         });
+
+        let disabledByCurrentRange = false;
+        if (type === "left" && currentMaxScore != null) {
+          disabledByCurrentRange = o.value > currentMaxScore;
+        }
+        if (type === "right" && currentMinScore != null) {
+          disabledByCurrentRange = o.value < currentMinScore;
+        }
+
+        o.disabled = disabledByOtherRange || disabledByCurrentRange;
       });
     },
     generateExpr() {
@@ -246,6 +392,70 @@ export default Vue.extend({
       let maxScore = this.value.maxScore;
       return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
     },
+    validateMinScore(rule, value, callback) {
+      if (value == null || value === '') {
+        callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+        return;
+      }
+      if (value < 1) {
+        callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+        return;
+      }
+      if (value > this.totalScore) {
+        callback(
+          new Error(
+            `${this.t('survey_creator.question.scoreExceedTotalTip')} ${this.totalScore}`
+          )
+        );
+        return;
+      }
+      if (this.value.maxScore != null && value > this.value.maxScore) {
+        callback(
+          new Error(this.t('survey_creator.question.minScoreGreaterThanMaxTip'))
+        );
+        return;
+      }
+      callback();
+    },
+    validateMaxScore(rule, value, callback) {
+      if (value == null || value === '') {
+        callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+        return;
+      }
+      if (value < 1) {
+        callback(new Error(this.t('survey_creator.question.scoreRequiredTip')));
+        return;
+      }
+      if (value > this.totalScore) {
+        callback(
+          new Error(
+            `${this.t('survey_creator.question.scoreExceedTotalTip')} ${this.totalScore}`
+          )
+        );
+        return;
+      }
+      if (this.value.minScore != null && value < this.value.minScore) {
+        callback(
+          new Error(this.t('survey_creator.question.maxScoreLessThanMinTip'))
+        );
+        return;
+      }
+      callback();
+    },
+    handleMinScoreChange(value) {
+      if (this.value.maxScore != null && value > this.value.maxScore) {
+        this.value.maxScore = value;
+      }
+      this.resetLeftScoreOptions();
+      this.resetRightScoreOptions();
+    },
+    handleMaxScoreChange(value) {
+      if (this.value.minScore != null && value < this.value.minScore) {
+        this.value.maxScore = this.value.minScore;
+      }
+      this.resetLeftScoreOptions();
+      this.resetRightScoreOptions();
+    },
   },
 });
 </script>

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

@@ -89,6 +89,9 @@ export default {
       titleRequiredTip: "Please Input Question",
       inputEnabledTip: "The user can enter after selecting this item",
       scoreRequiredTip: "Score Required",
+      scoreExceedTotalTip: "Score cannot exceed total score",
+      minScoreGreaterThanMaxTip: "Minimum score cannot be greater than maximum score",
+      maxScoreLessThanMinTip: "Maximum score cannot be less than minimum score",
       subQuestionRequiredTip: "Sub Question Required",
       optionalRequiredTip: "Optional Required",
       commitRequiredTip: "Commit Required",

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

@@ -88,6 +88,9 @@ export default {
       inputEnabledTip: "用户选中该项后可输入",
       textTitleRequiredTip: "请填写文字说明",
       scoreRequiredTip: "分值不能为空",
+      scoreExceedTotalTip: "分数不能超过总分",
+      minScoreGreaterThanMaxTip: "最小分值不能大于最大分值",
+      maxScoreLessThanMinTip: "最大分值不能小于最小分值",
       subQuestionRequiredTip: "子題不能为空",
       optionalRequiredTip: "选项不能为空",
       commitRequiredTip: "描述不能为空",