Commit 556f0233 authored by Sendya's avatar Sendya

fix: build error

parent 0ad2871f
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!-- content begin --> <!-- content begin -->
<router-view v-slot="{ Component }"> <router-view v-slot="{ Component }">
<WaterMark content="Pro Layout"> <WaterMark :content="watermarkContent">
<component :is="Component" /> <component :is="Component" />
</WaterMark> </WaterMark>
</router-view> </router-view>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, reactive, ref, watchEffect } from 'vue'; import { computed, defineComponent, reactive, ref, watchEffect, onMounted } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { message, Button, Input, Switch, Select, Avatar, Space, Badge, Menu } from 'ant-design-vue'; import { message, Button, Input, Switch, Select, Avatar, Space, Badge, Menu } from 'ant-design-vue';
import { getMenuData, clearMenuItem, WaterMark, FooterToolbar } from '@ant-design-vue/pro-layout'; import { getMenuData, clearMenuItem, WaterMark, FooterToolbar } from '@ant-design-vue/pro-layout';
...@@ -132,7 +132,7 @@ export default defineComponent({ ...@@ -132,7 +132,7 @@ export default defineComponent({
}, },
setup() { setup() {
const loading = ref(false); const loading = ref(false);
const watermarkContent = ref('Pro Layout');
const router = useRouter(); const router = useRouter();
const { menuData } = getMenuData(clearMenuItem(router.getRoutes())); const { menuData } = getMenuData(clearMenuItem(router.getRoutes()));
...@@ -181,8 +181,15 @@ export default defineComponent({ ...@@ -181,8 +181,15 @@ export default defineComponent({
}, 2000); }, 2000);
} }
onMounted(() => {
setTimeout(() => {
watermarkContent.value = 'New Mark';
}, 2000);
});
return { return {
i18n, i18n,
watermarkContent,
baseState, baseState,
state, state,
loading, loading,
......
import { createRouter, createWebHistory } from 'vue-router'; import { createRouter, createWebHistory } from 'vue-router';
import type { RouteRecordRaw } from 'vue-router'; import type { RouteRecordRaw } from 'vue-router';
import BasicLayout from './layouts/CustomLayout.vue'; import BasicLayout from './layouts/BasicLayout.vue';
import RouteView from './layouts/RouteView.vue'; import RouteView from './layouts/RouteView.vue';
const routes: RouteRecordRaw[] = [ const routes: RouteRecordRaw[] = [
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
], ],
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vue-tsc --noEmit && vite build", "build": "vue-tsc --noEmit && vite build && tsc -b --force tsconfig.esm.json",
"serve": "vite preview", "serve": "vite preview",
"build:types": "tsc -b --force tsconfig.esm.json" "build:types": "tsc -b --force tsconfig.esm.json"
}, },
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"omit.js": "^2.0.2", "omit.js": "^2.0.2",
"vue": "^3.2.22", "vue": "^3.2.22",
"vue-router": "^4.0.12" "vue-router": "^4.0.12",
"vue-types": "^4.1.1"
}, },
"devDependencies": { "devDependencies": {
"@ant-design/icons-vue": "^6.0.1", "@ant-design/icons-vue": "^6.0.1",
...@@ -61,7 +62,6 @@ ...@@ -61,7 +62,6 @@
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"less": "^4.1.2", "less": "^4.1.2",
"prettier": "^2.4.1", "prettier": "^2.4.1",
"tsc": "^2.0.3",
"typescript": "^4.4.4", "typescript": "^4.4.4",
"vite": "^2.6.14", "vite": "^2.6.14",
"vue-tsc": "^0.3.0" "vue-tsc": "^0.3.0"
......
...@@ -21,12 +21,12 @@ specifiers: ...@@ -21,12 +21,12 @@ specifiers:
lodash-es: ^4.17.21 lodash-es: ^4.17.21
omit.js: ^2.0.2 omit.js: ^2.0.2
prettier: ^2.4.1 prettier: ^2.4.1
tsc: ^2.0.3
typescript: ^4.4.4 typescript: ^4.4.4
vite: ^2.6.14 vite: ^2.6.14
vue: ^3.2.22 vue: ^3.2.22
vue-router: ^4.0.12 vue-router: ^4.0.12
vue-tsc: ^0.3.0 vue-tsc: ^0.3.0
vue-types: ^4.1.1
dependencies: dependencies:
ant-design-vue: 2.2.8_d993d7eb47a5c30940fe6565e4c82216 ant-design-vue: 2.2.8_d993d7eb47a5c30940fe6565e4c82216
...@@ -34,6 +34,7 @@ dependencies: ...@@ -34,6 +34,7 @@ dependencies:
omit.js: 2.0.2 omit.js: 2.0.2
vue: 3.2.22 vue: 3.2.22
vue-router: 4.0.12_vue@3.2.22 vue-router: 4.0.12_vue@3.2.22
vue-types: 4.1.1_vue@3.2.22
devDependencies: devDependencies:
'@ant-design/icons-vue': 6.0.1_vue@3.2.22 '@ant-design/icons-vue': 6.0.1_vue@3.2.22
...@@ -53,7 +54,6 @@ devDependencies: ...@@ -53,7 +54,6 @@ devDependencies:
fs-extra: 10.0.0 fs-extra: 10.0.0
less: 4.1.2 less: 4.1.2
prettier: 2.4.1 prettier: 2.4.1
tsc: 2.0.3
typescript: 4.4.4 typescript: 4.4.4
vite: 2.6.14_less@4.1.2 vite: 2.6.14_less@4.1.2
vue-tsc: 0.3.0_typescript@4.4.4 vue-tsc: 0.3.0_typescript@4.4.4
...@@ -1971,6 +1971,11 @@ packages: ...@@ -1971,6 +1971,11 @@ packages:
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
dev: false dev: false
/is-plain-object/5.0.0:
resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
engines: {node: '>=0.10.0'}
dev: false
/is-promise/2.2.2: /is-promise/2.2.2:
resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==} resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
dev: true dev: true
...@@ -2768,11 +2773,6 @@ packages: ...@@ -2768,11 +2773,6 @@ packages:
resolution: {integrity: sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=} resolution: {integrity: sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=}
dev: true dev: true
/tsc/2.0.3:
resolution: {integrity: sha512-SN+9zBUtrpUcOpaUO7GjkEHgWtf22c7FKbKCA4e858eEM7Qz86rRDpgOU2lBIDf0fLCsEg65ms899UMUIB2+Ow==}
hasBin: true
dev: true
/tsconfig-paths/3.11.0: /tsconfig-paths/3.11.0:
resolution: {integrity: sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==} resolution: {integrity: sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==}
dependencies: dependencies:
...@@ -3040,6 +3040,16 @@ packages: ...@@ -3040,6 +3040,16 @@ packages:
vue: 3.2.22 vue: 3.2.22
dev: false dev: false
/vue-types/4.1.1_vue@3.2.22:
resolution: {integrity: sha512-Jq2GZ/w6rExJbLA/h7nHBFLciu+YNekgox0DB64wN1snZ4IIJMq+qnqp1/vE4fc7vEjZcP5KGhLzkkSjIHLRzw==}
engines: {node: '>=12.16.0'}
peerDependencies:
vue: ^2.0.0 || ^3.0.0
dependencies:
is-plain-object: 5.0.0
vue: 3.2.22
dev: false
/vue/3.2.22: /vue/3.2.22:
resolution: {integrity: sha512-KD5nZpXVZquOC6926Xnp3zOvswrUyO9Rya7ZUoxWFQEjFDW4iACtwzubRB4Um2Om9kj6CaJOqAVRDSFlqLpdgw==} resolution: {integrity: sha512-KD5nZpXVZquOC6926Xnp3zOvswrUyO9Rya7ZUoxWFQEjFDW4iACtwzubRB4Um2Om9kj6CaJOqAVRDSFlqLpdgw==}
dependencies: dependencies:
......
...@@ -15,7 +15,8 @@ import { WithFalse, CustomRender } from '../typings'; ...@@ -15,7 +15,8 @@ import { WithFalse, CustomRender } from '../typings';
import { SiderProps } from './typings'; import { SiderProps } from './typings';
import { defaultSettingProps } from '../defaultSettings'; import { defaultSettingProps } from '../defaultSettings';
import { useRouteContext } from '../RouteContext'; import { useRouteContext } from '../RouteContext';
import { PropTypes, getMenuFirstChildren } from '../utils'; import PropTypes from 'vue-types';
import './index.less'; import './index.less';
const { Sider } = Layout; const { Sider } = Layout;
...@@ -66,15 +67,11 @@ export const siderMenuProps = { ...@@ -66,15 +67,11 @@ export const siderMenuProps = {
type: [Object, Boolean] as PropType<SiderProps['breakpoint'] | false>, type: [Object, Boolean] as PropType<SiderProps['breakpoint'] | false>,
default: () => false, default: () => false,
}, },
isMobile: PropTypes.looseBool, isMobile: PropTypes.bool,
splitMenus: PropTypes.looseBool, splitMenus: PropTypes.bool,
fixed: PropTypes.looseBool, fixed: PropTypes.bool,
hide: PropTypes.looseBool, hide: PropTypes.bool,
matchMenuKeys: { matchMenuKeys: PropTypes.array<string>(),
type: Array as PropType<string[]>,
default: () => [],
},
// events // events
onMenuHeaderClick: PropTypes.func, onMenuHeaderClick: PropTypes.func,
onMenuClick: PropTypes.func, onMenuClick: PropTypes.func,
......
import { Slots } from 'vue'; import { Slots } from 'vue';
import type { RouteRecord, RouteRecordRaw } from 'vue-router'; import type { RouteRecord, RouteRecordRaw } from 'vue-router';
import PropTypes from 'ant-design-vue/es/_util/vue-types'; // import PropTypes from 'ant-design-vue/es/_util/vue-types';
import PropTypes from 'vue-types';
import { MenuDataItem } from '../typings'; import { MenuDataItem } from '../typings';
export { default as isUrl } from './isUrl'; export { default as isUrl } from './isUrl';
......
/// <reference types="vite/client" /> /// <reference types="vite/client" />
declare module 'vue-types' {
import * as VueTypes from 'vue-types/index';
export default VueTypes;
}
...@@ -32,6 +32,7 @@ export default defineConfig({ ...@@ -32,6 +32,7 @@ export default defineConfig({
'vue', 'vue',
'vue-router', 'vue-router',
'@ant-design/icons-vue', '@ant-design/icons-vue',
'@ant-design/icons-svg',
'ant-design-vue', 'ant-design-vue',
'antd', 'antd',
'moment', 'moment',
...@@ -45,6 +46,7 @@ export default defineConfig({ ...@@ -45,6 +46,7 @@ export default defineConfig({
'vue-router': 'VueRouter', 'vue-router': 'VueRouter',
'ant-design-vue': 'antDesignVue', 'ant-design-vue': 'antDesignVue',
'@ant-design/icons-vue': 'iconsVue', '@ant-design/icons-vue': 'iconsVue',
'@ant-design/icons-svg': 'iconsSvg',
'antd': 'antd', 'antd': 'antd',
moment: 'moment', moment: 'moment',
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment