Showing
1 changed file
with
6 additions
and
2 deletions
| @@ -7821,6 +7821,7 @@ | @@ -7821,6 +7821,7 @@ | ||
| 7821 | */ | 7821 | */ |
| 7822 | EditorUi.prototype.importFile = function (data, mimeType, dx, dy, w, h, filename, | 7822 | EditorUi.prototype.importFile = function (data, mimeType, dx, dy, w, h, filename, |
| 7823 | done, file, crop, ignoreEmbeddedXml, evt) { | 7823 | done, file, crop, ignoreEmbeddedXml, evt) { |
| 7824 | + // TODO Thingskit 拖拽引入文件 | ||
| 7824 | crop = (crop != null) ? crop : true; | 7825 | crop = (crop != null) ? crop : true; |
| 7825 | var async = false; | 7826 | var async = false; |
| 7826 | var cells = null; | 7827 | var cells = null; |
| @@ -12483,7 +12484,7 @@ | @@ -12483,7 +12484,7 @@ | ||
| 12483 | this.hoverIcons.update(graph.view.getState(graph.getSelectionCell())); | 12484 | this.hoverIcons.update(graph.view.getState(graph.getSelectionCell())); |
| 12484 | } | 12485 | } |
| 12485 | } | 12486 | } |
| 12486 | - | 12487 | + |
| 12487 | // TODO ThingsKit 移除复制来源cell的无用属性(COPY_SOURCE属性) | 12488 | // TODO ThingsKit 移除复制来源cell的无用属性(COPY_SOURCE属性) |
| 12488 | this.editor.removeSourceCellsUnlessAttrubute(cells) | 12489 | this.editor.removeSourceCellsUnlessAttrubute(cells) |
| 12489 | return cells; | 12490 | return cells; |
| @@ -13052,8 +13053,11 @@ | @@ -13052,8 +13053,11 @@ | ||
| 13052 | this.defaultFilename, temp, fileHandle, desc)); | 13053 | this.defaultFilename, temp, fileHandle, desc)); |
| 13053 | } | 13054 | } |
| 13054 | }); | 13055 | }); |
| 13055 | - | ||
| 13056 | if (data != null && data.length > 0) { | 13056 | if (data != null && data.length > 0) { |
| 13057 | + // TODO Thingskit 导入时打开本地文件不再打开新的页面与弹出提示框 | ||
| 13058 | + fn() | ||
| 13059 | + return | ||
| 13060 | + | ||
| 13057 | if (currentFile == null || (!currentFile.isModified() && | 13061 | if (currentFile == null || (!currentFile.isModified() && |
| 13058 | (mxClient.IS_CHROMEAPP || EditorUi.isElectronApp || fileHandle != null))) { | 13062 | (mxClient.IS_CHROMEAPP || EditorUi.isElectronApp || fileHandle != null))) { |
| 13059 | fn(); | 13063 | fn(); |