From 61ac281134779ddac85f1618b2a9cadbeec1cdf0 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Fri, 17 May 2024 14:41:15 +0900
Subject: [PATCH] =?UTF-8?q?verName=E3=81=AE=E3=83=A9=E3=83=83=E3=83=94?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=83=BB=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7?=
 =?UTF-8?q?=E3=82=AF=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/main/NodeItem.vue   |  2 +-
 frontend/src/components/right/InputText.vue | 52 ++++++++++++++-------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/main/NodeItem.vue b/frontend/src/components/main/NodeItem.vue
index 6474a18..0e4cb8b 100644
--- a/frontend/src/components/main/NodeItem.vue
+++ b/frontend/src/components/main/NodeItem.vue
@@ -205,7 +205,7 @@ export default defineComponent({
      */
     const varName =(node:IActionNode)=>{
       const prop = node.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props.modelValue;
+      return prop?.props.modelValue.name;
     };
     const copyFlow=()=>{
       context.emit('copyFlow', props.actionNode);
diff --git a/frontend/src/components/right/InputText.vue b/frontend/src/components/right/InputText.vue
index a14e06d..b47a379 100644
--- a/frontend/src/components/right/InputText.vue
+++ b/frontend/src/components/right/InputText.vue
@@ -1,10 +1,7 @@
 <template>
   <div v-bind="$attrs">
-    <q-input :label="displayName" v-model="inputValue" label-color="primary"
-    :placeholder="placeholder" stack-label
-    :rules="rulesExp"
-    :maxlength="maxLength"
-    >
+    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label
+      :rules="rulesExp" :maxlength="maxLength">
       <template v-slot:append v-if="hint !== ''">
         <q-icon name="help" size="22px" color="blue-8">
           <q-tooltip class="bg-yellow-2 text-black shadow-4" anchor="bottom right">
@@ -18,7 +15,7 @@
 
 <script lang="ts">
 import { kMaxLength } from 'buffer';
-import { defineComponent, ref, watchEffect } from 'vue';
+import { defineComponent, ref, watchEffect, computed } from 'vue';
 
 export default defineComponent({
   name: 'InputText',
@@ -40,27 +37,50 @@ export default defineComponent({
       type: String,
       default: '',
     },
-    maxLength:{
+    maxLength: {
       type: Number,
-      default:undefined
+      default: undefined
     },
     //例：[val=>!!val ||'入力してください']
-    rules:{
-      type:String,
-      default:undefined
+    rules: {
+      type: String,
+      default: undefined
     },
     modelValue: {
-      type: String,
+      // type: Any,
       default: '',
     },
   },
 
   setup(props, { emit }) {
-    const inputValue = ref(props.modelValue);
-    const rulesExp = props.rules===undefined?null : eval(props.rules);
-    watchEffect(() => {
-      emit('update:modelValue', inputValue.value);
+    const inputValue = computed({
+      get: () => {
+        if (props.modelValue !== null && typeof props.modelValue === 'object' && 'name' in props.modelValue) {
+          return props.modelValue.name;
+        } else {
+          return props.modelValue;
+        }
+      },
+      set: (val) => {
+        if (props.name === 'verName') {
+          // return props.modelValue.name;
+          emit('update:modelValue', { name: val });
+        } else {
+          emit('update:modelValue', val);
+        }
+      },
     });
+    // const inputValue = ref(props.modelValue);
+    const rulesExp = props.rules === undefined ? null : eval(props.rules);
+
+    // const finalValue = computed(() => {
+    // return props.name !== 'verName' ? inputValue.value : {
+    // name: inputValue.value,
+    // };
+    // });
+    // watchEffect(() => {
+    //   emit('update:modelValue', finalValue);
+    // });
 
     return {
       inputValue,