diff --git a/package-lock.json b/package-lock.json index 909b5e9a..a797613f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "@gisce/react-ooui", - "version": "2.95.0", + "version": "2.96.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gisce/react-ooui", - "version": "2.95.0", + "version": "2.96.0", "dependencies": { "@ant-design/colors": "^7.2.0", "@ant-design/plots": "^1.0.9", "@gisce/fiber-diagram": "2.1.1", - "@gisce/ooui": "2.33.0", + "@gisce/ooui": "2.34.0", "@gisce/react-formiga-components": "1.17.0", "@gisce/react-formiga-table": "1.16.0-rc.1", "@monaco-editor/react": "^4.4.5", @@ -2145,9 +2145,9 @@ } }, "node_modules/@gisce/ooui": { - "version": "2.33.0", - "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.33.0.tgz", - "integrity": "sha512-o9edBfKa3bZCjR2qLvyEk+p/kq3RDeZTkix/drFegBRnkgqgRFUEp7PkZS9oTeSrYOk7WrRa/IiUA1ZWLI4MSw==", + "version": "2.34.0", + "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.34.0.tgz", + "integrity": "sha512-2Q25HQKooUlYrDYrI0Ntc20iNuX4Go3LUzZKAaIhHHPbyUzIXEYeW/0OEwARNrcBiprNwFsnE2P2wAlOIMrSow==", "dependencies": { "@gisce/conscheck": "1.0.9", "html-entities": "^2.3.3", diff --git a/package.json b/package.json index 47d23621..ecbf3b74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gisce/react-ooui", - "version": "2.95.0", + "version": "2.96.0", "engines": { "node": "20.5.0" }, @@ -37,7 +37,7 @@ "@ant-design/colors": "^7.2.0", "@ant-design/plots": "^1.0.9", "@gisce/fiber-diagram": "2.1.1", - "@gisce/ooui": "2.33.0", + "@gisce/ooui": "2.34.0", "@gisce/react-formiga-components": "1.17.0", "@gisce/react-formiga-table": "1.16.0-rc.1", "@monaco-editor/react": "^4.4.5", diff --git a/src/helpers/treeHelper.tsx b/src/helpers/treeHelper.tsx index d22c41f9..1ed0e1b3 100644 --- a/src/helpers/treeHelper.tsx +++ b/src/helpers/treeHelper.tsx @@ -79,9 +79,10 @@ const getTableColumns = ( return 0; }, isSortable: - type !== "one2many" && - !column.isFunction && - (type !== "many2one" || many2oneSortEnabled), + (type !== "one2many" && + !column.isFunction && + (type !== "many2one" || many2oneSortEnabled)) || + column.isSortable, }; }); return tableColumns;