@wg-npm/survey-response 1.78.511900 → 1.78.511938

package/dist/survey-response.esm.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import _ from 'lodash';
-import { Row, Input as Input$1, Icon, FormItem, CheckboxGroup, Checkbox, Col, RadioGroup, Radio, Tooltip as Tooltip$1, Card, Slider, InputNumber, Form, Message } from 'view-design';
+import { Row, Input as Input$1, Icon, FormItem, CheckboxGroup, Checkbox, Col, RadioGroup, Radio, InputNumber, Tooltip as Tooltip$1, Card, Slider, Form, Message } from 'view-design';
 import { CUSTOM_INPUT_REG, formatTitle, translate } from '@wg-npm/survey-core';
 import deepmerge from 'deepmerge';
 
@@ -3022,7 +3022,7 @@ function setCacheAdd(value) {
  * @name has
  * @memberOf SetCache
  * @param {*} value The value to search for.
- * @returns {boolean} Returns `true` if `value` is found, else `false`.
+ * @returns {number} Returns `true` if `value` is found, else `false`.
  */
 function setCacheHas(value) {
   return this.__data__.has(value);
@@ -16360,6 +16360,8 @@ var defaultLang = {
             noQuestion: "还未添加题目！",
             input_text_limit: "输入项字数不少于{0}字",
             choice_required: "此项必填",
+            matrix_title_score: "分数",
+            matrix_title_score_range_tip: "请输入{0}到{1}之间的分值",
         },
     },
 };
