@wg-npm/survey-creator 0.3.4143 → 0.3.4169

package/dist/survey-creator.esm.js

@@ -3281,11 +3281,11 @@ 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',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")]),_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')},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":2}},[_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',{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":{
+      }}},[_c('Select',{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":2}},[_c('FormItem',{attrs:{"prop":("evaluationItems[" + _vm.itemIndex + "].conditions[" + _vm.index + "].payload.rightOperator"),"rules":{
         required: true,
         trigger: 'change',
         message: _vm.t('survey_creator.question.notEmpty'),
@@ -3294,17 +3294,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),_vm._v(" "),_c('Col',{staticClass:"label",attrs:{"span":1}},[_vm._v("\n    "+_vm._s(_vm.t("survey_creator.question.scores"))+"\n  ")])],1)};
+      }}},[_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_staticRenderFns__$d = [];
 
   /* style */
   const __vue_inject_styles__$d = function (inject) {
     if (!inject) return
-    inject("data-v-20053a8c_0", { source: ".label[data-v-20053a8c]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
+    inject("data-v-67c4e4b6_0", { source: ".label[data-v-67c4e4b6]{text-align:right;margin-bottom:24px}", map: undefined, media: undefined });
 
   };
   /* scoped */
-  const __vue_scope_id__$d = "data-v-20053a8c";
+  const __vue_scope_id__$d = "data-v-67c4e4b6";
   /* module identifier */
   const __vue_module_identifier__$d = undefined;
   /* functional template */
@@ -3854,6 +3854,7 @@ var script$7 = Vue.extend({
         },
         cancel() {
             this.closeDrawer();
+            this.$emit("cancel");
         }
     }
 });
@@ -3868,7 +3869,7 @@ var __vue_staticRenderFns__$7 = [function () {var _vm=this;var _h=_vm.$createEle
   /* style */
   const __vue_inject_styles__$7 = function (inject) {
     if (!inject) return
-    inject("data-v-7b8bc506_0", { source: ".drawer-footer{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff;z-index:99}.question-form{margin-bottom:53px}", map: undefined, media: undefined });
+    inject("data-v-80ded99c_0", { source: ".drawer-footer{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff;z-index:99}.question-form{margin-bottom:53px}", map: undefined, media: undefined });
 
   };
   /* scoped */
@@ -4324,6 +4325,16 @@ var script$1 = Vue.extend({
         options: {
             type: Object,
             required: true
+        },
+        showQuestionWhenPageLoad: {
+            type: Boolean,
+            required: false,
+            default: false
+        },
+        showQuestionType: {
+            type: String,
+            required: false,
+            default: "EVALUATION"
         }
     },
     data: function () {
@@ -4355,6 +4366,15 @@ var script$1 = Vue.extend({
             this.currentSurvey.questions[0].active = true;
         }
         this.primaryLanguage = _.camelCase(this.currentSurvey.options.primaryLanguage);
+        if (this.showQuestionWhenPageLoad) {
+            const question = _.findLast(this.currentSurvey?.questions, questions => { return questions.type === this.showQuestionType; });
+            if (_.isUndefined(question)) {
+                this.createQuestion(this.showQuestionType);
+            }
+            else {
+                this.showQuestionEditDrawer(question);
+            }
+        }
     },
     computed: {
         isEditMode() {
@@ -4393,12 +4413,14 @@ var script$1 = Vue.extend({
                 this.$emit("on-save", JSON.stringify(this.getPureSurvey(this.currentSurvey)));
                 return;
             }
-            Modal.confirm({
-                title: this.t("survey_creator.message.surveyLocaleNoSettingCompleted"),
-                onOk: () => {
-                    this.$emit("on-save", JSON.stringify(this.getPureSurvey(this.currentSurvey)));
-                }
-            });
+            if (!this.showQuestionWhenPageLoad) {
+                Modal.confirm({
+                    title: this.t("survey_creator.message.surveyLocaleNoSettingCompleted"),
+                    onOk: () => {
+                        this.$emit("on-save", JSON.stringify(this.getPureSurvey(this.currentSurvey)));
+                    }
+                });
+            }
         },
         getPureSurvey(survey) {
             let temp = _.cloneDeep(survey);
@@ -4456,6 +4478,9 @@ var script$1 = Vue.extend({
             }
             BaseQuestionModel.refreshSurvey(this.currentSurvey);
             BaseQuestionModel.setActiveQuestion(newQuestion, this.currentSurvey.questions);
+            if (this.showQuestionWhenPageLoad) {
+                this.onSave();
+            }
         },
         onQuestionDelete(id) {
             _.remove(this.currentSurvey.questions, function (question) {
@@ -4478,6 +4503,9 @@ var script$1 = Vue.extend({
         },
         validateData() {
             return this.allTranslationIsCompleted(this.currentSurvey);
+        },
+        cancel() {
+            this.$emit("cancel");
         }
     }
 });
@@ -4486,7 +4514,7 @@ var script$1 = Vue.extend({
 const __vue_script__$1 = script$1;
 
 /* template */
-var __vue_render__$1 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"survey-creator-wrapper"},[_c('Card',{attrs:{"shadow":""}},[_c('Row',{attrs:{"align":"middle","justify":"space-between","type":"flex"}},[_c('Col',{attrs:{"span":"20"}},[_c('Icon',{staticClass:"icon-clipboard",attrs:{"custom":"i-icon icon-clipboard","size":"24"}}),_vm._v(" "),_c('span',{staticClass:"title"},[_vm._v("\n        "+_vm._s(_vm._f("translate")(_vm.survey.name.text,true))+"\n      ")])],1),_vm._v(" "),_c('Col',[_c('Button',{attrs:{"icon":"ios-arrow-back"},on:{"click":_vm.onBack}},[_vm._v(_vm._s(_vm.t('survey_creator.common.back')))])],1)],1)],1),_vm._v(" "),(_vm.isPreviewMode)?_c('survey-internal-previewer',{staticStyle:{"min-height":"calc(100vh - 128px)"},attrs:{"options":this.options,"survey":this.currentSurvey,"operation-type":_vm.questionOperationType}}):_c('Card',{staticStyle:{"min-height":"calc(100vh - 128px)"},attrs:{"shadow":""}},[_c('Tabs',{attrs:{"type":"card"},model:{value:(_vm.activeTab),callback:function ($$v) {_vm.activeTab=$$v;},expression:"activeTab"}},[_c('TabPane',{attrs:{"label":_vm.t('survey_creator.common.tab.question_setting'),"name":"EDIT"}},[(_vm.activeTab == 'EDIT')?_c('div',[_c('Row',{staticClass:"survey-operate",attrs:{"type":"flex","justify":"space-between","align":"middle","gutter":48}},[_c('Col',[_c('create-question-dropdown')],1),_vm._v(" "),_c('Col',[_c('edit-options',{staticClass:"edit-option",attrs:{"survey":this.currentSurvey}})],1)],1),_vm._v(" "),_c('Scroll',{staticClass:"question-content",attrs:{"height":_vm.height}},[_c('survey-editor',{attrs:{"options":this.options,"survey":this.currentSurvey}})],1)],1):_vm._e()]),_vm._v(" "),_c('TabPane',{attrs:{"label":_vm.t('survey_creator.common.tab.language'),"name":"TRANSLATE"}},[(_vm.activeTab == 'TRANSLATE')?_c('survey-translator',{attrs:{"options":this.options,"survey":this.currentSurvey}}):_vm._e()],1)],1)],1),_vm._v(" "),_c('question-edit-drawer',{ref:"editDrawer",attrs:{"question":_vm.editingQuestion,"operation-type":_vm.operationType},model:{value:(_vm.questionEditDrawerVisible),callback:function ($$v) {_vm.questionEditDrawerVisible=$$v;},expression:"questionEditDrawerVisible"}}),_vm._v(" "),_c('Card',{attrs:{"shadow":""}},[_c('Row',{attrs:{"gutter":30,"align":"middle","justify":"center","type":"flex"}},[_c('Col',[_c('Button',{attrs:{"loading":_vm.loading,"type":"primary","disabled":_vm.isSaved},on:{"click":_vm.onSave}},[_vm._v(_vm._s(_vm.t("survey_creator.common.save"))+"\n                ")])],1)],1)],1)],1)};
+var __vue_render__$1 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.showQuestionWhenPageLoad)?_c('div',[_c('question-edit-drawer',{ref:"editDrawer",attrs:{"question":_vm.editingQuestion,"operation-type":_vm.operationType},on:{"cancel":_vm.cancel},model:{value:(_vm.questionEditDrawerVisible),callback:function ($$v) {_vm.questionEditDrawerVisible=$$v;},expression:"questionEditDrawerVisible"}})],1):_c('div',{staticClass:"survey-creator-wrapper"},[_c('Card',{attrs:{"shadow":""}},[_c('Row',{attrs:{"align":"middle","justify":"space-between","type":"flex"}},[_c('Col',{attrs:{"span":"20"}},[_c('Icon',{staticClass:"icon-clipboard",attrs:{"custom":"i-icon icon-clipboard","size":"24"}}),_vm._v(" "),_c('span',{staticClass:"title"},[_vm._v("\n        "+_vm._s(_vm._f("translate")(_vm.survey.name.text,true))+"\n      ")])],1),_vm._v(" "),_c('Col',[_c('Button',{attrs:{"icon":"ios-arrow-back"},on:{"click":_vm.onBack}},[_vm._v(_vm._s(_vm.t('survey_creator.common.back')))])],1)],1)],1),_vm._v(" "),(_vm.isPreviewMode)?_c('survey-internal-previewer',{staticStyle:{"min-height":"calc(100vh - 128px)"},attrs:{"options":this.options,"survey":this.currentSurvey,"operation-type":_vm.operationType}}):_c('Card',{staticStyle:{"min-height":"calc(100vh - 128px)"},attrs:{"shadow":""}},[_c('Tabs',{attrs:{"type":"card"},model:{value:(_vm.activeTab),callback:function ($$v) {_vm.activeTab=$$v;},expression:"activeTab"}},[_c('TabPane',{attrs:{"label":_vm.t('survey_creator.common.tab.question_setting'),"name":"EDIT"}},[(_vm.activeTab == 'EDIT')?_c('div',[_c('Row',{staticClass:"survey-operate",attrs:{"type":"flex","justify":"space-between","align":"middle","gutter":48}},[_c('Col',[_c('create-question-dropdown')],1),_vm._v(" "),_c('Col',[_c('edit-options',{staticClass:"edit-option",attrs:{"survey":this.currentSurvey}})],1)],1),_vm._v(" "),_c('Scroll',{staticClass:"question-content",attrs:{"height":_vm.height}},[_c('survey-editor',{attrs:{"options":this.options,"survey":this.currentSurvey}})],1)],1):_vm._e()]),_vm._v(" "),_c('TabPane',{attrs:{"label":_vm.t('survey_creator.common.tab.language'),"name":"TRANSLATE"}},[(_vm.activeTab == 'TRANSLATE')?_c('survey-translator',{attrs:{"options":this.options,"survey":this.currentSurvey}}):_vm._e()],1)],1)],1),_vm._v(" "),_c('question-edit-drawer',{ref:"editDrawer",attrs:{"question":_vm.editingQuestion,"operation-type":_vm.operationType},model:{value:(_vm.questionEditDrawerVisible),callback:function ($$v) {_vm.questionEditDrawerVisible=$$v;},expression:"questionEditDrawerVisible"}}),_vm._v(" "),_c('Card',{attrs:{"shadow":""}},[_c('Row',{attrs:{"gutter":30,"align":"middle","justify":"center","type":"flex"}},[_c('Col',[_c('Button',{attrs:{"loading":_vm.loading,"type":"primary","disabled":_vm.isSaved},on:{"click":_vm.onSave}},[_vm._v(_vm._s(_vm.t("survey_creator.common.save"))+"\n                ")])],1)],1)],1)],1)])};
 var __vue_staticRenderFns__$1 = [];
 
   /* style */
@@ -4526,7 +4554,7 @@ var script = Vue.extend({
     components: { Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer },
     provide() {
         return {
-            $rootComponent: this.$rootComponent
+            $rootComponent: this
         };
     },
     props: {

package/package.json

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

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

@@ -30,10 +30,7 @@
         </Select>
       </FormItem>
     </Col>
-    <Col class="label" :span="1">
-      {{ t("survey_creator.question.scores") }}
-    </Col>
-    <Col :span="3">
+    <Col :span="2">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.leftOperator`"
         :rules="{
@@ -61,7 +58,7 @@
     <Col class="label">
       {{ t("survey_creator.question.totalScores") }}
     </Col>
-    <Col :span="3">
+    <Col :span="2">
       <FormItem
         :prop="`evaluationItems[${itemIndex}].conditions[${index}].payload.rightOperator`"
         :rules="{
@@ -111,9 +108,6 @@
         </Select>
       </FormItem>
     </Col>
-    <Col class="label" :span="1">
-      {{ t("survey_creator.question.scores") }}
-    </Col>
   </Row>
 </template>
 <script lang="ts">

package/src/components/editor/question-edit-drawer.vue

@@ -126,6 +126,7 @@ export default Vue.extend({
     },
     cancel() {
       this.closeDrawer();
+      this.$emit("cancel")
     }
   }
 });

package/src/components/survey-creator.vue

@@ -1,5 +1,15 @@
 <template>
-    <div class="survey-creator-wrapper">
+    <div>
+      <div v-if="showQuestionWhenPageLoad">
+        <question-edit-drawer
+            :question="editingQuestion"
+            ref="editDrawer"
+            v-model="questionEditDrawerVisible"
+            :operation-type="operationType"
+            @cancel="cancel"
+        />
+      </div>
+      <div class="survey-creator-wrapper" v-else>
         <Card shadow>
             <Row align="middle" justify="space-between" type="flex">
                 <Col span="20">
@@ -19,7 +29,7 @@
                 :options="this.options"
                 :survey="this.currentSurvey"
                 v-if="isPreviewMode"
-                :operation-type="questionOperationType"
+                :operation-type="operationType"
         ></survey-internal-previewer>
 
         <Card shadow v-else style="min-height: calc(100vh - 128px);">
@@ -69,6 +79,7 @@
                 </Col>
             </Row>
         </Card>
+      </div>
     </div>
 </template>
 <script lang="ts">
@@ -136,6 +147,16 @@
             options: {
                 type: Object as () => SurveyCreatorOptions,
                 required: true
+            },
+            showQuestionWhenPageLoad: {
+               type: Boolean,
+               required: false,
+               default: false
+            },
+            showQuestionType: {
+              type: String,
+              required: false,
+              default: QuestionType.EVALUATION
             }
         },
         data: function () {
@@ -170,6 +191,15 @@
                 this.currentSurvey.questions[0].active = true;
             }
             this.primaryLanguage = _.camelCase(this.currentSurvey.options.primaryLanguage);
+
+            if (this.showQuestionWhenPageLoad) {
+              const question = _.findLast(this.currentSurvey?.questions, questions=> { return questions.type === this.showQuestionType})
+              if (_.isUndefined(question)) {
+                this.createQuestion(this.showQuestionType)
+              } else {
+                this.showQuestionEditDrawer(<BaseQuestionModel>question)
+              }
+            }
         },
         computed: {
             isEditMode() {
@@ -211,16 +241,19 @@
                     );
                     return;
                 }
-                // @ts-ignore
-                Modal.confirm({
+
+                if (!this.showQuestionWhenPageLoad) {
+                  // @ts-ignore
+                  Modal.confirm({
                     title: this.t("survey_creator.message.surveyLocaleNoSettingCompleted"),
                     onOk: () => {
-                        this.$emit(
-                            "on-save",
-                            JSON.stringify(this.getPureSurvey(this.currentSurvey))
-                        );
+                      this.$emit(
+                          "on-save",
+                          JSON.stringify(this.getPureSurvey(this.currentSurvey))
+                      );
                     }
-                });
+                  });
+                }
             },
             getPureSurvey(survey) {
                 let temp = _.cloneDeep(survey);
@@ -292,6 +325,10 @@
                     newQuestion,
                     this.currentSurvey.questions
                 );
+
+                if (this.showQuestionWhenPageLoad) {
+                  this.onSave()
+                }
             },
             onQuestionDelete(id) {
                 _.remove(this.currentSurvey.questions, function (
@@ -318,6 +355,9 @@
             },
             validateData() {
                 return this.allTranslationIsCompleted(this.currentSurvey);
+            },
+            cancel() {
+              this.$emit("cancel")
             }
         }
     });

package/src/components/survey-previewer.vue

@@ -36,7 +36,7 @@
         components: {Card, Row, Col, Button, Toolbar, SurveyInternalPreviewer},
         provide() {
             return {
-                $rootComponent: this.$rootComponent
+                $rootComponent: this
             };
         },
         props: {