feat(update): 注册冲突策略和输出范围选项

2026-07-04 09:02:49 +08:00 · 2026-05-25 22:41:08 +08:00
parent 07d5823c81
commit 2e3fac93f0
2 changed files with 11 additions and 0 deletions
--- a/extend/base/admin/service/AdminUpdateServiceBase.php
+++ b/extend/base/admin/service/AdminUpdateServiceBase.php
@@ -27,6 +27,11 @@ class AdminUpdateServiceBase

    public $dryRun = false;

+    public $optionalConflict = null;  // null=未指定(走交互), skip|overwrite|ask
+    public $forceConflict = null;     // null=未指定(走交互), overwrite|skip|ask
+    public $showScope = null;         // null=未指定(默认all), all|conflict
+    public $skippedConflictFiles = []; // [file_path => ['type' => 'add|delete|update', 'category' => 'optional|force']]
+
    /**
     * @var Input
     */