Skip to content

Commit 4f76253

Browse files
authored
Merge pull request #188 from zyronon/dev
merge Dev
2 parents 4aa090f + 9d2a098 commit 4f76253

File tree

16 files changed

+1473
-794
lines changed

16 files changed

+1473
-794
lines changed

components.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ declare module 'vue' {
8080
IconFluentDismiss20Regular: typeof import('~icons/fluent/dismiss20-regular')['default']
8181
IconFluentDismissCircle16Regular: typeof import('~icons/fluent/dismiss-circle16-regular')['default']
8282
IconFluentDismissCircle20Filled: typeof import('~icons/fluent/dismiss-circle20-filled')['default']
83+
IconFluentDocument20Regular: typeof import('~icons/fluent/document20-regular')['default']
8384
IconFluentErrorCircle20Filled: typeof import('~icons/fluent/error-circle20-filled')['default']
8485
IconFluentErrorCircle20Regular: typeof import('~icons/fluent/error-circle20-regular')['default']
8586
IconFluentEye16Regular: typeof import('~icons/fluent/eye16-regular')['default']
@@ -145,6 +146,7 @@ declare module 'vue' {
145146
Progress: typeof import('./src/components/base/Progress.vue')['default']
146147
Radio: typeof import('./src/components/base/radio/Radio.vue')['default']
147148
RadioGroup: typeof import('./src/components/base/radio/RadioGroup.vue')['default']
149+
ResourceCard: typeof import('./src/components/ResourceCard.vue')['default']
148150
RouterLink: typeof import('vue-router')['RouterLink']
149151
RouterView: typeof import('vue-router')['RouterView']
150152
Select: typeof import('./src/components/base/select/Select.vue')['default']

src/App.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ let isInitializing = true // 标记是否正在初始化
2525
watch(store.$state, (n: BaseState) => {
2626
// 如果正在初始化,不保存数据,避免覆盖
2727
if (isInitializing) return
28-
console.log('watch')
2928
let data = shakeCommonDict(n)
3029
set(SAVE_DICT_KEY.key, JSON.stringify({val: data, version: SAVE_DICT_KEY.version}))
3130
@@ -132,4 +131,4 @@ onMounted(() => {
132131
v-model="showTransfer"
133132
@ok="init"
134133
/>
135-
</template>
134+
</template>

src/apis/dict.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import http from '@/utils/http.ts'
2+
import { Dict } from '@/types/types.ts'
3+
4+
export function copyOfficialDict(params?, data?) {
5+
return http<Dict>('dict/copyOfficialDict', data, params, 'post')
6+
}
7+
8+
export function deleteDict(params?, data?) {
9+
return http<Dict>('dict/delete', data, params, 'post')
10+
}

src/apis/words.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import http from '@/utils/http.ts'
2+
import { Dict } from '@/types/types.ts'
3+
4+
export function wordDelete(params?, data?) {
5+
return http<Dict>('word/delete', data, params, 'post')
6+
}

0 commit comments

Comments
 (0)