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 c4046b690a..97990ca974 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 @@ -6,7 +6,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "序号", ], @@ -17,7 +17,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "省份", ], @@ -28,7 +28,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 64, "actualTextWidth": 292, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城市", @@ -42,7 +42,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -53,7 +53,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "子类别", ], @@ -69,7 +69,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "1", ], @@ -91,7 +91,7 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "3", ], @@ -118,7 +118,7 @@ Array [ "actualText": "纸张纸张纸张纸张纸张", "actualTextHeight": 32, "actualTextWidth": 122, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "纸张纸张纸张", "纸张纸张", @@ -130,7 +130,7 @@ Array [ "actualText": "-", "actualTextHeight": 16, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -141,7 +141,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -155,7 +155,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "家具", ], @@ -166,7 +166,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "桌子", ], @@ -177,7 +177,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -191,7 +191,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "沙发", ], @@ -202,7 +202,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -216,7 +216,7 @@ Array [ "actualText": "家具家具家具家具家具家具家具家具家具家具家具家...", "actualTextHeight": 64, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "家具家具家具", "家具家具家具", @@ -230,7 +230,7 @@ Array [ "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌...", "actualTextHeight": 64, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "桌子桌子桌子", "桌子桌子桌子", @@ -244,7 +244,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -258,7 +258,7 @@ Array [ "actualText": "办公用品", "actualTextHeight": 16, "actualTextWidth": 49, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "办公用品", ], @@ -269,7 +269,7 @@ Array [ "actualText": "笔", "actualTextHeight": 16, "actualTextWidth": 13, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "笔", ], @@ -280,7 +280,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -294,7 +294,7 @@ Array [ "actualText": "纸张", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "纸张", ], @@ -305,7 +305,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -324,7 +324,7 @@ Array [ "actualText": "浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江浙江浙...", "actualTextHeight": 64, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "浙江浙江浙江", "浙江浙江浙江", @@ -338,7 +338,7 @@ Array [ "actualText": "杭州杭州杭州杭州", "actualTextHeight": 30, "actualTextWidth": 98, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "杭州杭州杭州", "杭州", @@ -405,7 +405,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江...", "actualTextHeight": 64, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江省", @@ -419,7 +419,7 @@ Array [ "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州...", "actualTextHeight": 60, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "杭州市杭州市", "杭州市杭州市", @@ -473,17 +473,6 @@ Array [ "originalText": "南充市", "width": 96, }, - Object { - "actualText": "乐山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "乐山市", - ], - "originalText": "乐山市", - "width": 96, - }, ] `; @@ -493,7 +482,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -548,18 +537,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, - "multiLineActualTexts": Array [ - "-", - ], - "originalText": "-", - "width": 96, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 30, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -603,7 +581,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -659,7 +637,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -699,22 +677,11 @@ Array [ "originalText": 1943, "width": 96, }, - Object { - "actualText": "2330", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "2330", - ], - "originalText": 2330, - "width": 96, - }, Object { "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -769,7 +736,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -809,22 +776,11 @@ Array [ "originalText": 2333, "width": 96, }, - Object { - "actualText": "2445", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "2445", - ], - "originalText": 2445, - "width": 96, - }, Object { "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -879,7 +835,7 @@ Array [ "actualText": "7789778977897789778977897789", "actualTextHeight": 45, "actualTextWidth": 189, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "77897789778", "97789778977", @@ -925,18 +881,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 30, - "multiLineActualTexts": Array [ - "-", - ], - "originalText": "-", - "width": 96, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -991,7 +936,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -1031,22 +976,11 @@ Array [ "originalText": 2457, "width": 96, }, - Object { - "actualText": "2458", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "2458", - ], - "originalText": 2458, - "width": 96, - }, Object { "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -1101,7 +1035,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -1141,17 +1075,6 @@ Array [ "originalText": 3551, "width": 96, }, - Object { - "actualText": "352", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "352", - ], - "originalText": 352, - "width": 96, - }, ] `; @@ -2234,7 +2157,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "序号", ], @@ -2245,7 +2168,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "省份", ], @@ -2256,7 +2179,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -2269,7 +2192,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -2280,7 +2203,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -2334,7 +2257,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "家具", ], @@ -2345,7 +2268,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "桌子", ], @@ -2356,7 +2279,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -2369,7 +2292,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "沙发", ], @@ -2380,7 +2303,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -2393,7 +2316,7 @@ Array [ "actualText": "家具家具家具家具家具家具家具家具家具家具...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家具", @@ -2406,7 +2329,7 @@ Array [ "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "桌子桌子桌子桌", "子桌子桌子桌子", @@ -2419,7 +2342,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -2432,7 +2355,7 @@ Array [ "actualText": "办公用品", "actualTextHeight": 16, "actualTextWidth": 49, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "办公用品", ], @@ -2443,7 +2366,7 @@ Array [ "actualText": "笔", "actualTextHeight": 16, "actualTextWidth": 13, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "笔", ], @@ -2454,7 +2377,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -2467,7 +2390,7 @@ Array [ "actualText": "纸张", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "纸张", ], @@ -2478,7 +2401,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -3212,7 +3135,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "2", ], @@ -3312,7 +3235,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江...", @@ -3385,7 +3308,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -3484,7 +3407,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -3616,7 +3539,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "2", ], @@ -3716,7 +3639,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江...", @@ -3789,7 +3712,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -3888,7 +3811,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -3948,7 +3871,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "序号", ], @@ -3959,7 +3882,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "省份", ], @@ -3970,7 +3893,7 @@ Array [ "actualText": "城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城...", @@ -3982,7 +3905,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -3993,7 +3916,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -4047,7 +3970,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "家具", ], @@ -4058,7 +3981,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "桌子", ], @@ -4069,7 +3992,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -4081,7 +4004,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "沙发", ], @@ -4092,7 +4015,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -4352,7 +4275,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "序号", ], @@ -4363,7 +4286,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "省份", ], @@ -4374,7 +4297,7 @@ Array [ "actualText": "城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城...", @@ -4386,7 +4309,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -4397,7 +4320,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -4451,7 +4374,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "家具", ], @@ -4462,7 +4385,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "桌子", ], @@ -4473,7 +4396,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -4485,7 +4408,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "沙发", ], @@ -4496,7 +4419,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -4756,7 +4679,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "序号", ], @@ -4767,7 +4690,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "省份", ], @@ -4778,7 +4701,7 @@ Array [ "actualText": "城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城...", @@ -4790,7 +4713,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -4801,7 +4724,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -4855,7 +4778,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "家具", ], @@ -4866,7 +4789,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "桌子", ], @@ -4877,7 +4800,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -4889,7 +4812,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "沙发", ], @@ -4900,7 +4823,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -5398,7 +5321,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "2", ], @@ -5491,7 +5414,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江...", "actualTextHeight": 64, "actualTextWidth": 290, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江省", @@ -5555,7 +5478,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -5610,7 +5533,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "-", ], @@ -5626,7 +5549,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "序号", ], @@ -5637,7 +5560,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "省份", ], @@ -5648,7 +5571,7 @@ Array [ "actualText": "城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城...", @@ -5660,7 +5583,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -5671,7 +5594,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -5725,7 +5648,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "家具", ], @@ -5736,7 +5659,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "桌子", ], @@ -5747,7 +5670,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -5759,7 +5682,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "沙发", ], @@ -5770,7 +5693,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -5900,17 +5823,6 @@ Array [ "originalText": 1822, "width": 96, }, - Object { - "actualText": "1943", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 35, - "multiLineActualTexts": Array [ - "1943", - ], - "originalText": 1943, - "width": 96, - }, Object { "actualText": "632", "actualTextHeight": 15, @@ -5988,17 +5900,6 @@ Array [ "originalText": 2244, "width": 96, }, - Object { - "actualText": "2333", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 35, - "multiLineActualTexts": Array [ - "2333", - ], - "originalText": 2333, - "width": 96, - }, ] `; @@ -7185,7 +7086,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "序号", ], @@ -7196,7 +7097,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "省份", ], @@ -7207,7 +7108,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城...", "actualTextHeight": 48, "actualTextWidth": 217, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城市", @@ -7220,7 +7121,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -7231,7 +7132,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -7258,7 +7159,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "2", ], @@ -7285,7 +7186,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "家具", ], @@ -7296,7 +7197,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "桌子", ], @@ -7307,7 +7208,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数...", "actualTextHeight": 45, "actualTextWidth": 217, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -7320,7 +7221,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "沙发", ], @@ -7331,7 +7232,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数...", "actualTextHeight": 45, "actualTextWidth": 217, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数量", @@ -7360,7 +7261,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江省浙江省浙江...", "actualTextHeight": 48, "actualTextWidth": 217, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江省", @@ -7434,7 +7335,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -7452,17 +7353,6 @@ Array [ "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, @@ -7511,7 +7401,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -7529,17 +7419,6 @@ Array [ "originalText": 2451, "width": 96, }, - Object { - "actualText": "2244", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "2244", - ], - "originalText": 2244, - "width": 96, - }, ] `; @@ -7549,7 +7428,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "序号", ], @@ -7560,7 +7439,7 @@ Array [ "actualText": "省份/城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 184, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "省份/城市城", "市城市城市", @@ -7573,7 +7452,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 32, "actualTextWidth": 242, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类别类别类别", "类别类别类别类别", @@ -7585,7 +7464,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -7601,7 +7480,7 @@ Array [ "actualText": "1", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 112, + "height": 128, "multiLineActualTexts": Array [ "1", ], @@ -7623,24 +7502,13 @@ Array [ "actualText": "3", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 112, + "height": 128, "multiLineActualTexts": Array [ "3", ], "originalText": "3", "width": 80, }, - Object { - "actualText": "4", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 150, - "multiLineActualTexts": Array [ - "4", - ], - "originalText": "4", - "width": 80, - }, ] `; @@ -7650,7 +7518,7 @@ Array [ "actualText": "纸张纸张纸张纸张纸张", "actualTextHeight": 32, "actualTextWidth": 122, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "纸张纸张纸张纸", "张纸张", @@ -7662,7 +7530,7 @@ Array [ "actualText": "-", "actualTextHeight": 16, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -7673,7 +7541,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7686,7 +7554,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "家具", ], @@ -7697,7 +7565,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "桌子", ], @@ -7708,7 +7576,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7721,7 +7589,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "沙发", ], @@ -7732,7 +7600,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7745,7 +7613,7 @@ Array [ "actualText": "家具家具家具家具家具家具家具家具家具家具...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家具", @@ -7758,7 +7626,7 @@ Array [ "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "桌子桌子桌子桌", "子桌子桌子桌子", @@ -7771,7 +7639,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7784,7 +7652,7 @@ Array [ "actualText": "办公用品", "actualTextHeight": 16, "actualTextWidth": 49, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "办公用品", ], @@ -7795,7 +7663,7 @@ Array [ "actualText": "笔", "actualTextHeight": 16, "actualTextWidth": 13, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "笔", ], @@ -7806,7 +7674,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7819,7 +7687,7 @@ Array [ "actualText": "纸张", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "纸张", ], @@ -7830,7 +7698,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 45, "actualTextWidth": 253, - "height": 53, + "height": 61, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -7848,7 +7716,7 @@ Array [ "actualText": "浙江浙江浙江浙江浙江浙江浙江...", "actualTextHeight": 48, "actualTextWidth": 181, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "浙江浙江浙", "江浙江浙江", @@ -7861,7 +7729,7 @@ Array [ "actualText": "杭州杭州杭州杭州", "actualTextHeight": 30, "actualTextWidth": 98, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "杭州杭州杭", "州杭州", @@ -7928,7 +7796,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江省浙江...", "actualTextHeight": 48, "actualTextWidth": 181, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "浙江省浙江", "省浙江省浙", @@ -7941,7 +7809,7 @@ Array [ "actualText": "杭州市杭州市杭州市杭州市杭州...", "actualTextHeight": 45, "actualTextWidth": 181, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "杭州市杭州", "市杭州市杭", @@ -7950,38 +7818,16 @@ 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, - }, -] -`; - -exports[`SpreadSheet Multi Line Text Tests PivotSheet should render three max text lines for tree mode 5`] = ` -Array [ +] +`; + +exports[`SpreadSheet Multi Line Text Tests PivotSheet should render three max text lines for tree mode 5`] = ` +Array [ Object { "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -7990,7 +7836,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8054,7 +7900,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8063,7 +7909,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8074,7 +7920,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 30, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8083,27 +7929,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 30, - "multiLineActualTexts": Array [ - "-", - ], - "originalText": "-", - "width": 103, - }, - Object { - "actualText": undefined, - "actualTextHeight": 0, - "actualTextWidth": 0, - "height": 56, - "multiLineActualTexts": Array [], - "originalText": undefined, - "width": 103, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8168,7 +7994,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8177,7 +8003,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8188,27 +8014,7 @@ Array [ "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, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8217,7 +8023,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8281,7 +8087,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8290,7 +8096,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8301,27 +8107,7 @@ Array [ "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, - "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8330,7 +8116,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8394,7 +8180,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8403,7 +8189,7 @@ Array [ "actualText": "7789778977897789778977897789", "actualTextHeight": 45, "actualTextWidth": 189, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "7789778977897", "7897789778977", @@ -8416,7 +8202,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 30, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8425,27 +8211,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 30, - "multiLineActualTexts": Array [ - "-", - ], - "originalText": "-", - "width": 103, - }, - Object { - "actualText": undefined, - "actualTextHeight": 0, - "actualTextWidth": 0, - "height": 56, - "multiLineActualTexts": Array [], - "originalText": undefined, - "width": 103, - }, - Object { - "actualText": "-", - "actualTextHeight": 15, - "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8509,7 +8275,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8518,7 +8284,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8529,27 +8295,7 @@ Array [ "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, - "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8558,7 +8304,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "-", ], @@ -8622,7 +8368,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 56, + "height": 64, "multiLineActualTexts": Array [], "originalText": undefined, "width": 103, @@ -8631,33 +8377,13 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 56, + "height": 64, "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, - }, ] `; @@ -8667,7 +8393,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "序号", ], @@ -8678,7 +8404,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "省份", ], @@ -8689,7 +8415,7 @@ Array [ "actualText": "城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "城市城市城市", "城市城市城...", @@ -8701,7 +8427,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -8712,7 +8438,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -8739,7 +8465,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "2", ], @@ -8766,7 +8492,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "家具", ], @@ -8777,7 +8503,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "桌子", ], @@ -8788,7 +8514,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -8800,7 +8526,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "沙发", ], @@ -8811,7 +8537,7 @@ Array [ "actualText": "数量数量数量数量数量数...", "actualTextHeight": 30, "actualTextWidth": 144, - "height": 38, + "height": 46, "multiLineActualTexts": Array [ "数量数量数量", "数量数量数...", @@ -8839,7 +8565,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江...", "actualTextHeight": 32, "actualTextWidth": 144, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "浙江省浙江省", "浙江省浙江...", @@ -8912,7 +8638,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -8952,17 +8678,6 @@ Array [ "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, @@ -9011,7 +8726,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "-", ], @@ -9051,17 +8766,6 @@ Array [ "originalText": 2333, "width": 96, }, - Object { - "actualText": "2445", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "2445", - ], - "originalText": 2445, - "width": 96, - }, ] `; @@ -9071,7 +8775,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "序号", ], @@ -9082,7 +8786,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "省份", ], @@ -9093,7 +8797,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 64, "actualTextWidth": 292, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -9107,7 +8811,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 16, "actualTextWidth": 241, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "类别类别类别类别类别类别类别类别类别类别", ], @@ -9118,7 +8822,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "子类别", ], @@ -9145,7 +8849,7 @@ Array [ "actualText": "2", "actualTextHeight": 15, "actualTextWidth": 7, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "2", ], @@ -9172,7 +8876,7 @@ Array [ "actualText": "家具", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "家具", ], @@ -9183,7 +8887,7 @@ Array [ "actualText": "桌子", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "桌子", ], @@ -9194,7 +8898,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -9208,7 +8912,7 @@ Array [ "actualText": "沙发", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "沙发", ], @@ -9219,7 +8923,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -9233,7 +8937,7 @@ Array [ "actualText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具", "actualTextHeight": 64, "actualTextWidth": 340, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "家具家具家具家", "具家具家具家具", @@ -9247,7 +8951,7 @@ Array [ "actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子", "actualTextHeight": 80, "actualTextWidth": 365, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "桌子桌子桌子桌", "子桌子桌子桌子", @@ -9262,7 +8966,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -9276,7 +8980,7 @@ Array [ "actualText": "办公用品", "actualTextHeight": 16, "actualTextWidth": 49, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "办公用品", ], @@ -9287,7 +8991,7 @@ Array [ "actualText": "笔", "actualTextHeight": 16, "actualTextWidth": 13, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "笔", ], @@ -9298,7 +9002,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -9312,7 +9016,7 @@ Array [ "actualText": "纸张", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "纸张", ], @@ -9323,7 +9027,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 60, "actualTextWidth": 268, - "height": 68, + "height": 76, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -9397,7 +9101,7 @@ Array [ "actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省", "actualTextHeight": 80, "actualTextWidth": 365, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "浙江省浙江省浙", "江省浙江省浙江", @@ -9412,7 +9116,7 @@ Array [ "actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市", "actualTextHeight": 75, "actualTextWidth": 365, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "杭州市杭州市杭", "州市杭州市杭州", @@ -9532,7 +9236,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "-", ], @@ -9631,7 +9335,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "-", ], @@ -9730,7 +9434,7 @@ Array [ "actualText": "7789778977897789778977897789", "actualTextHeight": 45, "actualTextWidth": 189, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "778977897789", "778977897789", @@ -9831,7 +9535,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "-", ], @@ -9930,7 +9634,7 @@ Array [ "actualText": "-", "actualTextHeight": 15, "actualTextWidth": 4, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "-", ], @@ -9990,7 +9694,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -10090,17 +9794,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, ] `; @@ -10110,7 +9803,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -10121,7 +9814,7 @@ Array [ "actualText": "省份省份省份省份省份省份省份省份省份省份省份省份省份省...", "actualTextHeight": 64, "actualTextWidth": 338, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "省份省份省份省", "份省份省份省份", @@ -10135,7 +9828,7 @@ Array [ "actualText": "city", "actualTextHeight": 16, "actualTextWidth": 21, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "city", ], @@ -10146,7 +9839,7 @@ Array [ "actualText": "type", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "type", ], @@ -10157,7 +9850,7 @@ Array [ "actualText": "sub_type", "actualTextHeight": 16, "actualTextWidth": 53, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "sub_type", ], @@ -10168,7 +9861,7 @@ Array [ "actualText": "number", "actualTextHeight": 16, "actualTextWidth": 45, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "number", ], @@ -10270,17 +9963,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -10372,17 +10054,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -10474,17 +10145,6 @@ Array [ "originalText": "宁波市", "width": 103.8, }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -10576,17 +10236,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -10678,17 +10327,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "沙发", - ], - "originalText": "沙发", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -10776,20 +10414,9 @@ Array [ "actualTextWidth": 27, "height": 30, "multiLineActualTexts": Array [ - "7234", - ], - "originalText": 7234, - "width": 103.8, - }, - Object { - "actualText": "834", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "834", + "7234", ], - "originalText": 834, + "originalText": 7234, "width": 103.8, }, ] @@ -10801,7 +10428,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -10901,17 +10528,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, ] `; @@ -10921,7 +10537,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -10932,7 +10548,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "省份", ], @@ -10943,7 +10559,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 64, "actualTextWidth": 292, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -10957,7 +10573,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -10970,7 +10586,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "子类别", ], @@ -10981,7 +10597,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 64, "actualTextWidth": 268, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -11086,17 +10702,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -11188,17 +10793,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -11290,17 +10884,6 @@ Array [ "originalText": "宁波市", "width": 103.8, }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -11392,17 +10975,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -11494,17 +11066,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "沙发", - ], - "originalText": "沙发", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -11597,17 +11158,6 @@ Array [ "originalText": 7234, "width": 103.8, }, - Object { - "actualText": "834", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "834", - ], - "originalText": 834, - "width": 103.8, - }, ] `; @@ -11617,7 +11167,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -11649,7 +11199,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -11660,7 +11210,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "省份", ], @@ -11671,7 +11221,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 64, "actualTextWidth": 292, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -11685,7 +11235,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -11698,7 +11248,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "子类别", ], @@ -11709,7 +11259,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 64, "actualTextWidth": 268, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -11841,7 +11391,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -11884,7 +11434,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "序号", ], @@ -11895,7 +11445,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "省份", ], @@ -11906,7 +11456,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 64, "actualTextWidth": 292, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -11920,7 +11470,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -11933,7 +11483,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "子类别", ], @@ -11944,7 +11494,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 64, "actualTextWidth": 268, - "height": 72, + "height": 80, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -12156,7 +11706,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -12364,7 +11914,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -12375,7 +11925,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -12386,7 +11936,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 48, "actualTextWidth": 291, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城市城市", "城市城市城市城市城市", @@ -12399,7 +11949,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 32, "actualTextWidth": 242, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类别类别", "类别类别类别类别类别", @@ -12411,7 +11961,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -12422,7 +11972,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 48, "actualTextWidth": 267, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数量数量", "数量数量数量数量数量", @@ -14679,7 +14229,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -14790,17 +14340,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, ] `; @@ -14810,7 +14349,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -14821,7 +14360,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -14832,7 +14371,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -14845,7 +14384,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -14858,7 +14397,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -14869,7 +14408,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -14984,17 +14523,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -15096,17 +14624,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -15208,17 +14725,6 @@ Array [ "originalText": "舟山市", "width": 103.8, }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -15320,17 +14826,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -15432,17 +14927,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -15546,17 +15030,6 @@ Array [ "originalText": 834, "width": 103.8, }, - Object { - "actualText": "945", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "945", - ], - "originalText": 945, - "width": 103.8, - }, ] `; @@ -15566,7 +15039,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -15677,17 +15150,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, ] `; @@ -15697,7 +15159,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -15708,7 +15170,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -15719,7 +15181,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -15732,7 +15194,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -15745,7 +15207,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -15756,7 +15218,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -15871,17 +15333,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -15983,17 +15434,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -16095,17 +15535,6 @@ Array [ "originalText": "舟山市", "width": 103.8, }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -16207,17 +15636,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -16319,17 +15737,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -16433,17 +15840,6 @@ Array [ "originalText": 834, "width": 103.8, }, - Object { - "actualText": "945", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "945", - ], - "originalText": 945, - "width": 103.8, - }, ] `; @@ -18868,7 +18264,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -19087,7 +18483,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -19098,7 +18494,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "省份", ], @@ -19109,7 +18505,7 @@ Array [ "actualText": "城市城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城...", @@ -19121,7 +18517,7 @@ Array [ "actualText": "类别类别类别类别类别类别类...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类...", @@ -19133,7 +18529,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -19144,7 +18540,7 @@ Array [ "actualText": "数量数量数量数量数量数量数...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数...", @@ -20363,7 +19759,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -20428,7 +19824,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -20439,7 +19835,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "省份", ], @@ -20450,7 +19846,7 @@ Array [ "actualText": "城市城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城...", @@ -20462,7 +19858,7 @@ Array [ "actualText": "类别类别类别类别类别类别类...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类...", @@ -20474,7 +19870,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -20485,7 +19881,7 @@ Array [ "actualText": "数量数量数量数量数量数量数...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数...", @@ -21736,7 +21132,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -21944,7 +21340,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -21955,7 +21351,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -21966,7 +21362,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -21979,7 +21375,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -21992,7 +21388,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -22003,7 +21399,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -23162,7 +22558,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -23262,17 +22658,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, ] `; @@ -23282,7 +22667,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -23293,7 +22678,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -23304,7 +22689,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -23317,7 +22702,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -23330,7 +22715,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -23341,7 +22726,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -23445,17 +22830,6 @@ Array [ "originalText": 8, "width": 80, }, - Object { - "actualText": "9", - "actualTextHeight": 15, - "actualTextWidth": 7, - "height": 30, - "multiLineActualTexts": Array [ - "9", - ], - "originalText": 9, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -23546,17 +22920,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -23647,17 +23010,6 @@ Array [ "originalText": "宁波市", "width": 103.8, }, - Object { - "actualText": "舟山市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "舟山市", - ], - "originalText": "舟山市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -23748,17 +23100,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "家具", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "家具", - ], - "originalText": "家具", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -23849,17 +23190,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "沙发", - "actualTextHeight": 15, - "actualTextWidth": 25, - "height": 30, - "multiLineActualTexts": Array [ - "沙发", - ], - "originalText": "沙发", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -23952,17 +23282,6 @@ Array [ "originalText": 7234, "width": 103.8, }, - Object { - "actualText": "834", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "834", - ], - "originalText": 834, - "width": 103.8, - }, ] `; @@ -23972,7 +23291,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -24037,7 +23356,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -24048,7 +23367,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -24059,7 +23378,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -24072,7 +23391,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -24085,7 +23404,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -24096,7 +23415,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -24397,7 +23716,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -24484,7 +23803,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -24495,7 +23814,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -24506,7 +23825,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -24519,7 +23838,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -24532,7 +23851,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -24543,7 +23862,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -27176,7 +26495,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -27287,17 +26606,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, ] `; @@ -27307,7 +26615,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -27318,7 +26626,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -27329,7 +26637,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城市", @@ -27342,7 +26650,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 48, "actualTextWidth": 243, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类别", @@ -27355,7 +26663,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -27366,7 +26674,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量...", "actualTextHeight": 48, "actualTextWidth": 253, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数量", @@ -27481,17 +26789,6 @@ Array [ "originalText": 9, "width": 80, }, - Object { - "actualText": "10", - "actualTextHeight": 15, - "actualTextWidth": 14, - "height": 30, - "multiLineActualTexts": Array [ - "10", - ], - "originalText": 10, - "width": 80, - }, Object { "actualText": "浙江省", "actualTextHeight": 15, @@ -27593,17 +26890,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -27705,17 +26991,6 @@ Array [ "originalText": "舟山市", "width": 103.8, }, - Object { - "actualText": "杭州市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "杭州市", - ], - "originalText": "杭州市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -27817,17 +27092,6 @@ Array [ "originalText": "家具", "width": 103.8, }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -27929,17 +27193,6 @@ Array [ "originalText": "沙发", "width": 103.8, }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -28043,17 +27296,6 @@ Array [ "originalText": 834, "width": 103.8, }, - Object { - "actualText": "945", - "actualTextHeight": 15, - "actualTextWidth": 21, - "height": 30, - "multiLineActualTexts": Array [ - "945", - ], - "originalText": 945, - "width": 103.8, - }, ] `; @@ -28063,7 +27305,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -28185,17 +27427,6 @@ Array [ "originalText": 10, "width": 80, }, - Object { - "actualText": "11", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "11", - ], - "originalText": 11, - "width": 80, - }, ] `; @@ -28205,7 +27436,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "序号", ], @@ -28216,7 +27447,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "省份", ], @@ -28227,7 +27458,7 @@ Array [ "actualText": "城市城市城市城市城市城市城...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "城市城市城市城", "市城市城市城...", @@ -28239,7 +27470,7 @@ Array [ "actualText": "类别类别类别类别类别类别类...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "类别类别类别类", "别类别类别类...", @@ -28251,7 +27482,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "子类别", ], @@ -28262,7 +27493,7 @@ Array [ "actualText": "数量数量数量数量数量数量数...", "actualTextHeight": 32, "actualTextWidth": 168, - "height": 40, + "height": 48, "multiLineActualTexts": Array [ "数量数量数量数", "量数量数量数...", @@ -28387,17 +27618,6 @@ 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, @@ -28509,17 +27729,6 @@ Array [ "originalText": "浙江省", "width": 103.8, }, - Object { - "actualText": "浙江省", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "浙江省", - ], - "originalText": "浙江省", - "width": 103.8, - }, Object { "actualText": "绍兴市", "actualTextHeight": 15, @@ -28631,17 +27840,6 @@ Array [ "originalText": "杭州市", "width": 103.8, }, - Object { - "actualText": "绍兴市", - "actualTextHeight": 15, - "actualTextWidth": 37, - "height": 30, - "multiLineActualTexts": Array [ - "绍兴市", - ], - "originalText": "绍兴市", - "width": 103.8, - }, Object { "actualText": "家具", "actualTextHeight": 15, @@ -28753,17 +27951,6 @@ Array [ "originalText": "办公用品", "width": 103.8, }, - Object { - "actualText": "办公用品", - "actualTextHeight": 15, - "actualTextWidth": 49, - "height": 30, - "multiLineActualTexts": Array [ - "办公用品", - ], - "originalText": "办公用品", - "width": 103.8, - }, Object { "actualText": "桌子", "actualTextHeight": 15, @@ -28875,17 +28062,6 @@ Array [ "originalText": "笔", "width": 103.8, }, - Object { - "actualText": "笔", - "actualTextHeight": 15, - "actualTextWidth": 13, - "height": 30, - "multiLineActualTexts": Array [ - "笔", - ], - "originalText": "笔", - "width": 103.8, - }, Object { "actualText": "236723672361111", "actualTextHeight": 30, @@ -28999,17 +28175,6 @@ Array [ "originalText": 945, "width": 103.8, }, - Object { - "actualText": "1304", - "actualTextHeight": 15, - "actualTextWidth": 27, - "height": 30, - "multiLineActualTexts": Array [ - "1304", - ], - "originalText": 1304, - "width": 103.8, - }, ] `; @@ -29019,7 +28184,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -29227,7 +28392,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "序号", ], @@ -29238,7 +28403,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "省份", ], @@ -29249,7 +28414,7 @@ Array [ "actualText": "城市城市城市城市城市城市城市城市城市城市城市城市", "actualTextHeight": 48, "actualTextWidth": 291, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "城市城市城市城市城市", "城市城市城市城市城市", @@ -29262,7 +28427,7 @@ Array [ "actualText": "类别类别类别类别类别类别类别类别类别类别", "actualTextHeight": 32, "actualTextWidth": 242, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "类别类别类别类别类别", "类别类别类别类别类别", @@ -29274,7 +28439,7 @@ Array [ "actualText": "子类别", "actualTextHeight": 16, "actualTextWidth": 37, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "子类别", ], @@ -29285,7 +28450,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 48, "actualTextWidth": 267, - "height": 56, + "height": 64, "multiLineActualTexts": Array [ "数量数量数量数量数量", "数量数量数量数量数量", @@ -30441,7 +29606,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 104, + "height": 112, "multiLineActualTexts": Array [ "序号", ], @@ -30452,7 +29617,7 @@ Array [ "actualText": undefined, "actualTextHeight": 0, "actualTextWidth": 0, - "height": 88, + "height": 96, "multiLineActualTexts": Array [], "originalText": undefined, "width": 0, @@ -30504,7 +29669,7 @@ Array [ "actualText": "序号", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 192, + "height": 208, "multiLineActualTexts": Array [ "序号", ], @@ -30515,7 +29680,7 @@ Array [ "actualText": "地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区地区", "actualTextHeight": 80, "actualTextWidth": 1205, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "地区地区地区地区地区地区地区地区地区地区地区", "地区地区地区地区地区地区地区地区地区地区地区", @@ -30530,7 +29695,7 @@ Array [ "actualText": "省份", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 104, + "height": 112, "multiLineActualTexts": Array [ "省份", ], @@ -30541,7 +29706,7 @@ Array [ "actualText": "城市", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 104, + "height": 112, "multiLineActualTexts": Array [ "城市", ], @@ -30552,7 +29717,7 @@ Array [ "actualText": "类型", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 192, + "height": 208, "multiLineActualTexts": Array [ "类型", ], @@ -30563,7 +29728,7 @@ Array [ "actualText": "金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额金额", "actualTextHeight": 32, "actualTextWidth": 482, - "height": 88, + "height": 96, "multiLineActualTexts": Array [ "金额金额金额金额金额金额金额金额金额金额金额", "金额金额金额金额金额金额金额金额金额", @@ -30575,7 +29740,7 @@ Array [ "actualText": "价格", "actualTextHeight": 16, "actualTextWidth": 25, - "height": 104, + "height": 112, "multiLineActualTexts": Array [ "价格", ], @@ -30586,7 +29751,7 @@ Array [ "actualText": "数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量数量", "actualTextHeight": 96, "actualTextWidth": 726, - "height": 104, + "height": 112, "multiLineActualTexts": Array [ "数量数量数量数量数量", "数量数量数量数量数量", diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap index 174be89aeb..a7087fa63a 100644 --- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap +++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap @@ -53,10 +53,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5286FA", "verticalBorderColorOpacity": 1, @@ -139,10 +139,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5286FA", "verticalBorderColorOpacity": 1, @@ -511,10 +511,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E1EAFE", "verticalBorderColorOpacity": 1, @@ -641,10 +641,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#0647b1", "verticalBorderColorOpacity": 1, @@ -727,10 +727,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#0647b1", "verticalBorderColorOpacity": 1, @@ -1099,10 +1099,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#1e2436", "verticalBorderColorOpacity": 1, @@ -1229,10 +1229,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -1315,10 +1315,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -1687,10 +1687,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -1817,10 +1817,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E7E9ED", "verticalBorderColorOpacity": 1, @@ -1903,10 +1903,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E7E9ED", "verticalBorderColorOpacity": 1, @@ -2275,10 +2275,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#F0F2F4", "verticalBorderColorOpacity": 1, @@ -2405,10 +2405,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -2491,10 +2491,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -2863,10 +2863,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -2993,10 +2993,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -3079,10 +3079,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -3451,10 +3451,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, 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 c9bfbbe2f6..c6b2593755 100644 --- a/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts +++ b/packages/s2-core/__tests__/spreadsheet/multi-line-text-spec.ts @@ -161,7 +161,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(false); matchCellStyleSnapshot(); - expectColHierarchyHeight(118, 80, 38); + expectColHierarchyHeight(142, 96, 46); }); test('should render three max text lines', async () => { @@ -169,7 +169,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(false); matchCellStyleSnapshot(); - expectColHierarchyHeight(165, 112, 53); + expectColHierarchyHeight(189, 128, 61); }); test('should render custom text overflow text', async () => { @@ -337,7 +337,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(false); matchCellStyleSnapshot(); - expectColHierarchyHeight(118, 80, 38); + expectColHierarchyHeight(142, 96, 46); }); test('should not adaptive adjust cell height if custom cell style more than actual text height', async () => { @@ -388,7 +388,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { updateStyle(3); await s2.render(false); - expectColHierarchyHeight(149, 96, 53); + expectColHierarchyHeight(173, 112, 61); }); test('should render correctly layout if only enable grand totals', async () => { @@ -444,8 +444,8 @@ describe('SpreadSheet Multi Line Text Tests', () => { matchCellStyleSnapshot(); // 省份 4行文本, 叶子节点 (城市) 3行文本, 省份应该和城市高度一致, 才能展示所有文本 (maxLines: 4) - expectRowHierarchyHeight(384, 0, 72); - expectColHierarchyHeight(212, 144, 68); + expectRowHierarchyHeight(400, 0, 80); + expectColHierarchyHeight(236, 160, 76); }); test('should render three max text lines for tree mode', async () => { @@ -475,7 +475,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(524); + expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(556); }); // https://github.com/antvis/S2/issues/2678 @@ -530,7 +530,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(328); + expect(s2.facet.getLayoutResult().rowsHierarchy.height).toEqual(336); }); test.each(range(1, 11))( @@ -581,7 +581,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(false); matchCellStyleSnapshot(); - expectColHierarchyHeight(40, 0, 40, 1); + expectColHierarchyHeight(48, 0, 48, 1); }); test('should render three max text lines', async () => { @@ -590,7 +590,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { matchCellStyleSnapshot(); - expectColHierarchyHeight(56, 0, 56, 1); + expectColHierarchyHeight(64, 0, 64, 1); }); test('should render custom text overflow text', async () => { @@ -690,7 +690,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expectColHierarchyHeight(72, 0, 72, 1); + expectColHierarchyHeight(80, 0, 80, 1); }); // https://github.com/antvis/S2/issues/2594 @@ -974,7 +974,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expect(s2.facet.getLayoutResult().colsHierarchy.height).toEqual(56); + expect(s2.facet.getLayoutResult().colsHierarchy.height).toEqual(64); }); // https://github.com/antvis/S2/issues/2955 @@ -997,7 +997,7 @@ describe('SpreadSheet Multi Line Text Tests', () => { await s2.render(); matchCellStyleSnapshot(); - expect(s2.facet.getLayoutResult().colsHierarchy.height).toEqual(192); + expect(s2.facet.getLayoutResult().colsHierarchy.height).toEqual(208); }); test.each(range(1, 11))( diff --git a/packages/s2-core/src/common/constant/theme.ts b/packages/s2-core/src/common/constant/theme.ts index 7d3fc453ac..12d307d31d 100644 --- a/packages/s2-core/src/common/constant/theme.ts +++ b/packages/s2-core/src/common/constant/theme.ts @@ -5,7 +5,6 @@ import { paletteGray } from '../../theme/palette/gray'; import type { ThemeName } from '../interface'; import { S2_PREFIX_CLS } from './classnames'; -// Map of the theme export const PALETTE_MAP = { default: paletteDefault, colorful: paletteColorful, @@ -39,3 +38,5 @@ export const G2_THEME_TYPE: Record = { gray: 'light', dark: 'dark', }; + +export const CELL_PADDING = 8; diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts index 9200a80142..abddc61349 100644 --- a/packages/s2-core/src/facet/base-facet.ts +++ b/packages/s2-core/src/facet/base-facet.ts @@ -456,6 +456,7 @@ export abstract class BaseFacet { const { padding } = cell.getStyle().cell; const textHeight = cell.getActualTextHeight(); const adaptiveHeight = textHeight + padding.top + padding.bottom; + const height = cell.isMultiLineText() && textHeight >= defaultHeight ? adaptiveHeight diff --git a/packages/s2-core/src/theme/index.ts b/packages/s2-core/src/theme/index.ts index f37b09cb87..a76f7f0d00 100644 --- a/packages/s2-core/src/theme/index.ts +++ b/packages/s2-core/src/theme/index.ts @@ -1,6 +1,15 @@ /* eslint-disable max-lines-per-function */ -import { FONT_FAMILY, INTERVAL_BAR_HEIGHT } from '../common/constant'; -import type { DefaultCellTheme, S2Theme, ThemeCfg } from '../common/interface'; +import { + CELL_PADDING, + FONT_FAMILY, + INTERVAL_BAR_HEIGHT, +} from '../common/constant'; +import type { + DefaultCellTheme, + Padding, + S2Theme, + ThemeCfg, +} from '../common/interface'; import type { SpreadSheet } from '../sheet-type'; import { isMobile, isWindows } from '../utils/is-mobile'; import { getPalette } from '../utils/theme'; @@ -20,6 +29,12 @@ export const getTheme = ( const isTable = themeCfg?.spreadsheet?.isTableMode(); const boldTextDefaultFontWeight = isWindows() ? 'bold' : 700; + const cellPadding: Padding = { + top: CELL_PADDING, + right: CELL_PADDING, + bottom: CELL_PADDING, + left: CELL_PADDING, + }; const getDataCell = (): DefaultCellTheme => ({ bolderText: { @@ -56,12 +71,7 @@ export const getTheme = ( horizontalBorderWidth: 1, verticalBorderWidth: 1, // -------------- layout ----------------- - padding: { - top: 8, - right: 8, - bottom: 8, - left: 8, - }, + padding: cellPadding, /* ---------- interaction state ----------- */ interactionState: { @@ -209,12 +219,7 @@ export const getTheme = ( // -------------- border dash ----------------- borderDash: [], // -------------- layout ----------------- - padding: { - top: 4, - right: 8, - bottom: 4, - left: 8, - }, + padding: cellPadding, /* ---------- interaction state ----------- */ interactionState: { @@ -318,12 +323,7 @@ export const getTheme = ( // -------------- border dash ----------------- borderDash: [], // -------------- layout ----------------- - padding: { - top: 4, - right: 8, - bottom: 4, - left: 8, - }, + padding: cellPadding, /* ---------- interaction state ----------- */ interactionState: { @@ -418,12 +418,7 @@ export const getTheme = ( // -------------- border dash ----------------- borderDash: [], // -------------- layout ----------------- - padding: { - top: 4, - right: 8, - bottom: 4, - left: 8, - }, + padding: cellPadding, /* ---------- interaction state ----------- */ interactionState: { diff --git a/packages/s2-react-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap b/packages/s2-react-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap index fa7af33389..f4aa62d4b6 100644 --- a/packages/s2-react-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap +++ b/packages/s2-react-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap @@ -53,10 +53,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -139,10 +139,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -511,10 +511,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -641,10 +641,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -727,10 +727,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -1099,10 +1099,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -1229,10 +1229,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#52A87D", "verticalBorderColorOpacity": 1, @@ -1315,10 +1315,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#52A87D", "verticalBorderColorOpacity": 1, @@ -1687,10 +1687,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0F0E8", "verticalBorderColorOpacity": 1, @@ -1817,10 +1817,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -1903,10 +1903,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#CCDBFC", "verticalBorderColorOpacity": 1, @@ -2275,10 +2275,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -2405,10 +2405,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -2491,10 +2491,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -2863,10 +2863,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, @@ -2993,10 +2993,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#B6C0D7", "verticalBorderColorOpacity": 1, @@ -3079,10 +3079,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#B6C0D7", "verticalBorderColorOpacity": 1, @@ -3451,10 +3451,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#B6C0D7", "verticalBorderColorOpacity": 1, @@ -3581,10 +3581,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -3667,10 +3667,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#5184F6", "verticalBorderColorOpacity": 1, @@ -4040,10 +4040,10 @@ Object { }, }, "padding": Object { - "bottom": 4, + "bottom": 8, "left": 8, "right": 8, - "top": 4, + "top": 8, }, "verticalBorderColor": "#E0E9FD", "verticalBorderColorOpacity": 1, diff --git a/s2-site/docs/manual/migration-v2.zh.md b/s2-site/docs/manual/migration-v2.zh.md index 398ad7f7d2..d566aa5944 100644 --- a/s2-site/docs/manual/migration-v2.zh.md +++ b/s2-site/docs/manual/migration-v2.zh.md @@ -957,6 +957,19 @@ splitLine: { } ``` +#### 单元格默认 padding 变更 + +`paddingTop` 和 `paddingBottom` 调整为 `8px` + +```diff +{ +- top: 4, ++ top: 8, +- bottom: 4, ++ bottom: 8 +} +``` + ### 组件层 @antv/s2-react #### 支持 React 18 和 Ant Design 5.0