Skip to content

Commit 3d3532a

Browse files
chunshandchunshand
committed
Merge remote-tracking branch 'DaYePython/main'
# Conflicts: # pnpm-lock.yaml
2 parents a8fd2ec + 12ebb30 commit 3d3532a

File tree

15 files changed

+445
-1240
lines changed

15 files changed

+445
-1240
lines changed

‎.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shamefully-hoist=true

‎auto-imports.d.ts

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
// Generated by 'unplugin-auto-import'
2+
// We suggest you to commit this file into source control
3+
declare global {
4+
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
5+
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
6+
const biSyncRef: typeof import('@vueuse/core')['biSyncRef']
7+
const computed: typeof import('vue')['computed']
8+
const computedInject: typeof import('@vueuse/core')['computedInject']
9+
const controlledComputed: typeof import('@vueuse/core')['controlledComputed']
10+
const controlledRef: typeof import('@vueuse/core')['controlledRef']
11+
const createApp: typeof import('vue')['createApp']
12+
const createEventHook: typeof import('@vueuse/core')['createEventHook']
13+
const createGlobalState: typeof import('@vueuse/core')['createGlobalState']
14+
const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
15+
const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
16+
const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
17+
const customRef: typeof import('vue')['customRef']
18+
const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
19+
const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch']
20+
const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
21+
const defineComponent: typeof import('vue')['defineComponent']
22+
const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
23+
const effectScope: typeof import('vue')['effectScope']
24+
const EffectScope: typeof import('vue')['EffectScope']
25+
const extendRef: typeof import('@vueuse/core')['extendRef']
26+
const getCurrentInstance: typeof import('vue')['getCurrentInstance']
27+
const getCurrentScope: typeof import('vue')['getCurrentScope']
28+
const h: typeof import('vue')['h']
29+
const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
30+
const inject: typeof import('vue')['inject']
31+
const isDefined: typeof import('@vueuse/core')['isDefined']
32+
const isReadonly: typeof import('vue')['isReadonly']
33+
const isRef: typeof import('vue')['isRef']
34+
const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable']
35+
const markRaw: typeof import('vue')['markRaw']
36+
const nextTick: typeof import('vue')['nextTick']
37+
const onActivated: typeof import('vue')['onActivated']
38+
const onBeforeMount: typeof import('vue')['onBeforeMount']
39+
const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
40+
const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
41+
const onClickOutside: typeof import('@vueuse/core')['onClickOutside']
42+
const onDeactivated: typeof import('vue')['onDeactivated']
43+
const onErrorCaptured: typeof import('vue')['onErrorCaptured']
44+
const onKeyStroke: typeof import('@vueuse/core')['onKeyStroke']
45+
const onLongPress: typeof import('@vueuse/core')['onLongPress']
46+
const onMounted: typeof import('vue')['onMounted']
47+
const onRenderTracked: typeof import('vue')['onRenderTracked']
48+
const onRenderTriggered: typeof import('vue')['onRenderTriggered']
49+
const onScopeDispose: typeof import('vue')['onScopeDispose']
50+
const onServerPrefetch: typeof import('vue')['onServerPrefetch']
51+
const onStartTyping: typeof import('@vueuse/core')['onStartTyping']
52+
const onUnmounted: typeof import('vue')['onUnmounted']
53+
const onUpdated: typeof import('vue')['onUpdated']
54+
const pausableWatch: typeof import('@vueuse/core')['pausableWatch']
55+
const provide: typeof import('vue')['provide']
56+
const reactify: typeof import('@vueuse/core')['reactify']
57+
const reactifyObject: typeof import('@vueuse/core')['reactifyObject']
58+
const reactive: typeof import('vue')['reactive']
59+
const reactiveComputed: typeof import('@vueuse/core')['reactiveComputed']
60+
const reactiveOmit: typeof import('@vueuse/core')['reactiveOmit']
61+
const reactivePick: typeof import('@vueuse/core')['reactivePick']
62+
const readonly: typeof import('vue')['readonly']
63+
const ref: typeof import('vue')['ref']
64+
const refDefault: typeof import('@vueuse/core')['refDefault']
65+
const resolveComponent: typeof import('vue')['resolveComponent']
66+
const shallowReactive: typeof import('vue')['shallowReactive']
67+
const shallowReadonly: typeof import('vue')['shallowReadonly']
68+
const shallowRef: typeof import('vue')['shallowRef']
69+
const syncRef: typeof import('@vueuse/core')['syncRef']
70+
const templateRef: typeof import('@vueuse/core')['templateRef']
71+
const throttledRef: typeof import('@vueuse/core')['throttledRef']
72+
const throttledWatch: typeof import('@vueuse/core')['throttledWatch']
73+
const toRaw: typeof import('vue')['toRaw']
74+
const toReactive: typeof import('@vueuse/core')['toReactive']
75+
const toRef: typeof import('vue')['toRef']
76+
const toRefs: typeof import('vue')['toRefs']
77+
const triggerRef: typeof import('vue')['triggerRef']
78+
const tryOnBeforeUnmount: typeof import('@vueuse/core')['tryOnBeforeUnmount']
79+
const tryOnMounted: typeof import('@vueuse/core')['tryOnMounted']
80+
const tryOnScopeDispose: typeof import('@vueuse/core')['tryOnScopeDispose']
81+
const tryOnUnmounted: typeof import('@vueuse/core')['tryOnUnmounted']
82+
const unref: typeof import('vue')['unref']
83+
const unrefElement: typeof import('@vueuse/core')['unrefElement']
84+
const until: typeof import('@vueuse/core')['until']
85+
const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
86+
const useAsyncQueue: typeof import('@vueuse/core')['useAsyncQueue']
87+
const useAsyncState: typeof import('@vueuse/core')['useAsyncState']
88+
const useAttrs: typeof import('vue')['useAttrs']
89+
const useBase64: typeof import('@vueuse/core')['useBase64']
90+
const useBattery: typeof import('@vueuse/core')['useBattery']
91+
const useBreakpoints: typeof import('@vueuse/core')['useBreakpoints']
92+
const useBroadcastChannel: typeof import('@vueuse/core')['useBroadcastChannel']
93+
const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation']
94+
const useCached: typeof import('@vueuse/core')['useCached']
95+
const useClamp: typeof import('@vueuse/core')['useClamp']
96+
const useClipboard: typeof import('@vueuse/core')['useClipboard']
97+
const useColorMode: typeof import('@vueuse/core')['useColorMode']
98+
const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog']
99+
const useCounter: typeof import('@vueuse/core')['useCounter']
100+
const useCssModule: typeof import('vue')['useCssModule']
101+
const useCssVar: typeof import('@vueuse/core')['useCssVar']
102+
const useCssVars: typeof import('vue')['useCssVars']
103+
const useCycleList: typeof import('@vueuse/core')['useCycleList']
104+
const useDark: typeof import('@vueuse/core')['useDark']
105+
const useDebounce: typeof import('@vueuse/core')['useDebounce']
106+
const useDebouncedRefHistory: typeof import('@vueuse/core')['useDebouncedRefHistory']
107+
const useDebounceFn: typeof import('@vueuse/core')['useDebounceFn']
108+
const useDeviceMotion: typeof import('@vueuse/core')['useDeviceMotion']
109+
const useDeviceOrientation: typeof import('@vueuse/core')['useDeviceOrientation']
110+
const useDevicePixelRatio: typeof import('@vueuse/core')['useDevicePixelRatio']
111+
const useDevicesList: typeof import('@vueuse/core')['useDevicesList']
112+
const useDisplayMedia: typeof import('@vueuse/core')['useDisplayMedia']
113+
const useDocumentVisibility: typeof import('@vueuse/core')['useDocumentVisibility']
114+
const useDraggable: typeof import('@vueuse/core')['useDraggable']
115+
const useElementBounding: typeof import('@vueuse/core')['useElementBounding']
116+
const useElementByPoint: typeof import('@vueuse/core')['useElementByPoint']
117+
const useElementHover: typeof import('@vueuse/core')['useElementHover']
118+
const useElementSize: typeof import('@vueuse/core')['useElementSize']
119+
const useElementVisibility: typeof import('@vueuse/core')['useElementVisibility']
120+
const useEventBus: typeof import('@vueuse/core')['useEventBus']
121+
const useEventListener: typeof import('@vueuse/core')['useEventListener']
122+
const useEventSource: typeof import('@vueuse/core')['useEventSource']
123+
const useEyeDropper: typeof import('@vueuse/core')['useEyeDropper']
124+
const useFavicon: typeof import('@vueuse/core')['useFavicon']
125+
const useFetch: typeof import('@vueuse/core')['useFetch']
126+
const useFocus: typeof import('@vueuse/core')['useFocus']
127+
const useFocusWithin: typeof import('@vueuse/core')['useFocusWithin']
128+
const useFps: typeof import('@vueuse/core')['useFps']
129+
const useFullscreen: typeof import('@vueuse/core')['useFullscreen']
130+
const useGeolocation: typeof import('@vueuse/core')['useGeolocation']
131+
const useIdle: typeof import('@vueuse/core')['useIdle']
132+
const useInfiniteScroll: typeof import('@vueuse/core')['useInfiniteScroll']
133+
const useIntersectionObserver: typeof import('@vueuse/core')['useIntersectionObserver']
134+
const useInterval: typeof import('@vueuse/core')['useInterval']
135+
const useIntervalFn: typeof import('@vueuse/core')['useIntervalFn']
136+
const useKeyModifier: typeof import('@vueuse/core')['useKeyModifier']
137+
const useLastChanged: typeof import('@vueuse/core')['useLastChanged']
138+
const useLocalStorage: typeof import('@vueuse/core')['useLocalStorage']
139+
const useMagicKeys: typeof import('@vueuse/core')['useMagicKeys']
140+
const useManualRefHistory: typeof import('@vueuse/core')['useManualRefHistory']
141+
const useMediaControls: typeof import('@vueuse/core')['useMediaControls']
142+
const useMediaQuery: typeof import('@vueuse/core')['useMediaQuery']
143+
const useMemoize: typeof import('@vueuse/core')['useMemoize']
144+
const useMemory: typeof import('@vueuse/core')['useMemory']
145+
const useMounted: typeof import('@vueuse/core')['useMounted']
146+
const useMouse: typeof import('@vueuse/core')['useMouse']
147+
const useMouseInElement: typeof import('@vueuse/core')['useMouseInElement']
148+
const useMousePressed: typeof import('@vueuse/core')['useMousePressed']
149+
const useMutationObserver: typeof import('@vueuse/core')['useMutationObserver']
150+
const useNavigatorLanguage: typeof import('@vueuse/core')['useNavigatorLanguage']
151+
const useNetwork: typeof import('@vueuse/core')['useNetwork']
152+
const useNow: typeof import('@vueuse/core')['useNow']
153+
const useOffsetPagination: typeof import('@vueuse/core')['useOffsetPagination']
154+
const useOnline: typeof import('@vueuse/core')['useOnline']
155+
const usePageLeave: typeof import('@vueuse/core')['usePageLeave']
156+
const useParallax: typeof import('@vueuse/core')['useParallax']
157+
const usePermission: typeof import('@vueuse/core')['usePermission']
158+
const usePointer: typeof import('@vueuse/core')['usePointer']
159+
const usePointerSwipe: typeof import('@vueuse/core')['usePointerSwipe']
160+
const usePreferredColorScheme: typeof import('@vueuse/core')['usePreferredColorScheme']
161+
const usePreferredDark: typeof import('@vueuse/core')['usePreferredDark']
162+
const usePreferredLanguages: typeof import('@vueuse/core')['usePreferredLanguages']
163+
const useRafFn: typeof import('@vueuse/core')['useRafFn']
164+
const useRefHistory: typeof import('@vueuse/core')['useRefHistory']
165+
const useResizeObserver: typeof import('@vueuse/core')['useResizeObserver']
166+
const useScreenSafeArea: typeof import('@vueuse/core')['useScreenSafeArea']
167+
const useScriptTag: typeof import('@vueuse/core')['useScriptTag']
168+
const useScroll: typeof import('@vueuse/core')['useScroll']
169+
const useScrollLock: typeof import('@vueuse/core')['useScrollLock']
170+
const useSessionStorage: typeof import('@vueuse/core')['useSessionStorage']
171+
const useShare: typeof import('@vueuse/core')['useShare']
172+
const useSlots: typeof import('vue')['useSlots']
173+
const useSpeechRecognition: typeof import('@vueuse/core')['useSpeechRecognition']
174+
const useSpeechSynthesis: typeof import('@vueuse/core')['useSpeechSynthesis']
175+
const useStorage: typeof import('@vueuse/core')['useStorage']
176+
const useStorageAsync: typeof import('@vueuse/core')['useStorageAsync']
177+
const useStyleTag: typeof import('@vueuse/core')['useStyleTag']
178+
const useSwipe: typeof import('@vueuse/core')['useSwipe']
179+
const useTemplateRefsList: typeof import('@vueuse/core')['useTemplateRefsList']
180+
const useTextSelection: typeof import('@vueuse/core')['useTextSelection']
181+
const useThrottle: typeof import('@vueuse/core')['useThrottle']
182+
const useThrottledRefHistory: typeof import('@vueuse/core')['useThrottledRefHistory']
183+
const useThrottleFn: typeof import('@vueuse/core')['useThrottleFn']
184+
const useTimeAgo: typeof import('@vueuse/core')['useTimeAgo']
185+
const useTimeout: typeof import('@vueuse/core')['useTimeout']
186+
const useTimeoutFn: typeof import('@vueuse/core')['useTimeoutFn']
187+
const useTimestamp: typeof import('@vueuse/core')['useTimestamp']
188+
const useTitle: typeof import('@vueuse/core')['useTitle']
189+
const useToggle: typeof import('@vueuse/core')['useToggle']
190+
const useTransition: typeof import('@vueuse/core')['useTransition']
191+
const useUrlSearchParams: typeof import('@vueuse/core')['useUrlSearchParams']
192+
const useUserMedia: typeof import('@vueuse/core')['useUserMedia']
193+
const useVibrate: typeof import('@vueuse/core')['useVibrate']
194+
const useVirtualList: typeof import('@vueuse/core')['useVirtualList']
195+
const useVModel: typeof import('@vueuse/core')['useVModel']
196+
const useVModels: typeof import('@vueuse/core')['useVModels']
197+
const useWakeLock: typeof import('@vueuse/core')['useWakeLock']
198+
const useWebNotification: typeof import('@vueuse/core')['useWebNotification']
199+
const useWebSocket: typeof import('@vueuse/core')['useWebSocket']
200+
const useWebWorker: typeof import('@vueuse/core')['useWebWorker']
201+
const useWebWorkerFn: typeof import('@vueuse/core')['useWebWorkerFn']
202+
const useWindowFocus: typeof import('@vueuse/core')['useWindowFocus']
203+
const useWindowScroll: typeof import('@vueuse/core')['useWindowScroll']
204+
const useWindowSize: typeof import('@vueuse/core')['useWindowSize']
205+
const watch: typeof import('vue')['watch']
206+
const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
207+
const watchEffect: typeof import('vue')['watchEffect']
208+
const watchOnce: typeof import('@vueuse/core')['watchOnce']
209+
const watchWithFilter: typeof import('@vueuse/core')['watchWithFilter']
210+
const whenever: typeof import('@vueuse/core')['whenever']
211+
}
212+
export {}