@@ -17133,7 +17135,7 @@ var __vue_staticRenderFns__$5 = [];
 
 var script$7 = Vue.extend({
     name: "matrix",
-    mixins: [OptionLayoutMixin],
+    mixins: [OptionLayoutMixin, LocaleMixin],
     inject: ["responseStatus", "$rootComponent"],
     components: {
         FormItem,
@@ -17141,6 +17143,7 @@ var script$7 = Vue.extend({
         Radio,
         Row,
         Col,
+        InputNumber,
     },
     props: {
         question: {
@@ -17171,6 +17174,25 @@ var script$7 = Vue.extend({
             this.initData();
         },
     },
+    computed: {
+        isTitleScoringEnabled() {
+            return !!_.get(this.question, "options.titleScoringEnabled", false);
+        },
+        isTitleRequired() {
+            return !!_.get(this.question, "options.required", false);
+        },
+        isSubRequired() {
+            const opts = this.question.options;
+            return opts.subRequired !== undefined
+                ? !!opts.subRequired
+                : !!opts.required;
+        },
+        answerTitleProp() {
+            return this.isMoreSurvey
+                ? `moreSurveyAnswers[${this.surveyIndex}].answers[${this.index}].titleScore`
+                : `answers[${this.index}].titleScore`;
+        },
+    },
     methods: {
         answerProp(subIndex) {
             return this.isMoreSurvey
@@ -17178,6 +17200,9 @@ var script$7 = Vue.extend({
                 : `answers[${this.index}].answer[${subIndex}].answer`;
         },
         initData() {
+            if (this.isTitleScoringEnabled && this.value.titleScore === undefined) {
+                this.$set(this.value, "titleScore", null);
+            }
             let subAnswers = {};
             _.each(this.value.answer, (data) => {
                 _.set(subAnswers, data.questionId, data);
@@ -17196,8 +17221,30 @@ var script$7 = Vue.extend({
                 this.value.answer.push(_answer);
             });
         },
+        validateTitleScore(rule, value, callback) {
+            if (value === null || value === undefined) {
+                callback();
+                return;
+            }
+            const min = this.question.options.scoreMin;
+            const max = this.question.options.scoreMax;
+            if (min !== null && min !== undefined && value < min) {
+                const tip = this.t("survey_response.question.matrix_title_score_range_tip");
+                callback(new Error(tip.replace("{0}", min).replace("{1}", max)));
+                return;
+            }
+            if (max !== null && max !== undefined && value > max) {
+                const tip = this.t("survey_response.question.matrix_title_score_range_tip");
+                callback(new Error(tip.replace("{0}", min).replace("{1}", max)));
+                return;
+            }
+            callback();
+        },
         selChange() {
             let score = 0;
+            if (this.isTitleScoringEnabled && this.value.titleScore != null) {
+                score += parseFloat(this.value.titleScore) || 0;
+            }
             _.each(this.value.answer, (sub_answer, index) => {
                 _.each(this.question.choices, (choice) => {
                     if (choice.id == sub_answer.answer) {
@@ -17214,6 +17261,7 @@ var script$7 = Vue.extend({
                 this.value.answer[subIndex].answer = _.isEmpty(subAnswer)
                     ? subValue
                     : subAnswer;
+                this.selChange();
             }
         },
     },
@@ -17223,26 +17271,33 @@ var script$7 = Vue.extend({
 const __vue_script__$7 = script$7;
 
 /* template */
-var __vue_render__$6 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',_vm._l((_vm.question.subQuestions),function(subQuestion,subIndex){return _c('div',{key:subIndex,staticClass:"sub-question"},[_c('span',{staticClass:"number"},[_vm._v("\n      "+_vm._s(_vm.question.header.number)+"-"+_vm._s(subQuestion.number)+".")]),_vm._v(" "),_c('span',{staticClass:"title"},[_vm._v(" "+_vm._s(_vm.i18nText(subQuestion.text))+" ")]),_vm._v(" "),_c('FormItem',{attrs:{"prop":_vm.answerProp(subIndex),"rules":{
-        required: _vm.question.options.required && !_vm.question.options.disabled,
+var __vue_render__$6 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.isTitleScoringEnabled)?_c('div',{staticClass:"title-score-section"},[_c('FormItem',{attrs:{"prop":_vm.answerTitleProp,"rules":[
+        {
+          required: _vm.isTitleRequired && !_vm.question.options.disabled,
+          message: _vm.t('survey_response.question.question_required'),
+        },
+        { validator: _vm.validateTitleScore } ]}},[_c('div',{staticClass:"title-score-input-row"},[_c('span',{staticClass:"title-score-label"},[_vm._v(_vm._s(_vm.t('survey_response.question.matrix_title_score'))+"：")]),_vm._v(" "),_c('InputNumber',{attrs:{"min":_vm.question.options.scoreMin != null ? _vm.question.options.scoreMin : 0,"max":_vm.question.options.scoreMax != null ? _vm.question.options.scoreMax : (_vm.question.options.score || 100),"disabled":_vm.question.options.disabled},on:{"on-change":_vm.selChange},model:{value:(_vm.value.titleScore),callback:function ($$v) {_vm.$set(_vm.value, "titleScore", $$v);},expression:"value.titleScore"}})],1)])],1):_vm._e(),_vm._v(" "),_vm._l((_vm.question.subQuestions),function(subQuestion,subIndex){return _c('div',{key:subIndex,staticClass:"sub-question"},[(_vm.isSubRequired)?_c('label',{staticClass:"require-label"},[_vm._v("*")]):_vm._e(),_vm._v(" "),_c('span',{staticClass:"number"},[_vm._v("\n      "+_vm._s(_vm.question.header.number)+"-"+_vm._s(subQuestion.number)+".")]),_vm._v(" "),_c('span',{staticClass:"title"},[_vm._v(" "+_vm._s(_vm.i18nText(subQuestion.text))+" ")]),_vm._v(" "),_c('FormItem',{attrs:{"prop":_vm.answerProp(subIndex),"rules":{
+        required: _vm.isSubRequired && !_vm.question.options.disabled,
         message: _vm.t('survey_response.question.question_required'),
       }}},[_c('RadioGroup',{on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer[subIndex].answer),callback:function ($$v) {_vm.$set(_vm.value.answer[subIndex], "answer", $$v);},expression:"value.answer[subIndex].answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout},[_c('Radio',{key:choice.id,attrs:{"label":choice.id,"disabled":subQuestion.options.readonly || _vm.question.options.disabled},nativeOn:{"click":function($event){return _vm.toggleAnswer(
                   choice.id,
                   subIndex,
                   subQuestion.options.readonly || _vm.question.options.disabled
-                )}}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)],1)}),0)};
+                )}}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)],1)})],2)};
 var __vue_staticRenderFns__$6 = [];
 
   /* style */
-  const __vue_inject_styles__$7 = undefined;
+  const __vue_inject_styles__$7 = function (inject) {
+    if (!inject) return
+    inject("data-v-02dfeb56_0", { source: ".require-label[data-v-02dfeb56]{color:#ed4014}.title-score-section[data-v-02dfeb56]{margin-bottom:12px}.title-score-section .title-score-input-row[data-v-02dfeb56]{display:flex;align-items:center;gap:8px}.title-score-section .title-score-input-row .title-score-label[data-v-02dfeb56]{font-size:14px;color:#515a6e;white-space:nowrap}", map: undefined, media: undefined });
+
+  };
   /* scoped */
-  const __vue_scope_id__$7 = undefined;
+  const __vue_scope_id__$7 = "data-v-02dfeb56";
   /* module identifier */
   const __vue_module_identifier__$7 = undefined;
   /* functional template */
   const __vue_is_functional_template__$7 = false;
-  /* style inject */
-  
   /* style inject SSR */
   
   /* style inject shadow dom */
@@ -17257,7 +17312,7 @@ var __vue_staticRenderFns__$6 = [];
     __vue_is_functional_template__$7,
     __vue_module_identifier__$7,
     false,
-    undefined,
+    createInjector,
     undefined,
     undefined
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-response",
-  "version": "1.78.511900",
+  "version": "1.78.511938",
   "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.511900",
-    "@wg-npm/survey-service-api": "1.78.511900",
+    "@wg-npm/survey-core": "1.78.511938",
+    "@wg-npm/survey-service-api": "1.78.511938",
     "axios": "^0.19.2",
     "deepmerge": "^4.2.2",
     "lodash": "^4.17.15",
@@ -34,8 +34,8 @@
     "@typescript-eslint/parser": "^3.6.0",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@wg-npm/survey-core": "1.78.511900",
-    "@wg-npm/survey-service-api": "1.78.511900",
+    "@wg-npm/survey-core": "1.78.511938",
+    "@wg-npm/survey-service-api": "1.78.511938",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "51b5c6a6eff6f9ff420a037e671ffb4fe3bf3ed2",
+  "gitHead": "ad10a00e012ea9db36e51202b7a24265681d8630",
   "rollup": {
     "external": [
       "vue",

package/src/components/question/type/matrix.vue

@@ -1,10 +1,36 @@
 <template>
   <div>
+    <!-- Main title score input (when titleScoringEnabled) -->
+    <div v-if="isTitleScoringEnabled" class="title-score-section">
+      <FormItem
+        :prop="answerTitleProp"
+        :rules="[
+          {
+            required: isTitleRequired && !question.options.disabled,
+            message: t('survey_response.question.question_required'),
+          },
+          { validator: validateTitleScore },
+        ]"
+      >
+        <div class="title-score-input-row">
+          <span class="title-score-label">{{ t('survey_response.question.matrix_title_score') }}：</span>
+          <InputNumber
+            v-model="value.titleScore"
+            :min="question.options.scoreMin != null ? question.options.scoreMin : 0"
+            :max="question.options.scoreMax != null ? question.options.scoreMax : (question.options.score || 100)"
+            :disabled="question.options.disabled"
+            @on-change="selChange"
+          />
+        </div>
+      </FormItem>
+    </div>
+
     <div
       v-for="(subQuestion, subIndex) in question.subQuestions"
       :key="subIndex"
       class="sub-question"
     >
+      <label v-if="isSubRequired" class="require-label">*</label>
       <span class="number">
         {{ question.header.number }}-{{ subQuestion.number }}.</span
       >
@@ -12,7 +38,7 @@
       <FormItem
         :prop="answerProp(subIndex)"
         :rules="{
-          required: question.options.required && !question.options.disabled,
+          required: isSubRequired && !question.options.disabled,
           message: t('survey_response.question.question_required'),
         }"
       >
@@ -54,11 +80,12 @@
 import Vue from "vue";
 import _ from "lodash";
 import OptionLayoutMixin from "../../../mixins/option-layout-mixin";
-import { FormItem, RadioGroup, Radio, Row, Col } from "view-design";
+import LocaleMixin from "../../../mixins/locale-mixin";
+import { FormItem, RadioGroup, Radio, Row, Col, InputNumber } from "view-design";
 
 export default Vue.extend({
   name: "matrix",
-  mixins: [OptionLayoutMixin],
+  mixins: [OptionLayoutMixin, LocaleMixin],
   inject: ["responseStatus", "$rootComponent"],
 
   components: {
@@ -67,6 +94,7 @@ export default Vue.extend({
     Radio,
     Row,
     Col,
+    InputNumber,
   },
   props: {
     question: {
@@ -97,6 +125,28 @@ export default Vue.extend({
       this.initData();
     },
   },
+  computed: {
+    isTitleScoringEnabled() {
+      // @ts-ignore
+      return !!_.get(this.question, "options.titleScoringEnabled", false);
+    },
+    isTitleRequired() {
+      // @ts-ignore
+      return !!_.get(this.question, "options.required", false);
+    },
+    isSubRequired() {
+      const opts = this.question.options;
+      // subRequired is the new field; fall back to required for backward compat
+      return opts.subRequired !== undefined
+        ? !!opts.subRequired
+        : !!opts.required;
+    },
+    answerTitleProp() {
+      return this.isMoreSurvey
+        ? `moreSurveyAnswers[${this.surveyIndex}].answers[${this.index}].titleScore`
+        : `answers[${this.index}].titleScore`;
+    },
+  },
   methods: {
     answerProp(subIndex) {
       return this.isMoreSurvey
@@ -104,6 +154,11 @@ export default Vue.extend({
         : `answers[${this.index}].answer[${subIndex}].answer`;
     },
     initData() {
+      // Init main title score field
+      if (this.isTitleScoringEnabled && this.value.titleScore === undefined) {
+        this.$set(this.value, "titleScore", null);
+      }
+
       let subAnswers = {};
       // @ts-ignore
       _.each(this.value.answer, (data) => {
@@ -128,8 +183,33 @@ export default Vue.extend({
         this.value.answer.push(_answer);
       });
     },
+    validateTitleScore(rule, value, callback) {
+      if (value === null || value === undefined) {
+        callback();
+        return;
+      }
+      const min = this.question.options.scoreMin;
+      const max = this.question.options.scoreMax;
+      if (min !== null && min !== undefined && value < min) {
+        const tip = this.t("survey_response.question.matrix_title_score_range_tip");
+        callback(new Error(tip.replace("{0}", min).replace("{1}", max)));
+        return;
+      }
+      if (max !== null && max !== undefined && value > max) {
+        const tip = this.t("survey_response.question.matrix_title_score_range_tip");
+        callback(new Error(tip.replace("{0}", min).replace("{1}", max)));
+        return;
+      }
+      callback();
+    },
+
     selChange() {
       let score = 0;
+      // Add main title score
+      if (this.isTitleScoringEnabled && this.value.titleScore != null) {
+        score += parseFloat(this.value.titleScore) || 0;
+      }
+      // Add sub-question choice scores
       // @ts-ignore
       _.each(this.value.answer, (sub_answer, index) => {
         // @ts-ignore
@@ -150,8 +230,31 @@ export default Vue.extend({
         this.value.answer[subIndex].answer = _.isEmpty(subAnswer)
           ? subValue
           : subAnswer;
+        this.selChange();
       }
     },
   },
 });
 </script>
+
+<style scoped lang="less">
+.require-label {
+  color: #ed4014;
+}
+
+.title-score-section {
+  margin-bottom: 12px;
+
+  .title-score-input-row {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .title-score-label {
+      font-size: 14px;
+      color: #515a6e;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

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

@@ -28,6 +28,8 @@ export default {
       input_text_limit:
         "The number of characters in the entry should not be less than{0}",
       choice_required: "This item is required",
+      matrix_title_score: "Score",
+      matrix_title_score_range_tip: "Please enter a value between {0} and {1}",
     },
   },
 };

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

@@ -26,6 +26,8 @@ export default {
       noQuestion: "还未添加题目！",
       input_text_limit: "输入项字数不少于{0}字",
       choice_required: "此项必填",
+      matrix_title_score: "分数",
+      matrix_title_score_range_tip: "请输入{0}到{1}之间的分值",
     },
   },
 };