fix: some errors and edit 'Table' (6f7b4e5a) · Commits · Дмитрий Малюгин / UI_storybook

src/Playground.vue

+16 −134

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import AtIcon from '@icons/Mono/AtIcon.vue';
		import Knob from '@components/Knob/Knob.vue';
		import Rating from '@components/Rating/Rating.vue';
		import HomeIcon from '@icons/Mono/HomeIcon.vue';
		import ProgressBar from '@components/ProgressBar/ProgressBar.vue';

		const visibleDrawer = ref(false);
		const sliderOptions: ISliderOptions[] = [
		@@ -121,7 +122,7 @@ const tableColumns: ITableColumn[] = [
		type: 'select',
		options: {
		options: [{ value: 'Married' }, { value: 'Oh no...(s)he is dead' }],
		theme: 'sky',
		theme: 'black',
		},
		},
		{
		@@ -140,138 +141,18 @@ const tableColumns: ITableColumn[] = [
		size: 'small',
		},
		},
		];
		const tableData = ref([
		[
		{
		value: 'Pete',
		},
		{
		value: '30',
		},
		{
		value: 'Chess',
		},
		{
		value: 'USA',
		},
		{
		value: false,
		},
		{
		value: 'Married',
		},
		{
		value: 0,
		},
		{
		value: 30,
		},
		],
		[
		{
		value: 'John',
		},
		{
		value: '7',
		},
		{
		value: 'Football',
		},
		{
		value: 'Canada',
		},
		{
		value: true,
		},
		{
		value: 'Married',
		},
		{
		value: 0,
		},
		{
		value: 30,
		},
		],
		[
		{
		value: 'Дима',
		},
		{
		value: '22',
		},
		{
		value: 'Frontend',
		},
		{
		value: 'Russia',
		},
		{
		value: false,
		name: 'Strength',
		type: 'knob',
		options: {},
		},
		{
		value: 'Married',
		},
		{
		value: 0,
		},
		{
		value: 30,
		},
		],
		[
		{
		value: 'Ксюша',
		},
		{
		value: '32',
		},
		{
		value: 'Frontend',
		},
		{
		value: 'Russia',
		},
		{
		value: false,
		},
		{
		value: 'Married',
		},
		{
		value: 0,
		},
		{
		value: 30,
		},
		],
		[
		{
		value: 'Ксюша',
		},
		{
		value: '32',
		},
		{
		value: 'Backend',
		},
		{
		value: 'Russia',
		},
		{
		value: false,
		},
		{
		value: 'Married',
		},
		{
		value: 0,
		},
		{
		value: 30,
		},
		],
		];
		const tableData = ref([
		['Pete', '30', 'Chess', 'USA', false, 'Married', 0, 30, 2],
		['John', '7', 'Football', 'Canada', true, 'Married', 0, 30, 2],
		['Дима', '22', 'Frontend', 'Russia', false, 'Married', 0, 30, 2],
		['Ксюша', '32', 'Frontend', 'Russia', false, 'Married', 0, 30, 2],
		['Ксюша', '32', 'Backend', 'Russia', false, 'Married', 0, 30, 2],
		]);
		const activeCheckbox = ref();
		const selectOptions = [
		@@ -283,6 +164,7 @@ const selectOptions = [
		},
		];
		const knob = ref(0);
		const pbValue = ref(0);
		</script>

		<template>
		@@ -309,6 +191,7 @@ const knob = ref(0);
		<Checkbox v-model="activeCheckbox" />
		<Checkbox v-model="activeCheckbox" size="large" />
		<Checkbox v-model="activeCheckbox" size="huge" />
		<ProgressBar v-model="pbValue" />
		{{ tableData[1] }}
		<Table
		center
		@@ -316,10 +199,9 @@ const knob = ref(0);
		:columns="tableColumns"
		darknessTextColor="500"
		v-model="tableData"
		size="large"
		font-size="36px"
		theme="black"
		stripedRows
		editable
		></Table>
		<button class="testButton" @click="visibleDrawer = !visibleDrawer">Нажми меня</button>
		<div class="hui" style="width: 500px; height: 500px; background-color: gray"></div>
		@@ -402,7 +284,7 @@ const knob = ref(0);
		</template>
		</SelectButton>
		<ToggleSwitch />
		<Drawer v-model:visible="visibleDrawer" theme="sky" :dismissible="false" closeIcon="CropIcon">
		<Drawer v-model:visible="visibleDrawer" theme="sky" :dismissible="false" closeIcon="Crop">
		<template #header>Это - Drawer</template>
		<p>
		pizdwertyuki lokl,kmjhgfwewesrdty ukilo,kmjngeartyukikdhgfgjhklj.,kga Lorem ipsum dolor sit amet, consectetur

src/common/interfaces/componentsProp.ts

+0 −5

Original line number	Diff line number	Diff line
		@@ -18,11 +18,6 @@ export interface ITableColumn {
		padding?: string;
		}

		export interface ITableItem {
		value: string \| number \| boolean;
		editable?: boolean;
		}

		export interface ITableColumnOptions
		extends ICheckboxProps,
		ISelectProps,

src/common/interfaces/componentsProps.ts

+11 −2

Original line number	Diff line number	Diff line
		@@ -18,12 +18,11 @@ import type {
		ISelectOption,
		ISliderOptions,
		ITableColumn,
		ITableItem,
		ITreeItem,
		} from '@interfaces/componentsProp';

		export interface ITableProps {
		data?: ITableItem[][];
		data?: unknown[][];
		columns: ITableColumn[];
		multipleSort?: boolean;
		gap?: string;
		@@ -36,6 +35,12 @@ export interface ITableProps {
		textColor?: TThemeColor;
		darknessTheme?: TDarkness;
		darknessTextColor?: TDarkness;
		editable?: boolean;
		noEditingSettings?: {
		columns: number[];
		rows: number[];
		cells: [number, number][];
		};
		}

		export interface ITLProps {
		@@ -80,10 +85,12 @@ export interface IMDProps {
		}

		export interface IKnobProps {
		value?: number;
		min?: number;
		max?: number;
		step?: number;
		size?: TSize;
		width?: string;
		theme?: TThemeColor;
		colorGaps?: IColorGap[];
		negativeTheme?: TThemeColor;
		@@ -217,6 +224,7 @@ export interface IProgressBarProps {
		inactiveTheme?: TThemeColor;
		darknessTheme?: TDarkness;
		darknessInactiveTheme?: TDarkness;
		gradient?: string[];
		showLabel?: boolean;
		labelBefore?: string;
		labelAfter?: string;
		@@ -224,6 +232,7 @@ export interface IProgressBarProps {
		}

		export interface IRatingProps {
		value?: number;
		count?: number;
		size?: TSize;
		gap?: string;

src/components/Drawer/Drawer.stories.ts

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ export const BlackFull: Story = {
		visible: true,
		width: 200,
		theme: 'black',
		closeIcon: 'CrossIcon',
		closeIcon: 'Cross',
		header: 'Drawer',
		footer: 'The end.',
		headerDivider: true,

src/components/Drawer/Drawer.vue

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ const props = withDefaults(defineProps<IDrawerProps>(), {
		dismissible: true,
		theme: 'white',
		darknessTheme: '500',
		closeIcon: 'CrossIcon',
		closeIcon: 'Cross',
		headerDivider: false,
		footerDivider: false,
		});