@gisce/react-ooui 1.2.0-rc.12 → 1.2.0-rc.14
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/actionbar/TreeActionBar.d.ts.map +1 -1
- package/dist/react-ooui.es.js +3264 -3281
- package/dist/react-ooui.es.js.map +1 -1
- package/dist/react-ooui.umd.js +30 -30
- package/dist/react-ooui.umd.js.map +1 -1
- package/package.json +3 -3
- package/src/actionbar/TreeActionBar.tsx +2 -1
- package/src/widgets/containers/Group.tsx +3 -3
- package/src/widgets/modals/ExportModal.tsx +4 -2
- package/dist/ui/Fieldset.d.ts +0 -8
- package/dist/ui/Fieldset.d.ts.map +0 -1
- package/src/ui/Fieldset.tsx +0 -31
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gisce/react-ooui",
|
|
3
|
-
"version": "1.2.0-rc.
|
|
3
|
+
"version": "1.2.0-rc.14",
|
|
4
4
|
"files": [
|
|
5
5
|
"dist",
|
|
6
6
|
"src",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@ant-design/plots": "^1.0.9",
|
|
39
|
-
"@gisce/ooui": "^0.17.
|
|
40
|
-
"@gisce/react-formiga-components": "^1.0.9-rc.
|
|
39
|
+
"@gisce/ooui": "^0.17.10-rc.3",
|
|
40
|
+
"@gisce/react-formiga-components": "^1.0.9-rc.10",
|
|
41
41
|
"@gisce/react-formiga-table": "^0.5.0",
|
|
42
42
|
"@monaco-editor/react": "^4.4.5",
|
|
43
43
|
"@tabler/icons": "^1.96.0",
|
|
@@ -61,6 +61,7 @@ function TreeActionBar(props: Props) {
|
|
|
61
61
|
previousView,
|
|
62
62
|
results,
|
|
63
63
|
limit,
|
|
64
|
+
totalItems,
|
|
64
65
|
} = useContext(ActionViewContext) as ActionViewContextType;
|
|
65
66
|
|
|
66
67
|
const { parentContext = {}, treeExpandable, toolbar } = props;
|
|
@@ -351,7 +352,7 @@ function TreeActionBar(props: Props) {
|
|
|
351
352
|
searchParams || []
|
|
352
353
|
)}
|
|
353
354
|
limit={limit}
|
|
354
|
-
totalRegisters={
|
|
355
|
+
totalRegisters={totalItems || 0}
|
|
355
356
|
selectedRegistersToExport={
|
|
356
357
|
selectedRowItems &&
|
|
357
358
|
selectedRowItems.length &&
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { Group as GroupOoui } from "@gisce/ooui";
|
|
3
3
|
import Container from "./Container";
|
|
4
|
-
import
|
|
4
|
+
import { FieldSet } from "@gisce/react-formiga-components";
|
|
5
5
|
|
|
6
6
|
type Props = {
|
|
7
7
|
ooui: GroupOoui;
|
|
@@ -15,12 +15,12 @@ function Group(props: Props): React.ReactElement {
|
|
|
15
15
|
return (
|
|
16
16
|
<>
|
|
17
17
|
{ooui.label && showLabel ? (
|
|
18
|
-
<
|
|
18
|
+
<FieldSet label={ooui.label}>
|
|
19
19
|
<Container
|
|
20
20
|
container={ooui!.container}
|
|
21
21
|
responsiveBehaviour={responsiveBehaviour}
|
|
22
22
|
/>
|
|
23
|
-
</
|
|
23
|
+
</FieldSet>
|
|
24
24
|
) : (
|
|
25
25
|
<Container
|
|
26
26
|
container={ooui!.container}
|
|
@@ -136,7 +136,7 @@ const convertToExportField = ({
|
|
|
136
136
|
if (valuesForField.relation && valuesForField.is_function === true) {
|
|
137
137
|
continue;
|
|
138
138
|
}
|
|
139
|
-
|
|
139
|
+
|
|
140
140
|
const relationField =
|
|
141
141
|
valuesForField.type === "many2one" ||
|
|
142
142
|
valuesForField.type === "one2many" ||
|
|
@@ -150,7 +150,9 @@ const convertToExportField = ({
|
|
|
150
150
|
|
|
151
151
|
exportFields.push({
|
|
152
152
|
key: newKey,
|
|
153
|
-
title: `${parentTitle ? parentTitle + "
|
|
153
|
+
title: `${parentTitle ? parentTitle + " → " : ""}${
|
|
154
|
+
valuesForField.string
|
|
155
|
+
}`,
|
|
154
156
|
tooltip: valuesForField.help,
|
|
155
157
|
required: valuesForField.required,
|
|
156
158
|
isLeaf: !relationField,
|
package/dist/ui/Fieldset.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Fieldset.d.ts","sourceRoot":"","sources":["Fieldset.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,aAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,QAAA,MAAM,QAAQ,UAAW,KAAK,KAAG,MAAM,YAqBtC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
package/src/ui/Fieldset.tsx
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
|
|
3
|
-
type Props = {
|
|
4
|
-
label: string;
|
|
5
|
-
children: any;
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
const Fieldset = (props: Props): React.ReactElement => {
|
|
9
|
-
const { label, children } = props;
|
|
10
|
-
|
|
11
|
-
return (
|
|
12
|
-
// TODO: change in-line styles to TailWind classes
|
|
13
|
-
<fieldset className="p-2 border-gray-400 border border-solid font-sans">
|
|
14
|
-
<legend
|
|
15
|
-
style={{
|
|
16
|
-
all: "initial",
|
|
17
|
-
marginLeft: "1em",
|
|
18
|
-
paddingLeft: "0.5em",
|
|
19
|
-
paddingRight: "0.5em",
|
|
20
|
-
fontFamily:
|
|
21
|
-
"system-ui, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji'",
|
|
22
|
-
}}
|
|
23
|
-
>
|
|
24
|
-
{label}
|
|
25
|
-
</legend>
|
|
26
|
-
{children}
|
|
27
|
-
</fieldset>
|
|
28
|
-
);
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
export default Fieldset;
|