Skip to content

Commit fc72715

Browse files
authored
block readonly package paste, fix on filter app crash (#128)
* block readonly package paste, fix on filter app crash * minor changes * minor changes * minor changes * minor changes
1 parent e76cd64 commit fc72715

4 files changed

Lines changed: 51 additions & 46 deletions

File tree

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"files.exclude": {
99
"**/.git": true,
1010
"**/.DS_Store": true,
11-
"**/node_modules": true
1211
},
1312
"files.associations": {
1413
"*.js": "javascriptreact",

package-lock.json

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fileverse-dev/dsheet",
33
"private": false,
44
"description": "DSheet",
5-
"version": "1.0.40",
5+
"version": "1.0.42",
66
"main": "dist/index.es.js",
77
"module": "dist/index.es.js",
88
"exports": {
@@ -33,11 +33,11 @@
3333
]
3434
},
3535
"dependencies": {
36-
"@fileverse-dev/dsheets-templates": "^0.0.16",
37-
"@fileverse-dev/formula-parser": "^0.2.17",
36+
"@fileverse-dev/dsheets-templates": "^0.0.17",
37+
"@fileverse-dev/formula-parser": "^0.2.19",
3838
"@fileverse-dev/formulajs": "^4.4.11-mod-64",
39-
"@fileverse-dev/fortune-core": "^1.0.21",
40-
"@fileverse-dev/fortune-react": "^1.0.21",
39+
"@fileverse-dev/fortune-core": "^1.0.23",
40+
"@fileverse-dev/fortune-react": "^1.0.23",
4141
"@fileverse/ui": "^4.1.7-patch-18",
4242
"classnames": "^2.5.1",
4343
"exceljs": "^4.4.0",

package/utils/csv-import.tsx

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,24 @@ export const handleCSVUpload = (
5151
const headers = results.meta.fields || [];
5252

5353
// Add header row
54-
const headerRow = headers.map((header, index) => ({
55-
r: 0,
56-
c: index,
57-
v: {
58-
m: header !== null ? header : null,
59-
ct: {
60-
fa: 'General',
61-
t: 'g',
54+
const headerRow = headers.map((headerV, index) => {
55+
// @ts-expect-error later
56+
const renamedHeadersKeys = results.meta.renamedHeaders ? Object.keys(results.meta.renamedHeaders) : [];
57+
// @ts-expect-error later
58+
const header = renamedHeadersKeys.includes(headerV) ? results.meta.renamedHeaders[headerV] : headerV;
59+
return {
60+
r: 0,
61+
c: index,
62+
v: {
63+
m: header !== null ? header : null,
64+
ct: {
65+
fa: 'General',
66+
t: 'g',
67+
},
68+
v: header !== null ? header : null,
6269
},
63-
v: header !== null ? header : null,
64-
},
65-
}));
70+
}
71+
});
6672

6773
headerRow.forEach((cell) => {
6874
cellData.push(cell);
@@ -81,8 +87,8 @@ export const handleCSVUpload = (
8187
m:
8288
(row as Record<string, string | null>)[header] !== null
8389
? (row as Record<string, string | null>)[
84-
header
85-
]?.toString()
90+
header
91+
]?.toString()
8692
: null,
8793
ct: {
8894
fa: 'General',
@@ -91,10 +97,10 @@ export const handleCSVUpload = (
9197
// @ts-expect-error later
9298
v:
9399
(row as Record<string, string | number | null>)[header] !==
94-
null
100+
null
95101
? (row as Record<string, string | number | null>)[
96-
header
97-
]?.toString()
102+
header
103+
]?.toString()
98104
: null,
99105
},
100106
});

0 commit comments

Comments
 (0)