From 55eb1a9de2249b4386677d6264bc1ae8aa44c468 Mon Sep 17 00:00:00 2001 From: lijinke666 Date: Thu, 9 May 2024 19:42:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BA=86=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC=E4=BD=86=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=B8=B2=E6=9F=93=E7=9A=84=E6=96=87=E6=9C=AC=E6=9C=AA?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=97=B6,=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=B9=9F=E4=BC=9A=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multi-line-text-spec.ts.snap | 13828 ++++++++++------ .../spreadsheet/multi-line-text-spec.ts | 58 +- packages/s2-core/src/cell/base-cell.ts | 6 +- packages/s2-core/src/facet/base-facet.ts | 9 +- packages/s2-core/src/facet/pivot-facet.ts | 200 +- packages/s2-core/src/facet/table-facet.ts | 71 +- packages/s2-react/playground/config.tsx | 4 +- packages/s2-react/playground/index.tsx | 7 +- 8 files changed, 8645 insertions(+), 5538 deletions(-) diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap index 6102d0339f..78fab0d1e8 100644 --- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap +++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap @@ -80,7 +80,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "2", ], @@ -102,7 +102,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "4", ], @@ -350,7 +350,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -361,7 +361,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], @@ -372,7 +372,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "宁波市", ], @@ -383,7 +383,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "舟山市", ], @@ -394,7 +394,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "杭州市", ], @@ -433,7 +433,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "四川省", ], @@ -444,13 +444,46 @@ Array [ "actualText": "成都市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "成都市", ], "originalText": "成都市", "width": 96, }, + Object { + "actualText": "绵阳市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绵阳市", + ], + "originalText": "绵阳市", + "width": 96, + }, + Object { + "actualText": "南充市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "南充市", + ], + "originalText": "南充市", + "width": 96, + }, + Object { + "actualText": "乐山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "乐山市", + ], + "originalText": "乐山市", + "width": 96, + }, ] `; @@ -471,7 +504,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -482,7 +515,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -493,7 +526,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -504,7 +537,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -526,7 +559,40 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -548,7 +614,7 @@ Array [ "actualText": "236723672361111", "actualTextHeight": 30, "actualTextWidth": 99, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "23672367236", "1111", @@ -560,7 +626,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -571,7 +637,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -582,7 +648,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -604,13 +670,46 @@ Array [ "actualText": "1723", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1723", ], "originalText": "1723", "width": 96, }, + Object { + "actualText": "1822", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1822", + ], + "originalText": "1822", + "width": 96, + }, + Object { + "actualText": "1943", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1943", + ], + "originalText": "1943", + "width": 96, + }, + Object { + "actualText": "2330", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2330", + ], + "originalText": "2330", + "width": 96, + }, Object { "actualText": "-", "actualTextHeight": 15, @@ -626,7 +725,7 @@ Array [ "actualText": "632", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "632", ], @@ -637,7 +736,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -648,7 +747,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -659,7 +758,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -681,13 +780,46 @@ Array [ "actualText": "2451", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2451", ], "originalText": "2451", "width": 96, }, + Object { + "actualText": "2244", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2244", + ], + "originalText": "2244", + "width": 96, + }, + Object { + "actualText": "2333", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2333", + ], + "originalText": "2333", + "width": 96, + }, + Object { + "actualText": "2445", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2445", + ], + "originalText": "2445", + "width": 96, + }, Object { "actualText": "-", "actualTextHeight": 15, @@ -703,7 +835,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -714,7 +846,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -725,7 +857,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -736,7 +868,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -760,7 +892,40 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -782,7 +947,7 @@ Array [ "actualText": "1304", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1304", ], @@ -793,7 +958,7 @@ Array [ "actualText": "1145", "actualTextHeight": 15, "actualTextWidth": 26, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1145", ], @@ -804,7 +969,7 @@ Array [ "actualText": "1432", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1432", ], @@ -815,7 +980,7 @@ Array [ "actualText": "945", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "945", ], @@ -837,7 +1002,7 @@ Array [ "actualText": "2335", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2335", ], @@ -845,43 +1010,76 @@ Array [ "width": 96, }, Object { - "actualText": "-", + "actualText": "245", "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 72, + "actualTextWidth": 21, + "height": 30, "multiLineActualTexts": Array [ - "-", + "245", ], - "originalText": "-", + "originalText": "245", "width": 96, }, Object { - "actualText": "1354", + "actualText": "2457", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ - "1354", + "2457", ], - "originalText": "1354", + "originalText": "2457", "width": 96, }, Object { - "actualText": "1523", + "actualText": "2458", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ - "1523", + "2458", ], - "originalText": "1523", + "originalText": "2458", "width": 96, }, Object { - "actualText": "1634", + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 72, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "1354", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, + "multiLineActualTexts": Array [ + "1354", + ], + "originalText": "1354", + "width": 96, + }, + Object { + "actualText": "1523", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1523", + ], + "originalText": "1523", + "width": 96, + }, + Object { + "actualText": "1634", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, "multiLineActualTexts": Array [ "1634", ], @@ -892,7 +1090,7 @@ Array [ "actualText": "1343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1343", ], @@ -914,13 +1112,46 @@ Array [ "actualText": "4004", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4004", ], "originalText": "4004", "width": 96, }, + Object { + "actualText": "3077", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3077", + ], + "originalText": "3077", + "width": 96, + }, + Object { + "actualText": "3551", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3551", + ], + "originalText": "3551", + "width": 96, + }, + Object { + "actualText": "352", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "352", + ], + "originalText": "352", + "width": 96, + }, ] `; @@ -1389,7 +1620,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "1", ], @@ -1400,7 +1631,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "2", ], @@ -1531,7 +1762,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -1553,7 +1784,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "舟山市", ], @@ -1564,7 +1795,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "杭州市", ], @@ -1575,7 +1806,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], @@ -1586,7 +1817,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 212, + "height": 120, "multiLineActualTexts": Array [ "四川省", ], @@ -1597,7 +1828,7 @@ Array [ "actualText": "成都市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "成都市", ], @@ -1608,7 +1839,7 @@ Array [ "actualText": "绵阳市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "绵阳市", ], @@ -1619,7 +1850,7 @@ Array [ "actualText": "南充市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "南充市", ], @@ -1630,7 +1861,7 @@ Array [ "actualText": "乐山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "乐山市", ], @@ -1657,7 +1888,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -1668,7 +1899,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -1679,7 +1910,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -1690,7 +1921,7 @@ Array [ "actualText": "1723", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1723", ], @@ -1701,7 +1932,7 @@ Array [ "actualText": "1822", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1822", ], @@ -1712,7 +1943,7 @@ Array [ "actualText": "1943", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1943", ], @@ -1723,7 +1954,7 @@ Array [ "actualText": "2330", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2330", ], @@ -1745,7 +1976,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -1756,7 +1987,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -1767,7 +1998,7 @@ Array [ "actualText": "632", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "632", ], @@ -1778,7 +2009,7 @@ Array [ "actualText": "2451", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2451", ], @@ -1789,7 +2020,7 @@ Array [ "actualText": "2244", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2244", ], @@ -1800,7 +2031,7 @@ Array [ "actualText": "2333", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2333", ], @@ -1811,7 +2042,7 @@ Array [ "actualText": "2445", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2445", ], @@ -1833,7 +2064,7 @@ Array [ "actualText": "1432", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1432", ], @@ -1844,7 +2075,7 @@ Array [ "actualText": "945", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "945", ], @@ -1855,7 +2086,7 @@ Array [ "actualText": "1304", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1304", ], @@ -1866,7 +2097,7 @@ Array [ "actualText": "2335", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2335", ], @@ -1877,7 +2108,7 @@ Array [ "actualText": "245", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "245", ], @@ -1888,7 +2119,7 @@ Array [ "actualText": "2457", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2457", ], @@ -1899,7 +2130,7 @@ Array [ "actualText": "2458", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2458", ], @@ -1921,7 +2152,7 @@ Array [ "actualText": "1634", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1634", ], @@ -1932,7 +2163,7 @@ Array [ "actualText": "1343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1343", ], @@ -1943,7 +2174,7 @@ Array [ "actualText": "1354", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1354", ], @@ -1954,7 +2185,7 @@ Array [ "actualText": "4004", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4004", ], @@ -1965,7 +2196,7 @@ Array [ "actualText": "3077", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3077", ], @@ -1976,7 +2207,7 @@ Array [ "actualText": "3551", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3551", ], @@ -1987,7 +2218,7 @@ Array [ "actualText": "352", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "352", ], @@ -2065,7 +2296,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 163, + "height": 140, "multiLineActualTexts": Array [ "1", ], @@ -2087,7 +2318,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 259, + "height": 190, "multiLineActualTexts": Array [ "3", ], @@ -2265,7 +2496,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 163, + "height": 140, "multiLineActualTexts": Array [ "浙江省", ], @@ -2309,7 +2540,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "杭州市", ], @@ -2346,7 +2577,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 259, + "height": 190, "multiLineActualTexts": Array [ "四川省", ], @@ -2368,7 +2599,7 @@ Array [ "actualText": "绵阳市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "绵阳市", ], @@ -2379,7 +2610,7 @@ Array [ "actualText": "南充市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "南充市", ], @@ -2390,7 +2621,7 @@ Array [ "actualText": "乐山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "乐山市", ], @@ -2440,7 +2671,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -2473,7 +2704,7 @@ Array [ "actualText": "1822", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1822", ], @@ -2484,7 +2715,7 @@ Array [ "actualText": "1943", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1943", ], @@ -2495,7 +2726,7 @@ Array [ "actualText": "2330", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2330", ], @@ -2539,7 +2770,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -2572,7 +2803,7 @@ Array [ "actualText": "2244", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2244", ], @@ -2583,7 +2814,7 @@ Array [ "actualText": "2333", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2333", ], @@ -2594,7 +2825,7 @@ Array [ "actualText": "2445", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2445", ], @@ -2638,7 +2869,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -2673,7 +2904,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -2684,7 +2915,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -2695,7 +2926,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -2739,7 +2970,7 @@ Array [ "actualText": "945", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "945", ], @@ -2772,7 +3003,7 @@ Array [ "actualText": "245", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "245", ], @@ -2783,7 +3014,7 @@ Array [ "actualText": "2457", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2457", ], @@ -2794,7 +3025,7 @@ Array [ "actualText": "2458", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "2458", ], @@ -2838,7 +3069,7 @@ Array [ "actualText": "1343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1343", ], @@ -2871,7 +3102,7 @@ Array [ "actualText": "3077", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3077", ], @@ -2882,7 +3113,7 @@ Array [ "actualText": "3551", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3551", ], @@ -2893,7 +3124,7 @@ Array [ "actualText": "352", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "352", ], @@ -2970,7 +3201,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "1", ], @@ -2992,7 +3223,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "3", ], @@ -3070,7 +3301,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -3093,7 +3324,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "四川省", ], @@ -3121,7 +3352,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -3132,7 +3363,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -3143,7 +3374,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -3165,7 +3396,7 @@ Array [ "actualText": "1723", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1723", ], @@ -3176,7 +3407,7 @@ Array [ "actualText": "1822", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1822", ], @@ -3187,7 +3418,7 @@ Array [ "actualText": "1943", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1943", ], @@ -3198,7 +3429,7 @@ Array [ "actualText": "2330", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2330", ], @@ -3220,7 +3451,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -3231,7 +3462,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -3242,7 +3473,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -3264,7 +3495,7 @@ Array [ "actualText": "2451", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2451", ], @@ -3275,7 +3506,7 @@ Array [ "actualText": "2244", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2244", ], @@ -3286,7 +3517,7 @@ Array [ "actualText": "2333", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2333", ], @@ -3297,7 +3528,7 @@ Array [ "actualText": "2445", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2445", ], @@ -3374,7 +3605,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "1", ], @@ -3396,7 +3627,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "3", ], @@ -3474,7 +3705,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -3497,7 +3728,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "四川省", ], @@ -3525,7 +3756,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -3536,7 +3767,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -3547,7 +3778,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -3569,7 +3800,7 @@ Array [ "actualText": "1723", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1723", ], @@ -3580,7 +3811,7 @@ Array [ "actualText": "1822", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1822", ], @@ -3591,7 +3822,7 @@ Array [ "actualText": "1943", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1943", ], @@ -3602,7 +3833,7 @@ Array [ "actualText": "2330", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2330", ], @@ -3624,7 +3855,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -3635,7 +3866,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -3646,7 +3877,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -3668,7 +3899,7 @@ Array [ "actualText": "2451", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2451", ], @@ -3679,7 +3910,7 @@ Array [ "actualText": "2244", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2244", ], @@ -3690,7 +3921,7 @@ Array [ "actualText": "2333", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2333", ], @@ -3701,7 +3932,7 @@ Array [ "actualText": "2445", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2445", ], @@ -5156,13 +5387,24 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "1", ], "originalText": "1", "width": 80, }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 72, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, ] `; @@ -5238,13 +5480,27 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], "originalText": "浙江省", "width": 96, }, + Object { + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 64, + "actualTextWidth": 290, + "height": 72, + "multiLineActualTexts": Array [ + "浙江省浙江省", + "浙江省浙江省", + "浙江省浙江省", + "浙江省浙江...", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 96, + }, ] `; @@ -5266,7 +5522,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -5277,7 +5533,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -5288,7 +5544,18 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 72, "multiLineActualTexts": Array [ "-", ], @@ -5310,7 +5577,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -5321,7 +5588,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -5332,13 +5599,24 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], "originalText": "5343", "width": 96, }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 72, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 96, + }, ] `; @@ -6969,7 +7247,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "1", ], @@ -6987,6 +7265,17 @@ Array [ "originalText": "2", "width": 80, }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 120, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, ] `; @@ -7060,7 +7349,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 189, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -7080,6 +7369,17 @@ Array [ "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 96, }, + Object { + "actualText": "四川省", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 120, + "multiLineActualTexts": Array [ + "四川省", + ], + "originalText": "四川省", + "width": 96, + }, ] `; @@ -7101,7 +7401,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -7112,7 +7412,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -7123,7 +7423,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7141,6 +7441,28 @@ Array [ "originalText": "-", "width": 96, }, + Object { + "actualText": "1723", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1723", + ], + "originalText": "1723", + "width": 96, + }, + Object { + "actualText": "1822", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1822", + ], + "originalText": "1822", + "width": 96, + }, Object { "actualText": "632", "actualTextHeight": 15, @@ -7156,7 +7478,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -7167,7 +7489,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -7178,7 +7500,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -7196,6 +7518,28 @@ Array [ "originalText": "-", "width": 96, }, + Object { + "actualText": "2451", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2451", + ], + "originalText": "2451", + "width": 96, + }, + Object { + "actualText": "2244", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2244", + ], + "originalText": "2244", + "width": 96, + }, ] `; @@ -7268,7 +7612,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 268, + "height": 150, "multiLineActualTexts": Array [ "2", ], @@ -7286,6 +7630,17 @@ Array [ "originalText": "3", "width": 80, }, + Object { + "actualText": "4", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 150, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, ] `; @@ -7518,7 +7873,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -7529,7 +7884,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], @@ -7540,7 +7895,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "宁波市", ], @@ -7551,7 +7906,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "舟山市", ], @@ -7562,7 +7917,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "杭州市", ], @@ -7582,6 +7937,41 @@ Array [ "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 100, }, + Object { + "actualText": "杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 181, + "height": 56, + "multiLineActualTexts": Array [ + "杭州市杭州", + "市杭州市杭", + "州市杭州...", + ], + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "width": 100, + }, + Object { + "actualText": "四川省", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "四川省", + ], + "originalText": "四川省", + "width": 100, + }, + Object { + "actualText": "成都市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "成都市", + ], + "originalText": "成都市", + "width": 100, + }, ] `; @@ -7611,7 +8001,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7620,7 +8010,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7631,7 +8021,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7642,7 +8032,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7653,7 +8043,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7669,6 +8059,37 @@ Array [ "originalText": undefined, "width": 103, }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 56, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, Object { "actualText": undefined, "actualTextHeight": 0, @@ -7693,7 +8114,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7702,7 +8123,7 @@ Array [ "actualText": "236723672361111", "actualTextHeight": 30, "actualTextWidth": 100, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "236723672361", "111", @@ -7714,7 +8135,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -7725,7 +8146,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -7736,7 +8157,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7753,12 +8174,43 @@ Array [ "width": 103, }, Object { - "actualText": undefined, - "actualTextHeight": 0, - "actualTextWidth": 0, + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, "height": 56, - "multiLineActualTexts": Array [], - "originalText": undefined, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "1723", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1723", + ], + "originalText": "1723", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 56, + "multiLineActualTexts": Array [], + "originalText": undefined, "width": 103, }, Object { @@ -7776,7 +8228,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7785,7 +8237,7 @@ Array [ "actualText": "632", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "632", ], @@ -7796,7 +8248,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -7807,7 +8259,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -7818,7 +8270,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -7834,6 +8286,37 @@ Array [ "originalText": undefined, "width": 103, }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 56, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "2451", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2451", + ], + "originalText": "2451", + "width": 103, + }, Object { "actualText": undefined, "actualTextHeight": 0, @@ -7858,7 +8341,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7867,7 +8350,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7878,7 +8361,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7889,7 +8372,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7900,7 +8383,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -7916,6 +8399,39 @@ Array [ "originalText": undefined, "width": 103, }, + Object { + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 56, + "multiLineActualTexts": Array [ + "778977897789", + "778977897789", + "7789", + ], + "originalText": "7789778977897789778977897789", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, Object { "actualText": undefined, "actualTextHeight": 0, @@ -7940,7 +8456,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7949,7 +8465,7 @@ Array [ "actualText": "1304", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1304", ], @@ -7960,7 +8476,7 @@ Array [ "actualText": "1145", "actualTextHeight": 15, "actualTextWidth": 26, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1145", ], @@ -7971,7 +8487,7 @@ Array [ "actualText": "1432", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1432", ], @@ -7982,7 +8498,7 @@ Array [ "actualText": "945", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "945", ], @@ -7998,6 +8514,37 @@ Array [ "originalText": undefined, "width": 103, }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 56, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "2335", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2335", + ], + "originalText": "2335", + "width": 103, + }, Object { "actualText": undefined, "actualTextHeight": 0, @@ -8022,7 +8569,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 30, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8031,7 +8578,7 @@ Array [ "actualText": "1354", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1354", ], @@ -8042,7 +8589,7 @@ Array [ "actualText": "1523", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1523", ], @@ -8053,7 +8600,7 @@ Array [ "actualText": "1634", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1634", ], @@ -8064,7 +8611,7 @@ Array [ "actualText": "1343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 53, + "height": 30, "multiLineActualTexts": Array [ "1343", ], @@ -8080,6 +8627,37 @@ Array [ "originalText": undefined, "width": 103, }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 56, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 103, + }, + Object { + "actualText": undefined, + "actualTextHeight": 0, + "actualTextWidth": 0, + "height": 30, + "multiLineActualTexts": Array [], + "originalText": undefined, + "width": 103, + }, + Object { + "actualText": "4004", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4004", + ], + "originalText": "4004", + "width": 103, + }, ] `; @@ -8150,7 +8728,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "1", ], @@ -8172,7 +8750,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "3", ], @@ -8250,7 +8828,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 144, + "height": 120, "multiLineActualTexts": Array [ "浙江省", ], @@ -8273,7 +8851,7 @@ Array [ "actualText": "四川省", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 152, + "height": 120, "multiLineActualTexts": Array [ "四川省", ], @@ -8301,7 +8879,7 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "3877", ], @@ -8312,7 +8890,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -8323,7 +8901,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "-", ], @@ -8345,7 +8923,7 @@ Array [ "actualText": "1723", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1723", ], @@ -8356,7 +8934,7 @@ Array [ "actualText": "1822", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1822", ], @@ -8367,13 +8945,24 @@ Array [ "actualText": "1943", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "1943", ], "originalText": "1943", "width": 96, }, + Object { + "actualText": "2330", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2330", + ], + "originalText": "2330", + "width": 96, + }, Object { "actualText": "632", "actualTextHeight": 15, @@ -8389,7 +8978,7 @@ Array [ "actualText": "7234", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "7234", ], @@ -8400,7 +8989,7 @@ Array [ "actualText": "834", "actualTextHeight": 15, "actualTextWidth": 21, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "834", ], @@ -8411,7 +9000,7 @@ Array [ "actualText": "5343", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "5343", ], @@ -8433,7 +9022,7 @@ Array [ "actualText": "2451", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2451", ], @@ -8444,7 +9033,7 @@ Array [ "actualText": "2244", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2244", ], @@ -8455,33 +9044,1774 @@ Array [ "actualText": "2333", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 38, + "height": 30, "multiLineActualTexts": Array [ "2333", ], "originalText": "2333", "width": 96, }, + Object { + "actualText": "2445", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2445", + ], + "originalText": "2445", + "width": 96, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 1`] = ` +exports[`SpreadSheet Multi Line Text Tests PivotSheet should use actual text height for large max line 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 68, "multiLineActualTexts": Array [ "序号", ], "originalText": "序号", "width": 80, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 2`] = ` + Object { + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 68, + "multiLineActualTexts": Array [ + "省份", + ], + "originalText": "省份", + "width": 102.57, + }, + Object { + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 64, + "actualTextWidth": 292, + "height": 68, + "multiLineActualTexts": Array [ + "城市城市城市城", + "市城市城市城市", + "城市城市城市城", + "市城市", + ], + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "width": 102.57, + }, + Object { + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 16, + "actualTextWidth": 241, + "height": 72, + "multiLineActualTexts": Array [ + "类别类别类别类别类别类别类别类别类别类别", + ], + "originalText": "类别类别类别类别类别类别类别类别类别类别", + "width": 285.14, + }, + Object { + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 88, + "multiLineActualTexts": Array [ + "子类别", + ], + "originalText": "子类别", + "width": 285.14, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests PivotSheet should use actual text height for large max line 2`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 120, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 88, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 120, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests PivotSheet should use actual text height for large max line 3`] = ` +Array [ + Object { + "actualText": "家具", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 72, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 205.14, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 88, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 102.57, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 60, + "actualTextWidth": 268, + "height": 68, + "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 102.57, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 88, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 102.57, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 60, + "actualTextWidth": 268, + "height": 68, + "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 102.57, + }, + Object { + "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualTextHeight": 64, + "actualTextWidth": 340, + "height": 72, + "multiLineActualTexts": Array [ + "家具家具家具家", + "具家具家具家具", + "家具家具家具家", + "具家具家具家具", + ], + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "width": 102.57, + }, + Object { + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "actualTextHeight": 80, + "actualTextWidth": 365, + "height": 88, + "multiLineActualTexts": Array [ + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子", + ], + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "width": 102.57, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 60, + "actualTextWidth": 268, + "height": 68, + "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 102.57, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 16, + "actualTextWidth": 49, + "height": 72, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 205.14, + }, + Object { + "actualText": "笔", + "actualTextHeight": 16, + "actualTextWidth": 13, + "height": 88, + "multiLineActualTexts": Array [ + "笔", + ], + "originalText": "笔", + "width": 102.57, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 60, + "actualTextWidth": 268, + "height": 68, + "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 102.57, + }, + Object { + "actualText": "纸张", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 88, + "multiLineActualTexts": Array [ + "纸张", + ], + "originalText": "纸张", + "width": 102.57, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 60, + "actualTextWidth": 268, + "height": 68, + "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 102.57, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests PivotSheet should use actual text height for large max line 4`] = ` +Array [ + Object { + "actualText": "浙江省", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 120, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 102.57, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 102.57, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 102.57, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 102.57, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", + "width": 102.57, + }, + Object { + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "actualTextHeight": 80, + "actualTextWidth": 365, + "height": 88, + "multiLineActualTexts": Array [ + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江省", + "浙江省浙江省浙", + "江省", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 102.57, + }, + Object { + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "actualTextHeight": 75, + "actualTextWidth": 365, + "height": 88, + "multiLineActualTexts": Array [ + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州市", + "杭州市杭州市杭", + "州市", + ], + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "width": 102.57, + }, + Object { + "actualText": "四川省", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 120, + "multiLineActualTexts": Array [ + "四川省", + ], + "originalText": "四川省", + "width": 102.57, + }, + Object { + "actualText": "成都市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "成都市", + ], + "originalText": "成都市", + "width": 102.57, + }, + Object { + "actualText": "绵阳市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绵阳市", + ], + "originalText": "绵阳市", + "width": 102.57, + }, + Object { + "actualText": "南充市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "南充市", + ], + "originalText": "南充市", + "width": 102.57, + }, + Object { + "actualText": "乐山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "乐山市", + ], + "originalText": "乐山市", + "width": 102.57, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests PivotSheet should use actual text height for large max line 5`] = ` +Array [ + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 30, + "multiLineActualTexts": Array [ + "236723672361", + "111", + ], + "originalText": "236723672361111", + "width": 102.57, + }, + Object { + "actualText": "3877", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3877", + ], + "originalText": "3877", + "width": 102.57, + }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 88, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "1723", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1723", + ], + "originalText": "1723", + "width": 102.57, + }, + Object { + "actualText": "1822", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1822", + ], + "originalText": "1822", + "width": 102.57, + }, + Object { + "actualText": "1943", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1943", + ], + "originalText": "1943", + "width": 102.57, + }, + Object { + "actualText": "2330", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2330", + ], + "originalText": "2330", + "width": 102.57, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 102.57, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 102.57, + }, + Object { + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 102.57, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 88, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "2451", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2451", + ], + "originalText": "2451", + "width": 102.57, + }, + Object { + "actualText": "2244", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2244", + ], + "originalText": "2244", + "width": 102.57, + }, + Object { + "actualText": "2333", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2333", + ], + "originalText": "2333", + "width": 102.57, + }, + Object { + "actualText": "2445", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2445", + ], + "originalText": "2445", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 88, + "multiLineActualTexts": Array [ + "778977897789", + "778977897789", + "7789", + ], + "originalText": "7789778977897789778977897789", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 30, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "1304", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1304", + ], + "originalText": "1304", + "width": 102.57, + }, + Object { + "actualText": "1145", + "actualTextHeight": 15, + "actualTextWidth": 26, + "height": 30, + "multiLineActualTexts": Array [ + "1145", + ], + "originalText": "1145", + "width": 102.57, + }, + Object { + "actualText": "1432", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1432", + ], + "originalText": "1432", + "width": 102.57, + }, + Object { + "actualText": "945", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "945", + ], + "originalText": "945", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 88, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "2335", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2335", + ], + "originalText": "2335", + "width": 102.57, + }, + Object { + "actualText": "245", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "245", + ], + "originalText": "245", + "width": 102.57, + }, + Object { + "actualText": "2457", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2457", + ], + "originalText": "2457", + "width": 102.57, + }, + Object { + "actualText": "2458", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "2458", + ], + "originalText": "2458", + "width": 102.57, + }, + Object { + "actualText": "1354", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1354", + ], + "originalText": "1354", + "width": 102.57, + }, + Object { + "actualText": "1523", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1523", + ], + "originalText": "1523", + "width": 102.57, + }, + Object { + "actualText": "1634", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1634", + ], + "originalText": "1634", + "width": 102.57, + }, + Object { + "actualText": "1343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1343", + ], + "originalText": "1343", + "width": 102.57, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 88, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 102.57, + }, + Object { + "actualText": "4004", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4004", + ], + "originalText": "4004", + "width": 102.57, + }, + Object { + "actualText": "3077", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3077", + ], + "originalText": "3077", + "width": 102.57, + }, + Object { + "actualText": "3551", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3551", + ], + "originalText": "3551", + "width": 102.57, + }, + Object { + "actualText": "352", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "352", + ], + "originalText": "352", + "width": 102.57, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 72, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 2`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 46, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 76, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 46, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, + Object { + "actualText": "4", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, + Object { + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "5", + ], + "originalText": "5", + "width": 80, + }, + Object { + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 3`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 72, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, + Object { + "actualText": "省份省份省份省份省份省份省份省份省份省份省份省份省份省...", + "actualTextHeight": 64, + "actualTextWidth": 338, + "height": 72, + "multiLineActualTexts": Array [ + "省份省份省份省", + "份省份省份省份", + "省份省份省份省", + "份省份省份省...", + ], + "originalText": "省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份", + "width": 103.8, + }, + Object { + "actualText": "city", + "actualTextHeight": 16, + "actualTextWidth": 21, + "height": 72, + "multiLineActualTexts": Array [ + "city", + ], + "originalText": "city", + "width": 103.8, + }, + Object { + "actualText": "type", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 72, + "multiLineActualTexts": Array [ + "type", + ], + "originalText": "type", + "width": 103.8, + }, + Object { + "actualText": "sub_type", + "actualTextHeight": 16, + "actualTextWidth": 53, + "height": 72, + "multiLineActualTexts": Array [ + "sub_type", + ], + "originalText": "sub_type", + "width": 103.8, + }, + Object { + "actualText": "number", + "actualTextHeight": 16, + "actualTextWidth": 45, + "height": 72, + "multiLineActualTexts": Array [ + "number", + ], + "originalText": "number", + "width": 103.8, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 5`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 46, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 76, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 46, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, + Object { + "actualText": "4", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, + Object { + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "5", + ], + "originalText": "5", + "width": 80, + }, + Object { + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 46, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, + "multiLineActualTexts": Array [ + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江省", + "浙江省浙江省...", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 46, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 46, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 103.8, + }, + Object { + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, + "multiLineActualTexts": Array [ + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州市", + "杭州市杭州市...", + ], + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "width": 103.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 46, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 103.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 103.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 103.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", + "width": 103.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 103.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 103.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualTextHeight": 60, + "actualTextWidth": 340, + "height": 76, + "multiLineActualTexts": Array [ + "家具家具家具家", + "具家具家具家具", + "家具家具家具家", + "具家具家具家具", + ], + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 103.8, + }, + Object { + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, + "multiLineActualTexts": Array [ + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子桌", + "子桌子桌子桌...", + ], + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "width": 103.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 103.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 103.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 103.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 103.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 103.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 103.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 103.8, + }, + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 76, + "multiLineActualTexts": Array [ + "7789778977897", + "7897789778977", + "89", + ], + "originalText": "7789778977897789778977897789", + "width": 103.8, + }, + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "3877", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3877", + ], + "originalText": "3877", + "width": 103.8, + }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 103.8, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 103.8, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 103.8, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 103.8, + }, + Object { + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 103.8, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 72, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 2`] = ` Array [ Object { "actualText": "1", @@ -8585,7 +10915,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 3`] = ` Array [ Object { "actualText": "序号", @@ -8599,69 +10929,74 @@ Array [ "width": 80, }, Object { - "actualText": "省份省份省份省份省份省份省份省份省份省份省份省份省份省...", - "actualTextHeight": 64, - "actualTextWidth": 338, + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, "height": 72, "multiLineActualTexts": Array [ - "省份省份省份省", - "份省份省份省份", - "省份省份省份省", - "份省份省份省...", + "省份", ], - "originalText": "省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份省份", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "city", - "actualTextHeight": 16, - "actualTextWidth": 21, + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 64, + "actualTextWidth": 292, "height": 72, "multiLineActualTexts": Array [ - "city", + "城市城市城市城", + "市城市城市城市", + "城市城市城市城", + "市城市", ], - "originalText": "city", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "type", - "actualTextHeight": 16, - "actualTextWidth": 25, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, "height": 72, "multiLineActualTexts": Array [ - "type", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], - "originalText": "type", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "sub_type", + "actualText": "子类别", "actualTextHeight": 16, - "actualTextWidth": 53, + "actualTextWidth": 37, "height": 72, "multiLineActualTexts": Array [ - "sub_type", + "子类别", ], - "originalText": "sub_type", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "number", - "actualTextHeight": 16, - "actualTextWidth": 45, + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 64, + "actualTextWidth": 268, "height": 72, "multiLineActualTexts": Array [ - "number", + "数量数量数量数", + "量数量数量数量", + "数量数量数量数", + "量", ], - "originalText": "number", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly col cell height if actual text lines is difference 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 5`] = ` Array [ Object { "actualText": "1", @@ -9188,111 +11523,381 @@ Array [ "actualTextWidth": 189, "height": 76, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "7789778977897", + "7897789778977", + "89", + ], + "originalText": "7789778977897789778977897789", + "width": 103.8, + }, + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "3877", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3877", + ], + "originalText": "3877", + "width": 103.8, + }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 103.8, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 103.8, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 103.8, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 103.8, + }, + Object { + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 103.8, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 56, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 2`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 46, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 61, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, + Object { + "actualText": "4", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, + Object { + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "5", + ], + "originalText": "5", + "width": 80, + }, + Object { + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, + Object { + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "10", ], - "originalText": "7789778977897789778977897789", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", "11", ], - "originalText": "236723672361111", - "width": 103.8, + "originalText": "11", + "width": 80, }, Object { - "actualText": "3877", + "actualText": "12", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "3877", + "12", ], - "originalText": "3877", - "width": 103.8, + "originalText": "12", + "width": 80, }, Object { - "actualText": "4342", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "4342", + "13", ], - "originalText": "4342", - "width": 103.8, + "originalText": "13", + "width": 80, }, Object { - "actualText": "5343", + "actualText": "14", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "5343", + "14", ], - "originalText": "5343", - "width": 103.8, + "originalText": "14", + "width": 80, }, Object { - "actualText": "632", + "actualText": "15", "actualTextHeight": 15, - "actualTextWidth": 21, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "632", + "15", ], - "originalText": "632", - "width": 103.8, + "originalText": "15", + "width": 80, }, Object { - "actualText": "7234", + "actualText": "16", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "7234", + "16", ], - "originalText": "7234", - "width": 103.8, + "originalText": "16", + "width": 80, }, Object { - "actualText": "834", + "actualText": "17", "actualTextHeight": 15, - "actualTextWidth": 21, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "834", + "17", ], - "originalText": "834", - "width": 103.8, + "originalText": "17", + "width": 80, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 56, "multiLineActualTexts": Array [ "序号", ], "originalText": "序号", "width": 80, }, + Object { + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 56, + "multiLineActualTexts": Array [ + "省份", + ], + "originalText": "省份", + "width": 143.8, + }, + Object { + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 48, + "actualTextWidth": 291, + "height": 56, + "multiLineActualTexts": Array [ + "城市城市城市城市城市", + "城市城市城市城市城市", + "城市城市", + ], + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "width": 143.8, + }, + Object { + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 32, + "actualTextWidth": 242, + "height": 56, + "multiLineActualTexts": Array [ + "类别类别类别类别类别", + "类别类别类别类别类别", + ], + "originalText": "类别类别类别类别类别类别类别类别类别类别", + "width": 143.8, + }, + Object { + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 56, + "multiLineActualTexts": Array [ + "子类别", + ], + "originalText": "子类别", + "width": 143.8, + }, + Object { + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 48, + "actualTextWidth": 267, + "height": 56, + "multiLineActualTexts": Array [ + "数量数量数量数量数量", + "数量数量数量数量数量", + "数量", + ], + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 143.8, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 5`] = ` Array [ Object { "actualText": "1", @@ -9309,7 +11914,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 76, + "height": 30, "multiLineActualTexts": Array [ "2", ], @@ -9320,7 +11925,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 61, "multiLineActualTexts": Array [ "3", ], @@ -9393,226 +11998,217 @@ Array [ "originalText": "9", "width": 80, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 3`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 72, + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "10", ], - "originalText": "序号", + "originalText": "10", "width": 80, }, Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 72, + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "省份", + "11", ], - "originalText": "省份", - "width": 103.8, + "originalText": "11", + "width": 80, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "actualTextHeight": 64, - "actualTextWidth": 292, - "height": 72, + "actualText": "12", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城市", - "城市城市城市城", - "市城市", + "12", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 103.8, + "originalText": "12", + "width": 80, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 72, + "actualText": "13", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "13", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 103.8, + "originalText": "13", + "width": 80, }, Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 72, + "actualText": "14", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "子类别", + "14", ], - "originalText": "子类别", - "width": 103.8, + "originalText": "14", + "width": 80, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量数量", - "actualTextHeight": 64, - "actualTextWidth": 268, - "height": 72, - "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数量", - "数量数量数量数", - "量", - ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", - "width": 103.8, - }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly data cell height if actual text lines is difference 5`] = ` -Array [ + "actualText": "15", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "15", + ], + "originalText": "15", + "width": 80, + }, Object { - "actualText": "1", + "actualText": "16", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 46, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "1", + "16", ], - "originalText": "1", + "originalText": "16", "width": 80, }, Object { - "actualText": "2", + "actualText": "17", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 76, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "2", + "17", ], - "originalText": "2", + "originalText": "17", "width": 80, }, Object { - "actualText": "3", - "actualTextHeight": 15, - "actualTextWidth": 7, + "actualText": "浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江", + "actualTextHeight": 30, + "actualTextWidth": 242, "height": 46, "multiLineActualTexts": Array [ - "3", + "浙江浙江浙江浙江浙江", + "浙江浙江浙江浙江浙江", ], - "originalText": "3", - "width": 80, + "originalText": "浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江", + "width": 143.8, }, Object { - "actualText": "4", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "4", + "浙江省", ], - "originalText": "4", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "5", + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, + "multiLineActualTexts": Array [ + "浙江省浙江省浙江省浙", + "江省浙江省浙江省浙江", + "省浙江省浙江省浙江省", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 143.8, + }, + Object { + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "5", + "浙江省", ], - "originalText": "5", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "6", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "6", + "浙江省", ], - "originalText": "6", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "7", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "7", + "浙江省", ], - "originalText": "7", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "8", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "8", + "浙江省", ], - "originalText": "8", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "9", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "9", + "浙江省", ], - "originalText": "9", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江省", - "浙江省浙江省...", + "浙江省", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, + "originalText": "浙江省", + "width": 143.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9623,7 +12219,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9634,7 +12230,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9645,7 +12241,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9656,7 +12252,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9667,7 +12263,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -9678,43 +12274,141 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "杭州杭州杭州杭州", + "actualTextHeight": 15, + "actualTextWidth": 97, + "height": 46, + "multiLineActualTexts": Array [ + "杭州杭州杭州杭州", + ], + "originalText": "杭州杭州杭州杭州", + "width": 143.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, + "multiLineActualTexts": Array [ + "杭州市杭州市杭州市杭", + "州市杭州市杭州市杭州", + "市杭州市杭州市杭州市", + ], + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "width": 143.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 143.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 143.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 143.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", + "width": 143.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 143.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 143.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 143.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州市", - "杭州市杭州市...", + "杭州市", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", - "width": 103.8, + "originalText": "杭州市", + "width": 143.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "宁波市", @@ -9725,7 +12419,7 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "舟山市", @@ -9736,7 +12430,7 @@ Array [ "舟山市", ], "originalText": "舟山市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "杭州市", @@ -9747,7 +12441,7 @@ Array [ "杭州市", ], "originalText": "杭州市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "绍兴市", @@ -9758,7 +12452,7 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "宁波市", @@ -9769,54 +12463,53 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "舟山市", + "actualText": "纸张纸张纸张纸张纸张", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 121, + "height": 46, "multiLineActualTexts": Array [ - "舟山市", + "纸张纸张纸张纸张纸张", ], - "originalText": "舟山市", - "width": 103.8, + "originalText": "纸张纸张纸张纸张纸张", + "width": 143.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "actualTextHeight": 60, - "actualTextWidth": 340, - "height": 76, + "actualTextHeight": 45, + "actualTextWidth": 339, + "height": 61, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家具", - "家具家具家具家", - "具家具家具家具", + "家具家具家具家具家具", + "家具家具家具家具家具", + "家具家具家具家具", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9827,7 +12520,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9838,7 +12531,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9849,7 +12542,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9860,7 +12553,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9871,7 +12564,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -9882,146 +12575,318 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "-", + "actualTextHeight": 15, + "actualTextWidth": 4, + "height": 46, + "multiLineActualTexts": Array [ + "-", + ], + "originalText": "-", + "width": 143.8, }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 143.8, + }, + Object { + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, + "multiLineActualTexts": Array [ + "桌子桌子桌子桌子桌子", + "桌子桌子桌子桌子桌子", + "桌子桌子桌子桌子桌子", + ], + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "width": 143.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 143.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "桌子", + ], + "originalText": "桌子", + "width": 143.8, + }, + Object { + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "桌子", + "width": 143.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 143.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 143.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 143.8, + }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 143.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子桌", - "子桌子桌子桌...", + "笔", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", - "width": 103.8, + "originalText": "笔", + "width": 143.8, }, Object { - "actualText": "桌子", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "笔", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "笔", + "width": 143.8, }, Object { - "actualText": "桌子", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "桌子", + "笔", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "笔", + "width": 143.8, }, Object { - "actualText": "桌子", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "桌子", + "笔", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "笔", + "width": 143.8, }, Object { - "actualText": "沙发", + "actualText": "纸张", "actualTextHeight": 15, "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "纸张", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "纸张", + "width": 143.8, }, Object { - "actualText": "沙发", + "actualText": "纸张", "actualTextHeight": 15, "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "纸张", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "纸张", + "width": 143.8, }, Object { - "actualText": "沙发", + "actualText": "纸张", "actualTextHeight": 15, "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "纸张", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "纸张", + "width": 143.8, }, Object { - "actualText": "沙发", + "actualText": "-", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 4, + "height": 46, "multiLineActualTexts": Array [ - "沙发", + "-", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "-", + "width": 143.8, }, Object { "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualTextHeight": 15, + "actualTextWidth": 98, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "236723672361111", ], "originalText": "236723672361111", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 76, + "actualTextHeight": 30, + "actualTextWidth": 188, + "height": 61, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "778977897789778977", + "8977897789", ], "originalText": "7789778977897789778977897789", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualTextHeight": 15, + "actualTextWidth": 98, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "236723672361111", ], "originalText": "236723672361111", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "3877", @@ -10032,7 +12897,7 @@ Array [ "3877", ], "originalText": "3877", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "4342", @@ -10043,7 +12908,7 @@ Array [ "4342", ], "originalText": "4342", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "5343", @@ -10054,7 +12919,7 @@ Array [ "5343", ], "originalText": "5343", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "632", @@ -10065,7 +12930,7 @@ Array [ "632", ], "originalText": "632", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "7234", @@ -10076,7 +12941,7 @@ Array [ "7234", ], "originalText": "7234", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "834", @@ -10087,18 +12952,95 @@ Array [ "834", ], "originalText": "834", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "945", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "945", + ], + "originalText": "945", + "width": 143.8, + }, + Object { + "actualText": "1304", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1304", + ], + "originalText": "1304", + "width": 143.8, + }, + Object { + "actualText": "1145", + "actualTextHeight": 15, + "actualTextWidth": 26, + "height": 30, + "multiLineActualTexts": Array [ + "1145", + ], + "originalText": "1145", + "width": 143.8, + }, + Object { + "actualText": "1432", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1432", + ], + "originalText": "1432", + "width": 143.8, + }, + Object { + "actualText": "1343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1343", + ], + "originalText": "1343", + "width": 143.8, + }, + Object { + "actualText": "1354", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1354", + ], + "originalText": "1354", + "width": 143.8, + }, + Object { + "actualText": "1523", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1523", + ], + "originalText": "1523", + "width": 143.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 30, "multiLineActualTexts": Array [ "序号", ], @@ -10108,13 +13050,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -10136,7 +13078,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -10215,87 +13157,54 @@ Array [ "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "10", - ], - "originalText": "10", - "width": 80, - }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, - Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "12", - ], - "originalText": "12", - "width": 80, - }, - Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "13", + "10", ], - "originalText": "13", + "originalText": "10", "width": 80, }, Object { - "actualText": "14", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "14", + "11", ], - "originalText": "14", + "originalText": "11", "width": 80, }, Object { - "actualText": "15", + "actualText": "12", "actualTextHeight": 15, "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "15", + "12", ], - "originalText": "15", + "originalText": "12", "width": 80, }, Object { - "actualText": "16", + "actualText": "13", "actualTextHeight": 15, "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "16", + "13", ], - "originalText": "16", + "originalText": "13", "width": 80, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 30, "multiLineActualTexts": Array [ "序号", ], @@ -10306,74 +13215,69 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 30, "multiLineActualTexts": Array [ "省份", ], "originalText": "省份", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "actualTextHeight": 48, - "actualTextWidth": 291, - "height": 72, + "actualText": "城市城市城市...", + "actualTextHeight": 16, + "actualTextWidth": 83, + "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城市城市", - "城市城市城市城市城市", - "城市城市", + "城市城市城市...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 32, - "actualTextWidth": 242, - "height": 72, + "actualText": "类别类别类别...", + "actualTextHeight": 16, + "actualTextWidth": 83, + "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类别类别", - "类别类别类别类别类别", + "类别类别类别...", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 72, + "height": 30, "multiLineActualTexts": Array [ "子类别", ], "originalText": "子类别", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量数量", - "actualTextHeight": 48, - "actualTextWidth": 267, - "height": 72, + "actualText": "数量数量数量...", + "actualTextHeight": 16, + "actualTextWidth": 83, + "height": 30, "multiLineActualTexts": Array [ - "数量数量数量数量数量", - "数量数量数量数量数量", - "数量", + "数量数量数量...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", - "width": 143.8, + "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should calc correctly row cell height if actual text lines is difference 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -10395,7 +13299,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -10512,75 +13416,6 @@ Array [ "originalText": "13", "width": 80, }, - Object { - "actualText": "14", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "14", - ], - "originalText": "14", - "width": 80, - }, - Object { - "actualText": "15", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "15", - ], - "originalText": "15", - "width": 80, - }, - Object { - "actualText": "16", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "16", - ], - "originalText": "16", - "width": 80, - }, - Object { - "actualText": "浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江", - "actualTextHeight": 30, - "actualTextWidth": 242, - "height": 46, - "multiLineActualTexts": Array [ - "浙江浙江浙江浙江浙江", - "浙江浙江浙江浙江浙江", - ], - "originalText": "浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江", - "width": 143.8, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 143.8, - }, - Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "actualTextHeight": 45, - "actualTextWidth": 363, - "height": 61, - "multiLineActualTexts": Array [ - "浙江省浙江省浙江省浙", - "江省浙江省浙江省浙江", - "省浙江省浙江省浙江省", - ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 143.8, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -10590,18 +13425,18 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "浙江省浙江省...", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 83, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "浙江省浙江省...", ], - "originalText": "浙江省", - "width": 143.8, + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10612,7 +13447,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10623,7 +13458,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10634,7 +13469,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10645,7 +13480,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10656,7 +13491,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10667,7 +13502,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10678,7 +13513,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10689,7 +13524,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10700,7 +13535,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10711,7 +13546,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "浙江省", @@ -10722,42 +13557,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 143.8, - }, - Object { - "actualText": "杭州杭州杭州杭州", - "actualTextHeight": 15, - "actualTextWidth": 97, - "height": 46, - "multiLineActualTexts": Array [ - "杭州杭州杭州杭州", - ], - "originalText": "杭州杭州杭州杭州", - "width": 143.8, - }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 143.8, - }, - Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", - "actualTextHeight": 45, - "actualTextWidth": 363, - "height": 61, - "multiLineActualTexts": Array [ - "杭州市杭州市杭州市杭", - "州市杭州市杭州市杭州", - "市杭州市杭州市杭州市", - ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "绍兴市", @@ -10768,40 +13568,18 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 143.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 143.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "杭州市", + "actualText": "杭州市杭州市...", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 83, "height": 30, "multiLineActualTexts": Array [ - "杭州市", + "杭州市杭州市...", ], - "originalText": "杭州市", - "width": 143.8, + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "width": 103.8, }, Object { "actualText": "绍兴市", @@ -10812,7 +13590,7 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "宁波市", @@ -10823,7 +13601,7 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "舟山市", @@ -10834,7 +13612,7 @@ Array [ "舟山市", ], "originalText": "舟山市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "杭州市", @@ -10845,7 +13623,7 @@ Array [ "杭州市", ], "originalText": "杭州市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "绍兴市", @@ -10856,7 +13634,7 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "宁波市", @@ -10867,7 +13645,7 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "舟山市", @@ -10878,7 +13656,7 @@ Array [ "舟山市", ], "originalText": "舟山市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "杭州市", @@ -10889,7 +13667,7 @@ Array [ "杭州市", ], "originalText": "杭州市", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "绍兴市", @@ -10900,18 +13678,29 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "纸张纸张纸张纸张纸张", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 121, - "height": 46, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "纸张纸张纸张纸张纸张", + "宁波市", ], - "originalText": "纸张纸张纸张纸张纸张", - "width": 143.8, + "originalText": "宁波市", + "width": 103.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 103.8, }, Object { "actualText": "家具", @@ -10922,20 +13711,18 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "actualTextHeight": 45, - "actualTextWidth": 339, - "height": 61, + "actualText": "家具家具家具...", + "actualTextHeight": 15, + "actualTextWidth": 83, + "height": 30, "multiLineActualTexts": Array [ - "家具家具家具家具家具", - "家具家具家具家具家具", - "家具家具家具家具", + "家具家具家具...", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -10946,7 +13733,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -10957,7 +13744,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -10968,7 +13755,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -10979,7 +13766,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -10990,7 +13777,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -11001,7 +13788,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "家具", @@ -11012,29 +13799,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 143.8, - }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 143.8, - }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "办公用品", @@ -11045,7 +13810,7 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "办公用品", @@ -11056,7 +13821,7 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "办公用品", @@ -11067,7 +13832,7 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "办公用品", @@ -11078,18 +13843,7 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 143.8, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 46, - "multiLineActualTexts": Array [ - "-", - ], - "originalText": "-", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "桌子", @@ -11100,20 +13854,18 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", - "actualTextHeight": 45, - "actualTextWidth": 363, - "height": 61, + "actualText": "桌子桌子桌子...", + "actualTextHeight": 15, + "actualTextWidth": 83, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌子桌子", - "桌子桌子桌子桌子桌子", - "桌子桌子桌子桌子桌子", + "桌子桌子桌子...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "桌子", @@ -11124,7 +13876,7 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "桌子", @@ -11135,7 +13887,7 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "桌子", @@ -11146,7 +13898,7 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "沙发", @@ -11157,7 +13909,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "沙发", @@ -11168,7 +13920,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "沙发", @@ -11179,7 +13931,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "沙发", @@ -11190,7 +13942,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "笔", @@ -11201,7 +13953,7 @@ Array [ "笔", ], "originalText": "笔", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "笔", @@ -11212,7 +13964,7 @@ Array [ "笔", ], "originalText": "笔", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "笔", @@ -11223,7 +13975,7 @@ Array [ "笔", ], "originalText": "笔", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "笔", @@ -11234,74 +13986,40 @@ Array [ "笔", ], "originalText": "笔", - "width": 143.8, - }, - Object { - "actualText": "纸张", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "纸张", - ], - "originalText": "纸张", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "纸张", + "actualText": "23672367236...", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "纸张", - ], - "originalText": "纸张", - "width": 143.8, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 46, - "multiLineActualTexts": Array [ - "-", + "23672367236...", ], - "originalText": "-", - "width": 143.8, + "originalText": "236723672361111", + "width": 103.8, }, Object { - "actualText": "236723672361111", + "actualText": "77897789778...", "actualTextHeight": 15, - "actualTextWidth": 98, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "236723672361111", - ], - "originalText": "236723672361111", - "width": 143.8, - }, - Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 30, - "actualTextWidth": 188, - "height": 61, - "multiLineActualTexts": Array [ - "778977897789778977", - "8977897789", + "77897789778...", ], "originalText": "7789778977897789778977897789", - "width": 143.8, + "width": 103.8, }, Object { - "actualText": "236723672361111", + "actualText": "23672367236...", "actualTextHeight": 15, - "actualTextWidth": 98, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "236723672361111", + "23672367236...", ], "originalText": "236723672361111", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "3877", @@ -11312,7 +14030,7 @@ Array [ "3877", ], "originalText": "3877", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "4342", @@ -11323,7 +14041,7 @@ Array [ "4342", ], "originalText": "4342", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "5343", @@ -11334,7 +14052,7 @@ Array [ "5343", ], "originalText": "5343", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "632", @@ -11345,7 +14063,7 @@ Array [ "632", ], "originalText": "632", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "7234", @@ -11356,7 +14074,7 @@ Array [ "7234", ], "originalText": "7234", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "834", @@ -11367,7 +14085,7 @@ Array [ "834", ], "originalText": "834", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "945", @@ -11378,7 +14096,7 @@ Array [ "945", ], "originalText": "945", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "1304", @@ -11389,7 +14107,7 @@ Array [ "1304", ], "originalText": "1304", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "1145", @@ -11400,7 +14118,7 @@ Array [ "1145", ], "originalText": "1145", - "width": 143.8, + "width": 103.8, }, Object { "actualText": "1432", @@ -11411,40 +14129,18 @@ Array [ "1432", ], "originalText": "1432", - "width": 143.8, - }, - Object { - "actualText": "1343", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1343", - ], - "originalText": "1343", - "width": 143.8, - }, - Object { - "actualText": "1354", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1354", - ], - "originalText": "1354", - "width": 143.8, + "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -11454,13 +14150,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -11471,7 +14167,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -11482,7 +14178,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -11566,49 +14262,16 @@ Array [ "originalText": "10", "width": 80, }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, - Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "12", - ], - "originalText": "12", - "width": 80, - }, - Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "13", - ], - "originalText": "13", - "width": 80, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -11619,7 +14282,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "省份", ], @@ -11627,23 +14290,27 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市...", - "actualTextHeight": 16, - "actualTextWidth": 83, - "height": 30, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ + "城市城市城市城", + "市城市城市城市", "城市城市城市...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别类别...", - "actualTextHeight": 16, - "actualTextWidth": 83, - "height": 30, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 56, "multiLineActualTexts": Array [ - "类别类别类别...", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -11652,7 +14319,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "子类别", ], @@ -11660,11 +14327,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量...", - "actualTextHeight": 16, - "actualTextWidth": 83, - "height": 30, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ + "数量数量数量数", + "量数量数量数量", "数量数量数量...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", @@ -11673,15 +14342,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should default render one line text 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -11692,7 +14361,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -11703,7 +14372,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -11787,44 +14456,11 @@ Array [ "originalText": "10", "width": 80, }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, - Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "12", - ], - "originalText": "12", - "width": 80, - }, - Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "13", - ], - "originalText": "13", - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -11832,12 +14468,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省...", - "actualTextHeight": 15, - "actualTextWidth": 83, - "height": 30, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "浙江省浙江省...", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, @@ -11846,40 +14484,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -11967,7 +14572,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -11975,12 +14580,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭州市...", - "actualTextHeight": 15, - "actualTextWidth": 83, - "height": 30, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "杭州市杭州市...", + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州...", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -11989,7 +14596,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -12070,80 +14677,14 @@ Array [ "multiLineActualTexts": Array [ "杭州市", ], - "originalText": "杭州市", - "width": 103.8, - }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, - Object { - "actualText": "家具家具家具...", - "actualTextHeight": 15, - "actualTextWidth": 83, - "height": 30, - "multiLineActualTexts": Array [ - "家具家具家具...", - ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "width": 103.8, - }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", + "originalText": "杭州市", "width": 103.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -12151,21 +14692,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualText": "家具家具家具家具家具家具家具家具家具家具...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "家具", + "家具家具家具家", + "具家具家具家具", + "家具家具家具...", ], - "originalText": "家具", + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -12206,36 +14749,36 @@ Array [ "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 49, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "家具", ], - "originalText": "办公用品", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 49, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "家具", ], - "originalText": "办公用品", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 49, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "家具", ], - "originalText": "办公用品", + "originalText": "家具", "width": 103.8, }, Object { @@ -12253,7 +14796,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -12261,11 +14804,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子桌子...", - "actualTextHeight": 15, - "actualTextWidth": 83, - "height": 30, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ + "桌子桌子桌子桌", + "子桌子桌子桌子", "桌子桌子桌子...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", @@ -12275,7 +14820,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -12360,67 +14905,38 @@ Array [ "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "23672367236...", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, "multiLineActualTexts": Array [ - "23672367236...", + "2367236723611", + "11", ], "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "77897789778...", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 61, "multiLineActualTexts": Array [ - "77897789778...", + "7789778977897", + "7897789778977", + "89", ], "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "23672367236...", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, "multiLineActualTexts": Array [ - "23672367236...", + "2367236723611", + "11", ], "originalText": "236723672361111", "width": 103.8, @@ -12502,43 +15018,10 @@ Array [ "originalText": "945", "width": 103.8, }, - Object { - "actualText": "1304", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1304", - ], - "originalText": "1304", - "width": 103.8, - }, - Object { - "actualText": "1145", - "actualTextHeight": 15, - "actualTextWidth": 26, - "height": 30, - "multiLineActualTexts": Array [ - "1145", - ], - "originalText": "1145", - "width": 103.8, - }, - Object { - "actualText": "1432", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1432", - ], - "originalText": "1432", - "width": 103.8, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 1`] = ` Array [ Object { "actualText": "序号", @@ -12554,7 +15037,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 2`] = ` Array [ Object { "actualText": "1", @@ -12669,7 +15152,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 3`] = ` Array [ Object { "actualText": "序号", @@ -12746,9 +15229,9 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 5`] = ` Array [ Object { "actualText": "1", @@ -13425,13 +15908,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 20, "multiLineActualTexts": Array [ "序号", ], @@ -13441,13 +15924,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -13458,7 +15941,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -13469,7 +15952,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -13491,7 +15974,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "5", ], @@ -13553,16 +16036,27 @@ Array [ "originalText": "10", "width": 80, }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 20, "multiLineActualTexts": Array [ "序号", ], @@ -13570,78 +16064,72 @@ Array [ "width": 80, }, Object { - "actualText": "省份", + "actualText": "province", "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + "actualTextWidth": 51, + "height": 20, "multiLineActualTexts": Array [ - "省份", + "province", ], - "originalText": "省份", + "originalText": "province", "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "city", + "actualTextHeight": 16, + "actualTextWidth": 21, + "height": 20, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城市", - "城市城市城市...", + "city", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "originalText": "city", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 56, + "actualText": "type", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "type", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", + "originalText": "type", "width": 103.8, }, Object { - "actualText": "子类别", + "actualText": "sub_type", "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 56, + "actualTextWidth": 53, + "height": 20, "multiLineActualTexts": Array [ - "子类别", + "sub_type", ], - "originalText": "子类别", + "originalText": "sub_type", "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "number", + "actualTextHeight": 16, + "actualTextWidth": 45, + "height": 20, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数量", - "数量数量数量...", + "number", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "originalText": "number", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -13652,7 +16140,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -13663,7 +16151,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -13685,7 +16173,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "5", ], @@ -13747,11 +16235,22 @@ Array [ "originalText": "10", "width": 80, }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -13759,23 +16258,21 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", + "浙江省", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "originalText": "浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -13793,6 +16290,17 @@ Array [ "originalText": "浙江省", "width": 103.8, }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 100, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -13860,34 +16368,43 @@ Array [ "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ - "绍兴市", + "宁波市", ], - "originalText": "绍兴市", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州...", + "舟山市", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "originalText": "舟山市", + "width": 103.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", "width": 103.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], @@ -13898,7 +16415,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "宁波市", ], @@ -13975,31 +16492,18 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "家具", ], "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, - "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家具", - "家具家具家具...", - ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -14032,7 +16536,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -14051,25 +16555,25 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "家具", + "办公用品", ], - "originalText": "家具", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "家具", + "办公用品", ], - "originalText": "家具", + "originalText": "办公用品", "width": 103.8, }, Object { @@ -14084,34 +16588,32 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "办公用品", ], - "originalText": "桌子", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子...", + "办公用品", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "办公用品", "width": 103.8, }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], @@ -14122,7 +16624,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "桌子", ], @@ -14130,14 +16632,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "桌子", + "沙发", ], - "originalText": "桌子", + "originalText": "沙发", "width": 103.8, }, Object { @@ -14155,7 +16657,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "沙发", ], @@ -14174,14 +16676,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "笔", ], - "originalText": "沙发", + "originalText": "笔", "width": 103.8, }, Object { @@ -14196,40 +16698,36 @@ Array [ "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "笔", ], - "originalText": "236723672361111", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 61, + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "笔", ], - "originalText": "7789778977897789778977897789", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "纸张", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "纸张", ], - "originalText": "236723672361111", + "originalText": "纸张", "width": 103.8, }, Object { @@ -14247,7 +16745,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "4342", ], @@ -14262,63 +16760,107 @@ Array [ "multiLineActualTexts": Array [ "5343", ], - "originalText": "5343", + "originalText": "5343", + "width": 103.8, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 103.8, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 100, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 103.8, + }, + Object { + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 103.8, + }, + Object { + "actualText": "945", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "945", + ], + "originalText": "945", "width": 103.8, }, Object { - "actualText": "632", + "actualText": "1304", "actualTextHeight": 15, - "actualTextWidth": 21, + "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "632", + "1304", ], - "originalText": "632", + "originalText": "1304", "width": 103.8, }, Object { - "actualText": "7234", + "actualText": "1145", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 26, "height": 30, "multiLineActualTexts": Array [ - "7234", + "1145", ], - "originalText": "7234", + "originalText": "1145", "width": 103.8, }, Object { - "actualText": "834", + "actualText": "1432", "actualTextHeight": 15, - "actualTextWidth": 21, + "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "834", + "1432", ], - "originalText": "834", + "originalText": "1432", "width": 103.8, }, Object { - "actualText": "945", + "actualText": "1343", "actualTextHeight": 15, - "actualTextWidth": 21, + "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "945", + "1343", ], - "originalText": "945", + "originalText": "1343", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 70, "multiLineActualTexts": Array [ "序号", ], @@ -14328,13 +16870,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 70, "multiLineActualTexts": Array [ "1", ], @@ -14345,7 +16887,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "2", ], @@ -14356,7 +16898,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -14378,7 +16920,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "5", ], @@ -14407,60 +16949,16 @@ Array [ "originalText": "7", "width": 80, }, - Object { - "actualText": "8", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "8", - ], - "originalText": "8", - "width": 80, - }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": "9", - "width": 80, - }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": "10", - "width": 80, - }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 70, "multiLineActualTexts": Array [ "序号", ], @@ -14468,72 +16966,78 @@ Array [ "width": 80, }, Object { - "actualText": "province", + "actualText": "省份", "actualTextHeight": 16, - "actualTextWidth": 51, - "height": 20, + "actualTextWidth": 25, + "height": 70, "multiLineActualTexts": Array [ - "province", + "省份", ], - "originalText": "province", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "city", - "actualTextHeight": 16, - "actualTextWidth": 21, - "height": 20, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 70, "multiLineActualTexts": Array [ - "city", + "城市城市城市城", + "市城市城市城市", + "城市城市城市...", ], - "originalText": "city", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "type", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 20, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 70, "multiLineActualTexts": Array [ - "type", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], - "originalText": "type", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "sub_type", + "actualText": "子类别", "actualTextHeight": 16, - "actualTextWidth": 53, - "height": 20, + "actualTextWidth": 37, + "height": 70, "multiLineActualTexts": Array [ - "sub_type", + "子类别", ], - "originalText": "sub_type", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "number", - "actualTextHeight": 16, - "actualTextWidth": 45, - "height": 20, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 70, "multiLineActualTexts": Array [ - "number", + "数量数量数量数", + "量数量数量数量", + "数量数量数量...", ], - "originalText": "number", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text not wrap 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 70, "multiLineActualTexts": Array [ "1", ], @@ -14544,7 +17048,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "2", ], @@ -14552,153 +17056,65 @@ Array [ "width": 80, }, Object { - "actualText": "3", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "3", - ], - "originalText": "3", - "width": 80, - }, - Object { - "actualText": "4", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "4", - ], - "originalText": "4", - "width": 80, - }, - Object { - "actualText": "5", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, - "multiLineActualTexts": Array [ - "5", - ], - "originalText": "5", - "width": 80, - }, - Object { - "actualText": "6", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "6", - ], - "originalText": "6", - "width": 80, - }, - Object { - "actualText": "7", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "7", - ], - "originalText": "7", - "width": 80, - }, - Object { - "actualText": "8", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "8", - ], - "originalText": "8", - "width": 80, - }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": "9", - "width": 80, - }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": "10", - "width": 80, - }, - Object { - "actualText": "11", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "11", + "3", ], - "originalText": "11", + "originalText": "3", "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "4", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "5", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "5", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "5", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "6", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "6", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "6", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "7", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "7", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 70, "multiLineActualTexts": Array [ "浙江省", ], @@ -14706,21 +17122,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "浙江省", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], - "originalText": "浙江省", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -14772,43 +17190,34 @@ Array [ "width": 103.8, }, Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", + "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 70, "multiLineActualTexts": Array [ - "舟山市", + "绍兴市", ], - "originalText": "舟山市", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "杭州市", + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州...", ], - "originalText": "杭州市", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -14819,7 +17228,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "宁波市", ], @@ -14859,44 +17268,11 @@ Array [ "originalText": "绍兴市", "width": 103.8, }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 70, "multiLineActualTexts": Array [ "家具", ], @@ -14904,21 +17280,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "家具家具家具家具家具家具家具家具家具家具...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "家具家具家具家", + "具家具家具家具", + "家具家具家具...", ], - "originalText": "家具", + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -14940,7 +17318,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -14959,65 +17337,45 @@ Array [ "width": 103.8, }, Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, - Object { - "actualText": "办公用品", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 49, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "家具", ], - "originalText": "办公用品", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, + "actualTextWidth": 25, + "height": 70, "multiLineActualTexts": Array [ - "办公用品", + "桌子", ], - "originalText": "办公用品", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "办公用品", + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子...", ], - "originalText": "办公用品", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -15028,7 +17386,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], @@ -15036,14 +17394,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "桌子", ], - "originalText": "沙发", + "originalText": "桌子", "width": 103.8, }, Object { @@ -15057,17 +17415,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, - "multiLineActualTexts": Array [ - "沙发", - ], - "originalText": "沙发", - "width": 103.8, - }, Object { "actualText": "沙发", "actualTextHeight": 15, @@ -15076,62 +17423,44 @@ Array [ "multiLineActualTexts": Array [ "沙发", ], - "originalText": "沙发", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 70, "multiLineActualTexts": Array [ - "笔", + "2367236723611", + "11", ], - "originalText": "笔", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 100, "multiLineActualTexts": Array [ - "笔", + "7789778977897", + "7897789778977", + "89", ], - "originalText": "笔", + "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "纸张", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, "multiLineActualTexts": Array [ - "纸张", + "2367236723611", + "11", ], - "originalText": "纸张", + "originalText": "236723672361111", "width": 103.8, }, Object { @@ -15149,7 +17478,7 @@ Array [ "actualText": "4342", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "4342", ], @@ -15178,93 +17507,90 @@ Array [ "originalText": "632", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height 1`] = ` +Array [ Object { - "actualText": "7234", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 100, - "multiLineActualTexts": Array [ - "7234", - ], - "originalText": "7234", - "width": 103.8, - }, - Object { - "actualText": "834", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 70, "multiLineActualTexts": Array [ - "834", + "序号", ], - "originalText": "834", - "width": 103.8, + "originalText": "序号", + "width": 80, }, Object { - "actualText": "945", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 70, "multiLineActualTexts": Array [ - "945", + "省份", ], - "originalText": "945", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "1304", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualText": "城市城市城市城市城市城市城...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 70, "multiLineActualTexts": Array [ - "1304", + "城市城市城市城", + "市城市城市城...", ], - "originalText": "1304", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "1145", - "actualTextHeight": 15, - "actualTextWidth": 26, - "height": 30, + "actualText": "类别类别类别类别类别类别类...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 70, "multiLineActualTexts": Array [ - "1145", + "类别类别类别类", + "别类别类别类...", ], - "originalText": "1145", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "1432", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 70, "multiLineActualTexts": Array [ - "1432", + "子类别", ], - "originalText": "1432", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "1343", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualText": "数量数量数量数量数量数量数...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 70, "multiLineActualTexts": Array [ - "1343", + "数量数量数量数", + "量数量数量数...", ], - "originalText": "1343", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 70, + "height": 100, "multiLineActualTexts": Array [ "序号", ], @@ -15274,13 +17600,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -15291,7 +17617,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 76, "multiLineActualTexts": Array [ "2", ], @@ -15353,16 +17679,27 @@ Array [ "originalText": "7", "width": 80, }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 70, + "height": 100, "multiLineActualTexts": Array [ "序号", ], @@ -15373,7 +17710,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 70, + "height": 100, "multiLineActualTexts": Array [ "省份", ], @@ -15381,14 +17718,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 70, + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 64, + "actualTextWidth": 292, + "height": 100, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", - "城市城市城市...", + "城市城市城市城", + "市城市", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, @@ -15397,7 +17735,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 70, + "height": 50, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -15410,7 +17748,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 70, + "height": 100, "multiLineActualTexts": Array [ "子类别", ], @@ -15418,14 +17756,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 70, + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 64, + "actualTextWidth": 268, + "height": 100, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", - "数量数量数量...", + "数量数量数量数", + "量", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -15433,15 +17772,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should get correctly cell height priority if actual text wrap 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -15452,7 +17791,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 76, "multiLineActualTexts": Array [ "2", ], @@ -15514,11 +17853,22 @@ Array [ "originalText": "7", "width": 80, }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -15526,14 +17876,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, "multiLineActualTexts": Array [ "浙江省浙江省浙", "江省浙江省浙江", - "省浙江省浙江...", + "省浙江省浙江省", + "浙江省浙江省...", ], "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, @@ -15593,11 +17944,22 @@ Array [ "originalText": "浙江省", "width": 103.8, }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -15605,14 +17967,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, "multiLineActualTexts": Array [ "杭州市杭州市杭", "州市杭州市杭州", - "市杭州市杭州...", + "市杭州市杭州市", + "杭州市杭州市...", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -15672,11 +18035,22 @@ Array [ "originalText": "绍兴市", "width": 103.8, }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 103.8, + }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -15684,14 +18058,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualTextHeight": 60, + "actualTextWidth": 340, + "height": 76, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家具", - "家具家具家具...", + "家具家具家具家", + "具家具家具家具", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, @@ -15751,11 +18126,22 @@ Array [ "originalText": "家具", "width": 103.8, }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 103.8, + }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -15763,14 +18149,15 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 60, + "actualTextWidth": 338, + "height": 76, "multiLineActualTexts": Array [ "桌子桌子桌子桌", "子桌子桌子桌子", - "桌子桌子桌子...", + "桌子桌子桌子桌", + "子桌子桌子桌...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, @@ -15830,11 +18217,22 @@ Array [ "originalText": "沙发", "width": 103.8, }, + Object { + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "沙发", + ], + "originalText": "沙发", + "width": 103.8, + }, Object { "actualText": "236723672361111", "actualTextHeight": 30, "actualTextWidth": 100, - "height": 70, + "height": 46, "multiLineActualTexts": Array [ "2367236723611", "11", @@ -15846,7 +18244,7 @@ Array [ "actualText": "7789778977897789778977897789", "actualTextHeight": 45, "actualTextWidth": 189, - "height": 100, + "height": 76, "multiLineActualTexts": Array [ "7789778977897", "7897789778977", @@ -15911,90 +18309,27 @@ Array [ "originalText": "632", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height 1`] = ` -Array [ - Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 70, - "multiLineActualTexts": Array [ - "序号", - ], - "originalText": "序号", - "width": 80, - }, - Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 70, - "multiLineActualTexts": Array [ - "省份", - ], - "originalText": "省份", - "width": 103.8, - }, - Object { - "actualText": "城市城市城市城市城市城市城...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 70, - "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城...", - ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 103.8, - }, - Object { - "actualText": "类别类别类别类别类别类别类...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 70, - "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类...", - ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 103.8, - }, - Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 70, - "multiLineActualTexts": Array [ - "子类别", - ], - "originalText": "子类别", - "width": 103.8, - }, Object { - "actualText": "数量数量数量数量数量数量数...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 70, + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数...", + "7234", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "originalText": "7234", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 100, + "height": 40, "multiLineActualTexts": Array [ "序号", ], @@ -16004,13 +18339,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "1", ], @@ -16021,7 +18356,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 76, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -16032,7 +18367,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "3", ], @@ -16043,7 +18378,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "4", ], @@ -16054,7 +18389,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "5", ], @@ -16065,7 +18400,7 @@ Array [ "actualText": "6", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "6", ], @@ -16075,35 +18410,145 @@ Array [ Object { "actualText": "7", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, + Object { + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "10", + ], + "originalText": "10", + "width": 80, + }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 20, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, + Object { + "actualText": "12", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "12", + ], + "originalText": "12", + "width": 80, + }, + Object { + "actualText": "13", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "13", + ], + "originalText": "13", + "width": 80, + }, + Object { + "actualText": "14", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "14", + ], + "originalText": "14", + "width": 80, + }, + Object { + "actualText": "15", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "15", + ], + "originalText": "15", + "width": 80, + }, + Object { + "actualText": "16", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "16", + ], + "originalText": "16", + "width": 80, + }, + Object { + "actualText": "17", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "7", + "17", ], - "originalText": "7", + "originalText": "17", "width": 80, }, Object { - "actualText": "8", + "actualText": "18", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "8", + "18", ], - "originalText": "8", + "originalText": "18", "width": 80, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 100, + "height": 40, "multiLineActualTexts": Array [ "序号", ], @@ -16114,7 +18559,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 100, + "height": 40, "multiLineActualTexts": Array [ "省份", ], @@ -16122,28 +18567,25 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "actualTextHeight": 64, - "actualTextWidth": 292, - "height": 100, + "actualText": "城市城市城市城市城市城市城...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "城市城市城市城", - "市城市城市城市", - "城市城市城市城", - "市城市", + "市城市城市城...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 50, + "actualText": "类别类别类别类别类别类别类...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "别类别类别类...", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -16152,7 +18594,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 100, + "height": 40, "multiLineActualTexts": Array [ "子类别", ], @@ -16160,15 +18602,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量数量", - "actualTextHeight": 64, - "actualTextWidth": 268, - "height": 100, + "actualText": "数量数量数量数量数量数量数...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "数量数量数量数", - "量数量数量数量", - "数量数量数量数", - "量", + "量数量数量数...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -16176,15 +18616,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust cell height if custom cell style more than actual text height by colCell.heightByField 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "1", ], @@ -16195,7 +18635,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 76, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -16206,7 +18646,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "3", ], @@ -16217,7 +18657,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "4", ], @@ -16228,7 +18668,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "5", ], @@ -16239,7 +18679,7 @@ Array [ "actualText": "6", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "6", ], @@ -16250,7 +18690,7 @@ Array [ "actualText": "7", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "7", ], @@ -16261,7 +18701,7 @@ Array [ "actualText": "8", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "8", ], @@ -16269,1318 +18709,1352 @@ Array [ "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "9", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, + "actualTextWidth": 7, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "9", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江省", - "浙江省浙江省...", + "10", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, + "actualTextWidth": 13, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "11", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "11", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "12", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "12", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "12", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "13", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "13", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "14", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "14", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "14", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "15", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "15", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "15", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "16", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "16", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "16", + "width": 80, }, Object { - "actualText": "绍兴市", + "actualText": "17", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "绍兴市", + "17", ], - "originalText": "绍兴市", - "width": 103.8, + "originalText": "17", + "width": 80, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "18", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州市", - "杭州市杭州市...", + "18", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", - "width": 103.8, + "originalText": "18", + "width": 80, }, Object { - "actualText": "绍兴市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ - "绍兴市", + "浙江省", ], - "originalText": "绍兴市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "宁波市", + "actualText": "浙江省浙江省浙江省浙江省浙...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 20, + "multiLineActualTexts": Array [ + "浙江省浙江省浙", + "江省浙江省浙...", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "宁波市", + "浙江省", ], - "originalText": "宁波市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "舟山市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "舟山市", + "浙江省", ], - "originalText": "舟山市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "杭州市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "杭州市", + "浙江省", ], - "originalText": "杭州市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "绍兴市", + "浙江省", ], - "originalText": "绍兴市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "宁波市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "宁波市", + "浙江省", ], - "originalText": "宁波市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "actualTextHeight": 60, - "actualTextWidth": 340, - "height": 76, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家具", - "家具家具家具家", - "具家具家具家具", + "浙江省", ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "桌子", + "浙江省", ], - "originalText": "桌子", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 60, - "actualTextWidth": 338, - "height": 76, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子桌", - "子桌子桌子桌...", + "浙江省", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "四川省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "桌子", + "四川省", ], - "originalText": "桌子", + "originalText": "四川省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "桌子", + "绍兴市", ], - "originalText": "桌子", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "桌子", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualText": "杭州市杭州市杭州市杭州市杭...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 20, "multiLineActualTexts": Array [ - "桌子", + "杭州市杭州市杭", + "州市杭州市杭...", ], - "originalText": "桌子", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "沙发", + "绍兴市", ], - "originalText": "沙发", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "沙发", + "宁波市", ], - "originalText": "沙发", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "沙发", + "舟山市", ], - "originalText": "沙发", + "originalText": "舟山市", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "杭州市", ], - "originalText": "236723672361111", + "originalText": "杭州市", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 76, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "绍兴市", ], - "originalText": "7789778977897789778977897789", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "宁波市", ], - "originalText": "236723672361111", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "3877", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "3877", + "舟山市", ], - "originalText": "3877", + "originalText": "舟山市", "width": 103.8, }, Object { - "actualText": "4342", + "actualText": "杭州市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "4342", + "杭州市", ], - "originalText": "4342", + "originalText": "杭州市", "width": 103.8, }, Object { - "actualText": "5343", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "5343", + "绍兴市", ], - "originalText": "5343", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "632", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "632", + "宁波市", ], - "originalText": "632", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "7234", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "7234", + "舟山市", ], - "originalText": "7234", + "originalText": "舟山市", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 1`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "序号", + "杭州市", ], - "originalText": "序号", - "width": 80, + "originalText": "杭州市", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 2`] = ` -Array [ Object { - "actualText": "1", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 20, "multiLineActualTexts": Array [ - "1", + "绍兴市", ], - "originalText": "1", - "width": 80, + "originalText": "绍兴市", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 20, "multiLineActualTexts": Array [ - "2", + "宁波市", ], - "originalText": "2", - "width": 80, + "originalText": "宁波市", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 20, "multiLineActualTexts": Array [ - "3", + "舟山市", ], - "originalText": "3", - "width": 80, + "originalText": "舟山市", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "成都市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 20, "multiLineActualTexts": Array [ - "4", + "成都市", ], - "originalText": "4", - "width": 80, + "originalText": "成都市", + "width": 103.8, }, Object { - "actualText": "5", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "5", + "家具", ], - "originalText": "5", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "6", - "actualTextHeight": 15, - "actualTextWidth": 7, + "actualText": "家具家具家具家具家具家具家...", + "actualTextHeight": 30, + "actualTextWidth": 168, "height": 20, "multiLineActualTexts": Array [ - "6", + "家具家具家具家", + "具家具家具家...", ], - "originalText": "6", - "width": 80, + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "width": 103.8, }, Object { - "actualText": "7", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "7", + "家具", ], - "originalText": "7", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "8", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "8", + "家具", ], - "originalText": "8", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "9", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "9", + "家具", ], - "originalText": "9", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "10", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "10", + "家具", ], - "originalText": "10", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "11", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 13, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "11", + "家具", ], - "originalText": "11", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "12", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "12", + "家具", ], - "originalText": "12", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "13", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "13", + "家具", ], - "originalText": "13", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "14", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 49, "height": 20, "multiLineActualTexts": Array [ - "14", + "办公用品", ], - "originalText": "14", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, Object { - "actualText": "15", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 49, "height": 20, "multiLineActualTexts": Array [ - "15", + "办公用品", ], - "originalText": "15", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, Object { - "actualText": "16", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 49, "height": 20, "multiLineActualTexts": Array [ - "16", + "办公用品", ], - "originalText": "16", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, Object { - "actualText": "17", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 49, "height": 20, "multiLineActualTexts": Array [ - "17", + "办公用品", ], - "originalText": "17", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, Object { - "actualText": "18", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 49, "height": 20, "multiLineActualTexts": Array [ - "18", + "办公用品", ], - "originalText": "18", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 3`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, "multiLineActualTexts": Array [ - "序号", + "办公用品", ], - "originalText": "序号", - "width": 80, + "originalText": "办公用品", + "width": 103.8, }, Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, "multiLineActualTexts": Array [ - "省份", + "办公用品", ], - "originalText": "省份", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城...", + "办公用品", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类...", + "家具", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 40, + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "子类别", + "桌子", ], - "originalText": "子类别", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数...", - "actualTextHeight": 32, + "actualText": "桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 30, "actualTextWidth": 168, - "height": 40, + "height": 20, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数...", + "桌子桌子桌子桌", + "子桌子桌子桌...", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style less than actual text height by dataCell.height 5`] = ` -Array [ Object { - "actualText": "1", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "1", + "桌子", ], - "originalText": "1", - "width": 80, + "originalText": "桌子", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "2", + "桌子", ], - "originalText": "2", - "width": 80, + "originalText": "桌子", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "3", + "桌子", ], - "originalText": "3", - "width": 80, + "originalText": "桌子", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "4", + "沙发", ], - "originalText": "4", - "width": 80, + "originalText": "沙发", + "width": 103.8, }, Object { - "actualText": "5", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "5", + "沙发", ], - "originalText": "5", - "width": 80, + "originalText": "沙发", + "width": 103.8, }, Object { - "actualText": "6", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "6", + "沙发", ], - "originalText": "6", - "width": 80, + "originalText": "沙发", + "width": 103.8, }, Object { - "actualText": "7", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "7", + "沙发", ], - "originalText": "7", - "width": 80, + "originalText": "沙发", + "width": 103.8, }, Object { - "actualText": "8", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 13, "height": 20, "multiLineActualTexts": Array [ - "8", + "笔", ], - "originalText": "8", - "width": 80, + "originalText": "笔", + "width": 103.8, }, Object { - "actualText": "9", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 13, "height": 20, "multiLineActualTexts": Array [ - "9", + "笔", ], - "originalText": "9", - "width": 80, + "originalText": "笔", + "width": 103.8, }, Object { - "actualText": "10", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 13, "height": 20, "multiLineActualTexts": Array [ - "10", + "笔", ], - "originalText": "10", - "width": 80, + "originalText": "笔", + "width": 103.8, }, Object { - "actualText": "11", + "actualText": "笔", "actualTextHeight": 15, "actualTextWidth": 13, "height": 20, "multiLineActualTexts": Array [ - "11", + "笔", ], - "originalText": "11", - "width": 80, + "originalText": "笔", + "width": 103.8, }, Object { - "actualText": "12", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "12", + "纸张", ], - "originalText": "12", - "width": 80, + "originalText": "纸张", + "width": 103.8, }, Object { - "actualText": "13", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "13", + "纸张", ], - "originalText": "13", - "width": 80, + "originalText": "纸张", + "width": 103.8, }, Object { - "actualText": "14", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "14", + "纸张", ], - "originalText": "14", - "width": 80, + "originalText": "纸张", + "width": 103.8, }, Object { - "actualText": "15", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "15", + "纸张", ], - "originalText": "15", - "width": 80, + "originalText": "纸张", + "width": 103.8, }, Object { - "actualText": "16", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "16", + "桌子", ], - "originalText": "16", - "width": 80, + "originalText": "桌子", + "width": 103.8, }, Object { - "actualText": "17", - "actualTextHeight": 15, - "actualTextWidth": 14, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, "height": 20, "multiLineActualTexts": Array [ - "17", + "2367236723611", + "11", ], - "originalText": "17", - "width": 80, + "originalText": "236723672361111", + "width": 103.8, }, Object { - "actualText": "18", - "actualTextHeight": 15, - "actualTextWidth": 14, + "actualText": "778977897789778977897789...", + "actualTextHeight": 30, + "actualTextWidth": 172, "height": 20, "multiLineActualTexts": Array [ - "18", + "7789778977897", + "78977897789...", ], - "originalText": "18", - "width": 80, + "originalText": "7789778977897789778977897789", + "width": 103.8, + }, + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 20, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "3877", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "3877", ], - "originalText": "浙江省", + "originalText": "3877", "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙...", - "actualTextHeight": 30, - "actualTextWidth": 168, + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙...", + "4342", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "originalText": "4342", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "5343", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "5343", ], - "originalText": "浙江省", + "originalText": "5343", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "632", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "632", ], - "originalText": "浙江省", + "originalText": "632", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "7234", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "7234", ], - "originalText": "浙江省", + "originalText": "7234", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "834", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "834", ], - "originalText": "浙江省", + "originalText": "834", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "945", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "945", ], - "originalText": "浙江省", + "originalText": "945", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1304", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1304", ], - "originalText": "浙江省", + "originalText": "1304", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1145", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 26, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1145", ], - "originalText": "浙江省", + "originalText": "1145", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1432", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1432", ], - "originalText": "浙江省", + "originalText": "1432", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1343", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1343", ], - "originalText": "浙江省", + "originalText": "1343", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1354", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1354", ], - "originalText": "浙江省", + "originalText": "1354", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1523", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1523", ], - "originalText": "浙江省", + "originalText": "1523", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1634", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1634", ], - "originalText": "浙江省", + "originalText": "1634", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "1723", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "1723", ], - "originalText": "浙江省", + "originalText": "1723", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 40, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 2`] = ` +Array [ Object { - "actualText": "浙江省", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "浙江省", + "1", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "1", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "浙江省", + "2", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "2", + "width": 80, }, Object { - "actualText": "四川省", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "四川省", + "3", ], - "originalText": "四川省", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "绍兴市", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "绍兴市", + "4", ], - "originalText": "绍兴市", - "width": 103.8, + "originalText": "4", + "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 3`] = ` +Array [ Object { - "actualText": "杭州市杭州市杭州市杭州市杭...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 20, + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 40, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭...", + "序号", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "originalText": "序号", + "width": 80, + }, + Object { + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 40, + "multiLineActualTexts": Array [ + "省份", + ], + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualText": "城市城市城市城市城市城市城...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ - "绍兴市", + "城市城市城市城", + "市城市城市城...", ], - "originalText": "绍兴市", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualText": "类别类别类别类别类别类别类...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ - "宁波市", + "类别类别类别类", + "别类别类别类...", ], - "originalText": "宁波市", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "舟山市", - "actualTextHeight": 15, + "actualText": "子类别", + "actualTextHeight": 16, "actualTextWidth": 37, - "height": 20, + "height": 40, "multiLineActualTexts": Array [ - "舟山市", + "子类别", ], - "originalText": "舟山市", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualText": "数量数量数量数量数量数量数...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ - "杭州市", + "数量数量数量数", + "量数量数量数...", ], - "originalText": "杭州市", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 5`] = ` +Array [ Object { - "actualText": "绍兴市", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "绍兴市", + "1", ], - "originalText": "绍兴市", - "width": 103.8, + "originalText": "1", + "width": 80, }, Object { - "actualText": "宁波市", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "宁波市", + "2", ], - "originalText": "宁波市", - "width": 103.8, + "originalText": "2", + "width": 80, }, Object { - "actualText": "舟山市", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "舟山市", + "3", ], - "originalText": "舟山市", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "杭州市", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "杭州市", + "4", ], - "originalText": "杭州市", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "绍兴市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "绍兴市", + "浙江省", ], - "originalText": "绍兴市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualText": "浙江省浙江省浙江省浙江省浙...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 100, "multiLineActualTexts": Array [ - "宁波市", + "浙江省浙江省浙", + "江省浙江省浙...", ], - "originalText": "宁波市", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { - "actualText": "舟山市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "舟山市", + "浙江省", ], - "originalText": "舟山市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "杭州市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "杭州市", + "浙江省", ], - "originalText": "杭州市", + "originalText": "浙江省", "width": 103.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "绍兴市", ], @@ -17588,43 +20062,44 @@ Array [ "width": 103.8, }, Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualText": "杭州市杭州市杭州市杭州市杭...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 100, "multiLineActualTexts": Array [ - "宁波市", + "杭州市杭州市杭", + "州市杭州市杭...", ], - "originalText": "宁波市", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, Object { - "actualText": "舟山市", + "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "舟山市", + "绍兴市", ], - "originalText": "舟山市", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "成都市", + "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "成都市", + "宁波市", ], - "originalText": "成都市", + "originalText": "宁波市", "width": 103.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -17635,7 +20110,7 @@ Array [ "actualText": "家具家具家具家具家具家具家...", "actualTextHeight": 30, "actualTextWidth": 168, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家...", @@ -17647,7 +20122,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -17658,7 +20133,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -17666,934 +20141,934 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "桌子", ], - "originalText": "家具", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "桌子桌子桌子桌", + "子桌子桌子桌...", ], - "originalText": "家具", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "桌子", ], - "originalText": "家具", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "桌子", ], - "originalText": "家具", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 100, "multiLineActualTexts": Array [ - "家具", + "2367236723611", + "11", ], - "originalText": "家具", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualText": "778977897789778977897789...", + "actualTextHeight": 30, + "actualTextWidth": 172, + "height": 100, "multiLineActualTexts": Array [ - "办公用品", + "7789778977897", + "78977897789...", ], - "originalText": "办公用品", + "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 100, "multiLineActualTexts": Array [ - "办公用品", + "2367236723611", + "11", ], - "originalText": "办公用品", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "3877", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 27, + "height": 100, "multiLineActualTexts": Array [ - "办公用品", + "3877", ], - "originalText": "办公用品", + "originalText": "3877", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 1`] = ` +Array [ Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "办公用品", + "序号", ], - "originalText": "办公用品", - "width": 103.8, + "originalText": "序号", + "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 2`] = ` +Array [ Object { - "actualText": "办公用品", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "办公用品", + "1", ], - "originalText": "办公用品", - "width": 103.8, + "originalText": "1", + "width": 80, }, Object { - "actualText": "办公用品", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "办公用品", + "2", ], - "originalText": "办公用品", - "width": 103.8, + "originalText": "2", + "width": 80, }, Object { - "actualText": "办公用品", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "办公用品", + "3", ], - "originalText": "办公用品", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "办公用品", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "4", ], - "originalText": "办公用品", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "家具", + "actualText": "5", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "5", ], - "originalText": "家具", - "width": 103.8, + "originalText": "5", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "6", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "6", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "6", + "width": 80, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 20, + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌...", + "7", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "8", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "8", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "8", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "9", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "9", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "10", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "10", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { - "actualText": "沙发", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "沙发", + "11", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "11", + "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 3`] = ` +Array [ Object { - "actualText": "沙发", - "actualTextHeight": 15, + "actualText": "序号", + "actualTextHeight": 16, "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "沙发", + "序号", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "序号", + "width": 80, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, + "actualText": "省份", + "actualTextHeight": 16, "actualTextWidth": 25, "height": 20, "multiLineActualTexts": Array [ - "沙发", + "省份", ], - "originalText": "沙发", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, + "actualText": "城市城市城市城市城市城市城...", + "actualTextHeight": 32, + "actualTextWidth": 168, "height": 20, "multiLineActualTexts": Array [ - "沙发", + "城市城市城市城", + "市城市城市城...", ], - "originalText": "沙发", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, + "actualText": "类别类别类别类别类别类别类...", + "actualTextHeight": 32, + "actualTextWidth": 168, "height": 20, "multiLineActualTexts": Array [ - "笔", + "类别类别类别类", + "别类别类别类...", ], - "originalText": "笔", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, "height": 20, "multiLineActualTexts": Array [ - "笔", + "子类别", ], - "originalText": "笔", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, + "actualText": "数量数量数量数量数量数量数...", + "actualTextHeight": 32, + "actualTextWidth": 168, "height": 20, "multiLineActualTexts": Array [ - "笔", + "数量数量数量数", + "量数量数量数...", ], - "originalText": "笔", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 5`] = ` +Array [ Object { - "actualText": "笔", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "笔", + "1", ], - "originalText": "笔", - "width": 103.8, + "originalText": "1", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "纸张", + "2", ], - "originalText": "纸张", - "width": 103.8, + "originalText": "2", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "纸张", + "3", ], - "originalText": "纸张", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "纸张", + "4", ], - "originalText": "纸张", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "5", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "纸张", + "5", ], - "originalText": "纸张", - "width": 103.8, + "originalText": "5", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "6", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "6", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "6", + "width": 80, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 20, + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "7", ], - "originalText": "236723672361111", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { - "actualText": "778977897789778977897789...", - "actualTextHeight": 30, - "actualTextWidth": 172, - "height": 20, + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "7789778977897", - "78977897789...", + "8", ], - "originalText": "7789778977897789778977897789", - "width": 103.8, + "originalText": "8", + "width": 80, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 20, + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "9", ], - "originalText": "236723672361111", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { - "actualText": "3877", + "actualText": "10", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "3877", + "10", ], - "originalText": "3877", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { - "actualText": "4342", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "4342", + "11", ], - "originalText": "4342", - "width": 103.8, + "originalText": "11", + "width": 80, }, Object { - "actualText": "5343", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 46, "multiLineActualTexts": Array [ - "5343", + "浙江省", ], - "originalText": "5343", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "632", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualText": "浙江省浙江省浙江省浙江省浙...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ - "632", + "浙江省浙江省浙", + "江省浙江省浙...", ], - "originalText": "632", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { - "actualText": "7234", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 46, "multiLineActualTexts": Array [ - "7234", + "浙江省", ], - "originalText": "7234", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "834", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "834", + "浙江省", ], - "originalText": "834", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "945", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "945", + "浙江省", ], - "originalText": "945", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1304", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1304", + "浙江省", ], - "originalText": "1304", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1145", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 26, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1145", + "浙江省", ], - "originalText": "1145", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1432", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1432", + "浙江省", ], - "originalText": "1432", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1343", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1343", + "浙江省", ], - "originalText": "1343", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1354", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1354", + "浙江省", ], - "originalText": "1354", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1523", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1523", + "浙江省", ], - "originalText": "1523", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "1634", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 46, "multiLineActualTexts": Array [ - "1634", + "绍兴市", ], - "originalText": "1634", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "1723", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualText": "杭州市杭州市杭州市杭州市杭...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ - "1723", + "杭州市杭州市杭", + "州市杭州市杭...", ], - "originalText": "1723", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 1`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 46, "multiLineActualTexts": Array [ - "序号", + "绍兴市", ], - "originalText": "序号", - "width": 80, + "originalText": "绍兴市", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 2`] = ` -Array [ Object { - "actualText": "1", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1", + "宁波市", ], - "originalText": "1", - "width": 80, + "originalText": "宁波市", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "2", + "舟山市", ], - "originalText": "2", - "width": 80, + "originalText": "舟山市", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "杭州市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "3", + "杭州市", ], - "originalText": "3", - "width": 80, + "originalText": "杭州市", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "4", + "绍兴市", ], - "originalText": "4", - "width": 80, + "originalText": "绍兴市", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 3`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "宁波市", ], - "originalText": "序号", - "width": 80, + "originalText": "宁波市", + "width": 103.8, }, Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 40, + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "省份", + "舟山市", ], - "originalText": "省份", + "originalText": "舟山市", "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城...", + "杭州市", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "originalText": "杭州市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类...", + "绍兴市", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 40, + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "子类别", + "家具", ], - "originalText": "子类别", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数...", - "actualTextHeight": 32, + "actualText": "家具家具家具家具家具家具家...", + "actualTextHeight": 30, "actualTextWidth": 168, - "height": 40, + "height": 46, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数...", + "家具家具家具家", + "具家具家具家...", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not adaptive adjust data cell height if custom cell style more than actual text height by dataCell.height 5`] = ` -Array [ Object { - "actualText": "1", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "1", + "家具", ], - "originalText": "1", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "2", + "家具", ], - "originalText": "2", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "3", + "家具", ], - "originalText": "3", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "4", + "家具", ], - "originalText": "4", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "家具", ], - "originalText": "浙江省", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 100, + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙...", + "家具", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "家具", ], - "originalText": "浙江省", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "办公用品", ], - "originalText": "浙江省", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "绍兴市", + "办公用品", ], - "originalText": "绍兴市", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 100, + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭...", + "桌子", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualText": "桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ - "绍兴市", + "桌子桌子桌子桌", + "子桌子桌子桌...", ], - "originalText": "绍兴市", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { - "actualText": "宁波市", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "宁波市", + "桌子", ], - "originalText": "宁波市", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "桌子", ], - "originalText": "家具", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 100, + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家...", + "桌子", ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "沙发", ], - "originalText": "家具", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "沙发", ], - "originalText": "家具", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "沙发", ], - "originalText": "桌子", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 100, + "actualText": "沙发", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌...", + "沙发", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "笔", ], - "originalText": "桌子", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "笔", ], - "originalText": "桌子", + "originalText": "笔", "width": 103.8, }, Object { "actualText": "236723672361111", "actualTextHeight": 30, "actualTextWidth": 100, - "height": 100, + "height": 46, "multiLineActualTexts": Array [ "2367236723611", "11", @@ -18605,7 +21080,7 @@ Array [ "actualText": "778977897789778977897789...", "actualTextHeight": 30, "actualTextWidth": 172, - "height": 100, + "height": 46, "multiLineActualTexts": Array [ "7789778977897", "78977897789...", @@ -18617,7 +21092,7 @@ Array [ "actualText": "236723672361111", "actualTextHeight": 30, "actualTextWidth": 100, - "height": 100, + "height": 46, "multiLineActualTexts": Array [ "2367236723611", "11", @@ -18629,23 +21104,100 @@ Array [ "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "3877", ], "originalText": "3877", "width": 103.8, }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 103.8, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 103.8, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 103.8, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 103.8, + }, + Object { + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 103.8, + }, + Object { + "actualText": "945", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "945", + ], + "originalText": "945", + "width": 103.8, + }, + Object { + "actualText": "1304", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1304", + ], + "originalText": "1304", + "width": 103.8, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -18655,13 +21207,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "1", ], @@ -18672,7 +21224,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -18683,7 +21235,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "3", ], @@ -18694,7 +21246,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "4", ], @@ -18705,7 +21257,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "5", ], @@ -18713,81 +21265,147 @@ Array [ "width": 80, }, Object { - "actualText": "6", + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 20, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, + Object { + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "10", + ], + "originalText": "10", + "width": 80, + }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 20, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, + Object { + "actualText": "12", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "6", + "12", ], - "originalText": "6", + "originalText": "12", "width": 80, }, Object { - "actualText": "7", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "7", + "13", ], - "originalText": "7", + "originalText": "13", "width": 80, }, Object { - "actualText": "8", + "actualText": "14", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "8", + "14", ], - "originalText": "8", + "originalText": "14", "width": 80, }, Object { - "actualText": "9", + "actualText": "15", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "9", + "15", ], - "originalText": "9", + "originalText": "15", "width": 80, }, Object { - "actualText": "10", + "actualText": "16", "actualTextHeight": 15, "actualTextWidth": 14, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ - "10", + "16", ], - "originalText": "10", + "originalText": "16", "width": 80, }, Object { - "actualText": "11", + "actualText": "17", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, + "actualTextWidth": 14, + "height": 20, "multiLineActualTexts": Array [ - "11", + "17", ], - "originalText": "11", + "originalText": "17", "width": 80, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -18798,7 +21416,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ "省份", ], @@ -18806,25 +21424,27 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 20, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ "城市城市城市城", - "市城市城市城...", + "市城市城市城市", + "城市城市城市...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 20, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 56, "multiLineActualTexts": Array [ "类别类别类别类", - "别类别类别类...", + "别类别类别类别", + "类别类别类别", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -18833,7 +21453,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ "子类别", ], @@ -18841,13 +21461,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 20, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ "数量数量数量数", - "量数量数量数...", + "量数量数量数量", + "数量数量数量...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -18855,15 +21476,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust cell height if custom cell style less than actual text height by colCell.height 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "1", ], @@ -18874,7 +21495,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "2", ], @@ -18885,7 +21506,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "3", ], @@ -18896,7 +21517,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "4", ], @@ -18907,7 +21528,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "5", ], @@ -18918,7 +21539,7 @@ Array [ "actualText": "6", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "6", ], @@ -18929,7 +21550,7 @@ Array [ "actualText": "7", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "7", ], @@ -18940,7 +21561,7 @@ Array [ "actualText": "8", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "8", ], @@ -18951,7 +21572,7 @@ Array [ "actualText": "9", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "9", ], @@ -18962,29 +21583,163 @@ Array [ "actualText": "10", "actualTextHeight": 15, "actualTextWidth": 14, - "height": 30, + "height": 20, + "multiLineActualTexts": Array [ + "10", + ], + "originalText": "10", + "width": 80, + }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 20, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, + Object { + "actualText": "12", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "12", + ], + "originalText": "12", + "width": 80, + }, + Object { + "actualText": "13", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "13", + ], + "originalText": "13", + "width": 80, + }, + Object { + "actualText": "14", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "14", + ], + "originalText": "14", + "width": 80, + }, + Object { + "actualText": "15", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "15", + ], + "originalText": "15", + "width": 80, + }, + Object { + "actualText": "16", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "16", + ], + "originalText": "16", + "width": 80, + }, + Object { + "actualText": "17", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 20, + "multiLineActualTexts": Array [ + "17", + ], + "originalText": "17", + "width": 80, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 20, + "multiLineActualTexts": Array [ + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "10", + "浙江省", ], - "originalText": "10", - "width": 80, + "originalText": "浙江省", + "width": 103.8, }, Object { - "actualText": "11", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "11", + "浙江省", ], - "originalText": "11", - "width": 80, + "originalText": "浙江省", + "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -18992,22 +21747,21 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙...", + "浙江省", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "originalText": "浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19018,7 +21772,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19029,7 +21783,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19040,7 +21794,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19051,7 +21805,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19062,7 +21816,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19073,7 +21827,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19084,7 +21838,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19095,7 +21849,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "浙江省", ], @@ -19106,7 +21860,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "绍兴市", ], @@ -19114,13 +21868,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 20, "multiLineActualTexts": Array [ "杭州市杭州市杭", - "州市杭州市杭...", + "州市杭州市杭州", + "市杭州市杭州...", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -19129,7 +21884,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "绍兴市", ], @@ -19140,7 +21895,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "宁波市", ], @@ -19151,7 +21906,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "舟山市", ], @@ -19162,7 +21917,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "杭州市", ], @@ -19173,7 +21928,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "绍兴市", ], @@ -19184,7 +21939,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "宁波市", ], @@ -19195,7 +21950,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "舟山市", ], @@ -19206,7 +21961,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "杭州市", ], @@ -19217,18 +21972,84 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 20, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 103.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 103.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 103.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", + "width": 103.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, "multiLineActualTexts": Array [ "绍兴市", ], "originalText": "绍兴市", "width": 103.8, }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 103.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 20, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 103.8, + }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19236,13 +22057,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "家具家具家具家具家具家具家具家具家具家具...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 20, "multiLineActualTexts": Array [ "家具家具家具家", - "具家具家具家...", + "具家具家具家具", + "家具家具家具...", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, @@ -19251,7 +22073,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19262,7 +22084,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19273,7 +22095,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19284,7 +22106,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19295,7 +22117,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19306,7 +22128,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19317,7 +22139,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "家具", ], @@ -19328,7 +22150,7 @@ Array [ "actualText": "办公用品", "actualTextHeight": 15, "actualTextWidth": 49, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "办公用品", ], @@ -19339,7 +22161,73 @@ Array [ "actualText": "办公用品", "actualTextHeight": 15, "actualTextWidth": 49, - "height": 30, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 20, "multiLineActualTexts": Array [ "办公用品", ], @@ -19350,7 +22238,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "桌子", ], @@ -19358,13 +22246,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 20, "multiLineActualTexts": Array [ "桌子桌子桌子桌", - "子桌子桌子桌...", + "子桌子桌子桌子", + "桌子桌子桌子...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, @@ -19373,7 +22262,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 20, "multiLineActualTexts": Array [ "桌子", ], @@ -19384,7 +22273,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "桌子", ], @@ -19395,7 +22284,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "桌子", ], @@ -19406,7 +22295,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "沙发", ], @@ -19417,7 +22306,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "沙发", ], @@ -19428,7 +22317,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "沙发", ], @@ -19439,7 +22328,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "沙发", ], @@ -19450,7 +22339,7 @@ Array [ "actualText": "笔", "actualTextHeight": 15, "actualTextWidth": 13, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "笔", ], @@ -19461,7 +22350,7 @@ Array [ "actualText": "笔", "actualTextHeight": 15, "actualTextWidth": 13, - "height": 30, + "height": 20, "multiLineActualTexts": Array [ "笔", ], @@ -19469,341 +22358,266 @@ Array [ "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, - "multiLineActualTexts": Array [ - "2367236723611", - "11", - ], - "originalText": "236723672361111", - "width": 103.8, - }, - Object { - "actualText": "778977897789778977897789...", - "actualTextHeight": 30, - "actualTextWidth": 172, - "height": 46, - "multiLineActualTexts": Array [ - "7789778977897", - "78977897789...", - ], - "originalText": "7789778977897789778977897789", - "width": 103.8, - }, - Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, - "multiLineActualTexts": Array [ - "2367236723611", - "11", - ], - "originalText": "236723672361111", - "width": 103.8, - }, - Object { - "actualText": "3877", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "3877", - ], - "originalText": "3877", - "width": 103.8, - }, - Object { - "actualText": "4342", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "4342", - ], - "originalText": "4342", - "width": 103.8, - }, - Object { - "actualText": "5343", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 13, + "height": 20, "multiLineActualTexts": Array [ - "5343", + "笔", ], - "originalText": "5343", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "632", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualTextWidth": 13, + "height": 20, "multiLineActualTexts": Array [ - "632", + "笔", ], - "originalText": "632", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "7234", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "7234", + "纸张", ], - "originalText": "7234", + "originalText": "纸张", "width": 103.8, }, Object { - "actualText": "834", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "834", + "纸张", ], - "originalText": "834", + "originalText": "纸张", "width": 103.8, }, Object { - "actualText": "945", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, + "actualTextWidth": 25, + "height": 20, "multiLineActualTexts": Array [ - "945", + "纸张", ], - "originalText": "945", + "originalText": "纸张", "width": 103.8, }, Object { - "actualText": "1304", + "actualText": "纸张", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1304", - ], - "originalText": "1304", - "width": 103.8, - }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 1`] = ` -Array [ - Object { - "actualText": "序号", - "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 20, "multiLineActualTexts": Array [ - "序号", + "纸张", ], - "originalText": "序号", - "width": 80, + "originalText": "纸张", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 2`] = ` -Array [ Object { - "actualText": "1", - "actualTextHeight": 15, - "actualTextWidth": 7, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, "height": 20, "multiLineActualTexts": Array [ - "1", + "2367236723611", + "11", ], - "originalText": "1", - "width": 80, + "originalText": "236723672361111", + "width": 103.8, }, Object { - "actualText": "2", - "actualTextHeight": 15, - "actualTextWidth": 7, + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, "height": 20, "multiLineActualTexts": Array [ - "2", + "7789778977897", + "7897789778977", + "89", ], - "originalText": "2", - "width": 80, + "originalText": "7789778977897789778977897789", + "width": 103.8, }, Object { - "actualText": "3", - "actualTextHeight": 15, - "actualTextWidth": 7, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, "height": 20, "multiLineActualTexts": Array [ - "3", + "2367236723611", + "11", ], - "originalText": "3", - "width": 80, + "originalText": "236723672361111", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "3877", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "4", + "3877", ], - "originalText": "4", - "width": 80, + "originalText": "3877", + "width": 103.8, }, Object { - "actualText": "5", + "actualText": "4342", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "5", + "4342", ], - "originalText": "5", - "width": 80, + "originalText": "4342", + "width": 103.8, }, Object { - "actualText": "6", + "actualText": "5343", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "6", + "5343", ], - "originalText": "6", - "width": 80, + "originalText": "5343", + "width": 103.8, }, Object { - "actualText": "7", + "actualText": "632", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "7", + "632", ], - "originalText": "7", - "width": 80, + "originalText": "632", + "width": 103.8, }, Object { - "actualText": "8", + "actualText": "7234", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "8", + "7234", ], - "originalText": "8", - "width": 80, + "originalText": "7234", + "width": 103.8, }, Object { - "actualText": "9", + "actualText": "834", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "9", + "834", ], - "originalText": "9", - "width": 80, + "originalText": "834", + "width": 103.8, }, Object { - "actualText": "10", + "actualText": "945", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 21, "height": 20, "multiLineActualTexts": Array [ - "10", + "945", ], - "originalText": "10", - "width": 80, + "originalText": "945", + "width": 103.8, }, Object { - "actualText": "11", + "actualText": "1304", "actualTextHeight": 15, - "actualTextWidth": 13, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "11", + "1304", ], - "originalText": "11", - "width": 80, + "originalText": "1304", + "width": 103.8, }, Object { - "actualText": "12", + "actualText": "1145", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 26, "height": 20, "multiLineActualTexts": Array [ - "12", + "1145", ], - "originalText": "12", - "width": 80, + "originalText": "1145", + "width": 103.8, }, Object { - "actualText": "13", + "actualText": "1432", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "13", + "1432", ], - "originalText": "13", - "width": 80, + "originalText": "1432", + "width": 103.8, }, Object { - "actualText": "14", + "actualText": "1343", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "14", + "1343", ], - "originalText": "14", - "width": 80, + "originalText": "1343", + "width": 103.8, }, Object { - "actualText": "15", + "actualText": "1354", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "15", + "1354", ], - "originalText": "15", - "width": 80, + "originalText": "1354", + "width": 103.8, }, Object { - "actualText": "16", + "actualText": "1523", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "16", + "1523", ], - "originalText": "16", - "width": 80, + "originalText": "1523", + "width": 103.8, }, Object { - "actualText": "17", + "actualText": "1634", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 27, "height": 20, "multiLineActualTexts": Array [ - "17", + "1634", ], - "originalText": "17", - "width": 80, + "originalText": "1634", + "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 1`] = ` Array [ Object { "actualText": "序号", @@ -19816,79 +22630,16 @@ Array [ "originalText": "序号", "width": 80, }, - Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, - "multiLineActualTexts": Array [ - "省份", - ], - "originalText": "省份", - "width": 103.8, - }, - Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, - "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城市", - "城市城市城市...", - ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 103.8, - }, - Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 56, - "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类别", - "类别类别类别", - ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 103.8, - }, - Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 56, - "multiLineActualTexts": Array [ - "子类别", - ], - "originalText": "子类别", - "width": 103.8, - }, - Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, - "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数量", - "数量数量数量...", - ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", - "width": 103.8, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.height 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -19910,7 +22661,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -19921,7 +22672,7 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "4", ], @@ -19932,7 +22683,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "5", ], @@ -19943,7 +22694,7 @@ Array [ "actualText": "6", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "6", ], @@ -19954,7 +22705,7 @@ Array [ "actualText": "7", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "7", ], @@ -19965,7 +22716,7 @@ Array [ "actualText": "8", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "8", ], @@ -19976,196 +22727,201 @@ Array [ "actualText": "9", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "9", ], "originalText": "9", "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 3`] = ` +Array [ Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 56, "multiLineActualTexts": Array [ - "10", + "序号", ], - "originalText": "10", + "originalText": "序号", "width": 80, }, Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 56, "multiLineActualTexts": Array [ - "11", + "省份", ], - "originalText": "11", - "width": 80, + "originalText": "省份", + "width": 103.8, }, Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "12", + "城市城市城市城", + "市城市城市城市", + "城市城市城市...", ], - "originalText": "12", - "width": 80, + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "width": 103.8, }, Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 56, "multiLineActualTexts": Array [ - "13", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], - "originalText": "13", - "width": 80, + "originalText": "类别类别类别类别类别类别类别类别类别类别", + "width": 103.8, }, Object { - "actualText": "14", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 56, "multiLineActualTexts": Array [ - "14", + "子类别", ], - "originalText": "14", - "width": 80, + "originalText": "子类别", + "width": 103.8, }, Object { - "actualText": "15", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "15", + "数量数量数量数", + "量数量数量数量", + "数量数量数量...", ], - "originalText": "15", - "width": 80, + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 5`] = ` +Array [ Object { - "actualText": "16", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "16", + "1", ], - "originalText": "16", + "originalText": "1", "width": 80, }, Object { - "actualText": "17", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 7, "height": 20, "multiLineActualTexts": Array [ - "17", + "2", ], - "originalText": "17", + "originalText": "2", "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 20, + "actualTextWidth": 7, + "height": 46, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", + "3", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "4", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "5", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "浙江省", + "5", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "5", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "6", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "6", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "6", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "7", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "7", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "8", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "8", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "8", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "9", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "9", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -20173,21 +22929,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, "height": 20, "multiLineActualTexts": Array [ - "浙江省", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], - "originalText": "浙江省", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -20198,7 +22956,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -20209,7 +22967,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "浙江省", ], @@ -20220,7 +22978,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -20231,7 +22989,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -20242,7 +23000,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -20253,7 +23011,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -20264,7 +23022,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -20288,95 +23046,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -20387,7 +23057,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "宁波市", ], @@ -20398,7 +23068,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "舟山市", ], @@ -20409,7 +23079,7 @@ Array [ "actualText": "杭州市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "杭州市", ], @@ -20420,7 +23090,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], @@ -20431,7 +23101,7 @@ Array [ "actualText": "宁波市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "宁波市", ], @@ -20442,7 +23112,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "舟山市", ], @@ -20453,7 +23123,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -20477,7 +23147,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -20488,7 +23158,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -20499,7 +23169,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -20510,7 +23180,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -20521,7 +23191,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -20532,7 +23202,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -20543,7 +23213,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ "家具", ], @@ -20551,477 +23221,638 @@ Array [ "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "办公用品", + "桌子", ], - "originalText": "办公用品", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, "height": 20, "multiLineActualTexts": Array [ - "办公用品", + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子...", ], - "originalText": "办公用品", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 46, "multiLineActualTexts": Array [ - "办公用品", + "桌子", ], - "originalText": "办公用品", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "桌子", ], - "originalText": "办公用品", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "办公用品", + "桌子", ], - "originalText": "办公用品", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "沙发", ], - "originalText": "办公用品", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "沙发", ], - "originalText": "办公用品", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "办公用品", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 20, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "办公用品", + "沙发", ], - "originalText": "办公用品", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 20, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "沙发", ], - "originalText": "桌子", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "7789778977897789778977897789", "actualTextHeight": 45, - "actualTextWidth": 253, + "actualTextWidth": 189, "height": 20, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子...", + "7789778977897", + "7897789778977", + "89", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "3877", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3877", + ], + "originalText": "3877", + "width": 103.8, + }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 100, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 103.8, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 103.8, + }, + Object { + "actualText": "632", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "632", + ], + "originalText": "632", + "width": 103.8, + }, + Object { + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "7234", + ], + "originalText": "7234", + "width": 103.8, + }, + Object { + "actualText": "834", "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, + "multiLineActualTexts": Array [ + "834", + ], + "originalText": "834", + "width": 103.8, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 2`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 100, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 100, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "桌子", + "3", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "桌子", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "桌子", + "4", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "4", + "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 3`] = ` +Array [ Object { - "actualText": "桌子", - "actualTextHeight": 15, + "actualText": "序号", + "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ - "桌子", + "序号", ], - "originalText": "桌子", - "width": 103.8, + "originalText": "序号", + "width": 80, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, + "actualText": "省份", + "actualTextHeight": 16, "actualTextWidth": 25, - "height": 20, + "height": 56, "multiLineActualTexts": Array [ - "沙发", + "省份", ], - "originalText": "沙发", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "沙发", + "城市城市城市城", + "市城市城市城市", + "城市城市城市...", ], - "originalText": "沙发", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 56, "multiLineActualTexts": Array [ - "沙发", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], - "originalText": "沙发", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, + "height": 56, "multiLineActualTexts": Array [ - "沙发", + "子类别", ], - "originalText": "沙发", + "originalText": "子类别", "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "笔", + "数量数量数量数", + "量数量数量数量", + "数量数量数量...", ], - "originalText": "笔", + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 5`] = ` +Array [ Object { - "actualText": "笔", + "actualText": "1", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "笔", + "1", ], - "originalText": "笔", - "width": 103.8, + "originalText": "1", + "width": 80, }, Object { - "actualText": "笔", + "actualText": "2", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "笔", + "2", ], - "originalText": "笔", - "width": 103.8, + "originalText": "2", + "width": 80, }, Object { - "actualText": "笔", + "actualText": "3", "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "笔", + "3", ], - "originalText": "笔", - "width": 103.8, + "originalText": "3", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 7, + "height": 100, "multiLineActualTexts": Array [ - "纸张", + "4", ], - "originalText": "纸张", - "width": 103.8, + "originalText": "4", + "width": 80, }, Object { - "actualText": "纸张", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "纸张", + "浙江省", ], - "originalText": "纸张", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "纸张", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "纸张", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], - "originalText": "纸张", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { - "actualText": "纸张", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 20, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "纸张", + "浙江省", ], - "originalText": "纸张", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 20, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "浙江省", ], - "originalText": "236723672361111", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 20, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "绍兴市", ], - "originalText": "7789778977897789778977897789", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 20, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州...", ], - "originalText": "236723672361111", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, Object { - "actualText": "3877", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "3877", + "绍兴市", ], - "originalText": "3877", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "4342", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 37, + "height": 100, "multiLineActualTexts": Array [ - "4342", + "宁波市", ], - "originalText": "4342", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "5343", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "5343", + "家具", ], - "originalText": "5343", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "632", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualText": "家具家具家具家具家具家具家具家具家具家具...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "632", + "家具家具家具家", + "具家具家具家具", + "家具家具家具...", ], - "originalText": "632", + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, }, Object { - "actualText": "7234", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "7234", + "家具", ], - "originalText": "7234", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "834", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "834", + "家具", ], - "originalText": "834", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "945", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "945", + "桌子", ], - "originalText": "945", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "1304", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 100, "multiLineActualTexts": Array [ - "1304", + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子...", ], - "originalText": "1304", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { - "actualText": "1145", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 26, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "1145", + "桌子", ], - "originalText": "1145", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "1432", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualTextWidth": 25, + "height": 100, "multiLineActualTexts": Array [ - "1432", + "桌子", ], - "originalText": "1432", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "1343", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 100, "multiLineActualTexts": Array [ - "1343", + "2367236723611", + "11", ], - "originalText": "1343", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "1354", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 100, "multiLineActualTexts": Array [ - "1354", + "7789778977897", + "7897789778977", + "89", ], - "originalText": "1354", + "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "1523", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 20, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 100, "multiLineActualTexts": Array [ - "1523", + "2367236723611", + "11", ], - "originalText": "1523", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "1634", + "actualText": "3877", "actualTextHeight": 15, "actualTextWidth": 27, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ - "1634", + "3877", ], - "originalText": "1634", + "originalText": "3877", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 1`] = ` Array [ Object { "actualText": "序号", @@ -21037,13 +23868,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 100, "multiLineActualTexts": Array [ "1", ], @@ -21054,7 +23885,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "2", ], @@ -21087,7 +23918,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "5", ], @@ -21105,43 +23936,10 @@ Array [ "originalText": "6", "width": 80, }, - Object { - "actualText": "7", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "7", - ], - "originalText": "7", - "width": 80, - }, - Object { - "actualText": "8", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "8", - ], - "originalText": "8", - "width": 80, - }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": "9", - "width": 80, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 3`] = ` Array [ Object { "actualText": "序号", @@ -21218,15 +24016,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style less than actual text height by rowCell.heightByField 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 100, "multiLineActualTexts": Array [ "1", ], @@ -21237,7 +24035,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "2", ], @@ -21270,7 +24068,7 @@ Array [ "actualText": "5", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "5", ], @@ -21286,81 +24084,13 @@ Array [ "6", ], "originalText": "6", - "width": 80, - }, - Object { - "actualText": "7", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "7", - ], - "originalText": "7", - "width": 80, - }, - Object { - "actualText": "8", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "8", - ], - "originalText": "8", - "width": 80, - }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": "9", - "width": 80, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 20, - "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", - ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, + "width": 80, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 100, "multiLineActualTexts": Array [ "浙江省", ], @@ -21368,21 +24098,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, "height": 100, "multiLineActualTexts": Array [ - "浙江省", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], - "originalText": "浙江省", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -21426,7 +24158,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 100, "multiLineActualTexts": Array [ "绍兴市", ], @@ -21437,7 +24169,7 @@ Array [ "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "杭州市杭州市杭", "州市杭州市杭州", @@ -21472,7 +24204,7 @@ Array [ "actualText": "舟山市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "舟山市", ], @@ -21490,44 +24222,11 @@ Array [ "originalText": "杭州市", "width": 103.8, }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 100, "multiLineActualTexts": Array [ "家具", ], @@ -21538,7 +24237,7 @@ Array [ "actualText": "家具家具家具家具家具家具家具家具家具家具...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家具", @@ -21569,39 +24268,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -21628,7 +24294,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 100, "multiLineActualTexts": Array [ "桌子", ], @@ -21639,7 +24305,7 @@ Array [ "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 20, + "height": 100, "multiLineActualTexts": Array [ "桌子桌子桌子桌", "子桌子桌子桌子", @@ -21674,7 +24340,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], @@ -21693,167 +24359,322 @@ Array [ "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 100, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 100, + "multiLineActualTexts": Array [ + "7789778977897", + "7897789778977", + "89", + ], + "originalText": "7789778977897789778977897789", + "width": 103.8, + }, + Object { + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, + "multiLineActualTexts": Array [ + "2367236723611", + "11", + ], + "originalText": "236723672361111", + "width": 103.8, + }, + Object { + "actualText": "3877", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "3877", + ], + "originalText": "3877", + "width": 103.8, + }, + Object { + "actualText": "4342", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "4342", + ], + "originalText": "4342", + "width": 103.8, + }, + Object { + "actualText": "5343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "5343", + ], + "originalText": "5343", + "width": 103.8, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 1`] = ` +Array [ + Object { + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "序号", + ], + "originalText": "序号", + "width": 80, + }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 2`] = ` +Array [ + Object { + "actualText": "1", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "1", + ], + "originalText": "1", + "width": 80, + }, + Object { + "actualText": "2", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "2", + ], + "originalText": "2", + "width": 80, + }, + Object { + "actualText": "3", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "3", + ], + "originalText": "3", + "width": 80, + }, + Object { + "actualText": "4", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, + Object { + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "5", + ], + "originalText": "5", + "width": 80, + }, + Object { + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "7", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { - "actualText": "沙发", + "actualText": "8", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "8", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "8", + "width": 80, }, Object { - "actualText": "沙发", + "actualText": "9", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "9", ], - "originalText": "沙发", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "10", ], - "originalText": "236723672361111", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 20, + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "11", ], - "originalText": "7789778977897789778977897789", - "width": 103.8, + "originalText": "11", + "width": 80, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "12", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "12", ], - "originalText": "236723672361111", - "width": 103.8, + "originalText": "12", + "width": 80, }, Object { - "actualText": "3877", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "3877", + "13", ], - "originalText": "3877", - "width": 103.8, + "originalText": "13", + "width": 80, }, +] +`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 3`] = ` +Array [ Object { - "actualText": "4342", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 100, + "actualText": "序号", + "actualTextHeight": 16, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "4342", + "序号", ], - "originalText": "4342", - "width": 103.8, + "originalText": "序号", + "width": 80, }, Object { - "actualText": "5343", - "actualTextHeight": 15, - "actualTextWidth": 27, + "actualText": "省份", + "actualTextHeight": 16, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "5343", + "省份", ], - "originalText": "5343", + "originalText": "省份", "width": 103.8, }, Object { - "actualText": "632", - "actualTextHeight": 15, - "actualTextWidth": 21, + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 16, + "actualTextWidth": 289, "height": 30, "multiLineActualTexts": Array [ - "632", + "城市城市城市城市城市城市城市城市城市城市城市城市", ], - "originalText": "632", + "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "7234", - "actualTextHeight": 15, - "actualTextWidth": 27, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 16, + "actualTextWidth": 241, "height": 30, "multiLineActualTexts": Array [ - "7234", + "类别类别类别类别类别类别类别类别类别类别", ], - "originalText": "7234", + "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, }, Object { - "actualText": "834", - "actualTextHeight": 15, - "actualTextWidth": 21, + "actualText": "子类别", + "actualTextHeight": 16, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "834", + "子类别", ], - "originalText": "834", + "originalText": "子类别", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 1`] = ` -Array [ Object { - "actualText": "序号", + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + "actualTextWidth": 265, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "数量数量数量数量数量数量数量数量数量数量数量", ], - "originalText": "序号", - "width": 80, + "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 4`] = `Array []`; + +exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -21864,7 +24685,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "2", ], @@ -21875,7 +24696,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -21886,146 +24707,117 @@ Array [ "actualText": "4", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "4", ], "originalText": "4", "width": 80, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 3`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "5", ], - "originalText": "序号", + "originalText": "5", "width": 80, }, Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, - "multiLineActualTexts": Array [ - "省份", - ], - "originalText": "省份", - "width": 103.8, - }, - Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城市", - "城市城市城市...", + "6", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 103.8, + "originalText": "6", + "width": 80, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 56, + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "7", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 103.8, + "originalText": "7", + "width": 80, }, Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 56, + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "子类别", + "8", ], - "originalText": "子类别", - "width": 103.8, + "originalText": "8", + "width": 80, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数量", - "数量数量数量...", + "9", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", - "width": 103.8, + "originalText": "9", + "width": 80, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.height 5`] = ` -Array [ Object { - "actualText": "1", + "actualText": "10", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "1", + "10", ], - "originalText": "1", + "originalText": "10", "width": 80, }, Object { - "actualText": "2", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "2", + "11", ], - "originalText": "2", + "originalText": "11", "width": 80, }, Object { - "actualText": "3", + "actualText": "12", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "3", + "12", ], - "originalText": "3", + "originalText": "12", "width": 80, }, Object { - "actualText": "4", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 14, + "height": 30, "multiLineActualTexts": Array [ - "4", + "13", ], - "originalText": "4", + "originalText": "13", "width": 80, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -22033,14 +24825,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "actualTextHeight": 15, + "actualTextWidth": 361, + "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", + "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", ], "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, @@ -22049,7 +24839,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -22060,7 +24850,7 @@ Array [ "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], @@ -22068,774 +24858,680 @@ Array [ "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州...", + "浙江省", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "绍兴市", + "浙江省", ], - "originalText": "绍兴市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "宁波市", + "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "宁波市", + "浙江省", ], - "originalText": "宁波市", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, - Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家具", - "家具家具家具...", + "浙江省", ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "浙江省", ], - "originalText": "家具", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, - "multiLineActualTexts": Array [ - "桌子", - ], - "originalText": "桌子", - "width": 103.8, - }, - Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子...", + "浙江省", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "浙江省", ], - "originalText": "桌子", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, - "multiLineActualTexts": Array [ - "桌子", - ], - "originalText": "桌子", - "width": 103.8, - }, - Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "浙江省", ], - "originalText": "236723672361111", + "originalText": "浙江省", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 100, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "绍兴市", ], - "originalText": "7789778977897789778977897789", + "originalText": "绍兴市", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 100, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "actualTextHeight": 15, + "actualTextWidth": 361, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", ], - "originalText": "236723672361111", + "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, }, Object { - "actualText": "3877", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "3877", + "绍兴市", ], - "originalText": "3877", + "originalText": "绍兴市", "width": 103.8, - }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 1`] = ` -Array [ - Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "宁波市", ], - "originalText": "序号", - "width": 80, + "originalText": "宁波市", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 2`] = ` -Array [ Object { - "actualText": "1", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "1", + "舟山市", ], - "originalText": "1", - "width": 80, + "originalText": "舟山市", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "杭州市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "2", + "杭州市", ], - "originalText": "2", - "width": 80, + "originalText": "杭州市", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "绍兴市", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 46, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "3", + "绍兴市", ], - "originalText": "3", - "width": 80, + "originalText": "绍兴市", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "宁波市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "4", + "宁波市", ], - "originalText": "4", - "width": 80, + "originalText": "宁波市", + "width": 103.8, }, Object { - "actualText": "5", + "actualText": "舟山市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "5", + "舟山市", ], - "originalText": "5", - "width": 80, + "originalText": "舟山市", + "width": 103.8, }, Object { - "actualText": "6", + "actualText": "杭州市", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "6", + "杭州市", ], - "originalText": "6", - "width": 80, + "originalText": "杭州市", + "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 3`] = ` -Array [ Object { - "actualText": "序号", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "序号", + "绍兴市", ], - "originalText": "序号", - "width": 80, + "originalText": "绍兴市", + "width": 103.8, }, Object { - "actualText": "省份", - "actualTextHeight": 16, - "actualTextWidth": 25, - "height": 56, + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "省份", + "宁波市", ], - "originalText": "省份", + "originalText": "宁波市", "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城市", - "城市城市城市...", + "舟山市", ], - "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "originalText": "舟山市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 56, + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "家具", ], - "originalText": "类别类别类别类别类别类别类别类别类别类别", + "originalText": "家具", "width": 103.8, }, Object { - "actualText": "子类别", - "actualTextHeight": 16, - "actualTextWidth": 37, - "height": 56, + "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualTextHeight": 15, + "actualTextWidth": 337, + "height": 30, "multiLineActualTexts": Array [ - "子类别", + "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", ], - "originalText": "子类别", + "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数量", - "数量数量数量...", + "家具", ], - "originalText": "数量数量数量数量数量数量数量数量数量数量数量", + "originalText": "家具", "width": 103.8, }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 4`] = `Array []`; - -exports[`SpreadSheet Multi Line Text Tests TableSheet should not force adaptive adjust row height if custom cell style more than actual text height by rowCell.heightByField 5`] = ` -Array [ Object { - "actualText": "1", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "1", + "家具", ], - "originalText": "1", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "2", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "2", + "家具", ], - "originalText": "2", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "3", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 46, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "3", + "家具", ], - "originalText": "3", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "4", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "4", + "家具", ], - "originalText": "4", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "5", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "5", + "家具", ], - "originalText": "5", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "6", + "actualText": "家具", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "6", + "家具", ], - "originalText": "6", - "width": 80, + "originalText": "家具", + "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "办公用品", ], - "originalText": "浙江省", + "originalText": "办公用品", "width": 103.8, }, - Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", + "办公用品", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, + "actualTextWidth": 49, + "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "办公用品", ], - "originalText": "浙江省", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "办公用品", ], - "originalText": "浙江省", + "originalText": "办公用品", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "桌子", ], - "originalText": "浙江省", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "浙江省", + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 361, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", ], - "originalText": "浙江省", + "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 100, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "绍兴市", + "桌子", ], - "originalText": "绍兴市", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "桌子", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州...", + "桌子", ], - "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "绍兴市", + "actualText": "桌子", "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 46, + "actualTextWidth": 25, + "height": 30, "multiLineActualTexts": Array [ - "绍兴市", + "桌子", ], - "originalText": "绍兴市", + "originalText": "桌子", "width": 103.8, }, Object { - "actualText": "宁波市", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "宁波市", + "沙发", ], - "originalText": "宁波市", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "舟山市", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "舟山市", + "沙发", ], - "originalText": "舟山市", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "杭州市", + "actualText": "沙发", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 25, "height": 30, "multiLineActualTexts": Array [ - "杭州市", + "沙发", ], - "originalText": "杭州市", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "沙发", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 100, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "沙发", ], - "originalText": "家具", + "originalText": "沙发", "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家具", - "家具家具家具...", + "笔", ], - "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 13, + "height": 30, "multiLineActualTexts": Array [ - "家具", + "笔", ], - "originalText": "家具", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "家具", + "笔", ], - "originalText": "家具", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "笔", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "家具", + "笔", ], - "originalText": "家具", + "originalText": "笔", "width": 103.8, }, Object { - "actualText": "家具", + "actualText": "236723672361111", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 98, "height": 30, "multiLineActualTexts": Array [ - "家具", + "236723672361111", ], - "originalText": "家具", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "7789778977897789778977897789", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 100, + "actualTextWidth": 187, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "7789778977897789778977897789", ], - "originalText": "桌子", + "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 100, + "actualText": "236723672361111", + "actualTextHeight": 15, + "actualTextWidth": 98, + "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子...", + "236723672361111", ], - "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "3877", "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 46, + "actualTextWidth": 27, + "height": 30, "multiLineActualTexts": Array [ - "桌子", + "3877", ], - "originalText": "桌子", + "originalText": "3877", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "4342", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "桌子", + "4342", ], - "originalText": "桌子", + "originalText": "4342", "width": 103.8, }, Object { - "actualText": "桌子", + "actualText": "5343", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "桌子", + "5343", ], - "originalText": "桌子", + "originalText": "5343", "width": 103.8, }, Object { - "actualText": "沙发", + "actualText": "632", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 21, "height": 30, "multiLineActualTexts": Array [ - "沙发", + "632", ], - "originalText": "沙发", + "originalText": "632", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 100, + "actualText": "7234", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "7234", ], - "originalText": "236723672361111", + "originalText": "7234", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 100, + "actualText": "834", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, "multiLineActualTexts": Array [ - "7789778977897", - "7897789778977", - "89", + "834", ], - "originalText": "7789778977897789778977897789", + "originalText": "834", "width": 103.8, }, Object { - "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualText": "945", + "actualTextHeight": 15, + "actualTextWidth": 21, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "945", ], - "originalText": "236723672361111", + "originalText": "945", "width": 103.8, }, Object { - "actualText": "3877", + "actualText": "1304", "actualTextHeight": 15, "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "3877", + "1304", ], - "originalText": "3877", + "originalText": "1304", "width": 103.8, }, Object { - "actualText": "4342", + "actualText": "1145", "actualTextHeight": 15, - "actualTextWidth": 27, + "actualTextWidth": 26, "height": 30, "multiLineActualTexts": Array [ - "4342", + "1145", ], - "originalText": "4342", + "originalText": "1145", "width": 103.8, }, Object { - "actualText": "5343", + "actualText": "1432", "actualTextHeight": 15, "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "5343", + "1432", ], - "originalText": "5343", + "originalText": "1432", "width": 103.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 1`] = ` Array [ Object { "actualText": "序号", @@ -22851,7 +25547,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 2`] = ` Array [ Object { "actualText": "1", @@ -22999,7 +25695,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 3`] = ` Array [ Object { "actualText": "序号", @@ -23024,23 +25720,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualText": "城市城市@@@", "actualTextHeight": 16, - "actualTextWidth": 289, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "城市城市城市城市城市城市城市城市城市城市城市城市", + "城市城市@@@", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualText": "类别类别@@@", "actualTextHeight": 16, - "actualTextWidth": 241, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "类别类别类别类别类别类别类别类别类别类别", + "类别类别@@@", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -23057,12 +25753,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualText": "数量数量@@@", "actualTextHeight": 16, - "actualTextWidth": 265, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "数量数量数量数量数量数量数量数量数量数量数量", + "数量数量@@@", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -23070,9 +25766,9 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should not render word wrap text 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 5`] = ` Array [ Object { "actualText": "1", @@ -23229,12 +25925,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "actualText": "浙江省浙@@@", "actualTextHeight": 15, - "actualTextWidth": 361, + "actualTextWidth": 85, "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "浙江省浙@@@", ], "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, @@ -23372,12 +26068,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "actualText": "杭州市杭@@@", "actualTextHeight": 15, - "actualTextWidth": 361, + "actualTextWidth": 85, "height": 30, "multiLineActualTexts": Array [ - "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "杭州市杭@@@", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -23515,12 +26211,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualText": "家具家具@@@", "actualTextHeight": 15, - "actualTextWidth": 337, + "actualTextWidth": 85, "height": 30, "multiLineActualTexts": Array [ - "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "家具家具@@@", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, @@ -23658,12 +26354,12 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "actualText": "桌子桌子@@@", "actualTextHeight": 15, - "actualTextWidth": 361, + "actualTextWidth": 85, "height": 30, "multiLineActualTexts": Array [ - "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "桌子桌子@@@", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, @@ -23790,34 +26486,34 @@ Array [ "width": 103.8, }, Object { - "actualText": "236723672361111", + "actualText": "2367236@@@", "actualTextHeight": 15, - "actualTextWidth": 98, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "236723672361111", + "2367236@@@", ], "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", + "actualText": "7789778@@@", "actualTextHeight": 15, - "actualTextWidth": 187, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "7789778977897789778977897789", + "7789778@@@", ], "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "236723672361111", + "actualText": "2367236@@@", "actualTextHeight": 15, - "actualTextWidth": 98, + "actualTextWidth": 84, "height": 30, "multiLineActualTexts": Array [ - "236723672361111", + "2367236@@@", ], "originalText": "236723672361111", "width": 103.8, @@ -23935,13 +26631,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -23951,13 +26647,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -23968,7 +26664,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -23979,7 +26675,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -24063,49 +26759,16 @@ Array [ "originalText": "10", "width": 80, }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, - Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "12", - ], - "originalText": "12", - "width": 80, - }, - Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "13", - ], - "originalText": "13", - "width": 80, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -24116,7 +26779,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "省份", ], @@ -24124,23 +26787,27 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市@@@", - "actualTextHeight": 16, - "actualTextWidth": 84, - "height": 30, + "actualText": "城市城市城市城市城市城市城市城市城市城市...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "城市城市@@@", + "城市城市城市城", + "市城市城市城市", + "城市城市城市...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别@@@", - "actualTextHeight": 16, - "actualTextWidth": 84, - "height": 30, + "actualText": "类别类别类别类别类别类别类别类别类别类别", + "actualTextHeight": 48, + "actualTextWidth": 243, + "height": 56, "multiLineActualTexts": Array [ - "类别类别@@@", + "类别类别类别类", + "别类别类别类别", + "类别类别类别", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -24149,7 +26816,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 30, + "height": 56, "multiLineActualTexts": Array [ "子类别", ], @@ -24157,12 +26824,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量@@@", - "actualTextHeight": 16, - "actualTextWidth": 84, - "height": 30, + "actualText": "数量数量数量数量数量数量数量数量数量数量...", + "actualTextHeight": 48, + "actualTextWidth": 253, + "height": 56, "multiLineActualTexts": Array [ - "数量数量@@@", + "数量数量数量数", + "量数量数量数量", + "数量数量数量...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -24170,15 +26839,15 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render custom text overflow text 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "1", ], @@ -24189,7 +26858,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -24200,7 +26869,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "3", ], @@ -24265,96 +26934,30 @@ Array [ Object { "actualText": "9", "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": "9", - "width": 80, - }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": "10", - "width": 80, - }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": "11", - "width": 80, - }, - Object { - "actualText": "12", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "12", - ], - "originalText": "12", - "width": 80, - }, - Object { - "actualText": "13", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "13", - ], - "originalText": "13", - "width": 80, - }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, - Object { - "actualText": "浙江省浙@@@", - "actualTextHeight": 15, - "actualTextWidth": 85, + "actualTextWidth": 7, "height": 30, "multiLineActualTexts": Array [ - "浙江省浙@@@", + "9", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, + "originalText": "9", + "width": 80, }, Object { - "actualText": "浙江省", + "actualText": "10", "actualTextHeight": 15, - "actualTextWidth": 37, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "浙江省", + "10", ], - "originalText": "浙江省", - "width": 103.8, + "originalText": "10", + "width": 80, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -24362,21 +26965,23 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "浙江省", + "浙江省浙江省浙", + "江省浙江省浙江", + "省浙江省浙江...", ], - "originalText": "浙江省", + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "浙江省", ], @@ -24464,7 +27069,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -24472,12 +27077,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭@@@", - "actualTextHeight": 15, - "actualTextWidth": 85, - "height": 30, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "杭州市杭@@@", + "杭州市杭州市杭", + "州市杭州市杭州", + "市杭州市杭州...", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -24486,7 +27093,7 @@ Array [ "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "绍兴市", ], @@ -24570,44 +27177,11 @@ Array [ "originalText": "杭州市", "width": 103.8, }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, - Object { - "actualText": "宁波市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "宁波市", - ], - "originalText": "宁波市", - "width": 103.8, - }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -24615,12 +27189,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具家具@@@", - "actualTextHeight": 15, - "actualTextWidth": 85, - "height": 30, + "actualText": "家具家具家具家具家具家具家具家具家具家具...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "家具家具@@@", + "家具家具家具家", + "具家具家具家具", + "家具家具家具...", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, @@ -24629,7 +27205,7 @@ Array [ "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "家具", ], @@ -24713,44 +27289,11 @@ Array [ "originalText": "办公用品", "width": 103.8, }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -24758,12 +27301,14 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子@@@", - "actualTextHeight": 15, - "actualTextWidth": 85, - "height": 30, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", + "actualTextHeight": 45, + "actualTextWidth": 253, + "height": 61, "multiLineActualTexts": Array [ - "桌子桌子@@@", + "桌子桌子桌子桌", + "子桌子桌子桌子", + "桌子桌子桌子...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, @@ -24772,7 +27317,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 30, + "height": 46, "multiLineActualTexts": Array [ "桌子", ], @@ -24857,67 +27402,38 @@ Array [ "width": 103.8, }, Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, - Object { - "actualText": "2367236@@@", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, "multiLineActualTexts": Array [ - "2367236@@@", + "2367236723611", + "11", ], "originalText": "236723672361111", "width": 103.8, }, Object { - "actualText": "7789778@@@", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "7789778977897789778977897789", + "actualTextHeight": 45, + "actualTextWidth": 189, + "height": 61, "multiLineActualTexts": Array [ - "7789778@@@", + "7789778977897", + "7897789778977", + "89", ], "originalText": "7789778977897789778977897789", "width": 103.8, }, Object { - "actualText": "2367236@@@", - "actualTextHeight": 15, - "actualTextWidth": 84, - "height": 30, + "actualText": "236723672361111", + "actualTextHeight": 30, + "actualTextWidth": 100, + "height": 46, "multiLineActualTexts": Array [ - "2367236@@@", + "2367236723611", + "11", ], "originalText": "236723672361111", "width": 103.8, @@ -24999,49 +27515,16 @@ Array [ "originalText": "945", "width": 103.8, }, - Object { - "actualText": "1304", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1304", - ], - "originalText": "1304", - "width": 103.8, - }, - Object { - "actualText": "1145", - "actualTextHeight": 15, - "actualTextWidth": 26, - "height": 30, - "multiLineActualTexts": Array [ - "1145", - ], - "originalText": "1145", - "width": 103.8, - }, - Object { - "actualText": "1432", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1432", - ], - "originalText": "1432", - "width": 103.8, - }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 40, "multiLineActualTexts": Array [ "序号", ], @@ -25051,7 +27534,7 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 2`] = ` Array [ Object { "actualText": "1", @@ -25068,7 +27551,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 46, "multiLineActualTexts": Array [ "2", ], @@ -25163,16 +27646,27 @@ Array [ "originalText": "10", "width": 80, }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 40, "multiLineActualTexts": Array [ "序号", ], @@ -25183,7 +27677,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 40, "multiLineActualTexts": Array [ "省份", ], @@ -25191,27 +27685,25 @@ Array [ "width": 103.8, }, Object { - "actualText": "城市城市城市城市城市城市城市城市城市城市...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "城市城市城市城市城市城市城...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "城市城市城市城", - "市城市城市城市", - "城市城市城市...", + "市城市城市城...", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", "width": 103.8, }, Object { - "actualText": "类别类别类别类别类别类别类别类别类别类别", - "actualTextHeight": 48, - "actualTextWidth": 243, - "height": 56, + "actualText": "类别类别类别类别类别类别类...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "类别类别类别类", - "别类别类别类别", - "类别类别类别", + "别类别类别类...", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", "width": 103.8, @@ -25220,7 +27712,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 40, "multiLineActualTexts": Array [ "子类别", ], @@ -25228,14 +27720,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "数量数量数量数量数量数量数量数量数量数量...", - "actualTextHeight": 48, - "actualTextWidth": 253, - "height": 56, + "actualText": "数量数量数量数量数量数量数...", + "actualTextHeight": 32, + "actualTextWidth": 168, + "height": 40, "multiLineActualTexts": Array [ "数量数量数量数", - "量数量数量数量", - "数量数量数量...", + "量数量数量数...", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", "width": 103.8, @@ -25243,9 +27734,9 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render three max text lines 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 5`] = ` Array [ Object { "actualText": "1", @@ -25262,7 +27753,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 61, + "height": 46, "multiLineActualTexts": Array [ "2", ], @@ -25357,6 +27848,17 @@ Array [ "originalText": "10", "width": 80, }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -25369,14 +27871,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "浙江省浙江省浙江省浙江省浙...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ "浙江省浙江省浙", - "江省浙江省浙江", - "省浙江省浙江...", + "江省浙江省浙...", ], "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "width": 103.8, @@ -25469,6 +27970,17 @@ Array [ "originalText": "浙江省", "width": 103.8, }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 103.8, + }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -25481,14 +27993,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "杭州市杭州市杭州市杭州市杭...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ "杭州市杭州市杭", - "州市杭州市杭州", - "市杭州市杭州...", + "州市杭州市杭...", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "width": 103.8, @@ -25581,6 +28092,17 @@ Array [ "originalText": "杭州市", "width": 103.8, }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 103.8, + }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -25593,14 +28115,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "家具家具家具家具家具家具家具家具家具家具...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "家具家具家具家具家具家具家...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ "家具家具家具家", - "具家具家具家具", - "家具家具家具...", + "具家具家具家...", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "width": 103.8, @@ -25693,6 +28214,17 @@ Array [ "originalText": "办公用品", "width": 103.8, }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 103.8, + }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -25705,14 +28237,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", - "actualTextHeight": 45, - "actualTextWidth": 253, - "height": 61, + "actualText": "桌子桌子桌子桌子桌子桌子桌...", + "actualTextHeight": 30, + "actualTextWidth": 168, + "height": 46, "multiLineActualTexts": Array [ "桌子桌子桌子桌", - "子桌子桌子桌子", - "桌子桌子桌子...", + "子桌子桌子桌...", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "width": 103.8, @@ -25805,6 +28336,17 @@ Array [ "originalText": "笔", "width": 103.8, }, + Object { + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "笔", + ], + "originalText": "笔", + "width": 103.8, + }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -25818,14 +28360,13 @@ Array [ "width": 103.8, }, Object { - "actualText": "7789778977897789778977897789", - "actualTextHeight": 45, - "actualTextWidth": 189, - "height": 61, + "actualText": "778977897789778977897789...", + "actualTextHeight": 30, + "actualTextWidth": 172, + "height": 46, "multiLineActualTexts": Array [ "7789778977897", - "7897789778977", - "89", + "78977897789...", ], "originalText": "7789778977897789778977897789", "width": 103.8, @@ -25919,16 +28460,27 @@ Array [ "originalText": "945", "width": 103.8, }, + Object { + "actualText": "1304", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1304", + ], + "originalText": "1304", + "width": 103.8, + }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 1`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should use actual text height for large max line 1`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -25938,13 +28490,13 @@ Array [ ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 2`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should use actual text height for large max line 2`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -25955,7 +28507,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -25966,7 +28518,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -25976,101 +28528,167 @@ Array [ Object { "actualText": "4", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "4", + ], + "originalText": "4", + "width": 80, + }, + Object { + "actualText": "5", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "5", + ], + "originalText": "5", + "width": 80, + }, + Object { + "actualText": "6", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "6", + ], + "originalText": "6", + "width": 80, + }, + Object { + "actualText": "7", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "7", + ], + "originalText": "7", + "width": 80, + }, + Object { + "actualText": "8", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "8", + ], + "originalText": "8", + "width": 80, + }, + Object { + "actualText": "9", + "actualTextHeight": 15, + "actualTextWidth": 7, + "height": 30, + "multiLineActualTexts": Array [ + "9", + ], + "originalText": "9", + "width": 80, + }, + Object { + "actualText": "10", + "actualTextHeight": 15, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "4", + "10", ], - "originalText": "4", + "originalText": "10", "width": 80, }, Object { - "actualText": "5", + "actualText": "11", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 13, "height": 30, "multiLineActualTexts": Array [ - "5", + "11", ], - "originalText": "5", + "originalText": "11", "width": 80, }, Object { - "actualText": "6", + "actualText": "12", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "6", + "12", ], - "originalText": "6", + "originalText": "12", "width": 80, }, Object { - "actualText": "7", + "actualText": "13", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "7", + "13", ], - "originalText": "7", + "originalText": "13", "width": 80, }, Object { - "actualText": "8", + "actualText": "14", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "8", + "14", ], - "originalText": "8", + "originalText": "14", "width": 80, }, Object { - "actualText": "9", + "actualText": "15", "actualTextHeight": 15, - "actualTextWidth": 7, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "9", + "15", ], - "originalText": "9", + "originalText": "15", "width": 80, }, Object { - "actualText": "10", + "actualText": "16", "actualTextHeight": 15, "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "10", + "16", ], - "originalText": "10", + "originalText": "16", "width": 80, }, Object { - "actualText": "11", + "actualText": "17", "actualTextHeight": 15, - "actualTextWidth": 13, + "actualTextWidth": 14, "height": 30, "multiLineActualTexts": Array [ - "11", + "17", ], - "originalText": "11", + "originalText": "17", "width": 80, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 3`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should use actual text height for large max line 3`] = ` Array [ Object { "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 56, "multiLineActualTexts": Array [ "序号", ], @@ -26081,72 +28699,74 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 56, "multiLineActualTexts": Array [ "省份", ], "originalText": "省份", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "城市城市城市城市城市城市城...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", + "actualTextHeight": 48, + "actualTextWidth": 291, + "height": 56, "multiLineActualTexts": Array [ - "城市城市城市城", - "市城市城市城...", + "城市城市城市城市城市", + "城市城市城市城市城市", + "城市城市", ], "originalText": "城市城市城市城市城市城市城市城市城市城市城市城市", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "类别类别类别类别类别类别类...", + "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualTextWidth": 242, + "height": 56, "multiLineActualTexts": Array [ - "类别类别类别类", - "别类别类别类...", + "类别类别类别类别类别", + "类别类别类别类别类别", ], "originalText": "类别类别类别类别类别类别类别类别类别类别", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 56, "multiLineActualTexts": Array [ "子类别", ], "originalText": "子类别", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "数量数量数量数量数量数量数...", - "actualTextHeight": 32, - "actualTextWidth": 168, - "height": 40, + "actualText": "数量数量数量数量数量数量数量数量数量数量数量", + "actualTextHeight": 48, + "actualTextWidth": 267, + "height": 56, "multiLineActualTexts": Array [ - "数量数量数量数", - "量数量数量数...", + "数量数量数量数量数量", + "数量数量数量数量数量", + "数量", ], "originalText": "数量数量数量数量数量数量数量数量数量数量数量", - "width": 103.8, + "width": 143.8, }, ] `; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 4`] = `Array []`; +exports[`SpreadSheet Multi Line Text Tests TableSheet should use actual text height for large max line 4`] = `Array []`; -exports[`SpreadSheet Multi Line Text Tests TableSheet should render two max text lines 5`] = ` +exports[`SpreadSheet Multi Line Text Tests TableSheet should use actual text height for large max line 5`] = ` Array [ Object { "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "1", ], @@ -26157,7 +28777,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 61, "multiLineActualTexts": Array [ "2", ], @@ -26168,7 +28788,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "3", ], @@ -26244,58 +28864,191 @@ Array [ Object { "actualText": "10", "actualTextHeight": 15, - "actualTextWidth": 14, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "10", + ], + "originalText": "10", + "width": 80, + }, + Object { + "actualText": "11", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "11", + ], + "originalText": "11", + "width": 80, + }, + Object { + "actualText": "12", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "12", + ], + "originalText": "12", + "width": 80, + }, + Object { + "actualText": "13", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "13", + ], + "originalText": "13", + "width": 80, + }, + Object { + "actualText": "14", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "14", + ], + "originalText": "14", + "width": 80, + }, + Object { + "actualText": "15", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "15", + ], + "originalText": "15", + "width": 80, + }, + Object { + "actualText": "16", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "16", + ], + "originalText": "16", + "width": 80, + }, + Object { + "actualText": "17", + "actualTextHeight": 15, + "actualTextWidth": 14, + "height": 30, + "multiLineActualTexts": Array [ + "17", + ], + "originalText": "17", + "width": 80, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 143.8, + }, + Object { + "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, + "multiLineActualTexts": Array [ + "浙江省浙江省浙江省浙", + "江省浙江省浙江省浙江", + "省浙江省浙江省浙江省", + ], + "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", + "width": 143.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 143.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "浙江省", + ], + "originalText": "浙江省", + "width": 143.8, + }, + Object { + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "10", + "浙江省", ], - "originalText": "10", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { - "actualText": "11", + "actualText": "浙江省", "actualTextHeight": 15, - "actualTextWidth": 13, + "actualTextWidth": 37, "height": 30, "multiLineActualTexts": Array [ - "11", + "浙江省", ], - "originalText": "11", - "width": 80, + "originalText": "浙江省", + "width": 143.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "浙江省浙江省浙江省浙江省浙...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "浙江省", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, "multiLineActualTexts": Array [ - "浙江省浙江省浙", - "江省浙江省浙...", + "浙江省", ], - "originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", - "width": 103.8, + "originalText": "浙江省", + "width": 143.8, }, Object { "actualText": "浙江省", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26306,7 +29059,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26317,7 +29070,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26328,7 +29081,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26339,7 +29092,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26350,7 +29103,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26361,7 +29114,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26372,7 +29125,7 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "浙江省", @@ -26383,41 +29136,42 @@ Array [ "浙江省", ], "originalText": "浙江省", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "杭州市杭州市杭州市杭州市杭...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, "multiLineActualTexts": Array [ - "杭州市杭州市杭", - "州市杭州市杭...", + "杭州市杭州市杭州市杭", + "州市杭州市杭州市杭州", + "市杭州市杭州市杭州市", ], "originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "绍兴市", "actualTextHeight": 15, "actualTextWidth": 37, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "宁波市", @@ -26428,7 +29182,7 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "舟山市", @@ -26439,7 +29193,7 @@ Array [ "舟山市", ], "originalText": "舟山市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "杭州市", @@ -26450,7 +29204,7 @@ Array [ "杭州市", ], "originalText": "杭州市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "绍兴市", @@ -26461,7 +29215,7 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "宁波市", @@ -26472,7 +29226,7 @@ Array [ "宁波市", ], "originalText": "宁波市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "舟山市", @@ -26483,7 +29237,7 @@ Array [ "舟山市", ], "originalText": "舟山市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "杭州市", @@ -26494,7 +29248,7 @@ Array [ "杭州市", ], "originalText": "杭州市", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "绍兴市", @@ -26505,41 +29259,108 @@ Array [ "绍兴市", ], "originalText": "绍兴市", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 143.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 143.8, + }, + Object { + "actualText": "杭州市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "杭州市", + ], + "originalText": "杭州市", + "width": 143.8, + }, + Object { + "actualText": "绍兴市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "绍兴市", + ], + "originalText": "绍兴市", + "width": 143.8, + }, + Object { + "actualText": "宁波市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "宁波市", + ], + "originalText": "宁波市", + "width": 143.8, + }, + Object { + "actualText": "舟山市", + "actualTextHeight": 15, + "actualTextWidth": 37, + "height": 30, + "multiLineActualTexts": Array [ + "舟山市", + ], + "originalText": "舟山市", + "width": 143.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "家具家具家具家具家具家具家...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", + "actualTextHeight": 45, + "actualTextWidth": 339, + "height": 61, "multiLineActualTexts": Array [ - "家具家具家具家", - "具家具家具家...", + "家具家具家具家具家具", + "家具家具家具家具家具", + "家具家具家具家具", ], "originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -26550,7 +29371,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -26561,7 +29382,7 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "家具", @@ -26572,40 +29393,106 @@ Array [ "家具", ], "originalText": "家具", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 143.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 143.8, + }, + Object { + "actualText": "家具", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "家具", + ], + "originalText": "家具", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, + }, + Object { + "actualText": "办公用品", + "actualTextHeight": 15, + "actualTextWidth": 49, + "height": 30, + "multiLineActualTexts": Array [ + "办公用品", + ], + "originalText": "办公用品", + "width": 143.8, }, Object { - "actualText": "家具", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "家具", + "办公用品", ], - "originalText": "家具", - "width": 103.8, + "originalText": "办公用品", + "width": 143.8, }, Object { - "actualText": "家具", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "家具", + "办公用品", ], - "originalText": "家具", - "width": 103.8, + "originalText": "办公用品", + "width": 143.8, }, Object { - "actualText": "家具", + "actualText": "办公用品", "actualTextHeight": 15, - "actualTextWidth": 25, + "actualTextWidth": 49, "height": 30, "multiLineActualTexts": Array [ - "家具", + "办公用品", ], - "originalText": "家具", - "width": 103.8, + "originalText": "办公用品", + "width": 143.8, }, Object { "actualText": "办公用品", @@ -26616,7 +29503,7 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "办公用品", @@ -26627,41 +29514,42 @@ Array [ "办公用品", ], "originalText": "办公用品", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], "originalText": "桌子", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "桌子桌子桌子桌子桌子桌子桌...", - "actualTextHeight": 30, - "actualTextWidth": 168, - "height": 46, + "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", + "actualTextHeight": 45, + "actualTextWidth": 363, + "height": 61, "multiLineActualTexts": Array [ - "桌子桌子桌子桌", - "子桌子桌子桌...", + "桌子桌子桌子桌子桌子", + "桌子桌子桌子桌子桌子", + "桌子桌子桌子桌子桌子", ], "originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "桌子", "actualTextHeight": 15, "actualTextWidth": 25, - "height": 46, + "height": 30, "multiLineActualTexts": Array [ "桌子", ], "originalText": "桌子", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "桌子", @@ -26672,7 +29560,7 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "桌子", @@ -26683,7 +29571,7 @@ Array [ "桌子", ], "originalText": "桌子", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "沙发", @@ -26694,7 +29582,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "沙发", @@ -26705,7 +29593,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "沙发", @@ -26716,7 +29604,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "沙发", @@ -26727,7 +29615,7 @@ Array [ "沙发", ], "originalText": "沙发", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "笔", @@ -26738,7 +29626,7 @@ Array [ "笔", ], "originalText": "笔", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "笔", @@ -26749,43 +29637,107 @@ Array [ "笔", ], "originalText": "笔", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "笔", + ], + "originalText": "笔", + "width": 143.8, + }, + Object { + "actualText": "笔", + "actualTextHeight": 15, + "actualTextWidth": 13, + "height": 30, + "multiLineActualTexts": Array [ + "笔", + ], + "originalText": "笔", + "width": 143.8, + }, + Object { + "actualText": "纸张", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "纸张", + ], + "originalText": "纸张", + "width": 143.8, + }, + Object { + "actualText": "纸张", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "纸张", + ], + "originalText": "纸张", + "width": 143.8, + }, + Object { + "actualText": "纸张", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "纸张", + ], + "originalText": "纸张", + "width": 143.8, + }, + Object { + "actualText": "纸张", + "actualTextHeight": 15, + "actualTextWidth": 25, + "height": 30, + "multiLineActualTexts": Array [ + "纸张", + ], + "originalText": "纸张", + "width": 143.8, }, Object { "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualTextHeight": 15, + "actualTextWidth": 98, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "236723672361111", ], "originalText": "236723672361111", - "width": 103.8, + "width": 143.8, }, Object { - "actualText": "778977897789778977897789...", + "actualText": "7789778977897789778977897789", "actualTextHeight": 30, - "actualTextWidth": 172, - "height": 46, + "actualTextWidth": 188, + "height": 61, "multiLineActualTexts": Array [ - "7789778977897", - "78977897789...", + "778977897789778977", + "8977897789", ], "originalText": "7789778977897789778977897789", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "236723672361111", - "actualTextHeight": 30, - "actualTextWidth": 100, - "height": 46, + "actualTextHeight": 15, + "actualTextWidth": 98, + "height": 30, "multiLineActualTexts": Array [ - "2367236723611", - "11", + "236723672361111", ], "originalText": "236723672361111", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "3877", @@ -26796,7 +29748,7 @@ Array [ "3877", ], "originalText": "3877", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "4342", @@ -26807,7 +29759,7 @@ Array [ "4342", ], "originalText": "4342", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "5343", @@ -26818,7 +29770,7 @@ Array [ "5343", ], "originalText": "5343", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "632", @@ -26829,7 +29781,7 @@ Array [ "632", ], "originalText": "632", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "7234", @@ -26840,7 +29792,7 @@ Array [ "7234", ], "originalText": "7234", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "834", @@ -26851,7 +29803,7 @@ Array [ "834", ], "originalText": "834", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "945", @@ -26862,7 +29814,7 @@ Array [ "945", ], "originalText": "945", - "width": 103.8, + "width": 143.8, }, Object { "actualText": "1304", @@ -26873,7 +29825,73 @@ Array [ "1304", ], "originalText": "1304", - "width": 103.8, + "width": 143.8, + }, + Object { + "actualText": "1145", + "actualTextHeight": 15, + "actualTextWidth": 26, + "height": 30, + "multiLineActualTexts": Array [ + "1145", + ], + "originalText": "1145", + "width": 143.8, + }, + Object { + "actualText": "1432", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1432", + ], + "originalText": "1432", + "width": 143.8, + }, + Object { + "actualText": "1343", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1343", + ], + "originalText": "1343", + "width": 143.8, + }, + Object { + "actualText": "1354", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1354", + ], + "originalText": "1354", + "width": 143.8, + }, + Object { + "actualText": "1523", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1523", + ], + "originalText": "1523", + "width": 143.8, + }, + Object { + "actualText": "1634", + "actualTextHeight": 15, + "actualTextWidth": 27, + "height": 30, + "multiLineActualTexts": Array [ + "1634", + ], + "originalText": "1634", + "width": 143.8, }, ] `; diff --git a/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts b/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts index 5098e390a9..8baa66ce60 100644 --- a/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts +++ b/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts @@ -385,7 +385,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { updateStyle(3); await s2.render(false); - expectColHierarchyHeight(165, 112, 53); + expectColHierarchyHeight(149, 96, 53); }); test('should render correctly layout if only enable grand totals', async () => { @@ -441,7 +441,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { matchCellStyleSnapshot(); // 省份 4行文本, 叶子节点 (城市) 3行文本, 省份应该和城市高度一致, 才能展示所有文本 (maxLines: 4) - expectRowHierarchyHeight(568, 0, 72); + expectRowHierarchyHeight(384, 0, 72); expectColHierarchyHeight(212, 144, 68); }); @@ -472,7 +472,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(760); + expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(524); }); // https://github.com/antvis/S2/issues/2678 @@ -518,6 +518,32 @@ describe('SpreadSheet Multi Line Text Tests', () => { matchCellStyleSnapshot(); }); + + test('should use actual text height for large max line', async () => { + // 设置 20 行文本, 应该以实际的文本自适应高度 + updateStyle(20); + + s2.changeSheetSize(800, 600); + await s2.render(); + + matchCellStyleSnapshot(); + expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(328); + }); + + test.each(range(1, 11))( + 'should always render default cell height when set %s line, but actual text not wrap', + async (maxLines) => { + updateStyle(maxLines); + + s2.changeSheetSize(800, 600); + s2.setDataCfg(SimpleDataCfg); + await s2.render(); + + // 不管设置了多少行的文本, 如果实际文本未换行, 高度不应该自适应, 以默认高度为准. + expectColHierarchyHeight(60, 30, 30, 2); + expectRowHierarchyHeight(60, 0, 30, 2); + }, + ); }); describe('TableSheet', () => { @@ -539,7 +565,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { }); afterEach(() => { - s2.destroy(); + // s2.destroy(); }); test('should default render one line text', () => { @@ -899,12 +925,32 @@ describe('SpreadSheet Multi Line Text Tests', () => { ).toBeTruthy(); }); - test.skip.each(range(1, 6))( + test('should use actual text height for large max line', async () => { + updateStyle(20); + + s2.changeSheetSize(800, 600); + await s2.render(); + + matchCellStyleSnapshot(); + expect(s2.facet.getLayoutResult().colsHierarchy.height).toEqual(56); + }); + + test.each(range(1, 11))( 'should always render default cell height when set %s line, but actual text not wrap', async (maxLines) => { updateStyle(maxLines); - s2.setDataCfg(SimpleDataCfg); + s2.setDataCfg( + { + ...SimpleDataCfg, + fields: { + rows: [], + columns: ['province', 'city', 'type', 'price', 'cost'], + values: [], + }, + }, + true, + ); await s2.render(); expectColHierarchyHeight(30, 0, 30, 1); diff --git a/packages/s2-core/src/cell/base-cell.ts b/packages/s2-core/src/cell/base-cell.ts index 8ab3cb2044..f48cf44e61 100644 --- a/packages/s2-core/src/cell/base-cell.ts +++ b/packages/s2-core/src/cell/base-cell.ts @@ -284,7 +284,11 @@ export abstract class BaseCell extends Group { * 是否是多行文本 */ public isMultiLineText() { - return this.getTextLineBoundingRects().length > 1; + const { parsedStyle } = this.getTextShape(); + + return ( + parsedStyle?.maxLines! > 1 && this.getTextLineBoundingRects().length > 1 + ); } /** diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts index 34877f3b29..6a6cab381f 100644 --- a/packages/s2-core/src/facet/base-facet.ts +++ b/packages/s2-core/src/facet/base-facet.ts @@ -341,6 +341,7 @@ export abstract class BaseFacet { return height; } + const defaultHeight = this.getDefaultColNodeHeight(colNode, colsHierarchy); const CellInstance = this.spreadsheet.isTableMode() ? TableColCell : ColCell; @@ -348,7 +349,6 @@ export abstract class BaseFacet { const colCell = new CellInstance(colNode, this.spreadsheet, { shallowRender: true, }); - const defaultHeight = this.getDefaultColNodeHeight(colNode, colsHierarchy); return this.getCellAdaptiveHeight(colCell, defaultHeight); } @@ -387,11 +387,10 @@ export abstract class BaseFacet { cell.drawTextShape(); - const { parsedStyle } = cell.getTextShape(); const textHeight = cell.getActualTextHeight(); const adaptiveHeight = textHeight + padding.top + padding.bottom; - return parsedStyle?.maxLines! > 1 && textHeight >= defaultHeight + return cell.isMultiLineText() && textHeight >= defaultHeight ? adaptiveHeight : defaultHeight; } @@ -1758,7 +1757,7 @@ export abstract class BaseFacet { * | 自定义节点 b-1 | 自定义节点 b-1-1 | 指标 1 | * ------------------------------------------------- */ - public adjustRowLeafNodesWidth(params: AdjustLeafNodesParams) { + public adjustCustomRowLeafNodesWidth(params: AdjustLeafNodesParams) { if (!this.spreadsheet.isCustomRowFields()) { return; } @@ -1776,7 +1775,7 @@ export abstract class BaseFacet { * | 指标 1 | 自定义节点 a-1-1-1 | 指标 2 | | * ---------------------------------------------------------------------- */ - public adjustColLeafNodesHeight(params: AdjustLeafNodesParams) { + public adjustCustomColLeafNodesHeight(params: AdjustLeafNodesParams) { if (!this.spreadsheet.isCustomColumnFields()) { return; } diff --git a/packages/s2-core/src/facet/pivot-facet.ts b/packages/s2-core/src/facet/pivot-facet.ts index 1faba0a086..e580c0e5f9 100644 --- a/packages/s2-core/src/facet/pivot-facet.ts +++ b/packages/s2-core/src/facet/pivot-facet.ts @@ -172,38 +172,68 @@ export class PivotFacet extends FrozenFacet { this.calculateColNodesCoordinate(layoutResult); } - /** - * Calculate all col header related coordinate - * height, width, x, y - * colsHierarchy's height - * colsHierarchy's width - */ private calculateColNodesCoordinate(layoutResult: LayoutResult) { - const { rowLeafNodes, colLeafNodes, rowsHierarchy, colsHierarchy } = - layoutResult; + const { colLeafNodes, colsHierarchy } = layoutResult; + // 1. 计算叶子节点宽度 + this.calculateColLeafNodesWidth(layoutResult); + // 2. 根据叶子节点宽度计算所有父级节点宽度和 x 坐标, 便于计算自动换行后节点的真实高度 + this.calculateColNodeWidthAndX(colLeafNodes); + // 3. 计算每一层级的采样节点 this.updateColsHierarchySampleMaxHeightNodes(colsHierarchy); + // 4. 计算所有节点的高度 + this.calculateColNodesHeight(colsHierarchy); + // 5. 如果存在自定义多级列头, 还需要更新某一层级的采样 + this.updateCustomFieldsSampleNodes(colsHierarchy); + // 6. 补齐自定义列头节点缺失的高度 + this.adjustCustomColLeafNodesHeight({ + leafNodes: colLeafNodes, + hierarchy: colsHierarchy, + }); + // 7. 更新汇总节点坐标 + this.adjustColTotalNodesCoordinate(colsHierarchy); + } + private adjustColTotalNodesCoordinate(colsHierarchy: Hierarchy) { + if (!isEmpty(this.spreadsheet.options.totals?.col)) { + this.adjustTotalNodesCoordinate({ + hierarchy: colsHierarchy, + isRowHeader: false, + isSubTotal: true, + }); + this.adjustTotalNodesCoordinate({ + hierarchy: colsHierarchy, + isRowHeader: false, + isSubTotal: false, + }); + } + } + + private calculateColLeafNodesWidth(layoutResult: LayoutResult) { + const { rowLeafNodes, colLeafNodes, rowsHierarchy, colsHierarchy } = + layoutResult; let preLeafNode = Node.blankNode(); let currentColIndex = 0; + colsHierarchy.getLeaves().forEach((currentNode) => { + currentNode.colIndex = currentColIndex; + currentColIndex += 1; + currentNode.x = preLeafNode.x + preLeafNode.width; + currentNode.width = this.getColLeafNodesWidth( + currentNode, + colLeafNodes, + rowLeafNodes, + rowsHierarchy.width, + ); + colsHierarchy.width += currentNode.width; + preLeafNode = currentNode; + }); + } + + private calculateColNodesHeight(colsHierarchy: Hierarchy) { const colNodes = colsHierarchy.getNodes(); colNodes.forEach((currentNode) => { - if (currentNode.isLeaf) { - currentNode.colIndex = currentColIndex; - currentColIndex += 1; - currentNode.x = preLeafNode.x + preLeafNode.width; - currentNode.width = this.calculateColLeafNodesWidth( - currentNode, - colLeafNodes, - rowLeafNodes, - rowsHierarchy.width, - ); - colsHierarchy.width += currentNode.width; - preLeafNode = currentNode; - } - if (currentNode.level === 0) { currentNode.y = 0; } else { @@ -227,26 +257,6 @@ export class PivotFacet extends FrozenFacet { layoutCoordinate(this.spreadsheet, null, currentNode); }); - - this.updateCustomFieldsSampleNodes(colsHierarchy); - this.adjustColLeafNodesHeight({ - leafNodes: colLeafNodes, - hierarchy: colsHierarchy, - }); - this.autoCalculateColNodeWidthAndX(colLeafNodes); - - if (!isEmpty(this.spreadsheet.options.totals?.col)) { - this.adjustTotalNodesCoordinate({ - hierarchy: colsHierarchy, - isRowHeader: false, - isSubTotal: true, - }); - this.adjustTotalNodesCoordinate({ - hierarchy: colsHierarchy, - isRowHeader: false, - isSubTotal: false, - }); - } } // please read README-adjustTotalNodesCoordinate.md to understand this function @@ -329,7 +339,7 @@ export class PivotFacet extends FrozenFacet { * Auto column no-leaf node's width and x coordinate * @param colLeafNodes */ - private autoCalculateColNodeWidthAndX(colLeafNodes: Node[]) { + private calculateColNodeWidthAndX(colLeafNodes: Node[]) { let prevColParent: Node | null = null; let i = 0; @@ -358,7 +368,7 @@ export class PivotFacet extends FrozenFacet { } } - private calculateColLeafNodesWidth( + private getColLeafNodesWidth( colNode: Node, colLeafNodes: Node[], rowLeafNodes: Node[], @@ -458,24 +468,17 @@ export class PivotFacet extends FrozenFacet { : 0; } - /** - * Calculate all row header related coordinate - * height, width, x, y - * rowHierarchy's height - * rowHierarchy's width - */ - private calculateRowNodesCoordinate(layoutResult: LayoutResult) { - const { rowsHierarchy, rowLeafNodes, colLeafNodes } = layoutResult; + private calculateRowNodesAllLevelSampleNodes(layoutResult: LayoutResult) { + const { rowsHierarchy, colLeafNodes } = layoutResult; const isTree = this.spreadsheet.isHierarchyTreeType(); const sampleNodeByLevel = rowsHierarchy.sampleNodesForAllLevels || []; - // 1、calculate first node's width in every level if (isTree) { rowsHierarchy.width = this.getTreeRowHeaderWidth(); } else { sampleNodeByLevel.forEach((levelSample) => { - levelSample.width = this.calculateGridRowNodesWidth( + levelSample.width = this.getGridRowNodesWidth( levelSample, colLeafNodes, ); @@ -488,18 +491,31 @@ export class PivotFacet extends FrozenFacet { levelSample.x = preLevelSample?.x + preLevelSample?.width; }); } + } + + private calculateRowNodesBBox(rowsHierarchy: Hierarchy) { + const isTree = this.spreadsheet.isHierarchyTreeType(); + const sampleNodeByLevel = rowsHierarchy.sampleNodesForAllLevels || []; - // 2、calculate node's height & y（leaf nodes）, x-coordinate & width(all nodes), height & y (not-leaf), let preLeafNode = Node.blankNode(); - const allNodes = rowsHierarchy.getNodes(); + const rowNodes = rowsHierarchy.getNodes(); - for (let i = 0; i < allNodes.length; i++) { - const currentNode = allNodes[i]; - // in tree type, all nodes treat as leaf + rowNodes.forEach((currentNode, i) => { + // 树状模式都按叶子处理节点 const isLeaf = isTree || (!isTree && currentNode.isLeaf); + // 1. 获取宽度, 便于多行文本计算高度 + if (isTree) { + currentNode.width = this.getTreeRowHeaderWidth(); + } else { + const levelSampleNode = sampleNodeByLevel[currentNode.level]; + + currentNode.width = levelSampleNode?.width; + } + + // 2. 计算叶子节点的高度和坐标 if (isLeaf) { - // 1. 普通树状结构, 叶子节点各占一行, 2. 自定义树状结构 (平铺模式) + // 2.1. 普通树状结构, 叶子节点各占一行, 2.2. 自定义树状结构 (平铺模式) const rowIndex = (preLeafNode?.rowIndex ?? -1) + 1; const currentBranchNodeHeights = Node.getBranchNodes(currentNode).map( (rowNode) => this.getRowNodeHeight(rowNode), @@ -507,7 +523,7 @@ export class PivotFacet extends FrozenFacet { const defaultHeight = this.getRowNodeHeight(currentNode); // 父节点的高度是叶子节点的高度之和, 由于存在多行文本, 叶子节点的高度以当前路径下节点高度最大的为准: https://github.com/antvis/S2/issues/2678 - // 自定义高度除外: https://github.com/antvis/S2/issues/2594 + // 自定义高度除外: https://github.com/antvis/S2/issues/2594 const nodeHeight = this.isCustomRowCellHeight(currentNode) ? defaultHeight : max(currentBranchNodeHeights) ?? defaultHeight; @@ -521,7 +537,6 @@ export class PivotFacet extends FrozenFacet { rowsHierarchy.height += currentNode.height; } - // calc node.x if (isTree || currentNode.level === 0) { currentNode.x = 0; } else { @@ -530,36 +545,45 @@ export class PivotFacet extends FrozenFacet { currentNode.x = preLevelSample?.x + preLevelSample?.width; } - // calc node.width - if (isTree) { - currentNode.width = this.getTreeRowHeaderWidth(); - } else { - // same level -> same width - const levelSampleNode = sampleNodeByLevel[currentNode.level]; + layoutCoordinate(this.spreadsheet, currentNode, null); + }); + } - currentNode.width = levelSampleNode?.width; - } + private calculateRowNodesCoordinate(layoutResult: LayoutResult) { + const { rowsHierarchy, rowLeafNodes } = layoutResult; + const isTree = this.spreadsheet.isHierarchyTreeType(); + + // 1、计算每一层级的采样节点 + this.calculateRowNodesAllLevelSampleNodes(layoutResult); + + // 2、计算节点的高度和 y (叶子节点)，x坐标和宽度 (所有节点) + this.calculateRowNodesBBox(rowsHierarchy); - layoutCoordinate(this.spreadsheet, currentNode, null); - } if (!isTree) { - this.adjustRowLeafNodesWidth({ + // 3. 补齐自定义行头节点缺失的宽度; + this.adjustCustomRowLeafNodesWidth({ leafNodes: rowLeafNodes, hierarchy: rowsHierarchy, }); - this.autoCalculateRowNodeHeightAndY(rowLeafNodes); - if (!isEmpty(this.spreadsheet.options.totals?.row)) { - this.adjustTotalNodesCoordinate({ - hierarchy: rowsHierarchy, - isRowHeader: true, - isSubTotal: false, - }); - this.adjustTotalNodesCoordinate({ - hierarchy: rowsHierarchy, - isRowHeader: true, - isSubTotal: true, - }); - } + // 4.根据叶子节点高度计算所有父级节点高度和 Y 坐标, 便于计算自动换行后节点的真实高度 + this.calculateRowNodeHeightAndY(rowLeafNodes); + // 5. 更新汇总节点坐标 + this.adjustRowTotalNodesCoordinate(rowsHierarchy); + } + } + + private adjustRowTotalNodesCoordinate(rowsHierarchy: Hierarchy) { + if (!isEmpty(this.spreadsheet.options.totals?.row)) { + this.adjustTotalNodesCoordinate({ + hierarchy: rowsHierarchy, + isRowHeader: true, + isSubTotal: false, + }); + this.adjustTotalNodesCoordinate({ + hierarchy: rowsHierarchy, + isRowHeader: true, + isSubTotal: true, + }); } } @@ -567,7 +591,7 @@ export class PivotFacet extends FrozenFacet { * @description Auto calculate row no-leaf node's height and y coordinate * @param rowLeafNodes */ - private autoCalculateRowNodeHeightAndY(rowLeafNodes: Node[]) { + private calculateRowNodeHeightAndY(rowLeafNodes: Node[]) { // 3、in grid type, all no-leaf node's height, y are auto calculated let prevRowParent: Node | null = null; let i = 0; @@ -593,7 +617,7 @@ export class PivotFacet extends FrozenFacet { * @param node * @returns */ - private calculateGridRowNodesWidth(node: Node, colLeafNodes: Node[]): number { + private getGridRowNodesWidth(node: Node, colLeafNodes: Node[]): number { const { rowCell } = this.spreadsheet.options.style!; const cellDraggedWidth = this.getRowCellDraggedWidth(node); diff --git a/packages/s2-core/src/facet/table-facet.ts b/packages/s2-core/src/facet/table-facet.ts index 3a20de8abe..2e5527a2a0 100644 --- a/packages/s2-core/src/facet/table-facet.ts +++ b/packages/s2-core/src/facet/table-facet.ts @@ -350,34 +350,33 @@ export class TableFacet extends FrozenFacet { return getTotalHeight() + colsHierarchy.height; } - private calculateColNodesCoordinate( + private calculateColLeafNodesWidth( colLeafNodes: Node[], colsHierarchy: Hierarchy, ) { - this.updateColsHierarchySampleMaxHeightNodes(colsHierarchy); - let preLeafNode = Node.blankNode(); let currentCollIndex = 0; - const allNodes = colsHierarchy.getNodes(); const adaptiveColWidth = this.getAdaptiveColWidth(colLeafNodes); - for (let i = 0; i < allNodes.length; i++) { - const currentNode = allNodes[i]; + colsHierarchy.getLeaves().forEach((currentNode) => { + currentNode.colIndex = currentCollIndex; + currentCollIndex += 1; + currentNode.x = preLeafNode.x + preLeafNode.width; + currentNode.width = this.getColLeafNodesWidth( + currentNode, + adaptiveColWidth, + ); + layoutCoordinate(this.spreadsheet, null, currentNode); + colsHierarchy.width += currentNode.width; + preLeafNode = currentNode; + }); + } - if (currentNode.isLeaf) { - currentNode.colIndex = currentCollIndex; - currentCollIndex += 1; - currentNode.x = preLeafNode.x + preLeafNode.width; - currentNode.width = this.calculateColLeafNodesWidth( - currentNode, - adaptiveColWidth, - ); - layoutCoordinate(this.spreadsheet, null, currentNode); - colsHierarchy.width += currentNode.width; - preLeafNode = currentNode; - } + private calculateColNodesHeight(colsHierarchy: Hierarchy) { + const colNodes = colsHierarchy.getNodes(); + colNodes.forEach((currentNode) => { if (currentNode.level === 0) { currentNode.y = 0; } else { @@ -386,15 +385,34 @@ export class TableFacet extends FrozenFacet { } currentNode.height = this.getColNodeHeight(currentNode, colsHierarchy); - } + }); + } + private calculateColNodesCoordinate( + colLeafNodes: Node[], + colsHierarchy: Hierarchy, + ) { + this.calculateColLeafNodesWidth(colLeafNodes, colsHierarchy); + this.updateColsHierarchySampleMaxHeightNodes(colsHierarchy); + this.calculateColNodesHeight(colsHierarchy); + this.calculateColNodeWidthAndX(colLeafNodes); + this.calculateFrozenColNodeX(colsHierarchy); + this.updateCustomFieldsSampleNodes(colsHierarchy); + this.adjustCustomColLeafNodesHeight({ + leafNodes: colLeafNodes, + hierarchy: colsHierarchy, + }); + } + + private calculateFrozenColNodeX(colsHierarchy: Hierarchy) { const topLevelNodes = colsHierarchy.getNodes(0); const { trailingColCount = 0 } = getValidFrozenOptions( this.spreadsheet.options.frozen!, topLevelNodes.length, ); - preLeafNode = Node.blankNode(); + const colNodes = colsHierarchy.getNodes(); + let preLeafNode = Node.blankNode(); const width = this.getCanvasSize().width - @@ -403,7 +421,7 @@ export class TableFacet extends FrozenFacet { if (trailingColCount > 0) { const { trailingColCount: realFrozenTrailingColCount } = getFrozenLeafNodesCount(topLevelNodes, 0, trailingColCount); - const leafNodes = allNodes.filter((node) => node.isLeaf); + const leafNodes = colNodes.filter((node) => node.isLeaf); for (let i = 1; i <= realFrozenTrailingColCount; i++) { const currentNode = leafNodes[leafNodes.length - i]; @@ -417,20 +435,13 @@ export class TableFacet extends FrozenFacet { preLeafNode = currentNode; } } - - this.updateCustomFieldsSampleNodes(colsHierarchy); - this.adjustColLeafNodesHeight({ - leafNodes: colLeafNodes, - hierarchy: colsHierarchy, - }); - this.autoCalculateColNodeWidthAndX(colLeafNodes); } /** * Auto column no-leaf node's width and x coordinate * @param colLeafNodes */ - private autoCalculateColNodeWidthAndX(colLeafNodes: Node[]) { + private calculateColNodeWidthAndX(colLeafNodes: Node[]) { let prevColParent: Node | null = null; const leafNodes = colLeafNodes.slice(0); @@ -451,7 +462,7 @@ export class TableFacet extends FrozenFacet { } } - private calculateColLeafNodesWidth( + private getColLeafNodesWidth( colNode: Node, adaptiveColWidth: number, ): number { diff --git a/packages/s2-react/playground/config.tsx b/packages/s2-react/playground/config.tsx index f9f4c3401d..c87f7ec4ee 100644 --- a/packages/s2-react/playground/config.tsx +++ b/packages/s2-react/playground/config.tsx @@ -315,9 +315,9 @@ export const s2Options: SheetComponentOptions = { debug: true, width: 800, height: 600, - hierarchyType: 'tree', + hierarchyType: 'grid', seriesNumber: { - enable: true, + enable: false, }, transformCanvasConfig() { return { diff --git a/packages/s2-react/playground/index.tsx b/packages/s2-react/playground/index.tsx index 872b4d70c8..03da614bb0 100644 --- a/packages/s2-react/playground/index.tsx +++ b/packages/s2-react/playground/index.tsx @@ -409,7 +409,12 @@ function MainLayout() { children: ( <> Date: Thu, 9 May 2024 20:09:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?test:=20=E5=8D=95=E6=B5=8B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/__tests__/spreadsheet/custom-facet-spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/s2-core/__tests__/spreadsheet/custom-facet-spec.ts b/packages/s2-core/__tests__/spreadsheet/custom-facet-spec.ts index 9b0775bc2b..10628b6330 100644 --- a/packages/s2-core/__tests__/spreadsheet/custom-facet-spec.ts +++ b/packages/s2-core/__tests__/spreadsheet/custom-facet-spec.ts @@ -40,7 +40,7 @@ describe('SpreadSheet Custom Facet Tests', () => { test('should render custom pivot facet', async () => { // @ts-ignore class CustomPivotFacet extends PivotFacet { - calculateColLeafNodesWidth() { + getColLeafNodesWidth() { return 200; } } @@ -59,7 +59,7 @@ describe('SpreadSheet Custom Facet Tests', () => { test('should render custom table facet', async () => { // @ts-ignore class CustomTableFacet extends TableFacet { - calculateColLeafNodesWidth() { + getColLeafNodesWidth() { return 200; } } From 7e648d824017f55f5845b2195377fe1dfc1af65b Mon Sep 17 00:00:00 2001 From: lijinke666 Date: Fri, 10 May 2024 15:24:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20G=20=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88,=20=E4=BF=AE=E5=A4=8D=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/package.json | 6 +- packages/s2-react/package.json | 8 +- pnpm-lock.yaml | 284 ++++++++++++++++++--------------- 3 files changed, 161 insertions(+), 137 deletions(-) diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json index 2939104322..8535fdab4b 100644 --- a/packages/s2-core/package.json +++ b/packages/s2-core/package.json @@ -61,10 +61,10 @@ "tsc": "tsc --noEmit" }, "dependencies": { - "@antv/g-lite": "^2.0.0", + "@antv/g-lite": "^2.0.4", "@antv/event-emitter": "^0.1.3", - "@antv/g": "^6.0.2", - "@antv/g-canvas": "^2.0.0", + "@antv/g": "^6.0.5", + "@antv/g-canvas": "^2.0.4", "d3-ease": "^3.0.1", "d3-interpolate": "^1.3.2", "d3-timer": "^1.0.9", diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json index e5cea1df0d..647bcf0e15 100644 --- a/packages/s2-react/package.json +++ b/packages/s2-react/package.json @@ -73,10 +73,10 @@ "devDependencies": { "@ant-design/icons": "^5.3.7", "@antv/event-emitter": "^0.1.3", - "@antv/g": "^6.0.4", - "@antv/g-plugin-a11y": "^1.0.4", - "@antv/g-plugin-rough-canvas-renderer": "^2.0.4", - "@antv/g2": "^5.1.19", + "@antv/g": "^6.0.5", + "@antv/g-plugin-a11y": "^1.0.5", + "@antv/g-plugin-rough-canvas-renderer": "^2.0.5", + "@antv/g2": "^5.1.20", "@antv/s2": "workspace:*", "@antv/s2-shared": "workspace:*", "@testing-library/react": "^14.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d11131bcd4..2587ed9571 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -271,14 +271,14 @@ importers: specifier: ^0.1.3 version: 0.1.3 '@antv/g': - specifier: ^6.0.2 - version: 6.0.2 + specifier: ^6.0.5 + version: 6.0.5 '@antv/g-canvas': - specifier: ^2.0.0 - version: 2.0.1 + specifier: ^2.0.4 + version: 2.0.4 '@antv/g-lite': - specifier: ^2.0.0 - version: 2.0.1 + specifier: ^2.0.4 + version: 2.0.4 d3-ease: specifier: ^3.0.1 version: 3.0.1 @@ -345,17 +345,17 @@ importers: specifier: ^0.1.3 version: 0.1.3 '@antv/g': - specifier: ^6.0.4 - version: 6.0.4 + specifier: ^6.0.5 + version: 6.0.5 '@antv/g-plugin-a11y': - specifier: ^1.0.4 - version: 1.0.4 + specifier: ^1.0.5 + version: 1.0.5 '@antv/g-plugin-rough-canvas-renderer': - specifier: ^2.0.4 - version: 2.0.4 + specifier: ^2.0.5 + version: 2.0.5 '@antv/g2': - specifier: ^5.1.19 - version: 5.1.19 + specifier: ^5.1.20 + version: 5.1.20 '@antv/s2': specifier: workspace:* version: link:../s2-core @@ -841,7 +841,7 @@ packages: /@antv/component@2.0.0: resolution: {integrity: sha512-wl1pmqLIW/Zt9p7twMcAlvowHU81iV4bb5XWS38DL7gimSONHRh5C/uYKCXKB1KtHAH5d25YHESoGMBc0L3r+w==} dependencies: - '@antv/g': 6.0.4 + '@antv/g': 6.0.5 '@antv/scale': 0.4.15 '@antv/util': 3.3.7 svg-path-parser: 1.1.0 @@ -918,15 +918,6 @@ packages: /@antv/event-emitter@0.1.3: resolution: {integrity: sha512-4ddpsiHN9Pd4UIlWuKVK1C4IiZIdbwQvy9i7DUSI3xNJ89FPUFt8lxDYj8GzzfdllV0NkJTRxnG+FvLk0llidg==} - /@antv/g-camera-api@2.0.1: - resolution: {integrity: sha512-TQuX7heO9Dk1bxBvk2Byk42QlHFimpPbI8LdrKQ25RrwTca7+94lZEbWXaN7J58yi4FQQDBiWZsNkbFK5wP37g==} - dependencies: - '@antv/g-lite': 2.0.1 - '@antv/util': 3.3.7 - gl-matrix: 3.4.3 - tslib: 2.6.2 - dev: false - /@antv/g-camera-api@2.0.3: resolution: {integrity: sha512-BR2+XDaQXkdsD6DNvx+tBzErUAdfwZt4X0P/Co8TMXoFAElbdMSDhOLSU94vrJh5MF41ISMjktW1dOi5XmVocg==} dependencies: @@ -934,18 +925,14 @@ packages: '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 + dev: false - /@antv/g-canvas@2.0.1: - resolution: {integrity: sha512-I9Tc8csfvQ84tq14PbqzxuxybWoxK79m27eyOZIZH6k5QQucMyl7rk8ctjh2+YF/QYrXJeL2OMzKgkbECFxwnA==} + /@antv/g-camera-api@2.0.4: + resolution: {integrity: sha512-cYDfiluVwSbfXp6KTcBTpagVDenSloqZnWoIUv6sYkRyyf4hKZRSRE/oFyMQv6FyzdONiyowe8VU7sbmV8ePeQ==} dependencies: - '@antv/g-lite': 2.0.1 - '@antv/g-plugin-canvas-path-generator': 2.0.1 - '@antv/g-plugin-canvas-picker': 2.0.1 - '@antv/g-plugin-canvas-renderer': 2.0.1 - '@antv/g-plugin-dom-interaction': 2.0.1 - '@antv/g-plugin-html-renderer': 2.0.1 - '@antv/g-plugin-image-loader': 2.0.1 + '@antv/g-lite': 2.0.4 '@antv/util': 3.3.7 + gl-matrix: 3.4.3 tslib: 2.6.2 /@antv/g-canvas@2.0.3: @@ -960,20 +947,34 @@ packages: '@antv/g-plugin-image-loader': 2.0.3 '@antv/util': 3.3.7 tslib: 2.6.2 + dev: false - /@antv/g-dom-mutation-observer-api@2.0.1: - resolution: {integrity: sha512-Jg/nc6klNpjTfvCb1tv1a5ICJRtRRGbXb+vNA37UJvttae/p2hLPOKYbLBcuNs4mQf+AOxY2TZ/3Z3onxjM6Aw==} + /@antv/g-canvas@2.0.4: + resolution: {integrity: sha512-DA1Ru1sASV4eJIIL17+Thn6da6omPNcSZ4Lyl3ZgakRpXsXhIC6dzMT+loBgD5OUS6vqRNoRqqJI6htgGkI2ew==} dependencies: - '@antv/g-lite': 2.0.1 - dev: false + '@antv/g-lite': 2.0.4 + '@antv/g-plugin-canvas-path-generator': 2.0.4 + '@antv/g-plugin-canvas-picker': 2.0.4 + '@antv/g-plugin-canvas-renderer': 2.0.4 + '@antv/g-plugin-dom-interaction': 2.0.4 + '@antv/g-plugin-html-renderer': 2.0.4 + '@antv/g-plugin-image-loader': 2.0.4 + '@antv/util': 3.3.7 + tslib: 2.6.2 /@antv/g-dom-mutation-observer-api@2.0.3: resolution: {integrity: sha512-i+AYEE7ozpOSvS3D9t4GhGmu6HDTV1gNVa7T+XvoqVky6371xzN7YCEKNmwspTd63IDuA3ARlBBljxF20r9h4g==} dependencies: '@antv/g-lite': 2.0.3 + dev: false - /@antv/g-lite@2.0.1: - resolution: {integrity: sha512-buCkPKLWwErCySgwZVvLJow2bw9oK3Xk5VXzzOiuIqn5RAjEIyn0zSmMV6+KFiLteG9weIc/trb75rT2yVXUHw==} + /@antv/g-dom-mutation-observer-api@2.0.4: + resolution: {integrity: sha512-UuDA8jagEvjvSLfF6YdGt2YacAaz9N5XXcnaGyikfvvCcayga5J2BNB1WJwVDrMccrvvXEr7i6PmcZ7X9qXUzg==} + dependencies: + '@antv/g-lite': 2.0.4 + + /@antv/g-lite@2.0.3: + resolution: {integrity: sha512-6BWtQmdn8m6evb02eT06qWCgRTl9Xt4HEMT8sqdiuTClLqSsnsY3sGgELNBkgHgjTB2S4KonXza0ltiqwnu4Hg==} dependencies: '@antv/g-math': 3.0.0 '@antv/util': 3.3.7 @@ -983,8 +984,8 @@ packages: rbush: 3.0.1 tslib: 2.6.2 - /@antv/g-lite@2.0.3: - resolution: {integrity: sha512-6BWtQmdn8m6evb02eT06qWCgRTl9Xt4HEMT8sqdiuTClLqSsnsY3sGgELNBkgHgjTB2S4KonXza0ltiqwnu4Hg==} + /@antv/g-lite@2.0.4: + resolution: {integrity: sha512-2X8b0E5JtdoSk+ixdBp7scZ0rpkN4hbtlsQpAVn3O41O90mOAOkHQ0jD4arL66WVb0UqBo87kTBoMP1I9N+jzg==} dependencies: '@antv/g-math': 3.0.0 '@antv/util': 3.3.7 @@ -1006,14 +1007,14 @@ packages: dependencies: '@antv/g-lite': 2.0.3 tslib: 2.6.2 + dev: false - /@antv/g-plugin-canvas-path-generator@2.0.1: - resolution: {integrity: sha512-AEWkYW3j2q0dhZpY4w1zOTpl/qkkpQbGsT3XdSLXjQokx+ot4l7X3F+QYGobPoUkJbQxtiU1uiAhUAsIKLVjuQ==} + /@antv/g-plugin-a11y@1.0.5: + resolution: {integrity: sha512-994WXceCw/MJBZjRpNuyMOxgkwKVWn5QwXzhA+7+n6Fjgt1WcSoJuWelkcAKc7MUKysn0tP+ynLFdfRWS8FHdQ==} dependencies: - '@antv/g-lite': 2.0.1 - '@antv/g-math': 3.0.0 - '@antv/util': 3.3.7 + '@antv/g-lite': 2.0.4 tslib: 2.6.2 + dev: true /@antv/g-plugin-canvas-path-generator@2.0.3: resolution: {integrity: sha512-kaMtb16YT4+zKzoNqEQUjVOr6dRMgUewM+Q3HdzP1JHLTXkzpX8jCGYmcG6xoXWKsYAspgUq112X23X/zD4Z6Q==} @@ -1022,16 +1023,14 @@ packages: '@antv/g-math': 3.0.0 '@antv/util': 3.3.7 tslib: 2.6.2 + dev: false - /@antv/g-plugin-canvas-picker@2.0.1: - resolution: {integrity: sha512-0GN3Lhq3TtKY0EBk0//pQK1sBOFLd/W7ofNK4HorpP9GZyRugBHz1v8MEPrN7pCRE9jVLnLFGscLCtIuX2KEnA==} + /@antv/g-plugin-canvas-path-generator@2.0.4: + resolution: {integrity: sha512-hiGQphLKnjyRC2tioS9txoDbm6m+JcKeQCZacucoX3Sw3gW1C921OoeUHQr9XznbxPU9/+k5lBNnEHrD0ZAoWg==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-lite': 2.0.4 '@antv/g-math': 3.0.0 - '@antv/g-plugin-canvas-path-generator': 2.0.1 - '@antv/g-plugin-canvas-renderer': 2.0.1 '@antv/util': 3.3.7 - gl-matrix: 3.4.3 tslib: 2.6.2 /@antv/g-plugin-canvas-picker@2.0.3: @@ -1044,14 +1043,15 @@ packages: '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 + dev: false - /@antv/g-plugin-canvas-renderer@2.0.1: - resolution: {integrity: sha512-WcxuqAGsI25yXspLJRc6uZtstWvwDGzFFVZ2FuJLYOFFI8C6v/BJ6Ptzq81e8ocVpy8mNuEUlxzh/V4IOYeg0g==} + /@antv/g-plugin-canvas-picker@2.0.4: + resolution: {integrity: sha512-uAfN2co/peMm6TSYccPDs2obw+hw9c93sPBFhHTlHO+qBqnXRnchTWHSJosepZNLo4eRbgIO5C/KNSQZQg+nBg==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-lite': 2.0.4 '@antv/g-math': 3.0.0 - '@antv/g-plugin-canvas-path-generator': 2.0.1 - '@antv/g-plugin-image-loader': 2.0.1 + '@antv/g-plugin-canvas-path-generator': 2.0.4 + '@antv/g-plugin-canvas-renderer': 2.0.4 '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 @@ -1066,11 +1066,17 @@ packages: '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 + dev: false - /@antv/g-plugin-dom-interaction@2.0.1: - resolution: {integrity: sha512-r6LByuKIReLQs4oU5duDBS+mhnMG8uMX/4jbGpFdf5NoFSCldcRgUiYW7m3RrPBOCSRcDsbXkKUqGAgKf67gnQ==} + /@antv/g-plugin-canvas-renderer@2.0.4: + resolution: {integrity: sha512-2Hqwmmttp1HPV/VwuwaXMjvD2FPaHaVGqAQ6FJF7dLllTBJCpTZAgm8mpXfnP0USa394KILs3f5fY7K53kpfAw==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-lite': 2.0.4 + '@antv/g-math': 3.0.0 + '@antv/g-plugin-canvas-path-generator': 2.0.4 + '@antv/g-plugin-image-loader': 2.0.4 + '@antv/util': 3.3.7 + gl-matrix: 3.4.3 tslib: 2.6.2 /@antv/g-plugin-dom-interaction@2.0.3: @@ -1078,20 +1084,19 @@ packages: dependencies: '@antv/g-lite': 2.0.3 tslib: 2.6.2 + dev: false - /@antv/g-plugin-dragndrop@2.0.3: - resolution: {integrity: sha512-4qvz+MWWITezd7nXa7NfKfOf7wWVRSwph14uQ94l5bhsJNYiN/w7eSO2vWjg9CQk+C8yaUh/pOTcTC9qlnNmTA==} + /@antv/g-plugin-dom-interaction@2.0.4: + resolution: {integrity: sha512-3FE8vYj5u6NCvt1N6QCLHXBQUwCiKSopZUZFlWjVA7wadOyUwPHZv70gmRY1cbpEnkOVVfyyrQ9wNOr5A0qmSA==} dependencies: - '@antv/g-lite': 2.0.3 - '@antv/util': 3.3.7 + '@antv/g-lite': 2.0.4 tslib: 2.6.2 - /@antv/g-plugin-html-renderer@2.0.1: - resolution: {integrity: sha512-+UlRf+0aelxdr3cI5qVdsg3iTZkXR+CpEQHnMzx8Z4Uyf/67qNOJp5JFFVLXAvVqSkH/v8mWRmEcP3fEc9U6Dg==} + /@antv/g-plugin-dragndrop@2.0.3: + resolution: {integrity: sha512-4qvz+MWWITezd7nXa7NfKfOf7wWVRSwph14uQ94l5bhsJNYiN/w7eSO2vWjg9CQk+C8yaUh/pOTcTC9qlnNmTA==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-lite': 2.0.3 '@antv/util': 3.3.7 - gl-matrix: 3.4.3 tslib: 2.6.2 /@antv/g-plugin-html-renderer@2.0.3: @@ -1101,11 +1106,12 @@ packages: '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 + dev: false - /@antv/g-plugin-image-loader@2.0.1: - resolution: {integrity: sha512-5FJI7mmoPHlMGhBLJhLXGMZh1//xPvnu6CDZTp0adNRTJiMWVf/QlZSjBTrxlPLk60nmdSPS780K1mBf69fo8w==} + /@antv/g-plugin-html-renderer@2.0.4: + resolution: {integrity: sha512-KS1AT/TNOCMaNttWvfam8X5JC7LePYX5+OFp773Qpfo9tESEmZe+ooiXWhNaV8susaww3DwsW4kvETB1SBr5Rw==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-lite': 2.0.4 '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 @@ -1117,6 +1123,15 @@ packages: '@antv/util': 3.3.7 gl-matrix: 3.4.3 tslib: 2.6.2 + dev: false + + /@antv/g-plugin-image-loader@2.0.4: + resolution: {integrity: sha512-maWyUhywmpPfcV2ra+iLSNUu82UEULQrRYoRAvrT4BF6XAV1VQ+Sow/uW2OS0GAtcntnXobkxyGhMylMBzfaog==} + dependencies: + '@antv/g-lite': 2.0.4 + '@antv/util': 3.3.7 + gl-matrix: 3.4.3 + tslib: 2.6.2 /@antv/g-plugin-rough-canvas-renderer@2.0.4: resolution: {integrity: sha512-QXhrGP6mOJ4x/NuUX3MeggmX8IDkcFSs5y3MrMZdP+FjSWQ3XVA3OVOt2xLQ16RnHhwepmIPsMMPH6LHvaogKQ==} @@ -1126,14 +1141,17 @@ packages: '@antv/util': 3.3.7 roughjs: 4.6.6 tslib: 2.6.2 + dev: false - /@antv/g-web-animations-api@2.0.2: - resolution: {integrity: sha512-7zkbboSkSEGuUlpyD955KPriozbZ7dYSTPyUgkRdtmmeUrs+38wAfU1N0ZaQHT4rsTXupbsCxnXRfq03q/bEkA==} + /@antv/g-plugin-rough-canvas-renderer@2.0.5: + resolution: {integrity: sha512-0wUsC7uaOUUZtBnNb3aJkuauAX8igoxP+VpIvW1pWWg/b1FiDb38HyVTRAacjasT0VOYloHTQ0F1vixWrNCvhQ==} dependencies: - '@antv/g-lite': 2.0.1 + '@antv/g-canvas': 2.0.4 + '@antv/g-lite': 2.0.4 '@antv/util': 3.3.7 + roughjs: 4.6.6 tslib: 2.6.2 - dev: false + dev: true /@antv/g-web-animations-api@2.0.4: resolution: {integrity: sha512-fTnAvgeu3r22i0cWtb4bO/9uM1UD4XMX/YqM3E4KmA6Q6wJp1vTHunBXdct7YPnf2hVAKWkSdWWHYDbkhOQB7A==} @@ -1141,6 +1159,14 @@ packages: '@antv/g-lite': 2.0.3 '@antv/util': 3.3.7 tslib: 2.6.2 + dev: false + + /@antv/g-web-animations-api@2.0.5: + resolution: {integrity: sha512-J05EABt1kg1DxFU1eNDlkPX6HhQ1oauHVh8o5/xRqAyqmK2dGOzYJNftsaaY7vmyrRBxRALHheclDj8kaXKlhg==} + dependencies: + '@antv/g-lite': 2.0.4 + '@antv/util': 3.3.7 + tslib: 2.6.2 /@antv/g2@5.1.19: resolution: {integrity: sha512-sVzxgAm6DE65wRQpZ3O+OaRlCjESC12oT2Rle6Cifb80dC6LDjZ4aBT9O90QCYibCJj6WCTrDQSasi+7ALo7MA==} @@ -1148,8 +1174,8 @@ packages: '@antv/component': 2.0.0 '@antv/coord': 0.4.7 '@antv/event-emitter': 0.1.3 - '@antv/g': 6.0.4 - '@antv/g-canvas': 2.0.1 + '@antv/g': 6.0.5 + '@antv/g-canvas': 2.0.4 '@antv/g-plugin-dragndrop': 2.0.3 '@antv/path-util': 3.0.1 '@antv/scale': 0.4.15 @@ -1167,15 +1193,34 @@ packages: flru: 1.0.2 fmin: 0.0.2 pdfast: 0.2.0 + dev: false - /@antv/g@6.0.2: - resolution: {integrity: sha512-ZCpxUtU4JU1PIh2bDUlcnqLd8zJ2bOdx4EHYYTgUfMwu/hL2p/OYzg26A2qj91FL00JuZNEXVZdKAy5tm8jzmw==} + /@antv/g2@5.1.20: + resolution: {integrity: sha512-MKenSYtxVd68q/i/lV4pz8vpUc/yhiCIJRZclWUrGyP01RD+jaO6BVQhASdTYwz34HwQACXjt2K8tBqpYHb1Ew==} dependencies: - '@antv/g-camera-api': 2.0.1 - '@antv/g-dom-mutation-observer-api': 2.0.1 - '@antv/g-lite': 2.0.1 - '@antv/g-web-animations-api': 2.0.2 - dev: false + '@antv/component': 2.0.0 + '@antv/coord': 0.4.7 + '@antv/event-emitter': 0.1.3 + '@antv/g': 6.0.5 + '@antv/g-canvas': 2.0.4 + '@antv/g-plugin-dragndrop': 2.0.3 + '@antv/path-util': 3.0.1 + '@antv/scale': 0.4.15 + '@antv/util': 3.3.7 + d3-array: 3.2.4 + d3-dsv: 3.0.1 + d3-force: 3.0.0 + d3-format: 3.1.0 + d3-geo: 3.1.1 + d3-hierarchy: 3.1.2 + d3-path: 3.1.0 + d3-scale-chromatic: 3.1.0 + d3-shape: 3.2.0 + d3-voronoi: 1.1.4 + flru: 1.0.2 + fmin: 0.0.2 + pdfast: 0.2.0 + dev: true /@antv/g@6.0.4: resolution: {integrity: sha512-+vQVBezQiSffjDuPFTZCOJyqlA+TbZKILG77aapvquRi7ptKQV3783sOV5FjbzVbLk+F9X+DD877ha0oaEBFWQ==} @@ -1184,6 +1229,15 @@ packages: '@antv/g-dom-mutation-observer-api': 2.0.3 '@antv/g-lite': 2.0.3 '@antv/g-web-animations-api': 2.0.4 + dev: false + + /@antv/g@6.0.5: + resolution: {integrity: sha512-qj9gszJH+or/sQvf6xCxwUAqJbaqKY1ZOm7OX1csyxGqRqmjn8uhMVCBJxoknOvlhWvMtqXBWDCcTdNs7IJBIQ==} + dependencies: + '@antv/g-camera-api': 2.0.4 + '@antv/g-dom-mutation-observer-api': 2.0.4 + '@antv/g-lite': 2.0.4 + '@antv/g-web-animations-api': 2.0.5 /@antv/path-util@3.0.1: resolution: {integrity: sha512-tpvAzMpF9Qm6ik2YSMqICNU5tco5POOW7S4XoxZAI/B0L26adU+Md/SmO0BBo2SpuywKvzPH3hPT3xmoyhr04Q==} @@ -7164,7 +7218,6 @@ packages: dependencies: call-bind: 1.0.7 is-array-buffer: 3.0.4 - dev: true /array-equal@1.0.2: resolution: {integrity: sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==} @@ -7255,7 +7308,7 @@ packages: resolution: {integrity: sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-array-method-boxes-properly: 1.0.0 @@ -7273,7 +7326,7 @@ packages: /array.prototype.tosorted@1.1.2: resolution: {integrity: sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 @@ -7314,7 +7367,6 @@ packages: get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.3 - dev: true /arrify@1.0.1: resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} @@ -7437,7 +7489,6 @@ packages: engines: {node: '>= 0.4'} dependencies: possible-typed-array-names: 1.0.0 - dev: true /aws-sign2@0.7.0: resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==} @@ -9453,7 +9504,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /data-view-byte-length@1.0.1: resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} @@ -9462,7 +9512,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /data-view-byte-offset@1.0.0: resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} @@ -9471,7 +9520,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 - dev: true /datauri@3.0.0: resolution: {integrity: sha512-NeDFuUPV1YCpCn8MUIcDk1QnuyenUHs7f4Q5P0n9FFA0neKFrfEH9esR+YMW95BplbYfdmjbs0Pl/ZGAaM2QHQ==} @@ -9590,7 +9638,7 @@ packages: is-regex: 1.1.4 object-is: 1.1.5 object-keys: 1.1.1 - regexp.prototype.flags: 1.5.1 + regexp.prototype.flags: 1.5.2 /deep-equal@2.2.3: resolution: {integrity: sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==} @@ -10435,7 +10483,6 @@ packages: typed-array-length: 1.0.6 unbox-primitive: 1.0.2 which-typed-array: 1.1.15 - dev: true /es-array-method-boxes-properly@1.0.0: resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==} @@ -10506,7 +10553,6 @@ packages: engines: {node: '>= 0.4'} dependencies: es-errors: 1.3.0 - dev: true /es-set-tostringtag@2.0.2: resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} @@ -10523,7 +10569,6 @@ packages: get-intrinsic: 1.2.4 has-tostringtag: 1.0.2 hasown: 2.0.2 - dev: true /es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} @@ -12327,7 +12372,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 get-intrinsic: 1.2.4 - dev: true /get-tsconfig@4.7.2: resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} @@ -12877,7 +12921,6 @@ packages: engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 - dev: true /has-unicode@2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} @@ -12941,7 +12984,6 @@ packages: engines: {node: '>= 0.4'} dependencies: function-bind: 1.1.2 - dev: true /hast-util-embedded@2.0.1: resolution: {integrity: sha512-QUdSOP1/o+/TxXtpPFXR2mUg2P+ySrmlX7QjwHZCXqMFyYk7YmcGSvqRW+4XgXAoHifdE1t2PwFaQK33TqVjSw==} @@ -13804,7 +13846,6 @@ packages: es-errors: 1.3.0 hasown: 2.0.0 side-channel: 1.0.4 - dev: true /internmap@2.0.3: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} @@ -13844,7 +13885,7 @@ packages: resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==} engines: {node: '>= 0.10'} dependencies: - hasown: 2.0.0 + hasown: 2.0.2 /is-alphabetical@2.0.1: resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==} @@ -13875,7 +13916,6 @@ packages: dependencies: call-bind: 1.0.7 get-intrinsic: 1.2.4 - dev: true /is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} @@ -13918,7 +13958,7 @@ packages: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 has-tostringtag: 1.0.0 /is-buffer@1.1.6: @@ -13961,14 +14001,13 @@ packages: resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==} engines: {node: '>= 0.4'} dependencies: - hasown: 2.0.0 + hasown: 2.0.2 /is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} engines: {node: '>= 0.4'} dependencies: is-typed-array: 1.1.13 - dev: true /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} @@ -14030,7 +14069,7 @@ packages: functions-have-names: 1.2.3 has-bigints: 1.0.2 has-symbols: 1.0.3 - hasown: 2.0.0 + hasown: 2.0.2 is-arrow-function: 2.0.3 is-bigint: 1.0.4 is-boolean-object: 1.1.2 @@ -14071,7 +14110,7 @@ packages: /is-finalizationregistry@1.0.2: resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 /is-fullwidth-code-point@1.0.0: resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==} @@ -14173,7 +14212,6 @@ packages: /is-negative-zero@2.0.3: resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} - dev: true /is-npm@1.0.0: resolution: {integrity: sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==} @@ -14306,7 +14344,6 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 - dev: true /is-stream-ended@0.1.4: resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==} @@ -14361,7 +14398,6 @@ packages: engines: {node: '>= 0.4'} dependencies: which-typed-array: 1.1.15 - dev: true /is-typedarray@1.0.0: resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} @@ -14392,7 +14428,7 @@ packages: /is-weakset@2.0.2: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 get-intrinsic: 1.2.2 /is-what@3.14.1: @@ -17620,11 +17656,11 @@ packages: resolution: {integrity: sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.1 + define-data-property: 1.1.4 functions-have-names: 1.2.3 gopd: 1.0.1 - has-property-descriptors: 1.0.1 - hasown: 2.0.0 + has-property-descriptors: 1.0.2 + hasown: 2.0.2 isarray: 2.0.5 /modify-values@1.0.1: @@ -18189,7 +18225,7 @@ packages: engines: {node: '>= 0.8'} dependencies: array.prototype.reduce: 1.0.6 - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 safe-array-concat: 1.1.0 @@ -18198,7 +18234,7 @@ packages: resolution: {integrity: sha512-4G0QiXpoIppBUz5efmxTm/HTbVN2ioGjk/PbsaNvwISFX+saj8muGp6vNuzIdsosFxM4V/kpUVNvy/+9+DVBZQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 reflect.getprototypeof: 1.0.4 @@ -18929,7 +18965,6 @@ packages: /possible-typed-array-names@1.0.0: resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} engines: {node: '>= 0.4'} - dev: true /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.38): resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==} @@ -21924,7 +21959,6 @@ packages: define-properties: 1.2.1 es-errors: 1.3.0 set-function-name: 2.0.1 - dev: true /regexpu-core@5.3.2: resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} @@ -22667,7 +22701,6 @@ packages: get-intrinsic: 1.2.4 has-symbols: 1.0.3 isarray: 2.0.5 - dev: true /safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -22694,7 +22727,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-regex: 1.1.4 - dev: true /safe-regex@1.1.0: resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==} @@ -23631,7 +23663,6 @@ packages: define-properties: 1.2.1 es-abstract: 1.23.3 es-object-atoms: 1.0.0 - dev: true /string.prototype.trimend@1.0.7: resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} @@ -23646,7 +23677,6 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true /string.prototype.trimstart@1.0.7: resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} @@ -23662,7 +23692,6 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true /string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -24059,7 +24088,7 @@ packages: dependencies: '@ljharb/resumer': 0.0.1 '@ljharb/through': 2.3.13 - call-bind: 1.0.5 + call-bind: 1.0.7 deep-equal: 1.1.2 defined: 1.0.1 dotignore: 0.1.2 @@ -24072,7 +24101,7 @@ packages: mock-property: 1.0.3 object-inspect: 1.12.3 resolve: 1.22.8 - string.prototype.trim: 1.2.8 + string.prototype.trim: 1.2.9 /tar-fs@1.16.3: resolution: {integrity: sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==} @@ -24555,7 +24584,6 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-typed-array: 1.1.13 - dev: true /typed-array-byte-length@1.0.0: resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} @@ -24575,7 +24603,6 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true /typed-array-byte-offset@1.0.0: resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==} @@ -24597,7 +24624,6 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true /typed-array-length@1.0.4: resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} @@ -24616,7 +24642,6 @@ packages: has-proto: 1.0.3 is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - dev: true /typedarray-to-buffer@3.1.5: resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} @@ -25613,7 +25638,6 @@ packages: for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.2 - dev: true /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}