Merge remote-tracking branch 'origin/master'

src/components/common/schema/Schema.jsx

@@ -372,6 +372,7 @@ class Schema extends Component {
                                                 page={this.state.page}
                                                 pageSize={this.state.pageSize}
                                                 history={this.props.history}
+                                                add={'add'}
                                             /> :
                                             <Table
                                                 currentTable={this.state.currentTable}
@@ -388,6 +389,7 @@ class Schema extends Component {
                                                 page={this.state.page}
                                                 pageSize={this.state.pageSize}
                                                 history={this.props.history}
+                                                add={'whatever but not add'}
                                             />
                                 }
 
@@ -436,7 +438,7 @@ class CopySchemaButton extends Component {
                             schemaState: 'copy',
                             schemaData: JSON.stringify([]),
                             reference: schemaID,
-                            schemaName: schemaName + '_copy'
+                            schemaName: schemaName + '_' + Math.random().toString().slice(-3) + Math.random().toString().slice(-4)
                         };
 
                         return (

src/components/common/schema/Table.js

@@ -216,7 +216,6 @@ class Table extends Component {
                                         currentTable={this.state.currentTable}
                                         columns={this.state.columns}
                                         remark={this.state.remark}
-                                        currentTableIndex={this.props.currentTableIndex}
                                         schemaID={schemaID}
                                         userID={userID}
                                         schemaData={this.props.schemaData}
@@ -226,6 +225,7 @@ class Table extends Component {
                                         pageSize={this.props.pageSize}
                                         history={this.props.history}
                                         schemaName={schemaName}
+                                        add={this.props.add}
                                     />
                                 </div>
                         }
@@ -323,7 +323,6 @@ class UpdateTableButton extends Component {
                                             schemaCols.splice(index, 1, newTable);
                                         });
                                     } else {
-
                                         schemaCols.splice(index, 1, newTable);
                                     }
 
@@ -337,13 +336,15 @@ class UpdateTableButton extends Component {
                                                     }
                                                 });
                                                 this.props.showTablePagination(this.props.page, this.props.pageSize, schemaCols)
-                                                this.props.history.push({
-                                                    pathname: `/graphql-service/my-create/${this.props.schemaName}`,
-                                                    state:{
-                                                        schemaName:this.props.schemaName,
-                                                        schemaID:this.props.schemaID
-                                                    }
-                                                });
+                                                if(this.props.add !== 'add') {
+                                                    this.props.history.push({
+                                                        pathname: `/graphql-service/my-create/${this.props.schemaName}`,
+                                                        state:{
+                                                            schemaName:this.props.schemaName,
+                                                            schemaID:this.props.schemaID
+                                                        }
+                                                    });
+                                                }
                                             }}>
                                                 save
                                             </Button>