@wg-npm/survey-creator 0.3.7731 → 0.3.7744

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,79 +3202,35 @@ var script$d = Vue.extend({
         },
     },
     methods: {
-        getSelectedRangeByValue(value, ranges) {
-            let otherRange = _.map(ranges, (item) => {
+        createInitScoresOption() {
+            let otherRange = _.map(this.otherConditions, (item) => {
                 return {
-                    min: _.get(item, "payload.minScore"),
-                    max: _.get(item, "payload.maxScore"),
+                    min: _.get(item, "payload.minScore", 0),
+                    max: _.get(item, "payload.maxScore", 0),
                 };
             });
-            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.leftScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                let disabled = _.some(otherRange, function (o) {
+                    return num >= o.min && num <= o.max;
+                });
+                return {
+                    value: num,
+                    label: num,
+                    disabled: disabled
+                };
             });
-            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;
+            this.rightScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                let disabled = _.some(otherRange, function (o) {
+                    return num >= o.min && num <= o.max;
                 });
-                if (usedRange[length - 1][1] != globalMax) {
-                    other.push([usedRange[length - 1][1], globalMax]);
-                }
-                return other;
-            }
-        },
-        disabledScoreOption(value, type) {
-            if (this.checkValueInOtherRange(value, type)) {
-                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;
-            }
+                return {
+                    value: num,
+                    label: num,
+                    disabled: disabled
+                };
+            });
         },
-        checkValueInOtherRange(value, type) {
+        resetScoreOptions(options, type) {
             debugger;
             let otherRange = _.map(this.otherConditions, (item) => {
                 return {
@@ -3284,17 +3240,14 @@ var script$d = Vue.extend({
             });
             let currentValue = this.value;
             let currentTotalScore = this.totalScore;
-            return _.some(otherRange, function (o) {
-                let condition_a = value >= o.min && value <= o.max;
-                let condition_b = type == "left" ? value >= _.get(currentValue, "minScore", 0) : value <= _.get(currentValue, "maxScore", currentTotalScore);
-                return condition_a && condition_b;
+            _.forEach(options, function (o) {
+                o.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;
+                });
             });
         },
-        generateExpr() {
-            let minScore = this.value.minScore;
-            let maxScore = this.value.maxScore;
-            return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
-        },
     },
 });
 
@@ -3307,7 +3260,7 @@ var __vue_render__$d = function () {var _vm=this;var _h=_vm.$createElement;var _
       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":{
+    }}},[_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.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'),
@@ -3320,17 +3273,17 @@ var __vue_render__$d = function () {var _vm=this;var _h=_vm.$createElement;var _
       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)};
+    }}},[_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.value)+"\n                ")])}),1)],1)],1)],1)};
 var __vue_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-83ab61b4_0", { source: ".label[data-v-83ab61b4]{text-align:right;margin-bottom:24px}[data-v-83ab61b4] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
+    inject("data-v-b6aa713e_0", { source: ".label[data-v-b6aa713e]{text-align:right;margin-bottom:24px}[data-v-b6aa713e] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-83ab61b4";
+  const __vue_scope_id__$d = "data-v-b6aa713e";
   /* 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.7731",
+  "version": "0.3.7744",
   "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.7731",
-    "@wg-npm/survey-service-api": "0.3.7731",
+    "@wg-npm/survey-core": "0.3.7744",
+    "@wg-npm/survey-service-api": "0.3.7744",
     "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.7731",
-    "@wg-npm/survey-service-api": "0.3.7731",
+    "@wg-npm/survey-core": "0.3.7744",
+    "@wg-npm/survey-service-api": "0.3.7744",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",

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

@@ -18,14 +18,15 @@
                 <Select
                         v-model="value.minScore"
                         :placeholder="t('survey_creator.question.selectScore')"
+                        @on-change="resetScoreOptions(leftScores,'left')"
                 >
                     <Option
-                            v-for="score in scores"
-                            :value="score"
-                            :key="score"
-                            :disabled="disabledScoreOption(score, 'left')"
+                            v-for="score in leftScores"
+                            :value="score.value"
+                            :key="score.value"
+                            :disabled="score.disabled"
                     >
-                        {{ score }}
+                        {{ score.value }}
                     </Option>
                 </Select>
             </FormItem>
@@ -98,14 +99,15 @@
                 <Select
                         v-model="value.maxScore"
                         :placeholder="t('survey_creator.question.selectScore')"
+                        @on-change="resetScoreOptions(rightScores,'right')"
                 >
                     <Option
-                            v-for="score in scores"
-                            :value="score"
-                            :key="score"
-                            :disabled="disabledScoreOption(score, 'right')"
+                            v-for="score in rightScores"
+                            :value="score.value"
+                            :key="score.value"
+                            :disabled="score.disabled"
                     >
-                        {{ score }}
+                        {{ score.value }}
                     </Option>
                 </Select>
             </FormItem>
@@ -144,19 +146,19 @@
         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) => {
@@ -171,79 +173,36 @@
             },
         },
         methods: {
-            getSelectedRangeByValue(value, ranges) {
-                let otherRange = _.map(ranges, (item) => {
+            createInitScoresOption() {
+                let otherRange = _.map(this.otherConditions, (item) => {
                     return {
-                        min: _.get(item, "payload.minScore"),
-                        max: _.get(item, "payload.maxScore"),
+                        min: _.get(item, "payload.minScore", 0),
+                        max: _.get(item, "payload.maxScore", 0),
                     };
                 });
-                return _.head(
-                    _.filter(otherRange, function (o) {
-                        return value > o.min && value < o.max;
+
+                this.leftScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                    let disabled = _.some(otherRange, function (o) {
+                        return num >= o.min && num <= 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 {
+                        value: num,
+                        label: num,
+                        disabled: disabled
                     }
-                    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]);
+                })
+                this.rightScores = _.map(_.range(1, this.totalScore + 1, 1), function (num) {
+                    let disabled = _.some(otherRange, function (o) {
+                        return num >= o.min && num <= o.max;
+                    })
+                    return {
+                        value: num,
+                        label: num,
+                        disabled: disabled
                     }
-                    return other;
-                }
-            },
-            disabledScoreOption(value, type) {
-                if (this.checkValueInOtherRange(value, type)) {
-                    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, type) {
+            resetScoreOptions(options, type) {
                 debugger
                 let otherRange = _.map(this.otherConditions, (item) => {
                     return {
@@ -255,17 +214,13 @@
                 let currentValue = this.value;
                 let currentTotalScore = this.totalScore;
 
-                return _.some(otherRange, function (o) {
-                    let condition_a = value >= o.min && value <= o.max;
-                    let condition_b = type == "left" ? value >= _.get(currentValue, "minScore", 0) : value <= _.get(currentValue, "maxScore", currentTotalScore)
-
-                    return condition_a && condition_b;
-                });
-            },
-            generateExpr() {
-                let minScore = this.value.minScore;
-                let maxScore = this.value.maxScore;
-                return `${minScore} ${this.value.leftOperator} score and score ${this.value.rightOperator} ${maxScore}`;
+                _.forEach(options, function (o) {
+                    o.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;
+                    })
+                })
             },
         },
     });