Merge branch 'sunxianfu' into 'dev'

Sunxianfu

See merge request cooperation/vscode-rt-smart!2

Author: BernardXiong

.gitlab-ci.yml

@@ -0,0 +1,19 @@
+image: node:22
+stages: 
+  - deploy
+
+deploy-job:      # This job runs in the deploy stage.
+  stage: deploy  # It only runs when *both* jobs in the test stage complete successfully.
+  script:
+    - npm config set registry https://registry.npmmirror.com
+    - npm install -g @vscode/vsce
+    - npm install
+    - npm run compile
+    - npm run package:vs
+    - ls ./
+  artifacts:
+    paths:
+      - "*.vsix"  # 所有 .vsix 文件（如 dist/extension.vsix）
+    expire_in: 1 week  # 产物保留 1 周（可选，默认 30 天）
+  environment: production
+  when: manual  # 标记为手动作业

package.json

@@ -176,6 +176,7 @@
         ]
     },
     "scripts": {
+        "package:vs": "vsce package --no-dependencies",
         "vscode:prepublish": "npm run compile",
         "build:vue": "npm run build --workspace=smart-vue",
         "compile": "npm run build:vue && tsc -p ./",

src/extension.ts

@@ -21,6 +21,15 @@ import { initCurrentProject } from './project/cmd';
 
 let _context: vscode.ExtensionContext;
 
+export function postMessageExtensionData(context: vscode.ExtensionContext, panel: vscode.WebviewPanel) {
+    // 获取插件版本号（从 package.json 中读取）
+    const extensionVersion = context.extension.packageJSON.version;
+    const extensionNaeme = context.extension.packageJSON.name;
+    // 例如：version 为 "1.0.0"
+    console.log('插件版本号：', extensionVersion);
+    panel.webview.postMessage({ version: extensionVersion, name: extensionNaeme });
+}
+
 // 有两种模式
 // isRTThreadWorksapce - workspace模式，会定位.vscode/workspace.json文件是否存在，是否启用
 // isRTThread - 项目模式，rtconfig.h文件是否存在
@@ -31,6 +40,11 @@ export async function activate(context: vscode.ExtensionContext) {
 
     _context = context;
 
+    // 获取插件版本号（从 package.json 中读取）
+    const extensionVersion = context.extension.packageJSON.version;
+    // 例如：version 为 "1.0.0"
+    console.log('插件版本号：', extensionVersion);
+
     // init context for isRTThread, isRTThreadWorksapce
     vscode.commands.executeCommand('setContext', 'isRTThread', isRTThread);
     context.workspaceState.update('isRTThread', isRTThread);
@@ -86,12 +100,10 @@ export async function activate(context: vscode.ExtensionContext) {
 
             // register commands
             vscode.commands.registerCommand('extension.executeCommand', (arg1, arg2) => {
-                if (arg1)
-                {
+                if (arg1) {
                     executeCommand(arg1);
                 }
-                if (arg2)
-                {
+                if (arg2) {
                     executeCommand(arg2);
                 }
             });
@@ -100,7 +112,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     // open file
                     vscode.commands.executeCommand('vscode.open', vscode.Uri.file(arg.fn));
                 }
-            })
+            });
         }
     }
 
@@ -123,11 +135,11 @@ export async function activate(context: vscode.ExtensionContext) {
 
     /* initialize dock view always */
     initDockView(context);
-    initExperimentStatusBarItem(context)
+    initExperimentStatusBarItem(context);
 }
 
 function initExperimentStatusBarItem(context: vscode.ExtensionContext) {
-    if (false){
+    if (false) {
         const statusItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 5);
         statusItem.text = '$(beaker) 实验性功能';
         statusItem.tooltip = 'Experimental features';

src/vue/about/App.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <Banner />
+        <Banner sub-title="关于" />
 
         <div class="content_area">
             <div v-html="readmeMarkdown"></div>

src/vue/components/Banner.vue

@@ -2,23 +2,33 @@
   <div class="banner">
     <img src="https://oss-club.rt-thread.org/uploads/20250820/d1558ec1b465f2a3c44646550211a6d5.png" class="logo" />
     <div class="info">
-      <h1>{{ title }}</h1>
-      <p>{{ version }}</p>
+      <h1>{{ extentionName }}</h1>
+      <p>{{ extentionVersion }}</p>
       <div class="bar"></div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
+
 export interface BannerProps {
-  title?: string
+  subTitle?: string
   version?: string
 }
 
-withDefaults(defineProps<BannerProps>(), {
-  title: '扩展工具 - 关于',
+const extentionName = ref('')
+const extentionVersion = ref('')
+
+const props = withDefaults(defineProps<BannerProps>(), {
+  subTitle: '扩展工具 - 关于',
   version: '版本 v1.0.1'
 })
+
+window.addEventListener('message', (e) => {
+  e.data.name && (extentionName.value = `${e.data.name} - ${props.subTitle}`)
+  e.data.version && (extentionVersion.value = e.data.version)
+})
 </script>
 
 <style scoped>

src/vue/create-project/App.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <Banner />
+        <Banner sub-title="创建项目" />
 
         <div class="content_area">
             <div class="body-box">

src/vue/projects/App.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <Banner />
+        <Banner sub-title="项目" />
 
         <div class="content_area">
             <br>

src/vue/setting/view/layout/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="common-layout">
-    <Banner />
+    <Banner sub-title="设置" />
 
       <el-aside>
         <el-menu

src/webviews/about.ts

@@ -3,6 +3,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as marked from 'marked';
 import * as path from 'path';
+import { postMessageExtensionData } from '../extension';
 
 let aboutViewPanel: vscode.WebviewPanel | null = null;
 const name = "about";
@@ -83,5 +84,7 @@ export function openAboutWebview(context: vscode.ExtensionContext) {
         aboutViewPanel = panel;
     }
 
+    postMessageExtensionData(context, aboutViewPanel);
+
     return aboutViewPanel;
 }

src/webviews/create-project.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
 import { getEnvROOT, getExtensionVersion, createProject, readJsonObject, getBoardInfo } from '../api';
+import { postMessageExtensionData } from '../extension';
 
 let createProjectViewPanel: vscode.WebviewPanel | null = null;
 const name = "create-project";
@@ -34,8 +35,8 @@ let extensionInfo = {
 			]
 		}
 	],
-	SDKConfig : {},
-	configInfo : [{name: "RT-Thread", path: "d:/workspace/rt-thread", description: "RT-Thread主干路径"}]
+	SDKConfig: {},
+	configInfo: [{ name: "RT-Thread", path: "d:/workspace/rt-thread", description: "RT-Thread主干路径" }]
 };
 
 function readReadmeFile(fn: string): string {
@@ -146,7 +147,7 @@ export function openCreateProjectWebview(context: vscode.ExtensionContext) {
 					case 'createProject':
 						if (message.args && message.args.length > 0) {
 							const project = message.args[0];
-							
+
 							// 调用创建工程的API - 参数顺序: folder, projectInfo
 							createProject(project.folder, project);
 						}
@@ -178,6 +179,8 @@ export function openCreateProjectWebview(context: vscode.ExtensionContext) {
 			createProjectViewPanel = null;
 		}, null, context.subscriptions);
 	}
+
+	postMessageExtensionData(context, createProjectViewPanel);
 }
 
 export function isCreateProjectWebviewActive(): boolean {