From 025e173cd3a0dc73252c3c96aea60a1156fa099c Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Tue, 5 Mar 2024 19:54:57 +0800 Subject: [PATCH 1/3] chore: update translation --- packages/illa-public-component | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/illa-public-component b/packages/illa-public-component index 83ebe611cb..7c401dcb94 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit 83ebe611cbc67bc8bb4b9d141176577f55cfe1c9 +Subproject commit 7c401dcb94174698e2eb10db7e1b42b54c640ef3 From 18d78c9df430c567f650b738701aa21396fa4a58 Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:40:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E2=9C=A8=20update=20env=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/builder/index.html | 5 ++++- apps/builder/src/main.tsx | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/builder/index.html b/apps/builder/index.html index 83f70d9705..cc29762940 100644 --- a/apps/builder/index.html +++ b/apps/builder/index.html @@ -53,7 +53,10 @@ async function validateCustomDomain() { const origin = location.origin - if (origin !== "%ILLA_BUILDER_URL%") { + if ( + "%ILLA_INSTANCE_ID%" === "CLOUD" && + origin !== "%ILLA_BUILDER_URL%" + ) { window.customDomain = location.host try { const response = await fetch( diff --git a/apps/builder/src/main.tsx b/apps/builder/src/main.tsx index 286ca948a7..961e45f6d0 100644 --- a/apps/builder/src/main.tsx +++ b/apps/builder/src/main.tsx @@ -1,5 +1,5 @@ import { ILLAMixpanel } from "@illa-public/mixpanel-utils" -import { initDateReport, initDayjs, isCloudVersion } from "@illa-public/utils" +import { initDateReport, initDayjs } from "@illa-public/utils" import { LicenseInfo } from "@mui/x-data-grid-premium" import * as Sentry from "@sentry/react" import { StrictMode } from "react" @@ -34,7 +34,7 @@ if ( }) } -if (isCloudVersion) { +if (import.meta.env.ILLA_MUI_LICENSE) { LicenseInfo.setLicenseKey(import.meta.env.ILLA_MUI_LICENSE) } From f58ecc6444d75b7e14ef4794eaf8591e85abc059 Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:42:52 +0800 Subject: [PATCH 3/3] chore: update package --- apps/builder/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/builder/package.json b/apps/builder/package.json index 7a7cc3c9ac..7fe2727f23 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -5,7 +5,7 @@ "private": true, "author": "ILLA Cloud ", "license": "Apache-2.0", - "version": "4.5.15", + "version": "4.5.16", "scripts": { "dev": "vite --strictPort --force", "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud",