Browse Source

fix:修复聊天边框无法显示问题

master
秋田弘 7 months ago
parent
commit
19a69e28ad
  1. 22
      frontend/components.d.ts
  2. 2
      frontend/src/components/window/WindowTemplate.vue
  3. 4
      frontend/src/stores/chat.ts
  4. 3
      frontend/src/stores/upgrade.ts
  5. 2
      godo/cmd/main.go
  6. 14
      godo/store/start.go

22
frontend/components.d.ts

@ -49,24 +49,46 @@ declare module 'vue' {
DialogTemp: typeof import('./src/components/window/DialogTemp.vue')['default'] DialogTemp: typeof import('./src/components/window/DialogTemp.vue')['default']
EditFileName: typeof import('./src/components/builtin/EditFileName.vue')['default'] EditFileName: typeof import('./src/components/builtin/EditFileName.vue')['default']
EditType: typeof import('./src/components/builtin/EditType.vue')['default'] EditType: typeof import('./src/components/builtin/EditType.vue')['default']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElButton: typeof import('element-plus/es')['ElButton'] ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard'] ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol'] ElCol: typeof import('element-plus/es')['ElCol']
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDrawer: typeof import('element-plus/es')['ElDrawer']
ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElFooter: typeof import('element-plus/es')['ElFooter']
ElForm: typeof import('element-plus/es')['ElForm'] ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElProgress: typeof import('element-plus/es')['ElProgress'] ElProgress: typeof import('element-plus/es')['ElProgress']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElText: typeof import('element-plus/es')['ElText']
ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTransfer: typeof import('element-plus/es')['ElTransfer']
ElTree: typeof import('element-plus/es')['ElTree'] ElTree: typeof import('element-plus/es')['ElTree']
Error: typeof import('./src/components/taskbar/Error.vue')['default'] Error: typeof import('./src/components/taskbar/Error.vue')['default']
FileIcon: typeof import('./src/components/builtin/FileIcon.vue')['default'] FileIcon: typeof import('./src/components/builtin/FileIcon.vue')['default']

2
frontend/src/components/window/WindowTemplate.vue

@ -198,7 +198,7 @@
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
background-color: #fff; background-color: #fff;
// border: var(--window-border); border: var(--window-border);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// box-shadow: var(--window-box-shadow); // box-shadow: var(--window-box-shadow);

4
frontend/src/stores/chat.ts

@ -331,6 +331,7 @@ export const useChatStore = defineStore('chatStore', () => {
} }
// 发送文件消息 // 发送文件消息
const res = await fetchPost(config.userInfo.url + '/chat/send', JSON.stringify(Message)); const res = await fetchPost(config.userInfo.url + '/chat/send', JSON.stringify(Message));
console.log(Message)
console.log(res) console.log(res)
if (!res.ok) { if (!res.ok) {
fileSendActive.value = false; fileSendActive.value = false;
@ -344,7 +345,7 @@ export const useChatStore = defineStore('chatStore', () => {
isMe: true, isMe: true,
file_path: Message.message, file_path: Message.message,
file_name: Message.message.split('/').pop(), file_name: Message.message.split('/').pop(),
file_size: fileInfo.data.file_info.size, file_size: fileInfo.data.file_info?.size || 0,
previewMessage: "[文件消息]", previewMessage: "[文件消息]",
previewTimeFormat: formatTime(Date.now()), previewTimeFormat: formatTime(Date.now()),
displayName: userInfo.value.nickname, displayName: userInfo.value.nickname,
@ -375,6 +376,7 @@ export const useChatStore = defineStore('chatStore', () => {
// 发送文字消息 // 发送文字消息
const sendTextMessage = async () => { const sendTextMessage = async () => {
// 判断是群聊发送还是单聊发送 // 判断是群聊发送还是单聊发送
if (targetGroupInfo.value && Object.keys(targetGroupInfo.value).length) { if (targetGroupInfo.value && Object.keys(targetGroupInfo.value).length) {
console.log('群聊发送'); console.log('群聊发送');

3
frontend/src/stores/upgrade.ts

@ -81,10 +81,11 @@ export const useUpgradeStore = defineStore('upgradeStore', () => {
chatChatStore.onlineUserData(message.data) chatChatStore.onlineUserData(message.data)
break; break;
case 'user': case 'user':
console.log(message.data)
chatChatStore.userChatMessage(message.data) chatChatStore.userChatMessage(message.data)
break break
case 'group': case 'group':
console.log(message) console.log(message.data)
chatChatStore.groupChatMessage(message.data); chatChatStore.groupChatMessage(message.data);
break; break;
case 'update_group': case 'update_group':

2
godo/cmd/main.go

@ -81,6 +81,8 @@ func OsStart() {
router.HandleFunc("/system/message", sys.HandleSystemEvents).Methods(http.MethodGet) router.HandleFunc("/system/message", sys.HandleSystemEvents).Methods(http.MethodGet)
router.HandleFunc("/system/update", sys.UpdateAppHandler).Methods(http.MethodGet) router.HandleFunc("/system/update", sys.UpdateAppHandler).Methods(http.MethodGet)
router.HandleFunc("/system/setting", sys.ConfigHandler).Methods(http.MethodPost) router.HandleFunc("/system/setting", sys.ConfigHandler).Methods(http.MethodPost)
fileRouter := router.PathPrefix("/file").Subrouter() fileRouter := router.PathPrefix("/file").Subrouter()
fileRouter.HandleFunc("/desktop", files.HandleDesktop).Methods(http.MethodGet) fileRouter.HandleFunc("/desktop", files.HandleDesktop).Methods(http.MethodGet)
fileRouter.HandleFunc("/info", files.HandleSystemInfo).Methods(http.MethodGet) fileRouter.HandleFunc("/info", files.HandleSystemInfo).Methods(http.MethodGet)

14
godo/store/start.go

@ -36,14 +36,14 @@ import (
func StartProcess(w http.ResponseWriter, r *http.Request) { func StartProcess(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
name := vars["name"] name := vars["name"]
processesMu.Lock() // processesMu.Lock()
defer processesMu.Unlock() // defer processesMu.Unlock()
err := ExecuteScript(name) // err := ExecuteScript(name)
if err != nil { // if err != nil {
respondWithError(w, http.StatusInternalServerError, err.Error()) // respondWithError(w, http.StatusInternalServerError, err.Error())
return // return
} // }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, "Process %s started.", name) fmt.Fprintf(w, "Process %s started.", name)

Loading…
Cancel
Save