Skip to content

Commit 72aff0a

Browse files
zyrononzyronon
committed
Merge branch 'master' into dev
2 parents d88f339 + 7b5dd91 commit 72aff0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+181
-172
lines changed

‎apps/nuxt/app/pages/(articles)/articles.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<script setup lang="ts">
22
import { myDictList } from '@typewords/core/apis'
3-
import { BaseButton, BaseIcon, BasePage, PopConfirm, Progress, Toast } from '@typewords/base'
3+
import { BaseButton, BaseIcon, BasePage, DeleteIcon, PopConfirm, Progress, Toast } from '@typewords/base'
44
import Book from '@typewords/core/components/Book.vue'
5-
import DeleteIcon from '@typewords/core/components/icon/DeleteIcon.vue'
65
import { APP_NAME, AppEnv, DICT_LIST, LIB_JS_URL, Old_Host, Origin, TourConfig } from '@typewords/core/config/env.ts'
76
import { useBaseStore } from '@typewords/core/stores/base.ts'
87
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'

‎apps/nuxt/app/pages/(articles)/batch-edit-article.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import type { Article } from '@typewords/core/types/types.ts'
3-
import { BaseButton, Toast, MiniDialog, UploadButton } from '@typewords/base'
3+
import { BaseButton, Toast, MiniDialog, UploadButton ,BackIcon} from '@typewords/base'
44
import { cloneDeep, loadJsLib } from '@typewords/core/utils'
55
66
import List from '@typewords/core/components/list/List.vue'
@@ -10,7 +10,6 @@ import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
1010
import { nanoid } from 'nanoid'
1111
import EditArticle from '@typewords/core/components/article/EditArticle.vue'
1212
import { getDefaultArticle } from '@typewords/core/types/func.ts'
13-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
1413
import { onMounted } from 'vue'
1514
import { LIB_JS_URL } from '@typewords/core/config/env.ts'
1615
import { syncBookInMyStudyList } from '@typewords/core/hooks/article.ts'

‎apps/nuxt/app/pages/(articles)/book-list.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<script setup lang="ts">
22
import { resourceWrap, useNav } from '@typewords/core/utils'
3-
import { BaseButton, BaseIcon, BasePage } from '@typewords/base'
3+
import { BaseButton, BaseIcon, BasePage, BackIcon } from '@typewords/base'
44
import type { DictResource } from '@typewords/core/types/types.ts'
55
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
66
import Empty from '@typewords/core/components/Empty.vue'
77
import DictList from '@typewords/core/components/list/DictList.vue'
8-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
98
import { useRouter } from 'vue-router'
109
import { computed } from 'vue'
1110
import { getDefaultDict } from '@typewords/core/types/func.ts'

‎apps/nuxt/app/pages/(articles)/book/[id].vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<script setup lang="ts">
2-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
32
import Empty from '@typewords/core/components/Empty.vue'
43
import ArticleList from '@typewords/core/components/list/ArticleList.vue'
54
import { useBaseStore } from '@typewords/core/stores/base.ts'
65
import type { Article, Dict } from '@typewords/core/types/types.ts'
76
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
8-
import { BaseButton, BaseIcon, Switch, Toast } from '@typewords/base'
7+
import { BaseButton, BaseIcon, Switch, Toast, BackIcon } from '@typewords/base'
98
import { useRoute, useRouter } from 'vue-router'
109
import EditBook from '@typewords/core/components/article/EditBook.vue'
1110
import { computed, onMounted, onUnmounted, watch } from 'vue'

‎apps/nuxt/app/pages/(articles)/book/index.vue‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<script setup lang="ts">
2-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
32
import Empty from '@typewords/core/components/Empty.vue'
43
import ArticleList from '@typewords/core/components/list/ArticleList.vue'
54
import { useBaseStore } from '@typewords/core/stores/base.ts'
65
import type { Article, Dict } from '@typewords/core/types/types.ts'
76
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
8-
import { BaseButton, BaseIcon, Switch, Toast } from '@typewords/base'
7+
import { BaseButton, BaseIcon, Switch, Toast, BackIcon } from '@typewords/base'
98
import { useRoute, useRouter } from 'vue-router'
109
import EditBook from '@typewords/core/components/article/EditBook.vue'
1110
import { computed, onMounted, onUnmounted, watch } from 'vue'
12-
import { _dateFormat, _getDictDataByUrl, _nextTick, msToHourMinute, resourceWrap, total, useNav } from '@typewords/core/utils'
11+
import {
12+
_dateFormat,
13+
_getDictDataByUrl,
14+
_nextTick,
15+
msToHourMinute,
16+
resourceWrap,
17+
total,
18+
useNav,
19+
} from '@typewords/core/utils'
1320
import { getDefaultArticle, getDefaultDict } from '@typewords/core/types/func.ts'
1421
import ArticleAudio from '@typewords/core/components/article/ArticleAudio.vue'
1522
import { MessageBox } from '@typewords/core/utils/MessageBox.tsx'

