Skip to content

Commit 2af5f2e

Browse files
committed
Merge branch 'sunxianfu' into 'dev'
feat: 修复标题问题 See merge request cooperation/vscode-rt-smart!4
2 parents b635a1f + 4d5b25a commit 2af5f2e

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

src/vue/components/Banner.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export interface BannerProps {
1717
version?: string
1818
}
1919
20-
const extentionName = ref(localStorage.getItem('extentionName') || 'RT-Thread 扩展工具')
21-
const extentionVersion = ref(localStorage.getItem('extentionVersion') || '版本 v1.0.1')
20+
const extentionName = ref('')
21+
const extentionVersion = ref('')
2222
2323
const props = withDefaults(defineProps<BannerProps>(), {
2424
subTitle: '',
@@ -28,8 +28,6 @@ const props = withDefaults(defineProps<BannerProps>(), {
2828
window.addEventListener('message', (e) => {
2929
e.data.name && (extentionName.value = `扩展工具 - ${props.subTitle}`)
3030
e.data.version && (extentionVersion.value = e.data.version)
31-
localStorage.setItem('extentionName', extentionName.value)
32-
localStorage.setItem('extentionVersion', extentionVersion.value)
3331
})
3432
</script>
3533

src/webviews/about.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export function openAboutWebview(context: vscode.ExtensionContext) {
3838
const rootDir = path.join(context.extensionPath, 'out');
3939
const panel = vscode.window.createWebviewPanel('webview', title, vscode.ViewColumn.One, {
4040
enableScripts: true, // Enable javascript in the webview
41+
retainContextWhenHidden: true, // Keep the webview's context when it is hidden
4142
localResourceRoots: [vscode.Uri.file(rootDir)] // Only allow resources from vue view
4243
});
4344
const iconPath = path.join(context.extensionPath, 'resources', 'images', 'rt-thread.png');

src/webviews/create-project.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export function openCreateProjectWebview(context: vscode.ExtensionContext) {
5656
const rootDir = path.join(context.extensionPath, 'out');
5757
const panel = vscode.window.createWebviewPanel('webview', title, vscode.ViewColumn.One, {
5858
enableScripts: true, // Enable javascript in the webview
59+
retainContextWhenHidden: true, // Keep the webview's context when it is hidden
5960
localResourceRoots: [vscode.Uri.file(rootDir)] // Only allow resources from vue view
6061
});
6162

src/webviews/project.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export function openWorkspaceProjectsWebview(context: vscode.ExtensionContext) {
9898
const rootDir = path.join(context.extensionPath, 'out');
9999
const panel = vscode.window.createWebviewPanel('webview', title, vscode.ViewColumn.One, {
100100
enableScripts: true, // Enable javascript in the webview
101+
retainContextWhenHidden: true, // Keep the webview's context when it is hidden
101102
localResourceRoots: [vscode.Uri.file(rootDir)] // Only allow resources from vue view
102103
});
103104
const iconPath = path.join(context.extensionPath, 'resources', 'images', 'rt-thread.png');

src/webviews/setting.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export function openSettingWebview(context: vscode.ExtensionContext) {
206206
if (e.webviewPanel.visible) {
207207
panel.webview.postMessage({command: 'extensionInfo', data: extensionInfo});
208208
}
209-
})
209+
});
210210

211211
settingViewPanel = panel;
212212
}

0 commit comments

Comments
 (0)