Merge branch 'dev' into feature-auto-lookup

# Conflicts:
#	frontend/src/components/AppFieldSelectBox.vue
#	frontend/src/components/right/AppFieldSelect.vue
#	plugin/kintone-addins/package.json
#	plugin/kintone-addins/src/actions/auto-lookup.ts
#	plugin/kintone-addins/src/types/action-process.ts
#	plugin/kintone-addins/vite.config.js

backend/app/api/api_v1/routers/kintone.py

@@ -217,7 +217,9 @@ def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
     data = {"apps":[{"app":app,"revision":revision}],"revert": False}
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json
-    
+
+# 既定項目に含めるアプリのフィールドのみ取得する
+# スペース、枠線、ラベルを含まない    
 def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
     params = {"app":app}
@@ -225,6 +227,44 @@ def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
+# フォームに配置するフィールドのみ取得する
+# スペース、枠線、ラベルも含める
+def getformfromkintone(app:str,c:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+    params = {"app":app}
+    url = f"{c.BASE_URL}{config.API_V1_STR}/form.json"
+    r = httpx.get(url,headers=headers,params=params)
+    return r.json()
+
+
+def merge_kintone_fields(fields_response: dict, form_response: dict) -> dict:
+    fields_properties = fields_response.get('properties', {})
+    form_properties = form_response.get('properties', [])
+
+    merged_properties = {k: v for k, v in fields_properties.items()}
+
+    for index, form_field in enumerate(form_properties):
+        code = form_field.get('code')
+        if code:
+            if code and code not in merged_properties:
+                merged_properties[code] = form_field
+        else:
+            element_id = form_field.get('elementId')
+            if element_id:
+                key = element_id
+                form_field['code']=element_id
+                form_field['label']=form_field.get('type')
+            # else:
+            #     key = f"{form_field.get('type')}_{index}"
+                merged_properties[key] = form_field 
+
+    merged_response = {
+        'revision': fields_response.get('revision', ''),
+        'properties': merged_properties
+    }
+    
+    return merged_response
+
 def analysefields(excel,kintone):
     updatefields={}
     addfields={}
@@ -364,6 +404,12 @@ def updateappjscss(app,uploads,c:config.KINTONE_ENV):
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
+def getTempPath(filename):
+    scriptdir = Path(__file__).resolve().parent
+    rootdir = scriptdir.parent.parent.parent.parent
+    fpath = os.path.join(rootdir,"Temp",filename)
+    return fpath
+
 def createappjs(domainid,app):
     db = SessionLocal()
     flows = get_flows_by_app(db,domainid,app)
@@ -372,10 +418,10 @@ def createappjs(domainid,app):
     for flow in flows:
         content[flow.eventid] = {'flowid':flow.flowid,'name':flow.name,'content':flow.content}
     js = 'const alcflow=' + json.dumps(content)
-    scriptdir = Path(__file__).resolve().parent
-    rootdir = scriptdir.parent.parent.parent.parent
-    fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
-    print(rootdir)
+    # scriptdir = Path(__file__).resolve().parent
+    # rootdir = scriptdir.parent.parent.parent.parent
+    # fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
+    fpath = getTempPath(f"alc_setting_{app}.js")
     print(fpath)
     with open(fpath,'w') as file:
         file.write(js)
@@ -463,7 +509,7 @@ async def app(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAM}->{app}):",e)   
+        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAME}->{app}):",e)   
 
 @r.get("/allapps")
 async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -473,21 +519,30 @@ async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
         r = httpx.get(url,headers=headers)
         return r.json()
     except Exception as e:
-       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAM}):",e)   
+       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAME}):",e)   
 
 @r.get("/appfields")
 async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
     try:
         return getfieldsfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e) 
+
+@r.get("/allfields")
+async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
+    try:
+        field_resp = getfieldsfromkintone(app,env)
+        form_resp = getformfromkintone(app,env)
+        return merge_kintone_fields(field_resp,form_resp)
+    except Exception as e:
+       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.get("/appprocess")
 async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
     try:
         return getprocessfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.get("/alljscss")
 async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -498,7 +553,7 @@ async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkinton
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAME}->{app}):",e) 
 
 @r.post("/createapp",)
 async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -514,7 +569,7 @@ async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkin
             r = httpx.post(url,headers=headers,data=json.dumps(data))
         return r.json
     except Exception as e:
-        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAM}->{name}):",e) 
+        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAME}->{name}):",e) 
 
 
 @r.post("/createappfromexcel",)
@@ -643,7 +698,7 @@ async def updateprocessfromexcel(request:Request,app:str,env = Depends(getkinton
         if deploy:
             result = deoployappfromkintone(app,revision,env)
     except Exception as e:
-        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAM}->{app}):",e)
+        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAME}->{app}):",e)
        
     return result
 
@@ -654,7 +709,8 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
         jscs=[]
         files=[]
         files.append(createappjs(env.DOMAIN_ID, app))
-        files.append('Temp\\alc_runtime.js')
+        files.append(getTempPath('alc_runtime.js'))
+        files.append(getTempPath('alc_runtime.css'))        
         for file in files:
             upload = uploadkintonefiles(file,env)
             if upload.get('fileKey') != None:
@@ -664,4 +720,4 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
            deoployappfromkintone(app,appjscs["revision"],env)
            return appjscs
     except Exception as e:
-        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAM}->{app}):",e)
+        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAME}->{app}):",e)

backend/app/core/config.py

@@ -5,22 +5,22 @@ PROJECT_NAME = "KintoneAppBuilder"
 
 #SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres"
 SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres"
-
+#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/unittest"
 API_V1_STR = "/k/v1"
 
 API_V1_AUTH_KEY = "X-Cybozu-Authorization"
 
-DEPLOY_MODE = "DEV" #DEV,PROD
+DEPLOY_MODE = "PROD" #DEV,PROD
 
 DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
-#DEPLOY_JS_URL = "https://e84c-133-139-70-142.ngrok-free.app/alc_runtime.js"
+#DEPLOY_JS_URL = "https://ce1c-133-139-70-194.ngrok-free.app/alc_runtime.js"
 
 KINTONE_FIELD_TYPE=["GROUP","GROUP_SELECT","CHECK_BOX","SUBTABLE","DROP_DOWN","USER_SELECT","RADIO_BUTTON","RICH_TEXT","LINK","REFERENCE_TABLE","CALC","TIME","NUMBER","ORGANIZATION_SELECT","FILE","DATETIME","DATE","MULTI_SELECT","SINGLE_LINE_TEXT","MULTI_LINE_TEXT"]
 
 KINTONE_FIELD_PROPERTY=['label','code','type','required','unique','maxValue','minValue','maxLength','minLength','defaultValue','defaultNowValue','options','expression','hideExpression','digit','protocol','displayScale','unit','unitPosition']
 
 class KINTONE_ENV:
-    
+
     BASE_URL = ""
 
     API_V1_AUTH_VALUE = ""

backend/readme.md

