From 62e3cb4e3117dae65943c4d96ea4b741b79b5094 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 8 Nov 2023 12:19:24 +0100 Subject: [PATCH 1/3] bug fix action-connector + button add action --- .../cds-action-intent.component.html | 4 +-- .../cds-action-intent.component.scss | 1 + .../cds-intent/cds-intent.component.html | 33 +++++++++++++----- .../cds-intent/cds-intent.component.scss | 34 ++++++++++++++----- src/styles.scss | 16 +++++++++ 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html index 314c5f1c..db79d6e3 100644 --- a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html +++ b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html @@ -3,9 +3,9 @@
-
+
- - +
+ + + +
+ +
+
+ + + +
\ No newline at end of file diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss index d14ff94e..981d3a0d 100644 --- a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss +++ b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss @@ -17,11 +17,7 @@ -.action-intent { - padding: 0 12px 0 0; - margin: 7px 0 -4px 0; - display: block; -} + .action-element{ width: 100%; @@ -346,23 +342,45 @@ background-color: var(--action-no-featured-backgroud); } + +.footer-intent { + cursor: pointer; + .last-action-intent { + padding: 0 12px 0 0; + margin: 7px 0 -4px 0; + display: block; + } +} + /* Btn add action /* --------------------------------- */ .csd-open-action-menu-btn-wpr { // height: 32px; + // bottom: -50px; text-align: center; position: absolute; - bottom: -50px; + display: block; + bottom: -36px; + left: 118px; } -.cds-last-action>.csd-open-action-menu-btn-wpr { +.footer-intent>.csd-open-action-menu-btn-wpr { opacity: 0; } -.cds-last-action:hover>.csd-open-action-menu-btn-wpr { +.footer-intent:hover>.csd-open-action-menu-btn-wpr { opacity: 1; } + +// .cds-last-action>.csd-open-action-menu-btn-wpr { +// opacity: 0; +// } + +// .cds-last-action:hover>.csd-open-action-menu-btn-wpr { +// opacity: 1; +// } + .body-action { position: relative; display: flex; diff --git a/src/styles.scss b/src/styles.scss index 90d4ee00..049d851d 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1 +1,17 @@ /* You can add global styles to this file, and also import other style files */ + + + +.isLast{ + + .connector .point-connector-empty { + border: 1px solid; + border-color: rgba(0, 0, 0, 0.5); + width: 12px; + height: 12px; + background: #ffffff; + } + .connector .point-connector-empty::before { + border: 0px; + } +} \ No newline at end of file From 2e6c5203a84d9a511599e286108a78bf01ab883e Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 8 Nov 2023 17:24:32 +0100 Subject: [PATCH 2/3] fixed bug floatMenu --- .../cds-dashboard/cds-canvas/cds-canvas.component.ts | 3 ++- .../cds-canvas/cds-intent/cds-intent.component.scss | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts index bab2f5b1..eb73d4c5 100644 --- a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts +++ b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts @@ -532,7 +532,8 @@ export class CdsCanvasComponent implements OnInit { private openFloatMenuOnConnectorDraftReleased(detail){ this.logger.log("[CDS CANVAS] ho rilasciato in un punto qualsiasi dello stage e quindi apro il float menu", detail); this.positionFloatMenu = this.stageService.physicPointCorrector(detail.menuPoint); - this.positionFloatMenu.x = this.positionFloatMenu.x + 300; + let marginLeft = this.IS_OPEN_INTENTS_LIST?290:60; + this.positionFloatMenu.x = this.positionFloatMenu.x+marginLeft; detail.menuPoint = this.positionFloatMenu; this.closeAllPanels(); this.IS_OPEN_ADD_ACTIONS_MENU = true; diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss index 981d3a0d..e810a2bb 100644 --- a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss +++ b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss @@ -345,6 +345,7 @@ .footer-intent { cursor: pointer; + margin-bottom: -10px; .last-action-intent { padding: 0 12px 0 0; margin: 7px 0 -4px 0; From 0134f9aaaee2ec030f4d390d8025cce3632d9fef Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 8 Nov 2023 17:36:38 +0100 Subject: [PATCH 3/3] fixed css footer intent --- .../cds-intent/cds-intent.component.html | 17 +++++++++-------- .../cds-intent/cds-intent.component.scss | 12 +++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html index 85ce2fb3..5a8530ca 100644 --- a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html +++ b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html @@ -266,15 +266,16 @@ + + +
- - - +