条件エディタ追加

frontend/src/components/right/ConditionInput.vue

@@ -0,0 +1,95 @@
+<template>
+  <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
+    <template v-slot:control >
+      <q-card flat class="full-width">
+        <q-card-actions vertical>
+          <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
+        </q-card-actions>
+        <q-card-section class="text-caption" >
+          <div v-if="!isSetted">{{ placeholder }}</div>
+          <div v-else>{{ conditionString }}</div>
+        </q-card-section>
+      </q-card>
+    </template>
+  </q-field>
+  <condition-editor v-model:show="show" v-model:conditionTree="tree"></condition-editor>
+</template>
+
+  <script lang="ts">
+  import { defineComponent, ref ,watchEffect,computed,reactive} from 'vue';
+  import { ConditionTree,GroupNode,ConditionNode,LogicalOperator,Operator } from 'app/src/types/Conditions';
+  import ConditionEditor from '../ConditionEditor/ConditionEditor.vue'
+  export default defineComponent({
+    name: 'FieldInput',
+    components: {
+      ConditionEditor
+    },
+    props: {
+      displayName:{
+        type: String,
+        default: '',
+      },
+      name:{
+        type: String,
+        default: '',
+      },
+      placeholder: {
+        type: String,
+        default: '',
+      },
+      hint:{
+        type: String,
+        default: '',
+      },
+      modelValue: {
+        type: String,
+        default: null
+      },
+    },
+
+    setup(props, { emit }) {
+      const appDg = ref();
+      const show = ref(false);
+      const tree = reactive(new ConditionTree());
+      if(props.modelValue && props.modelValue!==''){
+        tree.fromJson(props.modelValue);
+      }else{
+        const newNode = new ConditionNode(LogicalOperator.AND,{},Operator.Equal,'',tree.root);
+        tree.addNode(tree.root,newNode);
+      }
+
+      const isSetted=ref(props.modelValue && props.modelValue!=='');
+
+      const conditionString = computed(()=>{
+          return tree.buildConditionString(tree.root);
+      });
+
+      const showDg = () => {
+        show.value = true;
+      };
+
+      const closeDg = (val:string) => {
+        if (val == 'OK') {
+          const conditionJson = tree.toJson();
+          isSetted.value=true;
+          emit('update:modelValue', conditionJson);
+        }
+      };
+
+      watchEffect(() => {
+        const conditionJson = tree.toJson();
+        emit('update:modelValue', conditionJson);
+      });
+
+      return {
+        appDg,
+        isSetted,
+        show,
+        showDg,
+        closeDg,
+        tree,
+        conditionString
+      };
+    }
+  });
+  </script>

frontend/src/components/right/DatePicker.vue

@@ -25,6 +25,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    name:{
+      type: String,
+      default: '',
+    },
     placeholder: {
       type: String,
       default: '',

frontend/src/components/right/FieldInput.vue

@@ -27,6 +27,11 @@ import { defineComponent, ref ,watchEffect,computed} from 'vue';
 import ShowDialog from '../ShowDialog.vue';
 import FieldSelect from '../FieldSelect.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
+interface IField{
+  name:string,
+  code:string,
+  type:string
+}
 export default defineComponent({
   name: 'FieldInput',
   components: {
@@ -38,6 +43,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    name:{
+      type: String,
+      default: '',
+    },
     placeholder: {
       type: String,
       default: '',

frontend/src/components/right/InputText.vue

@@ -12,6 +12,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    name:{
+      type: String,
+      default: '',
+    },
     placeholder: {
       type: String,
       default: '',

frontend/src/components/right/MuiltInputText.vue

@@ -12,6 +12,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    name:{
+      type: String,
+      default: '',
+    },
     placeholder: {
       type: String,
       default: '',

frontend/src/components/right/PropertyList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-for="(item, index) in properties" :key="index">
+    <div v-for="(item, index) in properties" :key="index" >
       <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
     </div>
   </div>
@@ -16,6 +16,7 @@ import SelectBox from '../right/SelectBox.vue';
 import DatePicker from '../right/DatePicker.vue';
 import FieldInput from '../right/FieldInput.vue';
 import MuiltInputText from '../right/MuiltInputText.vue';
+import ConditionInput from '../right/ConditionInput.vue';
 import { IActionNode,IActionProperty } from 'src/types/ActionTypes';
 
 export default defineComponent({
@@ -25,7 +26,8 @@ export default defineComponent({
     SelectBox,
     DatePicker,
     FieldInput,
-    MuiltInputText
+    MuiltInputText,
+    ConditionInput
   },
   props: {
     nodeProps: {
@@ -45,3 +47,5 @@ export default defineComponent({
   }
 });
 </script>
+<style lang="scss">
+</style>