@@ -24,4 +24,8 @@ python -m venv env
    ```bash
    pip install -r requirements.txt
 
-   ```
+   ```
+4. backend 起動
+   ```bash
+   uvicorn app.main:app --reload
+   ```

frontend/.env

@@ -1,3 +1,6 @@
-KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
-#KAB_BACKEND_URL="http://127.0.0.1:8000/"
-
+#開発環境
+#KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
+#単体テスト環境
+#KAB_BACKEND_URL="https://kab-backend-unittest.azurewebsites.net/"
+#ローカル開発環境
+KAB_BACKEND_URL="http://127.0.0.1:8000/"

frontend/quasar.config.js

@@ -94,6 +94,7 @@ module.exports = configure(function (/* ctx */) {
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
     devServer: {
       // https: true
+      port:9001,
       open: true, // opens browser window automatically
       env: { ...dotenv },
     },

frontend/src/components/AppFieldSelectBox.vue

@@ -0,0 +1,128 @@
+<template>
+
+    <div class="q-mx-md q-mb-lg">
+        <div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
+
+        <div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
+            <div v-if="selField?.app && !showSelectApp">{{ selField?.app?.name }}</div>
+            <q-space />
+            <div>
+                <q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
+                    showSelectApp = true;
+                }"></q-btn>
+            </div>
+        </div>
+    </div>
+
+    <div v-if="!showSelectApp && selField?.app?.name">
+        <div>
+            <div class="row q-mb-md">
+                <!-- <div class="col"> -->
+                <div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
+                <!-- </div> -->
+                <q-space />
+                <!-- <div class="col"> -->
+                <div class="q-mr-md">
+                    <q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
+                        <template v-slot:before>
+                            <q-icon name="search" />
+                        </template>
+                    </q-input>
+                </div>
+            </div>
+            <div class="row">
+                <field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelectFields="updateSelectFields"
+                    :appId="selField?.app?.id" not_page :filter="fieldFilter"
+                    :selectedFields="selField.fields"></field-select>
+            </div>
+        </div>
+    </div>
+    <div style="min-width: 45vw;" v-else>
+    </div>
+
+
+    <show-dialog v-model:visible="showSelectApp" name="アプリ選択">
+        <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
+                <template v-slot:before>
+                    <q-icon name="search" />
+                </template>
+            </q-input>
+        </template>
+
+        <AppSelectBox ref="appDlg" name="アプリ" type="single" :filter="filter"
+            :updateSelectApp="updateSelectApp"></AppSelectBox>
+    </show-dialog>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, watchEffect, computed, reactive } from 'vue';
+import ShowDialog from './ShowDialog.vue';
+import FieldSelect from './FieldSelect.vue';
+import AppSelectBox from './AppSelectBox.vue';
+interface IApp {
+    id: string,
+    name: string
+}
+interface IField {
+    name: string,
+    code: string,
+    type: string
+}
+
+interface IAppFields {
+    app?: IApp,
+    fields: IField[]
+}
+
+export default defineComponent({
+    inheritAttrs: false,
+    name: 'AppFieldSelectBox',
+    components: {
+        ShowDialog,
+        FieldSelect,
+        AppSelectBox,
+    },
+    props: {
+        selectedField: {
+            type: Object,
+            required: true
+        },
+        selectType: {
+            type: String,
+            default: 'single'
+        },
+
+    },
+    setup(props, { emit }) {
+        const showSelectApp = ref(false);
+        const selField = reactive(props.selectedField);
+
+        const isSelected = computed(() => {
+            return selField !== null && typeof selField === 'object' && ('app' in selField)
+        });
+
+        const updateSelectApp = (newAppinfo: IApp) => {
+            selField.app = newAppinfo
+        }
+        
+        const updateSelectFields = (newFields: IField[]) => {
+            selField.fields = newFields
+        }
+
+        watchEffect(() => {
+            emit('update:modelValue', selField);
+        });
+
+        return {
+            showSelectApp,
+            isSelected,
+            updateSelectApp,
+            filter: ref(),
+            updateSelectFields,
+            fieldFilter: ref(),
+            selField
+        };
+    }
+});
+</script>

frontend/src/components/AppSelectBox.vue

@@ -21,12 +21,12 @@ import { ref, onMounted, reactive, watchEffect } from 'vue'
 import { api } from 'boot/axios';
 
 export default {
-  name: 'AppSelect',
+  name: 'AppSelectBox',
   props: {
     name: String,
     type: String,
     filter: String,
-    updateExternalSelectAppInfo: {
+    updateSelectApp: {
       type: Function
     }
   },
@@ -42,8 +42,8 @@ export default {
     const selected = ref([])
 
     watchEffect(()=>{
-      if (selected.value && selected.value[0] && props.updateExternalSelectAppInfo) {
-        props.updateExternalSelectAppInfo(selected.value[0])
+      if (selected.value && selected.value[0] && props.updateSelectApp) {
+        props.updateSelectApp(selected.value[0])
       }
     });
     onMounted(() => {

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,20 +1,21 @@
 <template>
-  <q-field v-model="selectedObject" labelColor="primary" class="condition-object"
-          :clearable="isSelected" stack-label  :dense="true" :outlined="true" >
-    <template v-slot:control >
-      <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
+  <q-field labelColor="primary" class="condition-object" :clearable="isSelected" stack-label :dense="true"
+    :outlined="true">
+    <template v-slot:control>
+      <!-- <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
         {{ selectedObject.name }}
       </q-chip>
       <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
         {{ selectedObject.name.name }}
-      </q-chip>
+      </q-chip> -->
+      {{ selectedObject?.sharedText }}
     </template>
-   <template v-slot:append>
-    <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
+    <template v-slot:append>
+      <q-icon name="search" class="cursor-pointer" @click="showDg" />
     </template>
   </q-field>
-  <show-dialog v-model:visible="show" name="設定項目一覧" @close="closeDg" min-width="400px">
-    <template v-slot:toolbar>
+  <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
+    <!-- <template v-slot:toolbar>
         <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
           <template v-slot:before>
             <q-icon name="search" />
@@ -22,75 +23,101 @@
         </q-input>
     </template>
     <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
+  -->
+    <DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
+      :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" />
   </show-dialog>
-  </template>
+</template>
 
-  <script lang="ts">
-  import { defineComponent, reactive, ref ,watchEffect,computed} from 'vue';
-  import ShowDialog from '../ShowDialog.vue';
-  import ConditionObjects from '../ConditionObjects.vue';
-  import { useFlowEditorStore } from '../../stores/flowEditor';
-  import {IActionFlow,IActionNode,IActionVariable} from '../../types/ActionTypes';
-  export default defineComponent({
-    name: 'ConditionObject',
-    components: {
-      ShowDialog,
-      ConditionObjects
-    },
-    props: {
-      modelValue: {
-        type: Object,
-        default: null
-      },
-    },
-    setup(props, { emit }) {
-      const appDg = ref();
-      const show = ref(false);
-      const selectedObject = ref(props.modelValue);
-      const store = useFlowEditorStore();
-      const isSelected = computed(()=>{
-        return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
-      });
-      let vars:IActionVariable[] =[];
-      if(store.currentFlow!==undefined && store.activeNode!==undefined ){
-        vars =store.currentFlow.getVarNames(store.activeNode);
+<script lang="ts">
+import { defineComponent, reactive, ref, watchEffect, computed } from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+// import ConditionObjects from '../ConditionObjects.vue';
+import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue';
+import { useFlowEditorStore } from '../../stores/flowEditor';
+import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes';
+export default defineComponent({
+  name: 'ConditionObject',
+  components: {
+    ShowDialog,
+    DynamicItemInput,
+    // ConditionObjects
+  },
+  props: {
+    config: {
+      type: Object,
+      default: () => {
+        return {
+          canInput: false,
+          buttonsConfig: [
+            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        };
       }
-      const filter=ref('');
-      const showDg = () => {
-        show.value = true;
-      };
-
-      const closeDg = (val:string) => {
-        if (val == 'OK') {
-          selectedObject.value = appDg.value.selected[0];
-        }
-      };
-
-      watchEffect(() => {
-        emit('update:modelValue', selectedObject.value);
-      });
-
-      return {
-        store,
-        appDg,
-        show,
-        showDg,
-        closeDg,
-        selectedObject,
-        vars:reactive(vars),
-        isSelected,
-        filter
-      };
+    },
+    modelValue: {
+      type: Object,
+      default: null
+    },
+  },
+  setup(props, { emit }) {
+    // const appDg = ref();
+    const show = ref(false);
+    const selectedObject = ref(props.modelValue);
+    const store = useFlowEditorStore();
+    // const sharedText = ref(''); // 共享的文本状态
+    const isSelected = computed(() => {
+      return selectedObject?.value?.sharedText !== '';
+    });
+    // const isSelected = computed(()=>{
+    //   return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
+    // });
+    let vars: IActionVariable[] = [];
+    if (store.currentFlow !== undefined && store.activeNode !== undefined) {
+      vars = store.currentFlow.getVarNames(store.activeNode);
     }
-  });
-  </script>
+    // const filter=ref('');
+    const showDg = () => {
+      show.value = true;
+    };
+
+    const closeDg = (val: string) => {
+      if (val == 'OK') {
+        // selectedObject.value = appDg.value.selected[0];
+      }
+    };
+
+    watchEffect(() => {
+      emit('update:modelValue', selectedObject.value);
+    });
+
+    return {
+      store,
+      // appDg,
+      show,
+      showDg,
+      closeDg,
+      selectedObject,
+      vars: reactive(vars),
+      isSelected,
+      buttonsConfig: [
+        { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+        { label: '変数', color: 'green', type: 'VariableAdd' },
+      ]
+      // filter
+    };
+  }
+});
+</script>
 <style lang="scss">
-.condition-object{
+.condition-object {
   min-width: 200px;
   max-height: 40px;
   margin: 0 2px;
 }
-.selected-obj{
+
+.selected-obj {
   margin: 0 2px;
 }
 </style>

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -67,11 +67,13 @@
           <!-- condition -->
           <div @click.stop @keypress.stop v-else >
             <div class="row no-wrap items-center q-my-xs">
-              <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"></ConditionObject>
+              <ConditionObject v-bind="prop.node" v-model="prop.node.object" :config="leftDynamicItemConfig" class="col-4"/>
               <q-select v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
-              <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
+              <ConditionObject v-bind="prop.node" v-model="prop.node.value" :config="rightDynamicItemConfig" class="col-4"/>
+              <!-- <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"/> -->
+              <!-- <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
                         v-model="prop.node.value"
-                        class="condition-value" :outlined="true" :dense="true" ></q-input>
+                        class="condition-value" :outlined="true" :dense="true" ></q-input> -->
               <q-select v-if="prop.node.object && ('options' in prop.node.object)"
                         v-model="prop.node.value"
                         :options="objectValueOptions(prop.node.object.options)"
@@ -113,7 +115,7 @@ import { finished } from 'stream';
   </div>
 </template>
 <script lang="ts">
-import { defineComponent,ref,reactive, computed } from 'vue';
+import { defineComponent,ref,reactive, computed, inject } from 'vue';
 import { INode,ConditionTree,GroupNode,ConditionNode, LogicalOperator,Operator,NodeType } from '../../types/Conditions';
 import ConditionObject from './ConditionObject.vue';
 export default defineComponent( {
@@ -143,12 +145,9 @@ export default defineComponent( {
       return opts;
     });
 
+    const operator = inject('Operator')
     const operators =computed(()=>{
-      const opts=[];
-      for(const op in Operator){
-        opts.push(Operator[op as keyof typeof Operator]);
-      }
-      return opts;
+      return operator ? operator : Object.values(Operator);
     });
     const tree = reactive(props.conditionTree);
 
@@ -228,6 +227,8 @@ export default defineComponent( {
     // addCondition(tree.root);
 
     return {
+      leftDynamicItemConfig :inject('leftDynamicItemConfig'),
+      rightDynamicItemConfig:inject('rightDynamicItemConfig'),
       showingCondition,
       conditionString,
       tree,

frontend/src/components/DynamicItemInput/DynamicItemInput.vue

@@ -0,0 +1,141 @@
+<template>
+    <div class="q-mx-md" style="max-width: 600px;">
+        <!-- <q-card> -->
+        <div class="q-mb-md">
+            <q-input ref="inputRef" outlined dense debounce="200" @update:model-value="updateSharedText"
+                v-model="sharedText" :readonly="!canInput">
+                <template v-slot:append>
+                    <q-btn flat round padding="none" icon="cancel" @click="clearSharedText" color="grey-6" />
+                </template>
+            </q-input>
+
+        </div>
+
+        <div class="row q-gutter-sm">
+            <q-btn v-for="button in buttonsConfig" :key="button.type" :color="button.color" @mousedown.prevent
+                @click="openDialog(button)" size="sm">
+                {{ button.label }}
+            </q-btn>
+        </div>
+
+        <show-dialog v-model:visible="dialogVisible" :name="currentDialogName" @close="closeDialog" min-width="400px">
+            <template v-slot:toolbar>
+                <q-input dense debounce="200" v-model="filter" clearable>
+                    <template v-slot:before>
+                        <q-icon name="search" />
+                    </template>
+                </q-input>
+            </template>
+            <!-- asdf -->
+            <component :is="currentComponent" @select="handleSelect" :filter="filter" :appId="appId" />
+        </show-dialog>
+        <!-- </q-card> -->
+    </div>
+</template>
+
+<script lang="ts">
+import { ref, inject, watchEffect, defineComponent } from 'vue';
+import FieldAdd from './FieldAdd.vue';
+import VariableAdd from './VariableAdd.vue';
+// import FunctionAdd from './FunctionAdd.vue';
+import ShowDialog from '../ShowDialog.vue';
+
+type ButtonConfig = {
+    label: string;
+    color: string;
+    type: string;
+    editable: boolean;
+};
+
+export default defineComponent({
+    name: 'DynamicItemInput',
+    components: {
+        FieldAdd,
+        VariableAdd,
+        // FunctionAdd,
+        ShowDialog
+    },
+    props: {
+        // canInput: {
+        //     type: Boolean,
+        //     default: false
+        // },
+        appId: {
+            type: String,
+        },
+        selectedObject: {
+            default: {}
+        },
+        buttonsConfig: {
+            type: Array as () => ButtonConfig[],
+            default: () => [
+                { label: 'フィールド', color: 'primary', type: 'FieldAdd' }
+            ]
+        }
+    },
+    setup(props, { emit }) {
+        const filter = ref('');
+        const dialogVisible = ref(false);
+        const currentDialogName = ref('');
+        const currentComponent = ref('FieldAdd');
+        const sharedText = ref(props.selectedObject?.sharedText ?? '');
+        const inputRef = ref();
+        const canInput = ref(true);
+        const editable = ref(false);
+
+        const openDialog = (button: ButtonConfig) => {
+            currentDialogName.value = button.label;
+            currentComponent.value = button.type;
+            dialogVisible.value = true;
+            editable.value = button.editable ?? true;
+        };
+
+        const closeDialog = () => {
+            dialogVisible.value = false;
+        };
+
+        const handleSelect = (value) => {
+            // 获取当前光标位置
+            // const cursorPosition = inputRef.value.getNativeElement().selectionStart;
+            // if (cursorPosition === undefined || cursorPosition === 0) {
+            sharedText.value = `${value._t}`;
+            // } else {
+            //     const textBefore = sharedText.value.substring(0, cursorPosition);
+            //     const textAfter = sharedText.value.substring(cursorPosition);
+            //     sharedText.value = `${textBefore}${value._t}${textAfter}`;
+            // }
+            
+            if (value && value._t && (value._t as string).length > 0) {
+                canInput.value = editable.value;
+            }
+            emit('update:selectedObject', { sharedText: sharedText.value, ...value });
+            dialogVisible.value = false;
+        };
+
+        const clearSharedText = () => {
+            sharedText.value = '';
+            canInput.value = true;
+            emit('update:selectedObject', {});
+        }
+        const updateSharedText = (value) => {
+            sharedText.value = value;
+            emit('update:selectedObject', { ...props.selectedObject, sharedText: value });
+        }
+
+        return {
+            filter,
+            dialogVisible,
+            currentDialogName,
+            currentComponent,
+            canInput,
+            openDialog,
+            closeDialog,
+            handleSelect,
+            clearSharedText,
+            updateSharedText,
+            sharedText,
+            inputRef
+        };
+    }
+});
+</script>

frontend/src/components/DynamicItemInput/FieldAdd.vue

@@ -0,0 +1,41 @@
+<template>
+    <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp : appId"
+        :fields="sourceFields" @update:modelValue="handleSelect" />
+</template>
+<script lang="ts">
+import { computed, inject, ref } from 'vue';
+import FieldList from '../FieldList.vue';
+export default {
+    name: 'FieldAdd',
+    components: {
+        FieldList,
+    },
+    props: {
+        appId: Number,
+        filter: String
+    },
+    setup(props, { emit }) {
+        const sourceFields = inject<Array<unknown>>('sourceFields')
+        const sourceApp = inject<number>('sourceApp')
+        const appId = computed(() => {
+            if (sourceFields || sourceApp) {
+                return sourceApp.value
+            } else {
+                return props.appId
+            }
+        });
+        return {
+            sourceFields,
+            sourceApp,
+            selected: ref([]),
+            handleSelect: (newSelection: any[]) => {
+                
+                if (newSelection.length > 0) {
+                    const v = newSelection[0]
+                    emit('select', { _t: `field(${appId.value},${v.name})`, ...v }); // 假设您只需要选择的第一个字段的名称
+                }
+            }
+        }
+    },
+}
+</script>

frontend/src/components/DynamicItemInput/VariableAdd.vue

@@ -0,0 +1,42 @@
+<template>
+    <variable-list v-model="selected" type="single" :vars="vars" :filter="filter" @update:modelValue="handleSelect" />
+</template>
+<script lang="ts">
+import { ref } from 'vue';
+import VariableList from '../VariableList.vue';
+import { useFlowEditorStore } from 'src/stores/flowEditor';
+import { IActionVariable } from 'src/types/ActionTypes';
+export default {
+    name: 'VariableAdd',
+    components: {
+        VariableList,
+    },
+    props: {
+        appId: Number,
+        filter: String
+    },
+    setup(props, { emit }) {
+        const store = useFlowEditorStore();
+        let vars: IActionVariable[] = [];
+        console.log(store.currentFlow !== undefined && store.activeNode !== undefined);
+        
+        if (store.currentFlow !== undefined && store.activeNode !== undefined) {
+            vars = store.currentFlow.getVarNames(store.activeNode);
+        }
+        return {
+            vars,
+            selected: ref([]),
+            handleSelect: (newSelection: any[]) => {
+                if (newSelection.length > 0) {
+                    const v = newSelection[0];
+                    let name = v.name
+                    if (typeof name === 'object') {
+                        name = name.name
+                    }
+                    emit('select', { _t: `var(${name})`, ...v }); // 假设您只需要选择的第一个字段的名称
+                }
+            }
+        }
+    },
+}
+</script>

frontend/src/components/FieldList.vue

@@ -30,9 +30,9 @@ export default {
       { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
       { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
     ]
-
+    
     const { state : rows, isReady: isLoaded, isLoading } = useAsyncState((args) => {
-      if (props.fields) {
+      if (props.fields && Object.keys(props.fields).length > 0) {
         return props.fields.map(f => ({ name: f.label, objectType: 'field', ...f }));
       } else {
         return api.get('api/v1/appfields', {

frontend/src/components/FieldSelect.vue

@@ -11,6 +11,7 @@
 import { ref, onMounted, reactive, watchEffect } from 'vue'
 import { api } from 'boot/axios';
 
+
 export default {
   name: 'fieldSelect',
   props: {
@@ -28,10 +29,14 @@ export default {
       type:Array,
       default:()=>[]
     },
-    updateSelects: {
-      type: Function
+    fieldTypes:{
+      type:Array,
+      default:()=>[]
     },
     filter: String,
+    updateSelectFields: {
+      type: Function
+    },
   },
   setup(props) {
     const isLoaded = ref(false);
@@ -43,33 +48,39 @@ export default {
     const pageSetting = ref({
       sortBy: 'desc',
       descending: false,
-      page: 2,
+      page: 1,
       rowsPerPage: props.not_page ? 0 : 5
       // rowsNumber: xx if getting data from a server
     });
     const rows = reactive([]);
     const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
 
-    watchEffect(() => {
-        props.updateSelects(selected);
-    });
-
     onMounted(async () => {
-      const res = await api.get('api/v1/appfields', {
+      const url = props.fieldTypes.includes('SPACER')?'api/v1/allfields':'api/v1/appfields';
+      const res = await api.get(url, {
         params: {
           app: props.appId
         }
       });
       let fields = res.data.properties;
-      console.log(fields);
       Object.keys(fields).forEach((key) => {
         const fld = fields[key];
-        // rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
-        rows.push({ name: fld.label, ...fld });
+        if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
+          rows.push({ name: fld.label || fld.code, ...fld });
+        }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){
+          rows.push({ name: fld.label || fld.code, ...fld });
+        }
+
       });
       isLoaded.value = true;
     });
 
+    watchEffect(()=>{
+      if (selected.value && selected.value[0] && props.updateSelectFields) {
+        props.updateSelectFields(selected)
+      }
+    });
+
     return {
       columns,
       rows,

frontend/src/components/ShowDialog.vue

@@ -1,20 +1,17 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm" > -->
     <q-dialog :model-value="visible" persistent bordered >
-      <q-card style="min-width: 40vw; max-width: 80vw; max-height: 95vh;" :style="cardStyle">
+      <q-card class="" style="min-width: 40vw; max-width: 80vw; max-height: 95vh;" :style="cardStyle">
         <q-toolbar class="bg-grey-4">
           <q-toolbar-title>{{ name }}</q-toolbar-title>
           <q-space></q-space>
           <slot name="toolbar"></slot>
           <q-btn flat round dense icon="close" @click="CloseDialogue('Cancel')" />
         </q-toolbar>
-        <q-card-section>
-          <!-- <div class="text-h6">{{ name }}</div> -->
-        </q-card-section>
-        <q-card-section class="q-pt-none" :style="sectionStyle">
+        <q-card-section class="q-mt-md" :style="sectionStyle">
          <slot></slot>
         </q-card-section>
-        <q-card-actions align="right" class="text-primary q-mt-lg">
+        <q-card-actions align="right" class="text-primary">
           <q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
           <q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
         </q-card-actions>

frontend/src/components/VariableList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="q-pa-md">
-    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue"
+    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue" :filter="filter"
       @update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
   </div>
 </template>
@@ -19,7 +19,8 @@ export default {
       reqired: true,
       default: () => []
     },
-    modelValue: Array
+    modelValue: Array,
+    filter: String
   },
   emits: [
     'update:modelValue'

frontend/src/components/left/AppSelector.vue

@@ -30,7 +30,7 @@
           </template>
         </q-input>
       </template>
-      <AppSelect ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelect>
+      <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
   </ShowDialog>
 </template>
 
@@ -38,7 +38,7 @@
 import { defineComponent,ref } from 'vue';
 import {AppInfo} from '../../types/ActionTypes'
 import ShowDialog from '../../components/ShowDialog.vue';
-import AppSelect from '../../components/AppSelect.vue';
+import AppSelectBox from '../../components/AppSelectBox.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { useAuthStore } from 'src/stores/useAuthStore';
 export default defineComponent({
@@ -47,7 +47,7 @@ export default defineComponent({
     "appSelected"
   ],
   components:{
-    AppSelect,
+    AppSelectBox,
     ShowDialog
   },
   setup(props, context) {

frontend/src/components/left/EventTree.vue

@@ -1,48 +1,51 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm"> -->
-    <q-tree
-      :nodes="store.eventTree.screens"
-      node-key="eventId"
-      children-key="events"
-      no-connectors
-      v-model:expanded="store.expandedScreen"
-      :dense="true"
-      :ref="tree"
-    >
-      <template v-slot:header-EVENT="prop">
-        <div class="row col items-start no-wrap event-node" @click="onSelected(prop.node)">
-          <q-icon v-if="prop.node.eventId"
-                  name="play_circle"
-                  :color="prop.node.hasFlow?'green':'grey'"
-                  size="16px" class="q-mr-sm">
-                  </q-icon>
-          <div class="no-wrap" :class="selectedEvent && prop.node.eventId===selectedEvent.eventId?'selected-node':''">{{ prop.node.label }}</div>
+  <q-tree :nodes="store.eventTree.screens" node-key="eventId" children-key="events" no-connectors
+    v-model:expanded="store.expandedScreen" :dense="true" :ref="tree">
+    <template v-slot:header-EVENT="prop">
+      <div :ref="prop.node.eventId" class="row col items-center no-wrap event-node" @click="onSelected(prop.node)">
+        <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px"
+          class="q-mr-sm">
+        </q-icon>
+        <div class="no-wrap"
+          :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''">{{
+            prop.node.label }}</div>
+        <q-space></q-space>
+        <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
+      </div>
+    </template>
+    <template v-slot:header-CHANGE="prop">
+      <div class="row col items-start no-wrap event-node">
+        <div class="no-wrap"
+        :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''"
+        >{{ prop.node.label }}</div>
+        <q-space></q-space>
+        <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm"
+          @click="addChangeEvent(prop.node)"></q-icon>
+      </div>
+    </template>
+    <template v-slot:header-DELETABLE="prop">
+      <div class="row col items-start event-node" @click="onSelected(prop.node)">
+          <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px" class="q-mr-sm" />
+          <div class="no-wrap" :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''" >{{ prop.node.label }}</div>
           <q-space></q-space>
-          <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
-        </div>
-      </template>
-      <template v-slot:header-CHANGE="prop" >
-        <div class="row col items-start no-wrap event-node" >
-          <div class="no-wrap">{{ prop.node.label }}</div>
-          <q-space></q-space>
-          <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm" @click="addChangeEvent(prop.node)"></q-icon>
-        </div>
-      </template>
-    </q-tree>
-    <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg" widht="400px">
-      <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
-    </show-dialog>
+          <q-icon  name="delete_forever"  color="negative" size="16px" @click="deleteEvent(prop.node)"></q-icon>
+      </div>
+    </template>
+  </q-tree>
+  <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg">
+    <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
+  </show-dialog>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref } from 'vue';
-import { IKintoneEvent ,IKintoneEventGroup, IKintoneEventNode, kintoneEvent} from '../../types/KintoneEvents';
-import { storeToRefs } from 'pinia';
+import { QTree, useQuasar } from 'quasar';
+import { ActionFlow, RootAction } from 'src/types/ActionTypes';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
-import ShowDialog from '../ShowDialog.vue';
+import { defineComponent, ref } from 'vue';
+import { IKintoneEvent, IKintoneEventGroup, IKintoneEventNode } from '../../types/KintoneEvents';
 import FieldSelect from '../FieldSelect.vue';
-import { QTree } from 'quasar';
+import ShowDialog from '../ShowDialog.vue';
 export default defineComponent({
   name: 'EventTree',
   components: {
@@ -50,6 +53,7 @@ export default defineComponent({
     FieldSelect,
   },
   setup(props, context) {
+    const $q = useQuasar();
     const appDg = ref();
     const store = useFlowEditorStore();
     const showDialog = ref(false);
@@ -58,62 +62,79 @@ export default defineComponent({
     // const selectedFlow = store.currentFlow;
 
     // const expanded=ref();
-    const selectedEvent = ref<IKintoneEvent|null>(null);
-    const selectedChangeEvent=ref<IKintoneEventGroup|null>(null);
-    const isFieldChange = (node:IKintoneEventNode)=>{
-      return node.header=='EVENT' && node.eventId.indexOf(".change.")>-1;
+    const selectedEvent = ref<IKintoneEvent | null>(null);
+    const selectedChangeEvent = ref<IKintoneEventGroup | null>(null);
+    const isFieldChange = (node: IKintoneEventNode) => {
+      return node.header == 'EVENT' && node.eventId.indexOf(".change.") > -1;
     }
     //フィールド値変更イベント追加
-    const closeDg = (val:string) => {
+    const closeDg = (val: string) => {
       if (val == 'OK') {
-        if(!selectedChangeEvent.value){return;}
+        if (!selectedChangeEvent.value) { return; }
         const field = appDg.value.selected[0];
         const eventid = `${selectedChangeEvent.value.eventId}.${field.code}`;
-        if(store.eventTree.findEventById(eventid)){
+        if (store.eventTree.findEventById(eventid)) {
           return;
         }
-        selectedChangeEvent.value?.events.push(
-          new kintoneEvent(
-            field.label,
-            eventid,
-            selectedChangeEvent.value.eventId)
-        );
+        selectedChangeEvent.value?.events.push({
+          eventId: eventid,
+          label: field.name,
+          parentId: selectedChangeEvent.value.eventId,
+          header: 'DELETABLE'
+        });
         tree.value?.expanded?.push(selectedChangeEvent.value.eventId);
         tree.value?.expandAll();
       }
     };
-    const addChangeEvent=(node:IKintoneEventGroup)=>{
-      if(store.appInfo===undefined){
-          return;
+    const addChangeEvent = (node: IKintoneEventGroup) => {
+      if (store.appInfo === undefined) {
+        return;
       }
-      selectedChangeEvent.value=node;
-      showDialog.value=true;
+      selectedChangeEvent.value = node;
+      showDialog.value = true;
     }
-    const onSelected=(node:IKintoneEvent)=>{
-        if(!node.eventId){
-          return;
-        }
-        selectedEvent.value=node;
-        if(store.appInfo===undefined){
-          return;
-        }
-        const screen = store.eventTree.findEventById(node.parentId);
-        let flow =store.findFlowByEventId(node.eventId);
-        let screenName=screen!==null?screen.label:"";
-        let nodeLabel = node.label;
-        // if(isFieldChange(node)){
-        //   screenName=nodeLabel;
-        //   nodeLabel=`${node.label}の値を変更したとき`;
-        // }
-        if(flow!==undefined && flow!==null ){
-          store.selectFlow(flow);
-        }else{
-          const root = new RootAction(node.eventId,screenName,nodeLabel)
-            const flow =new ActionFlow(root);
-            store.flows?.push(flow);
-            store.selectFlow(flow);
-            selectedEvent.value.flowData=flow;
-        }
+
+    const deleteEvent = (node: IKintoneEvent) => {
+      if (!node.eventId) {
+        return;
+      }
+      store.deleteEvent(node);
+      store.selectFlow(undefined)
+
+      $q.notify({
+        type: 'positive',
+        caption: "通知",
+        message: `イベント ${node.label} 削除`
+      })
+    }
+
+    const onSelected = (node: IKintoneEvent) => {
+      if (!node.eventId) {
+        return;
+      }
+      selectedEvent.value = node;
+      if (store.appInfo === undefined) {
+        return;
+      }
+      const screen = store.eventTree.findEventById(node.parentId);
+
+      let flow = store.findFlowByEventId(node.eventId);
+      let screenName = screen !== null ? screen.label : "";
+      let nodeLabel = node.label;
+      // if(isFieldChange(node)){
+      //   screenName=nodeLabel;
+      //   nodeLabel=`${node.label}の値を変更したとき`;
+      // }
+
+      if (flow !== undefined && flow !== null) {
+        store.selectFlow(flow);
+      } else {
+        const root = new RootAction(node.eventId, screenName, nodeLabel)
+        const flow = new ActionFlow(root);
+        store.flows?.push(flow);
+        store.selectFlow(flow);
+        selectedEvent.value.flowData = flow;
+      }
     };
     return {
       // eventTree,
@@ -125,6 +146,7 @@ export default defineComponent({
       onSelected,
       selectedEvent,
       addChangeEvent,
+      deleteEvent,
       closeDg,
       store
     }
@@ -132,20 +154,25 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
-.nowrap{
-  flex-wrap:nowarp;
-  text-wrap:nowarp;
+.nowrap {
+  flex-wrap: nowarp;
+  text-wrap: nowarp;
 }
-.event-node{
-  cursor:pointer;
+
+.event-node {
+  cursor: pointer;
 }
-.selected-node{
+
+.selected-node {
   color: $primary;
   font-weight: bolder;
 }
-.event-node:hover{
+
+.event-node:hover {
   background-color: $light-blue-1;
 }
 
+.delete-btn {
+  margin-right: 5px;
+}
 </style>
-

frontend/src/components/right/AppFieldSelect.vue

@@ -18,121 +18,68 @@
             <q-separator />
             <q-card-section class="q-pa-none q-ma-none">
                 <div style="">
-                    <div v-if="selectedField.fields && selectedField.fields.length > 0 ">
-                      <q-list bordered>
-                        <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator v-slot="{ item, index }">
-                            <q-item :key="index" dense clickable >
-                                <q-item-section>
+                    <div v-if="selectedField.fields && selectedField.fields.length > 0">
+                        <q-list bordered>
+                            <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator
+                                v-slot="{ item, index }">
+                                <q-item :key="index" dense clickable>
+                                    <q-item-section>
                                         <q-item-label>
                                             {{ item.label }}
                                         </q-item-label>
-                                </q-item-section>
-                                <q-item-section side>
-                                    <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
-                                </q-item-section>
-                            </q-item>
-                        </q-virtual-scroll>
-                      </q-list>
+                                    </q-item-section>
+                                    <q-item-section side>
+                                        <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
+                                    </q-item-section>
+                                </q-item>
+                            </q-virtual-scroll>
+                        </q-list>
                     </div>
                     <!-- <div v-else class="row q-mt-lg">
                     </div> -->
                 </div>
                 <!-- <q-separator /> -->
             </q-card-section>
-            <q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length===0">
+            <q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length === 0">
                 <div class="row">
                     <div class="text-grey text-caption"> {{ $props.placeholder }}</div>
                     <!-- <q-btn flat color="grey" label="clear" @click="clear" /> -->
                 </div>
             </q-card-section>
         </q-card>
-     </div>
-
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeFieldDialog" ref="fieldDlg">
-
-        <div class="q-mx-md q-mb-lg">
-            <div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
-
-            <div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
-                <div v-if="!showSelectApp && selectedField.app">{{ selectedField.app?.name }}</div>
-                <q-space />
-                <div>
-                    <q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
-                        showSelectApp = true;
-                    }"></q-btn>
-                </div>
-            </div>
-        </div>
-
-        <div v-if="!showSelectApp && selectedField.app?.name">
-            <div>
-                <div class="row q-mb-md">
-                    <!-- <div class="col"> -->
-                    <div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
-                    <!-- </div> -->
-                    <q-space />
-                    <!-- <div class="col"> -->
-                    <div class="q-mr-md">
-                      <q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
-                          <template v-slot:before>
-                              <q-icon name="search" />
-                          </template>
-                      </q-input>
-                    </div>
-                </div>
-                <div class="row">
-                    <field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelects="updateItems"
-                        :appId="selectedField.app?.id" not_page :filter="fieldFilter" :selectedFields="selectedField.fields"></field-select>
-                </div>
-            </div>
-        </div>
-        <div style="min-width: 45vw;" v-else>
-        </div>
-
-    </show-dialog>
-
-    <show-dialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeAppDlg">
-        <template v-slot:toolbar>
-            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
-                <template v-slot:before>
-                    <q-icon name="search" />
-                </template>
-            </q-input>
-        </template>
-
-        <AppSelect ref="appDlg" name="アプリ" type="single" :filter="filter"
-            :updateExternalSelectAppInfo="updateExternalSelectAppInfo"></AppSelect>
+    </div>
+    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeAFBox">
+        <AppFieldSelectBox v-model:selectedField="selectedField" :selectType="selectType" ref="afBox"/>
     </show-dialog>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watchEffect, computed } from 'vue';
+import { defineComponent, ref, watchEffect } from 'vue';
+import AppFieldSelectBox from '../AppFieldSelectBox.vue';
 import ShowDialog from '../ShowDialog.vue';
-import FieldSelect from '../FieldSelect.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import AppSelect from '../AppSelect.vue';
-interface IApp{
-  id:string,
-  name:string
+
+export interface IApp {
+    id: string,
+    name: string
 }
-interface IField {
+export interface IField {
     name: string,
     code: string,
     type: string
 }
 
-interface IAppFields{
-   app?:IApp,
-   fields:IField[]
+export interface IAppFields {
+    app?: IApp,
+    fields: IField[]
 }
 
 export default defineComponent({
-    inheritAttrs:false,
+    inheritAttrs: false,
     name: 'AppFieldSelect',
     components: {
         ShowDialog,
-        FieldSelect,
-        AppSelect,
+        AppFieldSelectBox
     },
     props: {
         displayName: {
@@ -151,84 +98,54 @@ export default defineComponent({
             type: Object,
             default: null
         },
-        selectType:{
-            type:String,
-            default:'single'
+        selectType: {
+            type: String,
+            default: 'single'
         }
     },
     setup(props, { emit }) {
-        const appDlg = ref();
-        const fieldDlg = ref();
         const show = ref(false);
-        const showSelectApp = ref(false);
-       const selectedField = ref<IAppFields>({
-          app:undefined,
-          fields:[]
-       });
-       if(props.modelValue && "app" in props.modelValue && "fields" in props.modelValue){
-         selectedField.value=props.modelValue as IAppFields;
-       }
+        const afBox = ref();
+        const selectedField = ref<IAppFields>({
+            app: undefined,
+            fields: []
+        });
+        if (props.modelValue && 'app' in props.modelValue && 'fields' in props.modelValue) {
+            selectedField.value = props.modelValue as IAppFields;
+        }
         const store = useFlowEditorStore();
 
-        const isSelected = computed(() => {
-            return selectedField.value !== null && typeof selectedField.value === 'object' && ('app' in selectedField.value)
-        });
-
-        const showDg = () => {
-            show.value = true;
-        };
-
         const clear = () => {
-            selectedField.value ={
-              fields:[]
-            } ;
+            selectedField.value = {
+                fields: []
+            };
         }
 
-        const closeAppDlg = (val: string) => {
+        const removeField = (index: number) => {
+            selectedField.value.fields.splice(index, 1);
+        }
+
+        const closeAFBox = (val: string) => {
             if (val == 'OK') {
-                selectedField.value.app = appDlg.value.selected[0];
-                selectedField.value.fields=[];
-                showSelectApp.value=false;
+                console.log(afBox.value);
+                
+                selectedField.value = afBox.value.selField;
             }
         };
 
-        const closeFieldDialog=(val:string)=>{
-          if (val == 'OK') {
-                selectedField.value.fields = fieldDlg.value.selected;
-            }
-        };
-        const updateExternalSelectAppInfo = (newAppinfo:IApp) => {
-          // selectedField.value.app = newAppinfo
-        }
-
-        const updateItems = (newFields:IField[]) => {
-          // selectedField.value.fields = newFields
-        }
-
-        const removeField=(index:number)=>{
-          selectedField.value.fields.splice(index,1);
-        }
         watchEffect(() => {
             emit('update:modelValue', selectedField.value);
         });
 
         return {
             store,
-            appDlg,
-            fieldDlg,
+            afBox,
             show,
-            showDg,
-            closeAppDlg,
-            closeFieldDialog,
+            showDg: () => { show.value = true },
             selectedField,
-            showSelectApp,
-            isSelected,
-            updateExternalSelectAppInfo,
-            filter: ref(),
-            updateItems,
             clear,
-            fieldFilter: ref(),
-            removeField
+            removeField,
+            closeAFBox,
         };
     }
 });

frontend/src/components/right/AppSelect.vue

@@ -0,0 +1,93 @@
+<template>
+    <div>
+        <q-field :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="() => { dgIsShow = true }">アプリ選択</q-btn>
+                    </q-card-actions>
+                    <q-card-section class="text-caption">
+                        <div v-if="selectedField.app.name">
+                            {{ selectedField.app.name }}
+                        </div>
+                        <div v-else>{{ placeholder }}</div>
+                    </q-card-section>
+                </q-card>
+            </template>
+        </q-field>
+    </div>
+
+    <ShowDialog v-model:visible="dgIsShow" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh">
+        <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
+                <template v-slot:before>
+                    <q-icon name="search" />
+                </template>
+            </q-input>
+        </template>
+        <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
+    </ShowDialog>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, reactive, ref, watchEffect } from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+import AppSelectBox from '../AppSelectBox.vue';
+
+
+export default defineComponent({
+    inheritAttrs: false,
+    name: 'AppSelect',
+    components: {
+        ShowDialog,
+        AppSelectBox
+    },
+    props: {
+        context: {
+            type: Array<Props>,
+            default: '',
+        },
+        displayName: {
+            type: String,
+            default: '',
+        },
+        name: {
+            type: String,
+            default: '',
+        },
+        placeholder: {
+            type: String,
+            default: '',
+        },
+        modelValue: {
+            type: Object,
+            default: null
+        }
+    },
+    setup(props, { emit }) {
+        const appDg = ref()
+        const dgIsShow = ref(false)
+        const selectedField = props.modelValue && props.modelValue.app ? props.modelValue : reactive({app:{}});
+        const closeDg = (state: string) => {
+            dgIsShow.value = false;
+            if (state == 'OK') {
+                selectedField.app = appDg.value.selected[0];
+            }
+        };
+
+        console.log(selectedField);
+
+        watchEffect(() => {
+            emit('update:modelValue', selectedField);
+        });
+
+        return {
+            filter: ref(''),
+            dgIsShow,
+            appDg,
+            closeDg,
+            selectedField
+        };
+    }
+});
+</script>

frontend/src/components/right/ConditionInput.vue

@@ -4,7 +4,8 @@
       <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-btn color="grey-3" text-color="black" :disable="btnDisable" @click="showDg()">クリックで設定：{{ isSetted ?
+              '設定済み' : '未設定' }}</q-btn>
           </q-card-actions>
           <q-card-section class="text-caption">
             <div v-if="!isSetted">{{ placeholder }}</div>
@@ -20,7 +21,7 @@
 
 
 <script lang="ts">
-import { ConditionNode, ConditionTree, Operator } from 'app/src/types/Conditions';
+import { ConditionNode, ConditionTree, Operator, OperatorListItem } from 'app/src/types/Conditions';
 import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
 import ConditionEditor from '../ConditionEditor/ConditionEditor.vue';
 
@@ -28,6 +29,10 @@ type Props = {
   props?: {
     name: string;
     modelValue?: {
+      app: {
+        id: string;
+        name: string;
+      },
       fields: {
         type: string;
         label: string;
@@ -37,6 +42,15 @@ type Props = {
   }
 };
 
+type InputConfg = {
+  canInput: boolean;
+  buttonsConfig: {
+    label: string;
+    color: string;
+    type: string;
+  }[]
+};
+
 
 export default defineComponent({
   name: 'FieldInput',
@@ -72,28 +86,71 @@ export default defineComponent({
     sourceType: {
       type: String,
       default: 'field'
+    },
+    onlySourceSelect: {
+      type: Boolean,
+      default: false
+    },
+    operatorList: {
+      type: Array,
+    },
+    inputConfig: {
+      type: Object,
+      default: () => ({
+        left: {
+          canInput: false,
+          buttonsConfig: [
+            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        },
+        right: {
+          canInput: true,
+          buttonsConfig: [
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        },
+      })
     }
   },
 
   setup(props, { emit }) {
     const source = props.context.find(element => element?.props?.name === 'sources')
-    
+
     if (source) {
-      if(props.sourceType === 'field'){
-        provide('sourceFields', computed( () => source.props?.modelValue?.fields ?? []));
-      } else if(props.sourceType === 'app'){
-        console.log('sourceApp', source.props?.modelValue);
-        provide('sourceApp', computed( () => source.props?.modelValue?.app?.id));
+      if (props.sourceType === 'field') {
+        provide('sourceFields', computed(() => source.props?.modelValue?.fields ?? []));
+      } else if (props.sourceType === 'app') {
+        provide('sourceApp', computed(() => source.props?.modelValue?.app?.id));
       }
     }
 
+    provide('leftDynamicItemConfig', props.inputConfig.left);
+    provide('rightDynamicItemConfig', props.inputConfig.right);
+    provide('Operator', props.operatorList);
+
+    const btnDisable = computed(() => {
+      const onlySourceSelect = props.onlySourceSelect;
+
+      if (!onlySourceSelect) {
+        return false;
+      }
+
+      if (props.sourceType === 'field') {
+        return source?.props?.modelValue?.fields?.length ?? 0 > 0;
+      } else if (props.sourceType === 'app') {
+        return source?.props?.modelValue?.app?.id ? false : true
+      }
+      return true;
+    })
+
     const appDg = ref();
     const show = ref(false);
     const tree = reactive(new ConditionTree());
     if (props.modelValue && props.modelValue !== '') {
       tree.fromJson(props.modelValue);
     } else {
-      const newNode = new ConditionNode({}, Operator.Equal, '', tree.root);
+      const newNode = new ConditionNode({}, (props.operatorList && props.operatorList.length > 0) ? props.operatorList[0] as OperatorListItem : Operator.Equal, '', tree.root);
       tree.addNode(tree.root, newNode);
     }
 
@@ -109,13 +166,15 @@ export default defineComponent({
 
     const onClosed = (val: string) => {
       if (val == 'OK') {
-        const conditionJson = tree.toJson();
         isSetted.value = true;
+        tree.setQuery(tree.buildConditionQueryString(tree.root));
+        const conditionJson = tree.toJson();
         emit('update:modelValue', conditionJson);
       }
     };
 
     watchEffect(() => {
+      tree.setQuery(tree.buildConditionQueryString(tree.root));
       const conditionJson = tree.toJson();
       emit('update:modelValue', conditionJson);
     });
@@ -127,7 +186,8 @@ export default defineComponent({
       showDg,
       onClosed,
       tree,
-      conditionString
+      conditionString,
+      btnDisable
     };
   }
 });

frontend/src/components/right/DataMapping.vue

@@ -0,0 +1,250 @@
+<template>
+    <div>
+        <q-field :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" :disable="btnDisable"
+                            @click="() => { dgIsShow = true }">クリックで設定</q-btn>
+                    </q-card-actions>
+                    <q-card-section class="text-caption">
+                        <div v-if="mappingObjectsInputDisplay && mappingObjectsInputDisplay.length > 0">
+                            <div v-for="(item) in mappingObjectsInputDisplay" :key="item">{{ item }}</div>
+                        </div>
+                        <div v-else>{{ placeholder }}</div>
+                    </q-card-section>
+                </q-card>
+            </template>
+        </q-field>
+        <show-dialog v-model:visible="dgIsShow" name="データマッピング" @close="closeDg" min-width="50vw" min-height="60vh">
+
+            <div class="q-mx-md">
+                <div class="row q-col-gutter-x-xs flex-center">
+                    <div class="col-6">
+                        <div class="q-mx-xs">ソース</div>
+                    </div>
+                    <!-- <div class="col-1">
+                    </div> -->
+                    <div class="col-6">
+                        <div class="q-mx-xs">目標</div>
+                    </div>
+                    <!-- <div class="col-1"><q-btn flat round dense icon="add" size="sm" @click="addMappingObject" /> -->
+                    <!-- </div> -->
+                </div>
+                <q-virtual-scroll style="max-height: 75vh;" :items="mappingProps" separator v-slot="{ item, index }">
+                    <!-- <div class="q-my-sm" v-for="(item, index) in mappingProps" :key="item.id"> -->
+                    <div class="row q-my-md q-col-gutter-x-md flex-center">
+                        <div class="col-6">
+                            <ConditionObject :config="config" v-model="item.from" />
+                        </div>
+                        <!-- <div class="col-1">
+                        </div> -->
+                        <div class="col-6">
+                            <q-field v-model="item.vName" type="text" outlined dense>
+                                <!-- <template v-slot:append>
+                                    <q-icon name="search" class="cursor-pointer"
+                                        @click="() => { mappingProps[index].to.isDialogVisible = true }" />
+                                </template> -->
+                                <template v-slot:control>
+                                    <div class="self-center full-width no-outline" tabindex="0"
+                                        v-if="item.to.app?.name && item.to.fields?.length > 0 && item.to.fields[0].label">
+                                        {{ `${item.to.fields[0].label}` }}
+                                        <q-tooltip>
+                                            <div>アプリ : {{ item.to.app.name }}</div>
+                                            <div>フィールドのコード : {{ item.to.fields[0].code }}</div>
+                                            <div>フィールドのタイプ : {{ item.to.fields[0].type }}</div>
+                                            <div>フィールド : {{ item.to.fields[0] }}</div>
+                                        </q-tooltip>
+                                    </div>
+                                </template>
+                            </q-field>
+                        </div>
+                        <!-- <div class="col-1">
+                            <q-btn flat round dense icon="delete" size="sm" @click="() => deleteMappingObject(index)" />
+                        </div> -->
+                    </div>
+
+                    <show-dialog v-model:visible="mappingProps[index].to.isDialogVisible" name="フィールド一覧"
+                        @close="closeToDg" ref="fieldDlg">
+                        <FieldSelect v-if="onlySourceSelect" ref="fieldDlg" name="フィールド" :appId="sourceAppId" not_page
+                            :selectedFields="mappingProps[index].to.fields"
+                            :updateSelects="(fields) => { mappingProps[index].to.fields = fields; mappingProps[index].to.app = sourceApp }">
+                        </FieldSelect>
+                        <AppFieldSelectBox v-else v-model:selectedField="mappingProps[index].to" />
+                    </show-dialog>
+                    <!-- </div> -->
+                </q-virtual-scroll>
+            </div>
+        </show-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import { v4 as uuidv4 } from 'uuid';
+import { computed, defineComponent, watch, isRef, reactive, ref, watchEffect } from 'vue';
+import ConditionObject from '../ConditionEditor/ConditionObject.vue';
+import ShowDialog from '../ShowDialog.vue';
+import AppFieldSelectBox from '../AppFieldSelectBox.vue';
+import FieldSelect from '../FieldSelect.vue';
+import IAppFields from './AppFieldSelect.vue';
+import { api } from 'boot/axios';
+
+type Props = {
+    props?: {
+        name: string;
+        modelValue?: {
+            app: {
+                id: string;
+                name: string;
+            }
+        }
+    }
+};
+type ValueType = {
+    id: string;
+    from: object;
+    to: typeof IAppFields & {
+        isDialogVisible: boolean;
+    };
+}
+
+
+export default defineComponent({
+    name: 'DataMapping',
+    inheritAttrs: false,
+    components: {
+        ShowDialog,
+        ConditionObject,
+        AppFieldSelectBox,
+        FieldSelect
+    },
+    props: {
+        context: {
+            type: Array<Props>,
+            default: '',
+        },
+        displayName: {
+            type: String,
+            default: '',
+        },
+        name: {
+            type: String,
+            default: '',
+        },
+        modelValue: {
+            type: Object as () => ValueType[],
+        },
+        placeholder: {
+            type: String,
+            default: '',
+        },
+        onlySourceSelect: {
+            type: Boolean,
+            default: false
+        }
+    },
+
+    setup(props, { emit }) {
+        const source = props.context.find(element => element?.props?.name === 'sources')
+
+        const sourceApp = computed(() => source?.props?.modelValue?.app);
+
+        const sourceAppId = computed(() => sourceApp.value?.id);
+
+        const closeDg = () => {
+            emit('update:modelValue', mappingProps.value
+            );
+        }
+
+        const closeToDg = () => {
+            emit('update:modelValue', mappingProps.value
+            );
+        }
+
+        const mappingProps = computed(() => props.modelValue ?? []);
+
+        watch(() => sourceAppId.value, async (newId, oldId) => {
+            if (!newId) return;
+            const a = await api.get('api/v1/appfields', {
+                params: {
+                    app: newId
+                }
+            }).then(res => {
+                return Object.values(res.data.properties)
+                    .map(f => ({ name: f.label, objectType: 'field', ...f }))
+                    .map(f => {
+                        return {
+                            id: uuidv4(),
+                            from: {},
+                            to: {
+                                app: sourceApp.value,
+                                fields: [f],
+                                isDialogVisible: false
+                            }
+                        }
+                    })
+            })
+            const modelValue = props.modelValue ?? [];
+
+            if (modelValue.length === 0 || newId !== oldId) {
+                emit('update:modelValue', a);
+                return;
+            }
+            const modelValueFieldNames = modelValue.map(item => item.to.fields[0].name);
+
+            const newFields = a.filter(field => !modelValueFieldNames.includes(field.to.fields[0].name));
+
+            const updatedModelValue = [...modelValue, ...newFields];
+
+            emit('update:modelValue', updatedModelValue);
+        })
+
+        console.log(mappingProps.value);
+
+        // const deleteMappingObject = (index: number) => mappingProps.length === 1
+        //     ? mappingProps.splice(0, mappingProps.length, defaultMappingProp())
+        //     : mappingProps.splice(index, 1);
+
+        const mappingObjectsInputDisplay = computed(() =>
+            (mappingProps.value && Array.isArray(mappingProps.value)) ?
+                mappingProps.value
+                    .filter(item => item.from?.sharedText && item.to.fields?.length > 0)
+                    .map(item => {
+                        return `field(${item.to.app?.id},${item.to.fields[0].label}) = ${item.from.sharedText} `;
+                    })
+                : []
+        );
+
+
+
+        const btnDisable = computed(() => props.onlySourceSelect ? !(source?.props?.modelValue?.app?.id) : false);
+
+        //集計処理方法
+
+        watchEffect(() => {
+            emit('update:modelValue', mappingProps.value);
+        });
+        return {
+            uuidv4,
+            dgIsShow: ref(false),
+            closeDg,
+            toDgIsShow: ref(false),
+            closeToDg,
+            mappingProps,
+            // addMappingObject: () => mappingProps.push(defaultMappingProp()),
+            // deleteMappingObject,
+            mappingObjectsInputDisplay,
+            sourceApp,
+            sourceAppId,
+            btnDisable,
+            config: {
+                canInput: false,
+                buttonsConfig: [
+                    { label: '変数', color: 'green', type: 'VariableAdd',editable:false },
+                ]
+            }
+        };
+    },
+});
+</script>
+<style lang="scss"></style>

frontend/src/components/right/DataProcessing.vue

@@ -139,6 +139,7 @@ export default defineComponent({
         }
         return null;
       }));
+      provide('sourceApp', computed(() => source.props?.modelValue?.app?.id));
     }
 
     const actionName = props.context.find(element => element?.props?.name === 'displayName')
@@ -168,12 +169,7 @@ export default defineComponent({
         processingObjects
           .filter(item => item.field && item.logicalOperator && item.vName)
           .map(item => {
-            const name = typeof item.field?.name === 'string'
-              ? item.field.name
-              : item.field?.name.name;
-            return item.logicalOperator.operator!==''?
-                     `${processingProps.name}.${item.vName} = ${item.logicalOperator.operator}(${name})`
-                    :`${processingProps.name}.${item.vName} = ${name}`
+            return`var(${processingProps.name}.${item.vName}) = ${item.field.sharedText}`
           })
         : []
     );

frontend/src/components/right/EventSetter.vue

@@ -61,12 +61,12 @@ export default defineComponent({
         if(store.eventTree.findEventById(addEventId)){
           return;
         }
-        customEvents.events.push(
-          new kintoneEvent(
-            displayName,
-            addEventId,
-            customButtonId)
-        );
+        customEvents.events.push({
+          eventId: addEventId,
+          label: displayName,
+          parentId: customButtonId,
+          header: 'DELETABLE'
+        });
       }
     }
 

frontend/src/components/right/FieldInput.vue

@@ -7,9 +7,6 @@
           {{ selectedField.name }}
         </q-chip>
       </template>
-      <!-- <template v-slot:hint v-if="isSelected">
-        <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
-      </template> -->
       <template v-slot:hint v-if="!isSelected">
         {{ placeholder }}
       </template>
@@ -19,7 +16,7 @@
       </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>
+      <field-select ref="appDg" name="フィールド" :type="selectType" :appId="store.appInfo?.appId" :fieldTypes="fieldTypes"></field-select>
     </show-dialog>
   </div>
 </template>
@@ -54,6 +51,14 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    selectType:{
+        type:String,
+        default:'single'
+    },
+    fieldTypes:{
+      type:Array,
+      default:()=>[]
+    },
     hint: {
       type: String,
       default: '',

frontend/src/components/right/InputText.vue

@@ -33,6 +33,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    fieldTypes:{
+      type:Array,
+      default:()=>[]
+    },
     hint: {
       type: String,
       default: '',

frontend/src/components/right/PropertyList.vue

@@ -22,6 +22,8 @@ import EventSetter from '../right/EventSetter.vue';
 import ColorPicker from './ColorPicker.vue';
 import NumInput from './NumInput.vue';
 import DataProcessing from './DataProcessing.vue';
+import DataMapping from './DataMapping.vue';
+import AppSelect from './AppSelect.vue';
 import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
 
 export default defineComponent({
@@ -37,7 +39,9 @@ export default defineComponent({
     EventSetter,
     ColorPicker,
     NumInput,
-    DataProcessing
+    DataProcessing,
+    DataMapping,
+    AppSelect
   },
   props: {
     nodeProps: {

frontend/src/components/right/SelectBox.vue

@@ -29,7 +29,7 @@ export default defineComponent({
       default:'',
     },
     modelValue: {
-      type: Object,
+      type: [Array,String],
       default: null,
     },
   },

frontend/src/control/flowctrl.ts

@@ -1,44 +1,49 @@
 import { api } from 'boot/axios';
 import { ActionFlow } from 'src/types/ActionTypes';
 
-export class FlowCtrl
-{
-
-  async getFlows(appId:string):Promise<ActionFlow[]>
-  {
-      const flows:ActionFlow[]=[];
-      try{
-        const result = await api.get(`api/flows/${appId}`);
-        //console.info(result.data);
-         if(!result.data || !Array.isArray(result.data)){
-           return [];
-         }
-
-         for(const flow of result.data){
-             flows.push(ActionFlow.fromJSON(flow.content));
-         }
-        return flows;
-      }catch(error){
-        console.error(error);
-        return flows;
+export class FlowCtrl {
+  async getFlows(appId: string): Promise<ActionFlow[]> {
+    const flows: ActionFlow[] = [];
+    try {
+      const result = await api.get(`api/flows/${appId}`);
+      //console.info(result.data);
+      if (!result.data || !Array.isArray(result.data)) {
+        return [];
       }
+
+      for (const flow of result.data) {
+        flows.push(ActionFlow.fromJSON(flow.content));
+      }
+      return flows;
+    } catch (error) {
+      console.error(error);
+      return flows;
+    }
   }
 
-  async SaveFlow(jsonData:any):Promise<boolean>
-  {
-       const result = await api.post('api/flow',jsonData);
-       console.info(result.data)
-       return true;
+  async SaveFlow(jsonData: any): Promise<boolean> {
+    const result = await api.post('api/flow', jsonData);
+    console.info(result.data);
+    return true;
   }
   /**
    * フローを更新する
    * @param jsonData
    * @returns
    */
-  async  UpdateFlow(jsonData:any):Promise<boolean>
-  {
-    const result = await api.put('api/flow/' + jsonData.flowid,jsonData);
-    console.info(result.data)
+  async UpdateFlow(jsonData: any): Promise<boolean> {
+    const result = await api.put('api/flow/' + jsonData.flowid, jsonData);
+    console.info(result.data);
+    return true;
+  }
+  /**
+   * フローを消去する
+   * @param flowId
+   * @returns
+   */
+  async DeleteFlow(flowId: string): Promise<boolean> {
+    const result = await api.delete('api/flow/' + flowId);
+    console.info(result.data);
     return true;
   }
   /**
@@ -46,12 +51,9 @@ export class FlowCtrl
    * @param appid
    * @returns
    */
-  async depoly(appid:string):Promise<boolean>
-  {
+  async depoly(appid: string): Promise<boolean> {
     const result = await api.post(`api/v1/createjstokintone?app=${appid}`);
     console.info(result.data);
     return true;
   }
-
 }
-

frontend/src/pages/RuleEditor.vue

@@ -24,7 +24,7 @@
           <q-btn :label="model+'選択'" color="primary" @click="showDg()" />
           <show-dialog v-model:visible="show" :name="model" @close="closeDg" width="400px">
             <template v-if="model=='アプリ'">
-              <app-select ref="appDg" :name="model" type="single"></app-select>
+              <app-select-box ref="appDg" :name="model" type="single"></app-select-box>
             </template>
             <template v-if="model=='フィールド'">
               <field-select ref="appDg" :name="model" type="multiple" :appId="1"></field-select>
@@ -42,7 +42,7 @@
 
 <script setup lang="ts">
 import ShowDialog from 'components/ShowDialog.vue';
-import AppSelect from 'components/AppSelect.vue';
+import AppSelectBox from 'components/AppSelectBox.vue';
 import FieldSelect from 'components/FieldSelect.vue';
 import ActionSelect from 'components/ActionSelect.vue';
 import { ref } from 'vue'

frontend/src/stores/flowEditor.ts

@@ -1,118 +1,142 @@
 import { defineStore } from 'pinia';
-import { AppInfo ,IActionFlow, IActionNode} from 'src/types/ActionTypes';
-import { IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
-import {FlowCtrl } from '../control/flowctrl';
+import { AppInfo, IActionFlow, IActionNode } from 'src/types/ActionTypes';
+import { IKintoneEvent, KintoneEventManager } from 'src/types/KintoneEvents';
+import { FlowCtrl } from '../control/flowctrl';
 
-export interface FlowEditorState{
-  flowNames1:string;
-  appInfo?:AppInfo;
-  flows?:IActionFlow[];
-  selectedFlow?:IActionFlow|undefined;
-  activeNode:IActionNode|undefined;
-  eventTree:KintoneEventManager;
-  selectedEvent:IKintoneEvent|undefined;
-  expandedScreen:any[];
+export interface FlowEditorState {
+  flowNames1: string;
+  appInfo?: AppInfo;
+  flows?: IActionFlow[];
+  selectedFlow?: IActionFlow | undefined;
+  activeNode: IActionNode | undefined;
+  eventTree: KintoneEventManager;
+  selectedEvent: IKintoneEvent | undefined;
+  expandedScreen: any[];
 }
-const flowCtrl=new FlowCtrl();
+const flowCtrl = new FlowCtrl();
 const eventTree = new KintoneEventManager();
-export const useFlowEditorStore = defineStore("flowEditor",{
-  state: ():FlowEditorState =>  ({
-      flowNames1: '',
-      appInfo:undefined,
-      flows:[],
-      selectedFlow:undefined,
-      activeNode:undefined,
-      eventTree:eventTree,
-      selectedEvent:undefined,
-      expandedScreen:[]
-    }),
+export const useFlowEditorStore = defineStore('flowEditor', {
+  state: (): FlowEditorState => ({
+    flowNames1: '',
+    appInfo: undefined,
+    flows: [],
+    selectedFlow: undefined,
+    activeNode: undefined,
+    eventTree: eventTree,
+    selectedEvent: undefined,
+    expandedScreen: [],
+  }),
   getters: {
     /**
      *
      * @returns 現在編集しているフロー
      */
-    currentFlow():IActionFlow|undefined{
-        return this.selectedFlow;
+    currentFlow(): IActionFlow | undefined {
+      return this.selectedFlow;
     },
     /**
      * KintoneイベントIDから、バンドしているフローを検索する
      * @param state
      * @returns
      */
-    findFlowByEventId(state){
-      return (eventId:string)=>{
-          return state.flows?.find((flow)=>{
-              const root=flow.getRoot();
-              return root?.name===eventId
-          });
-      }
-    }
+    findFlowByEventId(state) {
+      return (eventId: string) => {
+        return state.flows?.find((flow) => {
+          const root = flow.getRoot();
+          return root?.name === eventId;
+        });
+      };
+    },
+
+    findEventById(state) {
+      return (eventId: string) => {
+        return state.eventTree.findEventById(eventId);
+      };
+    },
+
   },
 
   actions: {
-    setFlows(flows:IActionFlow[]){
-      this.flows=flows;
+    setFlows(flows: IActionFlow[]) {
+      this.flows = flows;
     },
-    selectFlow(flow:IActionFlow){
-      this.selectedFlow=flow;
+    selectFlow(flow: IActionFlow | undefined) {
+      this.selectedFlow = flow;
     },
-    setActiveNode(node:IActionNode){
-      this.activeNode=node;
+    setActiveNode(node: IActionNode) {
+      this.activeNode = node;
     },
-    setApp(app:AppInfo){
-      this.appInfo=app;
+    setApp(app: AppInfo) {
+      this.appInfo = app;
     },
     /**
      * DBからフルーを保存する
      * @returns
      */
-    async loadFlow(){
-        if(this.appInfo===undefined) return;
-        const actionFlows = await flowCtrl.getFlows(this.appInfo?.appId);
-        //eventTreeにバンドする
-        this.eventTree.bindFlows(actionFlows);
-        if(actionFlows===undefined || actionFlows.length===0){
-          this.flows=[];
-          this.selectedFlow=undefined;
-          return;
-        }
-        this.setFlows(actionFlows);
-        if(actionFlows && actionFlows.length>0){
-          this.selectFlow(actionFlows[0]);
-        }
-        const expandNames = actionFlows.map(flow=>flow.getRoot()?.title);
-        // const expandName =actionFlows[0].getRoot()?.title;
-        this.expandedScreen=expandNames;
+    async loadFlow() {
+      if (this.appInfo === undefined) return;
+      const actionFlows = await flowCtrl.getFlows(this.appInfo?.appId);
+      //eventTreeにバンドする
+      this.eventTree.bindFlows(actionFlows);
+      if (actionFlows === undefined || actionFlows.length === 0) {
+        this.flows = [];
+        this.selectedFlow = undefined;
+        return;
+      }
+      this.setFlows(actionFlows);
+      if (actionFlows && actionFlows.length > 0) {
+        this.selectFlow(actionFlows[0]);
+      }
+      const expandNames = actionFlows.map((flow) => flow.getRoot()?.title);
+      // const expandName =actionFlows[0].getRoot()?.title;
+      this.expandedScreen = expandNames;
     },
     /**
      * フローをDBに保存及び更新する
      */
-    async saveFlow(flow:IActionFlow){
-      const root=flow.getRoot();
-      const isNew = flow.id==='';
-      const jsonData={
-        flowid: isNew ? flow.createNewId():flow.id,
+    async saveFlow(flow: IActionFlow) {
+      const root = flow.getRoot();
+      const isNew = flow.id === '';
+      const jsonData = {
+        flowid: isNew ? flow.createNewId() : flow.id,
         appid: this.appInfo?.appId,
         eventid: root?.name,
         name: root?.subTitle,
-        content: JSON.stringify(flow)
-      }
+        content: JSON.stringify(flow),
+      };
 
-      if(isNew){
+      if (isNew) {
         return await flowCtrl.SaveFlow(jsonData);
-      }else{
+      } else {
         return await flowCtrl.UpdateFlow(jsonData);
       }
     },
+
+
+    async deleteEvent(event: IKintoneEvent) {
+      const store = useFlowEditorStore();
+      if (event.flowData) {
+        const flow = event.flowData;
+        if (flow.id !== '') {
+          await flowCtrl.DeleteFlow(flow.id)
+          if (this.flows) {
+            this.flows = this.flows.filter((f) => f.id !== flow.id);
+          }
+        }
+        eventTree.deleteEvent(event, store);
+      }
+      else {
+        eventTree.deleteEvent(event, store);
+      }
+    },
     /**
      * デプロイする
      */
-    async deploy():Promise<boolean>{
-      if(this.appInfo===undefined){
+    async deploy(): Promise<boolean> {
+      if (this.appInfo === undefined) {
         return false;
       }
       return await flowCtrl.depoly(this.appInfo?.appId);
-   }
-
-  }
+    },
+  },
 });

frontend/src/types/Conditions.ts

@@ -74,6 +74,11 @@ export class GroupNode implements INode {
 
 }
 
+export type OperatorListItem = {
+  label: string;
+  value: string;
+}
+
 // 条件式ノード
 export class ConditionNode implements INode {
   index: number;
@@ -83,13 +88,13 @@ export class ConditionNode implements INode {
     return this.parent.logicalOperator;
   };
   object: any; // 比較元
-  operator: Operator; // 比較子
+  operator: Operator | OperatorListItem; // 比較子
   value: any;
   get header():string{
     return 'generic';
   }
 
-  constructor(object: any, operator: Operator, value: any, parent: GroupNode) {
+  constructor(object: any, operator: Operator | OperatorListItem, value: any, parent: GroupNode) {
     this.index=0;
     this.type = NodeType.Condition;
     this.object = object;
@@ -113,10 +118,12 @@ export class ConditionNode implements INode {
 export class ConditionTree {
   root: GroupNode;
   maxIndex:number;
+  queryString:string;
 
   constructor() {
     this.maxIndex=0;
     this.root = new GroupNode(LogicalOperator.AND, null);
+    this.queryString='';
   }
 
   // ノード追加
@@ -194,16 +201,53 @@ export class ConditionTree {
     } else {
       const condNode=node as ConditionNode;
       if (condNode.object && condNode.operator ) {
-        let value=condNode.value;
-        if(value && typeof value ==='object' && ('label' in value)){
-            value =condNode.value.label;
-        }
-        return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${condNode.operator} '${value}'`;
+        // let value=condNode.value;
+        // if(value && typeof value ==='object' && ('label' in value)){
+        //     value =condNode.value.label;
+        // }
+        return `${condNode.object.sharedText} ${typeof condNode.operator === 'object' ? condNode.operator.label : condNode.operator} ${condNode.value.sharedText}`;
+        // return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${typeof condNode.operator === 'object' ? condNode.operator.label : condNode.operator} '${value}'`;
       } else {
         return '';
       }
     }
   }
