条件式の障害対応(511,512,513)

This commit is contained in:
xiaozhe.ma
2024-07-12 09:50:28 +09:00
parent a85a3683f2
commit 0fda3d143c
4 changed files with 62 additions and 54 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,14 +1,16 @@
<template> <template>
<div class="q-pa-md">
<q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled" <q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled"
:clearable="isSelected"> :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" />
@@ -26,7 +28,9 @@
--> -->
<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> </show-dialog>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
@@ -36,6 +40,7 @@ import ShowDialog from '../ShowDialog.vue';
import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue'; import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue';
import { useFlowEditorStore } from '../../stores/flowEditor'; import { useFlowEditorStore } from '../../stores/flowEditor';
import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes'; import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes';
export default defineComponent({ export default defineComponent({
name: 'ConditionObject', name: 'ConditionObject',
components: { components: {

View File

@@ -94,7 +94,7 @@ export default defineComponent({
dialogVisible.value = false; dialogVisible.value = false;
}; };
const handleSelect = (value) => { const handleSelect = (value:any) => {
// 获取当前光标位置 // 获取当前光标位置
// const cursorPosition = inputRef.value.getNativeElement().selectionStart; // const cursorPosition = inputRef.value.getNativeElement().selectionStart;
// if (cursorPosition === undefined || cursorPosition === 0) { // if (cursorPosition === undefined || cursorPosition === 0) {
@@ -117,9 +117,9 @@ export default defineComponent({
canInput.value = true; canInput.value = true;
emit('update:selectedObject', {}); emit('update:selectedObject', {});
} }
const updateSharedText = (value) => { const updateSharedText = (value:string) => {
sharedText.value = value; sharedText.value = value;
emit('update:selectedObject', { ...props.selectedObject, sharedText: value }); emit('update:selectedObject', { ...props.selectedObject, sharedText: value,objectType:'text' });
} }
return { return {

View File

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