@gisce/react-ooui 0.6.0 → 0.7.2
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/helpers/treeHelper.d.ts +6 -1
- package/dist/helpers/treeHelper.d.ts.map +1 -1
- package/dist/helpers/treeHelper.js +27 -1
- package/dist/helpers/treeHelper.js.map +1 -1
- package/dist/index.js +70 -1
- package/dist/index.js.LICENSE.txt +15 -0
- package/dist/widgets/views/Dashboard/DashboardTree.d.ts.map +1 -1
- package/dist/widgets/views/Dashboard/DashboardTree.js +11 -27
- package/dist/widgets/views/Dashboard/DashboardTree.js.map +1 -1
- package/dist/widgets/views/Form.d.ts.map +1 -1
- package/dist/widgets/views/Form.js +15 -48
- package/dist/widgets/views/Form.js.map +1 -1
- package/dist/widgets/views/SearchTree.d.ts.map +1 -1
- package/dist/widgets/views/SearchTree.js +39 -40
- package/dist/widgets/views/SearchTree.js.map +1 -1
- package/dist/widgets/views/Tree.d.ts +1 -1
- package/dist/widgets/views/Tree.d.ts.map +1 -1
- package/dist/widgets/views/Tree.js +17 -29
- package/dist/widgets/views/Tree.js.map +1 -1
- package/package.json +4 -1
- package/src/helpers/treeHelper.ts +41 -0
- package/src/stories/views/SearchTree.stories.tsx +324 -162
- package/src/widgets/views/Dashboard/DashboardTree.tsx +13 -36
- package/src/widgets/views/Form.tsx +8 -52
- package/src/widgets/views/SearchTree.tsx +43 -49
- package/src/widgets/views/Tree.tsx +29 -46
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AAS3C,aAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAyDF,iBAAS,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CA2K9C;AAED,eAAe,IAAI,CAAC"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
3
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
4
|
-
return cooked;
|
|
5
|
-
};
|
|
6
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
3
|
if (k2 === undefined) k2 = k;
|
|
8
4
|
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
@@ -22,9 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
18
|
__setModuleDefault(result, mod);
|
|
23
19
|
return result;
|
|
24
20
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
22
|
var react_1 = __importStar(require("react"));
|
|
30
23
|
var antd_1 = require("antd");
|
|
@@ -34,10 +27,14 @@ var Many2oneSuffix_1 = require("../base/many2one/Many2oneSuffix");
|
|
|
34
27
|
var dynamicColumnsHelper_1 = require("@/helpers/dynamicColumnsHelper");
|
|
35
28
|
var timeHelper_1 = require("@/helpers/timeHelper");
|
|
36
29
|
var ProgressBar_1 = require("../base/ProgressBar");
|
|
37
|
-
var
|
|
38
|
-
var StyledTable = styled_components_1.default(antd_1.Table)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n .ant-table-body {\n min-height: ", "px;\n }\n"], ["\n .ant-table-body {\n min-height: ", "px;\n }\n"])), function (props) { return props.minHeight; });
|
|
30
|
+
var react_formiga_table_1 = require("@gisce/react-formiga-table");
|
|
39
31
|
var booleanComponentFn = function (value) {
|
|
40
|
-
return react_1.default.createElement(
|
|
32
|
+
return (react_1.default.createElement("div", { style: {
|
|
33
|
+
display: "flex",
|
|
34
|
+
justifyContent: "center",
|
|
35
|
+
alignContent: "center",
|
|
36
|
+
} },
|
|
37
|
+
react_1.default.createElement(antd_1.Checkbox, { defaultChecked: value, disabled: true })));
|
|
41
38
|
};
|
|
42
39
|
var many2OneComponentFn = function (m2oField) {
|
|
43
40
|
if (!m2oField) {
|
|
@@ -60,13 +57,16 @@ var progressBarComponentFn = function (value) {
|
|
|
60
57
|
var floatTimeComponent = function (value) {
|
|
61
58
|
return react_1.default.createElement(react_1.default.Fragment, null, timeHelper_1.parseFloatToString(value));
|
|
62
59
|
};
|
|
60
|
+
var numberComponent = function (value) {
|
|
61
|
+
return react_1.default.createElement("div", { style: { textAlign: "right" } }, value);
|
|
62
|
+
};
|
|
63
63
|
var imageComponent = function (value) {
|
|
64
64
|
return (react_1.default.createElement("img", { src: "data:image/*;base64," + value, style: { maxWidth: "50px", padding: "5px" } }));
|
|
65
65
|
};
|
|
66
66
|
function Tree(props) {
|
|
67
|
-
var _a = props.page, page = _a === void 0 ? 1 : _a, limit = props.limit, total = props.total, treeView = props.treeView, results = props.results, onRequestPageChange = props.onRequestPageChange, loading = props.loading, onRowClicked = props.onRowClicked, _b = props.showPagination, showPagination = _b === void 0 ? true : _b, rowSelection = props.rowSelection, scrollY = props.scrollY, _c = props.colorsForResults, colorsForResults = _c === void 0 ? {} : _c, onChangeSort = props.onChangeSort,
|
|
68
|
-
var
|
|
69
|
-
var
|
|
67
|
+
var _a = props.page, page = _a === void 0 ? 1 : _a, limit = props.limit, total = props.total, treeView = props.treeView, results = props.results, onRequestPageChange = props.onRequestPageChange, loading = props.loading, onRowClicked = props.onRowClicked, _b = props.showPagination, showPagination = _b === void 0 ? true : _b, rowSelection = props.rowSelection, scrollY = props.scrollY, _c = props.colorsForResults, colorsForResults = _c === void 0 ? {} : _c, onChangeSort = props.onChangeSort, sorter = props.sorter;
|
|
68
|
+
var _d = react_1.useState([]), items = _d[0], setItems = _d[1];
|
|
69
|
+
var _e = react_1.useState([]), columns = _e[0], setColumns = _e[1];
|
|
70
70
|
var errorInParseColors = react_1.useRef(false);
|
|
71
71
|
var treeOoui = react_1.useRef(null);
|
|
72
72
|
var t = react_1.useContext(LocaleContext_1.LocaleContext).t;
|
|
@@ -81,6 +81,8 @@ function Tree(props) {
|
|
|
81
81
|
progressbar: progressBarComponentFn,
|
|
82
82
|
float_time: floatTimeComponent,
|
|
83
83
|
image: imageComponent,
|
|
84
|
+
integer: numberComponent,
|
|
85
|
+
float: numberComponent,
|
|
84
86
|
});
|
|
85
87
|
setColumns(columns);
|
|
86
88
|
}, [treeView]);
|
|
@@ -151,13 +153,7 @@ function Tree(props) {
|
|
|
151
153
|
}
|
|
152
154
|
return treeOoui.current === null ? (react_1.default.createElement(antd_1.Spin, { style: { padding: "2rem" } })) : (react_1.default.createElement("div", null,
|
|
153
155
|
pagination(),
|
|
154
|
-
react_1.default.createElement(
|
|
155
|
-
? undefined
|
|
156
|
-
: { x: dataTable.tableWidth, y: adjustedHeight }, size: "small", dataSource: items, pagination: false, loading: loading, rowClassName: function (record) {
|
|
157
|
-
return "cursor-pointer select-none record-row-" + record.id;
|
|
158
|
-
}, rowKey: function (item) {
|
|
159
|
-
return item.id;
|
|
160
|
-
}, onRow: function (record) {
|
|
156
|
+
react_1.default.createElement(react_formiga_table_1.Table, { height: adjustedHeight, columns: dataTable.columns, dataSource: items, loading: loading, loadingComponent: react_1.default.createElement(antd_1.Spin, null), onRow: function (record) {
|
|
161
157
|
var style = undefined;
|
|
162
158
|
if (colorsForResults[record.id]) {
|
|
163
159
|
style = { color: colorsForResults[record.id] };
|
|
@@ -169,16 +165,8 @@ function Tree(props) {
|
|
|
169
165
|
onRowClicked(record.id);
|
|
170
166
|
},
|
|
171
167
|
};
|
|
172
|
-
}, rowSelection: rowSelection,
|
|
173
|
-
if (!sorter.order) {
|
|
174
|
-
onChangeSort === null || onChangeSort === void 0 ? void 0 : onChangeSort(undefined);
|
|
175
|
-
}
|
|
176
|
-
else {
|
|
177
|
-
onChangeSort === null || onChangeSort === void 0 ? void 0 : onChangeSort(sorter);
|
|
178
|
-
}
|
|
179
|
-
} }),
|
|
168
|
+
}, onRowSelectionChange: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange, onChangeSort: onChangeSort, sorter: sorter }),
|
|
180
169
|
getSums()));
|
|
181
170
|
}
|
|
182
171
|
exports.default = Tree;
|
|
183
|
-
var templateObject_1;
|
|
184
172
|
//# sourceMappingURL=Tree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tree.js","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Tree.js","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gisce/react-ooui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist",
|
|
@@ -25,11 +25,13 @@
|
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@ant-design/charts": "^1.3.6",
|
|
27
27
|
"@gisce/ooui": "^0.7.1",
|
|
28
|
+
"@gisce/react-formiga-table": "^0.0.12",
|
|
28
29
|
"fiber-diagram": "github:gisce/fiber-diagram",
|
|
29
30
|
"file-type": "^16.5.0",
|
|
30
31
|
"react-grid-layout": "^1.3.4",
|
|
31
32
|
"react-hotkeys-hook": "^3.4.4",
|
|
32
33
|
"react-measure": "^2.5.2",
|
|
34
|
+
"react-table": "^7.8.0",
|
|
33
35
|
"scroll-into-view": "^1.16.0",
|
|
34
36
|
"styled-components": "^5.2.1",
|
|
35
37
|
"use-deep-compare-effect": "^1.8.1",
|
|
@@ -53,6 +55,7 @@
|
|
|
53
55
|
"@types/react-grid-layout": "^1.3.2",
|
|
54
56
|
"@types/react-measure": "^2.0.7",
|
|
55
57
|
"@types/react-responsive": "^8.0.2",
|
|
58
|
+
"@types/react-table": "^7.7.12",
|
|
56
59
|
"@types/scroll-into-view": "^1.16.0",
|
|
57
60
|
"@types/styled-components": "^5.1.7",
|
|
58
61
|
"@types/uuid": "^8.3.1",
|
|
@@ -117,6 +117,46 @@ function getColorMap(colorsValue: any) {
|
|
|
117
117
|
return map;
|
|
118
118
|
}
|
|
119
119
|
|
|
120
|
+
function sortResults({
|
|
121
|
+
resultsToSort,
|
|
122
|
+
sorter,
|
|
123
|
+
fields,
|
|
124
|
+
}: {
|
|
125
|
+
resultsToSort: any[];
|
|
126
|
+
sorter: any;
|
|
127
|
+
fields: any;
|
|
128
|
+
}) {
|
|
129
|
+
if (!sorter) {
|
|
130
|
+
return resultsToSort;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
const { id: field, desc } = sorter;
|
|
134
|
+
const order = desc === false ? "ascend" : "descend";
|
|
135
|
+
|
|
136
|
+
const type = fields[field].type;
|
|
137
|
+
|
|
138
|
+
const sortFn = (a: any, b: any) => {
|
|
139
|
+
let aItem = a[field] || "",
|
|
140
|
+
bItem = b[field] || "";
|
|
141
|
+
|
|
142
|
+
if (type === "many2one") {
|
|
143
|
+
aItem = a[field]?.[1] || "";
|
|
144
|
+
bItem = b[field]?.[1] || "";
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
if (aItem === bItem) {
|
|
148
|
+
return 0;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
if (order === "ascend") {
|
|
152
|
+
return aItem > bItem ? 1 : -1;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
return aItem < bItem ? 1 : -1;
|
|
156
|
+
};
|
|
157
|
+
|
|
158
|
+
return resultsToSort.sort(sortFn);
|
|
159
|
+
}
|
|
120
160
|
export {
|
|
121
161
|
getTableColumns,
|
|
122
162
|
getTableItems,
|
|
@@ -124,4 +164,5 @@ export {
|
|
|
124
164
|
convertBooleansToNumeric,
|
|
125
165
|
itemHasBooleans,
|
|
126
166
|
getColorMap,
|
|
167
|
+
sortResults,
|
|
127
168
|
};
|