+
+  buildConditionQueryString(node:INode){
+    if (node.type !== NodeType.Condition) {
+      let conditionString = '';
+      if(node.type !== NodeType.Root){
+        conditionString = '(';
+      }
+      
+      const groupNode = node as GroupNode;
+      for (let i = 0; i < groupNode.children.length; i++) {
+        const childConditionString = this.buildConditionQueryString(groupNode.children[i]);
+        if (childConditionString !== '') {
+          conditionString += childConditionString;
+          if (i < groupNode.children.length - 1) {
+            conditionString += ` ${groupNode.logicalOperator.toLowerCase()} `;
+          }
+        }
+      }
+
+      if(node.type !== NodeType.Root){
+        conditionString += ')';
+      }
+      return conditionString;
+    } else {
+      const condNode=node as ConditionNode;
+      if (condNode.object && condNode.operator ) {
+        if (!condNode.object.code || !condNode.value.sharedText){
+          return '';
+        }
+        return `${condNode.object.code} ${typeof condNode.operator === 'object' ? condNode.operator.value : condNode.operator} "${condNode.value.sharedText}"`;
+      } else {
+        return '';
+      }
+    }
+  }
+
   /**
    *
    * @param node ノード移動
@@ -325,7 +369,7 @@ export class ConditionTree {
   }
 
   toJson():string{
-    return JSON.stringify(this.root, (key, value) => {
+    return JSON.stringify({queryString :this.queryString, ...this.root}, (key, value) => {
       if (key === 'parent') {
         return value ? value.type : null;
       }
@@ -333,4 +377,7 @@ export class ConditionTree {
     });
   }
 
+  setQuery(queryString:string){
+    this.queryString=queryString;
+  }
 }

frontend/src/types/KintoneEvents.ts

@@ -1,9 +1,10 @@
-import {IActionFlow} from './ActionTypes';
+import { useFlowEditorStore } from 'src/stores/flowEditor';
+import { IActionFlow } from './ActionTypes';
 export interface IKintoneEventNode {
   label: string;
-  header:string;
-  eventId:string;
-  parentId:string;
+  header: string;
+  eventId: string;
+  parentId: string;
 }
 
 export interface IKintoneEvent extends IKintoneEventNode {
@@ -15,60 +16,64 @@ export interface IKintoneEventGroup extends IKintoneEventNode {
   events: IKintoneEventNode[];
 }
 
-
-export class kintoneEvent implements IKintoneEvent{
+export class kintoneEvent implements IKintoneEvent {
   eventId: string;
-  parentId:string;
-   get hasFlow(): boolean{
-    return this.flowData!==undefined && this.flowData.actionNodes.length>1
-  };
+  parentId: string;
+  get hasFlow(): boolean {
+    return this.flowData !== undefined && this.flowData.actionNodes.length > 1;
+  }
   flowData?: IActionFlow | undefined;
   label: string;
-  get header():string{
-    return "EVENT";
-  }
-  constructor(label:string,eventId:string,parentId:string){
-    this.eventId=eventId;
-    this.label=label;
-    this.parentId=parentId;
+  header = 'EVENT';
+  constructor(label: string, eventId: string, parentId: string) {
+    this.eventId = eventId;
+    this.label = label;
+    this.parentId = parentId;
   }
 }
 
-export class kintoneEventGroup implements IKintoneEventGroup{
+export class kintoneEventGroup implements IKintoneEventGroup {
   eventId: string;
-  parentId:string;
+  parentId: string;
   label: string;
   events: IKintoneEventNode[];
-  get header():string{
-    return "EVENTGROUP";
+  get header(): string {
+    return 'EVENTGROUP';
   }
-  constructor(eventId:string,label:string,events:IKintoneEventNode[],parentId:string){
-    this.eventId=eventId;
-    this.label=label;
-    this.events=events;
-    this.parentId=parentId;
+  constructor(
+    eventId: string,
+    label: string,
+    events: IKintoneEventNode[],
+    parentId: string
+  ) {
+    this.eventId = eventId;
+    this.label = label;
+    this.events = events;
+    this.parentId = parentId;
   }
 }
 
-
-export class kintoneEventForChange implements IKintoneEventGroup{
+export class kintoneEventForChange implements IKintoneEventGroup {
   eventId: string;
-  parentId:string;
+  parentId: string;
   label: string;
   events: IKintoneEventNode[];
-  get header():string{
-    return "CHANGE";
+  get header(): string {
+    return 'CHANGE';
   }
-  constructor(eventId:string,label:string,events:IKintoneEventNode[],parentId:string){
-    this.eventId=eventId;
-    this.label=label;
-    this.events=events;
-    this.parentId=parentId;
+  constructor(
+    eventId: string,
+    label: string,
+    events: IKintoneEventNode[],
+    parentId: string
+  ) {
+    this.eventId = eventId;
+    this.label = label;
+    this.events = events;
+    this.parentId = parentId;
   }
 }
 
-
-
 export class KintoneEventManager {
   public screens: IKintoneEventGroup[];
 
@@ -76,28 +81,32 @@ export class KintoneEventManager {
     this.screens = this.getKintoneEvents();
   }
 
-  public bindFlows(flows:IActionFlow[]){
-    this.screens=this.getKintoneEvents();
-    for (const flow of flows){
-      const eventId =flow.getRoot()?.name;
-      if(eventId!==undefined){
+  public bindFlows(flows: IActionFlow[]) {
+    this.screens = this.getKintoneEvents();
+    for (const flow of flows) {
+      const eventId = flow.getRoot()?.name;
+      if (eventId !== undefined) {
         const eventNode = this.findEventById(eventId);
-        if(eventNode!==null && eventNode.header==="EVENT"){
-          const event =eventNode as kintoneEvent;
-          event.flowData=flow;
-        }else{
+        if (eventNode !== null && eventNode.header === 'EVENT') {
+          const event = eventNode as kintoneEvent;
+          event.flowData = flow;
+        } else {
           //EventGroupのIDを取得
-          const lastIndex = eventId.lastIndexOf(".");
-          const groupId=eventId.substring(0,lastIndex);
+          const lastIndex = eventId.lastIndexOf('.');
+          const groupId = eventId.substring(0, lastIndex);
           const eventNode = this.findEventById(groupId);
-          if(eventNode && (eventNode.header==="EVENTGROUP" || eventNode.header==="CHANGE")){
-            const groupEvent=eventNode as kintoneEventGroup;
-            const newEvent =new kintoneEvent(
-              flow.getRoot()?.subTitle || "",
-              eventId,
-              groupEvent.parentId
-            );
-            newEvent.flowData=flow;
+          if (eventNode && (eventNode.header === 'EVENTGROUP' || eventNode.header === 'CHANGE')) {
+            const groupEvent = eventNode as kintoneEventGroup;
+
+            const newEvent = {
+              label: flow.getRoot()?.subTitle || '',
+              eventId: eventId,
+              parentId: groupId,
+              header: 'DELETABLE',
+              hasFlow: true,
+              flowData: flow,
+            };
+
             groupEvent.events.push(newEvent);
           }
         }
@@ -106,61 +115,193 @@ export class KintoneEventManager {
   }
 
   public findEventById(eventId: string): IKintoneEventNode | null {
-    const screen=this.findScreen(eventId);
-    if(screen) {return screen;}
+    const screen = this.findScreen(eventId);
+    if (screen) {
+      return screen;
+    }
     for (const screen of this.screens) {
       for (const event of screen.events) {
-          if (event.eventId === eventId) {
-            return event;
-          }
-          if(event.header==="EVENTGROUP"||event.header==="CHANGE"){
-            const eventGroup = event as IKintoneEventGroup;
-            const targetEvent = eventGroup.events.find((ev)=>{
-              return ev.eventId===eventId;
-            })
-            if(targetEvent){
-              return targetEvent;
-            }
+        if (event.eventId === eventId) {
+          return event;
+        }
+        if (event.header === 'EVENTGROUP' || event.header === 'CHANGE') {
+          const eventGroup = event as IKintoneEventGroup;
+          const targetEvent = eventGroup.events.find((ev) => {
+            return ev.eventId === eventId;
+          });
+          if (targetEvent) {
+            return targetEvent;
           }
+        }
       }
     }
     return null;
   }
 
-  public findScreen(eventId:string):IKintoneEventGroup|undefined{
-    return this.screens.find(screen=>screen.eventId==eventId);
+  public findScreen(eventId: string): IKintoneEventGroup | undefined {
+    return this.screens.find((screen) => screen.eventId == eventId);
   }
 
-  public getKintoneEvents():IKintoneEventGroup[]{
+  public deleteEvent(
+    event: kintoneEvent,
+    store: ReturnType<typeof useFlowEditorStore>
+  ) {
+    if (event.header !== 'DELETABLE') {
+      return;
+    }
+
+    const parent = store.findEventById(event.parentId);
+    if (parent?.header !== 'CHANGE' && parent?.header !== 'EVENTGROUP') {
+      return;
+    }
+    const realParent = parent as kintoneEventForChange;
+
+    const index = realParent.events.findIndex(
+      (e) => e.eventId === event.eventId
+    );
+
+    if (index !== -1) {
+      realParent.events.splice(index, 1);
+    }
+  }
+
+  public getKintoneEvents(): IKintoneEventGroup[] {
     return [
-        new kintoneEventGroup("app.record.create","レコード追加画面",[
-          new kintoneEvent('レコード追加画面を表示した後','app.record.create.show',"app.record.create"),
-          new kintoneEvent('保存をクリックしたとき','app.record.create.submit',"app.record.create"),
-          new kintoneEvent('保存が成功したとき','app.record.create.submit.success',"app.record.create"),
-          new kintoneEventForChange('app.record.create.change','フィールドの値を変更したとき',[],"app.record.create"),
-          new kintoneEventGroup('app.record.create.show.customButtonClick','ボタンをクリックした時',[],"app.record.create")
-        ],""),
-        new kintoneEventGroup("app.record.detail","レコード詳細画面",[
-          new kintoneEvent('レコード詳細画面を表示した後','app.record.detail.show',"app.record.detail"),
-          new kintoneEvent('レコードを削除するとき','app.record.detail.delete.submit',"app.record.detail"),
-          new kintoneEvent('プロセス管理のアクションを実行したとき','app.record.detail.process.proceed',"app.record.detail"),
-          new kintoneEventGroup('app.record.detail.show.customButtonClick','ボタンをクリックした時',[],"app.record.detail"),
-        ],""),
-        new kintoneEventGroup("app.record.edit","レコード編集画面",[
-          new kintoneEvent('レコード編集画面を表示した後','app.record.edit.show',"app.record.edit"),
-          new kintoneEvent('保存をクリックしたとき','app.record.edit.submit',"app.record.edit"),
-          new kintoneEvent('保存が成功したとき','app.record.edit.submit.success',"app.record.edit"),
-          new kintoneEventForChange('app.record.edit.change','フィールドの値を変更したとき',[],"app.record.edit"),
-          new kintoneEventGroup('app.record.edit.show.customButtonClick','ボタンをクリックした時',[],"app.record.edit"),
-        ],""),
-        new kintoneEventGroup("app.record.index","レコード一覧画面",[
-          new kintoneEvent('一覧画面を表示した後', 'app.record.index.show',"app.record.index"),
-          new kintoneEvent('インライン編集を開始したとき','app.record.index.edit.show',"app.record.index"),
-          new kintoneEvent('インライン編集の【保存】をクリックしたとき','app.record.index.edit.submit',"app.record.index"),
-          new kintoneEvent('インライン編集の保存が成功したとき', 'app.record.index.edit.submit.success',"app.record.index"),
-          new kintoneEventForChange('app.record.index.edit.change','インライン編集のフィールド値を変更したとき' ,[],"app.record.index"),
-          new kintoneEventGroup('app.record.detail.show.customButtonClick','ボタンをクリックした時',[],"app.record.index"),
-        ],"")
+      new kintoneEventGroup(
+        'app.record.create',
+        'レコード追加画面',
+        [
+          new kintoneEvent(
+            'レコード追加画面を表示した後',
+            'app.record.create.show',
+            'app.record.create'
+          ),
+          new kintoneEvent(
+            '保存をクリックしたとき',
+            'app.record.create.submit',
+            'app.record.create'
+          ),
+          new kintoneEvent(
+            '保存が成功したとき',
+            'app.record.create.submit.success',
+            'app.record.create'
+          ),
+          new kintoneEventForChange(
+            'app.record.create.change',
+            'フィールドの値を変更したとき',
+            [],
+            'app.record.create'
+          ),
+          new kintoneEventGroup(
+            'app.record.create.show.customButtonClick',
+            'ボタンをクリックした時',
+            [],
+            'app.record.create'
+          ),
+        ],
+        ''
+      ),
+      new kintoneEventGroup(
+        'app.record.detail',
+        'レコード詳細画面',
+        [
+          new kintoneEvent(
+            'レコード詳細画面を表示した後',
+            'app.record.detail.show',
+            'app.record.detail'
+          ),
+          new kintoneEvent(
+            'レコードを削除するとき',
+            'app.record.detail.delete.submit',
+            'app.record.detail'
+          ),
+          new kintoneEvent(
+            'プロセス管理のアクションを実行したとき',
+            'app.record.detail.process.proceed',
+            'app.record.detail'
+          ),
+          new kintoneEventGroup(
+            'app.record.detail.show.customButtonClick',
+            'ボタンをクリックした時',
+            [],
+            'app.record.detail'
+          ),
+        ],
+        ''
+      ),
+      new kintoneEventGroup(
+        'app.record.edit',
+        'レコード編集画面',
+        [
+          new kintoneEvent(
+            'レコード編集画面を表示した後',
+            'app.record.edit.show',
+            'app.record.edit'
+          ),
+          new kintoneEvent(
+            '保存をクリックしたとき',
+            'app.record.edit.submit',
+            'app.record.edit'
+          ),
+          new kintoneEvent(
+            '保存が成功したとき',
+            'app.record.edit.submit.success',
+            'app.record.edit'
+          ),
+          new kintoneEventForChange(
+            'app.record.edit.change',
+            'フィールドの値を変更したとき',
+            [],
+            'app.record.edit'
+          ),
+          new kintoneEventGroup(
+            'app.record.edit.show.customButtonClick',
+            'ボタンをクリックした時',
+            [],
+            'app.record.edit'
+          ),
+        ],
+        ''
+      ),
+      new kintoneEventGroup(
+        'app.record.index',
+        'レコード一覧画面',
+        [
+          new kintoneEvent(
+            '一覧画面を表示した後',
+            'app.record.index.show',
+            'app.record.index'
+          ),
+          new kintoneEvent(
+            'インライン編集を開始したとき',
+            'app.record.index.edit.show',
+            'app.record.index'
+          ),
+          new kintoneEvent(
+            'インライン編集の【保存】をクリックしたとき',
+            'app.record.index.edit.submit',
+            'app.record.index'
+          ),
+          new kintoneEvent(
+            'インライン編集の保存が成功したとき',
+            'app.record.index.edit.submit.success',
+            'app.record.index'
+          ),
+          new kintoneEventForChange(
+            'app.record.index.edit.change',
+            'インライン編集のフィールド値を変更したとき',
+            [],
+            'app.record.index'
+          ),
+          new kintoneEventGroup(
+            'app.record.detail.show.customButtonClick',
+            'ボタンをクリックした時',
+            [],
+            'app.record.index'
+          ),
+        ],
+        ''
+      ),
     ];
   }
 }

node_modules/.package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "App Builder for kintone",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

node_modules/.yarn-integrity

@@ -0,0 +1,15 @@
+{
+  "systemParams": "win32-x64-108",
+  "modulesFolders": [
+    "node_modules"
+  ],
+  "flags": [],
+  "linkedModules": [
+    "@quasar\\quasar-ui-qactivity",
+    "docs"
+  ],
+  "topLevelPatterns": [],
+  "lockfileEntries": {},
+  "files": [],
+  "artifacts": {}
+}

plugin/kintone-addins/.env.dev

@@ -0,0 +1,2 @@
+VITE_SOURCE_MAP = inline
+VITE_PORT = 4173

plugin/kintone-addins/.env.production

@@ -0,0 +1,2 @@
+VITE_SOURCE_MAP = false
+VITE_PORT = 4173

plugin/kintone-addins/package-lock.json

@@ -8,7 +8,8 @@
       "name": "kintone-addins",
       "version": "0.0.0",
       "dependencies": {
-        "jquery": "^3.7.1"
+        "jquery": "^3.7.1",
+        "yarn": "^1.22.22"
       },
       "devDependencies": {
         "@types/jquery": "^3.5.24",
@@ -795,6 +796,19 @@
           "optional": true
         }
       }
+    },
+    "node_modules/yarn": {
+      "version": "1.22.22",
+      "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz",
+      "integrity": "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==",
+      "hasInstallScript": true,
+      "bin": {
+        "yarn": "bin/yarn.js",
+        "yarnpkg": "bin/yarn.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
     }
   }
 }

plugin/kintone-addins/package.json

@@ -4,21 +4,37 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "tsc && set \"SOURCE_MAP=true\" && vite build && vite preview",
-    "build": "tsc && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "build:dev":"tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "preview": "vite preview",
-    "ngrok":"ngrok http http://localhost:4173/",
-    "vite":"vite dev"
+    "dev": "run-p watch server ngrok",
+    "watch": "vite build --watch --mode dev",
+    "server": "vite dev --mode dev",
+    "ngrok": "ngrok http 4173",
+    "build": "run-s b:production copyjs:windows copycss:windows",
+    "build:dev": "run-s b:dev copyjs:windows copycss:windows",
+    "build:linux": "run-s b:production copyjs:linux copycss:linux",
+    "build:linux-dev": "run-s b:dev copy:linux",
+    "b:production": "tsc & vite build --mode production",
+    "b:dev": "tsc & vite build --mode dev",
+    "copyjs:windows": "xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
+    "copyjs:linux": "cp -ur dist/*.js ../../backend/Temp",
+    "copycss:windows": "xcopy dist\\*.css ..\\..\\backend\\Temp\\ /E /I /Y",
+    "copycss:linux": "cp -ur dist/*.css  ../../backend/Temp"
   },
   "devDependencies": {
     "@types/jquery": "^3.5.24",
     "@types/node": "^20.8.9",
+    "npm-run-all2": "^6.2.0",
     "sass": "^1.69.5",
     "typescript": "^5.0.2",
-    "vite": "^4.4.5"
+    "vite": "^4.4.5",
+    "vite-plugin-checker": "^0.6.4",
+    "vite-plugin-lib-inject-css": "^2.1.1"
   },
   "dependencies": {
-    "jquery": "^3.7.1"
+    "@kintone/rest-api-client": "^5.5.2",
+    "@popperjs/core": "^2.11.8",
+    "@types/bootstrap": "^5.2.10",
+    "bootstrap": "^5.3.3",
+    "jquery": "^3.7.1",
+    "vite-plugin-css-injected-by-js": "^3.5.1"
   }
 }

plugin/kintone-addins/src/actions/auto-lookup.scss

@@ -0,0 +1 @@
+@import 'bootstrap/scss/bootstrap';

plugin/kintone-addins/src/actions/auto-lookup.ts

@@ -0,0 +1,272 @@
+import {
+  IAction,
+  IActionResult,
+  IActionNode,
+  IActionProperty,
+  IContext,
+  IField,
+} from "../types/ActionTypes";
+
+import { actionAddins } from ".";
+import type { Record} from "@kintone/rest-api-client/lib/src/client/types";
+import { KintoneRestAPIClient} from "@kintone/rest-api-client";
+import "./auto-lookup.scss";
+import "bootstrap/js/dist/modal";
+// import "bootstrap/js/dist/spinner";
+import {Modal} from "bootstrap"
+import $ from "jquery";
+
+interface Props {
+  displayName: string;
+  lookupField: LookupField;
+  condition: Condition;
+}
+
+interface Condition {
+  queryString: string;
+  index: number;
+  type: string;
+  children: Child[];
+  parent: null;
+  logicalOperator: string;
+}
+
+interface Child {
+  index: number;
+  type: string;
+  parent: string;
+  object: any;
+  operator: string;
+  value: string;
+}
+
+interface LookupField {
+  app: App;
+  fields: Field[];
+}
+
+interface Field {
+  name: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  lookup: Lookup;
+}
+
+interface Lookup {
+  relatedApp: RelatedApp;
+  relatedKeyField: string;
+  fieldMappings: FieldMapping[];
+  lookupPickerFields: any[];
+  filterCond: string;
+  sort: string;
+}
+
+interface FieldMapping {
+  field: string;
+  relatedField: string;
+}
+
+interface RelatedApp {
+  app: string;
+  code: string;
+}
+
+interface App {
+  id: string;
+  name: string;
+  description: string;
+  createdate: string;
+}
+
+export class AutoLookUpAction implements IAction {
+  name: string;
+  actionProps: IActionProperty[];
+  props: Props;
+  constructor() {
+    this.name = "ルックアップ更新";
+    this.actionProps = [];
+    this.props = {} as Props;
+    this.register();
+  }
+
+  /***
+   * アクセスのメインの処理関数
+   */
+  async process(
+    prop: IActionNode,
+    event: any,
+    context: IContext
+  ): Promise<IActionResult> {
+    this.actionProps = prop.actionProps;
+    this.props = {
+      ...prop.ActionValue,
+      condition: JSON.parse((prop.ActionValue as any).condition),
+    } as Props;
+    // console.log(context);
+
+    let result = {
+      canNext: true,
+      result: "",
+    } as IActionResult;
+    try {
+      const lookUpFields = this.props.lookupField.fields.filter(
+        (f) => f.lookup && f.lookup.relatedApp.app === String(kintone.app.getId())
+      );
+      if (!lookUpFields || lookUpFields.length===0) {
+        throw new Error(
+          `ルックアップの設定は不正です。${this.props.lookupField.fields[0].label} `
+        );
+      }
+      const lookUpField = this.props.lookupField.fields[0]; 
+      const key = event.record[lookUpField.lookup.relatedKeyField].value;
+      const targetRecords = await this.getUpdateRecords(lookUpField, key);
+      //更新対象がない時にスキップ
+      if(targetRecords.length===0){
+        return result;
+      }
+      const updateRecords = this.convertForLookup(targetRecords,lookUpField,key);
+      console.log("updateRecords", updateRecords);
+      this.showSpinnerModel(this.props.lookupField.app);
+      await this.updateLookupTarget(updateRecords);
+      this.showResult(this.props.lookupField.app,updateRecords.length);
+    } catch (error) {
+        console.error("ルックアップ更新中例外が発生しました。", error);
+        if(error instanceof Error){
+          event.error = error.message;
+        }else{
+          event.error = "ルックアップ更新中例外が発生しました。";
+        }
+        result.canNext = false;
+    }
+    console.log("autoLookupProps", this.props);
+    return result;
+  }
+
+  /**
+   * REST API用クエリ作成
+   * TODO:共通関数として作成
+   * @param lookUpField 
+   * @param key 
+   * @returns 
+   */
+  makeQuery=(lookUpField:Field,key:any)=>{
+    if(typeof key==='number'){
+      return `${lookUpField.code} = ${key}`
+    }
+    if(typeof key==='string'){
+      return `${lookUpField.code} = "${key}"`
+    }
+  }
+
+  /**
+   * 更新対象のレコードを取得する
+   */
+  getUpdateRecords = async (lookUpField:Field,key:any):Promise< Record[]>=>{
+    const client=new KintoneRestAPIClient();
+    const resp = await client.record.getAllRecords({
+      app:this.props.lookupField.app.id,
+      fields:["$id"],
+      condition:this.makeQuery(lookUpField,key)
+    });
+    return resp;
+  }
+
+ /**
+  * ルックアップ更新用レコードに変換する
+  * @param targetRecords 更新対象レコード
+  * @param lookUpField ルックアップフィールド
+  * @param key ルックアップフィールドの値
+  * @returns 
+  */
+  convertForLookup = (targetRecords:Record[],lookUpField:Field,key:any):Array<any>=>{
+    return targetRecords.map((r) => ({
+      id: Number(r["$id"].value),
+      record: { [lookUpField.code]: { value: key } },
+    }));
+  }
+
+  /**
+   * ルックアップ先を更新する
+   * @param updateRecords 
+   */
+  updateLookupTarget = async (updateRecords:Array<any>)=>{
+    if (updateRecords && updateRecords.length > 0) {
+      const client=new KintoneRestAPIClient();
+      client.record.updateAllRecords({
+        app:this.props.lookupField.app.id,
+        records:updateRecords
+      });
+      // await kintone.api(kintone.api.url("/k/v1/records.json", true), "PUT", {
+      //   app: this.props.lookupField.app.id,
+      //   records: updateRecords
+      // });
+    }
+  }
+
+  /**
+   * 更新中のダイアログ表示
+   * @param app 
+   */
+  showSpinnerModel = (app:App) => {
+    let dialog = $("#alcLookupModal");
+    if(dialog.length===0){
+      const modalHTML = `
+      <div class="modal" id="alcLookupModal" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+        <div class="modal-dialog-centered">
+          <div class="modal-dialog modal-content">
+            <div class="modal-header">
+              <h1 class="modal-title fs-5" id="alcLookupModalLabel">ルックアップ同期処理</h1>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+              <div class="row" id="app${app.id}">
+                  <div class="spinner-border text-secondary col-1 " role="alert"></div>
+                  <div class="col">${app.name}</div>
+              </div>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
+            </div>
+          </div>
+        </div>
+      </div>`;
+      dialog = $(modalHTML).appendTo("body");
+      dialog.get()[0].addEventListener('hidden.bs.modal',(ev)=>{
+        Modal.getOrCreateInstance(dialog.get()[0]).dispose();
+        $("#alcLookupModal").remove();
+      });
+    }else{
+      const dialogBody=$("#alcLookupModal .modal-body");
+      const htmlrow=` 
+          <div class="row" id="app${app.id}">
+            <div class="spinner-border text-secondary col-1 " role="alert">
+            </div>
+            <div class="col">${app.name}</div>
+          <div>`;
+      dialogBody.append(htmlrow);
+    }
+    Modal.getOrCreateInstance(dialog.get()[0]).show();
+  }
+
+  /**
+   * 更新結果を表示する
+   * @param app 　更新先アプリ情報
+   * @param count 更新件数
+   */
+  showResult=(app:App,count:number)=>{
+    const dialogBody=$(`#alcLookupModal .modal-body #app${app.id}`);
+    const html=`    <div class="col-1 text-success">✔</div>
+                    <div class="col">${app.name}</div>
+                    <div class="col">更新件数:${count}件</div>`;
+    dialogBody.html(html);
+  }
+
+  register(): void {
+    actionAddins[this.name] = this;
+  }
+}
+
+new AutoLookUpAction();