‎components.d.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// generated by unplugin-vue-components
2+
// We suggest you to commit this file into source control
3+
// Read more: https://github.com/vuejs/vue-next/pull/3399
4+
5+
declare module 'vue' {
6+
export interface GlobalComponents {
7+
Home: typeof import('./src/components/home.vue')['default']
8+
NButton: typeof import('naive-ui')['NButton']
9+
NCard: typeof import('naive-ui')['NCard']
10+
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
11+
NGrid: typeof import('naive-ui')['NGrid']
12+
NGridItem: typeof import('naive-ui')['NGridItem']
13+
NInput: typeof import('naive-ui')['NInput']
14+
NMessageProvider: typeof import('naive-ui')['NMessageProvider']
15+
NSelect: typeof import('naive-ui')['NSelect']
16+
NSpace: typeof import('naive-ui')['NSpace']
17+
NText: typeof import('naive-ui')['NText']
18+
}
19+
}
20+
21+
export { }

‎index.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
3+
4+
<head>
45
<link rel="icon" href="/favicon.ico" />
56
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
67
<title></title>
7-
</head>
8-
<body>
8+
</head>
9+
10+
<body>
911
<div id="app"></div>
10-
<script type="module" src="/src/main.js"></script>
11-
</body>
12-
</html>
12+
<script type="module" src="/src/main.ts"></script>
13+
</body>
14+
15+
</html>

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"dependencies": {
1111
"@vueuse/core": "^7.7.1",
1212
"naive-ui": "^2.26.4",
13+
"unplugin-auto-import": "^0.7.1",
1314
"vue": "^3.2.25"
1415
},
1516
"devDependencies": {
1617
"@vitejs/plugin-vue": "^2.2.0",
1718
"unplugin-vue-components": "^0.17.21",
19+
"utools-api-types": "^2.6.3",
1820
"vite": "^2.8.0"
1921
}
2022
}

