@wg-npm/survey-creator 0.5.161 → 0.5.164

package/package.json

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

package/src/components/common/question-title-dynamic.vue

@@ -0,0 +1,55 @@
+<script lang="ts">
+import Vue, { CreateElement } from "vue";
+import { Input } from "view-design";
+import _ from "lodash";
+import { CUSTOM_INPUT_REG } from "@wg-npm/survey-core";
+
+export default Vue.component("question-title-dynamic", {
+  components: { Input },
+  props: {
+    splitedTitles: {
+      type: Array,
+      required: true,
+    },
+    customFilledTitle: {
+      type: Array,
+      required: false,
+    },
+  },
+  render(createElement: CreateElement) {
+
+    let childArr: Array<any> = [];
+    const self = this;
+
+    console.log(typeof Input);
+
+    _.forEach(this.splitedTitles, (title: string, index: number) => {
+
+      if(CUSTOM_INPUT_REG.test(title)) {
+        let corespondTitle = _.find(self.customFilledTitle, (title) => {
+          return title.index === index;
+        });
+        childArr.push(createElement(Input, {
+          domProps: {
+            value: corespondTitle.title
+          },
+          on: {
+            input: function (value) {
+              corespondTitle.title = value;
+            }
+          }
+        }));
+      } else {
+        childArr.push(title);
+      }
+    });
+    return createElement("div", { class: "content pl-sm"}, childArr);
+  }
+});
+</script>
+
+<style scoped lang="less">
+  /deep/ .ivu-input-wrapper {
+    width: auto;
+  }
+</style>

package/src/components/common/question-title.vue

@@ -4,35 +4,7 @@
     <span class="number pl-sm" v-if="question.header.number"
       >{{ question.header.number }}.</span
     >
-
-    <div
-      class="flex pl-sm"
-      v-for="(title, index) in getTitle(question)"
-      :key="index"
-    >
-      <span v-if="title !== ''" class="content">{{ title }}</span>
-      <div
-        v-for="customTitle in customFilledTitle"
-        :key="index + customTitle.index"
-      >
-        <Input
-          v-if="title === '' && index === customTitle.index"
-          v-model.trim="customTitle.title"
-        />
-
-        <div v-else>
-          <Input
-            class="pl-sm"
-            v-if="
-              getShowInput(index, getTitle(question)) &&
-              index === customTitle.index
-            "
-            v-model.trim="customTitle.title"
-          />
-        </div>
-      </div>
-    </div>
-
+    <question-title-dynamic v-if="question" :splitedTitles="getTitle(question)" :customFilledTitle="customFilledTitle"></question-title-dynamic>
     <span class="options-explain pl-sm title-score-related" v-if="haveMaxScore"
       >({{
         t(`survey_creator.question.max_score`, $rootComponent.currentLanguage)
@@ -90,15 +62,15 @@ import {
   BaseQuestionModel,
   formatTitle,
   QuestionType,
-  showInput,
 } from "@wg-npm/survey-core";
 import { Icon, Input } from "view-design";
 import LocaleMixin from "../../mixins/locale-mixin";
+import QuestionTitleDynamic from "./question-title-dynamic.vue";
 import _ from "lodash";
 
 export default Vue.extend({
   name: "question-title",
-  components: { Icon, Input },
+  components: { Icon, Input, QuestionTitleDynamic },
   mixins: [LocaleMixin],
   inject: ["$rootComponent"],
   props: {
@@ -140,12 +112,9 @@ export default Vue.extend({
     },
   },
   methods: {
-    getShowInput(index, formatTitle) {
-      return showInput(index, formatTitle);
-    },
     getTitle(question) {
       return formatTitle(question, Vue.$surveyLanguage);
-    },
+    }
   },
 });
 </script>

package/src/components/editor/question-default-layout.vue

@@ -32,8 +32,8 @@ import {
   BaseQuestionModel,
   QuestionType,
   SurveyModel,
-  showInput,
   formatTitle,
+  CUSTOM_INPUT_REG,
 } from "@wg-npm/survey-core";
 import QuestionTitle from "../common/question-title.vue";
 import EditQuestionToolbar from "./editor-question-toolbar.vue";
@@ -58,10 +58,7 @@ export default Vue.extend({
     customQuestion() {
       let input_titles: any = [];
       _.each(formatTitle(this.question, Vue.$surveyLanguage), (t, index) => {
-        if (
-          t === "" ||
-          showInput(index, formatTitle(this.question, Vue.$surveyLanguage))
-        ) {
+        if (CUSTOM_INPUT_REG.test(t)) {
           let title = {
             title: "",
             index: index,

package/src/components/survey-previewer.vue

@@ -33,10 +33,9 @@ import Toolbar from "./toolbar/toolbar.vue";
 import SurveyInternalPreviewer from "./previewer/survey-internal-previewer.vue";
 import LocaleMixin from "../mixins/locale-mixin";
 import {
-  BaseQuestionModel,
   SurveyModel,
   formatTitle,
-  showInput,
+  CUSTOM_INPUT_REG,
 } from "@wg-npm/survey-core";
 import { SurveyPreviewerOptions } from "../../types/survey-previewer";
 
@@ -104,7 +103,7 @@ export default Vue.extend({
           let input_titles: any = [];
           let formatTitleStr = formatTitle(q, Vue.$surveyLanguage);
           _.each(formatTitleStr, (t, index) => {
-            if (t === "" || showInput(index, formatTitleStr)) {
+            if (CUSTOM_INPUT_REG.test(t)) {
               let title = {
                 title: "",
                 index: index,