alicorn-dev/KintoneAppBuilder
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/Temp/alc_runtime.js
View File

File diff suppressed because one or more lines are too long

59
frontend/src/components/ConditionEditor/ConditionObject.vue
View File

@@ -1,32 +1,36 @@
<template> <template>
<q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled" <div class="q-pa-md">
:clearable="isSelected"> <q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled"
<template v-slot:control> :clearable="isSelected">
<!-- <q-chip color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj"> <template v-slot:control>
{{ selectedObject.name }} <q-chip color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
</q-chip> {{ selectedObject.name }}
<q-chip color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj"> </q-chip>
{{ selectedObject.name.name }} <q-chip color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
</q-chip> --> {{ selectedObject.name.name }}
{{ selectedObject?.sharedText }} </q-chip>
</template> <div v-if="isSelected && selectedObject.objectType==='text'">{{ selectedObject?.sharedText }}</div>
<template v-slot:append>
<q-icon name="search" class="cursor-pointer" @click="showDg" /> </template>
</template> <template v-slot:append>
</q-field> <q-icon name="search" class="cursor-pointer" @click="showDg" />
<show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px"> </template>
<!-- <template v-slot:toolbar> </q-field>
<q-input dense debounce="200" v-model="filter" placeholder="検索" clearable> <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
<template v-slot:before> <!-- <template v-slot:toolbar>
<q-icon name="search" /> <q-input dense debounce="200" v-model="filter" placeholder="検索" clearable>
</template> <template v-slot:before>
</q-input> <q-icon name="search" />
</template> </template>
<condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects> </q-input>
--> </template>
<DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput" <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
:buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" /> -->
<DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
: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: {

6
frontend/src/components/DynamicItemInput/DynamicItemInput.vue
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 {

3
plugin/kintone-addins/src/types/Conditions.ts
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;
} }