Skip to content
This repository was archived by the owner on May 29, 2026. It is now read-only.

Commit a93cc66

Browse files
committed
refactor: remove stupid code
Signed-off-by: Innei <i@innei.in>
1 parent ca24fce commit a93cc66

3 files changed

Lines changed: 43 additions & 42 deletions

File tree

src/components/kv-editor/index.tsx

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,32 @@ export const KVEditor = defineComponent({
2727
const KVArray = ref<{ key: string; value: string }[]>([])
2828

2929
const keySet = ref(new Set<string>())
30-
31-
const cleaner = watch(
32-
() => props.value,
33-
(newValue) => {
34-
if (!isEmpty(newValue)) {
35-
const arr = Object.entries(newValue).map(([k, v]) => {
36-
keySet.value.add(k)
37-
return {
38-
key: k,
39-
value: v.toString(),
40-
}
41-
})
42-
KVArray.value = arr
43-
cleaner()
44-
}
45-
},
46-
{ deep: true },
47-
)
48-
30+
onMounted(() => {
31+
if (!isEmpty(props.value)) {
32+
const arr = Object.entries(props.value).map(([k, v]) => {
33+
keySet.value.add(k)
34+
return {
35+
key: k,
36+
value: v.toString(),
37+
}
38+
})
39+
KVArray.value = arr
40+
}
41+
})
4942
watch(
5043
() => KVArray.value,
5144
(newValue) => {
52-
const record = newValue.reduce((acc, cur) => {
53-
// filter empty key value
54-
if (cur.key === '' && cur.value === '') {
45+
const record = newValue.reduce(
46+
(acc, cur) => {
47+
// filter empty key value
48+
if (cur.key === '' && cur.value === '') {
49+
return acc
50+
}
51+
acc[cur.key] = cur.value.toString()
5552
return acc
56-
}
57-
acc[cur.key] = cur.value.toString()
58-
return acc
59-
}, {} as { [key: string]: string })
53+
},
54+
{} as { [key: string]: string },
55+
)
6056
props.onChange(record)
6157
},
6258
{ deep: true },
@@ -89,9 +85,12 @@ export const KVEditor = defineComponent({
8985
}}
9086
>
9187
{{
92-
default(rowProps: { index: number; value: typeof KVArray.value[0] }) {
88+
default(rowProps: {
89+
index: number
90+
value: (typeof KVArray.value)[0]
91+
}) {
9392
return (
94-
<div class="flex items-center w-full">
93+
<div class="flex w-full items-center">
9594
{props.plainKeyInput ? (
9695
<NInput
9796
class="mr-4"

src/views/extra-features/snippets/tabs/for-edit.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ export const Tab2ForEdit = defineComponent({
359359

360360
<NFormItem label="Secret">
361361
<KVEditor
362+
key={data.value.id}
362363
plainKeyInput
363364
onChange={(kv) => {
364365
data.value.secret = kv

src/views/setting/tabs/user.tsx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { RelativeTime } from 'components/time/relative-time'
55
import { UploadWrapper } from 'components/upload'
66
import { socialKeyMap } from 'constants/social'
77
import { cloneDeep, isEmpty } from 'lodash-es'
8-
import type { UserModel } from 'models/user'
98
import {
109
NButton,
1110
NForm,
@@ -17,8 +16,9 @@ import {
1716
NUploadDragger,
1817
useMessage,
1918
} from 'naive-ui'
20-
import { RESTManager, deepDiff } from 'utils'
19+
import { deepDiff, RESTManager } from 'utils'
2120
import { computed, defineComponent, onMounted, ref } from 'vue'
21+
import type { UserModel } from 'models/user'
2222

2323
import styles from './user.module.css'
2424

@@ -62,7 +62,7 @@ export const TabUser = defineComponent(() => {
6262
yGap={20}
6363
>
6464
<NGi>
65-
<NForm class="flex flex-col justify-center items-center ">
65+
<NForm class="flex flex-col items-center justify-center ">
6666
<NFormItem>
6767
<div class={styles['avatar']}>
6868
<UploadWrapper
@@ -92,7 +92,7 @@ export const TabUser = defineComponent(() => {
9292
</NFormItem>
9393

9494
<NFormItem label="上次登录时间" class="!mt-4">
95-
<div class="text-center w-full">
95+
<div class="w-full text-center">
9696
<NText>
9797
{data.value.lastLoginTime ? (
9898
<RelativeTime
@@ -106,7 +106,7 @@ export const TabUser = defineComponent(() => {
106106
</NFormItem>
107107

108108
<NFormItem label="上次登录地址">
109-
<div class="text-center w-full">
109+
<div class="w-full text-center">
110110
{data.value.lastLoginIp ? (
111111
<IpInfoPopover
112112
trigger={'hover'}
@@ -195,15 +195,16 @@ export const TabUser = defineComponent(() => {
195195
</NFormItem>
196196

197197
<NFormItem label="社交平台 ID 录入">
198-
<KVEditor
199-
options={Object.keys(socialKeyMap).map((key) => {
200-
return { label: key, value: socialKeyMap[key] }
201-
})}
202-
onChange={(newValue) => {
203-
data.value.socialIds = newValue
204-
}}
205-
value={data.value.socialIds || {}}
206-
></KVEditor>
198+
<KVEditor
199+
key={data.value.id}
200+
options={Object.keys(socialKeyMap).map((key) => {
201+
return { label: key, value: socialKeyMap[key] }
202+
})}
203+
onChange={(newValue) => {
204+
data.value.socialIds = newValue
205+
}}
206+
value={data.value.socialIds || {}}
207+
></KVEditor>
207208
</NFormItem>
208209
</NForm>
209210
</NGi>

0 commit comments

Comments
 (0)