Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c8ccc06

Browse files
committed
fix: denglu
1 parent c2bc781 commit c8ccc06

File tree

5 files changed

+89
-21
lines changed

5 files changed

+89
-21
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@vueuse/core": "^10.1.2",
1313
"clipboard": "^2.0.11",
1414
"crypto-js": "^4.1.1",
15+
"socket.io-client": "^4.6.2",
1516
"vue": "^3.2.47",
1617
"vue3-lazy": "^1.0.0-alpha.1"
1718
},

‎src/DrawPanel.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ onMounted(() => {
204204
<p class="underline text-orange-400 pr-4 cursor-pointer" @click.stop="showSettingsModal">设置参数</p>
205205
<p class="underline text-orange-400 pr-4 cursor-pointer" @click.stop="showSettingsModal">设置风格</p>
206206
<p class="flex-1"></p>
207+
<p class="underline text-orange-400 pr-4 cursor-pointer font-bold" @click.stop="showLoginModal">登录/注册</p>
207208
<p class="underline text-orange-400 pr-4 cursor-pointer">微信交流群</p>
208209
<p class="underline text-orange-400 cursor-pointer" @click.stop="showUseModal">使用说明</p>
209210
</div>

‎src/components/Login-Modal/index.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const onClickSave = () => {
6969
Toast({ value: "注册成功,请登录", duration: 1500 })
7070
form.password = ''
7171
form.rePassword = ''
72+
form.type = FORM_TYPE.LOGIN
7273
} else {
7374
Toast({ value: "登录成功", duration: 1500 })
7475
const { token, ...userInfo } = res

‎src/utils/websocket.ts‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22

3+
import { io } from 'socket.io-client'
4+
35
interface CreateWsOptions {
46
onOpen?: (event: Event) => void;
57
onError?: (event: Event) => void;
@@ -36,26 +38,40 @@ export const createWebsocket = (ops?: CreateWsOptions) => {
3638
}
3739
}
3840

39-
const ws = wsInstance = new WebSocket(import.meta.env.VITE_APP_WS_URL);
40-
ws.addEventListener('open', (event) => {
41-
ws.send(JSON.stringify({
42-
event: 'init'
43-
}))
44-
ops?.onOpen?.(event)
45-
});
46-
ws.addEventListener('error', ops?.onError);
47-
ws.addEventListener('message', (event: MessageEvent) => {
48-
let data
49-
try {
50-
data = JSON.parse(event.data)
51-
const { event: type, data: eventData } = data
52-
dispatchEventData(type, eventData)
53-
} catch (error) {
54-
console.log(error)
55-
}
56-
});
57-
ws.addEventListener('close', ops?.onClose);
58-
return ws;
41+
console.log("ws url: ", import.meta.env.VITE_APP_WS_URL);
42+
const socket = io(import.meta.env.VITE_APP_WS_URL);
43+
socket.on(EventType.TASK_UPDATE, (data) => {
44+
console.log("data get: ", data)
45+
ops?.onTaskUpdate?.(data)
46+
})
47+
// const ws = wsInstance = new WebSocket("ws://localhost:3333/socket.io/");
48+
// ws.addEventListener('open', (event) => {
49+
// console.log('open')
50+
// ws.send(JSON.stringify({
51+
// event: 'init',
52+
// // data: {
53+
// // a: 123,
54+
// // b: 456
55+
// // }
56+
// }))
57+
// ops?.onOpen?.(event)
58+
// });
59+
// ws.addEventListener('error', (error) => {
60+
// console.log(error)
61+
// ops?.onError?.(error)
62+
// });
63+
// ws.addEventListener('message', (event: MessageEvent) => {
64+
// let data
65+
// try {
66+
// data = JSON.parse(event.data)
67+
// const { event: type, data: eventData } = data
68+
// dispatchEventData(type, eventData)
69+
// } catch (error) {
70+
// console.log(error)
71+
// }
72+
// });
73+
// ws.addEventListener('close', ops?.onClose);
74+
return socket;
5975
}
6076

6177
export const sendMessage = (data: any) => {

‎yarn.lock‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@
448448
"@nodelib/fs.scandir" "2.1.5"
449449
fastq "^1.6.0"
450450

451+
"@socket.io/component-emitter@~3.1.0":
452+
version "3.1.0"
453+
resolved "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
454+
integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
455+
451456
"@types/node@^20.3.0":
452457
version "20.3.0"
453458
resolved "https://registry.npmmirror.com/@types/node/-/node-20.3.0.tgz#719498898d5defab83c3560f45d8498f58d11938"
@@ -848,7 +853,7 @@ de-indent@^1.0.2:
848853
resolved "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
849854
integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
850855

851-
debug@^4.1.0:
856+
debug@^4.1.0, debug@~4.3.1, debug@~4.3.2:
852857
version "4.3.4"
853858
resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
854859
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -880,6 +885,22 @@ electron-to-chromium@^1.4.411:
880885
resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.417.tgz#a0c7eb992e68287fa50c8da5a5238b01f20b9a82"
881886
integrity sha512-8rY8HdCxuSVY8wku3i/eDac4g1b4cSbruzocenrqBlzqruAZYHjQCHIjC66dLR9DXhEHTojsC4EjhZ8KmzwXqA==
882887

888+
engine.io-client@~6.4.0:
889+
version "6.4.0"
890+
resolved "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91"
891+
integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==
892+
dependencies:
893+
"@socket.io/component-emitter" "~3.1.0"
894+
debug "~4.3.1"
895+
engine.io-parser "~5.0.3"
896+
ws "~8.11.0"
897+
xmlhttprequest-ssl "~2.0.0"
898+
899+
engine.io-parser@~5.0.3:
900+
version "5.0.7"
901+
resolved "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.0.7.tgz#ed5eae76c71f398284c578ab6deafd3ba7e4e4f6"
902+
integrity sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==
903+
883904
esbuild@^0.17.5:
884905
version "0.17.19"
885906
resolved "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
@@ -1389,6 +1410,24 @@ semver@^7.3.8:
13891410
dependencies:
13901411
lru-cache "^6.0.0"
13911412

1413+
socket.io-client@^4.6.2:
1414+
version "4.6.2"
1415+
resolved "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.6.2.tgz#2bfde952e74625d54e622718a7cb1d591ee62fd6"
1416+
integrity sha512-OwWrMbbA8wSqhBAR0yoPK6EdQLERQAYjXb3A0zLpgxfM1ZGLKoxHx8gVmCHA6pcclRX5oA/zvQf7bghAS11jRA==
1417+
dependencies:
1418+
"@socket.io/component-emitter" "~3.1.0"
1419+
debug "~4.3.2"
1420+
engine.io-client "~6.4.0"
1421+
socket.io-parser "~4.2.4"
1422+
1423+
socket.io-parser@~4.2.4:
1424+
version "4.2.4"
1425+
resolved "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
1426+
integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
1427+
dependencies:
1428+
"@socket.io/component-emitter" "~3.1.0"
1429+
debug "~4.3.1"
1430+
13921431
source-map-js@^1.0.2:
13931432
version "1.0.2"
13941433
resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -1561,6 +1600,16 @@ wrappy@1:
15611600
resolved "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
15621601
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
15631602

1603+
ws@~8.11.0:
1604+
version "8.11.0"
1605+
resolved "https://registry.npmmirror.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
1606+
integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
1607+
1608+
xmlhttprequest-ssl@~2.0.0:
1609+
version "2.0.0"
1610+
resolved "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
1611+
integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
1612+
15641613
yallist@^3.0.2:
15651614
version "3.1.1"
15661615
resolved "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /