@wg-npm/survey-creator 0.3.7725 → 0.3.7738

package/dist/survey-creator.esm.js

@@ -3180,19 +3180,19 @@ var script$d = Vue.extend({
     data() {
         return {
             operators: ["<=", "<"],
+            leftScores: [],
+            rightScores: []
         };
     },
     created() {
         this.value.leftOperator = _.unescape(this.value.leftOperator);
         this.value.rightOperator = _.unescape(this.value.rightOperator);
+        this.createInitScoresOption();
     },
     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 });
@@ -3202,95 +3202,48 @@ var script$d = Vue.extend({
         },
     },
     methods: {
-        getSelectedRangeByValue(value, ranges) {
-            let otherRange = _.map(ranges, (item) => {
+        createInitScoresOption() {
+            this.leftScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
                 return {
-                    min: _.get(item, "payload.minScore"),
-                    max: _.get(item, "payload.maxScore"),
+                    value: num,
+                    label: num,
+                    disabled: false
                 };
             });
-            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];
+            this.rightScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                return {
+                    value: num,
+                    label: num,
+                    disabled: false
+                };
             });
-            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) {
+        resetScoreOptions(options, type) {
             debugger;
-            if (this.checkValueInOtherRange(value)) {
-                return true;
-            }
-            let leftScore = _.get(this.value, "minScore", 0);
-            let rightScore = _.get(this.value, "maxScore", this.totalScore);
-            if (leftScore != null && type == "left" && value >= rightScore) {
-                return true;
-            }
-            if (rightScore != null && type == "right" && value <= leftScore) {
-                return true;
+            if (this.otherConditions.length == 0) {
+                return;
             }
-        },
-        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;
+            let currentValue = this.value;
+            let currentTotalScore = this.totalScore;
+            _.map(options, function (o) {
+                let disabled = _.some(otherRange, function (or) {
+                    let condition_a = o >= or.min && o <= or.max;
+                    let condition_b = type == "left" ? o.value >= _.get(currentValue, "minScore", 0) : o.value <= _.get(currentValue, "maxScore", currentTotalScore);
+                    return condition_a && condition_b;
+                });
+                return {
+                    value: o.value,
+                    label: o.label,
+                    disabled: disabled
+                };
             });
         },
-        generateExpr() {
-            let minScore = this.value.minScore;
-            let maxScore = this.value.maxScore;
-            return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
-        },
     },
 });
 
@@ -3298,35 +3251,35 @@ var script$d = Vue.extend({
 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":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')},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',{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'),
-      }}},[_c('Select',{staticClass:"operator",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":3}},[_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',{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')},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)],1)};
+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":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-change":function($event){return _vm.resetScoreOptions(_vm.leftScores,'left')}},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)+"\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'),
+    }}},[_c('Select',{staticClass:"operator",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":3}},[_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',{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-change":function($event){return _vm.resetScoreOptions(_vm.rightScores,'right')}},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)+"\n                ")])}),1)],1)],1)],1)};
 var __vue_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-1411052e_0", { source: ".label[data-v-1411052e]{text-align:right;margin-bottom:24px}[data-v-1411052e] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
