ログの削除

# Conflicts:
#	plugin/kintone-addins/package.json
#	plugin/kintone-addins/vite.config.js

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

@@ -404,12 +404,6 @@ 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)
@@ -418,10 +412,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
+    scriptdir = Path(__file__).resolve().parent
-    # rootdir = scriptdir.parent.parent.parent.parent
+    rootdir = scriptdir.parent.parent.parent.parent
-    # fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
+    fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
-    fpath = getTempPath(f"alc_setting_{app}.js")
+    print(rootdir)
     print(fpath)
     with open(fpath,'w') as file:
         file.write(js)
@@ -509,7 +503,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_NAME}->{app}):",e)   
+        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAM}->{app}):",e)   
 
 @r.get("/allapps")
 async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -519,14 +513,14 @@ 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_NAME}):",e)   
+       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAM}):",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_NAME}->{app}):",e) 
+       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 
 
 @r.get("/allfields")
 async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
@@ -535,14 +529,14 @@ async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
         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) 
+       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAM}->{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_NAME}->{app}):",e) 
+       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAM}->{app}):",e) 
 
 @r.get("/alljscss")
 async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -553,7 +547,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_NAME}->{app}):",e) 
+       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAM}->{app}):",e) 
 
 @r.post("/createapp",)
 async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -569,7 +563,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_NAME}->{name}):",e) 
+        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAM}->{name}):",e) 
 
 
 @r.post("/createappfromexcel",)
@@ -698,7 +692,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_NAME}->{app}):",e)
+        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAM}->{app}):",e)
        
     return result
 
@@ -709,8 +703,7 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
         jscs=[]
         files=[]
         files.append(createappjs(env.DOMAIN_ID, app))
-        files.append(getTempPath('alc_runtime.js'))
+        files.append('Temp\\alc_runtime.js')
-        files.append(getTempPath('alc_runtime.css'))        
         for file in files:
             upload = uploadkintonefiles(file,env)
             if upload.get('fileKey') != None:
@@ -720,4 +713,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_NAME}->{app}):",e)
+        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAM}->{app}):",e)

backend/app/core/config.py

@@ -5,14 +5,15 @@ 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 = "PROD" #DEV,PROD
+DEPLOY_MODE = "DEV" #DEV,PROD
 
 DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/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"]
 

frontend/.env

@@ -1,6 +1,2 @@
-#開発環境
 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,7 +94,6 @@ 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

@@ -33,7 +33,7 @@
             <div class="row">
                 <field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelectFields="updateSelectFields"
                     :appId="selField?.app?.id" not_page :filter="fieldFilter"
-                    :selectedFields="selField.fields" :fieldTypes="fieldTypes"></field-select>
+                    :selectedFields="selField.fields"></field-select>
             </div>
         </div>
     </div>
