@wg-npm/survey-creator 0.3.6202 → 0.3.7684

package/dist/survey-creator.esm.js

@@ -1612,6 +1612,14 @@ var script$u = Vue.extend({
             required: true
         }
     },
+    watch: {
+        item: {
+            handler(val) {
+                this.getDesc();
+            },
+            deep: true
+        }
+    },
     methods: {
         getDesc() {
             let max = this.item.range.max || null;
@@ -1798,6 +1806,14 @@ var script$t = Vue.extend({
             return _.cloneDeep(this.$rootComponent.currentSurvey.questions);
         },
     },
+    watch: {
+        conditions: {
+            handler(val) {
+                this.initialDesc();
+            },
+            deep: true
+        }
+    },
     methods: {
         getDesc(condition) {
             let payload = condition.payload;
@@ -3181,7 +3197,8 @@ var script$d = Vue.extend({
             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");
+            const conditions = _.flatMap(otherEvaluationItems, item => _.get(item, "conditions", []));
+            return _.filter(conditions, (item) => _.get(item, "type") == "SCORE");
         },
     },
     methods: {
@@ -3304,11 +3321,11 @@ var __vue_staticRenderFns__$d = [];
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-34509240_0", { source: ".label[data-v-34509240]{text-align:right;margin-bottom:24px}[data-v-34509240] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
+    inject("data-v-7c338c4d_0", { source: ".label[data-v-7c338c4d]{text-align:right;margin-bottom:24px}[data-v-7c338c4d] .operator .ivu-select-selected-value{height:28px;line-height:28px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-34509240";
+  const __vue_scope_id__$d = "data-v-7c338c4d";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -4369,7 +4386,7 @@ var script$1 = Vue.extend({
         }
         this.primaryLanguage = _.camelCase(this.currentSurvey.options.primaryLanguage);
         if (this.showQuestionWhenPageLoad) {
-            const question = _.findLast(this.currentSurvey?.questions, questions => { return questions.type === this.showQuestionType; });
+            const question = _.find(this.currentSurvey?.questions, questions => { return questions.type === this.showQuestionType; });
             if (_.isUndefined(question)) {
                 this.createQuestion(this.showQuestionType);
             }

package/package.json

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

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

@@ -1,117 +1,125 @@
 <template>
-  <Tooltip max-width="200">
-    <span v-html="this.descTitle" slot="content"></span>
-    <span v-html="this.desc" class="desc"> </span>
-  </Tooltip>
+    <Tooltip max-width="200">
+        <span v-html="this.descTitle" slot="content"></span>
+        <span v-html="this.desc" class="desc"> </span>
+    </Tooltip>
 </template>
 
 <script lang="ts">
-const SPLIT_LENGTH = 60;
-import Vue from "vue";
-import { ExprConditionType } from "@wg-npm/survey-core/src/models";
-import LocaleMixin from "../../../../mixins/locale-mixin";
-import _ from "lodash";
-import { Tooltip } from "view-design";
-import { ExprEvaluationQuestion } from "@wg-npm/survey-core/src/expr-evaluation-question";
+    const SPLIT_LENGTH = 60;
+    import Vue from "vue";
+    import {ExprConditionType} from "@wg-npm/survey-core/src/models";
+    import LocaleMixin from "../../../../mixins/locale-mixin";
+    import _ from "lodash";
+    import {Tooltip} from "view-design";
+    import {ExprEvaluationQuestion} from "@wg-npm/survey-core/src/expr-evaluation-question";
 
-export default Vue.extend({
-  name: "expr-if",
-  mixins: [LocaleMixin],
-  components: { Tooltip },
-  inject: ["$rootComponent"],
-  data() {
-    return {
-      desc: "",
-      descTitle: "",
-    };
-  },
-  created() {
-    this.initialDesc();
-  },
-  props: {
-    conditions: {
-      type: Array,
-      required: true,
-    },
-  },
-  computed: {
-    questions() {
-      return _.cloneDeep(this.$rootComponent.currentSurvey.questions);
-    },
-  },
-  methods: {
-    getDesc(condition) {
-      let payload = condition.payload;
-      if (condition.type == ExprConditionType.SCORE) {
-        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();
-        let scope = _.join(
-          _.map(numbers, (number) => {
-            if (_.isArray(_.head(number))) {
-              return _.join(
-                _.map(number, (e) => _.join(e, "-")),
-                ", "
-              );
+    export default Vue.extend({
+        name: "expr-if",
+        mixins: [LocaleMixin],
+        components: {Tooltip},
+        inject: ["$rootComponent"],
+        data() {
+            return {
+                desc: "",
+                descTitle: "",
+            };
+        },
+        created() {
+            this.initialDesc();
+        },
+        props: {
+            conditions: {
+                type: Array,
+                required: true,
+            },
+        },
+        computed: {
+            questions() {
+                return _.cloneDeep(this.$rootComponent.currentSurvey.questions);
+            },
+        },
+        watch: {
+            conditions: {
+                handler(val) {
+                    this.initialDesc();
+                },
+                deep: true
             }
-            return _.join(number, "-");
-          }),
-          ", "
-        );
-        if (condition.type == ExprConditionType.ASSIGN) {
-          return this.t(
-            "survey_creator.question.evaluation.condition.assign_template",
-            [
-              scope,
-              _.join(payload.values, "、"),
-              _.unescape(payload.operator),
-              payload.size,
-            ]
-          );
-        } else if (condition.type == ExprConditionType.AUTO) {
-          return this.t(
-            "survey_creator.question.evaluation.condition.auto_template",
-            [scope, _.join(payload.values, "、")]
-          );
-        }
-        return "";
-      }
-    },
-    getChineseLength(_str) {
-      _str = _.trim(_str);
-      let strLength = _str.length;
-      if (!strLength) {
-        return 0;
-      }
-      let chinese = _str.match(/[\u4e00-\u9fa5]/g);
-      return chinese ? chinese.length : 0;
-    },
-    initialDesc() {
-      let desc = "";
-      let ds = _.map(this.conditions, (c) => {
-        return this.getDesc(c);
-      });
-      desc = _.join(ds, "<br>");
-      this.desc = desc;
-      let strLength = desc.length;
-      let cLength = this.getChineseLength(desc.substring(0, SPLIT_LENGTH));
-      if (strLength > SPLIT_LENGTH) {
-        this.desc =
-          desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "...";
-      }
-      this.descTitle = desc;
-    },
-  },
-});
+        },
+        methods: {
+            getDesc(condition) {
+                let payload = condition.payload;
+                if (condition.type == ExprConditionType.SCORE) {
+                    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();
+                    let scope = _.join(
+                        _.map(numbers, (number) => {
+                            if (_.isArray(_.head(number))) {
+                                return _.join(
+                                    _.map(number, (e) => _.join(e, "-")),
+                                    ", "
+                                );
+                            }
+                            return _.join(number, "-");
+                        }),
+                        ", "
+                    );
+                    if (condition.type == ExprConditionType.ASSIGN) {
+                        return this.t(
+                            "survey_creator.question.evaluation.condition.assign_template",
+                            [
+                                scope,
+                                _.join(payload.values, "、"),
+                                _.unescape(payload.operator),
+                                payload.size,
+                            ]
+                        );
+                    } else if (condition.type == ExprConditionType.AUTO) {
+                        return this.t(
+                            "survey_creator.question.evaluation.condition.auto_template",
+                            [scope, _.join(payload.values, "、")]
+                        );
+                    }
+                    return "";
+                }
+            },
+            getChineseLength(_str) {
+                _str = _.trim(_str);
+                let strLength = _str.length;
+                if (!strLength) {
+                    return 0;
+                }
+                let chinese = _str.match(/[\u4e00-\u9fa5]/g);
+                return chinese ? chinese.length : 0;
+            },
+            initialDesc() {
+                let desc = "";
+                let ds = _.map(this.conditions, (c) => {
+                    return this.getDesc(c);
+                });
+                desc = _.join(ds, "<br>");
+                this.desc = desc;
+                let strLength = desc.length;
+                let cLength = this.getChineseLength(desc.substring(0, SPLIT_LENGTH));
+                if (strLength > SPLIT_LENGTH) {
+                    this.desc =
+                        desc.substring(0, SPLIT_LENGTH - _.ceil(cLength / 2)) + "...";
+                }
+                this.descTitle = desc;
+            },
+        },
+    });
 </script>

package/src/components/common/question/evaluation/star.vue

@@ -15,6 +15,14 @@
                 required: true
             }
         },
+        watch: {
+            item: {
+                handler(val) {
+                    this.getDesc();
+                },
+                deep: true
+            }
+        },
         methods: {
             getDesc() {
                 let max = this.item.range.max || null;

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

@@ -164,9 +164,9 @@ export default Vue.extend({
         }),
         (item) => item.index != this.itemIndex
       );
-      return _.filter(
-        _.flatMap(otherEvaluationItems, "conditions"),
-        (item) => item.type == ExprConditionType.SCORE
+      const conditions = _.flatMap(otherEvaluationItems, item=>_.get(item,"conditions",[]));
+      return _.filter(conditions,
+        (item) => _.get(item,"type") == ExprConditionType.SCORE
       );
     },
   },
@@ -184,6 +184,7 @@ export default Vue.extend({
         })
       );
     },
+    //todo 此功能暂未启用
     getUsableRanges() {
       let usedRange = _.map(this.otherConditions, (item) => {
         return [item.payload.minScore, item.payload.maxScore];

package/src/components/survey-creator.vue

@@ -194,7 +194,7 @@
             this.primaryLanguage = _.camelCase(this.currentSurvey.options.primaryLanguage);
 
             if (this.showQuestionWhenPageLoad) {
-              const question = _.findLast(this.currentSurvey?.questions, questions=> { return questions.type === this.showQuestionType})
+              const question = _.find(this.currentSurvey?.questions, questions=> { return questions.type === this.showQuestionType})
               if (_.isUndefined(question)) {
                 this.createQuestion(this.showQuestionType)
               } else {