From 154dadb2eda3dea3a2056b2e68023182023eabff Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Tue, 22 Aug 2023 21:07:52 +0300 Subject: [PATCH] [ve] Add dependence to config --- build/build-develop-addons.bat | 8 +++++ configs/draw.json | 50 ++++++++++++++++++++++++++- draw/model/VisioDocument.js | 31 ++++++++++++++--- tests/draw/serialize/sax-serialize.js | 2 ++ 4 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 build/build-develop-addons.bat diff --git a/build/build-develop-addons.bat b/build/build-develop-addons.bat new file mode 100644 index 0000000000..209a847df2 --- /dev/null +++ b/build/build-develop-addons.bat @@ -0,0 +1,8 @@ +CD /D %~dp0 +call npm install -g grunt-cli +call npm install + +call grunt --level=WHITESPACE_ONLY --addon=sdkjs-forms --addon=sdkjs-ooxml +call grunt develop --addon=sdkjs-forms --addon=sdkjs-ooxml + +pause \ No newline at end of file diff --git a/configs/draw.json b/configs/draw.json index 45dc273d0e..6abd5f5cee 100644 --- a/configs/draw.json +++ b/configs/draw.json @@ -11,12 +11,21 @@ "common/docscoapi.js", "common/spellcheckapi.js", "common/apiCommon.js", + "common/SerializeCommonWordExcel.js", "vendor/string.js", "vendor/array.js", "common/editorscommon.js", + "common/HistoryCommon.js", + "common/TableId.js", + "common/TableIdChanges.js", "common/libfont/engine.js", "common/libfont/loader.js", + "common/collaborativeHistory.js", + "common/CollaborativeEditingBase.js", + "common/macros.js", "common/apiBase.js", + "common/apiBase_plugins.js", + "common/spell/spell.js", "common/zlib/zlib.js", "draw/api.js" ], @@ -26,7 +35,46 @@ "common/stringserialize.js", "draw/model/VisioDocument.js", - "common/Drawings/Format/Format.js" + "common/libfont/common.js", + "common/libfont/map.js", + "common/libfont/rasterheap.js", + "common/libfont/glyphstring.js", + "common/libfont/character.js", + "common/libfont/grapheme.js", + "common/libfont/textshaper.js", + "common/libfont/file.js", + "common/libfont/manager.js", + + "common/Drawings/Metafile.js", + "common/libfont/textmeasurer.js", + + "word/Editor/History.js", + + "common/Drawings/CommonController.js", + "common/Drawings/States.js", + "common/Drawings/DrawingsChanges.js", + "common/Drawings/Format/Format.js", + "common/Drawings/Format/CreateGeometry.js", + "common/Drawings/Format/Geometry.js", + "common/Drawings/Format/GraphicObjectBase.js", + "common/Drawings/Format/Shape.js", + "common/Drawings/Format/CnxShape.js", + "common/Drawings/Format/Path.js", + "common/Drawings/Format/Image.js", + "common/Drawings/Format/GroupShape.js", + "common/Drawings/Format/Data.js", + "common/Drawings/Format/ChartSpace.js", + "common/Drawings/Format/ChartFormat.js", + "common/Drawings/Format/TextBody.js", + "common/Drawings/Format/GraphicFrame.js", + "common/Charts/DrawingObjects.js", + + "word/Editor/DocumentContentBase.js", + "word/Editor/DocumentContent.js", + + "common/Drawings/Format/OleObject.js", + "common/Drawings/Format/DrawingContent.js" + ], "desktop": { "min": [ diff --git a/draw/model/VisioDocument.js b/draw/model/VisioDocument.js index 3ee9f4d723..8c2f64d60a 100644 --- a/draw/model/VisioDocument.js +++ b/draw/model/VisioDocument.js @@ -37,8 +37,6 @@ // Docs: // VisioDocument_Type complexType: https://learn.microsoft.com/ru-ru/office/client-developer/visio/visiodocument_type-complextypevisio-xml function CVisioDocument(Api, isMainLogicDocument) { - this.Api = Api; - this.start = null; this.key = null; this.metric = null; @@ -68,6 +66,24 @@ this.Pages = null; this.PagesContents = []; this.Theme = null; + + //------------------------------------------------------------------------------------------------------------------ + // Сохраняем ссылки на глобальные объекты + //------------------------------------------------------------------------------------------------------------------ + this.History = History; + this.IdCounter = AscCommon.g_oIdCounter; + this.TableId = AscCommon.g_oTableId; + // this.CollaborativeEditing = (("undefined" !== typeof(AscCommon.CWordCollaborativeEditing) && AscCommon.CollaborativeEditing instanceof AscCommon.CWordCollaborativeEditing) ? AscCommon.CollaborativeEditing : null); + this.Api = Api; + //------------------------------------------------------------------------------------------------------------------ + // Выставляем ссылки на главный класс + //------------------------------------------------------------------------------------------------------------------ + if (false !== isMainLogicDocument) + { + // if (this.History) + // this.History.Set_LogicDocument(this); + } + this.MainDocument = false !== isMainLogicDocument; } @@ -294,9 +310,14 @@ //-------------------------------------------------------------export--------------------------------------------------- - window['AscCommonDraw'] = window['AscCommonDraw'] || {}; - window['AscCommonWord'] = window['AscCommonWord'] || {}; - window['AscFormat'] = window['AscFormat'] || {}; + window['Asc'] = window['Asc'] || {}; + window['AscCommon'] = window['AscCommon'] || {}; + window['AscCommonWord'] = window['AscCommonWord'] || {}; + window['AscCommonSlide'] = window['AscCommonSlide'] || {}; + window['AscCommonExcel'] = window['AscCommonExcel'] || {}; + window['AscCommonDraw'] = window['AscCommonDraw'] || {}; + window['AscFormat'] = window['AscFormat'] || {}; + window['AscWord'] = window['AscWord'] || {}; window['AscCommonDraw'].CVisioDocument = CVisioDocument; window['AscCommonDraw'].CWindows = CWindows; diff --git a/tests/draw/serialize/sax-serialize.js b/tests/draw/serialize/sax-serialize.js index 5dc454c816..d6ce1cd4ef 100644 --- a/tests/draw/serialize/sax-serialize.js +++ b/tests/draw/serialize/sax-serialize.js @@ -36,6 +36,8 @@ $(function() { var api = new Asc.asc_draw_api({ 'id-view': 'editor_sdk' }); + AscCommon.g_oTableId.init() + //todo events setTimeout(startTests, 3000);