条件設定関連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,

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -69,17 +69,19 @@
             <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>
-              <ConditionObject v-bind="prop.node" v-model="prop.node.value" :config="rightDynamicItemConfig" class="col-4"/>
+              <ConditionObject v-bind="prop.node" v-model="prop.node.value" :config="rightDynamicItemConfig" class="col-4"
+              :options="objectValueOptions(prop.node?.object?.options)"
+              />
               <!-- <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"/> -->
               <!-- <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
                         v-model="prop.node.value"
                         class="condition-value" :outlined="true" :dense="true" ></q-input> -->
-              <q-select v-if="prop.node.object && ('options' in prop.node.object)"
+              <!-- <q-select v-if="prop.node.object && ('options' in prop.node.object)"
                         v-model="prop.node.value"
                         :options="objectValueOptions(prop.node.object.options)"
                         clearable
                         value-key="index"
-                        class="condition-value" :outlined="true" :dense="true" ></q-select>
+                        class="condition-value" :outlined="true" :dense="true" ></q-select> -->
               <q-btn flat round dense icon="more_horiz" size="sm" >
               <q-menu  auto-close anchor="top right">
                   <q-list>
@@ -118,6 +120,7 @@ import { finished } from 'stream';
 import { defineComponent,ref,reactive, computed, inject } from 'vue';
 import { INode,ConditionTree,GroupNode,ConditionNode, LogicalOperator,Operator,NodeType } from '../../types/Conditions';
 import ConditionObject from './ConditionObject.vue';
+import { IDynamicInputConfig } from 'src/types/ComponentTypes';
 export default defineComponent( {
   name: 'NodeCondition',
   components: {
@@ -145,17 +148,18 @@ export default defineComponent( {
       return opts;
     });
 
-    const operator = inject('Operator')
-    const operators =computed(()=>{
-      return operator ? operator : Object.values(Operator);
-    });
+    const operatorSet = inject<Array<any>>('Operator')
+    const operators = ref(operatorSet ? operatorSet : Object.values(Operator));
     const tree = reactive(props.conditionTree);
 
     const conditionString = computed(()=>{
         return tree.buildConditionString(tree.root);
     });
 
-    const objectValueOptions=(options:any):any[]=>{
+    const objectValueOptions=(options:any):any[]|null=>{
+      if(!options){
+        return null;
+      }
       const opts:any[] =[];
       Object.keys(options).forEach((key) =>
       {
@@ -222,13 +226,14 @@ export default defineComponent( {
       ticked.value=[];
     }
 
-
     const expanded=computed(()=>tree.getGroups(tree.root));
     // addCondition(tree.root);
+    const leftDynamicItemConfig = inject<IDynamicInputConfig>('leftDynamicItemConfig');
+    const rightDynamicItemConfig = inject<IDynamicInputConfig>('rightDynamicItemConfig');
 
     return {
-      leftDynamicItemConfig :inject('leftDynamicItemConfig'),
-      rightDynamicItemConfig:inject('rightDynamicItemConfig'),
+      leftDynamicItemConfig,
+      rightDynamicItemConfig,
       showingCondition,
       conditionString,
       tree,
@@ -260,10 +265,11 @@ export default defineComponent( {
   max-height: 40px;
   margin: 0 2px;
 }
+
 .operator{
   min-width: 150px;
   max-height: 40px;
-  margin-left: 12px;
+  margin: 0 2px;
 
   text-align: center;
   font-size: 12pt;