refactor(mac):显示windows窗体(显示最大最小化按钮)

- 在 Mac 系统中添加编辑菜单
- 注释掉全屏和还原菜单项
- 移除无边框窗口设置
- 调整搜索框和表格样式
- 优化设置页面布局

README.md

@@ -10,7 +10,8 @@
 ![扫码_搜索联合传播样式-白色版.png](build/screenshot/%E6%89%AB%E7%A0%81_%E6%90%9C%E7%B4%A2%E8%81%94%E5%90%88%E4%BC%A0%E6%92%AD%E6%A0%B7%E5%BC%8F-%E7%99%BD%E8%89%B2%E7%89%88.png)
 
 ### 📈 交流群
-- QQ交流群2：[点击链接加入群聊【go-stock交流群2】：892666282](https://qm.qq.com/q/5mYiy6Yxh0)
+
+[//]: # (- QQ交流群2：[点击链接加入群聊【go-stock交流群2】：892666282](https://qm.qq.com/q/5mYiy6Yxh0))
 - QQ交流群：[点击链接加入群聊【go-stock交流群】：491605333(定期清理，随缘入群)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0YQ8qD3exahsD4YLNhzQTWe5ssstWC89&authKey=usOMMRFtIQDC%2FYcatHYapcxQbJ7PwXPHK9OypTXWzNjAq%2FRVvQu9bj2lRgb%2BSZ3p&noverify=0&group_code=491605333)
 
 ###  ✨ 简介

app.go

@@ -295,6 +295,13 @@ func (a *App) CheckUpdate() {
 				"content": "版本更新完成,下次重启软件生效.",
 			})
 		}
+	} else {
+		go runtime.EventsEmit(a.ctx, "newsPush", map[string]any{
+			"time":    "当前版本：" + Version,
+			"isRed":   false,
+			"source":  "go-stock",
+			"content": "当前版本无更新",
+		})
 	}
 }
 
