Skip to content

Commit

Permalink
fix: 图标移除
Browse files Browse the repository at this point in the history
v1.3.1-sp4


fix: -


fix: 图标移除
  • Loading branch information
youngster-yj committed Jul 2, 2024
1 parent 3a008c2 commit ada8f9c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/yakit-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: wget -O bins/yak_linux_amd64 https://yaklang.oss-accelerate.aliyuncs.com/yak/latest/yak_linux_amd64 && zip ./bins/yak_linux_amd64.zip ./bins/yak_linux_amd64 && rm ./bins/yak_linux_amd64
- name: "Download Yak Engine via wget(Windows)"
id: download-windows-engine
run: wget -O bins/yak_windows_amd64.exe https://yaklang.oss-accelerate.aliyuncs.com/yak/latest/yak_windows_amd64.exe && zip ./bins/yak_windows_amd64.zip ./bins/yak_windows_amd64.exe && rm ./bins/yak_windows_amd64.exe
run: wget -O bins/yak_windows_amd64.exe https://yaklang.oss-cn-beijing.aliyuncs.com/yak/latest/yak_202403271716.exe && zip ./bins/yak_windows_amd64.zip ./bins/yak_windows_amd64.exe && rm ./bins/yak_windows_amd64.exe
- name: "Fetch Latest EngineVersion"
id: fetch-version-engine
run: wget -O bins/engine-version.txt https://yaklang.oss-accelerate.aliyuncs.com/yak/latest/version.txt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {useDebounceFn, useMemoizedFn, useGetState} from "ahooks"
import {getRemoteValue, setRemoteValue} from "@/utils/kv"
import {useStore} from "@/store"
import yakitImg from "@/assets/yakit.jpg"
import telecomLogoSmall from "@/assets/telecom_logo_small.png"
import {API} from "@/services/swagger/resposeType"
import {YakitButton} from "../yakitUI/YakitButton/YakitButton"
import {YakitAutoComplete} from "../yakitUI/YakitAutoComplete/YakitAutoComplete"
Expand Down Expand Up @@ -260,7 +261,7 @@ export const ConfigPrivateDomain: React.FC<ConfigPrivateDomainProps> = React.mem
{enterpriseLogin && (
<div className='login-title-show'>
<div className='icon-box'>
<img src={yakitImg} className='type-icon-img' />
<img src={telecomLogoSmall} className='type-icon-img' />
</div>
<div className='title-box'>四川电信资阳专版企业登录</div>
</div>
Expand Down
12 changes: 7 additions & 5 deletions app/renderer/src/main/src/components/basics/YakitLoading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import {InstallEngine, QuestionModal} from "../layout/update/InstallEngine"
import classNames from "classnames"
import styles from "./yakitLoading.module.scss"
import {getReleaseEditionName, isCommunityEdition, isEnpriTrace, isEnpriTraceAgent} from "@/utils/envfile"
import { RemoteLinkInfo } from "../layout/UILayout"
import { DynamicStatusProps } from "@/store"
import yakitSE from "@/assets/yakitSE.png";
import yakitEE from "@/assets/yakitEE.png";
import telecomLogoSmall from "@/assets/telecom_logo_small.png"

const {ipcRenderer} = window.require("electron")

Expand Down Expand Up @@ -562,12 +564,12 @@ export const YakitLoading: React.FC<YakitLoadingProp> = (props) => {
</div>
}
{/* 便携版 - 启动Logo */}
{
isEnpriTraceAgent()&& <div className={styles["yakit-loading-icon-wrapper"]}>
<div className={styles["white-icon"]}>
<img src={yakitSE} alt="暂无图片" />
{isEnpriTraceAgent() && (
<div className={styles["yakit-loading-icon-wrapper"]}>
<div className={styles["white-icon"]}>
<img src={telecomLogoSmall} alt="暂无图片" />
</div>
</div>
</div>)
}

<div className={styles["yakit-loading-content"]}>
Expand Down
4 changes: 2 additions & 2 deletions multibuilder/electron-builder-se.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ mac:
arch:
- x64
- arm64
icon: "app/assets/yakitselogo.icns"
icon: "app/assets/telecom_logo_small.png"

linux:
artifactName: ${productName}-${version}-linux-amd64.${ext}
Expand Down Expand Up @@ -80,7 +80,7 @@ win:
- target: nsis
arch:
- x64
icon: "app/assets/yakitselogo.ico"
icon: "app/assets/telecom_logo_small.ico"

nsis:
oneClick: false
Expand Down

0 comments on commit ada8f9c

Please sign in to comment.