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.

Sign up for GitHub

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

Improved kup-chip #1330

Merged
merged 21 commits into from
Feb 22, 2022
Merged

Improved kup-chip #1330

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3630978
kup-chip: handled tree-like view.
lucafoscili Feb 17, 2022
1da6566
kup-chip: handled filter/input/choice on tree-like chipset.
lucafoscili Feb 17, 2022
9806ede
Showcase: minor fixes.
lucafoscili Feb 17, 2022
8e3bae4
Merge branch 'develop' into new-chip
lucafoscili Feb 17, 2022
f0a1632
FChip: fixed indentation.
lucafoscili Feb 17, 2022
38d1e49
kup-chip: when seen as tree, now it's collapsible.
lucafoscili Feb 18, 2022
a85d6d4
KupData: added nodes utilities ("setProperties" and "toStream").
lucafoscili Feb 18, 2022
3e4e291
KupData: added node utilities. kup-chip: minor fixes.
lucafoscili Feb 18, 2022
78c1a73
KupData: simplified KupDataNode by moving tree-specific property to K…
lucafoscili Feb 18, 2022
9a676b2
kup-echart: heatmap displays only the first theme color when not pass…
lucafoscili Feb 18, 2022
c267d8d
kup-echart: improved heatmap.
lucafoscili Feb 18, 2022
f0234f3
FChip: removed label property, replaced by "value". Old value propert…
lucafoscili Feb 21, 2022
ab5e214
kup-magic-box: added Chip, Button List and Tree.
lucafoscili Feb 21, 2022
094d50b
kup-echart: prevented JS error when cells were present in a row but t…
lucafoscili Feb 21, 2022
ce5036f
Minor fixes.
lucafoscili Feb 21, 2022
f85f36a
kup-magic-box: basic editability for JSON view.
lucafoscili Feb 21, 2022
1179b7d
FCell: color picker has full width even when non-editable.
lucafoscili Feb 21, 2022
c4e72a8
kup-magic-box: improved editability.
lucafoscili Feb 21, 2022
fa43690
kup-chip: watcher on data prop.
lucafoscili Feb 21, 2022
354e879
Bugfix (kup-echart): kup-echart-click returned wrong row for map charts.
lucafoscili Feb 22, 2022
e6d75c7
FChip: removed data conversion (handled only inside kup-chip).
lucafoscili Feb 22, 2022
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 packages/ketchup-showcase/public/showcase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ table#customstyle-tab kup-text-field {
position: fixed;
top: 0;
left: 0;
z-index: 130;
z-index: calc(var(--kup-navbar-zindex) + 1);
}