@@ -92,10 +92,7 @@ export default defineComponent({
             type: String,
             default: 'single'
         },
-        fieldTypes:{
+
-            type:Array,
-            default:()=>[]
-        }
     },
     setup(props, { emit }) {
         const showSelectApp = ref(false);
@@ -108,7 +105,7 @@ export default defineComponent({
         const updateSelectApp = (newAppinfo: IApp) => {
             selField.app = newAppinfo
         }
-
+        
         const updateSelectFields = (newFields: IField[]) => {
             selField.fields = newFields
         }

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,35 +1,32 @@
 <template>
-  <div class="q-pa-sm">
+  <q-field labelColor="primary" class="condition-object" :clearable="isSelected" stack-label :dense="true"
-    <q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled"
+    :outlined="true">
-      :clearable="isSelected">
+    <template v-slot:control>
-      <template v-slot:control>
+      <!-- <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
-        <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
+        {{ selectedObject.name }}
-          {{ selectedObject.name }}
+      </q-chip>
-        </q-chip>
+      <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
-        <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
+        {{ selectedObject.name.name }}
-          {{ selectedObject.name.name }}
+      </q-chip> -->
-        </q-chip>
+      {{ selectedObject?.sharedText }}
-        <div v-if="isSelected && selectedObject.objectType==='text'">{{ selectedObject?.sharedText }}</div>
+    </template>
-      </template>
+    <template v-slot:append>
-      <template v-slot:append>
+      <q-icon name="search" class="cursor-pointer" @click="showDg" />
-        <q-icon name="search" class="cursor-pointer" @click="showDg" />
+    </template>
-      </template>
+  </q-field>
-    </q-field>
+  <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
-    <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
+    <!-- <template v-slot:toolbar>
-      <!-- <template v-slot:toolbar>
+        <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
-          <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
+          <template v-slot:before>
-            <template v-slot:before>
+            <q-icon name="search" />
-              <q-icon name="search" />
+          </template>
-            </template>
+        </q-input>
-          </q-input>
+    </template>
-      </template>
+    <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
-      <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"
-      <DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
+      :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" />
-        :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" />
-
   </show-dialog>
-</div>
 </template>
 
 <script lang="ts">
@@ -39,7 +36,6 @@ import ShowDialog from '../ShowDialog.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: {
@@ -48,14 +44,6 @@ export default defineComponent({
     // ConditionObjects
   },
   props: {
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    label: {
-      type: String,
-      default: undefined
-    },
     config: {
       type: Object,
       default: () => {
@@ -80,7 +68,7 @@ export default defineComponent({
     const store = useFlowEditorStore();
     // const sharedText = ref(''); // 共享的文本状态
     const isSelected = computed(() => {
-      return selectedObject.value?.sharedText !== '';
+      return selectedObject?.value?.sharedText !== '';
     });
     // const isSelected = computed(()=>{
     //   return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -68,7 +68,7 @@
           <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" :config="leftDynamicItemConfig" class="col-4"/>
-              <q-select  v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
+              <q-select v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
               <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)"
@@ -263,8 +263,7 @@ export default defineComponent( {
 .operator{
   min-width: 150px;
   max-height: 40px;
-  margin-left: 12px;
+  margin: 0 2px;
-
   text-align: center;
   font-size: 12pt;
 }

frontend/src/components/DynamicItemInput/DynamicItemInput.vue

@@ -3,7 +3,7 @@
         <!-- <q-card> -->
         <div class="q-mb-md">
             <q-input ref="inputRef" outlined dense debounce="200" @update:model-value="updateSharedText"
-                v-model="sharedText" :readonly="!canInput" autogrow>
+                v-model="sharedText" :readonly="!canInput">
                 <template v-slot:append>
                     <q-btn flat round padding="none" icon="cancel" @click="clearSharedText" color="grey-6" />
                 </template>
@@ -94,7 +94,7 @@ export default defineComponent({
             dialogVisible.value = false;
         };
 
-        const handleSelect = (value:any) => {
+        const handleSelect = (value) => {
             // 获取当前光标位置
             // const cursorPosition = inputRef.value.getNativeElement().selectionStart;
             // if (cursorPosition === undefined || cursorPosition === 0) {
@@ -104,7 +104,7 @@ export default defineComponent({
             //     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;
             }
@@ -117,9 +117,9 @@ export default defineComponent({
             canInput.value = true;
             emit('update:selectedObject', {});
         }
-        const updateSharedText = (value:string) => {
+        const updateSharedText = (value) => {
             sharedText.value = value;
-            emit('update:selectedObject', { ...props.selectedObject, sharedText: value,objectType:'text' });
+            emit('update:selectedObject', { ...props.selectedObject, sharedText: value });
         }
 
         return {
@@ -138,4 +138,4 @@ export default defineComponent({
         };
     }
 });
-</script>
+</script>

frontend/src/components/FieldSelect.vue

@@ -67,10 +67,7 @@ export default {
         const fld = fields[key];
         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;
     });

frontend/src/components/right/AppFieldSelect.vue

@@ -49,7 +49,7 @@
         </q-card>
     </div>
     <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeAFBox">
-        <AppFieldSelectBox v-model:selectedField="selectedField" :selectType="selectType" ref="afBox" :fieldTypes="fieldTypes"/>
+        <AppFieldSelectBox v-model:selectedField="selectedField" :selectType="selectType" ref="afBox"/>
     </show-dialog>
 </template>
 
@@ -66,8 +66,7 @@ export interface IApp {
 export interface IField {
     name: string,
     code: string,
-    type: string,
+    type: string
-    label?:string
 }
 
 export interface IAppFields {
@@ -102,10 +101,6 @@ export default defineComponent({
         selectType: {
             type: String,
             default: 'single'
-        },
-        fieldTypes:{
-            type:Array,
-            default:()=>[]
         }
     },
     setup(props, { emit }) {
@@ -133,7 +128,7 @@ export default defineComponent({
         const closeAFBox = (val: string) => {
             if (val == 'OK') {
                 console.log(afBox.value);
-
+                
                 selectedField.value = afBox.value.selField;
             }
         };

frontend/src/components/right/DataMapping.vue

@@ -16,62 +16,52 @@
                 </q-card>
             </template>
         </q-field>
-        <show-dialog v-model:visible="dgIsShow" name="データマッピング" @close="closeDg" min-width="55vw" min-height="60vh">
+        <show-dialog v-model:visible="dgIsShow" name="データマッピング" @close="closeDg" min-width="50vw" min-height="60vh">
 
-            <div class="">
+            <div class="q-mx-md">
                 <div class="row q-col-gutter-x-xs flex-center">
-                    <div class="col-5">
+                    <div class="col-6">
                         <div class="q-mx-xs">ソース</div>
                     </div>
                     <!-- <div class="col-1">
                     </div> -->
-                    <div class="col-5">
+                    <div class="col-6">
-                        <div class="row justify-between q-mr-md">
+                        <div class="q-mx-xs">目標</div>
-                            <div class="">{{ sourceApp?.name }}</div>
-                            <q-btn outline color="primary" size="xs" label="最新のフィールドを取得する"
-                                @click="() => updateFields(sourceAppId!)" />
-                        </div>
-                    </div>
-                    <div class="col-1 q-pl-sm">
-                        キー
                     </div>
+                    <!-- <div class="col-1"><q-btn flat round dense icon="add" size="sm" @click="addMappingObject" /> -->
+                    <!-- </div> -->
                 </div>
-                <q-virtual-scroll style="max-height: 60vh;" :items="mappingProps" separator v-slot="{ item, index }">
+                <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-pa-sm q-col-gutter-x-md flex-center">
+                    <div class="row q-my-md q-col-gutter-x-md flex-center">
-                        <div class="col-5">
+                        <div class="col-6">
-                            <ConditionObject :config="config" v-model="item.from" :disabled="item.disabled"
+                            <ConditionObject :config="config" v-model="item.from" />
-                                :label="item.disabled ? '「Lookup」によってロックされる' : undefined" />
                         </div>
                         <!-- <div class="col-1">
                         </div> -->
-                        <div class="col-5">
+                        <div class="col-6">
-                            <q-field v-model="item.vName" type="text" outlined dense :disable="item.disabled" >
+                            <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"
+                                    <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}` }}
-                                        <span class="text-red" v-if="item.to.fields[0].required">*</span>
+                                        <q-tooltip>
-                                        <q-tooltip class="bg-yellow-2 text-black shadow-4" >
                                             <div>アプリ : {{ item.to.app.name }}</div>
                                             <div>フィールドのコード : {{ item.to.fields[0].code }}</div>
                                             <div>フィールドのタイプ : {{ item.to.fields[0].type }}</div>
-                                            <div v-if="item.to.fields[0].required">必須項目</div>
+                                            <div>フィールド : {{ item.to.fields[0] }}</div>
-                                            <!-- <div>フィールド : {{ item.to.fields[0] }}</div>
-                                            <div>フィールド : {{ item.isKey }}</div> -->
                                         </q-tooltip>
                                     </div>
                                 </template>
                             </q-field>
                         </div>
-                        <div class="col-1">
+                        <!-- <div class="col-1">
-                            <q-checkbox size="sm" v-model="item.isKey" :disable="item.disabled" />
+                            <q-btn flat round dense icon="delete" size="sm" @click="() => deleteMappingObject(index)" />
-                            <!-- <q-btn flat round dense icon="delete" size="sm" @click="() => deleteMappingObject(index)" /> -->
+                        </div> -->
-                        </div>
                     </div>
 
                     <show-dialog v-model:visible="mappingProps[index].to.isDialogVisible" name="フィールド一覧"
@@ -84,10 +74,6 @@
                     </show-dialog>
                     <!-- </div> -->
                 </q-virtual-scroll>
-
-                <div class="q-mt-lg q-ml-md row ">
-                    <q-checkbox size="sm" v-model="createWithNull" label="キーが存在しない場合は新規に作成され、存在する場合はデータが更新されます。" />
-                </div>
             </div>
         </show-dialog>
     </div>
@@ -100,10 +86,10 @@ import ConditionObject from '../ConditionEditor/ConditionObject.vue';
 import ShowDialog from '../ShowDialog.vue';
 import AppFieldSelectBox from '../AppFieldSelectBox.vue';
 import FieldSelect from '../FieldSelect.vue';
-import { IApp, IField } from './AppFieldSelect.vue';
+import IAppFields from './AppFieldSelect.vue';
 import { api } from 'boot/axios';
 
-type ContextProps = {
+type Props = {
     props?: {
         name: string;
         modelValue?: {
@@ -114,25 +100,14 @@ type ContextProps = {
         }
     }
 };
-
+type ValueType = {
-type CurrentModelValueType = {
-    data: MappingValueType[];
-    createWithNull: boolean;
-}
-
-type MappingValueType = {
     id: string;
-    from: { sharedText?: string };
+    from: object;
-    to: {
+    to: typeof IAppFields & {
-        app?: IApp,
-        fields: IField[],
         isDialogVisible: boolean;
     };
-    isKey: boolean;
-    disabled: boolean;
 }
 
-const blackListLabelName = ['レコード番号', '作業者', '更新者', '更新日時', '作成日時', '作成者']
 
 export default defineComponent({
     name: 'DataMapping',
@@ -145,7 +120,7 @@ export default defineComponent({
     },
     props: {
         context: {
-            type: Array<ContextProps>,
+            type: Array<Props>,
             default: '',
         },
         displayName: {
@@ -157,7 +132,7 @@ export default defineComponent({
             default: '',
         },
         modelValue: {
-            type: Object as () => CurrentModelValueType,
+            type: Object as () => ValueType[],
         },
         placeholder: {
             type: String,
@@ -166,11 +141,7 @@ export default defineComponent({
         onlySourceSelect: {
             type: Boolean,
             default: false
-        },
+        }
-        fieldTypes:{
-          type:Array,
-          default:()=>[]
-        },
     },
 
     setup(props, { emit }) {
@@ -181,62 +152,58 @@ export default defineComponent({
         const sourceAppId = computed(() => sourceApp.value?.id);
 
         const closeDg = () => {
-            emit('update:modelValue', { data: mappingProps.value, createWithNull: createWithNull.value });
+            emit('update:modelValue', mappingProps.value
+            );
         }
 
         const closeToDg = () => {
-            emit('update:modelValue', { data: mappingProps.value, createWithNull: createWithNull.value });
+            emit('update:modelValue', mappingProps.value
+            );
         }
 
-        const mappingProps = ref(props.modelValue?.data ?? []);
+        const mappingProps = computed(() => props.modelValue ?? []);
 
-        const createWithNull = ref(props.modelValue?.createWithNull ?? false)
+        watch(() => sourceAppId.value, async (newId, oldId) => {
-
-        // 外部ソースコンポーネントの appid をリッスンし、変更されたときに現在のコンポーネントを更新します
-        watch(() => sourceAppId.value, async (newId,) => {
             if (!newId) return;
-            updateFields(newId)
+            const a = await api.get('api/v1/appfields', {
-        })
-
-        const updateFields = async (sourceAppId: string) => {
-            const ktAppFields = await api.get('api/v1/appfields', {
                 params: {
-                    app: sourceAppId
+                    app: newId
                 }
             }).then(res => {
                 return Object.values(res.data.properties)
-                    // kintoneのデフォルトの非表示フィールドフィルタリング
-                    .filter(f => !blackListLabelName.find(label => f.label === label))
                     .map(f => ({ name: f.label, objectType: 'field', ...f }))
                     .map(f => {
-                        // 更新前の値を求める
-                        const beforeData = mappingProps.value.find(m => m.to.fields[0].code === f.code)
                         return {
                             id: uuidv4(),
-                            from: beforeData?.from ?? {}, // 以前のデータを入力します
+                            from: {},
                             to: {
                                 app: sourceApp.value,
                                 fields: [f],
                                 isDialogVisible: false
-                            },
+                            }
-                            isKey: beforeData?.isKey ?? false, // 以前のデータを入力します
-                            disabled: false
                         }
                     })
             })
+            const modelValue = props.modelValue ?? [];
 
-            // 「ルックアップ」によってロックされているフィールドを検索する
+            if (modelValue.length === 0 || newId !== oldId) {
-            const lookupFixedField = ktAppFields
+                emit('update:modelValue', a);
-                .filter(field => field.to.fields[0].lookup !== undefined)
+                return;
-                .flatMap(field => field.to.fields[0].lookup.fieldMappings.map((m) => m.field))
-
-            // 「ルックアップ」でロックされたビューコンポーネントを非対話型に設定します
-            if (lookupFixedField.length > 0) {
-                ktAppFields.filter(f => lookupFixedField.includes(f.to.fields[0].code)).forEach(f => f.disabled = true)
             }
+            const modelValueFieldNames = modelValue.map(item => item.to.fields[0].name);
 
-            mappingProps.value = ktAppFields
+            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)) ?
@@ -248,12 +215,15 @@ export default defineComponent({
                 : []
         );
 
+
+
         const btnDisable = computed(() => props.onlySourceSelect ? !(source?.props?.modelValue?.app?.id) : false);
 
-        watchEffect(() => {
+        //集計処理方法
-            emit('update:modelValue', { data: mappingProps.value, createWithNull: createWithNull.value });
-        });
 
+        watchEffect(() => {
+            emit('update:modelValue', mappingProps.value);
+        });
         return {
             uuidv4,
             dgIsShow: ref(false),
@@ -261,8 +231,6 @@ export default defineComponent({
             toDgIsShow: ref(false),
             closeToDg,
             mappingProps,
-            createWithNull,
-            updateFields,
             // addMappingObject: () => mappingProps.push(defaultMappingProp()),
             // deleteMappingObject,
             mappingObjectsInputDisplay,
@@ -272,13 +240,11 @@ export default defineComponent({
             config: {
                 canInput: false,
                 buttonsConfig: [
-                    { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+                    { label: '変数', color: 'green', type: 'VariableAdd',editable:false },
-                    { label: '変数', color: 'green', type: 'VariableAdd', editable: false },
                 ]
             }
         };
     },
 });
-
 </script>
 <style lang="scss"></style>

frontend/src/components/right/DataProcessing.vue

@@ -40,7 +40,7 @@
             <div class="col-5">
               <ConditionObject v-model="item.field" />
             </div>
-            <div class="col-2 q-pa-sm">
+            <div class="col-2">
               <q-select v-model="item.logicalOperator" :options="logicalOperators"  outlined dense></q-select>
             </div>
             <div class="col-4">
@@ -78,8 +78,14 @@ type Props = {
 
 type ProcessingObjectType = {
   field?: {
-    sharedText: string;
+    name: string | {
-    objectType: 'field';
+      name: string;
+    };
+    objectType: string;
+    type: string;
+    code: string;
+    label: string;
+    noLabel: boolean;
   };
   logicalOperator?: string;
   vName?: string;
@@ -139,54 +145,34 @@ export default defineComponent({
     const actionName = props.context.find(element => element?.props?.name === 'displayName')
 
     const processingProps: ValueType = props.modelValue && props.modelValue.vars
-      ? reactive(props.modelValue)
+      ? props.modelValue
       : reactive({
         name: '',
         actionName: actionName?.props?.modelValue as string,
         displayName: '結果（戻り値）',
-        vars: [
+        vars: [{ id: uuidv4() }]
-        {
-          id: uuidv4(),
-          field:{
-            objectType:'field',
-            sharedText:''
-          }
-        }]
       });
 
     const closeDg = () => {
-      emit('update:modelValue', processingProps);
+      emit('update:modelValue', processingProps
+      );
     }
 
     const processingObjects = processingProps.vars;
 
-    const deleteProcessingObject = (index: number) => {
+    const deleteProcessingObject = (index: number) => processingObjects.length === 1
-      if(processingObjects.length >0){
+      ? processingObjects.splice(0, processingObjects.length, { id: uuidv4() })
-        processingObjects.splice(index, 1);
+      : processingObjects.splice(index, 1);
-      }
+
-      if(processingObjects.length===0){
-        addProcessingObject();
-      }
-    }
     const processingObjectsInputDisplay = computed(() =>
       processingObjects ?
         processingObjects
           .filter(item => item.field && item.logicalOperator && item.vName)
           .map(item => {
-            return`var(${processingProps.name}.${item.vName}) = ${item.field?.sharedText}`
+            return`var(${processingProps.name}.${item.vName}) = ${item.field.sharedText}`
           })
         : []
     );
-
-    const addProcessingObject=()=>{
-      processingObjects.push({
-        id: uuidv4(),
-        field:{
-          objectType:'field',
-          sharedText:''
-        }
-      });
-    }
     //集計処理方法
     const logicalOperators = ref([
       {
@@ -228,7 +214,7 @@ export default defineComponent({
       closeDg,
       processingObjects,
       processingProps,
-      addProcessingObject,
+      addProcessingObject: () => processingObjects.push({ id: uuidv4() }),
       deleteProcessingObject,
       logicalOperators,
       processingObjectsInputDisplay,

node_modules/.yarn-integrity

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

plugin/kintone-addins/package.json

@@ -8,16 +8,16 @@
     "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": "run-s b:production copy:windows",
-    "build:linux": "run-s b:production copyjs:linux copycss:linux",
+    "build:dev": "run-s b:dev copy:windows",
+    "build:linux": "run-s b:production copy:linux",
     "build:linux-dev": "run-s b:dev copy:linux",
-    "b:production": "tsc & vite build --mode production",
+
-    "b:dev": "tsc & vite build --mode dev",
+    "b:production": "vite build --mode production",
-    "copyjs:windows": "xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
+    "b:dev": "vite build --mode dev",
-    "copyjs:linux": "cp -ur dist/*.js ../../backend/Temp",
+    "copy:windows": "xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "copycss:windows": "xcopy dist\\*.css ..\\..\\backend\\Temp\\ /E /I /Y",
+    "copy:linux": "cp -ur dist/*.js ../../backend/Temp"
-    "copycss:linux": "cp -ur dist/*.css  ../../backend/Temp"
   },
   "devDependencies": {
     "@types/jquery": "^3.5.24",
@@ -29,10 +29,8 @@
     "vite-plugin-checker": "^0.6.4"
   },
   "dependencies": {
-    "@kintone/rest-api-client": "^5.5.2",
+    "jquery": "^3.7.1",
-    "@popperjs/core": "^2.11.8",
+    "vite-plugin-css-injected-by-js": "^3.5.1",
-    "@types/bootstrap": "^5.2.10",
+    "yarn": "^1.22.22"
-    "bootstrap": "^5.3.3",
-    "jquery": "^3.7.1"
   }
 }

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

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

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

@@ -1,272 +0,0 @@
-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/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

@@ -6,19 +6,67 @@ import {
   IContext,
 } from "../types/ActionTypes";
 import { actionAddins } from ".";
-import {KintoneRestAPIClient} from '@kintone/rest-api-client';
-import { Aggregator,Operator} from '../util/aggregates';
-import { FieldForm } from "../types/FieldLayout";
 
-interface IDataProcessingProps {
+interface Props {
   displayName: string;
   sources: Sources;
   condition: string;
-  verName?: VerName;
+  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 {
@@ -30,26 +78,170 @@ interface VerName {
 
 interface Var {
   id: string;
-  field: FieldForm;
+  field: Field2;
-  logicalOperator: CalcOperator;
+  logicalOperator: LogicalOperator;
   vName: string;
 }
 
-interface CalcOperator {
+interface LogicalOperator {
-  operator: Operator;
+  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: FieldForm[];
+  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;
+  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;
@@ -61,125 +253,122 @@ type AnyObject = {
   [key: string]: any;
 };
 
-export class DataProcessingAction implements IAction {
+const ERROR_TYPE = "ERROR_TYPE";
-  name: string;
-  actionProps: IActionProperty[];
-  props: IDataProcessingProps ;
 
-  constructor() {
+const calc = (f: Var, result: Result) => {
-    this.name = "データ処理";
+  const type = typeCheck(f.field.type);
-    this.actionProps = [];
+  if (!type) {
-    this.props = {
+    return ERROR_TYPE;
-      displayName:'',
-      condition:'',
-      sources:{
-        app:{
-          id:""
-        },
-        fields:[]
-      },
-    };
-    this.register();
   }
 
-  async process(
+  const fun =
-    nodes: IActionNode,
+    calcFunc[
-    event: any,
+      `${type}_${Operator[f.logicalOperator.operator as keyof typeof Operator]}`
-    context: IContext
+    ];
-  ): Promise<IActionResult> {
+  if (!fun) {
-    this.actionProps = nodes.actionProps;
+    return ERROR_TYPE;
-
-    this.props = nodes.ActionValue as IDataProcessingProps;
-    const condition = JSON.parse(this.props.condition) as Condition;
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    try {
-      if (!this.props) {
-        return result;
-      }
-
-      const query = this.getQuery(condition.queryString,context.variables);
-      const data = await this.selectData(query);
-      
-      console.log("data ", data);
-
-      if(this.props.verName){
-         const varValues= this.props.verName.vars.reduce((acc, f) => {
-            const datas=data[f.field.code].value;
-            const agg = new Aggregator(datas,f.field);
-            const result = agg.calculate(f.logicalOperator.operator)
-            acc[f.vName]=result;
-            return acc;
-          }, {} as AnyObject);
-          context.variables[this.props.verName.name]=varValues;
-        console.log("context ", context);
-      }
-      return result;
-    } catch (error) {
-      console.error("データ集計中例外が発生しました。", error);
-      if(error instanceof Error){
-        event.error = `データ集計中例外が発生しました。 ${error.message}`;
-      }else{
-        event.error = "データ集計中例外が発生しました。";
-      }
-      result.canNext = false;
-      return result;
-    }
   }
-
+  const values = result[f.field.code].value;
-  /**
+  if (!values) {
-   * 
+    return null;
-   * @param str 
-   * @param vars 
-   * @returns 
-   */
-  getQuery = (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;
-  };
-
-  /**
-   * データを取得する
-   * @param query 
-   * @returns 
-   */
-  selectData = async ( query?: string) => {
-    const api = new KintoneRestAPIClient();
-    const fields = this.props.sources.fields.map((field)=>field.code);
-    const resp =  await api.record.getAllRecords({
-        app: this.props.sources.app.id,
-        fields:fields,
-        condition:query
-      });
-      const result: Result = {};
-      resp.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;
-     
-  };
-
-  register(): void {
-    actionAddins[this.name] = this;
   }
+  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",
 }
 
-new DataProcessingAction();
+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/data-update.ts

@@ -1,334 +0,0 @@
-import {
-  IAction,
-  IActionResult,
-  IActionNode,
-  IActionProperty,
-  IContext,
-} from "../types/ActionTypes";
-import { actionAddins } from ".";
-import { KintoneRestAPIClient } from "@kintone/rest-api-client";
-import { Lookup } from "@kintone/rest-api-client/lib/src/KintoneFields/types/property";
-import { FieldForm, FieldType } from "../types/FieldLayout";
-interface Props {
-  displayName: string;
-  sources: Sources;
-  dataMapping: DataMapping;
-}
-
-interface DataMapping {
-  data: Mapping[];
-  createWithNull: boolean;
-}
-
-interface Mapping {
-  id: string;
-  from: From;
-  to: To;
-  isKey: boolean;
-}
-
-
-
-interface To {
-  app: App;
-  fields:FieldForm[];
-  isDialogVisible: boolean;
-}
-
-
-interface From {
-  sharedText: string;
-  id: string;
-  objectType: 'variable'|'field'|'text';
-}
-
-interface IVar extends From{
-  name:{
-    name:string;
-  }
-}
-
-interface IFromField extends From,FieldForm{
-
-}
-interface Sources {
-  app: App;
-}
-
-interface App {
-  id: string;
-  name: string;
-  description: string;
-  createdate: string;
-}
-
-export class DataUpdateAction 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(context);
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    try {
-      const lookupFixedFieldCodes = await getLookupFixedFieldCodes(
-        this.dataMappingProps.sources.app.id
-      );
-
-      // createWithNull が有効な場合は、4 番目のパラメーターを true にして doUpdate 関数ブランチを実行します。
-      if (this.dataMappingProps.dataMapping.createWithNull) {
-        await doUpdate(
-          this.dataMappingProps.dataMapping.data,
-          this.dataMappingProps.sources.app.id,
-          context,
-          true, // キーがない場合、またはキーでターゲットが見つからない場合に、マッピング条件によって新しいレコードを作成するかどうかを決定するために使用されます。
-          lookupFixedFieldCodes
-        );
-      } else if (
-        // キーがないと更新対象を取得できないため、この時点でのみ更新が行われます。 doUpdate 関数の 4 番目のパラメーターは false です。
-        this.dataMappingProps.dataMapping.data
-          .map((m) => m.isKey)
-          .find((isKey) => isKey === true)
-      ) {
-        await doUpdate(
-          this.dataMappingProps.dataMapping.data,
-          this.dataMappingProps.sources.app.id,
-          context,
-          false,
-          lookupFixedFieldCodes
-        );
-      } else {
-        await doCreate(
-          this.dataMappingProps.dataMapping.data,
-          this.dataMappingProps.sources.app.id,
-          context,
-          lookupFixedFieldCodes
-        );
-      }
-    } catch (error) {
-      console.error("DataMappingAction error", error);
-      result.canNext = false;
-    }
-    console.log("dataMappingProps", this.dataMappingProps);
-
-    return result;
-  }
-
-  register(): void {
-    actionAddins[this.name] = this;
-  }
-}
-
-new DataUpdateAction();
-
-const getContextVarByPath = (obj: any, path: string) => {
-  return path.split(".").reduce((o, k) => (o || {})[k], obj);
-};
-
-interface UpdateRecord {
-  id: string;
-  record: {
-    [key: string]: {
-      value: any;
-    };
-  };
-}
-
-const client = new KintoneRestAPIClient();
-
-const getFromValue=(item:Mapping,context:IContext)=>{
-  if (item.from.objectType === "variable") {
-    const rfrom =item.from as IVar;
-    return  getContextVarByPath(context.variables,rfrom.name.name);
-  }else if(item.from.objectType === "field"){
-    const field = item.from as IFromField;
-    return context.record[field.code].value;
-  }
-  else {
-    return item.from.sharedText;
-  }
-}
-
-const doUpdate = async (
-  mappingData: Mapping[],
-  appId: string,
-  context: IContext,
-  needCreate: boolean,
-  lookupFixedFieldCodes: string[]
-) => {
-  const targetField = await findUpdateField(mappingData, appId, context);
-  console.log(targetField);
-  if (targetField.records.length === 0 && needCreate) {
-    await doCreate(mappingData, appId, context, lookupFixedFieldCodes);
-  } else {
-    // マッピングデータを単純なオブジェクトに処理し、ソース値が変数の場合は変数を置き換えます。
-    const mappingRules = mappingData
-      .filter(
-        (m) =>
-          Object.keys(m.from).length > 0 &&
-          !lookupFixedFieldCodes.includes(m.to.fields[0].code)
-      )
-      .map((m) => {
-        if (m.from.objectType === "variable") {
-          const rfrom =m.from as IVar;
-          return {
-            value: getContextVarByPath(context.variables,rfrom.name.name),
-            code: m.to.fields[0].code,
-          };
-        }else if(m.from.objectType === "field"){
-          const field = m.from as IFromField;
-          return {
-            value: context.record[field.code].value,
-            code: m.to.fields[0].code,
-          }
-        }
-         else {
-          return {
-            value: m.from.sharedText,
-            code: m.to.fields[0].code,
-          };
-        }
-      });
-
-    const updateRecords: UpdateRecord[] = targetField.records.map(
-      (targetRecord) => {
-        const updateRecord: UpdateRecord["record"] = {};
-
-        // マッピング内のルールにヒットしたフィールドのみが更新されます。
-        for (const mapping of mappingRules) {
-          if (targetRecord[mapping.code]) {
-            updateRecord[mapping.code] = {
-              value: mapping.value,
-            };
-          }
-        }
-
-        return {
-          id: targetRecord.$id.value as string,
-          record: updateRecord,
-        };
-      }
-    );
-
-    console.log(updateRecords);
-    await client.record.updateRecords({
-      app: appId,
-      records: updateRecords,
-    });
-  }
-};
-
-const makeQuery=(field:FieldForm,key:any)=>{
-  if(field.type===FieldType.NUMBER || field.type===FieldType.RECORD_NUMBER){
-    return `${field.code} = ${Number(key)}`
-  }
-  if(typeof key==='string'){
-    return `${field.code} = "${key}"`
-  }
-}
-
-
-const findUpdateField = async (
-  mappingData: Mapping[],
-  appId: string,
-  context: IContext
-) => {
-  const queryStr = mappingData
-    .filter((m) => m.to.app && m.to.fields && m.to.fields.length > 0 && m.isKey)
-    .map((m) => {
-      if (m.from.objectType === "variable") {
-        const vfrom = m.from as IVar;
-        return makeQuery(m.to.fields[0],getContextVarByPath(context.variables , vfrom.name.name));
-      }
-      else if(m.from.objectType === "field"){
-        const field = m.from as IFromField;
-        return makeQuery(m.to.fields[0],context.record[field.code].value);
-      } 
-      else{
-        return makeQuery(m.to.fields[0],m.from.sharedText);
-      }
-    })
-    .join("&");
-  // 検索条件が空の場合は全レコードを返すため、検索対象が見つからない場合は検索は行われません。
-  if (queryStr.length === 0) {
-    return {
-      records: [],
-    };
-  } else {
-    return await client.record.getRecords({
-      app: appId,
-      // query: undefined
-      query: queryStr,
-    });
-  }
-};
-
-const doCreate = async (
-  mappingData: Mapping[],
-  appId: string,
-  context: IContext,
-  lookupFixedFieldCodes: string[]
-) => {
-  const filterHandler =  (item:Mapping)=>{
-    if(!item.to.fields || item.to.fields.length===0){
-      return false;
-    }
-    if(item.from.objectType === "variable" && (item.from as IVar).name.name  ){
-      return true;
-    }
-    if(item.from.objectType === "field" && (item.from as IFromField).code){
-      return true;
-    }
-    if(item.from.objectType === "text" && item.from.sharedText!==null){
-      return true;
-    }
-    return false;
-  }
-  const record = mappingData
-    .filter(filterHandler)
-    .filter((item) => !lookupFixedFieldCodes.includes(item.to.fields[0].code))
-    .reduce((accumulator, item) => {
-      return {
-        ...accumulator,
-        [item.to.fields[0].code]: {
-          value: getFromValue(item,context),
-        },
-      };
-    }, {});
-  if (record && Object.keys(record).length > 0) {
-    console.log(record);
-    await client.record.addRecord({
-      app:appId,
-      record:record
-    });
-    // await kintone.api(kintone.api.url("/k/v1/record.json", true), "POST", {
-    //   app: appId,
-    //   record: record,
-    // });
-  }
-};
-
-const getLookupFixedFieldCodes = async (appId: string) => {
-  return await client.app
-    .getFormFields({ app: appId })
-    .then((resp) =>
-      Object.values(resp.properties)
-        .filter((f) => (f as Lookup).lookup !== undefined)
-        .flatMap((f) => (f as Lookup).lookup.fieldMappings.map((m) => m.field))
-    );
-};

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

@@ -1,76 +0,0 @@
-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

@@ -51,19 +51,13 @@ export class MailCheckAction implements IAction {
             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)) {
+                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 {
-                    record[this.props.field.code].error = null; 
-                }
             } else if (this.props.emailCheck === 'ゆるめ') {
                 if (!/^[^@]+@[^@]+$/.test(value)) {
                     record[this.props.field.code].error = this.props.message;
                 }
-                else {
-                        record[this.props.field.code].error = null; 
-                }
             } else {
                 result = {
                     canNext: true,

plugin/kintone-addins/src/index.ts

@@ -42,12 +42,7 @@ $(function (){
         const flow=ActionFlow.fromJSON(flowinfo.content);
         if(flow!==undefined){
           const process = new ActionProcess(event.type,flow,event);
-          process.exec().then((res)=>{
+          process.exec();
-            const record = event.record;  
-            kintone.app.record.set({record});
-          }).catch((err)=>{
-            console.error(err);
-          });
         }
         return event;
       });
@@ -63,7 +58,7 @@ $(function (){
             await process.exec();
           }
           const record = event.record;
-          kintone.app.record.set({record});
+          kintone.app.record.set({record})
         });
       });
     }

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

@@ -347,9 +347,6 @@ export class ConditionTree {
     if(!object || typeof object!=="object"){
       return object;
     }
-    if("sharedText" in object){
-      return object.sharedText;
-    }
     if("label" in object){
       return object.label;
     }

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

@@ -1,240 +0,0 @@
-// src/types/field.d.ts
-
-export enum FieldType {
-    CALC = "CALC",
-    CATEGORY = "CATEGORY",
-    CHECK_BOX = "CHECK_BOX",
-    CREATED_TIME = "CREATED_TIME",
-    CREATOR = "CREATOR",
-    DATE = "DATE",
-    DATETIME = "DATETIME",
-    DROP_DOWN = "DROP_DOWN",
-    FILE = "FILE",
-    GROUP = "GROUP",
-    GROUP_SELECT = "GROUP_SELECT",
-    LINK = "LINK",
-    MODIFIER = "MODIFIER",
-    MULTI_LINE_TEXT = "MULTI_LINE_TEXT",
-    MULTI_SELECT = "MULTI_SELECT",
-    NUMBER = "NUMBER",
-    ORGANIZATION_SELECT = "ORGANIZATION_SELECT",
-    RADIO_BUTTON = "RADIO_BUTTON",
-    RECORD_NUMBER = "RECORD_NUMBER",
-    REFERENCE_TABLE = "REFERENCE_TABLE",
-    RICH_TEXT = "RICH_TEXT",
-    SINGLE_LINE_TEXT = "SINGLE_LINE_TEXT",
-    STATUS = "STATUS",
-    STATUS_ASSIGNEE = "STATUS_ASSIGNEE",
-    SUBTABLE = "SUBTABLE",
-    TIME = "TIME",
-    UPDATED_TIME = "UPDATED_TIME",
-    USER_SELECT = "USER_SELECT"
-}
-
-export enum CalcFormat{
-    NUMBER = "NUMBER",
-    NUMBER_DIGIT = "NUMBER_DIGIT",
-    DATETIME = "DATETIME",
-    DATE = "DATE",
-    TIME = "TIME",
-    HOUR_MINUTE= "HOUR_MINUTE",
-    DAY_HOUR_MINUTE= "DAY_HOUR_MINUTE"
-}
-
-export interface FieldForm {
-    code: string;
-    type: FieldType;
-    required?: boolean;
-    noLabel?: boolean;
-}
-
-export interface OptionForm{
-    index: string;
-    label: string;
-}
-
-export interface EntityForm {
-    code: string;
-    type: 'USER' | 'ORGANIZATION' | 'GROUP' | 'FUNCTION';
-}
-
-export interface CalcFieldForm extends FieldForm {
-    unit?: string;
-    expression?: string;
-    format?:CalcFormat;
-    unitPosition?: 'BEFORE' | 'AFTER';
-    displayScale?: string;
-    hideExpression?: boolean;
-}
-
-export interface CategoryFieldForm extends FieldForm {
-    enabled?: boolean;
-}
-
-export interface DateFieldForm extends FieldForm {
-    defaultValue?: string;
-    unique?: boolean;
-    defaultNowValue?: boolean;
-}
-
-export interface DatetimeFieldForm extends FieldForm {
-    defaultValue?: string;
-    unique?: boolean;
-    defaultNowValue?: boolean;
-}
-
-export interface DecimalFieldForm extends FieldForm {
-    maxValue?: string;
-    defaultValue?: string;
-    unitPosition?: 'BEFORE' | 'AFTER';
-    minValue?: string;
-    unit?: string;
-    unique?: boolean;
-    displayScale?: string;
-    digit?: boolean;
-}
-
-export interface EditorFieldForm extends FieldForm {
-    defaultValue?: string;
-}
-
-export interface EntityForm {
-    code: string;
-    type: 'USER' | 'ORGANIZATION' | 'GROUP' | 'FUNCTION';
-}
-
-export interface FieldMappingForm {
-    relatedField: string;
-    field: string;
-}
-
-export interface FileFieldForm extends FieldForm {
-    thumbnailSize?: string;
-}
-
-export interface GroupFieldForm extends FieldForm {
-    openGroup?: boolean;
-}
-
-export interface GroupSelectFieldForm extends FieldForm {
-    entities: EntityForm[];
-    defaultValue?: EntityForm[];
-}
-
-export interface LinkFieldForm extends FieldForm {
-    protocol?: 'WEB' | 'CALL' | 'MAIL';
-    defaultValue?: string;
-    minLength?: string;
-    unique?: boolean;
-    maxLength?: string;
-}
-
-export interface LookupFieldForm extends FieldForm {
-    lookup: {
-        lookupPickerFields: string[];
-        relatedKeyField: string;
-        relatedApp: {
-            app: string;
-            code: string;
-        };
-        fieldMappings: FieldMappingForm[];
-        sort?: string;
-        filterCond?: string;
-    };
-}
-
-export interface ModifiedAtFieldForm extends FieldForm {}
-
-export interface ModifierFieldForm extends FieldForm {}
-
-export interface MultipleCheckFieldForm extends FieldForm {
-    defaultValue?: string[];
-    options: {
-        [key: string]: OptionForm;
-    };
-    align?: 'HORIZONTAL' | 'VERTICAL';
-}
-
-export interface MultipleLineTextFieldForm extends FieldForm {
-    defaultValue?: string;
-}
-
-export interface MultipleSelectFieldForm extends FieldForm {
-    defaultValue?: string[];
-    options: {
-        [key: string]: OptionForm;
-    };
-}
-
-
-export interface OrganizationSelectFieldForm extends FieldForm {
-    entities: EntityForm[];
-    defaultValue?: EntityForm[];
-}
-
-export interface RecordIdFieldForm extends FieldForm {}
-
-export interface ReferenceTableFieldForm extends FieldForm {
-    referenceTable: {
-        condition: {
-            relatedField: string;
-            field: string;
-        };
-        size?: string;
-        relatedApp: {
-            app: string;
-            code: string;
-        };
-        sort?: string;
-        filterCond?: string;
-        displayFields: string[];
-    };
-}
-
-export interface SingleCheckFieldForm extends FieldForm {
-    defaultValue?: string;
-    options: {
-        [key: string]: OptionForm;
-    };
-    align?: 'HORIZONTAL' | 'VERTICAL';
-}
-
-export interface SingleLineTextFieldForm extends FieldForm {
-    expression?: string;
-    defaultValue?: string;
-    minLength?: string;
-    unique?: boolean;
-    maxLength?: string;
-    hideExpression?: boolean;
-}
-
-export interface SingleSelectFieldForm extends FieldForm {
-    defaultValue?: string;
-    options: {
-        [key: string]: OptionForm;
-    };
-}
-
-export interface StatusAssigneeFieldForm extends FieldForm {
-    enabled?: boolean;
-}
-
-export interface StatusFieldForm extends FieldForm {
-    enabled?: boolean;
-}
-
-export interface TableForm extends FieldForm {
-    fields: {
-        [key: string]: CalcFieldForm | CategoryFieldForm | DateFieldForm | DatetimeFieldForm | DecimalFieldForm | EditorFieldForm | FileFieldForm | GroupFieldForm | GroupSelectFieldForm | LinkFieldForm | LookupFieldForm | ModifiedAtFieldForm | ModifierFieldForm | MultipleCheckFieldForm | MultipleLineTextFieldForm | MultipleSelectFieldForm | OrganizationSelectFieldForm | RecordIdFieldForm | ReferenceTableFieldForm | SingleCheckFieldForm | SingleLineTextFieldForm | SingleSelectFieldForm | StatusAssigneeFieldForm | StatusFieldForm | TableForm | TimeFieldForm | UserSelectFieldForm;
-    };
-}
-
-export interface TimeFieldForm extends FieldForm {
-    defaultValue?: string;
-    defaultNowValue?: boolean;
-}
-
-export interface UserSelectFieldForm extends FieldForm {
-    entities: EntityForm[];
-    defaultValue?: EntityForm[];
-}

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

@@ -7,7 +7,7 @@ import '../actions/error-show';
 import '../actions/button-add';
 import '../actions/condition-action';
 import '../actions/data-processing';
-import '../actions/data-update';
+import '../actions/data-mapping';
 import '../actions/current-field-get';
 import '../actions/regular-check';
 import '../actions/mail-check';
@@ -18,8 +18,6 @@ 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";
 

plugin/kintone-addins/src/util/aggregates.ts

@@ -1,121 +0,0 @@
-import { FieldForm,CalcFieldForm,FieldType, CalcFormat} from "../types/FieldLayout";
-
-/**
- * 集計操作子
- */
-export enum Operator {
-    SUM = "SUM",
-    AVG = "AVG",
-    MAX = "MAX",
-    MIN = "MIN",
-    COUNT = "COUNT",
-    FIRST = "FIRST",
-    LAST = "LAST"
-}
-
-/**
- * 集計関数
- */
-
-export class Aggregator {
-    private data: string[];
-    private field: FieldForm;
-
-    constructor(data: string[], field: FieldForm) {
-        this.data = data;
-        this.field = field;
-    }
-
-    private toNumberArray(): number[] {
-        const numberArray = this.data.map(item => {
-            const num = Number(item);
-            if (isNaN(num)) {
-                throw new Error(`フィールド「${this.field.code} 」は数値に変換できないため、計算を実行できません。`);
-            }
-            return num;
-        });
-
-        return numberArray;
-    }
-
-    private sum(): number | null {
-        if (this.data.length === 0) return null;
-        const numberArray = this.toNumberArray();
-        return numberArray.reduce((acc, val) => acc + val, 0);
-    }
-
-    private avg(): number | null {
-        if (this.data.length === 0) return null;
-        const numberArray = this.toNumberArray();
-        const total = numberArray.reduce((acc, val) => acc + val, 0);
-        return total / numberArray.length;
-    }
-
-    private max(): number | string | null {
-        if (this.data.length === 0) return null;
-        if (this.field.type === FieldType.NUMBER ) {
-            const numberArray = this.toNumberArray();
-            return Math.max(...numberArray);
-        }
-        if(this.field.type===FieldType.CALC){
-            const calcField = this.field as CalcFieldForm;
-            if(calcField.format===CalcFormat.NUMBER || calcField.format===CalcFormat.NUMBER_DIGIT){
-                const numberArray = this.toNumberArray();
-                return Math.max(...numberArray);
-            }
-        }
-        return this.data.reduce((max, item) => (item > max ? item : max), this.data[0]);
-    }
-
-    private min(): number | string | null {
-        if (this.data.length === 0) return null;
-        if (this.field.type === FieldType.NUMBER ) {
-            const numberArray = this.toNumberArray();
-            return Math.min(...numberArray);
-        }
-        if(this.field.type===FieldType.CALC){
-            const calcField = this.field as CalcFieldForm;
-            if(calcField.format===CalcFormat.NUMBER || calcField.format===CalcFormat.NUMBER_DIGIT){
-                const numberArray = this.toNumberArray();
-                return Math.min(...numberArray);
-            }
-        }
-        if(this.data===null || this.data.length===0){
-            return null;
-        }
-        return this.data.reduce((min, item) => (item < min ? item : min), this.data[0]);
-    }
-
-    private count(): number {
-        return this.data.length;
-    }
-
-    private first(): string | null {
-        return this.data.length ? this.data[0] : null;
-    }
-
-    private last(): string | null {
-        return this.data.length ? this.data[this.data.length - 1] : null;
-    }
-
-    public calculate(operator: Operator): number | string | null {
-            switch (operator) {
-                case Operator.SUM:
-                        return this.sum();
-                case Operator.AVG:
-                        return this.avg();
-                case Operator.MAX:
-                    return this.max();
-                case Operator.MIN:
-                    return this.min();
-                case Operator.COUNT:
-                    return this.count();
-                case Operator.FIRST:
-                    return this.first();
-                case Operator.LAST:
-                    return this.last();
-                default:
-                    return null;
-            }
-    }
-}

plugin/kintone-addins/vite.config.js

@@ -1,18 +1,17 @@
 // vite.config.js
 import { defineConfig, loadEnv } from "vite";
+import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
 import checker from "vite-plugin-checker";
-// import { libInjectCss } from 'vite-plugin-lib-inject-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(),
+      cssInjectedByJsPlugin(),
     ],
     build: {
       cssCodeSplit: false,
@@ -20,10 +19,10 @@ export default ({ mode }) => {
         input: "src/index.ts", // entry file
         output: {
           entryFileNames: "alc_runtime.js",
-          assetFileNames:'alc_runtime.css'
+          // assetFileNames:'alc_kintone_style.css'
         },
       },
-      sourcemap: sourcemap,
+      sourcemap: process.env.VITE_SOURCE_MAP,
     },
     server: {
       port: process.env.VITE_PORT,

plugin/kintone-addins/yarn.lock

@@ -135,18 +135,6 @@
   resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
-"@kintone/rest-api-client@^5.5.2":
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/@kintone/rest-api-client/-/rest-api-client-5.5.2.tgz#501cd72dcfe51cd84c1a65fb1e2fdd4a92933e5b"
-  integrity sha512-1nKynN5Lp1PdfGOr73tlEyGjT0gqr+fW5eV7BfkI5jEqbtNIqHfKNZi93zzPGIxz6cFr+PNGlfKO0+tZsO9DYw==
-  dependencies:
-    axios "^1.7.2"
-    core-js "^3.37.1"
-    form-data "^4.0.0"
-    js-base64 "^3.7.7"
-    mime "^3.0.0"
-    qs "^6.12.1"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -168,18 +156,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@popperjs/core@^2.11.8", "@popperjs/core@^2.9.2":
-  version "2.11.8"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
-  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-
-"@types/bootstrap@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@types/bootstrap/-/bootstrap-5.2.10.tgz#58506463bccc6602bc051487ad8d3a6458f94c6c"
-  integrity sha512-F2X+cd6551tep0MvVZ6nM8v7XgGN/twpdNDjqS1TUM7YFNEtQYWk+dKAnH+T1gr6QgCoGMPl487xw/9hXooa2g==
-  dependencies:
-    "@popperjs/core" "^2.9.2"
-
 "@types/jquery@^3.5.24":
   version "3.5.24"
   resolved "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.24.tgz"
@@ -225,11 +201,6 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
@@ -238,20 +209,6 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-axios@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
-  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -262,11 +219,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bootstrap@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38"
-  integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -275,13 +227,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
 braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
@@ -296,17 +241,6 @@ braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
-
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -378,13 +312,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^8.0.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
@@ -395,46 +322,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-core-js@^3.37.1:
-  version "3.37.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
-  integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
-
-cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
 esbuild@^0.18.10:
   version "0.18.20"
   resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"
@@ -500,20 +387,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-follow-redirects@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 fs-extra@^11.1.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
@@ -528,22 +401,6 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
-
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
@@ -551,13 +408,6 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -573,30 +423,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
-has-proto@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
-
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-hasown@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-  dependencies:
-    function-bind "^1.1.2"
-
 immutable@^4.0.0:
   version "4.3.4"
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"
@@ -626,31 +452,16 @@ is-number@^7.0.0:
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
 jquery@^3.7.1:
   version "3.7.1"
   resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
-js-base64@^3.7.7:
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
-  integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-json-parse-even-better-errors@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
-  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
-
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -660,11 +471,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
-
 merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -678,23 +484,6 @@ micromatch@^4.0.4:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
 minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -702,13 +491,6 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^9.0.0:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 nanoid@^3.3.6:
   version "3.3.6"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
@@ -719,24 +501,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
-  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
-
-npm-run-all2@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-6.2.0.tgz#ac0a893a593e1ab3ef85c5ac3526321d2e3137bd"
-  integrity sha512-wA7yVIkthe6qJBfiJ2g6aweaaRlw72itsFGF6HuwCHKwtwAx/4BY1vVpk6bw6lS8RLMsexoasOkd0aYOmsFG7Q==
-  dependencies:
-    ansi-styles "^6.2.1"
-    cross-spawn "^7.0.3"
-    memorystream "^0.3.1"
-    minimatch "^9.0.0"
-    pidtree "^0.6.0"
-    read-package-json-fast "^3.0.2"
-    shell-quote "^1.7.3"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -744,12 +508,7 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-object-inspect@^1.13.1:
+path-key@^3.0.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
-  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
-
-path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -764,11 +523,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pidtree@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
-  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
-
 postcss@^8.4.27:
   version "8.4.31"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"
@@ -778,31 +532,11 @@ postcss@^8.4.27:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-qs@^6.12.1:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.2.tgz#5443b587f3bf73ac68968de491e5b25bafe04478"
-  integrity sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==
-  dependencies:
-    side-channel "^1.0.6"
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-read-package-json-fast@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
-  dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -843,45 +577,6 @@ semver@^7.3.4, semver@^7.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
   integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
-set-function-length@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
-side-channel@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    object-inspect "^1.13.1"
-
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
@@ -961,6 +656,11 @@ vite-plugin-checker@^0.6.4:
     vscode-languageserver-textdocument "^1.0.1"
     vscode-uri "^3.0.2"
 
+vite-plugin-css-injected-by-js@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.1.tgz#b9c568c21b131d08e31aa6d368ee39c9d6c1b6c1"
+  integrity sha512-9ioqwDuEBxW55gNoWFEDhfLTrVKXEEZgl5adhWmmqa88EQGKfTmexy4v1Rh0pAS6RhKQs2bUYQArprB32JpUZQ==
+
 vite@^4.4.5:
   version "4.5.0"
   resolved "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz"
@@ -1016,9 +716,7 @@ vscode-uri@^3.0.2:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
   integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
 
-which@^2.0.1:
+yarn@^1.22.22:
-  version "2.0.2"
+  version "1.22.22"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==
-  dependencies:
-    isexe "^2.0.0"

sample.json

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

sample2.json

@@ -1,24 +1,22 @@
 [
   {
-    "component": "AppFieldSelect",
+    "component": "FieldInput",
     "props": {
-      "displayName": "更新先選択",
+      "displayName": "フィールド",
       "modelValue": {},
-      "name": "lookupField",
+      "name": "field",
-      "placeholder": "",
+      "placeholder": "対象項目を選択してください"
-      "fieldTypes": [
-        "lookup"
-      ],
-      "hint": "更新先のルックアップフィールドを選択する"
     }
   },
   {
-    "component": "ConditionInput",
+    "component": "SelectBox",
     "props": {
-      "displayName": "更新条件",
+        "displayName": "チェックする全角文字",
-      "modelValue": "",
+        "modelValue": null,
-      "name": "condition",
+        "name": "options",
-      "placeholder": "条件式を設定してください"
+        "placeholder": "チェックしたい全角文字を選択する",
+        "selectType":"multiple",
+        "options":["全角記号および句読点","ひらがな","カタカナ","全角英数字","常用漢字","拡張漢字"]
     }
   }
 ]