OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #123: (api -> master)

Browse Source 
Merge Request: Support cascade deletion

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/123
This commit is contained in:
王琼钰
2023-02-04 13:46:21 +08:00
parent 591b52a718 804e1c7796
commit 0d5502a752
55 changed files with 1325 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tjnetwork.py
View File

@@ -173,9 +173,11 @@ def pick_operation(name: str, operation: int, discard: bool = False) -> ChangeSe
def sync_with_server(name: str, operation: int) -> ChangeSet:
return api.sync_with_server(name, operation)
# combine commands as one undo/redo unit
def execute_batch_command(name: str, cs: ChangeSet) -> ChangeSet:
return api.execute_batch_command(name, cs)
# execute command one by one
def execute_batch_commands(name: str, cs: ChangeSet) -> ChangeSet:
return api.execute_batch_commands(name, cs)
@@ -265,7 +267,7 @@ def add_junction(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_junction(name, cs)
def delete_junction(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_junction(name, cs)
return api.delete_junction_cascade(name, cs)
############################################################
@@ -286,7 +288,7 @@ def add_reservoir(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_reservoir(name, cs)
def delete_reservoir(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_reservoir(name, cs)
return api.delete_reservoir_cascade(name, cs)
############################################################
@@ -307,7 +309,7 @@ def add_tank(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_tank(name, cs)
def delete_tank(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_tank(name, cs)
return api.delete_tank_cascade(name, cs)
############################################################
@@ -328,7 +330,7 @@ def add_pipe(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_pipe(name, cs)
def delete_pipe(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_pipe(name, cs)
return api.delete_pipe_cascade(name, cs)
############################################################
@@ -349,7 +351,7 @@ def add_pump(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_pump(name, cs)
def delete_pump(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_pump(name, cs)
return api.delete_pump_cascade(name, cs)
############################################################
@@ -370,7 +372,7 @@ def add_valve(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_valve(name, cs)
def delete_valve(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_valve(name, cs)
return api.delete_valve_cascade(name, cs)
############################################################
@@ -438,7 +440,7 @@ def add_pattern(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_pattern(name, cs)
def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_pattern(name, cs)
return api.delete_pattern_cascade(name, cs)
############################################################
@@ -459,7 +461,7 @@ def add_curve(name: str, cs: ChangeSet) -> ChangeSet:
return api.add_curve(name, cs)
def delete_curve(name: str, cs: ChangeSet) -> ChangeSet:
return api.delete_curve(name, cs)
return api.delete_curve_cascade(name, cs)
############################################################