Commit eec041c885a6ec7be698db7d7e038653ea015727
1 parent
e5c4b2f2
fix: DEFECT-485 switch page event faliure
Showing
2 changed files
with
18 additions
and
11 deletions
@@ -618,16 +618,17 @@ App.main = function(callback, createUi) | @@ -618,16 +618,17 @@ App.main = function(callback, createUi) | ||
618 | return; | 618 | return; |
619 | } | 619 | } |
620 | 620 | ||
621 | + // TODO thingsKit extended loading life | ||
621 | // Removes info text in embed mode | 622 | // Removes info text in embed mode |
622 | - if (urlParams['embed'] == '1' || urlParams['lightbox'] == '1') | ||
623 | - { | ||
624 | - var geInfo = document.getElementById('geInfo'); | ||
625 | - | ||
626 | - if (geInfo != null) | ||
627 | - { | ||
628 | - geInfo.parentNode.removeChild(geInfo); | ||
629 | - } | ||
630 | - } | 623 | + // if (urlParams['embed'] == '1' || urlParams['lightbox'] == '1') |
624 | + // { | ||
625 | + // var geInfo = document.getElementById('geInfo'); | ||
626 | + | ||
627 | + // if (geInfo != null) | ||
628 | + // { | ||
629 | + // geInfo.parentNode.removeChild(geInfo); | ||
630 | + // } | ||
631 | + // } | ||
631 | 632 | ||
632 | // Redirects to the latest AWS icons | 633 | // Redirects to the latest AWS icons |
633 | if (document.referrer != null && urlParams['libs'] == 'aws3' && | 634 | if (document.referrer != null && urlParams['libs'] == 'aws3' && |
@@ -7634,7 +7634,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -7634,7 +7634,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
7634 | function proxyFn(fn) { | 7634 | function proxyFn(fn) { |
7635 | return (...args) => { | 7635 | return (...args) => { |
7636 | const currentDataSource = getDataSourceBindValue() || {} | 7636 | const currentDataSource = getDataSourceBindValue() || {} |
7637 | - | 7637 | + |
7638 | to(ConfigurationNodeApi.updateNodeInfo({ | 7638 | to(ConfigurationNodeApi.updateNodeInfo({ |
7639 | configurationId, | 7639 | configurationId, |
7640 | contentId: currentPageId.id, | 7640 | contentId: currentPageId.id, |
@@ -13016,10 +13016,11 @@ class HandleDataInteraction { | @@ -13016,10 +13016,11 @@ class HandleDataInteraction { | ||
13016 | * @description 事件映射 | 13016 | * @description 事件映射 |
13017 | * @type {Map<>} | 13017 | * @type {Map<>} |
13018 | */ | 13018 | */ |
13019 | - eventMapping = new Map() | 13019 | + static eventMapping = new Map() |
13020 | 13020 | ||
13021 | constructor(DispatchInstance) { | 13021 | constructor(DispatchInstance) { |
13022 | this.DispatchInstance = DispatchInstance | 13022 | this.DispatchInstance = DispatchInstance |
13023 | + HandleDataInteraction.eventMapping = new Map() | ||
13023 | this.init() | 13024 | this.init() |
13024 | } | 13025 | } |
13025 | 13026 | ||
@@ -13028,6 +13029,10 @@ class HandleDataInteraction { | @@ -13028,6 +13029,10 @@ class HandleDataInteraction { | ||
13028 | this.createGraphEventListener() | 13029 | this.createGraphEventListener() |
13029 | } | 13030 | } |
13030 | 13031 | ||
13032 | + get eventMapping() { | ||
13033 | + return HandleDataInteraction.eventMapping | ||
13034 | + } | ||
13035 | + | ||
13031 | /** | 13036 | /** |
13032 | * @description DispatchCenter 实例中保存的 graph 对象 | 13037 | * @description DispatchCenter 实例中保存的 graph 对象 |
13033 | * @return {*} | 13038 | * @return {*} |
@@ -13058,6 +13063,7 @@ class HandleDataInteraction { | @@ -13058,6 +13063,7 @@ class HandleDataInteraction { | ||
13058 | */ | 13063 | */ |
13059 | generatorEventMapping() { | 13064 | generatorEventMapping() { |
13060 | const event = this.eventList | 13065 | const event = this.eventList |
13066 | + console.log('event list', event) | ||
13061 | for (const item of event) { | 13067 | for (const item of event) { |
13062 | const { content, id: nodeId, enabled, type } = item | 13068 | const { content, id: nodeId, enabled, type } = item |
13063 | if (!enabled) continue | 13069 | if (!enabled) continue |