drf-react-by-schema 0.25.0 → 0.25.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/DataGridBySchemaEditable/DataGridDesktop.js +1 -1
- package/dist/components/DataGridBySchemaEditable/utils.d.ts +1 -0
- package/dist/components/DataGridBySchemaEditable/utils.d.ts.map +1 -1
- package/dist/components/DataGridBySchemaEditable/utils.js +8 -1
- package/dist/components/forms/Form.d.ts +4 -1
- package/dist/components/forms/Form.d.ts.map +1 -1
- package/dist/components/forms/Form.js +15 -6
- package/dist/components/forms/FormActions.d.ts +1 -1
- package/dist/components/forms/FormActions.d.ts.map +1 -1
- package/dist/components/forms/FormActions.js +2 -2
- package/package.json +1 -1
|
@@ -207,7 +207,7 @@ function DataGridDesktop({ schema, dataGrid, setDataGrid, rowCount = 0, columns,
|
|
|
207
207
|
console.log('For view action to work, you must supply indexFieldViewBasePath prop!');
|
|
208
208
|
break;
|
|
209
209
|
}
|
|
210
|
-
actionItems.push(react_1.default.createElement(GridActionsCellItemLink_1.GridActionsCellItemLink, { key: `view_${id}`, icon: react_1.default.createElement(Visibility_1.default, null), label: "Visualizar esse item em janela separada", color: "inherit", component: LinkComponent, to:
|
|
210
|
+
actionItems.push(react_1.default.createElement(GridActionsCellItemLink_1.GridActionsCellItemLink, { key: `view_${id}`, icon: react_1.default.createElement(Visibility_1.default, null), label: "Visualizar esse item em janela separada", color: "inherit", component: LinkComponent, to: (0, utils_2.buildEditPath)(indexFieldViewBasePath, id), state: stateToLink }));
|
|
211
211
|
break;
|
|
212
212
|
}
|
|
213
213
|
});
|
|
@@ -12,4 +12,5 @@ export declare const quantityOnlyOperators: ({ type }: {
|
|
|
12
12
|
type: string;
|
|
13
13
|
}) => GridFilterOperator[];
|
|
14
14
|
export declare const buildEditPath: (basePath: string, objId: Id) => string;
|
|
15
|
+
export declare const buildExitPath: (basePath: string, objId?: Id) => string;
|
|
15
16
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/DataGridBySchemaEditable/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,0BAA0B,EAAE,EAAE,EAAQ,MAAM,cAAc,CAAC;AAoCpE,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,0BAA0B,EAAE,EACrC,UAAU,EAAE,UAAU,GACrB,0BAA0B,EAAE,CAmB9B;AAED,eAAO,MAAM,qBAAqB,GAAI,UAAU;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,yBA8B/D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,UAAU,MAAM,EAAE,OAAO,EAAE,WAKxD,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/DataGridBySchemaEditable/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,0BAA0B,EAAE,EAAE,EAAQ,MAAM,cAAc,CAAC;AAoCpE,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,0BAA0B,EAAE,EACrC,UAAU,EAAE,UAAU,GACrB,0BAA0B,EAAE,CAmB9B;AAED,eAAO,MAAM,qBAAqB,GAAI,UAAU;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,yBA8B/D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,UAAU,MAAM,EAAE,OAAO,EAAE,WAKxD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,UAAU,MAAM,EAAE,QAAQ,EAAE,WAKzD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildEditPath = exports.quantityOnlyOperators = void 0;
|
|
3
|
+
exports.buildExitPath = exports.buildEditPath = exports.quantityOnlyOperators = void 0;
|
|
4
4
|
exports.resizeColumns = resizeColumns;
|
|
5
5
|
const x_data_grid_1 = require("@mui/x-data-grid");
|
|
6
6
|
const InputInterval_1 = require("./InputInterval");
|
|
@@ -102,3 +102,10 @@ const buildEditPath = (basePath, objId) => {
|
|
|
102
102
|
return `${basePath}${objId}`;
|
|
103
103
|
};
|
|
104
104
|
exports.buildEditPath = buildEditPath;
|
|
105
|
+
const buildExitPath = (basePath, objId) => {
|
|
106
|
+
if (basePath.includes('{ID}') && objId) {
|
|
107
|
+
return basePath.replace('{ID}', `${objId}`);
|
|
108
|
+
}
|
|
109
|
+
return basePath;
|
|
110
|
+
};
|
|
111
|
+
exports.buildExitPath = buildExitPath;
|
|
@@ -14,7 +14,10 @@ interface FormProps<T extends TField = void> extends Omit<CommonFieldProps<T>, '
|
|
|
14
14
|
onDelete?: (removedId: Id) => void;
|
|
15
15
|
/** Optional. If the dev wants to do something after canceling the form editing. */
|
|
16
16
|
onCancel?: React.MouseEventHandler<HTMLButtonElement>;
|
|
17
|
-
navigate?:
|
|
17
|
+
navigate?: {
|
|
18
|
+
(to: string): void;
|
|
19
|
+
(delta: number): void;
|
|
20
|
+
};
|
|
18
21
|
/** Optional. Exit function. If not provided and also no exitPath provided,
|
|
19
22
|
* navigate(exitPath) or history.back() will be used.
|
|
20
23
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../../src/components/forms/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAc,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAW,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AAG/E,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAEhB,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,EACX,eAAe,EACf,eAAe,EAEf,EAAE,EACF,IAAI,EACJ,SAAS,EACT,eAAe,EACf,QAAQ,EACR,eAAe,EACf,SAAS,EACT,MAAM,EACN,WAAW,EACZ,MAAM,cAAc,CAAC;AAKtB,OAAoB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAM9D,UAAU,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,CAAE,SAAQ,IAAI,CACvD,gBAAgB,CAAC,CAAC,CAAC,EACnB,cAAc,GAAG,WAAW,CAC7B;IACC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1B,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE5B,+EAA+E;IAC/E,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,UAAU,EAAE,UAAU,EAAE,eAAe,KAAK,IAAI,CAAC;IACtF,yFAAyF;IACzF,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,IAAI,CAAC;IACnC,mFAAmF;IACnF,QAAQ,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../../src/components/forms/Form.tsx"],"names":[],"mappings":"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"}
|
|
@@ -119,22 +119,31 @@ function Form({ model, objId, defaults, objTitleField, onSave, onDelete, onCance
|
|
|
119
119
|
}), [loadSinglePageData, model, stableDefaults, objTitleField, stableExtraValidators, reset]);
|
|
120
120
|
const genericNavigate = (0, react_1.useCallback)((path) => {
|
|
121
121
|
if (navigate) {
|
|
122
|
+
if (typeof path === 'string') {
|
|
123
|
+
navigate(path);
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
122
126
|
navigate(path);
|
|
123
127
|
return;
|
|
124
128
|
}
|
|
125
|
-
|
|
129
|
+
if (typeof path === 'string') {
|
|
130
|
+
window.location.href = path;
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
window.history.back();
|
|
126
134
|
}, [navigate]);
|
|
127
|
-
const exit = (0, react_1.useCallback)(() => {
|
|
135
|
+
const exit = (0, react_1.useCallback)((id) => {
|
|
128
136
|
if (customExitRef.current) {
|
|
129
137
|
customExitRef.current();
|
|
130
138
|
return;
|
|
131
139
|
}
|
|
132
140
|
if (exitPath) {
|
|
133
|
-
genericNavigate(exitPath);
|
|
141
|
+
genericNavigate((0, utils_2.buildExitPath)(exitPath, id));
|
|
134
142
|
return;
|
|
135
143
|
}
|
|
136
|
-
const parentPath = window.location.pathname.replace(/\/[^\/]+\/?$/, '/');
|
|
137
|
-
genericNavigate(parentPath);
|
|
144
|
+
// const parentPath = window.location.pathname.replace(/\/[^\/]+\/?$/, '/');
|
|
145
|
+
// genericNavigate(parentPath);
|
|
146
|
+
genericNavigate(-1);
|
|
138
147
|
}, [exitPath, genericNavigate]);
|
|
139
148
|
const localOnSubmit = (0, react_1.useCallback)((data, event) => __awaiter(this, void 0, void 0, function* () {
|
|
140
149
|
const currentId = objId || (0, utils_1.getTmpId)();
|
|
@@ -176,7 +185,7 @@ function Form({ model, objId, defaults, objTitleField, onSave, onDelete, onCance
|
|
|
176
185
|
break;
|
|
177
186
|
case _types_1.FormSaveActions.EXIT_ON_SAVE:
|
|
178
187
|
default:
|
|
179
|
-
exit();
|
|
188
|
+
exit(newId);
|
|
180
189
|
break;
|
|
181
190
|
}
|
|
182
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormActions.d.ts","sourceRoot":"","sources":["../../../src/components/forms/FormActions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,EAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,QAAQ,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,IAAI,CAAC;IACnC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"FormActions.d.ts","sourceRoot":"","sources":["../../../src/components/forms/FormActions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,EAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,QAAQ,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,IAAI,CAAC;IACnC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,EAAE,EAC3D,YAAY,EACZ,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,eAAe,EACf,KAAK,EACL,SAAS,EACT,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,WAAW,GACZ,EAAE,gBAAgB,qBA+GlB"}
|
|
@@ -30,14 +30,14 @@ function FormActions({ formDisabled, model, objId, onCancel, onDelete, exit, bot
|
|
|
30
30
|
if (onDelete) {
|
|
31
31
|
onDelete(objId);
|
|
32
32
|
}
|
|
33
|
-
exit();
|
|
33
|
+
exit(objId);
|
|
34
34
|
}
|
|
35
35
|
};
|
|
36
36
|
const handleCancel = (event) => {
|
|
37
37
|
if (onCancel) {
|
|
38
38
|
onCancel(event);
|
|
39
39
|
}
|
|
40
|
-
exit();
|
|
40
|
+
exit(objId);
|
|
41
41
|
};
|
|
42
42
|
return (react_1.default.createElement(Box_1.default, { sx: finalSx },
|
|
43
43
|
bottom ? (react_1.default.createElement(Button_1.default, { variant: "contained", type: "button", color: "error", size: "small", disabled: (0, utils_1.isTmpId)(objId) || !onDeleteModel, onClick: handleDelete }, labelRemove || 'Remove')) : title ? (react_1.default.createElement(Typography_1.default, { variant: "h5" }, title)) : (react_1.default.createElement(Box_1.default, null)),
|
package/package.json
CHANGED