Commit a535d800 authored by Sendya's avatar Sendya

fix: clear style, remove unused vars

parent 7982cb1b
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"clean": "cross-env TS_NODE_PROJECT=scripts/tsconfig.json node -r ts-node/register ./scripts/cleanup.ts", "clean": "cross-env TS_NODE_PROJECT=scripts/tsconfig.json node -r ts-node/register ./scripts/cleanup.ts",
"start": "vc-tools run server", "start": "vc-tools run server",
"lint": "eslint src/ -c .eslintrc.js --ext .tsx,.ts", "lint": "eslint src/ -c .eslintrc.js --ext .tsx,.ts",
"lint-fix": "eslint --fix src/ -c .eslintrc.js --ext .tsx,.ts",
"compile": "vc-tools run compile", "compile": "vc-tools run compile",
"test": "cross-env NODE_ENV=test jest --config .jest.js", "test": "cross-env NODE_ENV=test jest --config .jest.js",
"prepublishOnly": "npm run lint && npm run generate && npm run compile && npm run test", "prepublishOnly": "npm run lint && npm run generate && npm run compile && npm run test",
......
import './BasicLayoutTest.less'; import './BasicLayoutTest.less';
import './BasicLayout.less';
import { App, FunctionalComponent } from 'vue'; import { App, FunctionalComponent } from 'vue';
...@@ -7,19 +8,10 @@ import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'; ...@@ -7,19 +8,10 @@ import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue';
import { default as ProProvider } from './ProProvider'; import { default as ProProvider } from './ProProvider';
import { default as GlobalFooter } from './GlobalFooter'; import { default as GlobalFooter } from './GlobalFooter';
import { default as SiderMenuWrapper, SiderMenuWrapperProps } from './SiderMenu'; import { default as SiderMenuWrapper, SiderMenuWrapperProps } from './SiderMenu';
import { createRouteContext } from './RouteContext';
import { WrapContent } from './WrapContent'; import { WrapContent } from './WrapContent';
const defaultI18nRender = (key: string) => key; const defaultI18nRender = (key: string) => key;
const { state: routeContext, Provider: RouteContextProvider } = createRouteContext({
isMobile: false,
menuData: [],
sideWidth: 208,
hasSideMenu: true,
hasHeader: true,
});
export type ProLayoutProps = SiderMenuWrapperProps; export type ProLayoutProps = SiderMenuWrapperProps;
const ProLayout: FunctionalComponent<ProLayoutProps> = (props, { emit, slots }) => { const ProLayout: FunctionalComponent<ProLayoutProps> = (props, { emit, slots }) => {
......
import { import { computed, defineComponent, onBeforeUnmount, onMounted, PropType, VNodeChild } from 'vue';
computed, import { useProProvider } from '../ProProvider';
defineComponent,
inject,
onBeforeUnmount,
onMounted,
PropType,
VNodeChild,
} from 'vue';
import { defaultProProviderProps, injectProConfigKey } from '../ProProvider';
import { RouteContextProps, useRouteContext } from '../RouteContext'; import { RouteContextProps, useRouteContext } from '../RouteContext';
import './index.less'; import './index.less';
...@@ -36,7 +28,7 @@ const FooterToolbar = defineComponent({ ...@@ -36,7 +28,7 @@ const FooterToolbar = defineComponent({
name: 'FooterToolbar', name: 'FooterToolbar',
props: FooterToolbarProps, props: FooterToolbarProps,
setup(props, { slots }) { setup(props, { slots }) {
const { getPrefixCls } = inject(injectProConfigKey, defaultProProviderProps); const { getPrefixCls } = useProProvider();
const baseClassName = props.prefixCls || getPrefixCls('footer-bar'); const baseClassName = props.prefixCls || getPrefixCls('footer-bar');
// const container = typeof props.getContainer === 'function' ? props.getContainer() // const container = typeof props.getContainer === 'function' ? props.getContainer()
...@@ -59,8 +51,8 @@ const FooterToolbar = defineComponent({ ...@@ -59,8 +51,8 @@ const FooterToolbar = defineComponent({
const dom = () => { const dom = () => {
return ( return (
<> <>
<div class={`${baseClassName.value}-left`}>{props.extra}</div> <div class={`${baseClassName}-left`}>{props.extra}</div>
<div class={`${baseClassName.value}-right`}>{slots.default?.()}</div> <div class={`${baseClassName}-right`}>{slots.default?.()}</div>
</> </>
); );
}; };
...@@ -72,7 +64,7 @@ const FooterToolbar = defineComponent({ ...@@ -72,7 +64,7 @@ const FooterToolbar = defineComponent({
}); });
return () => ( return () => (
<div class={baseClassName.value} style={{ width: width.value }}> <div class={baseClassName} style={{ width: width.value }}>
{props.renderContent {props.renderContent
? props.renderContent( ? props.renderContent(
{ {
......
import { FunctionalComponent, VNodeChild, ref, computed, toRefs } from 'vue'; import { FunctionalComponent, VNodeChild, ref } from 'vue';
/* replace antd ts define */
import { TabPaneProps } from './interfaces/TabPane'; import { TabPaneProps } from './interfaces/TabPane';
import { TabBarExtraContent, TabsProps } from './interfaces/Tabs'; import { TabBarExtraContent, TabsProps } from './interfaces/Tabs';
import { PageHeaderProps } from './interfaces/PageHeader'; import { PageHeaderProps } from './interfaces/PageHeader';
import { AffixProps } from './interfaces/Affix'; import { AffixProps } from './interfaces/Affix';
/* replace antd ts define end */
import { useRouteContext, RouteContextProps } from '../RouteContext'; import { useRouteContext, RouteContextProps } from '../RouteContext';
import { useProProvider } from '../ProProvider'; import { useProProvider } from '../ProProvider';
import { Affix, PageHeader, Tabs } from 'ant-design-vue'; import { Affix, PageHeader, Tabs } from 'ant-design-vue';
...@@ -89,7 +91,7 @@ const renderFooter = ( ...@@ -89,7 +91,7 @@ const renderFooter = (
tabBarExtraContent={tabBarExtraContent} tabBarExtraContent={tabBarExtraContent}
{...tabProps} {...tabProps}
> >
{tabList.map((item, index) => ( {tabList.map(item => (
<Tabs.TabPane {...item} tab={item.tab} key={item.key} /> <Tabs.TabPane {...item} tab={item.tab} key={item.key} />
))} ))}
</Tabs> </Tabs>
......
import { InjectionKey } from 'vue'; import { InjectionKey } from 'vue';
import { createContext, useContext } from './hooks/context'; import { createContext, useContext } from './hooks/context';
import { PureSettings } from './defaultSettings'; import { PureSettings } from './defaultSettings';
import { useProProvider } from './ProProvider';
export interface RouteContextProps extends Partial<PureSettings> { export interface RouteContextProps extends Partial<PureSettings> {
breadcrumb?: any; breadcrumb?: any;
......
...@@ -25,7 +25,7 @@ import { Menu } from 'ant-design-vue'; ...@@ -25,7 +25,7 @@ import { Menu } from 'ant-design-vue';
import defaultSettings, { PureSettings } from '../defaultSettings'; import defaultSettings, { PureSettings } from '../defaultSettings';
import { isImg, isUrl } from '../utils'; import { isImg, isUrl } from '../utils';
import { MenuMode, SelectInfo, OpenEventHandler, MenuInfo } from './typings'; import { MenuMode, SelectInfo, OpenEventHandler } from './typings';
import { RouteProps, MenuTheme, WithFalse } from '../typings'; import { RouteProps, MenuTheme, WithFalse } from '../typings';
export { MenuMode, SelectInfo, OpenEventHandler }; export { MenuMode, SelectInfo, OpenEventHandler };
...@@ -218,7 +218,13 @@ export default defineComponent({ ...@@ -218,7 +218,13 @@ export default defineComponent({
const handleOpenChange: OpenEventHandler = (openKeys): void => { const handleOpenChange: OpenEventHandler = (openKeys): void => {
emit('update:openKeys', openKeys); emit('update:openKeys', openKeys);
}; };
const handleSelect = (params: SelectInfo): void => { const handleSelect = (params: {
key: string | number;
keyPath: string[] | number[];
item: VNodeChild | any;
domEvent: MouseEvent;
selectedKeys: string[];
}): void => {
emit('update:selectedKeys', params.selectedKeys); emit('update:selectedKeys', params.selectedKeys);
}; };
...@@ -230,9 +236,7 @@ export default defineComponent({ ...@@ -230,9 +236,7 @@ export default defineComponent({
openKeys={props.openKeys || []} openKeys={props.openKeys || []}
selectedKeys={props.selectedKeys || []} selectedKeys={props.selectedKeys || []}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
onSelect={({ selectedKeys }) => { onSelect={handleSelect}
emit('update:selectedKeys', selectedKeys);
}}
> >
{props.menus && {props.menus &&
props.menus.map(menu => { props.menus.map(menu => {
......
...@@ -101,7 +101,7 @@ const SiderMenu: FunctionalComponent<SiderMenuProps> = (props: SiderMenuProps) = ...@@ -101,7 +101,7 @@ const SiderMenu: FunctionalComponent<SiderMenuProps> = (props: SiderMenuProps) =
const { getPrefixCls } = useProProvider(); const { getPrefixCls } = useProProvider();
const baseClassName = getPrefixCls('sider'); const baseClassName = getPrefixCls('sider');
const isMix = computed(() => props.layout === 'mix'); // const isMix = computed(() => props.layout === 'mix');
const fixed = computed(() => props.fixed); const fixed = computed(() => props.fixed);
const runtimeTheme = computed(() => (props.layout === 'mix' && 'light') || 'dark'); const runtimeTheme = computed(() => (props.layout === 'mix' && 'light') || 'dark');
const runtimeSideWidth = computed(() => const runtimeSideWidth = computed(() =>
......
...@@ -7,7 +7,7 @@ import SiderMenu, { SiderMenuProps, PrivateSiderMenuProps } from './SiderMenu'; ...@@ -7,7 +7,7 @@ import SiderMenu, { SiderMenuProps, PrivateSiderMenuProps } from './SiderMenu';
export type SiderMenuWrapperProps = SiderMenuProps & PrivateSiderMenuProps; export type SiderMenuWrapperProps = SiderMenuProps & PrivateSiderMenuProps;
const SiderMenuWrapper: FunctionalComponent<SiderMenuWrapperProps> = (props, { emit }) => { const SiderMenuWrapper: FunctionalComponent<SiderMenuWrapperProps> = props => {
return props.isMobile ? ( return props.isMobile ? (
<Drawer> <Drawer>
<SiderMenu {...props} /> <SiderMenu {...props} />
......
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