diff --git a/core/sfgrid/model.py b/core/sfgrid/model.py index 9fb6dc7..ed883a7 100644 --- a/core/sfgrid/model.py +++ b/core/sfgrid/model.py @@ -16,7 +16,7 @@ class SFGridTradeTarget(BaseModel): current_order_price = FloatField() current_order_no = CharField(default='') current_order_type = CharField(default='') - status = IntegerField(default=0) # 0表示新标的,1表示已建初始仓,正常交易中 + status = IntegerField(default=0) # -1表示新标的,未完成交易配置,0表示新标的,已完成交易配置,1表示已建初始仓,正常交易中 enabled = BooleanField(default=False) # 是否启动交易线程 grid_start_price = FloatField(default=10.0) # 基线价格 diff --git a/core/sfgrid/sfgrid_ui.py b/core/sfgrid/sfgrid_ui.py index 905b443..89b7a5c 100644 --- a/core/sfgrid/sfgrid_ui.py +++ b/core/sfgrid/sfgrid_ui.py @@ -937,7 +937,8 @@ class TradeTargetUI(ttk.Frame): plan_sell_price=0.0, current_order_price=0.0, current_order_no='', - current_order_type='' + current_order_type='', + status=-1 ) new_target.save() # 更新标的池 @@ -987,12 +988,11 @@ class TradeTargetUI(ttk.Frame): return # 检查标的的状态,status为1时仅可查看 - if target.status == 1: + if target.status == -1 or target.status == 0: + self.create_grid_config_window(target) + else: # 创建只读的网格配置查看窗口 self.create_grid_view_window(target) - else: - # 创建可编辑的网格配置窗口 - self.create_grid_config_window(target) def btnHandlerStartSelectedTrade(self): """启动选中的交易""" @@ -1078,7 +1078,7 @@ class TradeTargetUI(ttk.Frame): del self.tradeTargetData[id] del self.strategy_ctrl[id] del self.stockCodeIdMap[target.stock_code] # type: ignore - + # 从数据库中删除 target.delete_instance() # 添加日志