plugin/kintone-addins/src/actions/auto-numbering.ts

@@ -1,6 +1,6 @@
 
 import { actionAddins } from ".";
-import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes";
+import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes";
 import { Formatter } from "../util/format";
 
 declare global {
@@ -13,7 +13,7 @@ interface IAutoNumberingProps{
     format:string;
     prefix:string;
     suffix:string;
-    verName:string;
+    verName:IVarName;
 }
 
 export class AutoNumbering implements IAction{
@@ -29,7 +29,7 @@ export class AutoNumbering implements IAction{
             format:'',
             prefix:'',
             suffix:'',
-            verName:''
+            verName:{name:''}
         }
         globalThis.window.$format=this.format;
         this.register();
@@ -56,8 +56,8 @@ export class AutoNumbering implements IAction{
             const docNum = await this.createNumber(this.props);
             record[this.props.field.code].value=docNum;
             //変数設定
-            if(this.props.verName){
-                context.variables[this.props.verName]=docNum;
+            if(this.props.verName && this.props.verName.name!==''){
+                context.variables[this.props.verName.name]=docNum;
             }
             result= {
               canNext:true,
@@ -84,6 +84,7 @@ export class AutoNumbering implements IAction{
 
     execEval(match:string,expr:string):string{
         console.log(match);
+        // @ts-ignore
         return eval(expr);
     }
 

plugin/kintone-addins/src/actions/button-add.css

@@ -0,0 +1,24 @@
+.alc-button-normal {
+    display: inline-block;
+    box-sizing: border-box;
+    padding: 0 16px;
+    margin-left: 16px;
+    margin-top: 8px;
+    min-width: 100px;
+    outline: none;
+    border: 1px solid #e3e7e8;
+    background-color: #f7f9fa;
+    box-shadow: 1px 1px 1px #fff inset;
+    color: #3498db;
+    text-align: center;
+    line-height: 32px;
+}
+.alc-button-normal:hover {
+    background-color: #c8d6dd;
+    box-shadow: none;
+    cursor: pointer;
+  }
+.alc-button-normal:active {
+    color: #f7f9fa;
+    background-color: #54b8eb;
+}

plugin/kintone-addins/src/actions/button-add.ts

@@ -2,18 +2,26 @@
 import { actionAddins } from ".";
 import $ from 'jquery';
 import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
+import "./button-add.css";
+
 /**
  * ボタン配置属性定義
  */
 interface IButtonAddProps {
     //ボタン表示名
     buttonName: string;
+    space?:ISpace;
     //配置位置
     position: string;
     //イベント名
     eventName:string
 }   
 
+interface ISpace{
+    type:string,
+    elementId:string
+}
+
 export class ButtonAddAction implements IAction {
     name: string; 
     actionProps: IActionProperty[]; 
@@ -47,43 +55,19 @@ export class ButtonAddAction implements IAction {
             }
             this.props = actionNode.ActionValue as IButtonAddProps; 
             //ボタンを配置する
-            const menuSpace = kintone.app.record.getHeaderMenuSpaceElement();
-            if(!menuSpace) return result;
-            if($("style#alc-button-add").length===0){
-                const css=`
-                .alc-button-normal {
-                    display: inline-block;
-                    box-sizing: border-box;
-                    padding: 0 16px;
-                    margin-left: 16px;
-                    margin-top: 8px;
-                    min-width: 100px;
-                    outline: none;
-                    border: 1px solid #e3e7e8;
-                    background-color: #f7f9fa;
-                    box-shadow: 1px 1px 1px #fff inset;
-                    color: #3498db;
-                    text-align: center;
-                    line-height: 32px;
-                }
-                .alc-button-normal:hover {
-                    background-color: #c8d6dd;
-                    box-shadow: none;
-                    cursor: pointer;
-                  }
-                .alc-button-normal:active {
-                    color: #f7f9fa;
-                    background-color: #54b8eb;
-                }`;
-                const style = $("<style id='alc-button-add'>/<style>");
-                style.text(css);
-                $("head").append(style);
+            let buttonSpace;
+            if(this.props.space && this.props.space.elementId){
+                buttonSpace = kintone.app.record.getSpaceElement(this.props.space.elementId);
+            }else{
+                buttonSpace = kintone.app.record.getHeaderMenuSpaceElement();
             }
+            if(!buttonSpace) return result;
+  
             const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
             if(this.props.position==="一番左に追加する"){
-                $(menuSpace).prepend(button);
+                $(buttonSpace).prepend(button);
             }else{
-                $(menuSpace).append(button);
+                $(buttonSpace).append(button);
             }
             const clickEventName = `${event.type}.customButtonClick.${this.props.eventName}`;
             button.on("click",()=>{

plugin/kintone-addins/src/actions/condition-action.ts

@@ -1,13 +1,13 @@
 
 import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes";
 import { ConditionTree } from '../types/Conditions';
 /**
  * アクションの属性定義
  */
 interface ICondition{
     condition:string;
-    verName:string;
+    verName:IVarName;
 }
 /**
  * 条件分岐アクション
@@ -21,7 +21,7 @@ export class ConditionAction implements IAction{
         this.actionProps=[];
         this.props={
             condition:'',
-            verName:''
+            verName:{name:''}
         }
         //アクションを登録する
         this.register();
@@ -58,8 +58,8 @@ export class ConditionAction implements IAction{
                     result:'いいえ'
                   }
             }
-            if(this.props.verName){
-                context.variables[this.props.verName]=result.result;
+            if(this.props.verName && this.props.verName.name!==''){
+                context.variables[this.props.verName.name]=result.result;
             }
             return result;
         }catch(error){

plugin/kintone-addins/src/actions/counter-check.ts

@@ -0,0 +1,75 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
+/**
+ * アクションの属性定義
+ */
+interface IStrCountCheckProps{
+    field:IField;//チェックするフィールドの対象
+    message:string;//エラーメッセージ
+    maxLength:number;//
+}
+/**
+ * 正規表現チェックアクション
+ */
+export class StrCountCheckAciton implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:IStrCountCheckProps;
+    constructor(){
+        this.name="文字数チェック";
+        this.actionProps=[];
+        this.props={
+            field:{code:''},
+            message:'',
+            maxLength:0
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('strExpression'in actionNode.ActionValue)) {
+                return result
+            }
+            
+            this.props = actionNode.ActionValue as IStrCountCheckProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code].value;
+            const maxLength = this.props.maxLength;
+            if(value === undefined || value === '' ){
+                return result;
+            }else if(maxLength < value.length){
+                record[this.props.field.code].error = this.props.message;
+            }else{
+                result= {
+                    canNext:true,
+                    result:true
+                  }
+            }
+            return result;
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    };
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+    
+}
+new StrCountCheckAciton();

plugin/kintone-addins/src/actions/current-field-get.ts

@@ -0,0 +1,74 @@
+import {
+  IAction,
+  IActionResult,
+  IActionNode,
+  IActionProperty,
+  IContext,
+} from "../types/ActionTypes";
+import { actionAddins } from ".";
+
+
+interface Props {
+  displayName: string;
+  field: Field;
+  verName: VerName;
+}
+
+interface VerName {
+  name: string;
+}
+
+interface Field {
+  name: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  minLength: string;
+  maxLength: string;
+  expression: string;
+  hideExpression: boolean;
+  unique: boolean;
+  defaultValue: string;
+}
+
+export class CurrentFieldGetAction implements IAction {
+  name: string;
+  actionProps: IActionProperty[];
+  currentFieldGetProps: Props;
+  constructor() {
+    this.name = "フィールドの値を取得する";
+    this.actionProps = [];
+    this.currentFieldGetProps = {} as Props;
+    this.register();
+  }
+
+  async process(
+    prop: IActionNode,
+    event: any,
+    context: IContext
+  ): Promise<IActionResult> {
+    this.currentFieldGetProps = prop.ActionValue as Props;
+    this.actionProps = prop.actionProps;
+
+    let result = {
+      canNext: true,
+      result: "",
+    } as IActionResult;
+    
+    try {
+      context.variables[this.currentFieldGetProps.verName.name] = context.record[this.currentFieldGetProps.field.code].value;
+    } catch (error) {
+      console.error("CurrentFieldGetAction error", error);
+      result.canNext = false;
+    }
+    return result;
+  }
+
+  register(): void {
+    actionAddins[this.name] = this;
+  }
+}
+
+new CurrentFieldGetAction();

plugin/kintone-addins/src/actions/data-mapping.ts

@@ -0,0 +1,166 @@
+import {
+  IAction,
+  IActionResult,
+  IActionNode,
+  IActionProperty,
+  IContext,
+} from "../types/ActionTypes";
+import { actionAddins } from ".";
+
+interface Props {
+  displayName: string;
+  sources: Sources;
+  dataMapping: DataMapping[];
+}
+
+interface DataMapping {
+  id: string;
+  from: From;
+  to: To;
+}
+
+interface To {
+  app: App;
+  fields: Field[];
+  isDialogVisible: boolean;
+}
+
+interface Field {
+  name: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  minLength: string;
+  maxLength: string;
+  expression: string;
+  hideExpression: boolean;
+  unique: boolean;
+  defaultValue: string;
+}
+
+interface From {
+  sharedText: string;
+  _t: string;
+  id: string;
+  objectType: string;
+  name: Name;
+  actionName: string;
+  displayName: string;
+}
+
+interface Name {
+  name: string;
+}
+
+interface Sources {
+  app: App;
+}
+
+interface App {
+  id: string;
+  name: string;
+  description: string;
+  createdate: string;
+}
+
+export class DataMappingAction implements IAction {
+  name: string;
+  actionProps: IActionProperty[];
+  dataMappingProps: Props;
+  constructor() {
+    this.name = "データマッピング";
+    this.actionProps = [];
+    this.dataMappingProps = {} as Props;
+    this.register();
+  }
+
+  async process(
+    prop: IActionNode,
+    event: any,
+    context: IContext
+  ): Promise<IActionResult> {
+    this.actionProps = prop.actionProps;
+    this.dataMappingProps = prop.ActionValue as Props;
+    console.log(prop.ActionValue);
+
+    // this.initTypedActionProps();
+    let result = {
+      canNext: true,
+      result: "",
+    } as IActionResult;
+    try {
+      const record = this.dataMappingProps.dataMapping
+        .filter(
+          (item) =>
+            item.from.objectType === "variable" &&
+            item.from.name.name &&
+            item.to.app &&
+            item.to.fields &&
+            item.to.fields.length > 0
+        )
+        .reduce((accumulator, item) => {
+          return {...accumulator, [item.to.fields[0].code]: {
+            value: getValueByPath(context.variables, item.from.name.name),
+          }};
+      }, {});
+      if (record && Object.keys(record).length > 0) {
+        await kintone.api(kintone.api.url("/k/v1/record.json", true), "POST", {
+          app: this.dataMappingProps.sources.app.id,
+          record: record,
+        });
+      }
+    } catch (error) {
+      console.error("DataMappingAction error", error);
+      result.canNext = false;
+    }
+    console.log("dataMappingProps", this.dataMappingProps);
+
+    return result;
+  }
+
+  register(): void {
+    actionAddins[this.name] = this;
+  }
+}
+
+new DataMappingAction();
+
+const getValueByPath = (obj: any, path: string) => {
+  return path.split(".").reduce((o, k) => (o || {})[k], obj);
+};
+
+type Resp = { records: RespRecordType[] };
+
+type RespRecordType = {
+  [key: string]: {
+    type: string;
+    value: any;
+  };
+};
+
+type Result = {
+  type: string;
+  value: any[];
+};
+
+const selectData = async (appid: string, field: string): Promise<Result> => {
+  return kintone
+    .api(kintone.api.url("/k/v1/records", true), "GET", {
+      app: appid ?? kintone.app.getId(),
+      fields: [field],
+    })
+    .then((resp: Resp) => {
+      const result: Result = { type: "", value: [] };
+      resp.records.forEach((element) => {
+        for (const [key, value] of Object.entries(element)) {
+          if (result.type === "") {
+            result.type = value.type;
+          }
+          result.value.push(value.value);
+        }
+      });
+      return result;
+    });
+};

plugin/kintone-addins/src/actions/data-processing.ts

@@ -0,0 +1,374 @@
+import {
+  IAction,
+  IActionResult,
+  IActionNode,
+  IActionProperty,
+  IContext,
+} from "../types/ActionTypes";
+import { actionAddins } from ".";
+
+interface Props {
+  displayName: string;
+  sources: Sources;
+  condition: string;
+  conditionO: Condition;
+  verName: VerName;
+}
+
+interface Condition {
+  queryString: string;
+  index: number;
+  type: string;
+  children: Child[];
+  parent: null;
+  logicalOperator: string;
+}
+
+interface Child {
+  index: number;
+  type: string;
+  parent: string;
+  object: Object;
+  operator: ChildOperator;
+  value: Value;
+}
+
+interface Value {
+  sharedText: string;
+  _t: string;
+  objectType: string;
+  actionName: string;
+  displayName: string;
+  name: Name;
+}
+
+interface Name {
+  name: string;
+}
+
+interface ChildOperator {
+  label: string;
+  value: string;
+}
+
+interface Object {
+  sharedText: string;
+  _t: string;
+  name: string;
+  objectType: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  minLength: string;
+  maxLength: string;
+  expression: string;
+  hideExpression: boolean;
+  unique: boolean;
+  defaultValue: string;
+}
+
+interface VerName {
+  name: string;
+  actionName: string;
+  displayName: string;
+  vars: Var[];
+}
+
+interface Var {
+  id: string;
+  field: Field2;
+  logicalOperator: LogicalOperator;
+  vName: string;
+}
+
+interface LogicalOperator {
+  operator: string;
+  label: string;
+}
+
+interface Field2 {
+  sharedText: string;
+  _t: string;
+  name: string;
+  objectType: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  minLength: string;
+  maxLength: string;
+  expression: string;
+  hideExpression: boolean;
+  unique: boolean;
+  defaultValue: string;
+}
+
+interface Sources {
+  app: App;
+  fields: Field[];
+}
+
+interface Field {
+  name: string;
+  type: string;
+  code: string;
+  label: string;
+  noLabel: boolean;
+  required: boolean;
+  minLength: string;
+  maxLength: string;
+  expression: string;
+  hideExpression: boolean;
+  unique: boolean;
+  defaultValue: string;
+}
+
+interface App {
+  id: string;
+  name: string;
+  description: string;
+  createdate: string;
+}
+
+export class DataProcessingAction implements IAction {
+  name: string;
+  actionProps: IActionProperty[];
+  dataProcessingProps: Props | null;
+  constructor() {
+    this.name = "データ処理";
+    this.actionProps = [];
+    this.dataProcessingProps = null;
+    this.register();
+  }
+
+  async process(
+    nodes: IActionNode,
+    event: any,
+    context: IContext
+  ): Promise<IActionResult> {
+    this.actionProps = nodes.actionProps;
+    this.dataProcessingProps = nodes.ActionValue as Props;
+    this.dataProcessingProps.conditionO = JSON.parse(
+      this.dataProcessingProps.condition
+    );
+    let result = {
+      canNext: true,
+      result: "",
+    } as IActionResult;
+    try {
+      if (!this.dataProcessingProps) {
+        return result;
+      }
+
+      const data = await selectData(
+        varGet(
+          this.dataProcessingProps.conditionO.queryString,
+          context.variables
+        )
+      );
+      console.log("data ", data);
+
+      context.variables[this.dataProcessingProps.verName.name] =
+        this.dataProcessingProps.verName.vars.reduce((acc, f) => {
+          const v = calc(f, data);
+          if (v) {
+            acc[f.vName] = calc(f, data);
+          }
+          return acc;
+        }, {} as AnyObject);
+
+      console.log("context ", context);
+      return result;
+    } catch (error) {
+      console.error(error);
+      event.error = error;
+      return result;
+    }
+  }
+
+  register(): void {
+    actionAddins[this.name] = this;
+  }
+}
+
+new DataProcessingAction();
+
+const varGet = (str: string, vars: any) => {
+  console.log(str);
+
+  const regex = /var\((.*?)\)/g;
+  let match;
+  while ((match = regex.exec(str)) !== null) {
+    const varName = match[1];
+    if (varName in vars) {
+      str = str.replace(match[0], vars[varName]);
+    } else {
+      throw new Error(`変数${varName}が見つかりません`);
+    }
+  }
+  console.log(str);
+  return str;
+};
+
+const selectData = async (query?: string) => {
+  return kintone
+    .api(kintone.api.url("/k/v1/records", true), "GET", {
+      app: kintone.app.getId(),
+      query: query,
+    })
+    .then((resp: Resp) => {
+      const result: Result = {};
+      resp.records.forEach((element) => {
+        for (const [key, value] of Object.entries(element)) {
+          if (!result[key]) {
+            result[key] = { type: value.type, value: [] };
+          }
+          result[key].value.push(value.value);
+        }
+      });
+      return result;
+    });
+};
+
+type Resp = { records: RespRecordType[] };
+
+type RespRecordType = {
+  [key: string]: {
+    type: string;
+    value: any;
+  };
+};
+
+type Result = {
+  [key: string]: {
+    type: string;
+    value: any[];
+  };
+};
+
+type AnyObject = {
+  [key: string]: any;
+};
+
+const ERROR_TYPE = "ERROR_TYPE";
+
+const calc = (f: Var, result: Result) => {
+  const type = typeCheck(f.field.type);
+  if (!type) {
+    return ERROR_TYPE;
+  }
+
+  const fun =
+    calcFunc[
+      `${type}_${Operator[f.logicalOperator.operator as keyof typeof Operator]}`
+    ];
+  if (!fun) {
+    return ERROR_TYPE;
+  }
+  const values = result[f.field.code].value;
+  if (!values) {
+    return null;
+  }
+  return fun(values);
+};
+
+const typeCheck = (type: string) => {
+  switch (type) {
+    case "RECORD_NUMBER":
+    case "NUMBER":
+      return CalcType.NUMBER;
+    case "SINGLE_LINE_TEXT":
+    case "MULTI_LINE_TEXT":
+    case "RICH_TEXT":
+      return CalcType.STRING;
+    case "DATE":
+      return CalcType.DATE;
+    case "TIME":
+      return CalcType.TIME;
+    case "DATETIME":
+    case "UPDATED_TIME":
+      return CalcType.DATETIME;
+    default:
+      return null;
+  }
+};
+
+enum Operator {
+  SUM = "SUM",
+  AVG = "AVG",
+  MAX = "MAX",
+  MIN = "MIN",
+  COUNT = "COUNT",
+  FIRST = "FIRST",
+}
+
+enum CalcType {
+  NUMBER = "number",
+  STRING = "string",
+  DATE = "date",
+  TIME = "time",
+  DATETIME = "datetime",
+}
+
+const calcFunc: Record<string, (value: string[]) => string | null> = {
+  [`${CalcType.NUMBER}_${Operator.COUNT}`]: (value: string[]) =>
+    value.length.toString(),
+  [`${CalcType.STRING}_${Operator.COUNT}`]: (value: string[]) =>
+    value.length.toString(),
+  [`${CalcType.DATE}_${Operator.COUNT}`]: (value: string[]) =>
+    value.length.toString(),
+  [`${CalcType.TIME}_${Operator.COUNT}`]: (value: string[]) =>
+    value.length.toString(),
+  [`${CalcType.DATETIME}_${Operator.COUNT}`]: (value: string[]) =>
+    value.length.toString(),
+
+  [`${CalcType.NUMBER}_${Operator.SUM}`]: (value: string[]) =>
+    value.reduce((acc, v) => acc + Number(v), 0).toString(),
+  [`${CalcType.NUMBER}_${Operator.AVG}`]: (value: string[]) =>
+    (value.reduce((acc, v) => acc + Number(v), 0) / value.length).toString(),
+  [`${CalcType.NUMBER}_${Operator.MAX}`]: (value: string[]) =>
+    Math.max(...value.map(Number)).toString(),
+  [`${CalcType.NUMBER}_${Operator.MIN}`]: (value: string[]) =>
+    Math.min(...value.map(Number)).toString(),
+
+  [`${CalcType.STRING}_${Operator.SUM}`]: (value: string[]) => value.join(" "),
+
+  [`${CalcType.DATE}_${Operator.MAX}`]: (value: string[]) =>
+    value.reduce((maxDate, currentDate) =>
+      maxDate > currentDate ? maxDate : currentDate
+    ),
+
+  [`${CalcType.DATE}_${Operator.MIN}`]: (value: string[]) =>
+    value.reduce((minDate, currentDate) =>
+      minDate < currentDate ? minDate : currentDate
+    ),
+
+  [`${CalcType.TIME}_${Operator.MAX}`]: (value: string[]) =>
+    value.reduce((maxTime, currentTime) =>
+      maxTime > currentTime ? maxTime : currentTime
+    ),
+  [`${CalcType.TIME}_${Operator.MIN}`]: (value: string[]) =>
+    value.reduce((minTime, currentTime) =>
+      minTime < currentTime ? minTime : currentTime
+    ),
+
+  [`${CalcType.DATETIME}_${Operator.MAX}`]: (value: string[]) =>
+    value.reduce((maxDateTime, currentDateTime) =>
+      new Date(maxDateTime) > new Date(currentDateTime)
+        ? maxDateTime
+        : currentDateTime
+    ),
+
+  [`${CalcType.DATETIME}_${Operator.MIN}`]: (value: string[]) =>
+    value.reduce((minDateTime, currentDateTime) =>
+      new Date(minDateTime) < new Date(currentDateTime)
+        ? minDateTime
+        : currentDateTime
+    ),
+  [`${CalcType.STRING}_${Operator.FIRST}`]: (value: string[]) => {
+    return value[0];
+  },
+};

plugin/kintone-addins/src/actions/datetime-getter.ts

@@ -0,0 +1,66 @@
+import { actionAddins } from ".";
+import { IAction, IActionResult, IActionNode, IActionProperty, IField ,IContext, IVarName} from "../types/ActionTypes";
+/**
+ * アクションの属性定義
+ */
+interface IDatetimeGetterProps {
+    /**変数の名前 */
+    verName:IVarName;
+}
+/**
+ * 現在日時を取得するアクション
+ */
+export class DatetimeGetterAction implements IAction {
+    name: string;
+    actionProps: IActionProperty[];
+    props: IDatetimeGetterProps;
+    constructor() {
+        this.name = "現在日時";
+        this.actionProps = [];
+        this.props = {
+            verName:{name:''}
+        }
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode: IActionNode, event: any,context:IContext): Promise<IActionResult> {
+        let result = {
+            canNext: true,
+            result: false
+        };
+
+        try {
+            //属性設定を取得する
+            this.actionProps = actionNode.actionProps;
+
+            if (!('verName' in actionNode.ActionValue) ) {
+                return result
+            }
+            this.props = actionNode.ActionValue as IDatetimeGetterProps;
+            
+            let today = new Date();
+          
+            if(this.props.verName && this.props.verName.name!==''){
+                context.variables[this.props.verName.name]=today.toISOString();
+            }
+
+            return result;
+
+        } catch (error) {
+            event.error = error;
+            console.error(error);
+            result.canNext = false;
+            return result;
+        }
+    };
+    register(): void {
+        actionAddins[this.name] = this;
+    }
+
+}
+new DatetimeGetterAction();

plugin/kintone-addins/src/actions/field-shown.ts

@@ -56,8 +56,8 @@ export class FieldShownAction implements IAction{
                 }
             }
             result= {
-              canNext:true,
-              result:true
+            canNext:true,
+            result:true
             }
             return result;
         }catch(error){
@@ -69,9 +69,9 @@ export class FieldShownAction implements IAction{
 
     }
     /**
-     * 
+     *
      * @param context 条件式を実行する
-     * @returns 
+     * @returns
      */
     getConditionResult(context:any):boolean{
         const tree =this.getCondition(this.props.condition);
@@ -84,7 +84,7 @@ export class FieldShownAction implements IAction{
 
     /**
      * @param condition 条件式ツリーを取得する
-     * @returns 
+     * @returns
      */
     getCondition(condition:string):ConditionTree|null{
         try{
@@ -93,7 +93,7 @@ export class FieldShownAction implements IAction{
             if(tree.getConditions(tree.root).length>0){
                 return tree;
             }else{
-                return null; 
+                return null;
             }
         }catch(error){
             return null;
@@ -103,6 +103,5 @@ export class FieldShownAction implements IAction{
     register(): void {
         actionAddins[this.name]=this;
     }
-    
 }
 new FieldShownAction();

plugin/kintone-addins/src/actions/insert-value.ts

@@ -0,0 +1,507 @@
+
+
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
+import { ConditionTree } from '../types/Conditions';
+
+
+
+/**
+ * アクションの属性定義
+ */
+interface IInsertValueProps{
+    field:IField;
+    condition:string;
+    value:string;
+    show:string;
+}
+/**
+ *
+ */
+export class InsertValueAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:IInsertValueProps;
+    constructor(){
+        this.name="値を挿入する";// DBに登録したアクション名
+        this.actionProps=[];
+        //プロパティ属性の初期化
+        this.props={
+            field:{code:''},
+            condition:'',
+            value:'',
+            show:''
+        }
+        //アクションを登録する
+        this.register();
+    }
+
+    /**
+     * 空白文字を空白文字が非対応のフィールドに挿入しようとしていないか、必須項目フィールドに挿入しようとしていないかチェックする
+     * @param {string} inputValue - 挿入する値
+     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
+     */
+    checkInputBlank(fieldType :string | undefined,inputValue :string,fieldCode :string,fieldRequired :boolean | undefined,event :any): boolean{
+        //正規表現チェック
+        let blankCheck= inputValue.match(/^(\s|　)+?$/);//半角スペース・タブ文字・改行・改ページ・全角スペース
+
+        if(blankCheck !== null){
+            //空白文字を空白文字が非対応のフィールドに挿入しようとしている場合、例外を発生させる
+            if(fieldType === "NUMBER" || fieldType === "DATE" || fieldType === "DATETIME" || fieldType === "TIME" || fieldType === "USER_SELECT"
+                        || fieldType === "ORGANIZATION_SELECT" || fieldType === "GROUP_SELECT" || fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN" || fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT"){
+                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。"; //レコードにエラーを表示
+                throw new Error("「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
+
+            //空白文字を必須項目フィールドに挿入しようとしている場合、例外を発生させる
+            }else if(fieldRequired){
+                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。"; //レコードにエラーを表示
+                throw new Error("「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 入力値が半角数字かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {boolean} -入力値が有効な数値の場合はtrueを返し、そうでない場合は例外を発生させる
+     */
+    checkInputNumber(inputValue :string,fieldCode :string,event :any): boolean{
+        let inputNumberValue = Number(inputValue);//数値型に変換
+
+        //有限数かどうか判定s
+        if(!isFinite(inputNumberValue)){
+            event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
+            throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、有効な数値ではありません。「値を挿入する」コンポーネントの処理を中断しました。");
+        }
+        return true;
+    }
+
+    /** 入力値が有効な日付形式かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
+     */
+    checkInputDate(inputValue :string,fieldCode :string,event :any): boolean{
+        //正規表現チェック
+        let twoDigitMonthDay = inputValue.match(/(\d{4})-(\d{2})-(\d{2})$/);//4桁の数字-2桁の数字-2桁の数字
+        let singleDigitMonthDay = inputValue.match(/(\d{4})-(\d{1})-(\d{1})$/);//4桁の数字-1桁の数字-2桁の数字
+        let singleDigitMonth = inputValue.match(/(\d{4})-(\d{1})-(\d{2})$/);//4桁の数字-1桁の数字-2桁の数字
+        let singleDigitDay = inputValue.match(/(\d{4})-(\d{2})-(\d{1})$/);//4桁の数字-2桁の数字-1桁の数字
+        let dateTime = inputValue.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}).000Z/);//時刻入りのUTCの日付形式
+        let date;
+        //date型に変換
+        date = new Date(inputValue);
+
+        //date型変換できたか確認
+        if(date !== undefined && !isNaN(date.getDate())){
+            //正規表現チェック確認
+            if(twoDigitMonthDay === null && singleDigitMonth === null && singleDigitDay === null && singleDigitMonthDay === null && dateTime === null){
+                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
+                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
+            }
+        }
+        return true;
+    }
+
+    /** 入力値が有効な時刻形式かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
+     */
+    checkInputTime(inputValue :string,fieldCode :string,event :any): boolean{
+        //正規表現チェック
+        let timeFormat =inputValue.match(/^([0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/);
+
+            //正規表現チェック確認
+            if(timeFormat === null){
+                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。"; //レコードにエラーを表示
+                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。「値を挿入する」コンポーネントの処理を中断しました。");
+            }
+        return true;
+    }
+
+    /**
+     * 入力値のフィールドタイプがDATETIMEであれば、時刻ありの日付形式変換し、DATEであれば時刻なしの日付形式変換する関数
+     * @param {string} inputValue -挿入する値
+     * @param {string} fieldType  -フィールドタイプ
+     * @return {string} -入力値が日付形式に変換できた場合は文字列を返し、そうでない場合は例外を発生させる
+     */
+    changeDateFormat(inputValue :string, fieldType :string,fieldCode :string,event :any): string{
+        let dateTime;
+        let date;
+
+        //挿入する値をdate型に変換
+        date = new Date(inputValue);
+        //date型変換できたか確認
+        if(date !== undefined && !isNaN(date.getDate())){
+
+            //日時フィールドの場合、時刻ありの日付形式変換
+            if(fieldType === "DATETIME"){
+                dateTime =date.toISOString();
+                return dateTime;
+            }
+
+            //日付フィールドの場合、時刻なしの日付形式変換
+            let dateArray=inputValue.match(/(\d{4})-(\d{1,2})-(\d{1,2})$/);//4桁の数字-1～2桁の数字-1～2桁の数字
+            if(dateArray !== null){
+                let yearIndex = 1;
+                let monthIndex = 2;
+                let dayIndex = 3;
+                let dateFormatted=`${dateArray[yearIndex]}-${dateArray[monthIndex]}-${dateArray[dayIndex]}`
+                return dateFormatted;
+            }
+
+        }
+
+        event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
+        throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
+    }
+
+    /**
+     * 入力値がフィールドタイプ(ラジオボタン・ドロップダウン・複数選択・ドロップダウン)の選択肢に存在する値かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {boolean} -入力値が有効な値の場合はtrueを返し、そうでない場合は例外を発生させる
+     */
+    checkInputOption(inputValue :string,fieldOptions :string | undefined,fieldCode :string,event :any): boolean {
+
+        //入力値が選択肢に存在する値かチェックし、存在したらtrueを返す
+        if(fieldOptions !== undefined){
+            let options = Object.keys(fieldOptions);
+            for(var optionsIndex in options){
+                if(options[optionsIndex] === inputValue){
+                    return true;
+                }
+            }
+        }
+
+        event.record[fieldCode]['error']="「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。";
+        throw new Error("「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。「値を挿入する」コンポーネントの処理を中断しました。");
+    }
+
+    /**
+     * 入力値がフィールドタイプ(ユーザー選択)で、ユーザー情報に存在する値かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {string | boolean} 入力値が登録されているユーザー情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
+     */
+    async setInputUser(inputValue :string): Promise<string | boolean>{
+
+        //ユーザー名を格納する変数
+        let usersName;
+        const usersInfoColumnIndex=0;
+
+        try{
+            //APIでユーザー情報を取得する
+            const resp =await kintone.api(kintone.api.url('/v1/users', true), 'GET', {codes:[inputValue ]})
+
+            //入力されたログイン名(メールアドレス)がユーザー情報に登録されている場合、そのユーザー名を取得する
+            if (resp.users[usersInfoColumnIndex].code === inputValue) {
+                usersName=resp.users[usersInfoColumnIndex].name;
+            }
+
+            //ユーザー名が取得できた場合、ログイン名とユーザー名をフィールドにセットする
+            if(usersName === undefined){
+                throw new Error();
+            }
+        }catch{
+            return false;
+        }
+
+        return usersName;
+    }
+
+    /**
+     * 入力値がフィールドタイプ(組織選択)で、組織情報に存在する値かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {string | boolean} 入力値が登録されている組織情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
+     */
+    async setInputOrganization(inputValue :string): Promise<string | boolean>{
+
+        //組織名を格納する変数
+        let organizationName;
+        const organizationsInfoColumnIndex=0;
+
+        try{
+            //APIで組織情報を取得する
+            const resp =await kintone.api(kintone.api.url('/v1/organizations.json', true), 'GET', {codes:[inputValue ]})
+
+            //入力された組織コードが組織情報に登録されている場合、その組織名を取得する
+                if (resp.organizations[organizationsInfoColumnIndex].code === inputValue) {
+                    organizationName=resp.organizations[organizationsInfoColumnIndex].name;
+                }
+
+            //組織名が取得できた場合、組織コードと組織名をフィールドにセットする
+            if(organizationName === undefined){
+                throw new Error();
+            }
+        }catch{
+            return false;
+        }
+
+        return organizationName;
+    }
+
+    /**
+     * 入力値がフィールドタイプ(グループ選択)で、グループ情報に存在する値かチェックする関数
+     * @param {string} inputValue - 挿入する値
+     * @return {string | boolean} 入力値が登録されているグループ情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
+     */
+    async setInputGroup(inputValue :string): Promise<string | boolean>{
+
+        //グループ名を格納する変数
+        let groupsName;
+        const groupsInfoColumnIndex=0;
+
+        try{
+            //APIでグループ情報を取得する
+            const resp =await kintone.api(kintone.api.url('/v1/groups.json', true), 'GET', {codes:[inputValue ]})
+
+            //入力されたグループコードがグループ情報に登録されている場合、そのグループ名を取得する
+            if (resp.groups[groupsInfoColumnIndex].code === inputValue) {
+                groupsName=resp.groups[groupsInfoColumnIndex].name;
+            }
+
+            //グループ名が取得できた場合、グループコードとグループ名をフィールドにセットする
+            if(groupsName === undefined){
+                throw new Error();
+            }
+        }catch{
+            return false;
+        }
+
+        return groupsName;
+    }
+
+
+
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode
+     * @param event
+     * @returns
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps = actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) && !('value' in actionNode.ActionValue)) {
+                return result
+            }
+
+            const fieldColumnIndex=1;
+            const valueColumnIndex=3;
+
+            //プロパティで選択されたフィールド
+            const field=this.actionProps[fieldColumnIndex].props.modelValue.type;
+            //プロパティの挿入する値
+            const value=this.actionProps[valueColumnIndex].props.modelValue;
+
+            //条件式の結果を取得
+            const conditionResult = this.getConditionResult(context);
+            if(!conditionResult){
+                return result;
+            }
+
+            //プロパティの値を挿入するフィールドが未選択の場合、例外を発生させる
+            if(field === null){
+                throw new Error("「値を挿入する」コンポーネントで、値を挿入するフィールドが指定されていなかったため、処理が中断されました。");
+            }
+
+            //プロパティの値を挿入するフィールドが非対応フィールドの場合、例外を発生させる
+            //添付ファイル・テーブル・カテゴリー・ステータス・作成者・更新者・作業者・リビジョン番号・レコード番号・レコードID・計算・作成日時・更新日時フィールドが選択されている場合、例外を発生させる
+            if(field === "FILE" || field === "SUBTABLE" || field === "CATEGORY" || field === "STATUS"
+                    || field === "STATUS_ASSIGNEE" || field === "CREATOR" || field === "MODIFIER" || field === "__REVISION__"
+                        || field === "RECORD_NUMBER"|| field === "__ID__" || field ==="CALC" || field === "CREATED_TIME" || field === "UPDATED_TIME" ){
+                throw new Error("「値を挿入する」コンポーネントで、選択されたフィールドは、値を挿入するコンポーネントでは非対応のフィールドのため、処理を中断しました。");
+            }
+
+            //プロパティの挿入する値が未入力の場合、例外を発生させる
+            if(value === ""){
+                throw new Error("「値を挿入する」コンポーネントで、フィールドに挿入する値が指定されていなかったため、処理が中断されました。");
+            }
+
+            //既定のプロパティのインターフェースへ変換する
+            this.props = actionNode.ActionValue as IInsertValueProps;
+
+            //挿入する値を取得
+            let fieldValue = this.props.value;
+            //フィールドの種類を取得
+            const fieldType = this.props.field.type;
+            //フィールドが必須項目なのか取得
+            const fieldRequired=this.props.field.required;
+            //挿入するフィールドのコードを取得
+            const fieldCode=this.props.field.code;
+            //挿入する値の形式（手入力か変数）を取得
+            const insertValueType=this.props.show;
+            //ラジオボタン・チェックボックス・複数選択・ドロップダウンの選択肢を取得
+            let fieldOptions =this.props.field.options;
+            //変数の値を格納する
+            let variableValue;
+
+            //変数の場合、値が取得できるかチェック
+            if(insertValueType === "変数" && conditionResult){
+                variableValue = context.variables[fieldValue];
+
+                if(variableValue === undefined){
+                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした変数は、無効な入力形式です。");
+                }
+                fieldValue = variableValue;
+            }
+
+            //入力値チェック後、形式変換、型変換した値を格納する変数
+            let correctFormattedValue;
+            //入力値チェック後、形式変換、型変換した値を格納する配列
+            let correctValues :string[] = [];
+            //入力エラー（空白文字の混入）がないことをチェック
+            let notInputError=this.checkInputBlank(fieldType,fieldValue,fieldCode,fieldRequired,event);
+
+            //条件式の結果がtrue、入力エラー（空白文字の混入）がない場合、挿入する値をフィールドタイプ別にチェックする
+            if(conditionResult && notInputError){
+
+                //文字列型のフィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
+                if(fieldType === "SINGLE_LINE_TEXT" || fieldType === "MULTI_LINE_TEXT" || fieldType === "RICH_TEXT" || fieldType === "LINK" ){
+                    correctFormattedValue = fieldValue;
+
+                //数値型のフィールドに挿入しようとしている値が適切の場合、数値型に型変換してcorrectFormattedValueに代入する
+                }else if(fieldType === "NUMBER" ){
+                    if(this.checkInputNumber(fieldValue,fieldCode,event)){//入力値チェック
+                        correctFormattedValue = Number(fieldValue);//型変換
+                    }
+
+                //日付・日時型のフィールドに挿入しようとしている値が適切の場合、指定の日付・日時に形式変換してcorrectFormattedValueに代入する
+                }else if(fieldType === "DATE" || fieldType === "DATETIME" ){
+                    if(this.checkInputDate(fieldValue,fieldCode,event)){//入力値チェック
+                        let formattedDate = this.changeDateFormat(fieldValue,fieldType,fieldCode,event)
+                        if(formattedDate){
+                            correctFormattedValue = formattedDate
+                        }
+                    }
+
+                //時刻フィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
+                }else if(fieldType === "TIME"){
+                    if(this.checkInputTime(fieldValue,fieldCode,event)){//入力値チェック
+                        correctFormattedValue = fieldValue;
+                    }
+
+                //ラジオボタン・ドロップダウンのフィールドの選択肢と入力値が一致した場合、correctFormattedValueに代入する
+                }else if(fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN"){
+                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
+                        correctFormattedValue = fieldValue;
+                    }
+
+                //チェックボックス・複数選択のフィールドの選択肢と入力値が一致した場合、correctValuesの配列に代入する
+                }else if(fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT" ){
+                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
+                        correctValues[0] = fieldValue;
+                    }
+
+                //ユーザー情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
+                }else if(fieldType === "USER_SELECT"){
+                    //挿入する値がユーザー情報から見つかれば、ユーザー名を格納
+                    let users=await this.setInputUser(fieldValue);
+
+                    //ユーザー名が格納できている場合、ログイン名とユーザー名をcorrectFormattedValueに代入する
+                    if(!users){
+                        event.record[fieldCode]['error']="ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
+                        throw new Error("ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
+                    }else{
+                        correctFormattedValue=[{ code: fieldValue, name: users }];
+                    }
+
+                //組織情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
+                }else if(fieldType === "ORGANIZATION_SELECT"){
+                    //挿入する値が組織情報から見つかれば、組織名を格納
+                    let organizations=await this.setInputOrganization(fieldValue);
+
+                    //組織名が格納できている場合、組織コードと組織名をcorrectFormattedValueに代入する
+                    if(!organizations){
+                        event.record[fieldCode]['error']="組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
+                        throw new Error("組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
+                    }else{
+                        correctFormattedValue=[{ code: fieldValue, name: organizations}];
+                    }
+
+                //グループ情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
+                }else if(fieldType === "GROUP_SELECT"){
+                    //挿入する値がグループ情報から見つかれば、グループ名を格納
+                    let groups=await this.setInputGroup(fieldValue);
+
+                    //グループ名が格納できている場合、グループコードとグループ名をcorrectFormattedValueに代入する
+                    if(!groups){
+                        event.record[fieldCode]['error']="グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
+                        throw new Error("グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
+                    }else{
+                        correctFormattedValue=[{ code: fieldValue, name: groups}];
+                    }
+                }
+            }
+
+            //条件式の結果がtrueかつ挿入する値が変換できた場合、フィールド（ラジオボタン・ドロップダウン・チェックボックス・複数選択・文字列一行・文字列複数行・リッチエディタ・数値・日付・日時・時刻）にセット
+            if(conditionResult && (correctFormattedValue || correctValues)){
+                //条件式の結果がtureかつ、値を正しい形式に変換できた場合、フィールドに値をセットする
+                if(correctFormattedValue){
+                    event.record[fieldCode].value = correctFormattedValue;
+                //条件式の結果がtureかつ、値を正しい形式（配列）に変換できた場合、フィールドに値（配列）をセットする
+                }else if(correctValues.length > 0){
+                    event.record[fieldCode].value = correctValues;
+                }
+            }
+
+            result= {
+                canNext:true,
+                result:true
+            }
+            return result;
+        }catch(error:any){
+            event.record;
+            event.error=error.message;
+            console.error(error);
+            result.canNext=true;//次のノードは処理を続ける
+            return result;
+        }
+
+    }
+
+    /**
+     *
+     * @param context 条件式を実行する
+     * @returns
+     */
+    getConditionResult(context:any):boolean{
+        //プロパティ`condition`から条件ツリーを取得する
+        const tree =this.getCondition(this.props.condition);
+        if(!tree){
+            //条件を設定されていません
+            return true;
+        }
+        return tree.evaluate(tree.root,context);
+    }
+
+    /**
+     * @param condition 条件式ツリーを取得する
+     * @returns
+     */
+    getCondition(condition:string):ConditionTree|null{
+        try{
+            const tree = new ConditionTree();
+            tree.fromJson(condition);
+            if(tree.getConditions(tree.root).length>0){
+                return tree;
+            }else{
+                return null;
+            }
+        }catch(error){
+            return null;
+        }
+    }
+
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+
+}
+new InsertValueAction();

plugin/kintone-addins/src/actions/login-user-getter.ts

@@ -0,0 +1,76 @@
+import { actionAddins } from ".";
+import { IField,IAction,IActionResult, IActionNode, IActionProperty,IContext,IVarName} from "../types/ActionTypes";
+//右UI画面propertyのname:型：
+interface ILoginUserGetterProps{
+    //変数名にセット：値がオブジェクトの形式
+    verName:IVarName;
+}
+//IActionインタフェースを実装する新しいクラスActionを作成：
+export class LoginUserGetterAction implements IAction{
+    name: string;
+    //importから導入顕示定義
+    actionProps: IActionProperty[];
+    //上方のinterface Propsから、props受ける属性を定義：
+    props:ILoginUserGetterProps;
+    //関数定義に必要な類名を構築：
+    constructor(){
+        //pgAdminDBに登録したアクション名(name/subtitle)一致する必要がある：
+        this.name="ログインユーザー取得";
+        this.actionProps=[];
+        this.register();
+        //プロパティ属性初期化：
+        this.props={
+            verName:{name:''}
+        }
+        //リセット上記登録表：
+        this.register();
+    }
+/**
+ * アクションの処理を実装する
+ * @param actionNode アクションノード
+ * @param event Kintoneのイベント
+ * @param context コンテキスト（レコード、変数情報を持っている）
+ * @returns 
+ */
+　　//非同期処理ある関数下のある属性：
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する：
+            this.actionProps=actionNode.actionProps;
+            //プロパティ設定のデータ型は必要な情報含めますか？全部不存在時return:
+            if (!('verName' in actionNode.ActionValue)) {
+                return result
+            }
+            //既定のプロパティのインタフェースへ変換：
+            this.props = actionNode.ActionValue as ILoginUserGetterProps;
+//////////////////////////////////////////////////////////////////////////////////////
+            if(this.props.verName&&this.props.verName.name!==''){
+                context.variables[this.props.verName.name]=kintone.getLoginUser();
+                // window.alert("変数名"+this.props.verName.name+"の値は"+context.variables[this.props.verName.name]+"です");
+                // event.record["変数運用先のユーザ選択フィールド"].value= [{code:context.variables[this.props.verName.name].code}];
+            }
+//////////////////////////////////////////////////////////////////////////////////////
+            result= {
+                canNext:true,
+                result:true
+            }
+            return result;
+//////////////////////////////////////////////////////////////////////////////////////
+        }catch(error:any){;
+            event.error=error.message;
+            return {
+                canNext:false,
+                result:false
+            }
+        }
+    }
+//////////////////////////////////////////////////////////////////////////////////////
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new LoginUserGetterAction();

plugin/kintone-addins/src/actions/mail-check.ts

@@ -0,0 +1,80 @@
+import { actionAddins } from ".";
+import { IAction, IActionResult, IActionNode, IActionProperty, IField } from "../types/ActionTypes";
+/**
+ * アクションの属性定義
+ */
+interface IMailCheckProps {
+    field: IField;//チェックするフィールドの対象
+    message: string;//エラーメッセージ
+    emailCheck:string;
+}
+/**
+ * メールアドレスチェックアクション
+ */
+export class MailCheckAction implements IAction {
+    name: string;
+    actionProps: IActionProperty[];
+    props: IMailCheckProps;
+    constructor() {
+        this.name = "メールアドレスチェック";
+        this.actionProps = [];
+        this.props = {
+            field: { code: '' },
+            message: '',
+            emailCheck:''
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode: IActionNode, event: any): Promise<IActionResult> {
+        let result = {
+            canNext: true,
+            result: false
+        };
+
+        try {
+            //属性設定を取得する
+            this.actionProps = actionNode.actionProps;
+
+            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('emailCheck' in actionNode.ActionValue)) {
+                return result
+            }
+            this.props = actionNode.ActionValue as IMailCheckProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code].value;
+
+            if (this.props.emailCheck === '厳格') {
+                if (!/^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)) {
+                    record[this.props.field.code].error = this.props.message;
+                }
+            } else if (this.props.emailCheck === 'ゆるめ') {
+                if (!/^[^@]+@[^@]+$/.test(value)) {
+                    record[this.props.field.code].error = this.props.message;
+                }
+            } else {
+                result = {
+                    canNext: true,
+                    result: true
+                }
+            }
+            return result;
+        } catch (error) {
+            event.error = error;
+            console.error(error);
+            result.canNext = false;
+            return result;
+        }
+    };
+    register(): void {
+        actionAddins[this.name] = this;
+    }
+
+}
+new MailCheckAction();

plugin/kintone-addins/src/actions/regular-check.ts

@@ -0,0 +1,72 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
+/**
+ * アクションの属性定義
+ */
+interface IRegularCheckProps{
+    field:IField;//チェックするフィールドの対象
+    message:string;//エラーメッセージ
+    regExpression:string;//正規表現式
+}
+/**
+ * 正規表現チェックアクション
+ */
+export class RegularCheckAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:IRegularCheckProps;
+    constructor(){
+        this.name="正規表現チェック";
+        this.actionProps=[];
+        this.props={
+            field:{code:''},
+            message:'',
+            regExpression:''
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('regExpression'in actionNode.ActionValue)) {
+                return result
+            }
+            this.props = actionNode.ActionValue as IRegularCheckProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code].value;
+            const regex = new RegExp(this.props.regExpression);
+            if(!regex.test(value)){
+                record[this.props.field.code].error=this.props.message;
+            }else{
+                result= {
+                    canNext:true,
+                    result:true
+                  }
+            }
+            return result;
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    };
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+    
+}
+new RegularCheckAction();

plugin/kintone-addins/src/actions/string-join.ts

@@ -0,0 +1,211 @@
+import { actionAddins } from ".";
+import { IField, IAction,IActionResult, IActionNode, IActionProperty } from "../types/ActionTypes";
+import { Formatter } from "../util/format";
+
+//右UI画面propertyのname:型：
+interface IStringJoinProps{
+    //保存先フィールド
+    saveField:IField;
+    //結合元フィールド1
+    joinField1:IField;
+    //結合元フィールド2
+    joinField2:IField;
+    //区切り文字
+    delimiter:string;
+}
+
+//IActionインタフェースを実装する新しいクラスActionを作成：
+export class StringJoinAction implements IAction{
+    name: string;
+    //importから導入顕示定義
+    actionProps: IActionProperty[];
+    //上方のinterface Propsから、props受ける属性を定義：
+    props:IStringJoinProps;
+    //関数定義に必要な類名を構築：
+    constructor(){
+        //pgAdminDBに登録したアクション名(name/subtitle)一致する必要がある：
+        this.name="文字結合";
+        this.actionProps=[];
+        this.register();
+        //プロパティ属性初期化：
+        this.props={
+            saveField:{code:''},
+            joinField1:{code:''},
+            joinField2:{code:''},
+            delimiter:''
+        }
+        //リセット上記登録表：
+        this.register();
+    }
+/**
+ * アクションの処理を実装する
+ * @param actionNode アクションノード
+ * @param event Kintoneのイベント
+ * @param context コンテキスト（レコード、変数情報を持っている）
+ * @returns 
+ */
+    //非同期処理ある関数下のある属性：
+    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
+        let result={
+            //後継処理不可：
+            canNext:false,
+            result:false
+        };
+        try{
+            //属性設定を取得する：
+            this.actionProps=actionNode.actionProps;
+            //プロパティ設定のデータ型は必要な情報含めますか？全部不存在時return:
+            if (!('saveField' in actionNode.ActionValue) && !('joinField1' in actionNode.ActionValue) && !('joinField2' in actionNode.ActionValue)) {
+                return result
+            }
+
+            //既定のプロパティのインタフェースへ変換：
+            this.props = actionNode.ActionValue as IStringJoinProps;
+            const record = event.record;
+
+            //kintoneフィールドタイプ取得：
+            const joinField1type=this.props.joinField1.type;
+            const joinField2type=this.props.joinField2.type;
+            const saveFieldtype=this.props.saveField.type;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+            // //保存先フィールドは文字列フィールドではない場合、エラー発生：
+            if(!(saveFieldtype==='SINGLE_LINE_TEXT'||saveFieldtype==='MULTI_LINE_TEXT'||saveFieldtype==='RICH_TEXT')){
+                event.error='[エラーメッセージ]：結合保存先対応不可。結合しません';
+                if (event.type.includes('success')){
+                    window.alert("[windows alert]："+event.error);
+                }
+                result = {
+                    canNext: false,
+                    result: false
+                }
+                return result;
+            }
+//////////////////////////////////////////////////////////////////////////////////////////
+    //値取得方法定義：
+    function getValue(value:string,type:string|undefined,fieldCode:string,event:any){
+        if(event.record[fieldCode]?.value===undefined||event.record[fieldCode]?.value===null){
+            event.record[fieldCode].value='';
+        }
+        //作成者、更新者：
+        if(type==='CREATOR'||type==='MODIFIER'){
+            value = event.record[fieldCode]?.value.name;
+        //日時、作成日時、更新日時：
+        }else if(type==='DATETIME'||type==='CREATED_TIME'||type==='UPDATED_TIME'){
+            if(event.record[fieldCode]?.value!==undefined && event.record[fieldCode]?.value!==''){
+                value = Formatter.dateFormat(new Date(event.record[fieldCode]?.value),'yyyy-MM-dd HH:mm');
+                }else{
+                    value=event.record[fieldCode]?.value;
+                }
+        //ユーザ選択、組織選択、グループ選択、添付ファイル名、作業者、カテゴリー：
+        }else if(type==='USER_SELECT'||type==='ORGANIZATION_SELECT'||type==='GROUP_SELECT'||type==='FILE'||type==='STATUS_ASSIGNEE'){
+            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
+                value = event.record[fieldCode]?.value;
+            }else{
+                const mototext=event.record[fieldCode]?.value;
+                let arr=[];
+                for(let i=0;i<mototext.length;i++){
+                    arr.push(mototext[i].name);
+                }
+                //配列要素を,で連結して文字列を作成：
+                value=arr.join();
+            }
+        //カテゴリー、チェックボックス、複数選択：
+        }else if(type==='CATEGORY'||type==='CHECK_BOX'||type==='MULTI_SELECT'){
+            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
+                value = event.record[fieldCode]?.value;
+            }else{
+                const mototext=event.record[fieldCode]?.value;
+                let arr=[];
+                for(let i=0;i<mototext.length;i++){
+                    arr.push(mototext[i]);
+                }
+                //配列要素を,で連結して文字列を作成：
+                value=arr.join();
+            }
+        //詳細画面プロセス実行後のステータス：
+        }else if(type==='STATUS'&&event.type.includes('process')){
+            value = event.nextStatus.value;
+        }else{
+            value = event.record[fieldCode]?.value;
+        }
+        if (value===undefined || value===null){
+            value='';
+        }        
+        return value;     
+    }
+//////////////////////////////////////////////////////////////////////
+            //値取得方法呼出：
+            let joinValue1:string='';
+            joinValue1=getValue(joinValue1,joinField1type,this.props.joinField1.code,event);
+/////////////////////////////////////////////////////////////////////////////////////
+            let joinValue2:string='';
+            joinValue2=getValue(joinValue2,joinField2type,this.props.joinField2.code,event);
+//////////////////////////////////////////////////////////////////////////////////////////////////////////
+            const conString = this.props.delimiter;
+            let saveValue:string='';
+            //前後結合元が空白なら区切り文字も空白にする(例:1-8の8無いなら1。1-8の1無いなら8。1空白8の8無いなら1。結合元全部空白なら全部空白):
+            if(joinValue1===''&&joinValue2===''){
+                saveValue='';
+            }else if(joinValue1===''&&joinValue2!==''){
+                saveValue=joinValue2;
+            }else if(joinValue2===''&&joinValue1!==''){
+                saveValue=joinValue1;
+            }else if(joinValue1!==''&&joinValue2!==''){
+                saveValue=`${joinValue1}${conString}${joinValue2}`
+            }
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            //新規/更新/一覧保存成功後の以外のeventでPUT使用しない：
+            if (!event.type.includes('success')){
+                 //保存先フィールドに値セット：
+                 record[this.props.saveField.code].value=saveValue;
+                 window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
+            }else{
+                const params={
+                    "app":event.appId,
+                    "id":event.recordId,
+                    "record":{[this.props.saveField.code]:{"value":saveValue}}
+                };
+                return await kintone.api(kintone.api.url('/k/v1/record',true),'PUT',params).then((resp) => {
+                    //kintone保存先フィールド存在確認：
+                    record[this.props.saveField.code].value=saveValue;
+                    if (event.type.includes('index')){
+                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。一覧画面更新成功後自動リロードしません。必要に応じて手動リロードください。");
+                    }else{
+                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
+                    }
+                        //一覧画面更新成功後リロード：
+                    // if (event.type.includes('index')){
+                    //     event.url = location.href.endsWith('/') || location.href.endsWith('&') ?
+                    //     location.href.slice(0, -1) :
+                    //     location.href + (location.href.includes('?') ? '&' : '/');
+                    // }
+                }).catch((error) => {
+                    event.error = 'エラーが発生しました。結合しません。システム管理者へお問合せください';
+                    window.alert(event.error+"error message："+error);
+                    return event;
+                });
+            }
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+            result= {
+                canNext:true,
+                result:true
+            }
+            return result;
+        }catch(error){;
+            if (event.type.includes('success')){
+                window.alert("[windows alert]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error)
+            }
+            event.error="[エラーメッセージ]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error;
+            return {
+                canNext:false,
+                result:false
+            }
+        }
+    }
+///////////////////////////////////////////////////////////////////////////////////////////////
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new StringJoinAction();

plugin/kintone-addins/src/actions/validation-fullwidth.ts

@@ -0,0 +1,96 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
+
+//クラス名を設計書に揃える
+/**
+ * アクションの属性定義
+ */
+    interface FullWidthProps{
+        //checkOption:Array<string>,
+        field:IField
+    }
+/**
+ * 全角チェックアクション
+ */
+export class FullWidthAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:FullWidthProps;
+    constructor(){
+        this.name="全角チェック"; /* pgadminのnameと同様  */
+        this.actionProps=[];
+        this.props={
+            //checkOption:[],
+            field:{code:''}
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode
+     * @param event
+     * @returns
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) ) {
+                return result
+            }
+            this.props = actionNode.ActionValue as FullWidthProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code]?.value;
+            //条件分岐
+            //未入力時は何も処理をせず終了
+            if(value===undefined || value===''){
+                return result;
+            }
+            //半角が含まれていた場合resultがfalse
+            if(!this.containsFullWidthChars(value)){
+                //エラー時に出力される文字設定
+                record[this.props.field.code].error="半角が含まれています";
+                //次の処理を中止する値設定
+                result.canNext=false;
+                return result;
+            }
+            //resultプロパティ指定
+            result= {
+            canNext:true,
+            result:true
+            }
+            return result;
+
+        //例外処理
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    }
+    // 全て全角の文字列の場合はtrue、そうでない場合はfalse
+    containsFullWidthChars(text: string): boolean {
+
+        // 半角英数字カナ記号を除外
+        const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$";
+
+        //正規表現オブジェクト生成
+        const fullWidthRegex = new RegExp(checkRegex);
+
+        //正規表現チェック
+        return fullWidthRegex.test(text);
+    }
+
+    //戻り値を持たないためvoid型
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new FullWidthAction();

plugin/kintone-addins/src/actions/validation-halfwidth.ts

@@ -0,0 +1,90 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
+
+/**
+ * アクションの属性定義
+ */
+    interface HalfWidthProps{
+        field:IField
+    }
+/**
+ * 半角チェックアクション
+ */
+export class HalfWidthAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:HalfWidthProps;
+    constructor(){
+        this.name="半角チェック"; /* pgadminのnameと同様  */
+        this.actionProps=[];
+        this.props={
+            field:{code:''}
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode
+     * @param event
+     * @returns
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) ) {
+                return result
+            }
+            this.props = actionNode.ActionValue as HalfWidthProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code]?.value;
+            //条件分岐
+            //未入力時は何も処理をせず終了
+            if(value===undefined || value===''){
+                return result;
+            }
+            //全角が含まれていた場合保存処理中止(エラー処理)
+            if(!this.containsHalfWidthChars(value)){
+                //エラー時に出力される文字設定
+                record[this.props.field.code].error="全角が含まれています";
+                //次の処理を中止する値設定
+                result.canNext=false;
+                return result;
+            }
+            //半角の場合問題なく実行
+            //resultプロパティ指定
+            result= {
+            canNext:true,
+            result:true
+            }
+            return result;
+        //例外処理
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    }
+    // 全て全角の文字列の場合はtrue、そうでない場合はfalse
+    containsHalfWidthChars(text: string): boolean {
+
+        const checkRegex = "^[\x01-\x7E\uFF61-\uFF9F]+$";
+        //正規表現オブジェクト生成
+        const halfWidthRegex = new RegExp(checkRegex);
+
+        //正規表現チェック
+        return halfWidthRegex.test(text);
+    }
+    //戻り値を持たないためvoid型
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new HalfWidthAction();

plugin/kintone-addins/src/actions/value-getter.ts

@@ -0,0 +1,70 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext, IVarName} from "../types/ActionTypes";
+/**
+ * アクションの属性定義
+ */
+interface IGetValueProps{
+    field:IField;//チェックするフィールドの対象
+    verName:IVarName;
+}
+/**
+ * 正規表現チェックアクション
+ */
+export class GetValueAciton implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:IGetValueProps;
+    constructor(){
+        this.name="値を取得する";
+        this.actionProps=[];
+        this.props={
+            field:{code:''},
+            verName:{name:''}
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) && !('verName' in actionNode.ActionValue)) {
+                return result
+            }
+            
+            this.props = actionNode.ActionValue as IGetValueProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code].value;
+            if(this.props.verName && this.props.verName.name!==''){
+                context.variables[this.props.verName.name] = value;
+            }
+            result = {
+                canNext:true,
+                result:true
+                }
+            
+            return result;
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    };
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+    
+}
+new GetValueAciton();

