From c426bbf79321e0b6c771806b5393ce5e875ac1d6 Mon Sep 17 00:00:00 2001
From: "maxiaozhe@alicorns.co.jp" <maxiaozhe@alicorns.co.jp>
Date: Thu, 9 May 2024 10:49:05 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20numInput=E5=B1=9E=E6=80=A7UI=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20inputText,numInput=E3=81=ABrules=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=81=E5=85=A5=E5=8A=9B=E3=83=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E8=A8=AD=E5=AE=9A=E5=8F=AF=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/right/AppFieldSelect.vue   |   4 +-
 frontend/src/components/right/ColorPicker.vue |  20 +-
 .../src/components/right/ConditionInput.vue   |  31 +--
 frontend/src/components/right/DatePicker.vue  |  30 +--
 frontend/src/components/right/EventSetter.vue |  13 +-
 frontend/src/components/right/FieldInput.vue  | 159 ++++++------
 frontend/src/components/right/InputText.vue   |  52 ++--
 .../src/components/right/MuiltInputText.vue   |  14 +-
 frontend/src/components/right/NumInput.vue    |  51 +++-
 .../src/components/right/PropertyList.vue     |   2 +-
 frontend/src/components/right/SelectBox.vue   |   3 +
 sample.json                                   | 232 +++++-------------
 sample2.json                                  |  60 +++--
 13 files changed, 335 insertions(+), 336 deletions(-)

diff --git a/frontend/src/components/right/AppFieldSelect.vue b/frontend/src/components/right/AppFieldSelect.vue
index fe49486..3c16c73 100644
--- a/frontend/src/components/right/AppFieldSelect.vue
+++ b/frontend/src/components/right/AppFieldSelect.vue
@@ -1,6 +1,5 @@
 <template>
-
-    <div class="q-my-md">
+    <div class="q-my-md" v-bind="$attrs">
         <q-card flat>
             <q-card-section class="q-pa-none q-my-sm q-mr-md">
                 <!-- <div class=" q-my-none ">App Field Select</div> -->