#sample-wrapper.theming {
Expand Down
12 changes: 6 additions & 6 deletions packages/ketchup-showcase/src/mock/dataTableJL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ export const jlObjectsDataTable = {
data: {
data: [
{
value: 'text',
label: 'Text only',
id: 'text',
value: 'Text only',
},
{
value: 'icon',
id: 'icon',
icon: 'widgets',
label: 'With icon',
value: 'With icon',
},
],
},
Expand All @@ -50,10 +50,10 @@ export const jlObjectsDataTable = {
data: {
data: [
{
label: 'Federico Robertozzi',
value: 'Federico Robertozzi',
},
{
label: 'Parodonte Frascati',
value: 'Parodonte Frascati',
},
],
},
Expand Down
45 changes: 18 additions & 27 deletions packages/ketchup-showcase/src/views/components/advanced/card/examples/CardCollapsible.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,58 +91,49 @@ export default {
title: 'chip[0]',
data: [
{
value: '1_chip',
icon: 'filter_1',
label: 'First chip',
checked: false,
id: '1_chip',
value: 'First chip',
},
{
value: '2_chip',
icon: 'filter_2',
label: 'Second chip',
checked: true,
id: '2_chip',
value: 'Second chip',
},
{
value: '3_chip',
icon: 'filter_3',
label: 'Third chip',
checked: false,
id: '3_chip',
value: 'Third chip',
},
{
value: '4_chip',
icon: 'filter_4',
label: 'Fourth chip',
checked: false,
id: '4_chip',
value: 'Fourth chip',
},
{
value: '5_chip',
icon: 'filter_5',
label: 'Fifth chip',
checked: false,
id: '5_chip',
value: 'Fifth chip',
},
{
value: '6_chip',
icon: 'filter_6',
label: 'Sixth chip',
checked: false,
id: '6_chip',
value: 'Sixth chip',
},
{
value: '7_chip',
icon: 'filter_7',
label: 'Seventh chip',
checked: false,
id: '7_chip',
value: 'Seventh chip',
},
{
value: '8_chip',
icon: 'filter_8',
label: 'Eighth chip',
checked: false,
id: '8_chip',
value: 'Eighth chip',
},
{
value: '9_chip',
icon: 'filter_9',
label: 'Ninth chip',
checked: false,
id: '9_chip',
value: 'Ninth chip',
},
],
},
Expand Down
45 changes: 18 additions & 27 deletions packages/ketchup-showcase/src/views/components/advanced/card/examples/CardDemo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,58 +179,49 @@ function createComp() {
title: 'chip1',
data: [
{
value: '1_chip',
icon: 'filter_1',
label: 'First chip',
checked: false,
id: '1_chip',
value: 'First chip',
},
{
value: '2_chip',
icon: 'filter_2',
label: 'Second chip',
checked: true,
id: '2_chip',
value: 'Second chip',
},
{
value: '3_chip',
icon: 'filter_3',
label: 'Third chip',
checked: false,
id: '3_chip',
value: 'Third chip',
},
{
value: '4_chip',
icon: 'filter_4',
label: 'Fourth chip',
checked: false,
id: '4_chip',
value: 'Fourth chip',
},
{
value: '5_chip',
icon: 'filter_5',
label: 'Fifth chip',
checked: false,
id: '5_chip',
value: 'Fifth chip',
},
{
value: '6_chip',
icon: 'filter_6',
label: 'Sixth chip',
checked: false,
id: '6_chip',
value: 'Sixth chip',
},
{
value: '7_chip',
icon: 'filter_7',
label: 'Seventh chip',
checked: false,
id: '7_chip',
value: 'Seventh chip',
},
{
value: '8_chip',
icon: 'filter_8',
label: 'Eighth chip',
checked: false,
id: '8_chip',
value: 'Eighth chip',
},
{
value: '9_chip',
icon: 'filter_9',
label: 'Ninth chip',
checked: false,
id: '9_chip',
value: 'Ninth chip',
},
],
},
Expand Down
45 changes: 18 additions & 27 deletions packages/ketchup-showcase/src/views/components/advanced/card/examples/CardDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,58 +245,49 @@ export default {
title: 'chip[0]',
data: [
{
value: '1_chip',
icon: 'filter_1',
label: 'First chip',
checked: false,
id: '1_chip',
value: 'First chip',
},
{
value: '2_chip',
icon: 'filter_2',
label: 'Second chip',
checked: true,
id: '2_chip',
value: 'Second chip',
},
{
value: '3_chip',
icon: 'filter_3',
label: 'Third chip',
checked: false,
id: '3_chip',
value: 'Third chip',
},
{
value: '4_chip',
icon: 'filter_4',
label: 'Fourth chip',
checked: false,
id: '4_chip',
value: 'Fourth chip',
},
{
value: '5_chip',
icon: 'filter_5',
label: 'Fifth chip',
checked: false,
id: '5_chip',
value: 'Fifth chip',
},
{
value: '6_chip',
id: '6_chip',
icon: 'filter_6',
label: 'Sixth chip',
checked: false,
value: 'Sixth chip',
},
{
value: '7_chip',
icon: 'filter_7',
label: 'Seventh chip',
checked: false,
id: '7_chip',
value: 'Seventh chip',
},
{
value: '8_chip',
icon: 'filter_8',
label: 'Eighth chip',
checked: false,
id: '8_chip',
value: 'Eighth chip',
},
{
value: '9_chip',
icon: 'filter_9',
label: 'Ninth chip',
checked: false,
id: '9_chip',
value: 'Ninth chip',
},
],
},
Expand Down
45 changes: 18 additions & 27 deletions packages/ketchup-showcase/src/views/components/advanced/card/examples/CardStandard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,58 +1118,49 @@ export default {
title: 'chip[0]',
data: [
{
value: '1_chip',
icon: 'filter_1',
label: 'First chip',
checked: false,
id: '1_chip',
value: 'First chip',
},
{
value: '2_chip',
icon: 'filter_2',
label: 'Second chip',
checked: true,
id: '2_chip',
value: 'Second chip',
},
{
value: '3_chip',
icon: 'filter_3',
label: 'Third chip',
checked: false,
id: '3_chip',
value: 'Third chip',
},
{
value: '4_chip',
icon: 'filter_4',
label: 'Fourth chip',
checked: false,
id: '4_chip',
value: 'Fourth chip',
},
{
value: '5_chip',
icon: 'filter_5',
label: 'Fifth chip',
checked: false,
id: '5_chip',
value: 'Fifth chip',
},
{
value: '6_chip',
icon: 'filter_6',
label: 'Sixth chip',
checked: false,
id: '6_chip',
value: 'Sixth chip',
},
{
value: '7_chip',
icon: 'filter_7',
label: 'Seventh chip',
checked: false,
id: '7_chip',
value: 'Seventh chip',
},
{
value: '8_chip',
icon: 'filter_8',
label: 'Eighth chip',
checked: false,
id: '8_chip',
value: 'Eighth chip',
},
{
value: '9_chip',
icon: 'filter_9',
label: 'Ninth chip',
checked: false,
id: '9_chip',
value: 'Ninth chip',
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ketchup-showcase/src/views/components/advanced/tree/examples/TreeDemo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default {
{
prop: 'data',
description: 'The actual data of the chart.',
type: 'KupDataNode',
type: 'KupTreeNode',
isArray: true,
default: '[]',
try: 'json',
Expand Down
1 change: 0 additions & 1 deletion ...ges/ketchup-showcase/src/views/components/advanced/tree/examples/TreeDynamicExpansion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ export default {
basicTable = DynamicExpansionFaker(3, 5),
useCallback = DynamicExpansionFaker(3, 3),
useCallbackTable = DynamicExpansionFaker(3, 3),
// TODO horrible name, change it
useCallbackCallback = kupTreeDynamicCallbackFactory(useCallback),
useCallbackTableCallback =
kupTreeDynamicCallbackFactory(useCallbackTable);
Expand Down
Loading