From 591eaa28c5c94b11b34d4e695bae6ac85db97827 Mon Sep 17 00:00:00 2001 From: Yu Zhu <891085309@qq.com> Date: Mon, 3 Apr 2023 05:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20replace=20dialog=20with=20t?= =?UTF-8?q?oast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Menu/index.tsx | 7 +------ src/editor.ts | 11 ----------- src/environments/online/helper.ts | 16 ++++++++++++++++ src/locales/de.json | 3 ++- src/locales/sp.json | 3 ++- src/locales/zh-CN.json | 3 ++- src/locales/zh-HK.json | 3 ++- src/locales/zh-TW.json | 3 ++- vite.config.ts | 2 +- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index 2a6e092..4e99050 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -75,12 +75,7 @@ const MenubarDemo: React.FC<{ { - const url = editor.GenerateSceneURL() - ShowDialog({ - title: 'URL', - description: url, - button: 'OK', - }) + helper.GenerateSceneURL() }} > {i18n.t('Generate Scene URL')} diff --git a/src/editor.ts b/src/editor.ts index 46e07fa..baa4367 100644 --- a/src/editor.ts +++ b/src/editor.ts @@ -1471,17 +1471,6 @@ void main() { } } - GenerateSceneURL() { - try { - const d = encodeURIComponent(JSON.stringify(this.GetSceneData())) - const url_base = location.href.replace(/#$/, '') - return `${url_base}#${d}` - } catch (error) { - console.error(error) - } - return null - } - ClearScene() { this.scene.children .filter((o) => o?.name === 'torso') diff --git a/src/environments/online/helper.ts b/src/environments/online/helper.ts index bd64e15..5ff8b92 100644 --- a/src/environments/online/helper.ts +++ b/src/environments/online/helper.ts @@ -83,6 +83,22 @@ export class Helper { return null } } + + async GenerateSceneURL() { + try { + const d = encodeURIComponent( + JSON.stringify(this.editor.GetSceneData()) + ) + const url_base = location.href.replace(/#$/, '') + const url = `${url_base}#${d}` + await navigator.clipboard.writeText(url) + ShowToast({ title: i18n.t('Copied to Clipboard') }) + } catch (error) { + Oops(error) + console.error(error) + } + } + async SetRandomPose() { const body = await this.editor.GetBodyToSetPose() if (!body) { diff --git a/src/locales/de.json b/src/locales/de.json index 608352d..9046eb1 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -60,5 +60,6 @@ "Lock View": "Ansicht sperren", "Unlock View": "Ansicht entsperren", "Copy Keypoint Data": "Schlüsselpunktdaten kopieren", - "Copied to Clipboard": "In die Zwischenablage kopiert" + "Copied to Clipboard": "In die Zwischenablage kopiert", + "Generate Scene URL": "Szene-URL generieren" } diff --git a/src/locales/sp.json b/src/locales/sp.json index a11ed4f..92f92d5 100644 --- a/src/locales/sp.json +++ b/src/locales/sp.json @@ -60,5 +60,6 @@ "Lock View": "Bloquear vista", "Unlock View": "Desbloquear vista", "Copy Keypoint Data": "Copiar datos del punto clave", - "Copied to Clipboard": "Copiado al portapapeles" + "Copied to Clipboard": "Copiado al portapapeles", + "Generate Scene URL": "Generar URL de escena" } diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index 5b67557..34e8c73 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -60,5 +60,6 @@ "Lock View": "锁定视图", "Unlock View": "解除锁定视图", "Copy Keypoint Data": "复制关键点数据", - "Copied to Clipboard": "已复制到剪贴板" + "Copied to Clipboard": "已复制到剪贴板", + "Generate Scene URL": "生成场景URL" } diff --git a/src/locales/zh-HK.json b/src/locales/zh-HK.json index a36d449..f3cf424 100644 --- a/src/locales/zh-HK.json +++ b/src/locales/zh-HK.json @@ -60,5 +60,6 @@ "Lock View": "鎖定視圖", "Unlock View": "解鎖視圖", "Copy Keypoint Data": "複製關鍵點數據", - "Copied to Clipboard": "已複製到剪貼板" + "Copied to Clipboard": "已複製到剪貼板", + "Generate Scene URL": "生成場景URL" } diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json index 0728dc7..8377be2 100644 --- a/src/locales/zh-TW.json +++ b/src/locales/zh-TW.json @@ -60,5 +60,6 @@ "Lock View": "鎖定視圖", "Unlock View": "解鎖視圖", "Copy Keypoint Data": "複製關鍵點數據", - "Copied to Clipboard": "已複製到剪貼板" + "Copied to Clipboard": "已複製到剪貼板", + "Generate Scene URL": "生成場景URL" } diff --git a/vite.config.ts b/vite.config.ts index 4e8efda..cff34bc 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -42,7 +42,7 @@ const config: UserConfigFn = ({ command, mode, ssrBuild }) => { base: mode === 'singlefile' ? './' : '/open-pose-editor/', define: { global: {}, - __APP_VERSION__: JSON.stringify('0.1.7'), + __APP_VERSION__: JSON.stringify('0.1.8'), __APP_BUILD_TIME__: Date.now(), }, build: {