Commit a535d800 authored by Sendya's avatar Sendya

fix: clear style, remove unused vars

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