細部の問題の修正
This commit is contained in:
@@ -1,12 +1,13 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table flat bordered row-key="name" :selection="type" :selected="modelValue"
|
||||
<q-table flat bordered row-key="id" :selection="type" :selected="modelValue"
|
||||
@update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { PropType, reactive } from 'vue';
|
||||
import { IActionVariable } from '../types/ActionTypes';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
|
||||
export default {
|
||||
name: 'VariableList',
|
||||
@@ -39,6 +40,7 @@ export default {
|
||||
return v.name.vars
|
||||
.filter(o => o.vName && o.logicalOperator && o.field)
|
||||
.map(o => ({
|
||||
id: uuidv4(),
|
||||
objectType: 'variable',
|
||||
name: { name: `${v.name.name}.${o.vName}` },
|
||||
actionName: v.name.actionName,
|
||||
|
||||
@@ -198,7 +198,7 @@ export class ConditionTree {
|
||||
if(value && typeof value ==='object' && ('label' in value)){
|
||||
value =condNode.value.label;
|
||||
}
|
||||
return `${condNode.object.name} ${condNode.operator} '${value}'`;
|
||||
return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${condNode.operator} '${value}'`;
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user