Unverified Commit a93aceec authored by Sendya's avatar Sendya

chore: update build tool

parent ef85dd3f
import { createApp, onMounted, reactive, watch, watchEffect } from 'vue';
import { createApp, onMounted, reactive, watch } from 'vue';
import { menus } from './menus';
import { MenuTheme } from '../src/typings';
import { BaseMenu, MenuTheme, MenuMode } from '../src';
import { Card, Space, Button, Switch } from 'ant-design-vue';
import { useMenu } from '../src/hooks/useMenu';
import { RouterLink } from './mock-router';
import { default as BaseMenu, MenuMode } from '../src/SiderMenu/BaseMenu';
import * as Icon from '@ant-design/icons-vue';
import 'ant-design-vue/dist/antd.less';
......@@ -16,21 +15,27 @@ const BaseMenuDemo = {
mode: 'inline' as MenuMode,
themeChecked: true,
modeChecked: true,
})
});
const [menuState] = useMenu({
collapsed: false,
openKeys: ['/dashboard'],
selectedKeys: ['/dashboard/monitor'],
})
});
onMounted(() => {
watch(() => state.themeChecked, (val) => {
state.theme = val ? 'dark' : 'light'
})
watch(() => state.modeChecked, (val) => {
state.mode = val ? 'inline' : 'horizontal'
})
})
watch(
() => state.themeChecked,
val => {
state.theme = val ? 'dark' : 'light';
},
);
watch(
() => state.modeChecked,
val => {
state.mode = val ? 'inline' : 'horizontal';
},
);
});
return () => (
<div class="components">
......@@ -41,20 +46,28 @@ const BaseMenuDemo = {
disabled={state.mode !== 'inline'}
type="primary"
onClick={() => {
menuState.collapsed = !menuState.collapsed
menuState.collapsed = !menuState.collapsed;
}}
>
{menuState.collapsed ? '展开' : '收起'}
</Button>
<Switch checkedChildren="dark" unCheckedChildren="light" v-model={[state.themeChecked, 'checked']} />
<Switch checkedChildren="inline" unCheckedChildren="horizontal" v-model={[state.modeChecked, 'checked']} />
<Switch
checkedChildren="dark"
unCheckedChildren="light"
v-model={[state.themeChecked, 'checked']}
/>
<Switch
checkedChildren="inline"
unCheckedChildren="horizontal"
v-model={[state.modeChecked, 'checked']}
/>
</Space>
<div style={{ margin: '12px 0' }}>
<p>SelectedKeys: { JSON.stringify(menuState.selectedKeys) }</p>
<p>OpenKeys: { JSON.stringify(menuState.openKeys) }</p>
<p>Collapsed: { JSON.stringify(menuState.collapsed) }</p>
<p>MenuMode: { JSON.stringify(state.mode) }</p>
<p>MenuTheme: { JSON.stringify(state.theme) }</p>
<p>SelectedKeys: {JSON.stringify(menuState.selectedKeys)}</p>
<p>OpenKeys: {JSON.stringify(menuState.openKeys)}</p>
<p>Collapsed: {JSON.stringify(menuState.collapsed)}</p>
<p>MenuMode: {JSON.stringify(state.mode)}</p>
<p>MenuTheme: {JSON.stringify(state.theme)}</p>
</div>
</Card>
<div class="demo" style="background: rgb(244,244,244);">
......@@ -68,11 +81,11 @@ const BaseMenuDemo = {
selectedKeys={menuState.selectedKeys}
{...{
'onUpdate:openKeys': $event => {
menuState.openKeys = $event
menuState.openKeys = $event;
},
'onUpdate:selectedKeys': $event => {
menuState.selectedKeys = $event
}
menuState.selectedKeys = $event;
},
}}
/>
</div>
......@@ -84,11 +97,11 @@ const BaseMenuDemo = {
const app = createApp(BaseMenuDemo);
const filterIcons = ['default', 'createFromIconfontCN', 'getTwoToneColor', 'setTwoToneColor']
const filterIcons = ['default', 'createFromIconfontCN', 'getTwoToneColor', 'setTwoToneColor'];
Object.keys(Icon)
.filter(k => !filterIcons.includes(k))
.forEach(k => {
app.component(Icon[k].displayName, Icon[k])
})
.filter(k => !filterIcons.includes(k))
.forEach(k => {
app.component(Icon[k].displayName, Icon[k]);
});
app.use(RouterLink).mount('#__vue-content>div');
......@@ -22,12 +22,12 @@
"prepublishOnly": "npm run lint && npm run compile"
},
"peerDependencies": {
"ant-design-vue": ">=2.2.0",
"ant-design-vue": "^2.2.0-rc.1",
"vue-router": "^4.0.3",
"vue": ">=3.1.0"
"vue": ">=3.1.3"
},
"devDependencies": {
"@ant-design-vue/tools": "^3.0.8",
"@ant-design-vue/tools": "^3.1.0",
"@babel/core": "^7.12.10",
"@babel/plugin-proposal-export-default-from": "^7.12.1",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
......@@ -45,7 +45,7 @@
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-typescript": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.1.1",
"@vue/compiler-sfc": "^3.1.3",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/test-utils": "^2.0.0-rc.6",
......@@ -66,7 +66,7 @@
"ts-jest": "^26.4.4",
"ts-node": "^9.1.1",
"typescript": "~3.9.3",
"vue": "^3.1.1",
"vue": "^3.1.3",
"vue-jest": "^5.0.0-alpha.10",
"vue-router": "^4.0.3"
},
......@@ -76,7 +76,7 @@
"core-js": "^3.9.1",
"lodash-es": "^4.17.20",
"omit.js": "^2.0.2",
"vue": "^3.1.1",
"vue": "^3.1.3",
"vue-types": "^3.0.1"
},
"files": [
......@@ -91,6 +91,7 @@
"./src/index.ts"
]
},
"parallel": ["es", "js"],
"css": {
"loaderOptions": {
"less": {
......
......@@ -14,7 +14,7 @@ import 'ant-design-vue/es/menu/style';
import Menu from 'ant-design-vue/es/menu';
import { defaultSettingProps, defaultSettings } from '../defaultSettings';
import { isImg, isUrl } from '../utils';
import { MenuMode, SelectInfo, OpenEventHandler } from './typings';
import { MenuMode } from './typings';
import {
MenuDataItem,
MenuTheme,
......@@ -25,8 +25,6 @@ import {
} from '../typings';
import './index.less';
export { MenuMode, SelectInfo, OpenEventHandler };
export function useRootSubmenuKeys(menus: MenuDataItem[]): ComputedRef<string[]> {
return computed(() => menus.map(it => it.path));
}
......
......@@ -38,8 +38,6 @@ SiderMenuWrapper.displayName = 'SiderMenuWrapper';
export {
SiderMenu,
SiderMenuProps,
PrivateSiderMenuProps,
// vue props
siderMenuProps,
};
......
export * from './RouteContext';
export * from './typings';
export * from './utils/getMenuData';
export { createContext, useContext, ContextType, CreateContext } from './hooks/context';
export { createContext, useContext } from './hooks/context';
export type { ContextType, CreateContext } from './hooks/context';
export { default as FooterToolbar } from './FooterToolbar';
export { default as GlobalFooter } from './GlobalFooter';
export { default as GridContent } from './GridContent';
......@@ -13,15 +15,16 @@ export { WrapContent } from './WrapContent';
// ProProviderData,
// } from './ProProvider';
export { default as PageContainer } from './PageContainer';
export { default as SiderMenuWrapper, SiderMenuWrapperProps } from './SiderMenu';
export {
default as BaseMenu,
BaseMenuProps,
MenuMode,
OpenEventHandler,
SelectInfo,
baseMenuProps,
} from './SiderMenu/BaseMenu';
export { default as WaterMark, WaterMarkProps } from './WaterMark/index';
export { default, BasicLayoutProps } from './BasicLayout';
export { default as SiderMenuWrapper } from './SiderMenu';
export type { SiderMenuWrapperProps } from './SiderMenu';
export { default as BaseMenu, baseMenuProps } from './SiderMenu/BaseMenu';
export type { BaseMenuProps } from './SiderMenu/BaseMenu';
export type { MenuMode, OpenEventHandler, SelectInfo } from './SiderMenu/typings';
export { default as WaterMark } from './WaterMark';
export type { WaterMarkProps } from './WaterMark';
export { default } from './BasicLayout';
export type { BasicLayoutProps } from './BasicLayout';
......@@ -2,10 +2,10 @@
# yarn lockfile v1
"@ant-design-vue/tools@^3.0.8":
version "3.0.8"
resolved "https://registry.yarnpkg.com/@ant-design-vue/tools/-/tools-3.0.8.tgz#a24f5aeebae875c656153bd5a121b754f0f39b0a"
integrity sha512-kZzp3cFWE1bv5WFkB1qTSTW1xIcUTOsQvygqYUeRly6rrFPo3DZ2S16Co/Awy43iA0biQdQvUIA+icCfZ30fDQ==
"@ant-design-vue/tools@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@ant-design-vue/tools/-/tools-3.1.0.tgz#cc0004ddfeb747e1e443e7190619aac2551d372b"
integrity sha512-lrdDMSS2CLsJU2tOVYMpNoE7E8k2c55VgEWsRk2sH38AOfeRrF20W1W/wIASa4rZ9j5ow9Du4Mb7NH0wLglf5w==
dependencies:
"@babel/core" "~7.2.2"
"@babel/plugin-proposal-class-properties" "~7.2.1"
......@@ -1667,6 +1667,11 @@
resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
"@types/estree@^0.0.48":
version "0.0.48"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74"
integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
version "4.17.19"
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
......@@ -2246,55 +2251,37 @@
semver "^6.1.0"
strip-ansi "^6.0.0"
"@vue/compiler-core@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.1.tgz#4f2c5d70eabd454675714cc8bd2b97f6a8efb196"
integrity sha512-Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.1.1"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-core@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcompiler-core%2Fdownload%2F%40vue%2Fcompiler-core-3.1.2.tgz#31ab1d88e1706a5c7a545faeeb64c31bd0101db0"
integrity sha1-MasdiOFwalx6VF+u62TDG9AQHbA=
"@vue/compiler-core@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.3.tgz#cd9587aa1fda533b1bdf752689e281efccfb7062"
integrity sha512-I58MDtVa8AYEIa3waLO6/89JdmgpkDAEcL3Vrmlsbnt07KZ5sIGLqaXjzGrOT57j9s8ty0WTYlLQq2rWUVYGCg==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.1.2"
"@vue/shared" "3.1.3"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz#ef60d856ac2ede5b2ad5c72a7a68122895e3d652"
integrity sha512-nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A==
dependencies:
"@vue/compiler-core" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/compiler-dom@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcompiler-dom%2Fdownload%2F%40vue%2Fcompiler-dom-3.1.2.tgz#75a7731bcc5d9718183a3c56c18e992f7c13e7b1"
integrity sha1-dadzG8xdlxgYOjxWwY6ZL3wT57E=
"@vue/compiler-dom@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.3.tgz#ade4ff7db4b0a197c543dd67b5bd467d737ac344"
integrity sha512-BunLXKP+UvY1XJ0L6M7KD/De0XP+kOlIxFg3OfXtVQZcLLgnLcTgSK3t/ylvIpYJOadGaHhb+BfCK/hdqOVAyw==
dependencies:
"@vue/compiler-core" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/compiler-core" "3.1.3"
"@vue/shared" "3.1.3"
"@vue/compiler-sfc@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.1.tgz#d4e4507c013d0b219f0b106b317ec5bb1cde3398"
integrity sha512-lSgMsZaYHF+bAgryq5aUqpvyfhu52GJI2/4LoiJCE5uaxc6FCZfxfgqgw/d9ltiZghv+HiISFtmQVAVvlsk+/w==
"@vue/compiler-sfc@^3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.3.tgz#f8aba30e5254a2b7be9516159630c8f75b412216"
integrity sha512-WpQ0oHMT5Aeb92UBnYCOxfHwdOGFZJ+BUyFiu2rG6TTDuw+aPNHCsFxvi55eG+2P7uiqRFK03lc0mGh3v8OVmw==
dependencies:
"@babel/parser" "^7.13.9"
"@babel/types" "^7.13.0"
"@vue/compiler-core" "3.1.1"
"@vue/compiler-dom" "3.1.1"
"@vue/compiler-ssr" "3.1.1"
"@vue/shared" "3.1.1"
"@types/estree" "^0.0.48"
"@vue/compiler-core" "3.1.3"
"@vue/compiler-dom" "3.1.3"
"@vue/compiler-ssr" "3.1.3"
"@vue/shared" "3.1.3"
consolidate "^0.16.0"
estree-walker "^2.0.1"
hash-sum "^2.0.0"
......@@ -2306,13 +2293,13 @@
postcss-selector-parser "^6.0.4"
source-map "^0.6.1"
"@vue/compiler-ssr@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.1.tgz#1d08b98601397258ed059b75966e0e94a385d770"
integrity sha512-7H6krZtVt3h/YzfNp7eYK41hMDz8ZskiBy+Wby+EDRINX6BD9JQ5C8zyy2xAa7T6Iz2VrQzsaJ/Bb52lTPSS5A==
"@vue/compiler-ssr@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.3.tgz#e74394b031f6956710f1881e21fa9fe1fa5a030e"
integrity sha512-dAktYBae3h9QWJoSKsrfrcZEjh4hwphDMWwj+ZwIkHBhEpyjdFLJks8MpxRjGMZzqz5vNyteVXkbOAaoiWPwwA==
dependencies:
"@vue/compiler-dom" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/compiler-dom" "3.1.3"
"@vue/shared" "3.1.3"
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
version "3.2.0"
......@@ -2349,39 +2336,34 @@
resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab"
integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
"@vue/reactivity@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.1.2.tgz?cache=0&sync_timestamp=1624386356780&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Freactivity%2Fdownload%2F%40vue%2Freactivity-3.1.2.tgz#66fa530dd726d2fef285ae55d02106a727db463b"
integrity sha1-ZvpTDdcm0v7yha5V0CEGpyfbRjs=
"@vue/reactivity@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.3.tgz#0aa4dfbac33f1fa296b9436042e5cbd3d84eeb46"
integrity sha512-495ymt2nUp9yPQxp+iH+Ya+o2xFpprJY8tLbAdJO0TOkBfN3dErheNhvrq6i1a33/v6qGTFhnUkemU7Xar0NSQ==
dependencies:
"@vue/shared" "3.1.2"
"@vue/shared" "3.1.3"
"@vue/runtime-core@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.1.2.tgz?cache=0&sync_timestamp=1624386357169&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fruntime-core%2Fdownload%2F%40vue%2Fruntime-core-3.1.2.tgz#f4dbc503cfc9a02ab5f1ebe002c3322512064a54"
integrity sha1-9NvFA8/JoCq18evgAsMyJRIGSlQ=
"@vue/runtime-core@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.3.tgz#8524f6e965aba3a94ae30ded715f13ec6be59c46"
integrity sha512-Bt6Dx7f91R0qDpHJ8VAlEYgKTXngka+el7Xw9xcNsFC9hv4K5QAJiL4UsxP4TjYPo6sZvj5gi06vvdQ3ODf7FQ==
dependencies:
"@vue/reactivity" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/reactivity" "3.1.3"
"@vue/shared" "3.1.3"
"@vue/runtime-dom@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.1.2.tgz#0fd8724f14bc7ba64b6c954d874a8d8a4fcb5fe9"
integrity sha1-D9hyTxS8e6ZLbJVNh0qNik/LX+k=
"@vue/runtime-dom@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.3.tgz#cb1c218564892db0705ce9576b39e50f820b27b8"
integrity sha512-BN04WyV2vmoeOLPm+N7xqUTa+3U51cR8GCLe0hQbK0xbA8a81vAEXTMnLNGdUYQT5sU8kBzwtowhmZb9vTvnRg==
dependencies:
"@vue/runtime-core" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/runtime-core" "3.1.3"
"@vue/shared" "3.1.3"
csstype "^2.6.8"
"@vue/shared@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.1.tgz#2287cfc3dc20e5b20aeb65c2c3a56533bdca801c"
integrity sha512-g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA==
"@vue/shared@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.1.2.tgz?cache=0&sync_timestamp=1624386358410&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fshared%2Fdownload%2F%40vue%2Fshared-3.1.2.tgz#1069c0bc7d6f4bd15ccf3a5f3be29450aca368f9"
integrity sha1-EGnAvH1vS9FczzpfO+KUUKyjaPk=
"@vue/shared@3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.3.tgz#3f6f5e7226d8d2d965ef39780ae3f89dc906b5fc"
integrity sha512-uGBX4bZVFvgranxzpH3q1gGmICUjEUnNrMIBFeZRw8hBfCPhT+VnuY8+mG2l/yEyY73J9e6d36CtbFUqDXa12w==
"@vue/test-utils@^2.0.0-rc.6":
version "2.0.0-rc.6"
......@@ -15840,14 +15822,14 @@ vue-types@^3.0.0, vue-types@^3.0.1:
dependencies:
is-plain-object "3.0.1"
vue@^3.1.0:
version "3.1.2"
resolved "https://registry.nlark.com/vue/download/vue-3.1.2.tgz#647f8e3949a3d600771dca25d50225dc3e594c64"
integrity sha1-ZH+OOUmj1gB3Hcol1QIl3D5ZTGQ=
vue@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.3.tgz#8659cdcd18bae0fc0aa79ddde6594c1e0b2facae"
integrity sha512-CC7HIDNh9AoGUu9XkFc7Mvz03VVwp+JZ1toXsNbxXvuznSOoWP2k4htXaAu3nClYhNPRVkWBh+jWoFEmZq3lsA==
dependencies:
"@vue/compiler-dom" "3.1.2"
"@vue/runtime-dom" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/compiler-dom" "3.1.3"
"@vue/runtime-dom" "3.1.3"
"@vue/shared" "3.1.3"
w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
version "1.0.2"
......
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