Skip to content

Commit 289d1f8

Browse files
committed
✨ Modify account type to timestamp #2 #6
1 parent d2a23f6 commit 289d1f8

File tree

9 files changed

+5
-30
lines changed

9 files changed

+5
-30
lines changed

client/src/components/ChartWidget/BindingChart.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
5454
series.push({
5555
name: items.type,
56-
data: fineTunedArr.map((item) => item.amount || 0),
56+
data: fineTunedArr.map((item) => item?.amount || 0),
5757
})
5858
})
5959
return series

client/src/components/DetailTable.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<Table hoverable={true} striped={true} divClass="relative overflow-x-auto customized-scrollbar">
4141
<TableHead class="text-sm">
4242
<TableHeadCell class="min-w-24">{$_('type')}</TableHeadCell>
43-
<TableHeadCell>{$_('alias')}</TableHeadCell>
4443
<TableHeadCell>{$_('amount')}</TableHeadCell>
4544
<TableHeadCell>{$_('datetime')}</TableHeadCell>
4645
<TableHeadCell>{$_('currency')}</TableHeadCell>
@@ -51,8 +50,7 @@
5150
<TableBody tableBodyClass="py-4">
5251
{#each options as item, index (item.id)}
5352
<TableBodyRow>
54-
<TableBodyCell>{item.type}</TableBodyCell>
55-
<TableBodyCell>{item.alias}</TableBodyCell>
53+
<TableBodyCell>{item.alias || item.type}</TableBodyCell>
5654
<TableBodyCell>{item.amount}</TableBodyCell>
5755
<TableBodyCell>{item.datetime}</TableBodyCell>
5856
<TableBodyCell>{item.currency}</TableBodyCell>

client/src/components/Modal/Update.svelte

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,15 @@
160160
<!-- Modal body -->
161161
<div class="flex flex-col items-center justify-center p-6">
162162
<div class="module-warp">
163-
<label for="update-type" class="custom-label">
163+
<label for="update-alias" class="custom-label">
164164
{$_('type')}
165165
<i class="text-mark">*</i>
166166
</label>
167-
<input
168-
type="text"
169-
id="update-type"
170-
disabled={isChange}
171-
bind:value={items.type}
172-
class="custom-input {isChange ? 'text-grey cursor-not-allowed' : 'cursor-auto'}"
173-
placeholder={$_('placeholderOfCategory')}
174-
required />
175-
</div>
176-
<div class="module-warp">
177-
<label for="update-alias" class="custom-label">
178-
{$_('alias')}
179-
</label>
180167
<input
181168
type="text"
182169
id="update-alias"
183170
bind:value={items.alias}
184-
class="custom-input cursor-alias"
171+
class="custom-input"
185172
placeholder={$_('placeholderOfAlias')}
186173
required />
187174
</div>

client/src/helper/constant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const ASSETS_LIQUIDITY_ARR = LIQUIDITY_TYPES.map((value) => ({
4545
}))
4646

4747
export const DEFAULT_ACCOUNT_ITEM = {
48-
type: '',
48+
type: Date.now().toString(),
4949
alias: '',
5050
currency: 'CNY',
5151
risk: RISK_TYPES[0],

client/src/lang/en.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"viewDetails": "View Details",
1212
"recordAssets": "Record Assets",
1313
"type": "Type",
14-
"alias": "Alias",
1514
"amount": "Amount",
1615
"risk": "Risk",
1716
"liquidity": "Liquidity",
@@ -33,7 +32,6 @@
3332
"recordHasBeendestroyed": "This record has been successfully deleted",
3433
"recordDetails": "Record Details",
3534
"lastDays": "Last {count} Days",
36-
"placeholderOfCategory": "E.g., Bank Card, ⚠️ Name cannot be changed",
3735
"lowFrequencyTip": "Above are low-frequency update content",
3836
"placeholderOfRemark": "Please enter a remark",
3937
"placeholderOfCurrency": "Please enter the currency type",

client/src/lang/fr.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"viewDetails": "Voir les détails",
1212
"recordAssets": "Enregistrer Actifs",
1313
"type": "Taper",
14-
"alias": "Alias",
1514
"amount": "Montant",
1615
"risk": "Risque",
1716
"liquidity": "Liquidité",
@@ -33,7 +32,6 @@
3332
"recordHasBeendestroyed": "Cet enregistrement a été supprimé avec succès",
3433
"recordDetails": "Détails de l'enregistrement",
3534
"lastDays": "Les {count} derniers jours",
36-
"placeholderOfCategory": "Ex: Carte bancaire, ⚠️ Le nom ne peut pas être modifié",
3735
"lowFrequencyTip": "Ci-dessus sont les contenus à mise à jour peu fréquente",
3836
"placeholderOfRemark": "Veuillez saisir une remarque",
3937
"placeholderOfCurrency": "Veuillez saisir la devise",

client/src/lang/ja.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"viewDetails": "詳細を見る",
1212
"recordAssets": "資産を記録",
1313
"type": "タイプ ",
14-
"alias": "別名",
1514
"amount": "金額",
1615
"risk": "リスク",
1716
"liquidity": "流動性",
@@ -33,7 +32,6 @@
3332
"recordHasBeendestroyed": "このレコードは正常に削除されました",
3433
"recordDetails": "記録の詳細",
3534
"lastDays": "過去{count}日間",
36-
"placeholderOfCategory": "例:銀行カード、⚠️名称は変更できません",
3735
"lowFrequencyTip": "上記は低頻度更新コンテンツです",
3836
"placeholderOfRemark": "備考を入力してください",
3937
"placeholderOfCurrency": "通貨を入力してください",

client/src/lang/zh-tw.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"viewDetails": "查閱詳情",
1212
"recordAssets": "記錄資產",
1313
"type": "類型",
14-
"alias": "別名",
1514
"amount": "金額",
1615
"risk": "風險",
1716
"liquidity": "流動性",
@@ -33,7 +32,6 @@
3332
"recordHasBeendestroyed": "該記錄已成功銷燬",
3433
"recordDetails": "記錄詳情",
3534
"lastDays": "最近 {count} 天",
36-
"placeholderOfCategory": "如銀行卡,⚠️名稱不可變更",
3735
"lowFrequencyTip": "以上為低頻更新內容",
3836
"placeholderOfRemark": "請填寫備註",
3937
"placeholderOfCurrency": "請填寫幣種",

client/src/lang/zh.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"viewDetails": "查阅详情",
1212
"recordAssets": "记录资产",
1313
"type": "类型",
14-
"alias": "别名",
1514
"amount": "金额",
1615
"risk": "风险",
1716
"liquidity": "流动性",
@@ -34,7 +33,6 @@
3433
"recordDetails": "记录详情",
3534
"lastDays": "最近 {count} 天",
3635
"lowFrequencyTip": "以上为低频更新内容",
37-
"placeholderOfCategory": "如银行卡,⚠️名称不可变更",
3836
"placeholderOfRemark": "请填写备注",
3937
"placeholderOfCurrency": "请填写币种",
4038
"placeholderOfAlias": "为账户类型设置别名",

0 commit comments

Comments
 (0)