Compare commits
5 Commits
daitian
...
mvp_step2_
| Author | SHA1 | Date | |
|---|---|---|---|
| 2846297112 | |||
| 5cf60ddfdc | |||
| 0de33f04bc | |||
| 472353632c | |||
|
|
1a48fb5b20 |
@@ -9,7 +9,7 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
|||||||
|
|
||||||
SECRET_KEY = "alicorns"
|
SECRET_KEY = "alicorns"
|
||||||
ALGORITHM = "HS256"
|
ALGORITHM = "HS256"
|
||||||
ACCESS_TOKEN_EXPIRE_MINUTES = 30
|
ACCESS_TOKEN_EXPIRE_MINUTES = 2880
|
||||||
|
|
||||||
|
|
||||||
def get_password_hash(password: str) -> str:
|
def get_password_hash(password: str) -> str:
|
||||||
@@ -25,7 +25,7 @@ def create_access_token(*, data: dict, expires_delta: timedelta = None):
|
|||||||
if expires_delta:
|
if expires_delta:
|
||||||
expire = datetime.utcnow() + expires_delta
|
expire = datetime.utcnow() + expires_delta
|
||||||
else:
|
else:
|
||||||
expire = datetime.utcnow() + timedelta(minutes=2880)
|
expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||||
to_encode.update({"exp": expire})
|
to_encode.update({"exp": expire})
|
||||||
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
||||||
return encoded_jwt
|
return encoded_jwt
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "kintone-automate",
|
"name": "kintone-automate",
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
|
"description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
|
||||||
"productName": "Kintone Automate",
|
"productName": "kintone Automate",
|
||||||
"author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
|
"author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.action-table{
|
.action-table{
|
||||||
height: 100%;
|
min-height: 10vh;
|
||||||
max-height: 540px;
|
max-height: 68vh;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,69 +1,68 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="q-pa-md" >
|
<div class="q-px-xs">
|
||||||
<div v-if="!isLoaded" class="spinner flex flex-center">
|
<div v-if="!isLoaded" class="spinner flex flex-center">
|
||||||
<q-spinner color="primary" size="3em" />
|
<q-spinner color="primary" size="3em" />
|
||||||
</div>
|
</div>
|
||||||
<q-table v-else
|
<q-table v-else class="app-table" :selection="type" row-key="id" v-model:selected="selected" flat bordered
|
||||||
class="app-table"
|
virtual-scroll :columns="columns" :rows="rows" :pagination="pagination" :rows-per-page-options="[0]"
|
||||||
:selection="type"
|
:filter="filter" style="max-height: 65vh;">
|
||||||
row-key="id"
|
|
||||||
v-model:selected="selected"
|
|
||||||
flat bordered
|
|
||||||
virtual-scroll
|
|
||||||
:columns="columns"
|
|
||||||
:rows="rows"
|
|
||||||
:pagination="pagination"
|
|
||||||
:rows-per-page-options="[0]"
|
|
||||||
:filter="filter"
|
|
||||||
>
|
|
||||||
<template v-slot:body-cell-description="props">
|
<template v-slot:body-cell-description="props">
|
||||||
<q-td :props="props">
|
<q-td :props="props">
|
||||||
<q-scroll-area class="description-cell">
|
<q-scroll-area class="description-cell">
|
||||||
<div v-html="props.row.description" ></div>
|
<div v-html="props.row.description"></div>
|
||||||
</q-scroll-area>
|
</q-scroll-area>
|
||||||
</q-td>
|
</q-td>
|
||||||
</template>
|
</template>
|
||||||
</q-table>
|
</q-table>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { ref,onMounted,reactive } from 'vue'
|
import { ref, onMounted, reactive, watchEffect } from 'vue'
|
||||||
import { api } from 'boot/axios';
|
import { api } from 'boot/axios';
|
||||||
import { LeftDataBus } from './flowEditor/left/DataBus';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'AppSelect',
|
name: 'AppSelect',
|
||||||
props: {
|
props: {
|
||||||
name: String,
|
name: String,
|
||||||
type: String,
|
type: String,
|
||||||
filter:String
|
filter: String,
|
||||||
|
updateExternalSelectAppInfo: {
|
||||||
|
type: Function
|
||||||
|
}
|
||||||
},
|
},
|
||||||
setup() {
|
setup(props) {
|
||||||
const columns = [
|
const columns = [
|
||||||
{ name: 'id', required: true,label: 'ID',align: 'left',field: 'id',sortable: true},
|
{ name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true },
|
||||||
{ name: 'name', label: 'アプリ名', field: 'name', sortable: true,align:'left' },
|
{ name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
|
||||||
{ name: 'description', label: '概要', field: 'description',align:'left', sortable: false },
|
{ name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
|
||||||
{ name: 'createdate', label: '作成日時', field: 'createdate',align:'left'}
|
{ name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
|
||||||
]
|
]
|
||||||
const isLoaded=ref(false);
|
const isLoaded = ref(false);
|
||||||
const rows :any[]= reactive([]);
|
const rows: any[] = reactive([]);
|
||||||
onMounted( () => {
|
const selected = ref([])
|
||||||
api.get('api/v1/allapps').then(res =>{
|
|
||||||
res.data.apps.forEach((item:any) =>
|
|
||||||
{
|
|
||||||
rows.push({
|
|
||||||
id:item.appId,
|
|
||||||
name:item.name,
|
|
||||||
description:item.description,
|
|
||||||
createdate:dateFormat(item.createdAt)});
|
|
||||||
});
|
|
||||||
isLoaded.value=true;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const dateFormat=(dateStr:string)=>{
|
watchEffect(()=>{
|
||||||
|
if (selected.value && selected.value[0] && props.updateExternalSelectAppInfo) {
|
||||||
|
props.updateExternalSelectAppInfo(selected.value[0])
|
||||||
|
}
|
||||||
|
});
|
||||||
|
onMounted(() => {
|
||||||
|
api.get('api/v1/allapps').then(res => {
|
||||||
|
res.data.apps.forEach((item: any) => {
|
||||||
|
rows.push({
|
||||||
|
id: item.appId,
|
||||||
|
name: item.name,
|
||||||
|
description: item.description,
|
||||||
|
createdate: dateFormat(item.createdAt)
|
||||||
|
});
|
||||||
|
});
|
||||||
|
isLoaded.value = true;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const dateFormat = (dateStr: string) => {
|
||||||
const date = new Date(dateStr);
|
const date = new Date(dateStr);
|
||||||
const pad = (num:number) => num.toString().padStart(2, '0');
|
const pad = (num: number) => num.toString().padStart(2, '0');
|
||||||
const year = date.getFullYear();
|
const year = date.getFullYear();
|
||||||
const month = pad(date.getMonth() + 1);
|
const month = pad(date.getMonth() + 1);
|
||||||
const day = pad(date.getDate());
|
const day = pad(date.getDate());
|
||||||
@@ -75,10 +74,10 @@ export default {
|
|||||||
return {
|
return {
|
||||||
columns,
|
columns,
|
||||||
rows,
|
rows,
|
||||||
selected: ref([]),
|
selected,
|
||||||
isLoaded,
|
isLoaded,
|
||||||
pagination:ref({
|
pagination: ref({
|
||||||
rowsPerPage:10
|
rowsPerPage: 10
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -86,19 +85,16 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.description-cell{
|
.description-cell {
|
||||||
height: 60px;
|
height: 60px;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
max-height: 60px;
|
max-height: 60px;
|
||||||
max-width: 300px;
|
max-width: 300px;
|
||||||
white-space: break-spaces;
|
white-space: break-spaces;
|
||||||
}
|
}
|
||||||
.spinner{
|
|
||||||
|
.spinner {
|
||||||
min-height: 300px;
|
min-height: 300px;
|
||||||
min-width: 400px;
|
min-width: 400px;
|
||||||
}
|
}
|
||||||
.app-table{
|
|
||||||
height: 100%;
|
|
||||||
max-height: 600px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,53 +1,82 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="q-pa-md">
|
<div class="q-px-md" style=" min-width: 50vw; max-width: 85vw;">
|
||||||
<div v-if="!isLoaded" class="spinner flex flex-center">
|
<div v-if="!isLoaded" class="spinner flex flex-center">
|
||||||
<q-spinner color="primary" size="3em" />
|
<q-spinner color="primary" size="3em" />
|
||||||
</div>
|
</div>
|
||||||
<q-table v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
|
<q-table flat bordered v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns"
|
||||||
|
:rows="rows" :pagination="pageSetting" :filter="filter" style="max-height: 55vh;"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { ref,onMounted,reactive } from 'vue'
|
import { ref, onMounted, reactive, watchEffect } from 'vue'
|
||||||
import { api } from 'boot/axios';
|
import { api } from 'boot/axios';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'fieldSelect',
|
name: 'fieldSelect',
|
||||||
props: {
|
props: {
|
||||||
name: String,
|
name: String,
|
||||||
type: String,
|
type: {
|
||||||
appId:Number
|
type: String,
|
||||||
|
default: 'single'
|
||||||
|
},
|
||||||
|
appId: Number,
|
||||||
|
not_page: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
selectedFields:{
|
||||||
|
type:Array,
|
||||||
|
default:()=>[]
|
||||||
|
},
|
||||||
|
updateSelects: {
|
||||||
|
type: Function
|
||||||
|
},
|
||||||
|
filter: String,
|
||||||
},
|
},
|
||||||
setup(props) {
|
setup(props) {
|
||||||
const isLoaded=ref(false);
|
const isLoaded = ref(false);
|
||||||
const columns = [
|
const columns = [
|
||||||
{ name: 'name', required: true,label: 'フィールド名',align: 'left',field: row=>row.name,sortable: true},
|
{ name: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
|
||||||
{ name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
|
{ name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
|
||||||
{ name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
|
{ name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
|
||||||
]
|
]
|
||||||
const rows = reactive([])
|
const pageSetting = ref({
|
||||||
onMounted( async () => {
|
sortBy: 'desc',
|
||||||
const res = await api.get('api/v1/appfields', {
|
descending: false,
|
||||||
params:{
|
page: 2,
|
||||||
app: props.appId
|
rowsPerPage: props.not_page ? 0 : 5
|
||||||
}
|
// rowsNumber: xx if getting data from a server
|
||||||
});
|
});
|
||||||
let fields = res.data.properties;
|
const rows = reactive([]);
|
||||||
console.log(fields);
|
const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
|
||||||
Object.keys(fields).forEach((key) =>
|
|
||||||
{
|
|
||||||
const fld=fields[key];
|
|
||||||
// rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
|
|
||||||
rows.push({name:fld.label,...fld});
|
|
||||||
});
|
|
||||||
isLoaded.value=true;
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
watchEffect(() => {
|
||||||
columns,
|
props.updateSelects(selected);
|
||||||
rows,
|
});
|
||||||
selected: ref([]),
|
|
||||||
isLoaded
|
onMounted(async () => {
|
||||||
}
|
const res = await api.get('api/v1/appfields', {
|
||||||
|
params: {
|
||||||
|
app: props.appId
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let fields = res.data.properties;
|
||||||
|
console.log(fields);
|
||||||
|
Object.keys(fields).forEach((key) => {
|
||||||
|
const fld = fields[key];
|
||||||
|
// rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
|
||||||
|
rows.push({ name: fld.label, ...fld });
|
||||||
|
});
|
||||||
|
isLoaded.value = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
columns,
|
||||||
|
rows,
|
||||||
|
selected,
|
||||||
|
isLoaded,
|
||||||
|
pageSetting
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- <div class="q-pa-md q-gutter-sm" > -->
|
<!-- <div class="q-pa-md q-gutter-sm" > -->
|
||||||
<q-dialog :model-value="visible" persistent bordered>
|
<q-dialog :model-value="visible" persistent bordered >
|
||||||
<q-card :style="cardStyle" >
|
<q-card :style="cardStyle" style=" min-width: 40vw; max-width: 80vw; max-height: 95vh;">
|
||||||
<q-toolbar class="bg-grey-4">
|
<q-toolbar class="bg-grey-4">
|
||||||
<q-toolbar-title>{{ name }}</q-toolbar-title>
|
<q-toolbar-title>{{ name }}</q-toolbar-title>
|
||||||
<q-space></q-space>
|
<q-space></q-space>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<q-card-section class="q-pt-none" :style="sectionStyle">
|
<q-card-section class="q-pt-none" :style="sectionStyle">
|
||||||
<slot></slot>
|
<slot></slot>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
<q-card-actions align="right" class="text-primary">
|
<q-card-actions align="right" class="text-primary q-mt-lg">
|
||||||
<q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
|
<q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
|
||||||
<q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
|
<q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
|
||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
></q-btn>
|
></q-btn>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="680px" min-height="600px" height="600px">
|
<ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh" >
|
||||||
<template v-slot:toolbar>
|
<template v-slot:toolbar>
|
||||||
<q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
|
<q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
|
||||||
<template v-slot:before>
|
<template v-slot:before>
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
<template>
|
||||||
|
|
||||||
|
<div class="q-my-md">
|
||||||
|
<q-card flat>
|
||||||
|
<q-card-section class="q-pa-none q-my-sm q-mr-md">
|
||||||
|
<!-- <div class=" q-my-none ">App Field Select</div> -->
|
||||||
|
<div class="row q-mb-xs">
|
||||||
|
<div class="text-primary q-mb-xs text-caption">{{ $props.displayName }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div class="q-mb-xs">{{ selectedField.app?.name || '未選択' }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-1">
|
||||||
|
<q-btn round flat size="sm" color="primary" icon="search" @click="showDg" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
<q-separator />
|
||||||
|
<q-card-section class="q-pa-none q-ma-none">
|
||||||
|
<div style="">
|
||||||
|
<div v-if="selectedField.fields && selectedField.fields.length > 0 ">
|
||||||
|
<q-list bordered>
|
||||||
|
<q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator v-slot="{ item, index }">
|
||||||
|
<q-item :key="index" dense clickable >
|
||||||
|
<q-item-section>
|
||||||
|
<q-item-label>
|
||||||
|
{{ item.label }}
|
||||||
|
</q-item-label>
|
||||||
|
</q-item-section>
|
||||||
|
<q-item-section side>
|
||||||
|
<q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
|
||||||
|
</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</q-virtual-scroll>
|
||||||
|
</q-list>
|
||||||
|
</div>
|
||||||
|
<!-- <div v-else class="row q-mt-lg">
|
||||||
|
</div> -->
|
||||||
|
</div>
|
||||||
|
<!-- <q-separator /> -->
|
||||||
|
</q-card-section>
|
||||||
|
<q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length===0">
|
||||||
|
<div class="row">
|
||||||
|
<div class="text-grey text-caption"> {{ $props.placeholder }}</div>
|
||||||
|
<!-- <q-btn flat color="grey" label="clear" @click="clear" /> -->
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeFieldDialog" ref="fieldDlg">
|
||||||
|
|
||||||
|
<div class="q-mx-md q-mb-lg">
|
||||||
|
<div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
|
||||||
|
|
||||||
|
<div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
|
||||||
|
<div v-if="!showSelectApp && selectedField.app">{{ selectedField.app?.name }}</div>
|
||||||
|
<q-space />
|
||||||
|
<div>
|
||||||
|
<q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
|
||||||
|
showSelectApp = true;
|
||||||
|
}"></q-btn>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!showSelectApp && selectedField.app?.name">
|
||||||
|
<div>
|
||||||
|
<div class="row q-mb-md">
|
||||||
|
<!-- <div class="col"> -->
|
||||||
|
<div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
|
||||||
|
<!-- </div> -->
|
||||||
|
<q-space />
|
||||||
|
<!-- <div class="col"> -->
|
||||||
|
<div class="q-mr-md">
|
||||||
|
<q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
|
||||||
|
<template v-slot:before>
|
||||||
|
<q-icon name="search" />
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelects="updateItems"
|
||||||
|
:appId="selectedField.app?.id" not_page :filter="fieldFilter" :selectedFields="selectedField.fields"></field-select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="min-width: 45vw;" v-else>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</show-dialog>
|
||||||
|
|
||||||
|
<show-dialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeAppDlg">
|
||||||
|
<template v-slot:toolbar>
|
||||||
|
<q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
|
||||||
|
<template v-slot:before>
|
||||||
|
<q-icon name="search" />
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<AppSelect ref="appDlg" name="アプリ" type="single" :filter="filter"
|
||||||
|
:updateExternalSelectAppInfo="updateExternalSelectAppInfo"></AppSelect>
|
||||||
|
</show-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent, ref, watchEffect, computed } from 'vue';
|
||||||
|
import ShowDialog from '../ShowDialog.vue';
|
||||||
|
import FieldSelect from '../FieldSelect.vue';
|
||||||
|
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||||
|
import AppSelect from '../AppSelect.vue';
|
||||||
|
interface IApp{
|
||||||
|
id:string,
|
||||||
|
name:string
|
||||||
|
}
|
||||||
|
interface IField {
|
||||||
|
name: string,
|
||||||
|
code: string,
|
||||||
|
type: string
|
||||||
|
}
|
||||||
|
|
||||||
|
interface IAppFields{
|
||||||
|
app?:IApp,
|
||||||
|
fields:IField[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
name: 'FieldInput',
|
||||||
|
components: {
|
||||||
|
ShowDialog,
|
||||||
|
FieldSelect,
|
||||||
|
AppSelect,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
displayName: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
name: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
placeholder: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
modelValue: {
|
||||||
|
type: Object,
|
||||||
|
default: null
|
||||||
|
},
|
||||||
|
selectType:{
|
||||||
|
type:String,
|
||||||
|
default:'single'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
setup(props, { emit }) {
|
||||||
|
const appDlg = ref();
|
||||||
|
const fieldDlg = ref();
|
||||||
|
const show = ref(false);
|
||||||
|
const showSelectApp = ref(false);
|
||||||
|
const selectedField = ref<IAppFields>({
|
||||||
|
app:undefined,
|
||||||
|
fields:[]
|
||||||
|
});
|
||||||
|
if(props.modelValue && "app" in props.modelValue && "fields" in props.modelValue){
|
||||||
|
selectedField.value=props.modelValue as IAppFields;
|
||||||
|
}
|
||||||
|
const store = useFlowEditorStore();
|
||||||
|
|
||||||
|
const isSelected = computed(() => {
|
||||||
|
return selectedField.value !== null && typeof selectedField.value === 'object' && ('app' in selectedField.value)
|
||||||
|
});
|
||||||
|
|
||||||
|
const showDg = () => {
|
||||||
|
show.value = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const clear = () => {
|
||||||
|
selectedField.value ={
|
||||||
|
fields:[]
|
||||||
|
} ;
|
||||||
|
}
|
||||||
|
|
||||||
|
const closeAppDlg = (val: string) => {
|
||||||
|
if (val == 'OK') {
|
||||||
|
selectedField.value.app = appDlg.value.selected[0];
|
||||||
|
selectedField.value.fields=[];
|
||||||
|
showSelectApp.value=false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeFieldDialog=(val:string)=>{
|
||||||
|
if (val == 'OK') {
|
||||||
|
selectedField.value.fields = fieldDlg.value.selected;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const updateExternalSelectAppInfo = (newAppinfo:IApp) => {
|
||||||
|
// selectedField.value.app = newAppinfo
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateItems = (newFields:IField[]) => {
|
||||||
|
// selectedField.value.fields = newFields
|
||||||
|
}
|
||||||
|
|
||||||
|
const removeField=(index:number)=>{
|
||||||
|
selectedField.value.fields.splice(index,1);
|
||||||
|
}
|
||||||
|
watchEffect(() => {
|
||||||
|
emit('update:modelValue', selectedField.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
store,
|
||||||
|
appDlg,
|
||||||
|
fieldDlg,
|
||||||
|
show,
|
||||||
|
showDg,
|
||||||
|
closeAppDlg,
|
||||||
|
closeFieldDialog,
|
||||||
|
selectedField,
|
||||||
|
showSelectApp,
|
||||||
|
isSelected,
|
||||||
|
updateExternalSelectAppInfo,
|
||||||
|
filter: ref(),
|
||||||
|
updateItems,
|
||||||
|
clear,
|
||||||
|
fieldFilter: ref(),
|
||||||
|
removeField
|
||||||
|
};
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -1,98 +1,98 @@
|
|||||||
<template>
|
<template>
|
||||||
<q-field v-model="selectedField" :label="displayName" labelColor="primary"
|
<q-field v-model="selectedField" :label="displayName" labelColor="primary"
|
||||||
:clearable="isSelected" stack-label :bottom-slots="!isSelected" >
|
:clearable="isSelected" stack-label :bottom-slots="!isSelected" >
|
||||||
<template v-slot:control >
|
<template v-slot:control >
|
||||||
<q-chip color="primary" text-color="white" v-if="isSelected">
|
<q-chip color="primary" text-color="white" v-if="isSelected">
|
||||||
{{ selectedField.name }}
|
{{ selectedField.name }}
|
||||||
</q-chip>
|
</q-chip>
|
||||||
</template>
|
</template>
|
||||||
<!-- <template v-slot:hint v-if="isSelected">
|
<!-- <template v-slot:hint v-if="isSelected">
|
||||||
<div> 項目コード:<q-chip size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
|
<div> 項目コード:<q-chip size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
|
||||||
</template> -->
|
</template> -->
|
||||||
<template v-slot:hint v-if="!isSelected">
|
<template v-slot:hint v-if="!isSelected">
|
||||||
{{ placeholder }}
|
{{ placeholder }}
|
||||||
</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" color="primary" @click="showDg"/>
|
||||||
</template>
|
</template>
|
||||||
</q-field>
|
</q-field>
|
||||||
<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
|
<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
|
||||||
<field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
|
<field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
|
||||||
</show-dialog>
|
</show-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, ref ,watchEffect,computed} from 'vue';
|
import { defineComponent, ref ,watchEffect,computed} from 'vue';
|
||||||
import ShowDialog from '../ShowDialog.vue';
|
import ShowDialog from '../ShowDialog.vue';
|
||||||
import FieldSelect from '../FieldSelect.vue';
|
import FieldSelect from '../FieldSelect.vue';
|
||||||
import { useFlowEditorStore } from 'stores/flowEditor';
|
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||||
interface IField{
|
interface IField{
|
||||||
name:string,
|
name:string,
|
||||||
code:string,
|
code:string,
|
||||||
type:string
|
type:string
|
||||||
}
|
}
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'FieldInput',
|
name: 'FieldInput',
|
||||||
components: {
|
components: {
|
||||||
ShowDialog,
|
ShowDialog,
|
||||||
FieldSelect,
|
FieldSelect,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
displayName:{
|
displayName:{
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
name:{
|
name:{
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
placeholder: {
|
placeholder: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
hint:{
|
hint:{
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
modelValue: {
|
modelValue: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null
|
default: null
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
setup(props, { emit }) {
|
setup(props, { emit }) {
|
||||||
const appDg = ref();
|
const appDg = ref();
|
||||||
const show = ref(false);
|
const show = ref(false);
|
||||||
const selectedField = ref(props.modelValue);
|
const selectedField = ref(props.modelValue);
|
||||||
const store = useFlowEditorStore();
|
const store = useFlowEditorStore();
|
||||||
const isSelected = computed(()=>{
|
const isSelected = computed(()=>{
|
||||||
return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
|
return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
|
||||||
});
|
});
|
||||||
|
|
||||||
const showDg = () => {
|
const showDg = () => {
|
||||||
show.value = true;
|
show.value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const closeDg = (val:string) => {
|
const closeDg = (val:string) => {
|
||||||
if (val == 'OK') {
|
if (val == 'OK') {
|
||||||
selectedField.value = appDg.value.selected[0];
|
selectedField.value = appDg.value.selected[0];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
emit('update:modelValue', selectedField.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
store,
|
||||||
|
appDg,
|
||||||
|
show,
|
||||||
|
showDg,
|
||||||
|
closeDg,
|
||||||
|
selectedField,
|
||||||
|
isSelected
|
||||||
|
};
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
watchEffect(() => {
|
|
||||||
emit('update:modelValue', selectedField.value);
|
|
||||||
});
|
});
|
||||||
|
</script>
|
||||||
return {
|
|
||||||
store,
|
|
||||||
appDg,
|
|
||||||
show,
|
|
||||||
showDg,
|
|
||||||
closeDg,
|
|
||||||
selectedField,
|
|
||||||
isSelected
|
|
||||||
};
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label/>
|
<q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
|
||||||
|
<template v-slot:append v-if="hint!==''">
|
||||||
|
<q-icon name="help" size="22px" color="blue-8">
|
||||||
|
<q-tooltip class="bg-yellow-2 text-black shadow-4" anchor="bottom right"><div class="hint-text" v-html="hint"/></q-tooltip>
|
||||||
|
</q-icon>
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
@@ -39,7 +45,15 @@ export default defineComponent({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
inputValue,
|
inputValue,
|
||||||
|
showhint:ref(false)
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
.hint-text{
|
||||||
|
white-space : always;
|
||||||
|
max-width: 450px;
|
||||||
|
font-size: 1.2em;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
0
frontend/src/components/right/MultiFieldInput.vue
Normal file
0
frontend/src/components/right/MultiFieldInput.vue
Normal file
@@ -15,6 +15,7 @@ import InputText from '../right/InputText.vue';
|
|||||||
import SelectBox from '../right/SelectBox.vue';
|
import SelectBox from '../right/SelectBox.vue';
|
||||||
import DatePicker from '../right/DatePicker.vue';
|
import DatePicker from '../right/DatePicker.vue';
|
||||||
import FieldInput from '../right/FieldInput.vue';
|
import FieldInput from '../right/FieldInput.vue';
|
||||||
|
import AppFieldSelect from './AppFieldSelect.vue';
|
||||||
import MuiltInputText from '../right/MuiltInputText.vue';
|
import MuiltInputText from '../right/MuiltInputText.vue';
|
||||||
import ConditionInput from '../right/ConditionInput.vue';
|
import ConditionInput from '../right/ConditionInput.vue';
|
||||||
import EventSetter from '../right/EventSetter.vue';
|
import EventSetter from '../right/EventSetter.vue';
|
||||||
@@ -27,6 +28,7 @@ export default defineComponent({
|
|||||||
SelectBox,
|
SelectBox,
|
||||||
DatePicker,
|
DatePicker,
|
||||||
FieldInput,
|
FieldInput,
|
||||||
|
AppFieldSelect,
|
||||||
MuiltInputText,
|
MuiltInputText,
|
||||||
ConditionInput,
|
ConditionInput,
|
||||||
EventSetter
|
EventSetter
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
elevated
|
elevated
|
||||||
overlay
|
overlay
|
||||||
>
|
>
|
||||||
<q-card class="column full-height" style="width: 300px">
|
<q-card class="column" style="max-width: 300px;min-height: 100%">
|
||||||
<q-card-section>
|
<q-card-section>
|
||||||
<div class="text-h6">{{ actionNode?.subTitle }}:設定</div>
|
<div class="text-h6">{{ actionNode?.subTitle }}:設定</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|||||||
@@ -447,7 +447,7 @@ export class ActionFlow implements IActionFlow {
|
|||||||
|
|
||||||
getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
|
getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
|
||||||
let varNames:IActionVariable[]=[];
|
let varNames:IActionVariable[]=[];
|
||||||
if(prevNode.varName!==undefined){
|
if(prevNode.varName!==undefined && prevNode.varName.modelValue){
|
||||||
varNames.unshift({
|
varNames.unshift({
|
||||||
actionName:prevNode.name,
|
actionName:prevNode.name,
|
||||||
displayName:prevNode.varName.displayName,
|
displayName:prevNode.varName.displayName,
|
||||||
|
|||||||
@@ -68,6 +68,10 @@
|
|||||||
| modelValue | 空文字 | コンポーネントの初期値を設定します。<br>初期設定ないの場合は空文字で設定する。
|
| modelValue | 空文字 | コンポーネントの初期値を設定します。<br>初期設定ないの場合は空文字で設定する。
|
||||||
| name | field | 属性の設定値の名前です。 |
|
| name | field | 属性の設定値の名前です。 |
|
||||||
| placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。 |
|
| placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。 |
|
||||||
|
| hint | 説明文| 長い説明文を設定することが可能です。(markdown形式サポート予定、現在HTML可能) |
|
||||||
|
| selectType |`single` or `multiple`| フィールド選択・他のアプリのフィールド選択の選択モードを設定する |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### 使用可能なコンポーネント
|
### 使用可能なコンポーネント
|
||||||
| No. | コンポーネント名 | コンポーネントタイプ | 説明 |
|
| No. | コンポーネント名 | コンポーネントタイプ | 説明 |
|
||||||
|
|||||||
Reference in New Issue
Block a user