@visns-studio/visns-components 2.0.6 → 2.0.8
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.
|
@@ -98,8 +98,9 @@ const DataGrid = forwardRef(
|
|
|
98
98
|
(
|
|
99
99
|
{
|
|
100
100
|
ajaxSetting,
|
|
101
|
-
form,
|
|
102
101
|
columns,
|
|
102
|
+
form,
|
|
103
|
+
gridHeight,
|
|
103
104
|
settings,
|
|
104
105
|
setFilterData,
|
|
105
106
|
setConfig,
|
|
@@ -330,9 +331,11 @@ const DataGrid = forwardRef(
|
|
|
330
331
|
|
|
331
332
|
if (rowProps.data[fileRelationArray[0]]) {
|
|
332
333
|
if (linkFolder !== '') {
|
|
333
|
-
window.
|
|
334
|
+
window.open(
|
|
335
|
+
`${linkUrl}${rowData}/${linkFolder}`
|
|
336
|
+
);
|
|
334
337
|
} else {
|
|
335
|
-
window.
|
|
338
|
+
window.open(`${linkUrl}${rowData}`);
|
|
336
339
|
}
|
|
337
340
|
}
|
|
338
341
|
} else {
|
|
@@ -1678,7 +1681,9 @@ const DataGrid = forwardRef(
|
|
|
1678
1681
|
const [dataCount, setDataCount] = useState(0);
|
|
1679
1682
|
const [gridStyle, setGridStyle] = useState({
|
|
1680
1683
|
minHeight:
|
|
1681
|
-
|
|
1684
|
+
gridHeight && gridHeight > 0
|
|
1685
|
+
? gridHeight
|
|
1686
|
+
: dataCount > 5
|
|
1682
1687
|
? dataCount > 8
|
|
1683
1688
|
? windowHeight * 0.7 > 550
|
|
1684
1689
|
? windowHeight * 0.7
|
package/package.json
CHANGED