+    inject("data-v-29fedcdf_0", { source: ".label[data-v-29fedcdf]{text-align:right;margin-bottom:24px}[data-v-29fedcdf] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-1411052e";
+  const __vue_scope_id__$d = "data-v-29fedcdf";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */

package/package.json

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

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

@@ -1,277 +1,235 @@
 <template>
-  <Row type="flex" justify="start" :gutter="6" align="middle">
-    <Col class="label">
-      {{
-        t("survey_creator.question.evaluation.condition.score_condition_title")
-      }}
-    </Col>
-    <Col :span="4">
-      <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
-        :rules="{
+    <Row type="flex" justify="start" :gutter="6" align="middle">
+        <Col class="label">
+            {{
+            t("survey_creator.question.evaluation.condition.score_condition_title")
+            }}
+        </Col>
+        <Col :span="4">
+            <FormItem
+                    :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.minScore`"
+                    :rules="{
           required: true,
           type: 'number',
           trigger: 'change',
           message: t('survey_creator.question.scoreRequiredTip'),
         }"
-      >
-        <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">
-      <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
-        :rules="{
+            >
+                <Select
+                        v-model="value.minScore"
+                        :placeholder="t('survey_creator.question.selectScore')"
+                        @on-change="resetScoreOptions(leftScores,'left')"
+                >
+                    <Option
+                            v-for="score in leftScores"
+                            :value="score.value"
+                            :key="score.value"
+                            :disabled="score.disabled"
+                    >
+                        {{ score }}
+                    </Option>
+                </Select>
+            </FormItem>
+        </Col>
+        <Col :span="3">
+            <FormItem
+                    :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
+                    :rules="{
           required: true,
           trigger: 'change',
           message: t('survey_creator.question.notEmpty'),
         }"
-      >
-        <Select
-          class="operator"
-          v-model="value.leftOperator"
-          :placeholder="
+            >
+                <Select
+                        class="operator"
+                        v-model="value.leftOperator"
+                        :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 class="label">
-      {{ t("survey_creator.question.totalScores") }}
-    </Col>
-    <Col :span="3">
-      <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
-        :rules="{
+                >
+                    <Option
+                            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="3">
+            <FormItem
+                    :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
+                    :rules="{
           required: true,
           trigger: 'change',
           message: t('survey_creator.question.notEmpty'),
         }"
-      >
-        <Select
-          class="operator"
-          v-model="value.rightOperator"
-          :placeholder="
+            >
+                <Select
+                        class="operator"
+                        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="4">
-      <FormItem
-        :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.maxScore`"
-        :rules="{
+                >
+                    <Option
+                            v-for="(operator, index) in operators"
+                            :value="operator"
+                            :key="index"
+                    >
+                        {{ operator }}
+                    </Option>
+                </Select>
+            </FormItem>
+        </Col>
+        <Col :span="4">
+            <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>
-  </Row>
+            >
+                <Select
+                        v-model="value.maxScore"
+                        :placeholder="t('survey_creator.question.selectScore')"
+                        @on-change="resetScoreOptions(rightScores,'right')"
+                >
+                    <Option
+                            v-for="score in rightScores"
+                            :value="score.value"
+                            :key="score.value"
+                            :disabled="score.disabled"
+                    >
+                        {{ score }}
+                    </Option>
+                </Select>
+            </FormItem>
+        </Col>
+    </Row>
 </template>
 <script lang="ts">
-import Vue from "vue";
-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 Vue from "vue";
+    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;
+    Vue.prototype.$Message = Message;
 
-export default Vue.extend({
-  name: "score",
-  mixins: [ExprMixin, LocaleMixin],
-  components: {
-    Row,
-    Col,
-    Select,
-    Option,
-    FormItem,
-    InputNumber,
-  },
-  data() {
-    return {
-      operators: ["<=", "<"],
-    };
-  },
-  created() {
-    this.value.leftOperator = _.unescape(this.value.leftOperator);
-    this.value.rightOperator = _.unescape(this.value.rightOperator);
-  },
-  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
-      );
-      const conditions = _.flatMap(otherEvaluationItems, item=>_.get(item,"conditions",[]));
-      return _.filter(conditions,
-        (item) => _.get(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;
-        })
-      );
-    },
-    //todo 此功能暂未启用
-    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) {
-      debugger
-      if (this.checkValueInOtherRange(value)) {
-        return true;
-      }
-      let leftScore = _.get(this.value, "minScore", 0);
-      let rightScore = _.get(this.value, "maxScore", this.totalScore);
-      if (leftScore != null && type == "left" && value >= rightScore) {
-        return true;
-      }
-      if (rightScore != null && type == "right" && value <= leftScore) {
-        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}`;
-    },
-  },
-});
+    export default Vue.extend({
+        name: "score",
+        mixins: [ExprMixin, LocaleMixin],
+        components: {
+            Row,
+            Col,
+            Select,
+            Option,
+            FormItem,
+            InputNumber,
+        },
+        data() {
+            return {
+                operators: ["<=", "<"],
+                leftScores: [],
+                rightScores: []
+            };
+        },
+        created() {
+            this.value.leftOperator = _.unescape(this.value.leftOperator);
+            this.value.rightOperator = _.unescape(this.value.rightOperator);
+            this.createInitScoresOption()
+        },
+        computed: {
+            totalScore() {
+                return this.$rootComponent.currentSurvey.statistics.maxScore;
+            },
+            otherConditions() {
+                let otherEvaluationItems = _.filter(
+                    _.map(this.evaluationItems, (item, index) => {
+                        return _.extend({}, item, {index: index});
+                    }),
+                    (item) => item.index != this.itemIndex
+                );
+                const conditions = _.flatMap(otherEvaluationItems, item => _.get(item, "conditions", []));
+                return _.filter(conditions,
+                    (item) => _.get(item, "type") == ExprConditionType.SCORE
+                );
+            },
+        },
+        methods: {
+            createInitScoresOption() {
+                this.leftScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                    return {
+                        value: num,
+                        label: num,
+                        disabled: false
+                    }
+                })
+                this.rightScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                    return {
+                        value: num,
+                        label: num,
+                        disabled: false
+                    }
+                })
+            },
+            resetScoreOptions(options, type) {
+                debugger
+                if (this.otherConditions.length == 0) {
+                    return
+                }
+                let otherRange = _.map(this.otherConditions, (item) => {
+                    return {
+                        min: _.get(item, "payload.minScore", 0),
+                        max: _.get(item, "payload.maxScore", 0),
+                    };
+                });
+
+                let currentValue = this.value;
+                let currentTotalScore = this.totalScore;
+
+                _.map(options, function (o) {
+                    let disabled = _.some(otherRange, function (or) {
+                        let condition_a = o >= or.min && o <= or.max;
+                        let condition_b = type == "left" ? o.value >= _.get(currentValue, "minScore", 0) : o.value <= _.get(currentValue, "maxScore", currentTotalScore)
+                        return condition_a && condition_b;
+                    })
+                    return {
+                        value: o.value,
+                        label: o.label,
+                        disabled: disabled
+                    }
+                })
+            },
+        },
+    });
 </script>
 <style scoped lang="less">
-.label {
-  text-align: right;
-  margin-bottom: 24px;
-}
-/deep/ .operator {
-  .ivu-select-selected-value {
-    height: 28px;
-    line-height: 28px;
-  }
-}
+    .label {
+        text-align: right;
+        margin-bottom: 24px;
+    }
+
+    /deep/ .operator {
+        .ivu-select-selected-value {
+            height: 28px;
+            line-height: 28px;
+        }
+    }
 </style>