diff --git a/backend/pb_migrations/1776515455_updated_ledgers.js b/backend/pb_migrations/1776515455_updated_ledgers.js new file mode 100644 index 0000000..506403b --- /dev/null +++ b/backend/pb_migrations/1776515455_updated_ledgers.js @@ -0,0 +1,44 @@ +/// +migrate((db) => { + const dao = new Dao(db) + const collection = dao.findCollectionByNameOrId("ledgers_col") + + // update + collection.schema.addField(new SchemaField({ + "system": false, + "id": "lgr_desc", + "name": "description", + "type": "text", + "required": false, + "presentable": false, + "unique": false, + "options": { + "min": null, + "max": 500, + "pattern": "" + } + })) + + return dao.saveCollection(collection) +}, (db) => { + const dao = new Dao(db) + const collection = dao.findCollectionByNameOrId("ledgers_col") + + // update + collection.schema.addField(new SchemaField({ + "system": false, + "id": "lgr_desc", + "name": "description", + "type": "text", + "required": true, + "presentable": false, + "unique": false, + "options": { + "min": null, + "max": 500, + "pattern": "" + } + })) + + return dao.saveCollection(collection) +}) diff --git a/frontend/nginx.conf b/frontend/nginx.conf index a5bc3fc..912c294 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -17,7 +17,7 @@ server { # SSE realtime 连接(必须在 /api/ 之前) location /api/realtime { - proxy_pass http://gamegroup-pb:8090; + proxy_pass http://192.168.1.14:8090; proxy_http_version 1.1; proxy_set_header Connection ''; proxy_set_header Host $host; @@ -33,7 +33,7 @@ server { # API 代理到局域网 PocketBase location /api/ { client_max_body_size 500m; - proxy_pass http://gamegroup-pb:8090; + proxy_pass http://192.168.1.14:8090; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/frontend/src/api/ledgers.ts b/frontend/src/api/ledgers.ts index 6c60b6d..91feed9 100644 --- a/frontend/src/api/ledgers.ts +++ b/frontend/src/api/ledgers.ts @@ -7,7 +7,7 @@ interface CreateLedgerData { type: string amount: number category: string - description: string + description?: string relatedMembers?: string[] occurredAt: string } diff --git a/frontend/src/components/ledger/CreateLedgerDialog.vue b/frontend/src/components/ledger/CreateLedgerDialog.vue index 983700a..f09ae14 100644 --- a/frontend/src/components/ledger/CreateLedgerDialog.vue +++ b/frontend/src/components/ledger/CreateLedgerDialog.vue @@ -106,25 +106,22 @@ async function handleSubmit() { ? new Date(String(form.value.occurredAt)).toISOString() : new Date().toISOString() + const submitData = { + type: form.value.type, + amount: form.value.amount, + category: form.value.category, + description: form.value.description || '', + relatedMembers: form.value.relatedMembers, + occurredAt, + } + if (isEditing.value && props.editLedger) { - await ledgerStore.editLedger(props.editLedger.id, { - type: form.value.type, - amount: form.value.amount, - category: form.value.category, - description: form.value.description, - relatedMembers: form.value.relatedMembers, - occurredAt, - }) + await ledgerStore.editLedger(props.editLedger.id, submitData) ElMessage.success('账目更新成功') } else { await ledgerStore.addLedger({ group: props.groupId, - type: form.value.type, - amount: form.value.amount, - category: form.value.category, - description: form.value.description, - relatedMembers: form.value.relatedMembers, - occurredAt, + ...submitData, }) ElMessage.success('账目创建成功') }