plugin/kintone-addins/src/index.ts

@@ -1,9 +1,3 @@
-// export const sum = (a: number, b: number) => {
-//   if ('development' === process.env.NODE_ENV) {
-//     console.log('boop');
-//   }
-//   return a + b;
-// };
 import $ from 'jquery';
 import { ActionProcess } from './types/action-process';
 import { ActionFlow } from './types/ActionTypes';

plugin/kintone-addins/src/types/ActionTypes.ts

@@ -89,6 +89,13 @@ export interface IField{
   name?:string;
   code:string;
   type?:string;
+  required?:boolean;
+  options?:string;
+}
+//変数のインターフェース
+export interface IVarName{
+  name:string;
+  fields?:IVarName[];
 }
 
 /**

plugin/kintone-addins/src/types/action-process.ts

@@ -6,6 +6,21 @@ import '../actions/field-shown';
 import '../actions/error-show';
 import '../actions/button-add';
 import '../actions/condition-action';
+import '../actions/data-processing';
+import '../actions/data-mapping';
+import '../actions/current-field-get';
+import '../actions/regular-check';
+import '../actions/mail-check';
+import '../actions/counter-check';
+import '../actions/datetime-getter';
+import '../actions/insert-value';
+import '../actions/value-getter';
+import '../actions/string-join';
+import '../actions/validation-fullwidth';
+import '../actions/validation-halfwidth';
+import '../actions/login-user-getter';
+import '../actions/auto-lookup';
+
 import { ActionFlow,IActionFlow, IActionResult,IContext } from "./ActionTypes";
 
 export class ActionProcess{

plugin/kintone-addins/tsconfig.json

@@ -15,8 +15,8 @@
 
     /* Linting */
     "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
     "noFallthroughCasesInSwitch": true,
     "esModuleInterop": true
   },

plugin/kintone-addins/vite.config.js

@@ -1,16 +1,33 @@
 // vite.config.js
-import { defineConfig } from 'vite'
-const sourcemap = process.env.SOURCE_MAP==='true';
+import { defineConfig, loadEnv } from "vite";
+import checker from "vite-plugin-checker";
+import { libInjectCss } from 'vite-plugin-lib-inject-css';
 
-export default defineConfig({
-  build: {
-    rollupOptions: {
-      input: 'src/index.ts',  // entry file
-      output:{
-        entryFileNames:'alc_runtime.js',
-        // assetFileNames:'alc_kintone_style.css'
-      }
+export default ({ mode }) => {
+  process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
+  const sourcemap = process.env.VITE_SOURCE_MAP=== 'false'?false:process.env.VITE_SOURCE_MAP;
+  // console.log(process.env);
+  return defineConfig({
+    plugins: [
+      checker({
+        typescript: true,
+      }),
+      libInjectCss(),
+    ],
+    build: {
+      cssCodeSplit: false,
+      rollupOptions: {
+        input: "src/index.ts", // entry file
+        output: {
+          entryFileNames: "alc_runtime.js",
+          assetFileNames:'alc_runtime.css'
+        },
+      },
+      sourcemap: sourcemap,
     },
-    sourcemap:sourcemap
-  }
-})
+    server: {
+      port: process.env.VITE_PORT,
+      // open: "/dist/alc_runtime.js",
+    },
+  });
+};

sample.json

@@ -2,7 +2,7 @@
   "id": "",
   "actionNodes": [
     {
-      "id": "c5cd772a-04be-418e-a811-3787f98a2285",
+      "id": "822b5b2c-cfb7-447a-ae77-01bf3a530fae",
       "name": "app.record.create.show",
       "title": "レコード追加画面",
       "subTitle": "レコード追加画面を表示した後",
@@ -12,12 +12,12 @@
       "actionProps": [],
       "ActionValue": {},
       "nextNodeIds": {
-        "": "1eb097b1-9d08-462e-97b0-6e3e1232edef"
+        "": "3a762b11-8e15-4353-8148-306bfed6cd5e"
       }
     },
     {
-      "id": "1eb097b1-9d08-462e-97b0-6e3e1232edef",
-      "name": "属性UIテスト用",
+      "id": "3a762b11-8e15-4353-8148-306bfed6cd5e",
+      "name": "ルックアップ更新",
       "inputPoint": "",
       "outputPoints": [],
       "actionProps": [
@@ -28,85 +28,73 @@
             "displayName": "表示名",
             "placeholder": "表示を入力してください",
             "hint": "",
-            "modelValue": "属性UIテスト用"
+            "modelValue": "元データ更新時にルックアップ先が同期する"
           }
         },
         {
           "component": "AppFieldSelect",
           "props": {
-            "displayName": "フィールド選択(複数)",
+            "displayName": "更新先選択",
             "modelValue": {
               "app": {
-                "id": "64",
-                "name": "日報テスト",
-                "description": "日々の業務内容、報告事項、所感などを記載していくアプリです。\n記録を行うだけでなく、あとからの振り返りやメンバー間のコミュニケーションにも活用できます。",
-                "createdate": "2023/07/15 10:15:03"
-              },
-              "fields": [
-                {
-                  "name": "ステータス",
-                  "type": "STATUS",
-                  "code": "ステータス",
-                  "label": "ステータス",
-                  "enabled": false
-                }
-              ]
-            },
-            "name": "selectFields",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType": "multiple"
-          }
-        },
-        {
-          "component": "AppFieldSelect",
-          "props": {
-            "displayName": "フィールド選択(単一)",
-            "modelValue": {
-              "app": {
-                "id": "58",
-                "name": "日報",
+                "id": "247",
+                "name": "商品購買記録",
                 "description": "",
-                "createdate": "2023/07/13 19:05:26"
+                "createdate": "2024/06/24 02:49:12"
               },
               "fields": [
                 {
-                  "name": "所感、学び",
-                  "type": "MULTI_LINE_TEXT",
-                  "code": "文字列__複数行__0",
-                  "label": "所感、学び",
+                  "name": "商品ID",
+                  "type": "SINGLE_LINE_TEXT",
+                  "code": "商品ID",
+                  "label": "商品ID",
                   "noLabel": false,
-                  "required": false,
-                  "defaultValue": ""
+                  "required": true,
+                  "lookup": {
+                    "relatedApp": {
+                      "app": "246",
+                      "code": ""
+                    },
+                    "relatedKeyField": "商品ID",
+                    "fieldMappings": [
+                      {
+                        "field": "商品名",
+                        "relatedField": "商品名"
+                      },
+                      {
+                        "field": "単価",
+                        "relatedField": "価格"
+                      }
+                    ],
+                    "lookupPickerFields": [
+                      "商品名",
+                      "価格"
+                    ],
+                    "filterCond": "",
+                    "sort": "レコード番号 desc"
+                  }
                 }
               ]
             },
-            "name": "selectField",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType": "single"
+            "name": "lookupField",
+            "placeholder": "",
+            "fieldTypes": [
+              "lookup"
+            ],
+            "hint": "更新先のルックアップフィールドを選択する"
           }
         },
         {
-          "component": "ColorPicker",
+          "component": "ConditionInput",
           "props": {
-            "displayName": "色選択",
-            "modelValue": "#f50000",
-            "name": "color",
-            "placeholder": "カラーを選択してください"
-          }
-        },
-        {
-          "component": "NumInput",
-          "props": {
-            "displayName": "数値入力フィールド",
-            "modelValue": 100,
-            "name": "num",
-            "max": 100,
-            "min": 0,
-            "placeholder": "数値を入力してください"
+            "displayName": "更新条件",
+            "modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{},\"operator\":\"=\",\"value\":\"\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
+            "name": "condition",
+            "placeholder": "条件式を設定してください"
           }
         }
       ],
-      "prevNodeId": "c5cd772a-04be-418e-a811-3787f98a2285",
+      "prevNodeId": "822b5b2c-cfb7-447a-ae77-01bf3a530fae",
       "nextNodeIds": {}
     }
   ]

