Merge pull request #15 from iron-tech-space/changesByMarsel

iron-tech-space · web-flow · commit e27eb3846fbd · 2021-12-08T14:29:29.000+03:00
Add few changes
diff --git a/dist/components/Modal/ModalProps.d.ts b/dist/components/Modal/ModalProps.d.ts
@@ -16,23 +16,26 @@ export interface ModalSubscribeOnChangeOptions {
     /** Функция закрытия модалки */
     closeModal: () => void;
 }
+interface ModalConfig extends AntModalProps {
+    type?: 'save' | 'select' | 'view';
+    /** Запрос для автоматического сохранения формы */
+    requestSaveForm?: Request | any;
+    /** HTTP Метод, передаваемый в запрос сохранения */
+    methodSaveForm?: string;
+    /** Пропсы формы.
+     * Если верстка через конфиги, то пропс body обязателен */
+    form?: FormProps;
+}
+interface ModalButtonProps extends ButtonProps {
+    label?: string;
+}
 export interface ModalProps extends Omit<StoreProps, 'subscribe'> {
     /** Свойства [Button](https://ant.design/components/button/) из Ant Design
      *
      * Добавлено свойство `label` с типом `ReactNode` или `string` для формирования контента кнопки*/
-    buttonProps?: ButtonProps;
+    buttonProps?: ModalButtonProps;
     /** Объект модального окна. Стандартная конфигурация. */
-    modalConfig?: {
-        /** Тип модального окна */
-        type?: 'save' | 'select' | 'view';
-        /** Запрос для автоматического сохранения формы */
-        requestSaveForm?: Request;
-        /** HTTP Метод, передаваемый в запрос сохранения */
-        methodSaveForm?: string;
-        /** Пропсы формы.
-         * Если верстка через конфиги, то пропс body обязателен */
-        form?: FormProps;
-    };
+    modalConfig?: ModalConfig;
     /** Данные для модального окна */
     modalData?: AntModalProps;
     /** Объект для подписки на изменения в STORE.
@@ -57,3 +60,4 @@ export interface ModalProps extends Omit<StoreProps, 'subscribe'> {
         onChange: (params: ModalSubscribeOnChangeOptions) => void;
     }[];
 }
+export {};
diff --git a/dist/components/core/interfaces.d.ts b/dist/components/core/interfaces.d.ts
@@ -2,6 +2,7 @@ import { ReactNode } from "react";
 export declare type RequestOptions = {
     params: any;
     data: any;
+    method?: any;
 };
 export declare type Request = (options: RequestOptions) => Promise<any>;
 export declare type OptionItem = {
diff --git a/dist/components/index.d.ts b/dist/components/index.d.ts
@@ -30,6 +30,7 @@ import { SelectProps } from "./Select";
 import { TreeSelectProps } from "./TreeSelect";
 import { TimePickerProps } from "./DatePicker/DatePicker";
 import { UploadFileProps } from "./UploadFile";
+import { DrawerProps } from "antd/lib/drawer";
 import { CollapseProps, CollapsePanelProps } from "antd/lib/collapse";
 import { ListProps } from "antd/lib/list";
 import { PopoverProps } from "antd/lib/popover";
@@ -73,6 +74,7 @@ export declare const Select: FunctionComponent<SelectProps>;
 export declare const TreeSelect: FunctionComponent<TreeSelectProps>;
 export declare const TimePicker: FunctionComponent<TimePickerProps & StoreProps>;
 export declare const UploadFile: FunctionComponent<UploadFileProps>;
+export declare const Drawer: FunctionComponent<DrawerProps>;
 export declare const Collapse: FunctionComponent<CollapseProps & StoreProps>;
 export declare const CollapsePanel: FunctionComponent<CollapsePanelProps & StoreProps>;
 export declare const List: FunctionComponent<ListProps<any>>;
@@ -87,4 +89,4 @@ export declare const Modal: FunctionComponent<ModalProps>;
 export declare const Custom: FunctionComponent<CustomProps>;
 export declare const Switcher: FunctionComponent<SwitcherProps>;
 export declare const Dashboard: FunctionComponent<DashboardProps>;
-export type { LabelProps, StoreProps, CustomProps, SwitcherProps, SubscribeOnChangeOptions, ModalSubscribeOnChangeOptions, TablesSubscribeOnChangeOptions, sortBy, ButtonProps, TitleProps, TextProps, DatePickerProps, DividerProps, RowProps, ColProps, LayoutProps, SpaceProps, CheckboxProps, FormProps, FormHeaderProps, FormBodyProps, FormFooterProps, FormListProps, InputNumberProps, InputProps, SearchProps, TextAreaProps, PasswordProps, RadioProps, RadioGroupProps, SwitchProps, SliderSingleProps, SliderRangeProps, SelectProps, TreeSelectProps, TimePickerProps, UploadFileProps, CollapseProps, CollapsePanelProps, ListProps, PopoverProps, TooltipProps, TabsProps, TabPaneProps, TableProps, ModalProps };
+export type { LabelProps, StoreProps, CustomProps, SwitcherProps, SubscribeOnChangeOptions, ModalSubscribeOnChangeOptions, TablesSubscribeOnChangeOptions, sortBy, ButtonProps, TitleProps, TextProps, DatePickerProps, DividerProps, RowProps, ColProps, LayoutProps, SpaceProps, CheckboxProps, FormProps, FormHeaderProps, FormBodyProps, FormFooterProps, FormListProps, InputNumberProps, InputProps, SearchProps, TextAreaProps, PasswordProps, RadioProps, RadioGroupProps, SwitchProps, SliderSingleProps, SliderRangeProps, SelectProps, TreeSelectProps, TimePickerProps, UploadFileProps, DrawerProps, CollapseProps, CollapsePanelProps, ListProps, PopoverProps, TooltipProps, TabsProps, TabPaneProps, TableProps, ModalProps };
diff --git a/dist/index.es.js b/dist/index.es.js
diff --git a/dist/index.es.js.map b/dist/index.es.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.less b/dist/index.less
@@ -1,6 +1,6 @@
 @import '~react-base-table/styles.css';
-@import '../node_modules/react-grid-layout/css/styles.css';
-@import '../node_modules/react-resizable/css/styles.css';
+@import '~react-grid-layout/css/styles.css';
+@import '~react-resizable/css/styles.css';
 //@import '~antd/dist/antd';
 
 @import '../lib/components/utils/variables';
diff --git a/lib/components/Dashboard/Dashboard.js b/lib/components/Dashboard/Dashboard.js
@@ -76,16 +76,13 @@ var Dashboard = function Dashboard(props) {
 	var id = props.id,
 	    requestLoadConfig = props.requestLoadConfig;
 
-	var _useState = useState({
-		title: '',
-		panels: []
-	}),
+	var _useState = useState(props.dashboard),
 	    _useState2 = _slicedToArray(_useState, 2),
 	    dashboard = _useState2[0],
 	    setDashboard = _useState2[1];
 
 	useEffect(function () {
-		requestLoadConfig({
+		requestLoadConfig && requestLoadConfig({
 			data: { id: id },
 			params: {}
 		}).then(function (res) {
diff --git a/lib/components/Dashboard/DashboardProps.tsx b/lib/components/Dashboard/DashboardProps.tsx
@@ -18,6 +18,7 @@ export interface DashboardProps {
     // panels: DashboardPanelProps[] | undefined;
     id: string;
     requestLoadConfig: Request;
+    dashboard: any,
 }
 
 export interface LogsPanelProps {
diff --git a/lib/components/Dashboard/Panels/Logs.js b/lib/components/Dashboard/Panels/Logs.js
@@ -4,6 +4,10 @@ import 'antd/es/checkbox/style';
 import _Checkbox from 'antd/es/checkbox';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
+import 'antd/es/cascader/style';
+import _Cascader from 'antd/es/cascader';
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
@@ -21,7 +25,7 @@ var styles = {
 		borderBottom: '1px solid #d9d9d9'
 	},
 	inputUrl: {
-		flexBasis: '150px',
+		flexBasis: '200px',
 		borderRight: '1px solid #d9d9d9'
 	},
 	inputQuery: {
@@ -65,20 +69,25 @@ var Logs = function Logs(props) {
 	    logsRef = _useState6[0],
 	    setLogsRef = _useState6[1];
 
-	var _useState7 = useState(true),
+	var _useState7 = useState({ url: props.loki.url, query: props.loki.query }),
 	    _useState8 = _slicedToArray(_useState7, 2),
-	    autoScroll = _useState8[0],
-	    setAutoScroll = _useState8[1];
+	    wsParams = _useState8[0],
+	    setWsParams = _useState8[1];
+
+	var _useState9 = useState(true),
+	    _useState10 = _slicedToArray(_useState9, 2),
+	    autoScroll = _useState10[0],
+	    setAutoScroll = _useState10[1];
 
 	var onOpen = function onOpen() {
 		// setWs(new W3CWebSocket("ws://10.5.121.117:3100/loki/api/v1/tail?query={dynamicdq=\"oauth.dias-dev.ru\"}", 'echo-protocol'));
-		setWs(new W3CWebSocket('ws://' + props.loki.url + '/loki/api/v1/tail?query=' + props.loki.query, 'echo-protocol'));
+		setWs(new W3CWebSocket('ws://' + wsParams.url + '/loki/api/v1/tail?query=' + wsParams.query, 'echo-protocol'));
 		setLogs([]);
 		console.log('onCreate ws => ', ws);
 	};
 	var onClose = function onClose() {
 		console.log('onClose ws => ', ws);
-		ws.close();
+		ws && ws.close();
 		setWs(undefined);
 	};
 
@@ -112,6 +121,12 @@ var Logs = function Logs(props) {
 		};
 	}
 
+	var onChangeApp = function onChangeApp(value) {
+		// console.log(value);
+		onClose();
+		setWsParams(_extends({}, wsParams, { query: '{server="' + value[0] + '", app="' + value[1] + '"}' }));
+	};
+
 	return React.createElement(
 		React.Fragment,
 		null,
@@ -121,12 +136,12 @@ var Logs = function Logs(props) {
 			React.createElement(
 				'div',
 				{ style: styles.inputUrl },
-				React.createElement(_Input, { defaultValue: props.loki.url, bordered: false })
+				React.createElement(_Cascader, { options: props.servers, onChange: onChangeApp, placeholder: '\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435', bordered: false })
 			),
 			React.createElement(
 				'div',
 				{ style: styles.inputQuery },
-				React.createElement(_Input, { defaultValue: props.loki.query, bordered: false })
+				React.createElement(_Input, { value: wsParams.query, bordered: false, disabled: true })
 			),
 			React.createElement(
 				'div',
diff --git a/lib/index.less b/lib/index.less
@@ -1,6 +1,6 @@
 @import '~react-base-table/styles.css';
-@import '../node_modules/react-grid-layout/css/styles.css';
-@import '../node_modules/react-resizable/css/styles.css';
+@import '~react-grid-layout/css/styles.css';
+@import '~react-resizable/css/styles.css';
 //@import '~antd/dist/antd';
 
 @import 'components/utils/variables';
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rt-design",
-	"version": "0.0.80",
+	"version": "0.0.81",
 	"description": "React technical design library",
 	"author": "Iron tech space",
 	"license": "MIT",
diff --git a/src/components/Modal/ModalProps.ts b/src/components/Modal/ModalProps.ts
@@ -1,6 +1,6 @@
 import { StoreProps } from "../core/wrappers";
 import { ButtonProps, ModalProps as AntModalProps } from "antd";
-import { Request } from "../core/interfaces";
+import { Request, RequestOptions } from "../core/interfaces";
 import { FormProps } from "../Form/FormProps";
 
 export interface ModalSubscribeOnChangeOptions {
@@ -18,27 +18,32 @@ export interface ModalSubscribeOnChangeOptions {
     closeModal: () => void;
 }
 
+interface ModalConfig extends AntModalProps{
+    type?: 'save' | 'select' | 'view';
+
+    /** Запрос для автоматического сохранения формы */
+    requestSaveForm?: Request | any;
+
+    /** HTTP Метод, передаваемый в запрос сохранения */
+    methodSaveForm?: string;
+
+    /** Пропсы формы.
+     * Если верстка через конфиги, то пропс body обязателен */
+    form?: FormProps
+}
+
+interface ModalButtonProps extends ButtonProps{
+    label?: string
+}
+
 export interface ModalProps extends Omit<StoreProps, 'subscribe'> {
     /** Свойства [Button](https://ant.design/components/button/) из Ant Design
      *
      * Добавлено свойство `label` с типом `ReactNode` или `string` для формирования контента кнопки*/
-    buttonProps?: ButtonProps;
+    buttonProps?: ModalButtonProps;
 
     /** Объект модального окна. Стандартная конфигурация. */
-    modalConfig?: {
-        /** Тип модального окна */
-        type?: 'save' | 'select' | 'view';
-
-        /** Запрос для автоматического сохранения формы */
-        requestSaveForm?: Request;
-
-        /** HTTP Метод, передаваемый в запрос сохранения */
-        methodSaveForm?: string;
-
-        /** Пропсы формы.
-         * Если верстка через конфиги, то пропс body обязателен */
-        form?: FormProps
-    },
+    modalConfig?: ModalConfig,
 
     /** Данные для модального окна */
     modalData?: AntModalProps,
@@ -64,4 +69,4 @@ export interface ModalProps extends Omit<StoreProps, 'subscribe'> {
         /** Вызывается при изменение объекта по указанному path */
         onChange: (params: ModalSubscribeOnChangeOptions) => void;
     }[]
-}
+}
diff --git a/src/components/core/interfaces.ts b/src/components/core/interfaces.ts
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 
-export type RequestOptions = { params: any; data: any; }
+export type RequestOptions = { params: any; data: any; method?:any}
 
 export type Request = (options: RequestOptions) => Promise<any>;
 
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -48,6 +48,7 @@ import RtSelect, { SelectProps } from "./Select";
 import RtTreeSelect, { TreeSelectProps } from "./TreeSelect";
 import { RtTimePicker, TimePickerProps } from "./DatePicker/DatePicker";
 import RtUploadFile, { UploadFileProps } from "./UploadFile";
