Bladeren bron

add, copy, fill, completed

xy 7 jaren geleden
bovenliggende
commit
bea13c363b
2 gewijzigde bestanden met toevoegingen van 16 en 4 verwijderingen
  1. 7 2
      src/components/common/schema/Schema.jsx
  2. 9 2
      src/components/common/schema/Table.js

+ 7 - 2
src/components/common/schema/Schema.jsx

@@ -357,6 +357,7 @@ class Schema extends Component {
                                         this.state.currentTable === 'add' ?
                                             <Table
                                                 currentTable={''}
+                                                schemaData={data}
                                                 columns={[]}
                                                 remark=''
                                                 schemaID={this.state.schemaID}
@@ -364,6 +365,10 @@ class Schema extends Component {
                                                 userID={userID}
                                                 goBack={this.goBack}
                                                 trialcase={trialcase}
+                                                fetchData={this.fetchData}
+                                                showTablePagination={this.showTablePagination}
+                                                page={this.state.page}
+                                                pageSize={this.state.pageSize}
                                             /> :
                                             <Table
                                                 currentTable={this.state.currentTable}
@@ -461,12 +466,12 @@ class DeleteSchemaButton extends Component {
         }
     }
 
-    showConfirm = (delete_schema, schemaName) => {
+    showConfirm = (delete_schema, schemaName, userID) => {
         confirm({
             title: 'Do you want to delete this schema?',
             content: 'It cannot be found back!',
             onOk() {
-                delete_schema({variables: {schemaName}});
+                delete_schema({variables: {schemaName, user_id: userID}});
             },
             onCancel() {
             },

+ 9 - 2
src/components/common/schema/Table.js

@@ -304,9 +304,16 @@ class UpdateTableButton extends Component {
 
                                     const index = this.state.originTableName === '' ? -2 : this.props.schemaData.findIndex(obj => obj.name === this.state.originTableName)
                                     if (index === -2) {
-                                        schemaCols.push(newTable);
+                                        if(referenceID !== '') {
+                                            this.props.fetchData(referenceID).then(value => {
+                                                schemaCols = JSON.parse(value);
+                                                schemaCols.push(newTable);
+                                            });
+                                        } else {
+                                            schemaCols.push(newTable);
+                                        }
+
                                     } else if (index === -1) {
-                                        console.log('进行了一次删除操作 或 未知错误,数据库信息不匹配');
                                         // 先取数据,然后替换,然后填充
                                         this.props.fetchData(referenceID).then(value => {
                                             schemaCols = JSON.parse(value);