|
@@ -1,18 +1,18 @@
|
|
-import { computed, defineComponent, onMounted, ref, onUnmounted } from 'vue';
|
|
|
|
|
|
+import { computed, defineComponent, onMounted, onUnmounted } from 'vue';
|
|
import { NConfigProvider, zhCN, dateZhCN, NModal } from 'naive-ui';
|
|
import { NConfigProvider, zhCN, dateZhCN, NModal } from 'naive-ui';
|
|
import { AppProvider } from './components/Application';
|
|
import { AppProvider } from './components/Application';
|
|
-import { RouterView, useRouter } from 'vue-router';
|
|
|
|
|
|
+import { RouterView } from 'vue-router';
|
|
import setting from './settings/designSetting';
|
|
import setting from './settings/designSetting';
|
|
import { lighten } from './utils';
|
|
import { lighten } from './utils';
|
|
import RouterError from './components/RouterError';
|
|
import RouterError from './components/RouterError';
|
|
import { useRegisterSW } from 'virtual:pwa-register/vue';
|
|
import { useRegisterSW } from 'virtual:pwa-register/vue';
|
|
import { useUserStore } from './store/modules/users';
|
|
import { useUserStore } from './store/modules/users';
|
|
-import { modalClickMask } from './state';
|
|
|
|
-import ScreenTips from './screen-tips';
|
|
|
|
|
|
+import UpdateTips from './update-tips';
|
|
|
|
|
|
export default defineComponent({
|
|
export default defineComponent({
|
|
name: 'App',
|
|
name: 'App',
|
|
setup() {
|
|
setup() {
|
|
|
|
+ const upload = true;
|
|
const { needRefresh, offlineReady, updateServiceWorker } = useRegisterSW({
|
|
const { needRefresh, offlineReady, updateServiceWorker } = useRegisterSW({
|
|
onRegistered(r: any) {
|
|
onRegistered(r: any) {
|
|
console.log(r, 'registered');
|
|
console.log(r, 'registered');
|
|
@@ -214,7 +214,7 @@ export default defineComponent({
|
|
});
|
|
});
|
|
|
|
|
|
return () => (
|
|
return () => (
|
|
- <>
|
|
|
|
|
|
+ <div>
|
|
<NConfigProvider
|
|
<NConfigProvider
|
|
locale={zhCN}
|
|
locale={zhCN}
|
|
themeOverrides={getThemeOverrides.value}
|
|
themeOverrides={getThemeOverrides.value}
|
|
@@ -226,11 +226,9 @@ export default defineComponent({
|
|
<RouterError />
|
|
<RouterError />
|
|
</AppProvider>
|
|
</AppProvider>
|
|
</NConfigProvider>
|
|
</NConfigProvider>
|
|
- {/* <NModal
|
|
|
|
- maskClosable={modalClickMask}
|
|
|
|
- v-model:show={showModalMask.value}>
|
|
|
|
- <ScreenTips />
|
|
|
|
- </NModal> */}
|
|
|
|
|
|
+ <NModal maskClosable={false} v-model:show={needRefresh.value}>
|
|
|
|
+ <UpdateTips onConfirm={() => updateServiceWorker(true)} />
|
|
|
|
+ </NModal>
|
|
|
|
|
|
<span style={{ display: 'none' }}>
|
|
<span style={{ display: 'none' }}>
|
|
{needRefresh.value ? '新内容可用,点击刷新页面' : '没有新内容'}
|
|
{needRefresh.value ? '新内容可用,点击刷新页面' : '没有新内容'}
|
|
@@ -248,7 +246,7 @@ export default defineComponent({
|
|
content={showModalMsg.value}
|
|
content={showModalMsg.value}
|
|
positive-text="确认"
|
|
positive-text="确认"
|
|
onPositiveClick={submitCallback}></NModal> */}
|
|
onPositiveClick={submitCallback}></NModal> */}
|
|
- </>
|
|
|
|
|
|
+ </div>
|
|
);
|
|
);
|
|
}
|
|
}
|
|
});
|
|
});
|