@@ -128,6 +127,7 @@ interface IAppFields{
 }
 
 export default defineComponent({
+    inheritAttrs:false,
     name: 'FieldInput',
     components: {
         ShowDialog,
diff --git a/frontend/src/components/right/ColorPicker.vue b/frontend/src/components/right/ColorPicker.vue
index aae3896..e3cba43 100644
--- a/frontend/src/components/right/ColorPicker.vue
+++ b/frontend/src/components/right/ColorPicker.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="">
-        <q-field v-model="color" :label="displayName" bottom-slots labelColor="primary">
+    <div class="" v-bind="$attrs">
+        <q-field v-model="color" :label="displayName" labelColor="primary"  :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
             <template v-slot:control>
-                <q-chip text-color="black" color="white">
+                <q-chip text-color="black" color="white" v-if="isSelected">
                     <div class="row">
                         <div class="col-4">
                             <q-avatar class="shadow-1" :style="{ background: color }" size="xs"></q-avatar>
@@ -14,7 +14,7 @@
                 </q-chip>
             </template>
             <template v-slot:append>
-                <q-icon name="colorize" class="cursor-pointer">
+                <q-icon name="colorize" class="cursor-pointer" color="primary" >
                     <q-popup-proxy cover transition-show="scale" transition-hide="scale">
                         <q-color no-header default-view="palette" v-model="color" />
                     </q-popup-proxy>
@@ -30,8 +30,9 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref,watchEffect } from 'vue';
 export default defineComponent({
+    inheritAttrs:false,
     name: 'ColorPicker',
     components: {
     },
@@ -53,15 +54,20 @@ export default defineComponent({
             default: '',
         },
         modelValue: {
-            type: Object,
+            type: String,
             default: null
         },
     },
 
     setup(props, { emit }) {
-        const color = ref("#ffffff");
+        const color = ref(props.modelValue??"");
+        const isSelected = computed(()=>props.modelValue && props.modelValue!=="");
+        watchEffect(()=>{
+          emit('update:modelValue', color.value);
+        });
         return {
             color,
+            isSelected
         };
     }
 });
diff --git a/frontend/src/components/right/ConditionInput.vue b/frontend/src/components/right/ConditionInput.vue
index 4ad9fdf..2b5d552 100644
--- a/frontend/src/components/right/ConditionInput.vue
+++ b/frontend/src/components/right/ConditionInput.vue
@@ -1,18 +1,20 @@
 <template>
-  <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
-    <template v-slot:control >
-      <q-card flat class="full-width">
-        <q-card-actions vertical>
-          <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
-        </q-card-actions>
-        <q-card-section class="text-caption" >
-          <div v-if="!isSetted">{{ placeholder }}</div>
-          <div v-else>{{ conditionString }}</div>
-        </q-card-section>
-      </q-card>
-    </template>
-  </q-field>
-  <condition-editor v-model:show="show" v-model:conditionTree="tree" @closed="onClosed"></condition-editor>
+  <div v-bind="$attrs">
+    <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
+      <template v-slot:control >
+        <q-card flat class="full-width">
+          <q-card-actions vertical>
+            <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
+          </q-card-actions>
+          <q-card-section class="text-caption" >
+            <div v-if="!isSetted">{{ placeholder }}</div>
+            <div v-else>{{ conditionString }}</div>
+          </q-card-section>
+        </q-card>
+      </template>
+    </q-field>
+    <condition-editor v-model:show="show" v-model:conditionTree="tree" @closed="onClosed"></condition-editor>
+  </div>
 </template>
 
   <script lang="ts">
@@ -21,6 +23,7 @@
   import ConditionEditor from '../ConditionEditor/ConditionEditor.vue'
   export default defineComponent({
     name: 'FieldInput',
+    inheritAttrs:false,
     components: {
       ConditionEditor
     },
diff --git a/frontend/src/components/right/DatePicker.vue b/frontend/src/components/right/DatePicker.vue
index c5cbcb9..eeeff6b 100644
--- a/frontend/src/components/right/DatePicker.vue
+++ b/frontend/src/components/right/DatePicker.vue
@@ -1,18 +1,19 @@
 <template>
-
-  <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
-    <template v-slot:append>
-      <q-icon name="event" class="cursor-pointer">
-        <q-popup-proxy cover transition-show="scale" transition-hide="scale">
-          <q-date v-model="selectedDate">
-            <div class="row items-center justify-end">
-              <q-btn v-close-popup label="Close" color="primary" flat />
-            </div>
-          </q-date>
-        </q-popup-proxy>
-      </q-icon>
-    </template>
-  </q-input>
+  <div v-bind="$attrs">
+    <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
+      <template v-slot:append>
+        <q-icon name="event" class="cursor-pointer">
+          <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+            <q-date v-model="selectedDate">
+              <div class="row items-center justify-end">
+                <q-btn v-close-popup label="Close" color="primary" flat />
+              </div>
+            </q-date>
+          </q-popup-proxy>
+        </q-icon>
+      </template>
+    </q-input>
+  </div>
 </template>
 
 <script lang="ts">
@@ -20,6 +21,7 @@ import { defineComponent, ref ,watchEffect} from 'vue';
 
 export default defineComponent({
   name: 'DatePicker',
+  inheritAttrs:false,
   props: {
     displayName:{
       type: String,
diff --git a/frontend/src/components/right/EventSetter.vue b/frontend/src/components/right/EventSetter.vue
index aea604a..54303dd 100644
--- a/frontend/src/components/right/EventSetter.vue
+++ b/frontend/src/components/right/EventSetter.vue
@@ -1,9 +1,11 @@
 <template>
-  <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
-    <template v-slot:append>
-      <q-btn round dense flat icon="add" @click="addButtonEvent()" />
-    </template>
-  </q-input>
+  <div v-bind="$attrs">
+    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
+      <template v-slot:append>
+        <q-btn round dense flat icon="add" @click="addButtonEvent()" />
+      </template>
+    </q-input>
+  </div>
 </template>
 
 <script lang="ts">
@@ -13,6 +15,7 @@ import { IKintoneEventGroup,kintoneEvent } from 'src/types/KintoneEvents';
 
 export default defineComponent({
   name: 'EventSetter',
+  inheritAttrs:false,
   props: {
     displayName:{
       type: String,
diff --git a/frontend/src/components/right/FieldInput.vue b/frontend/src/components/right/FieldInput.vue
index 9be0622..b21357f 100644
--- a/frontend/src/components/right/FieldInput.vue
+++ b/frontend/src/components/right/FieldInput.vue
@@ -1,8 +1,9 @@
 <template>
-    <q-field v-model="selectedField" :label="displayName" labelColor="primary"
-            :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
-      <template v-slot:control >
-        <q-chip  color="primary" text-color="white"  v-if="isSelected">
+  <div v-bind="$attrs">
+    <q-field v-model="selectedField" :label="displayName" labelColor="primary" :clearable="isSelected" stack-label
+      :bottom-slots="!isSelected">
+      <template v-slot:control>
+        <q-chip color="primary" text-color="white" v-if="isSelected">
           {{ selectedField.name }}
         </q-chip>
       </template>
@@ -14,85 +15,87 @@
       </template>
 
       <template v-slot:append>
-      <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg"/>
+        <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg" />
       </template>
     </q-field>
     <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
       <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
     </show-dialog>
-    </template>
+  </div>
+</template>
 
-    <script lang="ts">
-    import { defineComponent, ref ,watchEffect,computed} from 'vue';
-    import ShowDialog from '../ShowDialog.vue';
-    import FieldSelect from '../FieldSelect.vue';
-    import { useFlowEditorStore } from 'stores/flowEditor';
-    interface IField{
-      name:string,
-      code:string,
-      type:string
-    }
-    export default defineComponent({
-      name: 'FieldInput',
-      components: {
-        ShowDialog,
-        FieldSelect,
-      },
-      props: {
-        displayName:{
-          type: String,
-          default: '',
-        },
-        name:{
-          type: String,
-          default: '',
-        },
-        placeholder: {
-          type: String,
-          default: '',
-        },
-        hint:{
-          type: String,
-          default: '',
-        },
-        modelValue: {
-          type: Object,
-          default: null
-        },
-      },
+<script lang="ts">
+import { defineComponent, ref, watchEffect, computed } from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+import FieldSelect from '../FieldSelect.vue';
+import { useFlowEditorStore } from 'stores/flowEditor';
+interface IField {
+  name: string,
+  code: string,
+  type: string
+}
+export default defineComponent({
+  name: 'FieldInput',
+  inheritAttrs:false,
+  components: {
+    ShowDialog,
+    FieldSelect,
+  },
+  props: {
+    displayName: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    hint: {
+      type: String,
+      default: '',
+    },
+    modelValue: {
+      type: Object,
+      default: null
+    },
+  },
 
-      setup(props, { emit }) {
-        const appDg = ref();
-        const show = ref(false);
-        const selectedField = ref(props.modelValue);
-        const store = useFlowEditorStore();
-        const isSelected = computed(()=>{
-          return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
-        });
-
-        const showDg = () => {
-          show.value = true;
-        };
-
-        const closeDg = (val:string) => {
-          if (val == 'OK') {
-            selectedField.value = appDg.value.selected[0];
-          }
-        };
-
-        watchEffect(() => {
-          emit('update:modelValue', selectedField.value);
-        });
-
-        return {
-          store,
-          appDg,
-          show,
-          showDg,
-          closeDg,
-          selectedField,
-          isSelected
-        };
-      }
+  setup(props, { emit }) {
+    const appDg = ref();
+    const show = ref(false);
+    const selectedField = ref(props.modelValue);
+    const store = useFlowEditorStore();
+    const isSelected = computed(() => {
+      return selectedField.value !== null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
     });
-    </script>
+
+    const showDg = () => {
+      show.value = true;
+    };
+
+    const closeDg = (val: string) => {
+      if (val == 'OK') {
+        selectedField.value = appDg.value.selected[0];
+      }
+    };
+
+    watchEffect(() => {
+      emit('update:modelValue', selectedField.value);
+    });
+
+    return {
+      store,
+      appDg,
+      show,
+      showDg,
+      closeDg,
+      selectedField,
+      isSelected
+    };
+  }
+});
+</script>
diff --git a/frontend/src/components/right/InputText.vue b/frontend/src/components/right/InputText.vue
index 5c5b312..a14e06d 100644
--- a/frontend/src/components/right/InputText.vue
+++ b/frontend/src/components/right/InputText.vue
@@ -1,24 +1,34 @@
 <template>
-  <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
-  <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"><div class="hint-text" v-html="hint"/></q-tooltip>
-    </q-icon>
-  </template>
-  </q-input>
+  <div v-bind="$attrs">
+    <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">
+            <div class="hint-text" v-html="hint" />
+          </q-tooltip>
+        </q-icon>
+      </template>
+    </q-input>
+  </div>
 </template>
 
 <script lang="ts">
-import { defineComponent,ref,watchEffect } from 'vue';
+import { kMaxLength } from 'buffer';
+import { defineComponent, ref, watchEffect } from 'vue';
 
 export default defineComponent({
   name: 'InputText',
+  inheritAttrs: false,
   props: {
-    displayName:{
+    displayName: {
       type: String,
       default: '',
     },
-    name:{
+    name: {
       type: String,
       default: '',
     },
@@ -26,33 +36,43 @@ export default defineComponent({
       type: String,
       default: '',
     },
-    hint:{
+    hint: {
       type: String,
       default: '',
     },
+    maxLength:{
+      type: Number,
+      default:undefined
+    },
+    //例：[val=>!!val ||'入力してください']
+    rules:{
+      type:String,
+      default:undefined
+    },
     modelValue: {
       type: String,
       default: '',
     },
   },
 
-  setup(props , { emit }) {
+  setup(props, { emit }) {
     const inputValue = ref(props.modelValue);
-
+    const rulesExp = props.rules===undefined?null : eval(props.rules);
     watchEffect(() => {
       emit('update:modelValue', inputValue.value);
     });
 
     return {
       inputValue,
-      showhint:ref(false)
+      showhint: ref(false),
+      rulesExp
     };
   },
 });
 </script>
 <style lang="scss">
-.hint-text{
-  white-space : always;
+.hint-text {
+  white-space: always;
   max-width: 450px;
   font-size: 1.2em;
 }
diff --git a/frontend/src/components/right/MuiltInputText.vue b/frontend/src/components/right/MuiltInputText.vue
index c6df176..ce8b6c9 100644
--- a/frontend/src/components/right/MuiltInputText.vue
+++ b/frontend/src/components/right/MuiltInputText.vue
@@ -1,18 +1,22 @@
 <template>
-  <q-input :label="displayName"   label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow stack-label/>
+  <div v-bind="$attrs">
+    <q-input :label="displayName" label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow
+      stack-label />
+  </div>
 </template>
 
 <script lang="ts">
-import { defineComponent,ref,watchEffect } from 'vue';
+import { defineComponent, ref, watchEffect } from 'vue';
 
 export default defineComponent({
   name: 'MuiltInputText',
+  inheritAttrs: false,
   props: {
-    displayName:{
+    displayName: {
       type: String,
       default: '',
     },
-    name:{
+    name: {
       type: String,
       default: '',
     },
@@ -20,7 +24,7 @@ export default defineComponent({
       type: String,
       default: '',
     },
-    hint:{
+    hint: {
       type: String,
       default: '',
     },
diff --git a/frontend/src/components/right/NumInput.vue b/frontend/src/components/right/NumInput.vue
index d916c94..6a1957f 100644
--- a/frontend/src/components/right/NumInput.vue
+++ b/frontend/src/components/right/NumInput.vue
@@ -1,6 +1,10 @@
 <template>
-  <div class="">
-    <q-input v-model.number="numValue" type="number" :label="displayName" label-color="primary" bottom-slots>
+  <div class="" v-bind="$attrs">
+    <q-input v-model.number="numValue" type="number" :label="displayName" label-color="primary" stack-label bottom-slots
+     :min="min"
+     :max="max"
+     :rules="rulesExp"
+     >
       <template v-slot:hint>
         {{ placeholder }}
       </template>
@@ -9,9 +13,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref, watchEffect } from 'vue';
 export default defineComponent({
   name: 'NumInput',
+  inheritAttrs:false,
   components: {
   },
   props: {
@@ -31,17 +36,51 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    min:{
+      type:Number,
+      default:undefined
+    },
+    max:{
+      type:Number,
+      default:undefined
+    },
+    //[val=>!!val ||'数値を入力してください',val=>val<=100 && val>=1 || '1-100の範囲内の数値を入力してください']
+    rules:{
+      type:String,
+      default:undefined
+    },
     modelValue: {
-      type: Object,
-      default: null
+      type: [Number , String],
+      default: undefined
     },
   },
 
   setup(props, { emit }) {
-    const numValue = ref(0);
+    const numValue = ref(props.modelValue);
+    const rulesExp = props.rules===undefined?null : eval(props.rules);
+    const isError = computed(()=>{
+      const val = numValue.value;
+      if (val === undefined) {
+        return false;
+      }
+      const numVal = typeof val === "string" ? parseInt(val) : val;
+      // Ensure parsed value is a valid number
+      if (isNaN(numVal)) {
+        return true;
+      }
+      // Check against min and max boundaries, if defined
+      if ((props.min !== undefined && numVal < props.min) || (props.max !== undefined && numVal > props.max)) {
+        return true;
+      }
+      return false;
+    });
 
+    watchEffect(()=>{
+      emit("update:modelValue",numValue.value);
+    });
     return {
       numValue,
+      rulesExp
     };
   }
 });
diff --git a/frontend/src/components/right/PropertyList.vue b/frontend/src/components/right/PropertyList.vue
index e113923..1c7357c 100644
--- a/frontend/src/components/right/PropertyList.vue
+++ b/frontend/src/components/right/PropertyList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-for="(item, index) in properties" :key="index" >
-      <component :is="item.component" v-bind="item.props" :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props"  :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/right/SelectBox.vue b/frontend/src/components/right/SelectBox.vue
index c014842..70f991c 100644
--- a/frontend/src/components/right/SelectBox.vue
+++ b/frontend/src/components/right/SelectBox.vue
@@ -1,5 +1,7 @@
 <template>
+  <div v-bind="$attrs">
   <q-select v-model="selectedValue" :label="displayName" :options="options"/>
+</div>
 </template>
 
 <script lang="ts">
@@ -7,6 +9,7 @@ import { defineComponent,ref,watchEffect } from 'vue';
 
 export default defineComponent({
   name: 'SelectBox',
+  inheritAttrs:false,
   props: {
     displayName:{
       type: String,
diff --git a/sample.json b/sample.json
index 2fc251f..786699d 100644
--- a/sample.json
+++ b/sample.json
@@ -2,25 +2,22 @@
   "id": "",
   "actionNodes": [
     {
-      "id": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
-      "name": "app.record.create.submit",
+      "id": "c5cd772a-04be-418e-a811-3787f98a2285",
+      "name": "app.record.create.show",
       "title": "レコード追加画面",
-      "subTitle": "保存をクリックしたとき",
+      "subTitle": "レコード追加画面を表示した後",
       "inputPoint": "",
       "outputPoints": [],
       "isRoot": true,
       "actionProps": [],
       "ActionValue": {},
-      "nextNodeIds": [
-        [
-          "",
-          "dfa6df09-7b3e-4848-89ad-2e9147004f31"
-        ]
-      ]
+      "nextNodeIds": {
+        "": "1eb097b1-9d08-462e-97b0-6e3e1232edef"
+      }
     },
     {
-      "id": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
-      "name": "自動採番する",
+      "id": "1eb097b1-9d08-462e-97b0-6e3e1232edef",
+      "name": "属性UIテスト用",
       "inputPoint": "",
       "outputPoints": [],
       "actionProps": [
@@ -31,185 +28,86 @@
             "displayName": "表示名",
             "placeholder": "表示を入力してください",
             "hint": "",
-            "modelValue": "文書番号を自動採番する"
+            "modelValue": "属性UIテスト用"
           }
         },
         {
-          "component": "FieldInput",
+          "component": "AppFieldSelect",
           "props": {
-            "displayName": "採番項目",
+            "displayName": "フィールド選択(複数)",
             "modelValue": {
-              "name": "文書番号",
-              "type": "SINGLE_LINE_TEXT",
-              "code": "文書番号",
-              "label": "文書番号",
-              "noLabel": false,
-              "required": false,
-              "minLength": "",
-              "maxLength": "",
-              "expression": "",
-              "hideExpression": false,
-              "unique": false,
-              "defaultValue": ""
+              "app": {
+                "id": "64",
+                "name": "日報テスト",
+                "description": "日々の業務内容、報告事項、所感などを記載していくアプリです。\n記録を行うだけでなく、あとからの振り返りやメンバー間のコミュニケーションにも活用できます。",
+                "createdate": "2023/07/15 10:15:03"
+              },
+              "fields": [
+                {
+                  "name": "ステータス",
+                  "type": "STATUS",
+                  "code": "ステータス",
+                  "label": "ステータス",
+                  "enabled": false
+                }
+              ]
             },
-            "name": "field",
-            "placeholder": "採番項目を選択してください"
+            "name": "selectFields",
+            "placeholder": "アプリ選択後、フィールドを選んでください",
+            "selectType": "multiple"
           }
         },
         {
-          "component": "InputText",
+          "component": "AppFieldSelect",
           "props": {
-            "displayName": "フォーマット",
-            "modelValue": "000000",
-            "name": "format",
-            "placeholder": "数値書式文字列を指定します"
-          }
-        },
-        {
-          "component": "InputText",
-          "props": {
-            "displayName": "前につける文字列",
-            "modelValue": "",
-            "name": "prefix",
-            "placeholder": "前につける文字列を入力してください"
-          }
-        },
-        {
-          "component": "InputText",
-          "props": {
-            "displayName": "後ろにつける文字列",
-            "modelValue": "{$format('yyyyMMdd')}",
-            "name": "suffix",
-            "placeholder": "後ろにつける文字列を入力してください"
-          }
-        },
-        {
-          "component": "InputText",
-          "props": {
-            "displayName": "結果（戻り値）",
-            "modelValue": "docNumber",
-            "name": "verName",
-            "placeholder": "変数名を入力してください"
-          }
-        }
-      ],
-      "prevNodeId": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
-      "nextNodeIds": [
-        [
-          "",
-          "b32bf329-f05a-486f-9b79-9920b57fe324"
-        ]
-      ]
-    },
-    {
-      "id": "b32bf329-f05a-486f-9b79-9920b57fe324",
-      "name": "条件式",
-      "inputPoint": "",
-      "outputPoints": [
-        "はい",
-        "いいえ"
-      ],
-      "actionProps": [
-        {
-          "component": "InputText",
-          "props": {
-            "name": "displayName",
-            "displayName": "表示名",
-            "placeholder": "表示を入力してください",
-            "hint": "",
-            "modelValue": "条件式を設定する"
-          }
-        },
-        {
-          "component": "ConditionInput",
-          "props": {
-            "displayName": "条件",
-            "modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"部署\",\"objectType\":\"field\",\"type\":\"DROP_DOWN\",\"code\":\"ドロップダウン\",\"label\":\"部署\",\"noLabel\":false,\"required\":false,\"options\":{\"総務\":{\"label\":\"総務\",\"index\":\"2\"},\"サポート\":{\"label\":\"サポート\",\"index\":\"3\"},\"マーケティング\":{\"label\":\"マーケティング\",\"index\":\"1\"},\"営業\":{\"label\":\"営業\",\"index\":\"0\"},\"開発\":{\"label\":\"開発\",\"index\":\"4\"}},\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":2,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"所感、学び\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行__0\",\"label\":\"所感、学び\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":3,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"業務内容\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行_\",\"label\":\"業務内容\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":4,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"ステータス\",\"objectType\":\"field\",\"type\":\"STATUS\",\"code\":\"ステータス\",\"label\":\"ステータス\",\"enabled\":true},\"operator\":\"=\",\"value\":\"作成中\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
-            "name": "condition",
-            "placeholder": "条件式を設定してください"
-          }
-        },
-        {
-          "component": "InputText",
-          "props": {
-            "displayName": "結果（戻り値）",
-            "modelValue": "conditionResult",
-            "name": "verName",
-            "placeholder": "変数名を入力してください"
-          }
-        }
-      ],
-      "prevNodeId": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
-      "nextNodeIds": [
-        [
-          "いいえ",
-          "82bdcbcc-d8c1-4e2c-b38f-f736c95b193a"
-        ]
-      ]
-    },
-    {
-      "id": "82bdcbcc-d8c1-4e2c-b38f-f736c95b193a",
-      "name": "表示／非表示",
-      "inputPoint": "いいえ",
-      "outputPoints": [],
-      "actionProps": [
-        {
-          "component": "InputText",
-          "props": {
-            "name": "displayName",
-            "displayName": "表示名",
-            "placeholder": "表示を入力してください",
-            "hint": "",
-            "modelValue": "指定項目の表示・非表示を設定する"
-          }
-        },
-        {
-          "component": "FieldInput",
-          "props": {
-            "displayName": "フィールド",
+            "displayName": "フィールド選択(単一)",
             "modelValue": {
-              "name": "文書番号",
-              "type": "SINGLE_LINE_TEXT",
-              "code": "文書番号",
-              "label": "文書番号",
-              "noLabel": false,
-              "required": false,
-              "minLength": "",
-              "maxLength": "",
-              "expression": "",
-              "hideExpression": false,
-              "unique": false,
-              "defaultValue": ""
+              "app": {
+                "id": "58",
+                "name": "日報",
+                "description": "",
+                "createdate": "2023/07/13 19:05:26"
+              },
+              "fields": [
+                {
+                  "name": "所感、学び",
+                  "type": "MULTI_LINE_TEXT",
+                  "code": "文字列__複数行__0",
+                  "label": "所感、学び",
+                  "noLabel": false,
+                  "required": false,
+                  "defaultValue": ""
+                }
+              ]
             },
-            "name": "field",
-            "placeholder": "対象項目を選択してください"
+            "name": "selectField",
+            "placeholder": "アプリ選択後、フィールドを選んでください",
+            "selectType": "single"
           }
         },
         {
-          "component": "SelectBox",
+          "component": "ColorPicker",
           "props": {
-            "displayName": "表示／非表示",
-            "options": [
-              "表示",
-              "非表示"
-            ],
-            "modelValue": "非表示",
-            "name": "show",
-            "placeholder": ""
+            "displayName": "色選択",
+            "modelValue": "#f50000",
+            "name": "color",
+            "placeholder": "カラーを選択してください"
           }
         },
         {
-          "component": "ConditionInput",
+          "component": "NumInput",
           "props": {
-            "displayName": "条件",
-            "modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{},\"operator\":\"=\",\"value\":\"\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
-            "name": "condition",
-            "placeholder": "条件式を設定してください"
+            "displayName": "数値入力フィールド",
+            "modelValue": 100,
+            "name": "num",
+            "max": 100,
+            "min": 0,
+            "placeholder": "数値を入力してください"
           }
         }
       ],
-      "prevNodeId": "b32bf329-f05a-486f-9b79-9920b57fe324",
-      "nextNodeIds": []
+      "prevNodeId": "c5cd772a-04be-418e-a811-3787f98a2285",
+      "nextNodeIds": {}
     }
   ]
 }
\ No newline at end of file
diff --git a/sample2.json b/sample2.json
index db814d3..df4cefd 100644
--- a/sample2.json
+++ b/sample2.json
@@ -2,36 +2,54 @@
     {
         "component": "InputText",
         "props": {
-            "displayName": "ボタン名",
+            "displayName": "文字入力",
             "modelValue": "",
-            "name": "buttonName",
-            "placeholder": "ボタンのラベルを入力してください"
+            "name": "str",
+            "placeholder": "文字を入力してください",
+            "maxLength":"20",
+            "hint":"文字列入力<br>入力ルール指定可能。ルールの設定例：[val=>!!val||'必須入力です']",
+            "rules":"[val=>!!val||'必須入力です']"
         }
     },
     {
-        "component": "SelectBox",
+        "component": "AppFieldSelect",
         "props": {
-            "displayName": "追加位置",
-            "modelValue": "",
-            "name": "position",
-            "options":[
-                "一番右に追加する",
-                "一番左に追加する"
-            ],
-            "placeholder": "追加位置を選択してください"
+            "displayName": "フィールド選択(複数)",
+            "modelValue": {},
+            "name": "selectFields",
+            "placeholder": "アプリ選択後、フィールドを選んでください",
+            "selectType":"multiple"
         }
     },
     {
-        "component": "EventSetter",
+        "component": "AppFieldSelect",
         "props": {
-            "displayName": "イベント名",
+            "displayName": "フィールド選択(単一)",
+            "modelValue": {},
+            "name": "selectField",
+            "placeholder": "アプリ選択後、フィールドを選んでください",
+            "selectType":"single"
+        }
+    },
+    {
+        "component": "ColorPicker",
+        "props": {
+            "displayName": "色選択",
             "modelValue": "",
-            "name": "eventName",
-            "connectProps":[{
-                "key":"displayName",
-                "propName":"buttonName"
-            }],
-            "placeholder": "イベント名を入力してください"
+            "name": "color",
+            "placeholder": "カラーを選択してください"
+        }
+    },
+    {
+        "component": "NumInput",
+        "props": {
+            "displayName": "数値入力フィールド",
+            "modelValue": "",
+            "name": "num",
+            "max":100,
+            "min":0,
+            "placeholder": "数値を入力してください",
+            "rules":"[val=>!!val ||'数値を入力してください',val=>val<=100 && val>=1 || '1-100の範囲内の数値を入力してください']"
         }
     }
-]
+]
\ No newline at end of file