haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3380 from haiwen/data-grid-bug-repair

Browse Source 
repair delete column bug
This commit is contained in:
Daniel Pan
2019-04-29 10:21:54 +08:00
committed by GitHub
parent 278c300079 5c1c5dcae8
commit dc1806ded9
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/package-lock.json generated
View File

@@ -118,9 +118,9 @@
} }
}, },
"@seafile/react-data-grid": { "@seafile/react-data-grid": {
"version": "6.1.3", "version": "6.1.5",
"resolved": "https://registry.npmjs.org/@seafile/react-data-grid/-/react-data-grid-6.1.3.tgz", "resolved": "https://registry.npmjs.org/@seafile/react-data-grid/-/react-data-grid-6.1.5.tgz",
"integrity": "sha512-cCpsP9uTDxNftYP6m6jCtUffZ59OOdJZ3Bk+BHQjY8LePWzunhbsVeDoFw7mUj8m3BekayoKCrIfFZFydcQxGA==", "integrity": "sha512-lCnrmnubDnaenY1BzpjSG7Ao++7hluahc38ChbSyHd3PlZRFOOA92doRJUEszQhkkmfT9FP1MmKreJPOxgbhkg==",
"requires": { "requires": {
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"react-is-deprecated": "^0.1.2", "react-is-deprecated": "^0.1.2",
@@ -128,9 +128,9 @@
} }
}, },
"@seafile/react-data-grid-addons": { "@seafile/react-data-grid-addons": {
"version": "6.1.3", "version": "6.1.5",
"resolved": "https://registry.npmjs.org/@seafile/react-data-grid-addons/-/react-data-grid-addons-6.1.3.tgz", "resolved": "https://registry.npmjs.org/@seafile/react-data-grid-addons/-/react-data-grid-addons-6.1.5.tgz",
"integrity": "sha512-vFBbflST0833T7cz2FGGmBkpkBhfi6MsUiq1HbOoV0b4yWKk3GI4tv0hFjDFabKI30EgVcVeqeS9T8Bu+7F47A==", "integrity": "sha512-9eP4XP/inZeg9hgKDpfmibLDDwbOE+GVhnUsqwfT6CpKzdBUnU6eiEbKC89J1WAq9yhKf/qfDrVLeekzsXRmfA==",
"requires": { "requires": {
"react-contextmenu": "^2.10.0", "react-contextmenu": "^2.10.0",
"react-dnd": "^2.6.0", "react-dnd": "^2.6.0",
@@ -15424,13 +15424,13 @@
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", "resolved": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
"integrity": "sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0=", "integrity": "sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0=",
"dev": true "dev": true
}, },
"strip-ansi": { "strip-ansi": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
"integrity": "sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=", "integrity": "sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=",
"dev": true, "dev": true,
"requires": { "requires": {

4
frontend/package.json
View File

@@ -4,8 +4,8 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/react-data-grid": "^6.1.3", "@seafile/react-data-grid": "^6.1.5",
"@seafile/react-data-grid-addons": "^6.1.3", "@seafile/react-data-grid-addons": "^6.1.5",
"@seafile/resumablejs": "^1.1.9", "@seafile/resumablejs": "^1.1.9",
"@seafile/seafile-editor": "^0.2.22", "@seafile/seafile-editor": "^0.2.22",
"MD5": "^1.3.0", "MD5": "^1.3.0",

11
frontend/src/pages/data-grid/app-main.js
View File

@@ -132,7 +132,14 @@ class AppMain extends React.Component {
let column = data.column; let column = data.column;
let key = column.key; let key = column.key;
let columns = this.state.columns.filter(item => item.key !== key); let columns = this.state.columns.filter(item => item.key !== key);
this.setState({columns: columns}); let rows = this.state.rows.map(item => {
delete item[key];
return item;
});
this.setState({
columns: columns,
rows: rows
});
} }
serializeGridData = () => { serializeGridData = () => {
@@ -192,7 +199,7 @@ class AppMain extends React.Component {
onGridRowsUpdated={this.handleGridRowsUpdated} onGridRowsUpdated={this.handleGridRowsUpdated}
enableRowSelect={true} enableRowSelect={true}
rowHeight={50} rowHeight={50}
minHeight={600} minHeight={500}
rowScrollTimeout={200} rowScrollTimeout={200}
enableInsertColumn={true} enableInsertColumn={true}
enableInsertRow={true} enableInsertRow={true}