‎apps/nuxt/app/pages/(user)/vip.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { BaseButton, BasePage, InputNumber, PopConfirm, Radio, RadioGroup, Toast } from '@typewords/base'
2+
import { BaseButton, BaseInput, BasePage, InputNumber, PopConfirm, Radio, RadioGroup, Toast } from '@typewords/base'
33
import { useRouter } from 'vue-router'
44
import { useUserStore } from '@typewords/core/stores/user.ts'
55
import type { User } from '@typewords/core/apis/user.ts'
@@ -15,7 +15,6 @@ import {
1515
setAutoRenewApi,
1616
} from '@typewords/core/apis/member.ts'
1717
import { _dateFormat, _nextTick } from '@typewords/core/utils'
18-
import { BaseInput } from '@typewords/base'
1918
2019
const router = useRouter()
2120
const userStore = useUserStore()

‎apps/nuxt/app/pages/(words)/dict-list.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
<script setup lang="ts">
22
import { _nextTick, groupBy, isMobile, loadJsLib, resourceWrap, useNav } from '@typewords/core/utils'
3-
import { BaseButton, BaseIcon, BasePage } from '@typewords/base'
3+
import { BackIcon, BaseButton, BaseIcon, BaseInput, BasePage } from '@typewords/base'
44
import type { DictResource } from '@typewords/core/types/types.ts'
55
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
66
import Empty from '@typewords/core/components/Empty.vue'
77
import DictList from '@typewords/core/components/list/DictList.vue'
8-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
98
import DictGroup from '@typewords/core/components/list/DictGroup.vue'
109
import { useBaseStore } from '@typewords/core/stores/base.ts'
1110
import { useRouter } from 'vue-router'
1211
import { computed, watch } from 'vue'
1312
import { getDefaultDict } from '@typewords/core/types/func.ts'
1413
import { useFetch } from '@vueuse/core'
1514
import { DICT_LIST, LIB_JS_URL, TourConfig } from '@typewords/core/config/env.ts'
16-
import { BaseInput } from '@typewords/base'
1715
import { useSettingStore } from '@typewords/core/stores/setting.ts'
1816
1917
const { nav } = useNav()

‎apps/nuxt/app/pages/(words)/dict.vue‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
<script setup lang="tsx">
22
import { detail } from '@typewords/core/apis'
3-
import BackIcon from '@typewords/core/components/icon/BackIcon.vue'
4-
import { BaseButton, BaseIcon, BasePage, Form, FormItem, PopConfirm, Textarea, Toast } from '@typewords/base'
3+
import {
4+
BackIcon,
5+
BaseButton,
6+
BaseIcon,
7+
BaseInput,
8+
BasePage,
9+
DeleteIcon,
10+
Form,
11+
FormItem,
12+
PopConfirm,
13+
Textarea,
14+
Toast,
15+
} from '@typewords/base'
516
import BaseTable from '@typewords/core/components/BaseTable.vue'
617
import WordItem from '@typewords/core/components/word/WordItem.vue'
7-
import { BaseInput } from '@typewords/base'
8-
import DeleteIcon from '@typewords/core/components/icon/DeleteIcon.vue'
918
import { AppEnv, DictId, LIB_JS_URL, TourConfig } from '@typewords/core/config/env.ts'
1019
import { getCurrentStudyWord } from '@typewords/core/hooks/dict.ts'
1120
import EditBook from '@typewords/core/components/article/EditBook.vue'

‎apps/nuxt/app/pages/(words)/words-test/[id].vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script setup lang="ts">
22
import { onMounted } from 'vue'
3-
import { BaseButton, BasePage, Toast } from '@typewords/base'
4-
import VolumeIcon from '@typewords/core/components/icon/VolumeIcon.vue'
3+
import { BaseButton, BasePage, Toast, VolumeIcon } from '@typewords/base'
54
import { useRoute, useRouter } from 'vue-router'
65
import { useBaseStore } from '@typewords/core/stores/base.ts'
76
import type { Dict, TaskWords, Word } from '@typewords/core/types/types.ts'

‎apps/nuxt/app/pages/(words)/words.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { getCurrentStudyWord } from '@typewords/core/hooks/dict.ts'
1818
import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
1919
import Book from '@typewords/core/components/Book.vue'
2020
import { getDefaultDict } from '@typewords/core/types/func.ts'
21-
import DeleteIcon from '@typewords/core/components/icon/DeleteIcon.vue'
21+
import {DeleteIcon} from '@typewords/base'
2222
import PracticeSettingDialog from '@typewords/core/components/word/PracticeSettingDialog.vue'
2323
import ChangeLastPracticeIndexDialog from '@typewords/core/components/word/ChangeLastPracticeIndexDialog.vue'
2424
import { useSettingStore } from '@typewords/core/stores/setting.ts'

0 commit comments

Comments
 (0)