Skip to content

Commit 490b24d

Browse files
Merge pull request #19 from iron-tech-space/changesByMarsel
Changes by Marsel
2 parents 144c5f3 + 89f07de commit 490b24d

File tree

12 files changed

+7830
-20229
lines changed

12 files changed

+7830
-20229
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.0.84
2+
3+
- Add dropdownRender props in `Select`
4+
5+
16
## 0.0.83
27

38
- Fixed add onFinish in ModalProps

dist/components/Select/SelectProps.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { SelectProps as AntSelectProps } from 'antd';
22
import { SelectValue } from "antd/lib/select";
33
import { StoreProps } from "../core/wrappers";
44
import { Request, sortBy, OptionItem } from "../core/interfaces";
5+
import { ReactNode } from "react";
56
export interface SelectProps<VT extends SelectValue = SelectValue> extends Omit<AntSelectProps<VT>, 'mode'>, StoreProps {
67
/** Сортировка по умолчанию */
78
defaultSortBy?: sortBy;
@@ -50,4 +51,6 @@ export interface SelectProps<VT extends SelectValue = SelectValue> extends Omit<
5051
widthControl?: string | number;
5152
/** Размер страницы */
5253
pageSize?: number;
54+
/** уникальное отображение данных в селекте */
55+
dropdownRender?: ReactNode;
5356
}

dist/index.es.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/components/Table/Table.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ export interface TableProps {
142142
/** Рамки таблицы*/
143143
bordered?: boolean
144144

145+
/** блокировка таблицы таблицы*/
145146
disabled?: boolean;
146147
/** Порог в пикселях для вызова _onLoad.
147148
* Кол-во пикселей от низа таблицы для срабатывания события загрузки (onEndReached) */
@@ -206,7 +207,7 @@ export interface TableProps {
206207
dispatch?: {
207208
path: string;
208209
type?: 'event' | undefined;
209-
extraData?: any;
210+
extraData?: string | { [key:string]:string };
210211
};
211212

212213
/** Объект для подписки на изменения в STORE */
@@ -216,7 +217,7 @@ export interface TableProps {
216217
/** Путь до объекта в Store */
217218
path: string;
218219
/** Путь к дополнительным данным которые будут переданы в onChange */
219-
extraData?: string;
220+
extraData?: string| { [key:string]:string };
220221
/** Выполнить подписку при монтировании компонента
221222
* По умолчанию false */
222223
withMount?: boolean;

lib/components/UploadFile/UploadFileProps.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,29 @@ import { UploadFile, UploadProps } from "antd/lib/upload/interface";
33
import { ButtonProps, TooltipProps } from "antd";
44
import { StoreProps } from "../core/wrappers";
55

6+
interface IDataObject {
7+
[key:string]: string | null
8+
}
9+
610
export interface UploadFileProps extends StoreProps{
711
/** Функция запроса для отправки файла с данным на сервер */
812
requestUploadFile: Request,
913

1014
/** Данные, прикрепляемые к файлу */
11-
dataObject: any,
15+
dataObject?: any | IDataObject ,
1216

1317
/** Функция, вызываемая при удачной загрузке файла */
14-
onCompletedUpload: (file: UploadFile) => void,
18+
onCompletedUpload?: (file: UploadFile) => void,
1519

1620
/** Функция, вызываемая при НЕ удачной загрузке файла */
17-
onFailedUpload: (file: UploadFile) => void,
21+
onFailedUpload?: (file: UploadFile) => void,
1822

1923
/** Ant Props для [Upload](https://ant.design/components/upload/) компонента */
20-
uploadProps: UploadProps,
24+
uploadProps?: UploadProps,
2125

2226
/** Ant Props для [Tooltip](https://ant.design/components/tooltip/) компонента */
23-
toolTipProps: TooltipProps,
27+
toolTipProps?: TooltipProps,
2428

2529
/** Ant Props для [Button](https://ant.design/components/button/) компонента */
26-
buttonProps: ButtonProps,
27-
}
30+
buttonProps?: ButtonProps,
31+
}

0 commit comments

Comments
 (0)