sample2.json

@@ -1,55 +1,24 @@
 [
-    {
-        "component": "InputText",
-        "props": {
-            "displayName": "文字入力",
-            "modelValue": "",
-            "name": "str",
-            "placeholder": "文字を入力してください",
-            "maxLength":"20",
-            "hint":"文字列入力<br>入力ルール指定可能。ルールの設定例：[val=>!!val||'必須入力です']",
-            "rules":"[val=>!!val||'必須入力です']"
-        }
-    },
-    {
-        "component": "AppFieldSelect",
-        "props": {
-            "displayName": "フィールド選択(複数)",
-            "modelValue": {},
-            "name": "selectFields",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType":"multiple"
-        }
-    },
-    {
-        "component": "AppFieldSelect",
-        "props": {
-            "displayName": "フィールド選択(単一)",
-            "modelValue": {},
-            "name": "selectField",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType":"single"
-        }
-    },
-    {
-        "component": "ColorPicker",
-        "props": {
-            "displayName": "色選択",
-            "modelValue": "",
-            "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の範囲内の数値を入力してください']"
-        }
+  {
+    "component": "AppFieldSelect",
+    "props": {
+      "displayName": "更新先選択",
+      "modelValue": {},
+      "name": "lookupField",
+      "placeholder": "",
+      "fieldTypes": [
+        "lookup"
+      ],
+      "hint": "更新先のルックアップフィールドを選択する"
     }
-]
+  },
+  {
+    "component": "ConditionInput",
+    "props": {
+      "displayName": "更新条件",
+      "modelValue": "",
+      "name": "condition",
+      "placeholder": "条件式を設定してください"
+    }
+  }
+]

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+