Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 将 IconFont 组件迁移至 components 内 #9

Merged
merged 2 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/app-header/btn/i18n-btn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { MenuProps } from 'antd';
import { Button, Dropdown } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont } from '../../../constants';
import { IconFont } from '../../iconfont';
import { LangList } from '../../../locales';
import { useGlobal } from '../../../recoil';
import useStyle from '../styles';
Expand Down
3 changes: 2 additions & 1 deletion src/components/app-header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import { Button, Divider, Dropdown, Popover, Space, Tooltip, Tour } from 'antd';
import classNames from 'classnames';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont, LocalStorageKey } from '../../constants';
import { LocalStorageKey } from '../../constants';
import { useFeature, useGlobal } from '../../recoil';
import type { ToolbarProps } from '../../types/l7editor';
import { IconFont } from '../iconfont';
import DownloadBtn from './btn/download-btn';
import HandBackBtn from './btn/handback-btn';
import I18nBtn from './btn/i18n-btn';
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/map-content/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { TabsProps } from 'antd';
import { Select, Tabs } from 'antd';
import React, { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont } from '../../constants';
import { IconFont } from '../iconfont';
import { useFeature, useGlobal } from '../../recoil';
import { AppTable } from '../app-table';
import { GeoJsonEditor } from '../geojson-editor';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import classNames from 'classnames';
import { cloneDeep } from 'lodash-es';
import React, { useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont, LayerZIndex } from '../../../constants';
import { LayerZIndex } from '../../../constants';
import { useFeature, useGlobal } from '../../../recoil';
import { IconFont } from '../../iconfont';
import { useStyle } from './styles';

const DistrictLayerOptions: Omit<LineLayerProps, 'source'> = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/map-control-group/auto-control/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CustomControl } from '@antv/larkmap';
import { Tooltip } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont } from '../../../constants';
import { IconFont } from '../../iconfont';
import { useFeature } from '../../../recoil';
import useStyles from '../styles';

Expand Down
2 changes: 1 addition & 1 deletion src/components/map-control-group/clear-control/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { CustomControl } from '@antv/larkmap';
import { Popconfirm, Tooltip } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont } from '../../../constants';
import { useFeature } from '../../../recoil';
import { prettierText } from '../../../utils/prettier-text';
import { IconFont } from '../../iconfont';
import useStyle from './styles';

export const ClearControl = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ import { CustomControl, RasterLayer, useScene } from '@antv/larkmap';
import { Checkbox, Popover, Tabs, Tooltip } from 'antd';
import React, { useEffect, useMemo, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import {
GOOGLE_TILE_MAP_URL,
IconFont,
OfficeLayerEnum,
} from '../../../constants';
import { GOOGLE_TILE_MAP_URL, OfficeLayerEnum } from '../../../constants';
import { useGlobal } from '../../../recoil';
import { IconFont } from '../../iconfont';
import useStyles from '../styles';
import useStyle from './styles';

Expand Down Expand Up @@ -126,7 +123,7 @@ export function OfficialLayerControl() {
}, [officeLayerGroup, layerType]);

return (
<CustomControl position="bottomright" >
<CustomControl position="bottomright">
<Popover
content={
<Tabs
Expand Down
3 changes: 2 additions & 1 deletion src/components/map-control-group/sam-control/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { Spin, Tooltip, message } from 'antd';
import { isEmpty } from 'lodash-es';
import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { GOOGLE_TILE_MAP_URL, IconFont, LayerId } from '../../../constants';
import { GOOGLE_TILE_MAP_URL, LayerId } from '../../../constants';
import { useFeature } from '../../../recoil';
import type { IFeatures } from '../../../types';
import { IconFont } from '../../iconfont';
import useStyles from '../styles';
import useStyle from './style';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tooltip, message } from 'antd';
import classNames from 'classnames';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { IconFont } from '../../../constants';
import { IconFont } from '../../iconfont';
import { useGlobal } from '../../../recoil';
import useStyle from './styles';

Expand Down
2 changes: 0 additions & 2 deletions src/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,3 @@ export enum OfficeLayerEnum {
AmapBuildings = 'amapBuildings',
GoogleSatellite = 'googleSatellite',
}

export { IconFont } from './iconfont';
Loading