-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat/data-grid' into develop
- Loading branch information
Showing
54 changed files
with
4,459 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
.../builder/src/page/App/components/InspectPanel/PanelSetters/ColorPickerSetter/interface.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...App/components/InspectPanel/PanelSetters/DataGridSetter/ColumnButtonGroupSetter/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| import { arrayMove } from "@dnd-kit/sortable" | ||
| import { get, isString } from "lodash" | ||
| import { FC } from "react" | ||
| import { useSelector } from "react-redux" | ||
| import { v4 } from "uuid" | ||
| import { Column } from "@/page/App/components/InspectPanel/PanelSetters/DragMoveComponent/Column" | ||
| import { ColumnContainer } from "@/page/App/components/InspectPanel/PanelSetters/DragMoveComponent/ColumnContainer" | ||
| import { ColumnEmpty } from "@/page/App/components/InspectPanel/PanelSetters/DragMoveComponent/Empty" | ||
| import { getExecutionResult } from "@/redux/currentApp/executionTree/executionSelector" | ||
| import { RootState } from "@/store" | ||
| import { ColumnButtonGroupSetterProps, GroupButton } from "./interface" | ||
|
|
||
| const ColumnButtonGroupSetter: FC<ColumnButtonGroupSetterProps> = (props) => { | ||
| const { | ||
| attrName, | ||
| handleUpdateMultiAttrDSL, | ||
| childrenSetter, | ||
| value, | ||
| widgetDisplayName, | ||
| } = props | ||
|
|
||
| const targetComponentProps = useSelector<RootState, Record<string, any>>( | ||
| (rootState) => { | ||
| const executionTree = getExecutionResult(rootState) | ||
| return get(executionTree, widgetDisplayName, {}) | ||
| }, | ||
| ) | ||
|
|
||
| const executeValue: GroupButton[] = | ||
| get(targetComponentProps, attrName, undefined) ?? [] | ||
|
|
||
| return ( | ||
| <ColumnContainer | ||
| hideTitle | ||
| columnNum={value?.length ?? 0} | ||
| onClickNew={() => { | ||
| handleUpdateMultiAttrDSL?.({ | ||
| [attrName]: [ | ||
| ...(value ?? []), | ||
| { | ||
| id: v4(), | ||
| mappedValue: "Button", | ||
| colorScheme: "blue", | ||
| disabled: false, | ||
| } as GroupButton, | ||
| ], | ||
| }) | ||
| }} | ||
| onDragEnd={(event) => { | ||
| if (value === undefined) { | ||
| return | ||
| } | ||
| const { active, over } = event | ||
| if (active && over && active.id !== over.id) { | ||
| const oldIndex = value.findIndex((item) => item.id === active.id) | ||
| const newIndex = value.findIndex((item) => item.id === over.id) | ||
| const finalColumns = arrayMove(value, oldIndex, newIndex) | ||
| handleUpdateMultiAttrDSL?.({ | ||
| [attrName]: finalColumns, | ||
| }) | ||
| return finalColumns | ||
| } | ||
| }} | ||
| items={value?.map((v) => v.id) ?? []} | ||
| > | ||
| {value && value.length > 0 ? ( | ||
| value.map((v, index) => { | ||
| return ( | ||
| <Column | ||
| key={v.id} | ||
| label={ | ||
| isString(executeValue[index].mappedValue) | ||
| ? executeValue[index].mappedValue | ||
| : JSON.stringify(executeValue[index].mappedValue) | ||
| } | ||
| showDelete={true} | ||
| showVisible={false} | ||
| attrPath={`${attrName}.${index}`} | ||
| childrenSetter={childrenSetter} | ||
| onDelete={(id) => { | ||
| const finalColumns = value.filter((item) => item.id !== id) | ||
| handleUpdateMultiAttrDSL?.({ | ||
| [attrName]: finalColumns, | ||
| }) | ||
| }} | ||
| id={v.id} | ||
| widgetDisplayName={widgetDisplayName} | ||
| /> | ||
| ) | ||
| }) | ||
| ) : ( | ||
| <ColumnEmpty /> | ||
| )} | ||
| </ColumnContainer> | ||
| ) | ||
| } | ||
|
|
||
| ColumnButtonGroupSetter.displayName = "ColumnButtonGroupSetter" | ||
|
|
||
| export default ColumnButtonGroupSetter |
14 changes: 14 additions & 0 deletions
14
.../components/InspectPanel/PanelSetters/DataGridSetter/ColumnButtonGroupSetter/interface.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { BaseSetter } from "@/page/App/components/InspectPanel/PanelSetters/interface" | ||
| import { PanelFieldConfig } from "@/page/App/components/InspectPanel/interface" | ||
|
|
||
| export interface ColumnButtonGroupSetterProps extends BaseSetter { | ||
| value?: GroupButton[] | ||
| childrenSetter?: PanelFieldConfig[] | ||
| } | ||
|
|
||
| export interface GroupButton { | ||
| id: string | ||
| mappedValue: string | ||
| disabled: boolean | ||
| colorScheme: string | ||
| } |
Oops, something went wrong.