+import AntDrawer, {DrawerProps} from "antd/lib/drawer"
 
 // Data Display
 import AntCollapse, { CollapseProps, CollapsePanelProps } from "antd/lib/collapse";
@@ -107,6 +108,7 @@ export const Select:     FunctionComponent<SelectProps> =                   with
 export const TreeSelect: FunctionComponent<TreeSelectProps> =               withPlaceholder(RtTreeSelect, 'Выберите значение');
 export const TimePicker: FunctionComponent<TimePickerProps & StoreProps> =  withPlaceholder(RtTimePicker, 'Выберите время');
 export const UploadFile: FunctionComponent<UploadFileProps> =               withStore(RtUploadFile);
+export const Drawer: FunctionComponent<DrawerProps> = withStore(AntDrawer);
 
 // Data Display
 export const Collapse:      FunctionComponent<CollapseProps & StoreProps> =         withStore(AntCollapse);
@@ -177,6 +179,7 @@ export type {
     TreeSelectProps,
     TimePickerProps,
     UploadFileProps,
+    DrawerProps,
 
     // Data Display
     CollapseProps,

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ export interface DashboardProps {`
`18`	`18`	`// panels: DashboardPanelProps[] \| undefined;`
`19`	`19`	`id: string;`
`20`	`20`	`requestLoadConfig: Request;`
	`21`	`+ dashboard: any,`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`export interface LogsPanelProps {`