From 7543a409678c5c1746e359a7ee6c27583a666f86 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 25 Feb 2026 09:51:57 +0700 Subject: [PATCH] fix(organization): Export Chart --- package.json | 5 +- src/plugins/exportChart.ts | 170 +++++++++++++++++++++++++++---------- 2 files changed, 126 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index f6919af12..6e2ddd2c2 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "arcgis-js-api": "^4.28.10", "axios": "^1.6.7", "bma-org-chart": "^0.0.8", - "dom-to-image-more": "^3.6.0", "esri-loader": "^3.7.0", + "html-to-image": "^1.11.13", "keycloak-js": "^20.0.2", "moment": "^2.29.4", "pdf-lib": "^1.17.1", @@ -61,11 +61,10 @@ "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-vue": "^9.3.0", "jsdom": "^20.0.3", - "node-sass": "^9.0.0", "npm-run-all": "^4.1.5", "prettier": "^2.7.1", "quasar-ui-q-draggable-table": "^1.0.1", - "sass": "^1.69.4", + "sass": "^1.97.3", "start-server-and-test": "^1.15.2", "typescript": "~4.7.4", "vite": "^4.0.0", diff --git a/src/plugins/exportChart.ts b/src/plugins/exportChart.ts index 31ea0ff26..0c707614a 100644 --- a/src/plugins/exportChart.ts +++ b/src/plugins/exportChart.ts @@ -1,6 +1,6 @@ -import domtoimage from "dom-to-image-more"; +import * as htmlToImage from "html-to-image"; import { PDFDocument } from "pdf-lib"; - +C /** ฟังก์ชันสำหรับแสดง loading spinner */ export function showLoadingSpinner() { const loading = document.createElement("div"); @@ -10,11 +10,16 @@ export function showLoadingSpinner() { loading.style.left = "0"; loading.style.width = "100vw"; loading.style.height = "100vh"; - loading.style.background = "rgba(0,0,0,0.2)"; + + // ปรับให้มืดขึ้น (0.6) และเพิ่มการเบลอฉากหลัง (blur) + loading.style.background = "rgba(0, 0, 0, 0.6)"; + loading.style.backdropFilter = "blur(4px)"; + loading.style.display = "flex"; loading.style.alignItems = "center"; loading.style.justifyContent = "center"; - loading.style.zIndex = "9999"; + loading.style.zIndex = "99999"; + loading.innerHTML = `
- + animation: spin 1s linear infinite;"> +
+