条件設定関連No511,512障害修正

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,5 +1,4 @@
 <template>
-  <div class="q-pa-sm">
     <q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled"
       :clearable="isSelected">
       <template v-slot:control>
@@ -26,19 +25,20 @@
       <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
     -->
       <DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
-        :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" />
+        :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" :options="options" ref="inputRef" />
 
   </show-dialog>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, ref, watchEffect, computed } from 'vue';
+import { defineComponent, reactive, ref, watchEffect, computed ,PropType} from 'vue';
 import ShowDialog from '../ShowDialog.vue';
 // import ConditionObjects from '../ConditionObjects.vue';
 import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue';
 import { useFlowEditorStore } from '../../stores/flowEditor';
 import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes';
+import { IDynamicInputConfig } from 'src/types/ComponentTypes';
+
 
 export default defineComponent({
   name: 'ConditionObject',
@@ -57,7 +57,7 @@ export default defineComponent({
       default: undefined
     },
     config: {
-      type: Object,
+      type: Object as PropType<IDynamicInputConfig>,
       default: () => {
         return {
           canInput: false,
@@ -68,6 +68,12 @@ export default defineComponent({
         };
       }
     },
+
+    options:
+    {
+      type:Array as PropType< string[]>,
+      default:()=>[]
+    },
     modelValue: {
       type: Object,
       default: null
@@ -75,6 +81,7 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     // const appDg = ref();
+    const inputRef=ref();
     const show = ref(false);
     const selectedObject = ref(props.modelValue);
     const store = useFlowEditorStore();
@@ -97,6 +104,7 @@ export default defineComponent({
     const closeDg = (val: string) => {
       if (val == 'OK') {
         // selectedObject.value = appDg.value.selected[0];
+        selectedObject.value = inputRef.value.selectedObjectRef
       }
     };
 
@@ -105,6 +113,7 @@ export default defineComponent({
     });
 
     return {
+      inputRef,
       store,
       // appDg,
       show,