e.stopPropagation()}
onKeydown={(e) => e.stopPropagation()}
>
@@ -42,10 +43,10 @@ export default defineComponent(() => {
)}
{/* 弹框主体 */}
-
+
{show.value && (
- {settings.state.showTime && (
-
- {settings.state.showTime && (
-
)
diff --git a/src/layout/header/ModeChange.tsx b/src/layout/header/ModeChange.tsx
index d17026b..30d8fb2 100644
--- a/src/layout/header/ModeChange.tsx
+++ b/src/layout/header/ModeChange.tsx
@@ -1,16 +1,50 @@
import { addIcons, OhVueIcon } from "oh-vue-icons";
import { defineComponent, ref } from "vue";
import { BiEyeFill } from "oh-vue-icons/icons";
-import { BiEyeSlashFill } from "oh-vue-icons/icons";
+import { BiEyeSlashFill, MdMorevert } from "oh-vue-icons/icons";
import useLayoutStore from "../useLayoutStore";
import clsx from "clsx";
-import useSettingsStore from "@/settings/useSettingsStore";
-addIcons(BiEyeFill, BiEyeSlashFill)
+import useSettingsStore, { SimpleShowStringType } from "@/settings/useSettingsStore";
+import { Dropdown, type MenuProps } from "ant-design-vue";
+addIcons(BiEyeFill, BiEyeSlashFill, MdMorevert)
+const items: MenuProps['items'] = [
+ {
+ key: '1',
+ label: (
+
+ 1st menu item
+
+ ),
+ },
+ {
+ key: '2',
+ label: (
+
+ 2nd menu item (disabled)
+
+ ),
+ disabled: true,
+ },
+ {
+ key: '3',
+ label: (
+
+ 3rd menu item (disabled)
+
+ ),
+ disabled: true,
+ },
+ {
+ key: '4',
+ danger: true,
+ label: 'a danger item',
+ },
+];
export default defineComponent(() => {
const layoutStore = useLayoutStore()
const settingStore = useSettingsStore()
const show = ref(false)
-
+ const showOptions = ref(false)
return () => (
- {text.value.timeStr}
-
- )}
+
+ {
+ layout.state.simple ?
+ settings.state.simpleModeShowString.includes('showTime') &&
+
+ {text.value.timeStr}
+
+ :
+ settings.state!.showTime &&
+
+ {text.value.timeStr}
+
+ }
- {settings.state.timeOptions.includes('date') &&
- {!layout.isCompact && settings.state.timeOptions.includes('week') && (
-
-
- {!layout.isCompact && settings.state.timeOptions.includes('lunal') && (
-
-
- )}
+ {
+ layout.state.simple ?
+ settings.state.simpleModeShowString.includes('showDate') &&
+ {text.value.dateStr}
}
- 星期{info.value.dayWeek}
- )}
- {info.value.day}
- )}
-
+ {settings.state.timeOptions.includes('date') &&
+ {!layout.isCompact && settings.state.timeOptions.includes('week') && (
+
+
+ {!layout.isCompact && settings.state.timeOptions.includes('lunal') && (
+
+
+ :
+ settings.state!.showTime &&
+ {text.value.dateStr}
}
+ 星期{info.value.dayWeek}
+ )}
+ {info.value.day}
+ )}
+
+ {settings.state.timeOptions.includes('date') &&
+ {!layout.isCompact && settings.state.timeOptions.includes('week') && (
+
+
+ {!layout.isCompact && settings.state.timeOptions.includes('lunal') && (
+
+
+ }
+
{text.value.dateStr}
}
+ 星期{info.value.dayWeek}
+ )}
+ {info.value.day}
+ )}
+ {
: '-top-[30px]'
: 'top-5'
)}>
- {
- layoutStore.state.simple = !layoutStore.state.simple
- }}
- >{layoutStore.state.simple ? '极简' : '常规'}
+
+ {
+ e.stopPropagation()
+ showOptions.value = !showOptions.value
+ }}>
+ {
+ layoutStore.state.simple &&
+
+
{
+ showOptions.value = false
+ }}>
+ {
+ SimpleShowStringType.map(item => (
+
+ }
+
+
+ {
+ layoutStore.state.simple = !layoutStore.state.simple
+ }}
+ >{layoutStore.state.simple ? '极简' : '常规'}
+ {
+ e.stopPropagation()
+ settingStore.state.simpleModeShowString.includes(item.value) ?
+ settingStore.state.simpleModeShowString = settingStore.state.simpleModeShowString.filter(el => el !== item.value)
+ :
+ settingStore.state.simpleModeShowString.push(item.value)
+ }}
+ >
+ {item.label}
+
+ ))
+ }
+ {
settingStore.state.showTop = settingStore.state.showTop === 'auto' ? 'show' : 'auto'
}}>
diff --git a/src/layout/header/search/SearchHistory.tsx b/src/layout/header/search/SearchHistory.tsx
index 01239dc..e589a70 100644
--- a/src/layout/header/search/SearchHistory.tsx
+++ b/src/layout/header/search/SearchHistory.tsx
@@ -1,11 +1,10 @@
import { defineComponent } from 'vue'
import { OhVueIcon, addIcons } from 'oh-vue-icons'
-import { MdHistory, MdRemove } from 'oh-vue-icons/icons'
+import { MdHistory, MdRemove, RiCloseCircleLine } from 'oh-vue-icons/icons'
import useSearchConfigStore from './useSearchConfigStore'
import jump from '@/utils/jump'
import useSettingsStore from '@/settings/useSettingsStore'
-addIcons(MdHistory)
-addIcons(MdRemove)
+addIcons(MdHistory, RiCloseCircleLine)
export default defineComponent(() => {
const searchConfig = useSearchConfigStore()
const settings = useSettingsStore()
@@ -15,7 +14,7 @@ export default defineComponent(() => {
{searchConfig.history.map((item, idx) => (
))}
diff --git a/src/layout/header/search/SearchSuggestion.tsx b/src/layout/header/search/SearchSuggestion.tsx
index 27a8e9b..4691c42 100644
--- a/src/layout/header/search/SearchSuggestion.tsx
+++ b/src/layout/header/search/SearchSuggestion.tsx
@@ -23,7 +23,7 @@ export const Item = defineComponent({
return () => (
{
jump(searchConfig.current.url + item)
}}
@@ -34,7 +33,7 @@ export default defineComponent(() => {
searchConfig.removeHistory(idx)
}}
>
-
{
@@ -46,12 +46,12 @@ export default defineComponent(() => {
const searchConfig = useSearchConfigStore()
return () => (
-
+
}
current={search.current}
num={0}
/>
@@ -59,10 +59,19 @@ export default defineComponent(() => {
prefix={translateUrl}
path={search.searchStr}
label="AI翻译："
- icon={
}
+ icon={
}
current={search.current}
num={1}
/>
+ {
+ search.addList.map((el, idx) => (
+ - {
)
const debouncedHandler = debounce((newValue) => {
console.log('数值改变并已防抖处理:', newValue)
- request
("GET", `/api/app/searchBars`).then((res) => {
+ request("GET", `/api/app/searchBars?keyword=${newValue || 'undefine'}`).then((res) => {
addList.value = res
+ console.log(addList.value);
+
})
}, 500) //
watch(searchStr, (newValue) => {
@@ -111,6 +113,7 @@ export default defineStore('search', () => {
focus,
showSearchConfig,
current,
- sugList
+ sugList, addList
+
}
})
diff --git a/src/main.css b/src/main.css
index 5250346..0ac2a4b 100644
--- a/src/main.css
+++ b/src/main.css
@@ -163,19 +163,16 @@ body {
.modal-enter-active,
.modal-leave-active {
transition:
- transform 0.3s ease-in-out,
- opacity 0.3s ease-in-out;
+ transform 2s ease-in-out,
+ opacity 2s ease-in-out;
}
.modal-enter-from {
- transform: translate(-50%, -60%);
opacity: 0;
}
.modal-leave-to {
- transform: translate(-50%, -40%);
opacity: 0;
}
-
/* 设置框动画 */
.settings-enter-active,
.settings-leave-active {
diff --git a/src/settings/SettingsOverlay.tsx b/src/settings/SettingsOverlay.tsx
index 693ca31..596616e 100644
--- a/src/settings/SettingsOverlay.tsx
+++ b/src/settings/SettingsOverlay.tsx
@@ -100,12 +100,17 @@ export default defineComponent(() => {
) : (
}
current={search.current}
num={0}
/>
@@ -59,10 +59,19 @@ export default defineComponent(() => {
prefix={translateUrl}
path={search.searchStr}
label="AI翻译："
- icon={}
+ icon={}
current={search.current}
num={1}
/>
+ {
+ search.addList.map((el, idx) => (
+
+ 
+ {el.name}
+
+
+ ))
+ }
{search.sugList.map((el, idx) => (
{
- router.go('settings-user')
+ if (profile.id) {
+ router.go('settings-user')
+ }else {
+ router.go('global-login')
+ }
+ // router.go('settings-user')
}}
>
登录注册
diff --git a/src/settings/useSettingsStore.ts b/src/settings/useSettingsStore.ts
index f397d60..d0c8fa7 100644
--- a/src/settings/useSettingsStore.ts
+++ b/src/settings/useSettingsStore.ts
@@ -3,6 +3,32 @@ import { computed, reactive } from 'vue'
export type VisibleState = 'show' | 'auto' | ''
export type TimeUnit = 'date' | 'week' | '12hour' | 'lunal' | 'second'
+
+
+export const SimpleShowStringType = [{
+ label: "侧边栏",
+ value: 'showSider',
+},
+{
+ label: "底部栏",
+ value: 'showDock',
+
+},
+{
+ label: "时间",
+ value: 'showTime',
+
+}, {
+ label: "日期",
+ value: 'showDate',
+
+}, {
+ label: "AI助手",
+ value: 'showPet',
+}
+]
+type SimpleValueType = typeof SimpleShowStringType[number]['value'];
+
export default defineStore(
'settings',
() => {
@@ -33,7 +59,9 @@ export default defineStore(
// 侧边栏
siderDirection: 'left' as 'left' | 'right',
// 禁用快捷键
- disabledShortcut: false
+ disabledShortcut: false,
+ // 极简模式显式
+ simpleModeShowString: ['showTime', 'showDate'] as SimpleValueType[]
})
return { state, blockInner: computed(() => state.blockSize - 2 * state.blockPadding) }
},
diff --git a/src/widgets/discount/Middle.tsx b/src/widgets/discount/Middle.tsx
index 1c91629..7b01d65 100644
--- a/src/widgets/discount/Middle.tsx
+++ b/src/widgets/discount/Middle.tsx
@@ -14,6 +14,7 @@ export default defineComponent(() => {
idx.value = 0
}
}, 5000)
+
})
return () => (
{
const audio = new Audio()
const time = useTimeStore()
const remainingTime = computed(() => {
- if (!state.isStart) {
- return 0
- }
+
return dayjs(state.beginTime).add(1, 'minute').diff(dayjs(time.date), 'second')
})
@@ -61,11 +59,7 @@ export default defineStore("work", () => {
state.isStart = false
state.beginTime = -1
stopMusic()
- if (remainingTime.value <= 0) {
- state.timeList.push(
- dayjs().valueOf()
- )
- }
+
}
const togglePlay = () => {
if (state.isPlaying) {
@@ -97,10 +91,16 @@ export default defineStore("work", () => {
}
watch(remainingTime, (val) => {
- if (val <= 0) {
+
+ if (val < 0) {
stopTomatoTime()
}
+ if (remainingTime.value === 0) {
+ state.timeList.push(
+ dayjs().valueOf()
+ )
+ }
})
const openShowModel = ref()
const openFullscreen = ref(false)