@corbe30/fortune-excel 1.0.3 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vscode/settings.json +3 -0
- package/README.md +24 -24
- package/dist/HandleZip.js +90 -34
- package/dist/ImportHelper.d.ts +2 -0
- package/dist/ImportHelper.js +51 -0
- package/dist/ToExcel/ExcelBorder.js +141 -141
- package/dist/ToExcel/ExcelConvert.js +19 -8
- package/dist/ToExcel/ExcelFile.js +66 -22
- package/dist/ToExcel/ExcelImage.js +27 -17
- package/dist/ToExcel/ExcelStyle.js +7 -7
- package/dist/ToFortuneSheet/FortuneBase.js +84 -28
- package/dist/ToFortuneSheet/FortuneCell.js +205 -185
- package/dist/ToFortuneSheet/FortuneFile.js +117 -111
- package/dist/ToFortuneSheet/FortuneImage.js +35 -15
- package/dist/ToFortuneSheet/FortuneSheet.js +217 -191
- package/dist/ToFortuneSheet/ReadXml.js +114 -87
- package/dist/ToolbarItem.d.ts +12 -0
- package/dist/ToolbarItem.js +67 -0
- package/dist/Transform.d.ts +2 -0
- package/dist/Transform.js +78 -0
- package/dist/common/constant.js +24 -24
- package/dist/common/emf.js +5 -5
- package/dist/common/method.js +169 -162
- package/dist/icons/ExportIcon.d.ts +3 -0
- package/dist/icons/ExportIcon.js +7 -0
- package/dist/icons/ImportIcon.d.ts +3 -0
- package/dist/icons/ImportIcon.js +7 -0
- package/dist/main.d.ts +2 -2
- package/dist/main.js +2 -24
- package/package.json +2 -2
- package/storybook-static/assets/Color-6VNJS4EI-0c01ecf9.js +1 -0
- package/storybook-static/assets/DocsRenderer-NNNQARDV-8c85b0e9.js +364 -0
- package/storybook-static/assets/Page.stories-2589ebf6.css +1 -0
- package/storybook-static/assets/Page.stories-a573643a.js +1948 -0
- package/storybook-static/assets/WithTooltip-V3YHNWJZ-a3f0d923.js +1 -0
- package/storybook-static/assets/_commonjs-dynamic-modules-302442b1.js +1 -0
- package/storybook-static/assets/_commonjsHelpers-de833af9.js +1 -0
- package/storybook-static/assets/_getPrototype-1e53b583.js +3 -0
- package/storybook-static/assets/entry-preview-b21759a2.js +1 -0
- package/storybook-static/assets/entry-preview-docs-d14f77b2.js +54 -0
- package/storybook-static/assets/formatter-SWP5E3XI-02b41ceb.js +156 -0
- package/storybook-static/assets/iframe-b3040d49.js +1 -0
- package/storybook-static/assets/index-1b441bc2.js +1 -0
- package/storybook-static/assets/index-356e4a49.js +6 -0
- package/storybook-static/assets/index-8b3efc3f.js +9 -0
- package/storybook-static/assets/index-9322cee5.js +1 -0
- package/storybook-static/assets/preview-0ef86afd.js +7 -0
- package/storybook-static/assets/preview-1970e752.js +1 -0
- package/storybook-static/assets/preview-2d30111f.js +27 -0
- package/storybook-static/assets/preview-2ff2accb.js +1 -0
- package/storybook-static/assets/preview-30b54f76.js +20 -0
- package/storybook-static/assets/preview-ba2273f4.js +1 -0
- package/storybook-static/assets/preview-c56bf6ac.js +1 -0
- package/storybook-static/assets/preview-d01b88e8.js +17 -0
- package/storybook-static/assets/preview-da31036b.js +396 -0
- package/storybook-static/assets/react-18-0a210e0b.js +24 -0
- package/storybook-static/assets/syntaxhighlighter-MJWPISIS-6799d638.js +1 -0
- package/storybook-static/favicon.svg +7 -0
- package/storybook-static/iframe.html +460 -0
- package/storybook-static/index.html +127 -0
- package/storybook-static/index.json +1 -0
- package/storybook-static/project.json +1 -0
- package/storybook-static/sb-addons/essentials-actions-2/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/essentials-actions-2/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/essentials-backgrounds-3/manager-bundle.js +12 -0
- package/storybook-static/sb-addons/essentials-backgrounds-3/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/essentials-controls-1/manager-bundle.js +63 -0
- package/storybook-static/sb-addons/essentials-controls-1/manager-bundle.js.LEGAL.txt +18 -0
- package/storybook-static/sb-addons/essentials-measure-6/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/essentials-measure-6/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/essentials-outline-7/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/essentials-outline-7/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/essentials-toolbars-5/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/essentials-toolbars-5/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/essentials-viewport-4/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/essentials-viewport-4/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/interactions-8/manager-bundle.js +12 -0
- package/storybook-static/sb-addons/interactions-8/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-addons/links-0/manager-bundle.js +3 -0
- package/storybook-static/sb-addons/links-0/manager-bundle.js.LEGAL.txt +0 -0
- package/storybook-static/sb-common-assets/fonts.css +31 -0
- package/storybook-static/sb-common-assets/nunito-sans-bold-italic.woff2 +0 -0
- package/storybook-static/sb-common-assets/nunito-sans-bold.woff2 +0 -0
- package/storybook-static/sb-common-assets/nunito-sans-italic.woff2 +0 -0
- package/storybook-static/sb-common-assets/nunito-sans-regular.woff2 +0 -0
- package/storybook-static/sb-manager/WithTooltip-V3YHNWJZ-MXTFSDU5.js +1 -0
- package/storybook-static/sb-manager/chunk-5QAFKPS7.js +7 -0
- package/storybook-static/sb-manager/chunk-7PRFHFSS.js +9 -0
- package/storybook-static/sb-manager/chunk-XE6LDGTE.js +406 -0
- package/storybook-static/sb-manager/chunk-YDUB7CS6.js +348 -0
- package/storybook-static/sb-manager/chunk-ZEU7PDD3.js +1 -0
- package/storybook-static/sb-manager/formatter-SWP5E3XI-7BGIK6BL.js +156 -0
- package/storybook-static/sb-manager/globals-module-info.js +1 -0
- package/storybook-static/sb-manager/globals.js +1 -0
- package/storybook-static/sb-manager/index.js +1 -0
- package/storybook-static/sb-manager/runtime.js +1 -0
- package/storybook-static/sb-manager/syntaxhighlighter-MJWPISIS-JOSCT6CQ.js +1 -0
- package/storybook-static/sb-preview/globals.js +1 -0
- package/storybook-static/sb-preview/runtime.js +112 -0
- package/storybook-static/stories.json +1 -0
- package/tsconfig.json +4 -3
- package/.github/workflows/main.yml +0 -30
|
@@ -2,7 +2,7 @@ import { getObjType, rgb2hex } from "../common/method.js";
|
|
|
2
2
|
var setBorder = function (lucksheetfile, worksheet) {
|
|
3
3
|
if (!lucksheetfile)
|
|
4
4
|
return;
|
|
5
|
-
|
|
5
|
+
var luckyToExcel = {
|
|
6
6
|
style: {
|
|
7
7
|
0: "none",
|
|
8
8
|
1: "thin",
|
|
@@ -21,35 +21,35 @@ var setBorder = function (lucksheetfile, worksheet) {
|
|
|
21
21
|
},
|
|
22
22
|
};
|
|
23
23
|
//获取所有的单元格边框的信息
|
|
24
|
-
|
|
25
|
-
for (
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
var borderInfoCompute = getBorderInfo(lucksheetfile);
|
|
25
|
+
for (var x in borderInfoCompute) {
|
|
26
|
+
var border = {};
|
|
27
|
+
var info = borderInfoCompute[x];
|
|
28
|
+
var row = parseInt(x.substr(0, x.indexOf("_")));
|
|
29
|
+
var column = parseInt(x.substr(x.indexOf("_") + 1));
|
|
30
30
|
if (info.t != undefined) {
|
|
31
|
-
|
|
31
|
+
var tcolor = info.t.color.indexOf("rgb") > -1 ? rgb2hex(info.t.color) : info.t.color;
|
|
32
32
|
border["top"] = {
|
|
33
33
|
style: luckyToExcel.style[info.t.style],
|
|
34
34
|
color: { argb: tcolor.replace("#", "") },
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
if (info.r != undefined) {
|
|
38
|
-
|
|
38
|
+
var rcolor = info.r.color.indexOf("rgb") > -1 ? rgb2hex(info.r.color) : info.r.color;
|
|
39
39
|
border["right"] = {
|
|
40
40
|
style: luckyToExcel.style[info.r.style],
|
|
41
41
|
color: { argb: rcolor.replace("#", "") },
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
if (info.b != undefined) {
|
|
45
|
-
|
|
45
|
+
var bcolor = info.b.color.indexOf("rgb") > -1 ? rgb2hex(info.b.color) : info.b.color;
|
|
46
46
|
border["bottom"] = {
|
|
47
47
|
style: luckyToExcel.style[info.b.style],
|
|
48
48
|
color: { argb: bcolor.replace("#", "") },
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
if (info.l != undefined) {
|
|
52
|
-
|
|
52
|
+
var lcolor = info.l.color.indexOf("rgb") > -1 ? rgb2hex(info.l.color) : info.l.color;
|
|
53
53
|
border["left"] = {
|
|
54
54
|
style: luckyToExcel.style[info.l.style],
|
|
55
55
|
color: { argb: lcolor.replace("#", "") },
|
|
@@ -60,25 +60,25 @@ var setBorder = function (lucksheetfile, worksheet) {
|
|
|
60
60
|
};
|
|
61
61
|
var getBorderInfo = function (luckysheetfile) {
|
|
62
62
|
var _a, _b, _c, _d;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
var borderInfoCompute = {};
|
|
64
|
+
var cfg = luckysheetfile.config;
|
|
65
|
+
var data = luckysheetfile.data;
|
|
66
66
|
if (!cfg || !data)
|
|
67
67
|
return {};
|
|
68
|
-
|
|
68
|
+
var borderInfo = cfg["borderInfo"];
|
|
69
69
|
//设置需要计算边框的区域
|
|
70
|
-
|
|
70
|
+
var dataset_row_st = 0, dataset_row_ed = data.length, dataset_col_st = 0, dataset_col_ed = data[0].length;
|
|
71
71
|
if (borderInfo != null && borderInfo.length > 0) {
|
|
72
|
-
for (
|
|
73
|
-
|
|
72
|
+
for (var i = 0; i < borderInfo.length; i++) {
|
|
73
|
+
var rangeType = borderInfo[i].rangeType;
|
|
74
74
|
if (rangeType == "range") {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
for (
|
|
80
|
-
|
|
81
|
-
|
|
75
|
+
var borderType = borderInfo[i].borderType;
|
|
76
|
+
var borderColor = borderInfo[i].color;
|
|
77
|
+
var borderStyle = borderInfo[i].style;
|
|
78
|
+
var borderRange = borderInfo[i].range;
|
|
79
|
+
for (var j = 0; j < borderRange.length; j++) {
|
|
80
|
+
var bd_r1 = borderRange[j].row[0], bd_r2 = borderRange[j].row[1];
|
|
81
|
+
var bd_c1 = borderRange[j].column[0], bd_c2 = borderRange[j].column[1];
|
|
82
82
|
if (bd_r1 < dataset_row_st) {
|
|
83
83
|
bd_r1 = dataset_row_st;
|
|
84
84
|
}
|
|
@@ -92,7 +92,7 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
92
92
|
bd_c2 = dataset_col_ed;
|
|
93
93
|
}
|
|
94
94
|
if (borderType == "border-left") {
|
|
95
|
-
for (
|
|
95
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
96
96
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
97
97
|
continue;
|
|
98
98
|
}
|
|
@@ -103,14 +103,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
103
103
|
color: borderColor,
|
|
104
104
|
style: borderStyle,
|
|
105
105
|
};
|
|
106
|
-
|
|
106
|
+
var bd_c_left = bd_c1 - 1;
|
|
107
107
|
if (bd_c_left >= 0 && borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
108
108
|
if (data[bd_r] != null &&
|
|
109
109
|
getObjType(data[bd_r][bd_c_left]) == "object" &&
|
|
110
110
|
data[bd_r][bd_c_left].mc != null) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
if (
|
|
111
|
+
var cell_left = data[bd_r][bd_c_left];
|
|
112
|
+
var mc_1 = cfg["merge"][((_a = cell_left === null || cell_left === void 0 ? void 0 : cell_left.mc) === null || _a === void 0 ? void 0 : _a.r) + "_" + ((_b = cell_left === null || cell_left === void 0 ? void 0 : cell_left.mc) === null || _b === void 0 ? void 0 : _b.c)];
|
|
113
|
+
if (mc_1.c + mc_1.cs - 1 == bd_c_left) {
|
|
114
114
|
borderInfoCompute[bd_r + "_" + bd_c_left].r = {
|
|
115
115
|
color: borderColor,
|
|
116
116
|
style: borderStyle,
|
|
@@ -124,9 +124,9 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
124
124
|
};
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
|
|
128
|
-
for (
|
|
129
|
-
|
|
127
|
+
var mc = cfg["merge"] || {};
|
|
128
|
+
for (var key in mc) {
|
|
129
|
+
var _e = mc[key], c = _e.c, r = _e.r, cs = _e.cs, rs = _e.rs;
|
|
130
130
|
if (bd_c1 <= c + cs - 1 &&
|
|
131
131
|
bd_c1 > c &&
|
|
132
132
|
bd_r >= r &&
|
|
@@ -137,7 +137,7 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
else if (borderType == "border-right") {
|
|
140
|
-
for (
|
|
140
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
141
141
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
142
142
|
continue;
|
|
143
143
|
}
|
|
@@ -148,15 +148,15 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
148
148
|
color: borderColor,
|
|
149
149
|
style: borderStyle,
|
|
150
150
|
};
|
|
151
|
-
|
|
151
|
+
var bd_c_right = bd_c2 + 1;
|
|
152
152
|
if (bd_c_right < data[0].length &&
|
|
153
153
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
154
154
|
if (data[bd_r] != null &&
|
|
155
155
|
getObjType(data[bd_r][bd_c_right]) == "object" &&
|
|
156
156
|
data[bd_r][bd_c_right].mc != null) {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
if (
|
|
157
|
+
var cell_right = data[bd_r][bd_c_right];
|
|
158
|
+
var mc_2 = cfg["merge"][cell_right.mc.r + "_" + cell_right.mc.c];
|
|
159
|
+
if (mc_2.c == bd_c_right) {
|
|
160
160
|
borderInfoCompute[bd_r + "_" + bd_c_right].l = {
|
|
161
161
|
color: borderColor,
|
|
162
162
|
style: borderStyle,
|
|
@@ -170,9 +170,9 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
170
170
|
};
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
|
-
|
|
174
|
-
for (
|
|
175
|
-
|
|
173
|
+
var mc = cfg["merge"] || {};
|
|
174
|
+
for (var key in mc) {
|
|
175
|
+
var _f = mc[key], c = _f.c, r = _f.r, cs = _f.cs, rs = _f.rs;
|
|
176
176
|
if (bd_c2 < c + cs - 1 &&
|
|
177
177
|
bd_c2 >= c &&
|
|
178
178
|
bd_r >= r &&
|
|
@@ -186,7 +186,7 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
186
186
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r1] != null) {
|
|
187
187
|
continue;
|
|
188
188
|
}
|
|
189
|
-
for (
|
|
189
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
190
190
|
if (borderInfoCompute[bd_r1 + "_" + bd_c] == null) {
|
|
191
191
|
borderInfoCompute[bd_r1 + "_" + bd_c] = {};
|
|
192
192
|
}
|
|
@@ -194,14 +194,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
194
194
|
color: borderColor,
|
|
195
195
|
style: borderStyle,
|
|
196
196
|
};
|
|
197
|
-
|
|
197
|
+
var bd_r_top = bd_r1 - 1;
|
|
198
198
|
if (bd_r_top >= 0 && borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
199
199
|
if (data[bd_r_top] != null &&
|
|
200
200
|
getObjType(data[bd_r_top][bd_c]) == "object" &&
|
|
201
201
|
data[bd_r_top][bd_c].mc != null) {
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
if (
|
|
202
|
+
var cell_top = data[bd_r_top][bd_c];
|
|
203
|
+
var mc_3 = cfg["merge"][cell_top.mc.r + "_" + cell_top.mc.c];
|
|
204
|
+
if (mc_3.r + mc_3.rs - 1 == bd_r_top) {
|
|
205
205
|
borderInfoCompute[bd_r_top + "_" + bd_c].b = {
|
|
206
206
|
color: borderColor,
|
|
207
207
|
style: borderStyle,
|
|
@@ -215,9 +215,9 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
215
215
|
};
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
|
-
|
|
219
|
-
for (
|
|
220
|
-
|
|
218
|
+
var mc = cfg["merge"] || {};
|
|
219
|
+
for (var key in mc) {
|
|
220
|
+
var _g = mc[key], c = _g.c, r = _g.r, cs = _g.cs, rs = _g.rs;
|
|
221
221
|
if (bd_r1 <= r + rs - 1 &&
|
|
222
222
|
bd_r1 > r &&
|
|
223
223
|
bd_c >= c &&
|
|
@@ -231,7 +231,7 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
231
231
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r2] != null) {
|
|
232
232
|
continue;
|
|
233
233
|
}
|
|
234
|
-
for (
|
|
234
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
235
235
|
if (borderInfoCompute[bd_r2 + "_" + bd_c] == null) {
|
|
236
236
|
borderInfoCompute[bd_r2 + "_" + bd_c] = {};
|
|
237
237
|
}
|
|
@@ -239,15 +239,15 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
239
239
|
color: borderColor,
|
|
240
240
|
style: borderStyle,
|
|
241
241
|
};
|
|
242
|
-
|
|
242
|
+
var bd_r_bottom = bd_r2 + 1;
|
|
243
243
|
if (bd_r_bottom < data.length &&
|
|
244
244
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
245
245
|
if (data[bd_r_bottom] != null &&
|
|
246
246
|
getObjType(data[bd_r_bottom][bd_c]) == "object" &&
|
|
247
247
|
data[bd_r_bottom][bd_c].mc != null) {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
if (
|
|
248
|
+
var cell_bottom = data[bd_r_bottom][bd_c];
|
|
249
|
+
var mc_4 = cfg["merge"][cell_bottom.mc.r + "_" + cell_bottom.mc.c];
|
|
250
|
+
if (mc_4.r == bd_r_bottom) {
|
|
251
251
|
borderInfoCompute[bd_r_bottom + "_" + bd_c].t = {
|
|
252
252
|
color: borderColor,
|
|
253
253
|
style: borderStyle,
|
|
@@ -261,9 +261,9 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
261
261
|
};
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
|
-
|
|
265
|
-
for (
|
|
266
|
-
|
|
264
|
+
var mc = cfg["merge"] || {};
|
|
265
|
+
for (var key in mc) {
|
|
266
|
+
var _h = mc[key], c = _h.c, r = _h.r, cs = _h.cs, rs = _h.rs;
|
|
267
267
|
if (bd_r2 < r + rs - 1 &&
|
|
268
268
|
bd_r2 >= r &&
|
|
269
269
|
bd_c >= c &&
|
|
@@ -274,16 +274,16 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
274
274
|
}
|
|
275
275
|
}
|
|
276
276
|
else if (borderType == "border-all") {
|
|
277
|
-
for (
|
|
277
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
278
278
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
279
279
|
continue;
|
|
280
280
|
}
|
|
281
|
-
for (
|
|
281
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
282
282
|
if (data[bd_r] != null &&
|
|
283
283
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
284
284
|
data[bd_r][bd_c].mc != null) {
|
|
285
|
-
|
|
286
|
-
|
|
285
|
+
var cell = data[bd_r][bd_c];
|
|
286
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
287
287
|
if (mc == undefined || mc == null) {
|
|
288
288
|
continue;
|
|
289
289
|
}
|
|
@@ -346,14 +346,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
346
346
|
};
|
|
347
347
|
}
|
|
348
348
|
if (bd_r == bd_r1) {
|
|
349
|
-
|
|
349
|
+
var bd_r_top = bd_r1 - 1;
|
|
350
350
|
if (bd_r_top >= 0 &&
|
|
351
351
|
borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
352
352
|
if (data[bd_r_top] != null &&
|
|
353
353
|
getObjType(data[bd_r_top][bd_c]) == "object" &&
|
|
354
354
|
data[bd_r_top][bd_c].mc != null) {
|
|
355
|
-
|
|
356
|
-
|
|
355
|
+
var cell_top = data[bd_r_top][bd_c];
|
|
356
|
+
var mc = cfg["merge"][cell_top.mc.r + "_" + cell_top.mc.c];
|
|
357
357
|
if (mc.r + mc.rs - 1 == bd_r_top) {
|
|
358
358
|
borderInfoCompute[bd_r_top + "_" + bd_c].b = {
|
|
359
359
|
color: borderColor,
|
|
@@ -370,14 +370,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
370
370
|
}
|
|
371
371
|
}
|
|
372
372
|
if (bd_r == bd_r2) {
|
|
373
|
-
|
|
373
|
+
var bd_r_bottom = bd_r2 + 1;
|
|
374
374
|
if (bd_r_bottom < data.length &&
|
|
375
375
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
376
376
|
if (data[bd_r_bottom] != null &&
|
|
377
377
|
getObjType(data[bd_r_bottom][bd_c]) == "object" &&
|
|
378
378
|
data[bd_r_bottom][bd_c].mc != null) {
|
|
379
|
-
|
|
380
|
-
|
|
379
|
+
var cell_bottom = data[bd_r_bottom][bd_c];
|
|
380
|
+
var mc = cfg["merge"][cell_bottom.mc.r + "_" + cell_bottom.mc.c];
|
|
381
381
|
if (mc.r == bd_r_bottom) {
|
|
382
382
|
borderInfoCompute[bd_r_bottom + "_" + bd_c].t = {
|
|
383
383
|
color: borderColor,
|
|
@@ -394,14 +394,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
394
394
|
}
|
|
395
395
|
}
|
|
396
396
|
if (bd_c == bd_c1) {
|
|
397
|
-
|
|
397
|
+
var bd_c_left = bd_c1 - 1;
|
|
398
398
|
if (bd_c_left >= 0 &&
|
|
399
399
|
borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
400
400
|
if (data[bd_r] != null &&
|
|
401
401
|
getObjType(data[bd_r][bd_c_left]) == "object" &&
|
|
402
402
|
data[bd_r][bd_c_left].mc != null) {
|
|
403
|
-
|
|
404
|
-
|
|
403
|
+
var cell_left = data[bd_r][bd_c_left];
|
|
404
|
+
var mc = cfg["merge"][cell_left.mc.r + "_" + cell_left.mc.c];
|
|
405
405
|
if (mc.c + mc.cs - 1 == bd_c_left) {
|
|
406
406
|
borderInfoCompute[bd_r + "_" + bd_c_left].r = {
|
|
407
407
|
color: borderColor,
|
|
@@ -418,14 +418,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
418
418
|
}
|
|
419
419
|
}
|
|
420
420
|
if (bd_c == bd_c2) {
|
|
421
|
-
|
|
421
|
+
var bd_c_right = bd_c2 + 1;
|
|
422
422
|
if (bd_c_right < data[0].length &&
|
|
423
423
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
424
424
|
if (data[bd_r] != null &&
|
|
425
425
|
getObjType(data[bd_r][bd_c_right]) == "object" &&
|
|
426
426
|
data[bd_r][bd_c_right].mc != null) {
|
|
427
|
-
|
|
428
|
-
|
|
427
|
+
var cell_right = data[bd_r][bd_c_right];
|
|
428
|
+
var mc = cfg["merge"][cell_right.mc.r + "_" + cell_right.mc.c];
|
|
429
429
|
if (mc.c == bd_c_right) {
|
|
430
430
|
borderInfoCompute[bd_r + "_" + bd_c_right].l = {
|
|
431
431
|
color: borderColor,
|
|
@@ -445,11 +445,11 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
445
445
|
}
|
|
446
446
|
}
|
|
447
447
|
else if (borderType == "border-outside") {
|
|
448
|
-
for (
|
|
448
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
449
449
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
450
450
|
continue;
|
|
451
451
|
}
|
|
452
|
-
for (
|
|
452
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
453
453
|
if (!(bd_r == bd_r1 ||
|
|
454
454
|
bd_r == bd_r2 ||
|
|
455
455
|
bd_c == bd_c1 ||
|
|
@@ -464,14 +464,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
464
464
|
color: borderColor,
|
|
465
465
|
style: borderStyle,
|
|
466
466
|
};
|
|
467
|
-
|
|
467
|
+
var bd_r_top = bd_r1 - 1;
|
|
468
468
|
if (bd_r_top >= 0 &&
|
|
469
469
|
borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
470
470
|
if (data[bd_r_top] != null &&
|
|
471
471
|
getObjType(data[bd_r_top][bd_c]) == "object" &&
|
|
472
472
|
data[bd_r_top][bd_c].mc != null) {
|
|
473
|
-
|
|
474
|
-
|
|
473
|
+
var cell_top = data[bd_r_top][bd_c];
|
|
474
|
+
var mc = cfg["merge"][((_c = cell_top === null || cell_top === void 0 ? void 0 : cell_top.mc) === null || _c === void 0 ? void 0 : _c.r) + "_" + ((_d = cell_top === null || cell_top === void 0 ? void 0 : cell_top.mc) === null || _d === void 0 ? void 0 : _d.c)];
|
|
475
475
|
if (mc.r + mc.rs - 1 == bd_r_top) {
|
|
476
476
|
borderInfoCompute[bd_r_top + "_" + bd_c].b = {
|
|
477
477
|
color: borderColor,
|
|
@@ -495,14 +495,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
495
495
|
color: borderColor,
|
|
496
496
|
style: borderStyle,
|
|
497
497
|
};
|
|
498
|
-
|
|
498
|
+
var bd_r_bottom = bd_r2 + 1;
|
|
499
499
|
if (bd_r_bottom < data.length &&
|
|
500
500
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
501
501
|
if (data[bd_r_bottom] != null &&
|
|
502
502
|
getObjType(data[bd_r_bottom][bd_c]) == "object" &&
|
|
503
503
|
data[bd_r_bottom][bd_c].mc != null) {
|
|
504
|
-
|
|
505
|
-
|
|
504
|
+
var cell_bottom = data[bd_r_bottom][bd_c];
|
|
505
|
+
var mc = cfg["merge"][cell_bottom.mc.r + "_" + cell_bottom.mc.c];
|
|
506
506
|
if (mc.r == bd_r_bottom) {
|
|
507
507
|
borderInfoCompute[bd_r_bottom + "_" + bd_c].t = {
|
|
508
508
|
color: borderColor,
|
|
@@ -526,14 +526,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
526
526
|
color: borderColor,
|
|
527
527
|
style: borderStyle,
|
|
528
528
|
};
|
|
529
|
-
|
|
529
|
+
var bd_c_left = bd_c1 - 1;
|
|
530
530
|
if (bd_c_left >= 0 &&
|
|
531
531
|
borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
532
532
|
if (data[bd_r] != null &&
|
|
533
533
|
getObjType(data[bd_r][bd_c_left]) == "object" &&
|
|
534
534
|
data[bd_r][bd_c_left].mc != null) {
|
|
535
|
-
|
|
536
|
-
|
|
535
|
+
var cell_left = data[bd_r][bd_c_left];
|
|
536
|
+
var mc = cfg["merge"][cell_left.mc.r + "_" + cell_left.mc.c];
|
|
537
537
|
if (mc.c + mc.cs - 1 == bd_c_left) {
|
|
538
538
|
borderInfoCompute[bd_r + "_" + bd_c_left].r = {
|
|
539
539
|
color: borderColor,
|
|
@@ -557,14 +557,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
557
557
|
color: borderColor,
|
|
558
558
|
style: borderStyle,
|
|
559
559
|
};
|
|
560
|
-
|
|
560
|
+
var bd_c_right = bd_c2 + 1;
|
|
561
561
|
if (bd_c_right < data[0].length &&
|
|
562
562
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
563
563
|
if (data[bd_r] != null &&
|
|
564
564
|
getObjType(data[bd_r][bd_c_right]) == "object" &&
|
|
565
565
|
data[bd_r][bd_c_right].mc != null) {
|
|
566
|
-
|
|
567
|
-
|
|
566
|
+
var cell_right = data[bd_r][bd_c_right];
|
|
567
|
+
var mc = cfg["merge"][cell_right.mc.r + "_" + cell_right.mc.c];
|
|
568
568
|
if (mc.c == bd_c_right) {
|
|
569
569
|
borderInfoCompute[bd_r + "_" + bd_c_right].l = {
|
|
570
570
|
color: borderColor,
|
|
@@ -584,11 +584,11 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
584
584
|
}
|
|
585
585
|
}
|
|
586
586
|
else if (borderType == "border-inside") {
|
|
587
|
-
for (
|
|
587
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
588
588
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
589
589
|
continue;
|
|
590
590
|
}
|
|
591
|
-
for (
|
|
591
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
592
592
|
if (bd_r == bd_r1 && bd_c == bd_c1) {
|
|
593
593
|
if (data[bd_r] != null &&
|
|
594
594
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
@@ -669,8 +669,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
669
669
|
if (data[bd_r] != null &&
|
|
670
670
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
671
671
|
data[bd_r][bd_c].mc != null) {
|
|
672
|
-
|
|
673
|
-
|
|
672
|
+
var cell = data[bd_r][bd_c];
|
|
673
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
674
674
|
if (mc.c == bd_c) {
|
|
675
675
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
676
676
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -714,8 +714,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
714
714
|
if (data[bd_r] != null &&
|
|
715
715
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
716
716
|
data[bd_r][bd_c].mc != null) {
|
|
717
|
-
|
|
718
|
-
|
|
717
|
+
var cell = data[bd_r][bd_c];
|
|
718
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
719
719
|
if (mc.c == bd_c) {
|
|
720
720
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
721
721
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -759,8 +759,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
759
759
|
if (data[bd_r] != null &&
|
|
760
760
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
761
761
|
data[bd_r][bd_c].mc != null) {
|
|
762
|
-
|
|
763
|
-
|
|
762
|
+
var cell = data[bd_r][bd_c];
|
|
763
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
764
764
|
if (mc.r == bd_r) {
|
|
765
765
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
766
766
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -804,8 +804,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
804
804
|
if (data[bd_r] != null &&
|
|
805
805
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
806
806
|
data[bd_r][bd_c].mc != null) {
|
|
807
|
-
|
|
808
|
-
|
|
807
|
+
var cell = data[bd_r][bd_c];
|
|
808
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
809
809
|
if (mc.r == bd_r) {
|
|
810
810
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
811
811
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -849,8 +849,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
849
849
|
if (data[bd_r] != null &&
|
|
850
850
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
851
851
|
data[bd_r][bd_c].mc != null) {
|
|
852
|
-
|
|
853
|
-
|
|
852
|
+
var cell = data[bd_r][bd_c];
|
|
853
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
854
854
|
if (mc.r == bd_r) {
|
|
855
855
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
856
856
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -918,11 +918,11 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
918
918
|
}
|
|
919
919
|
}
|
|
920
920
|
else if (borderType == "border-horizontal") {
|
|
921
|
-
for (
|
|
921
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
922
922
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
923
923
|
continue;
|
|
924
924
|
}
|
|
925
|
-
for (
|
|
925
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
926
926
|
if (bd_r == bd_r1) {
|
|
927
927
|
if (data[bd_r] != null &&
|
|
928
928
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
@@ -957,8 +957,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
957
957
|
if (data[bd_r] != null &&
|
|
958
958
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
959
959
|
data[bd_r][bd_c].mc != null) {
|
|
960
|
-
|
|
961
|
-
|
|
960
|
+
var cell = data[bd_r][bd_c];
|
|
961
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c];
|
|
962
962
|
if (mc.r == bd_r) {
|
|
963
963
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
964
964
|
borderInfoCompute[bd_r + "_" + bd_c] =
|
|
@@ -998,11 +998,11 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
998
998
|
}
|
|
999
999
|
}
|
|
1000
1000
|
else if (borderType == "border-vertical") {
|
|
1001
|
-
for (
|
|
1001
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
1002
1002
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
1003
1003
|
continue;
|
|
1004
1004
|
}
|
|
1005
|
-
for (
|
|
1005
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
1006
1006
|
if (bd_c == bd_c1) {
|
|
1007
1007
|
if (data[bd_r] != null &&
|
|
1008
1008
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
@@ -1037,8 +1037,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1037
1037
|
if (data[bd_r] != null &&
|
|
1038
1038
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
1039
1039
|
data[bd_r][bd_c].mc != null) {
|
|
1040
|
-
|
|
1041
|
-
|
|
1040
|
+
var cell = data[bd_r][bd_c];
|
|
1041
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c] ||
|
|
1042
1042
|
{};
|
|
1043
1043
|
if (mc.c == bd_c) {
|
|
1044
1044
|
if (borderInfoCompute[bd_r + "_" + bd_c] == null) {
|
|
@@ -1079,37 +1079,37 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1079
1079
|
}
|
|
1080
1080
|
}
|
|
1081
1081
|
else if (borderType == "border-none") {
|
|
1082
|
-
for (
|
|
1082
|
+
for (var bd_r = bd_r1; bd_r <= bd_r2; bd_r++) {
|
|
1083
1083
|
if (cfg["rowhidden"] != null && cfg["rowhidden"][bd_r] != null) {
|
|
1084
1084
|
continue;
|
|
1085
1085
|
}
|
|
1086
|
-
for (
|
|
1086
|
+
for (var bd_c = bd_c1; bd_c <= bd_c2; bd_c++) {
|
|
1087
1087
|
if (borderInfoCompute[bd_r + "_" + bd_c] != null) {
|
|
1088
1088
|
delete borderInfoCompute[bd_r + "_" + bd_c];
|
|
1089
1089
|
}
|
|
1090
1090
|
if (bd_r == bd_r1) {
|
|
1091
|
-
|
|
1091
|
+
var bd_r_top = bd_r1 - 1;
|
|
1092
1092
|
if (bd_r_top >= 0 &&
|
|
1093
1093
|
borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
1094
1094
|
delete borderInfoCompute[bd_r_top + "_" + bd_c].b;
|
|
1095
1095
|
}
|
|
1096
1096
|
}
|
|
1097
1097
|
if (bd_r == bd_r2) {
|
|
1098
|
-
|
|
1098
|
+
var bd_r_bottom = bd_r2 + 1;
|
|
1099
1099
|
if (bd_r_bottom < data.length &&
|
|
1100
1100
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
1101
1101
|
delete borderInfoCompute[bd_r_bottom + "_" + bd_c].t;
|
|
1102
1102
|
}
|
|
1103
1103
|
}
|
|
1104
1104
|
if (bd_c == bd_c1) {
|
|
1105
|
-
|
|
1105
|
+
var bd_c_left = bd_c1 - 1;
|
|
1106
1106
|
if (bd_c_left >= 0 &&
|
|
1107
1107
|
borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
1108
1108
|
delete borderInfoCompute[bd_r + "_" + bd_c_left].r;
|
|
1109
1109
|
}
|
|
1110
1110
|
}
|
|
1111
1111
|
if (bd_c == bd_c2) {
|
|
1112
|
-
|
|
1112
|
+
var bd_c_right = bd_c2 + 1;
|
|
1113
1113
|
if (bd_c_right < data[0].length &&
|
|
1114
1114
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
1115
1115
|
delete borderInfoCompute[bd_r + "_" + bd_c_right].l;
|
|
@@ -1121,8 +1121,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1121
1121
|
}
|
|
1122
1122
|
}
|
|
1123
1123
|
else if (rangeType == "cell") {
|
|
1124
|
-
|
|
1125
|
-
|
|
1124
|
+
var value = borderInfo[i].value;
|
|
1125
|
+
var bd_r = value.row_index, bd_c = value.col_index;
|
|
1126
1126
|
if (bd_r < dataset_row_st ||
|
|
1127
1127
|
bd_r > dataset_row_ed ||
|
|
1128
1128
|
bd_c < dataset_col_st ||
|
|
@@ -1142,8 +1142,8 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1142
1142
|
if (data[bd_r] != null &&
|
|
1143
1143
|
getObjType(data[bd_r][bd_c]) == "object" &&
|
|
1144
1144
|
data[bd_r][bd_c].mc != null) {
|
|
1145
|
-
|
|
1146
|
-
|
|
1145
|
+
var cell = data[bd_r][bd_c];
|
|
1146
|
+
var mc = cfg["merge"][cell.mc.r + "_" + cell.mc.c] ||
|
|
1147
1147
|
{};
|
|
1148
1148
|
if (value.l != null && bd_c == mc.c) {
|
|
1149
1149
|
//左边框
|
|
@@ -1151,13 +1151,13 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1151
1151
|
color: value.l.color,
|
|
1152
1152
|
style: value.l.style,
|
|
1153
1153
|
};
|
|
1154
|
-
|
|
1154
|
+
var bd_c_left = bd_c - 1;
|
|
1155
1155
|
if (bd_c_left >= 0 && borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
1156
1156
|
if (data[bd_r] != null &&
|
|
1157
1157
|
getObjType(data[bd_r][bd_c_left]) == "object" &&
|
|
1158
1158
|
data[bd_r][bd_c_left].mc != null) {
|
|
1159
|
-
|
|
1160
|
-
|
|
1159
|
+
var cell_left = data[bd_r][bd_c_left];
|
|
1160
|
+
var mc_l = cfg["merge"][cell_left.mc.r + "_" + cell_left.mc.c];
|
|
1161
1161
|
if (mc_l.c + mc_l.cs - 1 == bd_c_left) {
|
|
1162
1162
|
borderInfoCompute[bd_r + "_" + bd_c_left].r = {
|
|
1163
1163
|
color: value.l.color,
|
|
@@ -1182,14 +1182,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1182
1182
|
color: value.r.color,
|
|
1183
1183
|
style: value.r.style,
|
|
1184
1184
|
};
|
|
1185
|
-
|
|
1185
|
+
var bd_c_right = bd_c + 1;
|
|
1186
1186
|
if (bd_c_right < data[0].length &&
|
|
1187
1187
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
1188
1188
|
if (data[bd_r] != null &&
|
|
1189
1189
|
getObjType(data[bd_r][bd_c_right]) == "object" &&
|
|
1190
1190
|
data[bd_r][bd_c_right].mc != null) {
|
|
1191
|
-
|
|
1192
|
-
|
|
1191
|
+
var cell_right = data[bd_r][bd_c_right];
|
|
1192
|
+
var mc_r = cfg["merge"][cell_right.mc.r + "_" + cell_right.mc.c];
|
|
1193
1193
|
if (mc_r.c == bd_c_right) {
|
|
1194
1194
|
borderInfoCompute[bd_r + "_" + bd_c_right].l = {
|
|
1195
1195
|
color: value.r.color,
|
|
@@ -1214,13 +1214,13 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1214
1214
|
color: value.t.color,
|
|
1215
1215
|
style: value.t.style,
|
|
1216
1216
|
};
|
|
1217
|
-
|
|
1217
|
+
var bd_r_top = bd_r - 1;
|
|
1218
1218
|
if (bd_r_top >= 0 && borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
1219
1219
|
if (data[bd_r_top] != null &&
|
|
1220
1220
|
getObjType(data[bd_r_top][bd_c]) == "object" &&
|
|
1221
1221
|
data[bd_r_top][bd_c].mc != null) {
|
|
1222
|
-
|
|
1223
|
-
|
|
1222
|
+
var cell_top = data[bd_r_top][bd_c];
|
|
1223
|
+
var mc_t = cfg["merge"][cell_top.mc.r + "_" + cell_top.mc.c];
|
|
1224
1224
|
if (mc_t.r + mc_t.rs - 1 == bd_r_top) {
|
|
1225
1225
|
borderInfoCompute[bd_r_top + "_" + bd_c].b = {
|
|
1226
1226
|
color: value.t.color,
|
|
@@ -1245,14 +1245,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1245
1245
|
color: value.b.color,
|
|
1246
1246
|
style: value.b.style,
|
|
1247
1247
|
};
|
|
1248
|
-
|
|
1248
|
+
var bd_r_bottom = bd_r + 1;
|
|
1249
1249
|
if (bd_r_bottom < data.length &&
|
|
1250
1250
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
1251
1251
|
if (data[bd_r_bottom] != null &&
|
|
1252
1252
|
getObjType(data[bd_r_bottom][bd_c]) == "object" &&
|
|
1253
1253
|
data[bd_r_bottom][bd_c].mc != null) {
|
|
1254
|
-
|
|
1255
|
-
|
|
1254
|
+
var cell_bottom = data[bd_r_bottom][bd_c];
|
|
1255
|
+
var mc_b = cfg["merge"][cell_bottom.mc.r + "_" + cell_bottom.mc.c];
|
|
1256
1256
|
if (mc_b.r == bd_r_bottom) {
|
|
1257
1257
|
borderInfoCompute[bd_r_bottom + "_" + bd_c].t = {
|
|
1258
1258
|
color: value.b.color,
|
|
@@ -1279,13 +1279,13 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1279
1279
|
color: value.l.color,
|
|
1280
1280
|
style: value.l.style,
|
|
1281
1281
|
};
|
|
1282
|
-
|
|
1282
|
+
var bd_c_left = bd_c - 1;
|
|
1283
1283
|
if (bd_c_left >= 0 && borderInfoCompute[bd_r + "_" + bd_c_left]) {
|
|
1284
1284
|
if (data[bd_r] != null &&
|
|
1285
1285
|
getObjType(data[bd_r][bd_c_left]) == "object" &&
|
|
1286
1286
|
data[bd_r][bd_c_left].mc != null) {
|
|
1287
|
-
|
|
1288
|
-
|
|
1287
|
+
var cell_left = data[bd_r][bd_c_left];
|
|
1288
|
+
var mc_l = cfg["merge"][cell_left.mc.r + "_" + cell_left.mc.c];
|
|
1289
1289
|
if (mc_l.c + mc_l.cs - 1 == bd_c_left) {
|
|
1290
1290
|
borderInfoCompute[bd_r + "_" + bd_c_left].r = {
|
|
1291
1291
|
color: value.l.color,
|
|
@@ -1310,14 +1310,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1310
1310
|
color: value.r.color,
|
|
1311
1311
|
style: value.r.style,
|
|
1312
1312
|
};
|
|
1313
|
-
|
|
1313
|
+
var bd_c_right = bd_c + 1;
|
|
1314
1314
|
if (bd_c_right < data[0].length &&
|
|
1315
1315
|
borderInfoCompute[bd_r + "_" + bd_c_right]) {
|
|
1316
1316
|
if (data[bd_r] != null &&
|
|
1317
1317
|
getObjType(data[bd_r][bd_c_right]) == "object" &&
|
|
1318
1318
|
data[bd_r][bd_c_right].mc != null) {
|
|
1319
|
-
|
|
1320
|
-
|
|
1319
|
+
var cell_right = data[bd_r][bd_c_right];
|
|
1320
|
+
var mc_r = cfg["merge"][cell_right.mc.r + "_" + cell_right.mc.c];
|
|
1321
1321
|
if (mc_r.c == bd_c_right) {
|
|
1322
1322
|
borderInfoCompute[bd_r + "_" + bd_c_right].l = {
|
|
1323
1323
|
color: value.r.color,
|
|
@@ -1342,13 +1342,13 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1342
1342
|
color: value.t.color,
|
|
1343
1343
|
style: value.t.style,
|
|
1344
1344
|
};
|
|
1345
|
-
|
|
1345
|
+
var bd_r_top = bd_r - 1;
|
|
1346
1346
|
if (bd_r_top >= 0 && borderInfoCompute[bd_r_top + "_" + bd_c]) {
|
|
1347
1347
|
if (data[bd_r_top] != null &&
|
|
1348
1348
|
getObjType(data[bd_r_top][bd_c]) == "object" &&
|
|
1349
1349
|
data[bd_r_top][bd_c].mc != null) {
|
|
1350
|
-
|
|
1351
|
-
|
|
1350
|
+
var cell_top = data[bd_r_top][bd_c];
|
|
1351
|
+
var mc_t = cfg["merge"][cell_top.mc.r + "_" + cell_top.mc.c];
|
|
1352
1352
|
if (mc_t.r + mc_t.rs - 1 == bd_r_top) {
|
|
1353
1353
|
borderInfoCompute[bd_r_top + "_" + bd_c].b = {
|
|
1354
1354
|
color: value.t.color,
|
|
@@ -1373,14 +1373,14 @@ var getBorderInfo = function (luckysheetfile) {
|
|
|
1373
1373
|
color: value.b.color,
|
|
1374
1374
|
style: value.b.style,
|
|
1375
1375
|
};
|
|
1376
|
-
|
|
1376
|
+
var bd_r_bottom = bd_r + 1;
|
|
1377
1377
|
if (bd_r_bottom < data.length &&
|
|
1378
1378
|
borderInfoCompute[bd_r_bottom + "_" + bd_c]) {
|
|
1379
1379
|
if (data[bd_r_bottom] != null &&
|
|
1380
1380
|
getObjType(data[bd_r_bottom][bd_c]) == "object" &&
|
|
1381
1381
|
data[bd_r_bottom][bd_c].mc != null) {
|
|
1382
|
-
|
|
1383
|
-
|
|
1382
|
+
var cell_bottom = data[bd_r_bottom][bd_c];
|
|
1383
|
+
var mc_b = cfg["merge"][cell_bottom.mc.r + "_" + cell_bottom.mc.c];
|
|
1384
1384
|
if (mc_b.r == bd_r_bottom) {
|
|
1385
1385
|
borderInfoCompute[bd_r_bottom + "_" + bd_c].t = {
|
|
1386
1386
|
color: value.b.color,
|