@@ -424,12 +431,11 @@ func (a *App) domReady(ctx context.Context) {
 	//检查新版本
 	go func() {
 		a.CheckUpdate()
+		a.CheckStockBaseInfo(a.ctx)
 		a.cron.AddFunc("30 05 8,12,20 * * *", func() {
 			logger.SugaredLogger.Errorf("Checking for updates...")
 			a.CheckUpdate()
-			a.CheckStockBaseInfo()
 		})
-
 	}()
 
 	//检查谷歌浏览器
@@ -464,8 +470,11 @@ func (a *App) domReady(ctx context.Context) {
 	logger.SugaredLogger.Infof("domReady-cronEntrys:%+v", a.cronEntrys)
 
 }
-func (a *App) CheckStockBaseInfo() {
+func (a *App) CheckStockBaseInfo(ctx context.Context) {
 	defer PanicHandler()
+	defer func() {
+		go runtime.EventsEmit(ctx, "loadingMsg", "done")
+	}()
 
 	stockBasics := &[]data.StockBasic{}
 	resty.New().R().

frontend/src/App.vue

@@ -654,7 +654,7 @@ onMounted(() => {
           content: () => h('div',{type:"info",style:{
             "text-align":"left",
               "font-size":"14px",
-              "color":"#F98C24"
+              "color": data.source==="go-stock"?"#F98C24":"#549EC8"
             }}, { default: () => data.content }),
           meta: () => h(NText,{type:"warning"}, { default: () => data.source}),
           duration:1000*30 ,

frontend/src/components/SelectStock.vue

@@ -128,7 +128,7 @@ function openCenteredWindow(url, width, height) {
 </script>
 
 <template>
-  <n-grid :cols="24" style="max-height: calc(100vh - 170px)">
+  <n-grid :cols="24" style="max-height: calc(100vh - 165px)">
     <n-gi :span="4">
       <n-list bordered style="text-align: left;" hoverable clickable>
         <n-scrollbar style="max-height: calc(100vh - 170px);">
@@ -161,13 +161,13 @@ function openCenteredWindow(url, width, height) {
       <!--      </n-virtual-list>-->
     </n-gi>
     <n-gi :span="20">
-      <n-flex>
+      <n-flex style="--wails-draggable:no-drag">
         <n-input-group style="text-align: left">
           <n-input :rows="1" clearable v-model:value="search" placeholder="请输入选股指标或者要求"/>
           <n-button type="primary" @click="Search">搜索A股</n-button>
         </n-input-group>
       </n-flex>
-      <n-flex justify="start" v-if="traceInfo" style="margin: 5px 0">
+      <n-flex justify="start" v-if="traceInfo" style="margin: 5px 0;--wails-draggable:no-drag">
 
         <n-ellipsis line-clamp="1" :tooltip="true">
           <n-text type="info" :bordered="false">选股条件：</n-text>
@@ -183,11 +183,11 @@ function openCenteredWindow(url, width, height) {
       </n-flex>
       <n-data-table
           :striped="true"
-          :max-height="'calc(100vh - 250px)'"
+          :max-height="'calc(100vh - 150px)'"
           size="medium"
           :columns="columns"
           :data="dataList"
-          :pagination="{pageSize: 9}"
+          :pagination="{pageSize: 10}"
           :scroll-x="1800"
           :render-cell="(value, rowData, column) => {
 
@@ -218,10 +218,10 @@ function openCenteredWindow(url, width, height) {
           }
       }"
       />
-      <n-text>共找到
+      <div style="margin-top: -25px">共找到
         <n-tag type="info" :bordered="false">{{ dataList.length }}</n-tag>
         只股
-      </n-text>
+      </div>
     </n-gi>
   </n-grid>
 

frontend/src/components/settings.vue

@@ -285,7 +285,7 @@ function deletePrompt(ID){
 
 <template>
   <n-flex justify="left" style="text-align: left;--wails-draggable:drag" >
-  <n-form ref="formRef"  :label-placement="'left'" :label-align="'left'" >
+  <n-form ref="formRef"  :label-placement="'left'" :label-align="'left'" style="--wails-draggable:no-drag">
     <n-card :title="()=> h(NTag, { type: 'primary',bordered:false },()=> '基础设置')" size="small" >
       <n-grid :cols="24" :x-gap="24" style="text-align: left" >
         <!--        <n-gi :span="24">-->
@@ -379,7 +379,7 @@ function deletePrompt(ID){
       <n-form-item-gi :span="5"  v-if="formValue.openAI.enable" label="openAI maxTokens："  path="openAI.maxTokens" >
         <n-input-number  placeholder="maxTokens"  v-model:value="formValue.openAI.maxTokens"/>
       </n-form-item-gi>
-      <n-form-item-gi :span="5"  v-if="formValue.openAI.enable" title="天数越多消耗tokens越多" label="日K线数据(天)："  path="openAI.maxTokens" >
+      <n-form-item-gi :span="5"  v-if="formValue.openAI.enable" title="天数越多消耗tokens越多" label="日K线数据(天)："  path="openAI.kDays" >
         <n-input-number  min="30" step="1" max="365"  placeholder="日K线数据(天)" title="天数越多消耗tokens越多" v-model:value="formValue.openAI.kDays"/>
       </n-form-item-gi>
       <n-form-item-gi :span="11"  v-if="formValue.openAI.enable" label="模型系统 Prompt："  path="openAI.prompt" >
@@ -389,7 +389,7 @@ function deletePrompt(ID){
             placeholder="请输入系统prompt"
             :autosize="{
               minRows: 5,
-              maxRows: 8
+              maxRows: 6
             }"
         />
       </n-form-item-gi>
@@ -400,7 +400,7 @@ function deletePrompt(ID){
             placeholder="请输入用户prompt:例如{{stockName}}[{{stockCode}}]分析和总结"
             :autosize="{
               minRows: 5,
-              maxRows: 8
+              maxRows: 6
             }"
         />
      </n-form-item-gi>

frontend/wailsjs/go/main/App.d.ts

@@ -2,6 +2,7 @@
 // This file is automatically generated. DO NOT EDIT
 import {data} from '../models';
 import {models} from '../models';
+import {context} from '../models';
 
 export function AddCronTask(arg1:data.FollowedStock):Promise<any>;
 
@@ -15,6 +16,8 @@ export function AnalyzeSentiment(arg1:string):Promise<data.SentimentResult>;
 
 export function CheckSponsorCode(arg1:string):Promise<Record<string, any>>;
 
+export function CheckStockBaseInfo(arg1:context.Context):Promise<void>;
+
 export function CheckUpdate():Promise<void>;
 
 export function ClsCalendar():Promise<Array<any>>;

frontend/wailsjs/go/main/App.js

@@ -26,6 +26,10 @@ export function CheckSponsorCode(arg1) {
   return window['go']['main']['App']['CheckSponsorCode'](arg1);
 }
 
+export function CheckStockBaseInfo(arg1) {
+  return window['go']['main']['App']['CheckStockBaseInfo'](arg1);
+}
+
 export function CheckUpdate() {
   return window['go']['main']['App']['CheckUpdate']();
 }

main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/logger"
 	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/menu/keys"
 	"github.com/wailsapp/wails/v2/pkg/options"
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 	"github.com/wailsapp/wails/v2/pkg/options/windows"
@@ -70,14 +69,16 @@ func main() {
 	// Create an instance of the app structure
 	app := NewApp()
 	AppMenu := menu.NewMenu()
-	AppMenu.Append(menu.EditMenu())
-	FileMenu := AppMenu.AddSubmenu("设置")
-	FileMenu.AddText("窗口全屏", keys.CmdOrCtrl("f"), func(callback *menu.CallbackData) {
-		runtime.WindowFullscreen(app.ctx)
-	})
-	FileMenu.AddText("窗口还原", keys.Key("Esc"), func(callback *menu.CallbackData) {
-		runtime.WindowUnfullscreen(app.ctx)
-	})
+	if IsMacOS() {
+		AppMenu.Append(menu.EditMenu())
+	}
+	//FileMenu := AppMenu.AddSubmenu("设置")
+	//FileMenu.AddText("窗口全屏", keys.CmdOrCtrl("f"), func(callback *menu.CallbackData) {
+	//	runtime.WindowFullscreen(app.ctx)
+	//})
+	//FileMenu.AddText("窗口还原", keys.Key("Esc"), func(callback *menu.CallbackData) {
+	//	runtime.WindowUnfullscreen(app.ctx)
+	//})
 	//FileMenu.AddText("显示搜索框", keys.CmdOrCtrl("s"), func(callbackData *menu.CallbackData) {
 	//	runtime.EventsEmit(app.ctx, "showSearch", 1)
 	//})
@@ -118,7 +119,7 @@ func main() {
 		backgroundColour = &options.RGBA{R: 27, G: 38, B: 54, A: 1}
 	}
 
-	frameless := getFrameless()
+	//frameless := getFrameless()
 
 	// Create application with options
 	err = wails.Run(&options.App{
@@ -131,7 +132,7 @@ func main() {
 		//MaxHeight:                height,
 		DisableResize:            false,
 		Fullscreen:               false,
-		Frameless:                frameless,
+		Frameless:                false,
 		StartHidden:              false,
 		HideWindowOnClose:        false,
 		EnableDefaultContextMenu: true,