From d92616d785187c483dcdda610ad5a81e83c369e8 Mon Sep 17 00:00:00 2001 From: ChenX Date: Thu, 27 Jun 2019 21:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0saveas=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/Save.ts | 10 ++++++++++ src/Common/SerializeMaterial.ts | 23 ----------------------- src/Editor/CommandRegister.ts | 6 ++++-- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/Add-on/Save.ts b/src/Add-on/Save.ts index 0dbad9b19..bba60fc54 100644 --- a/src/Add-on/Save.ts +++ b/src/Add-on/Save.ts @@ -1,4 +1,5 @@ import { app } from '../ApplicationServices/Application'; +import { FileSystem } from '../Common/FileSystem'; import { ImgsUrl } from '../Common/HostUrl'; import { Post, RequestStatus } from '../Common/Request'; import { dataURItoBlob, deflate } from '../Common/SerializeMaterial'; @@ -75,3 +76,12 @@ export class New implements Command } } } + +export class SaveAs implements Command +{ + async exec() + { + let fileData = app.FileOut().Data; + FileSystem.WriteFile("临时.json", JSON.stringify(fileData)); + } +} diff --git a/src/Common/SerializeMaterial.ts b/src/Common/SerializeMaterial.ts index ba3efe9aa..a4a5547d9 100644 --- a/src/Common/SerializeMaterial.ts +++ b/src/Common/SerializeMaterial.ts @@ -51,29 +51,6 @@ export function inflate(data: string) return nd; } -function stringToUint8Array(str: string) -{ - let encodeStr = encodeURI(str); - let arr = []; - for (let i = 0; i < encodeStr.length; i++) - { - arr.push(encodeStr.charCodeAt(i)); - } - - return new Uint8Array(arr); -} - -function Uint8ArrayToString(fileData: number[]) -{ - var dataString = ""; - for (var i = 0; i < fileData.length; i++) - { - dataString += String.fromCharCode(fileData[i]); - } - - return decodeURI(dataString); -} - export function dataURItoBlob(dataURI: string) { // convert base64 to raw binary data held in a string diff --git a/src/Editor/CommandRegister.ts b/src/Editor/CommandRegister.ts index d2367ec75..f63ddd00b 100644 --- a/src/Editor/CommandRegister.ts +++ b/src/Editor/CommandRegister.ts @@ -32,6 +32,7 @@ import { DrawTopBottomBoard } from '../Add-on/DrawBoard/DrawTopBottomBoard'; import { DrawVerticalBoard } from '../Add-on/DrawBoard/DrawVerticalBoard'; import { DrawCircle } from "../Add-on/DrawCircle"; import { DrawCylineder } from '../Add-on/DrawCylinder'; +import { Command_AutoDimBrs } from '../Add-on/DrawDim/AutoDimBrs'; import { Command_DimContinue } from '../Add-on/DrawDim/Command_DimContinue'; import { Command_Draw2LineAngularDim } from '../Add-on/DrawDim/Draw2LineAngularDim'; import { DrawAlignedDimension } from '../Add-on/DrawDim/DrawAlignedDimension'; @@ -89,7 +90,7 @@ import { Command_PLTest } from '../Add-on/polytest'; import { Command_RevPl } from '../Add-on/RevPl'; import { Command_Rotate } from '../Add-on/Rotate'; import { RotateLayerBoard } from '../Add-on/RotateLayerBoard'; -import { New, Save } from '../Add-on/Save'; +import { New, Save, SaveAs } from '../Add-on/Save'; import { Command_Scale } from '../Add-on/Scale'; import { Command_Ssget } from '../Add-on/ssget'; import { Stretch } from '../Add-on/Stretch'; @@ -116,7 +117,6 @@ import { CommandServer } from '../DatabaseServices/CommandServer'; import { AutoTempateSizeAction } from '../DatabaseServices/Template/TemplateTest'; import { ICommand } from '../UI/Components/CommandPanel/CommandList'; import { commandMachine } from './CommandMachine'; -import { Command_AutoDimBrs } from '../Add-on/DrawDim/AutoDimBrs'; export function registerCommand() @@ -174,6 +174,8 @@ export function registerCommand() commandMachine.RegisterCommand("show", new Command_ShowAll) commandMachine.RegisterCommand("save", new Save()); + commandMachine.RegisterCommand("saveas", new SaveAs()); + commandMachine.RegisterCommand("new", new New()); commandMachine.RegisterCommand("open", new Open());