mirror of
https://github.com/ant-design/ant-design.git
synced 2024-11-28 05:05:48 +08:00
chore: Clean up merged code (#20595)
* chore: Clean up merged code * fix hy-am
This commit is contained in:
二货机器人
GitHub
parent
014bed6358
commit
0b5c92b1a4
@ -1,117 +0,0 @@
|
||||
import * as React from 'react';
|
||||
import * as moment from 'moment';
|
||||
import { TimePickerProps } from '../time-picker';
|
||||
import { tuple } from '../_util/type';
|
||||
|
||||
export interface PickerProps {
|
||||
id?: number | string;
|
||||
name?: string;
|
||||
prefixCls?: string;
|
||||
inputPrefixCls?: string;
|
||||
format?: string | string[];
|
||||
disabled?: boolean;
|
||||
allowClear?: boolean;
|
||||
className?: string;
|
||||
pickerClass?: string;
|
||||
pickerInputClass?: string;
|
||||
suffixIcon?: React.ReactNode;
|
||||
style?: React.CSSProperties;
|
||||
popupStyle?: React.CSSProperties;
|
||||
dropdownClassName?: string;
|
||||
locale?: any;
|
||||
size?: 'large' | 'small' | 'default';
|
||||
getCalendarContainer?: (triggerNode: Element) => HTMLElement;
|
||||
open?: boolean;
|
||||
onOpenChange?: (status: boolean) => void;
|
||||
disabledDate?: (current: moment.Moment | null) => boolean;
|
||||
dateRender?: (current: moment.Moment, today: moment.Moment) => React.ReactNode;
|
||||
autoFocus?: boolean;
|
||||
onFocus?: React.FocusEventHandler;
|
||||
onBlur?: (e: React.SyntheticEvent) => void;
|
||||
}
|
||||
|
||||
export interface SinglePickerProps {
|
||||
value?: moment.Moment | null;
|
||||
defaultValue?: moment.Moment | null;
|
||||
defaultPickerValue?: moment.Moment | null;
|
||||
placeholder?: string;
|
||||
renderExtraFooter?: (mode: DatePickerMode) => React.ReactNode;
|
||||
onChange?: (date: moment.Moment | null, dateString: string) => void;
|
||||
}
|
||||
|
||||
const DatePickerModes = tuple('time', 'date', 'month', 'year', 'decade');
|
||||
export type DatePickerMode = typeof DatePickerModes[number];
|
||||
|
||||
export interface DatePickerProps extends PickerProps, SinglePickerProps {
|
||||
showTime?: TimePickerProps | boolean;
|
||||
showToday?: boolean;
|
||||
open?: boolean;
|
||||
disabledTime?: (
|
||||
current?: moment.Moment | null,
|
||||
) => {
|
||||
disabledHours?: () => number[];
|
||||
disabledMinutes?: () => number[];
|
||||
disabledSeconds?: () => number[];
|
||||
};
|
||||
onOpenChange?: (status: boolean) => void;
|
||||
onPanelChange?: (value: moment.Moment | null, mode: DatePickerMode) => void;
|
||||
onOk?: (selectedTime: moment.Moment | null) => void;
|
||||
mode?: DatePickerMode;
|
||||
}
|
||||
|
||||
export interface MonthPickerProps extends PickerProps, SinglePickerProps {
|
||||
monthCellContentRender?: (date: moment.Moment, locale: any) => React.ReactNode;
|
||||
}
|
||||
|
||||
export type RangePickerValue =
|
||||
| undefined[]
|
||||
| null[]
|
||||
| [moment.Moment]
|
||||
| [undefined, moment.Moment]
|
||||
| [moment.Moment, undefined]
|
||||
| [null, moment.Moment]
|
||||
| [moment.Moment, null]
|
||||
| [moment.Moment, moment.Moment];
|
||||
export type RangePickerPresetRange = RangePickerValue | (() => RangePickerValue);
|
||||
|
||||
export interface RangePickerProps extends PickerProps {
|
||||
className?: string;
|
||||
tagPrefixCls?: string;
|
||||
value?: RangePickerValue;
|
||||
defaultValue?: RangePickerValue;
|
||||
defaultPickerValue?: RangePickerValue;
|
||||
timePicker?: React.ReactNode;
|
||||
onChange?: (dates: RangePickerValue, dateStrings: [string, string]) => void;
|
||||
onCalendarChange?: (dates: RangePickerValue, dateStrings: [string, string]) => void;
|
||||
onOk?: (selectedTime: RangePickerPresetRange) => void;
|
||||
showTime?: TimePickerProps | boolean;
|
||||
showToday?: boolean;
|
||||
ranges?: {
|
||||
[range: string]: RangePickerPresetRange;
|
||||
};
|
||||
placeholder?: [string, string];
|
||||
mode?: string | string[];
|
||||
separator?: React.ReactNode;
|
||||
disabledTime?: (
|
||||
current: RangePickerValue,
|
||||
type: string,
|
||||
) => {
|
||||
disabledHours?: () => number[];
|
||||
disabledMinutes?: () => number[];
|
||||
disabledSeconds?: () => number[];
|
||||
};
|
||||
onPanelChange?: (value?: RangePickerValue, mode?: string | string[]) => void;
|
||||
renderExtraFooter?: () => React.ReactNode;
|
||||
onMouseEnter?: (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => void;
|
||||
onMouseLeave?: (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => void;
|
||||
}
|
||||
|
||||
export interface WeekPickerProps extends PickerProps, SinglePickerProps {
|
||||
// - currently no own props -
|
||||
}
|
||||
|
||||
export interface DatePickerDecorator extends React.ClassicComponentClass<DatePickerProps> {
|
||||
RangePicker: React.ClassicComponentClass<RangePickerProps>;
|
||||
MonthPicker: React.ClassicComponentClass<MonthPickerProps>;
|
||||
WeekPicker: React.ClassicComponentClass<WeekPickerProps>;
|
||||
}
|
||||
@ -98552,7 +98552,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
|
||||
</div>
|
||||
`;
|
||||
|
||||
exports[`Locale Provider should display the text as hy 1`] = `
|
||||
exports[`Locale Provider should display the text as hy-am 1`] = `
|
||||
<div>
|
||||
<ul
|
||||
class="ant-pagination"
|
||||
@ -98866,7 +98866,7 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
tabindex="-1"
|
||||
type="button"
|
||||
>
|
||||
szept
|
||||
սպտ
|
||||
</button>
|
||||
<button
|
||||
class="ant-picker-year-btn"
|
||||
@ -98904,25 +98904,25 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
h
|
||||
երկ
|
||||
</th>
|
||||
<th>
|
||||
k
|
||||
երք
|
||||
</th>
|
||||
<th>
|
||||
sze
|
||||
չրք
|
||||
</th>
|
||||
<th>
|
||||
cs
|
||||
հնգ
|
||||
</th>
|
||||
<th>
|
||||
p
|
||||
ուրբ
|
||||
</th>
|
||||
<th>
|
||||
szo
|
||||
շբթ
|
||||
</th>
|
||||
<th>
|
||||
v
|
||||
կրկ
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -100912,7 +100912,7 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
tabindex="-1"
|
||||
type="button"
|
||||
>
|
||||
szept
|
||||
սպտ
|
||||
</button>
|
||||
<button
|
||||
class="ant-picker-year-btn"
|
||||
@ -100952,25 +100952,25 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
h
|
||||
երկ
|
||||
</th>
|
||||
<th>
|
||||
k
|
||||
երք
|
||||
</th>
|
||||
<th>
|
||||
sze
|
||||
չրք
|
||||
</th>
|
||||
<th>
|
||||
cs
|
||||
հնգ
|
||||
</th>
|
||||
<th>
|
||||
p
|
||||
ուրբ
|
||||
</th>
|
||||
<th>
|
||||
szo
|
||||
շբթ
|
||||
</th>
|
||||
<th>
|
||||
v
|
||||
կրկ
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -101462,7 +101462,7 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
tabindex="-1"
|
||||
type="button"
|
||||
>
|
||||
okt
|
||||
հկտ
|
||||
</button>
|
||||
<button
|
||||
class="ant-picker-year-btn"
|
||||
@ -101500,25 +101500,25 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
h
|
||||
երկ
|
||||
</th>
|
||||
<th>
|
||||
k
|
||||
երք
|
||||
</th>
|
||||
<th>
|
||||
sze
|
||||
չրք
|
||||
</th>
|
||||
<th>
|
||||
cs
|
||||
հնգ
|
||||
</th>
|
||||
<th>
|
||||
p
|
||||
ուրբ
|
||||
</th>
|
||||
<th>
|
||||
szo
|
||||
շբթ
|
||||
</th>
|
||||
<th>
|
||||
v
|
||||
կրկ
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -102458,7 +102458,7 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
<span
|
||||
class="ant-select-selection-item"
|
||||
>
|
||||
szept
|
||||
սպտ
|
||||
</span>
|
||||
</div>
|
||||
<span
|
||||
@ -102549,25 +102549,25 @@ exports[`Locale Provider should display the text as hy 1`] = `
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
h
|
||||
երկ
|
||||
</th>
|
||||
<th>
|
||||
k
|
||||
երք
|
||||
</th>
|
||||
<th>
|
||||
sze
|
||||
չրք
|
||||
</th>
|
||||
<th>
|
||||
cs
|
||||
հնգ
|
||||
</th>
|
||||
<th>
|
||||
p
|
||||
ուրբ
|
||||
</th>
|
||||
<th>
|
||||
szo
|
||||
շբթ
|
||||
</th>
|
||||
<th>
|
||||
v
|
||||
կրկ
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
import * as React from 'react';
|
||||
import * as PropTypes from 'prop-types';
|
||||
import * as moment from 'moment';
|
||||
import interopDefault from '../_util/interopDefault';
|
||||
import { ModalLocale, changeConfirmLocale } from '../modal/locale';
|
||||
import warning from '../_util/warning';
|
||||
|
||||
@ -27,14 +25,6 @@ export interface LocaleProviderProps {
|
||||
_ANT_MARK__?: string;
|
||||
}
|
||||
|
||||
function setMomentLocale(locale: Locale) {
|
||||
if (locale && locale.locale) {
|
||||
interopDefault(moment).locale(locale.locale);
|
||||
} else {
|
||||
interopDefault(moment).locale('en');
|
||||
}
|
||||
}
|
||||
|
||||
export default class LocaleProvider extends React.Component<LocaleProviderProps, any> {
|
||||
static defaultProps = {
|
||||
locale: {},
|
||||
@ -46,7 +36,6 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
|
||||
|
||||
constructor(props: LocaleProviderProps) {
|
||||
super(props);
|
||||
setMomentLocale(props.locale);
|
||||
changeConfirmLocale(props.locale && props.locale.Modal);
|
||||
|
||||
warning(
|
||||
@ -68,7 +57,6 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
|
||||
componentDidUpdate(prevProps: LocaleProviderProps) {
|
||||
const { locale } = this.props;
|
||||
if (prevProps.locale !== locale) {
|
||||
setMomentLocale(locale);
|
||||
changeConfirmLocale(locale && locale.Modal);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
const datePickerLocale = {
|
||||
lang: {
|
||||
locale: 'hy',
|
||||
locale: 'hy-am',
|
||||
placeholder: 'Ընտրեք ամսաթիվը',
|
||||
rangePlaceholder: ['Մեկնարկի ամսաթիվ', 'Ավարտի ամսաթիվը'],
|
||||
today: 'Այսօր',
|
||||
@ -36,7 +36,7 @@ const datePickerLocale = {
|
||||
};
|
||||
|
||||
export default {
|
||||
locale: 'hy',
|
||||
locale: 'hy-am',
|
||||
Pagination: {
|
||||
// Options.jsx
|
||||
items_per_page: '/ էջ',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user