From ecb90e7120b653117a432837e21aee319da73ef4 Mon Sep 17 00:00:00 2001 From: "maxiaozhe@alicorns.co.jp" Date: Mon, 15 Apr 2024 16:54:33 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=81=AB=E6=A4=9C=E7=B4=A2=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/Kintone自動化ツール設計図.drawio | 2047 +++++++++-------- frontend/src/components/ActionSelect.vue | 16 +- frontend/src/components/AppSelect.vue | 26 +- .../ConditionEditor/ConditionEditor.vue | 2 +- .../ConditionEditor/ConditionObject.vue | 14 +- frontend/src/components/ConditionObjects.vue | 5 +- frontend/src/components/FieldList.vue | 4 +- frontend/src/components/ShowDialog.vue | 24 +- frontend/src/components/left/AppSelector.vue | 14 +- frontend/src/css/app.scss | 24 + frontend/src/pages/FlowChart.vue | 12 +- 11 files changed, 1162 insertions(+), 1026 deletions(-) diff --git a/document/Kintone自動化ツール設計図.drawio b/document/Kintone自動化ツール設計図.drawio index 5c5b1ae..5873517 100644 --- a/document/Kintone自動化ツール設計図.drawio +++ b/document/Kintone自動化ツール設計図.drawio @@ -1,1000 +1,1047 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/components/ActionSelect.vue b/frontend/src/components/ActionSelect.vue index cf0856e..7f97a8f 100644 --- a/frontend/src/components/ActionSelect.vue +++ b/frontend/src/components/ActionSelect.vue @@ -3,13 +3,15 @@ - + :filter="filter" + > + diff --git a/frontend/src/components/AppSelect.vue b/frontend/src/components/AppSelect.vue index 69202a3..946558a 100644 --- a/frontend/src/components/AppSelect.vue +++ b/frontend/src/components/AppSelect.vue @@ -1,69 +1,70 @@ + \ No newline at end of file diff --git a/frontend/src/components/FieldSelect.vue b/frontend/src/components/FieldSelect.vue index bbd43ef..773870a 100644 --- a/frontend/src/components/FieldSelect.vue +++ b/frontend/src/components/FieldSelect.vue @@ -1,53 +1,84 @@ \ No newline at end of file diff --git a/frontend/src/components/right/FieldInput.vue b/frontend/src/components/right/FieldInput.vue index 3401443..716310d 100644 --- a/frontend/src/components/right/FieldInput.vue +++ b/frontend/src/components/right/FieldInput.vue @@ -1,98 +1,99 @@ - - + + \ No newline at end of file diff --git a/frontend/src/components/right/MultiFieldInput.vue b/frontend/src/components/right/MultiFieldInput.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/components/right/PropertyList.vue b/frontend/src/components/right/PropertyList.vue index 4556ef6..61bff1c 100644 --- a/frontend/src/components/right/PropertyList.vue +++ b/frontend/src/components/right/PropertyList.vue @@ -15,6 +15,7 @@ import InputText from '../right/InputText.vue'; import SelectBox from '../right/SelectBox.vue'; import DatePicker from '../right/DatePicker.vue'; import FieldInput from '../right/FieldInput.vue'; +import AppFieldSelect from './AppFieldSelect.vue'; import MuiltInputText from '../right/MuiltInputText.vue'; import ConditionInput from '../right/ConditionInput.vue'; import EventSetter from '../right/EventSetter.vue'; @@ -27,6 +28,7 @@ export default defineComponent({ SelectBox, DatePicker, FieldInput, + AppFieldSelect, MuiltInputText, ConditionInput, EventSetter diff --git a/frontend/src/components/right/PropertyPanel.vue b/frontend/src/components/right/PropertyPanel.vue index 82d605e..401bab3 100644 --- a/frontend/src/components/right/PropertyPanel.vue +++ b/frontend/src/components/right/PropertyPanel.vue @@ -11,7 +11,7 @@ elevated overlay > - +
{{ actionNode?.subTitle }}：設定
 From 472353632cfb7ead42be2d87099ddc5b42eb6f78 Mon Sep 17 00:00:00 2001 From: "maxiaozhe@alicorns.co.jp" Date: Mon, 22 Apr 2024 22:45:03 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E9=95=B7=E3=81=84=E8=AA=AC=E6=98=8E?= =?UTF-8?q?=E6=96=87=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 +- frontend/src/components/right/InputText.vue | 16 +++++++++++++++- frontend/src/types/ActionTypes.ts | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index cc05306..5016fbf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -2,7 +2,7 @@ "name": "kintone-automate", "version": "0.2.0", "description": "Kintoneアプリの自動生成とデプロイを支援ツールです", - "productName": "Kintone Automate", + "productName": "kintone Automate", "author": "maxiaozhe@alicorns.co.jp ", "private": true, "scripts": { diff --git a/frontend/src/components/right/InputText.vue b/frontend/src/components/right/InputText.vue index be8c5c6..5c5b312 100644 --- a/frontend/src/components/right/InputText.vue +++ b/frontend/src/components/right/InputText.vue @@ -1,5 +1,11 @@ + diff --git a/frontend/src/types/ActionTypes.ts b/frontend/src/types/ActionTypes.ts index 8b39e05..8d71ea4 100644 --- a/frontend/src/types/ActionTypes.ts +++ b/frontend/src/types/ActionTypes.ts @@ -447,7 +447,7 @@ export class ActionFlow implements IActionFlow { getPrevVarNames(prevNode:IActionNode):IActionVariable[]{ let varNames:IActionVariable[]=[]; - if(prevNode.varName!==undefined){ + if(prevNode.varName!==undefined && prevNode.varName.modelValue){ varNames.unshift({ actionName:prevNode.name, displayName:prevNode.varName.displayName, From 0de33f04bcefa895614b589f244068d854b65ef1 Mon Sep 17 00:00:00 2001 From: "maxiaozhe@alicorns.co.jp" Date: Thu, 25 Apr 2024 09:46:34 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E9=81=B8?= =?UTF-8?q?=E6=8A=9EUI=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/core/security.py | 4 +- frontend/src/components/AppSelect.vue | 12 +- frontend/src/components/FieldSelect.vue | 26 ++-- frontend/src/components/left/AppSelector.vue | 2 +- .../src/components/right/AppFieldSelect.vue | 138 ++++++++++-------- frontend/src/components/right/FieldInput.vue | 17 +-- 6 files changed, 106 insertions(+), 93 deletions(-) diff --git a/backend/app/core/security.py b/backend/app/core/security.py index 098fe34..6465002 100644 --- a/backend/app/core/security.py +++ b/backend/app/core/security.py @@ -9,7 +9,7 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") SECRET_KEY = "alicorns" ALGORITHM = "HS256" -ACCESS_TOKEN_EXPIRE_MINUTES = 30 +ACCESS_TOKEN_EXPIRE_MINUTES = 2880 def get_password_hash(password: str) -> str: @@ -25,7 +25,7 @@ def create_access_token(*, data: dict, expires_delta: timedelta = None): if expires_delta: expire = datetime.utcnow() + expires_delta else: - expire = datetime.utcnow() + timedelta(minutes=2880) + expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) to_encode.update({"exp": expire}) encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM) return encoded_jwt diff --git a/frontend/src/components/AppSelect.vue b/frontend/src/components/AppSelect.vue index 946558a..261a7e6 100644 --- a/frontend/src/components/AppSelect.vue +++ b/frontend/src/components/AppSelect.vue @@ -17,7 +17,7 @@ \ No newline at end of file + diff --git a/frontend/src/components/right/FieldInput.vue b/frontend/src/components/right/FieldInput.vue index 716310d..9be0622 100644 --- a/frontend/src/components/right/FieldInput.vue +++ b/frontend/src/components/right/FieldInput.vue @@ -12,16 +12,16 @@ - + - + - \ No newline at end of file From 2846297112ed017eb1b3e3286126d6b92a1e8428 Mon Sep 17 00:00:00 2001 From: "maxiaozhe@alicorns.co.jp" Date: Tue, 30 Apr 2024 12:54:20 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=81=AE=E8=A4=87=E6=95=B0=E9=81=B8=E6=8A=9E=E3=83=BB?= =?UTF-8?q?=E5=8D=98=E4=B8=80=E9=81=B8=E6=8A=9E=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/right/AppFieldSelect.vue | 8 +++++--- plugin/kintone-addins/readme.md | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/right/AppFieldSelect.vue b/frontend/src/components/right/AppFieldSelect.vue index a6545d6..fe49486 100644 --- a/frontend/src/components/right/AppFieldSelect.vue +++ b/frontend/src/components/right/AppFieldSelect.vue @@ -82,7 +82,7 @@
-
@@ -151,9 +151,11 @@ export default defineComponent({ type: Object, default: null }, - + selectType:{ + type:String, + default:'single' + } }, - setup(props, { emit }) { const appDlg = ref(); const fieldDlg = ref(); diff --git a/plugin/kintone-addins/readme.md b/plugin/kintone-addins/readme.md index df925b9..4e85ad1 100644 --- a/plugin/kintone-addins/readme.md +++ b/plugin/kintone-addins/readme.md @@ -68,6 +68,10 @@ | modelValue | 空文字 | コンポーネントの初期値を設定します。
初期設定ないの場合は空文字で設定する。 | name | field | 属性の設定値の名前です。 | | placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。 | +| hint | 説明文| 長い説明文を設定することが可能です。（markdown形式サポート予定、現在HTML可能） | +| selectType |`single` or `multiple`| フィールド選択・他のアプリのフィールド選択の選択モードを設定する | + + ### 使用可能なコンポーネント | No. | コンポーネント名 | コンポーネントタイプ | 説明 | From 994a0174f583dd1e3dfd8b0c4fc1d6dc5964e8ad Mon Sep 17 00:00:00 2001 From: Mouriya Date: Mon, 6 May 2024 20:58:06 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E3=83=94?= =?UTF-8?q?=E3=83=83=E3=82=AB=E3=83=BC=E3=81=A8=E6=95=B0=E5=AD=97=E5=85=A5?= =?UTF-8?q?=E5=8A=9B=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/right/ColorPicker.vue | 68 +++++++++++++++++++ frontend/src/components/right/NumInput.vue | 48 +++++++++++++ .../src/components/right/PropertyList.vue | 6 +- 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/right/ColorPicker.vue create mode 100644 frontend/src/components/right/NumInput.vue diff --git a/frontend/src/components/right/ColorPicker.vue b/frontend/src/components/right/ColorPicker.vue new file mode 100644 index 0000000..aae3896 --- /dev/null +++ b/frontend/src/components/right/ColorPicker.vue @@ -0,0 +1,68 @@ + + + diff --git a/frontend/src/components/right/NumInput.vue b/frontend/src/components/right/NumInput.vue new file mode 100644 index 0000000..d916c94 --- /dev/null +++ b/frontend/src/components/right/NumInput.vue @@ -0,0 +1,48 @@ + + + diff --git a/frontend/src/components/right/PropertyList.vue b/frontend/src/components/right/PropertyList.vue index 61bff1c..e113923 100644 --- a/frontend/src/components/right/PropertyList.vue +++ b/frontend/src/components/right/PropertyList.vue @@ -19,6 +19,8 @@ import AppFieldSelect from './AppFieldSelect.vue'; import MuiltInputText from '../right/MuiltInputText.vue'; import ConditionInput from '../right/ConditionInput.vue'; import EventSetter from '../right/EventSetter.vue'; +import ColorPicker from './ColorPicker.vue'; +import NumInput from './NumInput.vue'; import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes'; export default defineComponent({ @@ -31,7 +33,9 @@ export default defineComponent({ AppFieldSelect, MuiltInputText, ConditionInput, - EventSetter + EventSetter, + ColorPicker, + NumInput }, props: { nodeProps: { From c426bbf79321e0b6c771806b5393ce5e875ac1d6 Mon Sep 17 00:00:00 2001 From: "maxiaozhe@alicorns.co.jp" Date: Thu, 9 May 2024 10:49:05 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20numInput=E5=B1=9E=E6=80=A7UI?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20inputText,numInput=E3=81=ABrules=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E8=BF=BD=E5=8A=A0=E3=80=81=E5=85=A5=E5=8A=9B=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E8=A8=AD=E5=AE=9A=E5=8F=AF=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/right/AppFieldSelect.vue | 4 +- frontend/src/components/right/ColorPicker.vue | 20 +- .../src/components/right/ConditionInput.vue | 31 +-- frontend/src/components/right/DatePicker.vue | 30 +-- frontend/src/components/right/EventSetter.vue | 13 +- frontend/src/components/right/FieldInput.vue | 159 ++++++------ frontend/src/components/right/InputText.vue | 52 ++-- .../src/components/right/MuiltInputText.vue | 14 +- frontend/src/components/right/NumInput.vue | 51 +++- .../src/components/right/PropertyList.vue | 2 +- frontend/src/components/right/SelectBox.vue | 3 + sample.json | 232 +++++------------- sample2.json | 60 +++-- 13 files changed, 335 insertions(+), 336 deletions(-) diff --git a/frontend/src/components/right/AppFieldSelect.vue b/frontend/src/components/right/AppFieldSelect.vue index fe49486..3c16c73 100644 --- a/frontend/src/components/right/AppFieldSelect.vue +++ b/frontend/src/components/right/AppFieldSelect.vue @@ -1,6 +1,5 @@