‎public/plugin.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"main": "./index.html",
33
"logo": "logo.png",
4-
"features": [
5-
{
6-
"code": "git-commit",
7-
"explain": "帮助开发快速完成git commit message",
8-
"cmds": [
9-
"gitc"
10-
]
11-
}
12-
]
4+
"features": [{
5+
"code": "git-commit",
6+
"explain": "帮助开发快速完成git commit message",
7+
"cmds": [
8+
"gitc"
9+
]
10+
}],
11+
"development": {
12+
"main": "./index.html"
13+
}
1314
}

‎shims.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
declare module '*.vue' {
3+
import type { DefineComponent } from 'vue'
4+
const component: DefineComponent<{}, {}, any>
5+
export default component
6+
}

‎src/App.vue

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
<template>
42
<NConfigProvider :theme="theme">
53
<NMessageProvider>
@@ -10,26 +8,20 @@
108
<NButton @click="theme = null">浅色</NButton> -->
119
</template>
1210
<script setup lang="ts">
13-
import { ref, onMounted } from "vue";
11+
import { onMounted, computed } from "vue";
1412
import { darkTheme } from "naive-ui";
15-
import Home from "./components/home2.vue";
16-
const theme = ref(null);
17-
const loadFunc = () => {
18-
if (utools.isDarkColors()) {
19-
theme.value = darkTheme;
20-
} else {
21-
theme.value = null;
22-
}
23-
};
13+
import { BuiltInGlobalTheme } from "naive-ui/lib/themes/interface";
14+
const isDark = ref(false);
15+
const theme = computed<BuiltInGlobalTheme | null>(() => {
16+
return isDark.value ? darkTheme : null
17+
})
2418
let utools = null;
25-
if (window["utools"]) {
26-
utools = window["utools"];
27-
utools.onPluginReady(() => {
28-
console.log("插件装配完成，已准备好");
29-
loadFunc();
30-
});
31-
utools.onPluginEnter(({ code, type, payload }) => {
32-
loadFunc();
33-
});
34-
}
19+
onMounted(() => {
20+
if (window["utools"]) {
21+
utools = window["utools"];
22+
utools.onPluginEnter(() => {
23+
isDark.value = utools.isDarkColors();
24+
});
25+
}
26+
})
3527
</script>

0 commit comments

Comments
 (0)