From 5ba66eea366a142d216d58dda3bcc66d3b096109 Mon Sep 17 00:00:00 2001 From: Sokolov Andrey Date: Fri, 3 Apr 2020 14:05:31 +0500 Subject: [PATCH 1/2] fix relese problem --- CHANGELOG.md | 6 ++++++ addon/controllers/fd-application-model.js | 1 + addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js | 6 +++++- addon/services/fd-lock-service.js | 5 +++++ package.json | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac6839e66..2f0f8d548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] + +## [0.14.1] ### Changed * Change use template caption, when create new project. * Swap diagrams and model position in main menu. +### Fixed +* Fix work hotkey in inputs on diagrams primitives. +* FIx save class. + ## [0.14.0] ### Added * Add stage export. diff --git a/addon/controllers/fd-application-model.js b/addon/controllers/fd-application-model.js index cd7a7bdf4..a2d26600a 100644 --- a/addon/controllers/fd-application-model.js +++ b/addon/controllers/fd-application-model.js @@ -178,6 +178,7 @@ export default Controller.extend(FdSheetCloseConfirm, FdReadonlyProjectMixin, Fd stereotype: stereotype }); + newClass.incrementProperty('referenceCount'); if (!isBlank(dataobject) && !(dataobject instanceof $.Event)) { let formView = store.createRecord('fd-dev-form-view', { view: null, diff --git a/addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js b/addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js index 61241899a..6a1ed68ea 100644 --- a/addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js +++ b/addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js @@ -68,6 +68,10 @@ export default Mixin.create({ @param {Event} e event. */ _keydownHandler(e) { + if ($(e.target).is('textarea,input')) { + return; + } + if (e.ctrlKey) { e.stopPropagation(); @@ -116,7 +120,7 @@ export default Mixin.create({ this.get('paper').$el.focus(); - } else if (e.keyCode === 46 && !$(e.target).is('textarea,input')) { + } else if (e.keyCode === 46) { e.stopPropagation(); e.preventDefault(); this.deleteSelectElements(); diff --git a/addon/services/fd-lock-service.js b/addon/services/fd-lock-service.js index cc94a4448..2683e11c9 100644 --- a/addon/services/fd-lock-service.js +++ b/addon/services/fd-lock-service.js @@ -173,6 +173,11 @@ export default Service.extend({ return JSON.parse(result.value); }); } + + // Delete this when aadd lock for view git #709 + if (objectTypeName === 'view-sheet') { + return resolve(true); + } } return resolve(false); diff --git a/package.json b/package.json index ce2f3d12d..34f231997 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-flexberry-designer", - "version": "0.14.0", + "version": "0.14.1", "description": "CASE addon for ember-flexberry applications", "keywords": [ "ember-addon", From 8414a1a438d42778f672492823acbe80a79dbb6f Mon Sep 17 00:00:00 2001 From: Sokolov Andrey Date: Fri, 3 Apr 2020 15:05:19 +0500 Subject: [PATCH 2/2] fix comment --- addon/services/fd-lock-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/services/fd-lock-service.js b/addon/services/fd-lock-service.js index 2683e11c9..9c5614f53 100644 --- a/addon/services/fd-lock-service.js +++ b/addon/services/fd-lock-service.js @@ -174,7 +174,7 @@ export default Service.extend({ }); } - // Delete this when aadd lock for view git #709 + // Delete this when add lock for view git #709 if (objectTypeName === 'view-sheet') { return resolve(true); }