Merge branch 'develop' of https://github.com/rowyio/rowy into develop

This commit is contained in:
Sidney Alcantara
2021-11-01 12:24:51 +11:00
3 changed files with 27 additions and 21 deletions

View File

@@ -54,7 +54,6 @@ export default function ActionFab({
const { tableState, rowyRun } = useProjectContext();
const { ref } = row;
const { config } = column as any;
const action = !value
? "run"
: value.undo
@@ -71,7 +70,7 @@ export default function ActionFab({
ref: { path: ref.path },
column: { ...column, editor: undefined },
action,
schemaDocPath: formatPath(tableState?.tablePath ?? ""),
schemaDocPath: tableState?.config.tableConfig.path,
actionParams,
});

View File

@@ -1,4 +1,4 @@
import { TextField, FormControlLabel, Switch } from "@mui/material";
import { TextField, FormControlLabel, Switch, Grid } from "@mui/material";
export default function Settings({ config, handleChange }) {
return (
@@ -32,24 +32,30 @@ export default function Settings({ config, handleChange }) {
handleChange("primaryKey")(e.target.value);
}}
/>
<TextField
label="Title key (optional)"
name="titleKey"
value={config.titleKey}
fullWidth
onChange={(e) => {
handleChange("titleKey")(e.target.value);
}}
/>
<TextField
label="Subtitle key (optional)"
name="subtitleKey"
value={config.subtitleKey}
fullWidth
onChange={(e) => {
handleChange("subtitleKey")(e.target.value);
}}
/>
<Grid container direction="row" spacing={1}>
<Grid item xs={12} md={6}>
<TextField
label="Title key (optional)"
name="titleKey"
value={config.titleKey}
fullWidth
onChange={(e) => {
handleChange("titleKey")(e.target.value);
}}
/>
</Grid>
<Grid item xs={12} md={6}>
<TextField
label="Subtitle key (optional)"
name="subtitleKey"
value={config.subtitleKey}
fullWidth
onChange={(e) => {
handleChange("subtitleKey")(e.target.value);
}}
/>{" "}
</Grid>{" "}
</Grid>
<FormControlLabel
control={
<Switch

View File

@@ -36,6 +36,7 @@ export const config: IFieldConfig = {
}),
TableEditor: NullEditor as any,
SideDrawerField,
requireConfiguration: true,
settings: Settings,
};
export default config;