From 0d30fa45d5207a3df73ccfbea7f28dde1862c0e9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 17:27:23 +0700 Subject: [PATCH 01/10] add cicd --- .forgejo/workflows/build.yml | 50 ++++++++++++++++++++++++++++ .forgejo/workflows/ci-cd.yml | 61 +++++++++++++++++++++++++++++++++++ .forgejo/workflows/deploy.yml | 29 +++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 .forgejo/workflows/build.yml create mode 100644 .forgejo/workflows/ci-cd.yml create mode 100644 .forgejo/workflows/deploy.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..e63417a --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,50 @@ +# /.forgejo/workflows/build.yml +name: Build + +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+*" + workflow_dispatch: + +env: + REGISTRY: ${{ vars.CONTAINER_REGISTRY }} + REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} + CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} + IMAGE_VERSION: build + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + config-inline: | + [registry."${{ env.REGISTRY }}"] + ca=["/etc/ssl/certs/ca-certificates.crt"] + - name: Tag Version + run: | + if [[ "${{ github.event_name }}" == "push" ]]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/v//g' >> $GITHUB_ENV + else + echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV + fi + - name: Login in to registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ env.REGISTRY_USERNAME }} + password: ${{ env.REGISTRY_PASSWORD }} + - name: Build and push docker image + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64 + context: . + file: ./docker/Dockerfile + tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} + push: true diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml new file mode 100644 index 0000000..1325d34 --- /dev/null +++ b/.forgejo/workflows/ci-cd.yml @@ -0,0 +1,61 @@ +# /.forgejo/workflows/build.yml +name: Build + +on: + push: + tags: + - "dev[0-9]+.[0-9]+.[0-9]+" + - "dev[0-9]+.[0-9]+.[0-9]+*" + workflow_dispatch: + +env: + REGISTRY: ${{ vars.CONTAINER_REGISTRY }} + REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} + CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} + IMAGE_VERSION: build + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + config-inline: | + [registry."${{ env.REGISTRY }}"] + ca=["/etc/ssl/certs/ca-certificates.crt"] + - name: Tag Version + run: | + if [[ "${{ github.event_name }}" == "push" ]]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/dev//g' >> $GITHUB_ENV + else + echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV + fi + - name: Login in to registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ env.REGISTRY_USERNAME }} + password: ${{ env.REGISTRY_PASSWORD }} + - name: Build and push docker image + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64 + context: . + file: ./docker/Dockerfile + tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} + push: true + - name: Remote Deploy + uses: appleboy/ssh-action@v1.2.1 + with: + host: ${{ vars.SSH_DEPLOY_HOST }} + port: ${{ vars.SSH_DEPLOY_PORT }} + username: ${{ secrets.SSH_DEPLOY_USER }} + password: ${{ secrets.SSH_DEPLOY_PASSWORD }} + script: | + cd ~/repo + ./replace-env.sh APP_USER "${{ env.IMAGE_VERSION }}" + ./deploy.sh hrms-user diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..900559d --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,29 @@ +name: Build + +on: + workflow_dispatch: + inputs: + version: + description: "Version to deploy" + type: string + required: false + default: "latest" + +env: + IMAGE_VERSION: build + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Remote Deploy + uses: appleboy/ssh-action@v1.2.1 + with: + host: ${{ vars.SSH_DEPLOY_HOST }} + port: ${{ vars.SSH_DEPLOY_PORT }} + username: ${{ secrets.SSH_DEPLOY_USER }} + password: ${{ secrets.SSH_DEPLOY_PASSWORD }} + script: | + cd ~/repo + ./replace-env.sh APP_USER "${{ inputs.version }}" + ./deploy.sh hrms-user From 280e67042bbf82805b75bc12edb80636b045508f Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 15 Sep 2025 17:30:20 +0700 Subject: [PATCH 02/10] fix tag cicd --- .forgejo/workflows/ci-cd.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 1325d34..8532fae 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -3,9 +3,8 @@ name: Build on: push: - tags: - - "dev[0-9]+.[0-9]+.[0-9]+" - - "dev[0-9]+.[0-9]+.[0-9]+*" + branches: + - dev workflow_dispatch: env: @@ -29,11 +28,7 @@ jobs: ca=["/etc/ssl/certs/ca-certificates.crt"] - name: Tag Version run: | - if [[ "${{ github.event_name }}" == "push" ]]; then - echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/dev//g' >> $GITHUB_ENV - else - echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV - fi + echo "IMAGE_VERSION=latest" >> $GITHUB_ENV - name: Login in to registry uses: docker/login-action@v2 with: From 957e4c65c07239270737e550dc5fafc85b0db347 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 16 Sep 2025 10:59:05 +0700 Subject: [PATCH 03/10] fix --- .forgejo/workflows/ci-cd.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 8532fae..ae78569 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -1,5 +1,5 @@ # /.forgejo/workflows/build.yml -name: Build +name: Build & Deploy on: push: @@ -13,6 +13,7 @@ env: REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} IMAGE_VERSION: build + DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }} jobs: build: @@ -54,3 +55,11 @@ jobs: cd ~/repo ./replace-env.sh APP_USER "${{ env.IMAGE_VERSION }}" ./deploy.sh hrms-user + - name: Discord Notification + if: always() + run: | + STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" + COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" + curl -H "Content-Type: application/json" -X POST \ + -d "{\"embeds\":[{\"title\":\"$STATUS\",\"description\":\"Build & Deploy Image: \`${{env.CONTAINER_IMAGE_NAME}}:${{env.IMAGE_VERSION}}\`\nBy: \`${{gitea.actor}}\`\",\"color\":$COLOR}]}" \ + ${{ env.DISCORD_WEBHOOK }} From 9a4f5b5d2707522d9e6d56d850dd69f354621ece Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 16 Sep 2025 11:12:23 +0700 Subject: [PATCH 04/10] fix noti --- .forgejo/workflows/build.yml | 20 ++++++++++++++++++++ .forgejo/workflows/ci-cd.yml | 16 ++++++++++++++-- .forgejo/workflows/deploy.yml | 20 ++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e63417a..4e9f557 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -48,3 +48,23 @@ jobs: file: ./docker/Dockerfile tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} push: true + - name: Discord Notification + if: always() + run: | + STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" + COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" + curl -H "Content-Type: application/json" \ + -X POST \ + -d '{ + "embeds": [{ + "title": $STATUS, + "description": "**Build:**\n- Image: `${{env.CONTAINER_IMAGE_NAME}}`\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", + "color": $COLOR, + "footer": { + "text": "Release Notification", + "icon_url": "https://example.com/success-icon.png" + }, + "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + }] + }' \ + ${{ env.DISCORD_WEBHOOK }} diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index ae78569..1666adf 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -60,6 +60,18 @@ jobs: run: | STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" - curl -H "Content-Type: application/json" -X POST \ - -d "{\"embeds\":[{\"title\":\"$STATUS\",\"description\":\"Build & Deploy Image: \`${{env.CONTAINER_IMAGE_NAME}}:${{env.IMAGE_VERSION}}\`\nBy: \`${{gitea.actor}}\`\",\"color\":$COLOR}]}" \ + curl -H "Content-Type: application/json" \ + -X POST \ + -d '{ + "embeds": [{ + "title": $STATUS, + "description": "**Build & Deploy:**\n- Image: `${{env.CONTAINER_IMAGE_NAME}}`\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", + "color": $COLOR, + "footer": { + "text": "Release Notification", + "icon_url": "https://example.com/success-icon.png" + }, + "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + }] + }' \ ${{ env.DISCORD_WEBHOOK }} diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 900559d..19e43d9 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -27,3 +27,23 @@ jobs: cd ~/repo ./replace-env.sh APP_USER "${{ inputs.version }}" ./deploy.sh hrms-user + - name: Discord Notification + if: always() + run: | + STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" + COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" + curl -H "Content-Type: application/json" \ + -X POST \ + -d '{ + "embeds": [{ + "title": $STATUS, + "description": "**Deploy APP_USER**\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", + "color": $COLOR, + "footer": { + "text": "Release Notification", + "icon_url": "https://example.com/success-icon.png" + }, + "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + }] + }' \ + ${{ env.DISCORD_WEBHOOK }} From e9207c90fa122842589d99229054f275fe06b62c Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 16 Sep 2025 11:33:11 +0700 Subject: [PATCH 05/10] fix cicd --- .forgejo/workflows/build.yml | 20 -------------------- .forgejo/workflows/ci-cd.yml | 30 ++++++++++++++++-------------- .forgejo/workflows/deploy.yml | 20 -------------------- 3 files changed, 16 insertions(+), 54 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 4e9f557..e63417a 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -48,23 +48,3 @@ jobs: file: ./docker/Dockerfile tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }} push: true - - name: Discord Notification - if: always() - run: | - STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" - COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": $STATUS, - "description": "**Build:**\n- Image: `${{env.CONTAINER_IMAGE_NAME}}`\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", - "color": $COLOR, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ env.DISCORD_WEBHOOK }} diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 1666adf..68306d3 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -1,5 +1,5 @@ -# /.forgejo/workflows/build.yml -name: Build & Deploy +# /.forgejo/workflows/ci-cd.yml +name: Build & Deploy on Dev on: push: @@ -12,7 +12,7 @@ env: REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }} - IMAGE_VERSION: build + IMAGE_VERSION: latest DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }} jobs: @@ -29,7 +29,7 @@ jobs: ca=["/etc/ssl/certs/ca-certificates.crt"] - name: Tag Version run: | - echo "IMAGE_VERSION=latest" >> $GITHUB_ENV + echo "IMAGE_VERSION=latest" - name: Login in to registry uses: docker/login-action@v2 with: @@ -55,23 +55,25 @@ jobs: cd ~/repo ./replace-env.sh APP_USER "${{ env.IMAGE_VERSION }}" ./deploy.sh hrms-user + - name: Discord Notification if: always() run: | STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" + TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ) curl -H "Content-Type: application/json" \ -X POST \ - -d '{ - "embeds": [{ - "title": $STATUS, - "description": "**Build & Deploy:**\n- Image: `${{env.CONTAINER_IMAGE_NAME}}`\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", - "color": $COLOR, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" + -d "{ + \"embeds\": [{ + \"title\": \"$STATUS\", + \"description\": \"**Build & Deploy**\\n- Image: \`${{ env.CONTAINER_IMAGE_NAME }}\`\\n- Version: \`${{ env.IMAGE_VERSION }}\`\\n- By: \`${{ github.actor }}\`\", + \"color\": $COLOR, + \"footer\": { + \"text\": \"Release Notification\", + \"icon_url\": \"https://example.com/success-icon.png\" }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + \"timestamp\": \"$TIMESTAMP\" }] - }' \ + }" \ ${{ env.DISCORD_WEBHOOK }} diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 19e43d9..900559d 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -27,23 +27,3 @@ jobs: cd ~/repo ./replace-env.sh APP_USER "${{ inputs.version }}" ./deploy.sh hrms-user - - name: Discord Notification - if: always() - run: | - STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}" - COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}" - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": $STATUS, - "description": "**Deploy APP_USER**\n- Version: `${{ env.IMAGE_VERSION }}`\n- Deployed by: `${{gitea.actor}}`", - "color": $COLOR, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ env.DISCORD_WEBHOOK }} From c5de1286d2e61822ebd7bd49f0dc84b1ad853f62 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 9 Feb 2026 16:38:40 +0700 Subject: [PATCH 06/10] fix:test --- src/plugins/genreport.ts | 62 ++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/src/plugins/genreport.ts b/src/plugins/genreport.ts index d26eb62..d4e3018 100644 --- a/src/plugins/genreport.ts +++ b/src/plugins/genreport.ts @@ -20,33 +20,65 @@ async function genReport(data: any, fileName: string, type: string = "docx") { responseType: "arraybuffer", }) .then((res) => { - const data = res.data; - if (data) { - // สร้าง Blob จาก array buffer - const blob = new Blob([data], { - type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - }); + // const data = res.data; + // if (data) { + // // สร้าง Blob จาก array buffer + // const blob = new Blob([data], { + // type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + // }); - // สร้าง URL สำหรับไฟล์ Blob + // // สร้าง URL สำหรับไฟล์ Blob + // const url = URL.createObjectURL(blob); + + // // 1. ตัดนามสกุลเดิมที่ติดมากับ fileName ออก (ถ้ามี) + // const baseName = fileName.replace(/\.[^/.]+$/, ""); + + // // 2. กำหนดนามสกุลใหม่ตามเงื่อนไข + // const extension = type === "docx" ? "docx" : "pdf"; + + // // สร้างลิงก์เพื่อดาวน์โหลดไฟล์ + // const link = document.createElement("a"); + // link.href = url; + // link.download = `${baseName}.${extension}`; + // // link.download = `${fileName}.${type === "docx" ? "docx" : "pdf"}`; // กำหนดชื่อไฟล์ที่จะดาวน์โหลด + // document.body.appendChild(link); + // link.click(); + + // // ลบ URL ที่สร้างขึ้นหลังจากใช้งาน + // URL.revokeObjectURL(url); + + const responseData = res.data; + if (responseData) { + // --- ส่วนที่ปรับปรุง 1: กำหนด MIME Type ให้ตรงกับไฟล์ที่รับมาจริง --- + const mimeType = + type === "docx" + ? "application/vnd.openxmlformats-officedocument.wordprocessingml.document" + : "application/pdf"; + + const blob = new Blob([responseData], { type: mimeType }); const url = URL.createObjectURL(blob); - // 1. ตัดนามสกุลเดิมที่ติดมากับ fileName ออก (ถ้ามี) - const baseName = fileName.replace(/\.[^/.]+$/, ""); - - // 2. กำหนดนามสกุลใหม่ตามเงื่อนไข + // --- ส่วนที่ปรับปรุง 2: จัดการชื่อไฟล์ (ป้องกันนามสกุลซ้อน) --- + // ตัดช่องว่างหัวท้าย และตัดนามสกุลไฟล์เดิมที่อาจติดมาออก (.pdf, .docx ฯลฯ) + const baseName = fileName.trim().replace(/\.[^/.]+$/, ""); const extension = type === "docx" ? "docx" : "pdf"; - // สร้างลิงก์เพื่อดาวน์โหลดไฟล์ const link = document.createElement("a"); link.href = url; link.download = `${baseName}.${extension}`; - // link.download = `${fileName}.${type === "docx" ? "docx" : "pdf"}`; // กำหนดชื่อไฟล์ที่จะดาวน์โหลด + + // --- ส่วนที่ปรับปรุง 3: สำหรับ Android/Mobile --- + // บางครั้งการ click() ทันทีอาจถูก block หรือมีปัญหา ต้อง append เข้าไปจริงๆ document.body.appendChild(link); link.click(); - // ลบ URL ที่สร้างขึ้นหลังจากใช้งาน - URL.revokeObjectURL(url); + // หน่วงเวลาเล็กน้อยก่อนลบ element และ revoke URL เพื่อให้ Browser ทำงานเสร็จ + setTimeout(() => { + document.body.removeChild(link); + URL.revokeObjectURL(url); + }, 100); } + // } }) .catch((err) => { console.log(err); From 38436e7e3326050f607d087561ed6fdfa607f467 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 5 Mar 2026 15:13:54 +0700 Subject: [PATCH 07/10] fix: build on tag --- .forgejo/workflows/build.yml | 12 ++++++------ .forgejo/workflows/ci-cd.yml | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e63417a..ad4cf7e 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,12 +1,12 @@ # /.forgejo/workflows/build.yml name: Build -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+*" - workflow_dispatch: +# on: +# push: +# tags: +# - "v[0-9]+.[0-9]+.[0-9]+" +# - "v[0-9]+.[0-9]+.[0-9]+*" +# workflow_dispatch: env: REGISTRY: ${{ vars.CONTAINER_REGISTRY }} diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 68306d3..0647741 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -3,8 +3,11 @@ name: Build & Deploy on Dev on: push: - branches: - - dev + # branches: + # - dev + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+*" workflow_dispatch: env: From 4f5c05a3f8f91ca322b30082df79904ca845e5d1 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 6 Mar 2026 23:55:13 +0700 Subject: [PATCH 08/10] fix build --- .forgejo/workflows/ci-cd.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index 0647741..faae94a 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -30,9 +30,14 @@ jobs: config-inline: | [registry."${{ env.REGISTRY }}"] ca=["/etc/ssl/certs/ca-certificates.crt"] + - name: Tag Version - name: Tag Version run: | - echo "IMAGE_VERSION=latest" + if [ "${{ github.ref_type }}" == "tag" ]; then + echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV + else + echo "IMAGE_VERSION=latest" >> $GITHUB_ENV + fi - name: Login in to registry uses: docker/login-action@v2 with: From c44086b4bcc486ee26b5f3984da82e7f558ed56f Mon Sep 17 00:00:00 2001 From: nice Date: Wed, 25 Mar 2026 13:51:42 +0700 Subject: [PATCH 09/10] Update .forgejo/workflows/ci-cd.yml --- .forgejo/workflows/ci-cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml index faae94a..e36d2e3 100644 --- a/.forgejo/workflows/ci-cd.yml +++ b/.forgejo/workflows/ci-cd.yml @@ -30,7 +30,6 @@ jobs: config-inline: | [registry."${{ env.REGISTRY }}"] ca=["/etc/ssl/certs/ca-certificates.crt"] - - name: Tag Version - name: Tag Version run: | if [ "${{ github.ref_type }}" == "tag" ]; then From 3d34b2ab9acd1b048a1d14ee16a7a7c833dcbf84 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 30 Jun 2026 11:25:43 +0700 Subject: [PATCH 10/10] refactor(registry): show salary data --- src/modules/10_registry/02_Government/07_Position.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue index f981efb..639431b 100644 --- a/src/modules/10_registry/02_Government/07_Position.vue +++ b/src/modules/10_registry/02_Government/07_Position.vue @@ -491,7 +491,7 @@ onMounted(async () => { - + - +