[v1.4] ScriptEditor: 编辑冲突&脚本名称冲突 by cyfung1031 · Pull Request #1223 · scriptscat/scriptcat

cyfung1031 · 2026-02-07T19:12:51Z

新增/更改名字时，有相同名字的脚本的话，提醒一下是否真的储存
[Feature] 提醒有相同名字的腳本（安裝/更新/改代碼） #808

Copilot

Pull request overview

该 PR 在 ScriptEditor 的保存流程中新增“脚本名称 + namespace 冲突”检测：当新增脚本或修改脚本名称/命名空间时，如发现已有同名同命名空间脚本，则弹窗提醒用户是否仍要保存，以避免同页重复运行脚本的问题（#808）。

Changes:

保存时检测同名同 namespace 脚本，冲突时弹出确认对话框，可选择继续保存或中止保存
为该提示补充多语言文案（zh-CN/zh-TW/en-US/de-DE/ja-JP/ru-RU/vi-VN/ach-UG）

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
src/pages/options/routes/script/ScriptEditor.tsx	在保存逻辑中加入脚本名称冲突检测与确认弹窗
src/locales/zh-TW/translation.json	新增脚本名称冲突相关文案（繁中）
src/locales/zh-CN/translation.json	新增脚本名称冲突相关文案（简中）
src/locales/vi-VN/translation.json	新增脚本名称冲突相关文案（越南语）
src/locales/ru-RU/translation.json	新增脚本名称冲突相关文案（俄语）
src/locales/ja-JP/translation.json	新增脚本名称冲突相关文案（日语）
src/locales/en-US/translation.json	新增脚本名称冲突相关文案（英文）
src/locales/de-DE/translation.json	新增脚本名称冲突相关文案（德文）
src/locales/ach-UG/translation.json	新增脚本名称冲突相关文案（ach-UG）

Copilot · 2026-02-12T08:08:59Z

+            setTimeout(e.focus.bind(e), 50);
+            if (modalResult === "no") {
+              Message.warning(t("save_abort_when_scriptname_conflict"));
+              return Promise.reject(new Error("This script name is already used by another script. Save aborted."));


这里在用户选择“不保存”时通过 Promise.reject(new Error(...)) 中止流程，会被外层 save() 的 .catch() 统一当作 invalid_script_code 处理并弹出错误提示；同时 run 菜单里 await save(...) 没有兜底 catch，取消保存会导致运行流程抛错/潜在未处理的 Promise rejection。建议为“用户主动取消保存”使用可识别的中止信号（如专用错误类型/错误码），并在 save() 的 catch 中对该类中止分支直接静默返回/仅保留 warning，不要走 invalid_script_code 提示；调用方（如 run）也应捕获并直接 return。

Suggested change

return Promise.reject(new Error("This script name is already used by another script. Save aborted."));

// 用户主动取消保存：中止当前保存流程，但不触发 Promise rejection

return;

CodFrm · 2026-02-12T08:14:30Z

有问题这个脚本我有多个版本，如果就是想保留几个不同的版本，体验不是很好（等有用户提再优化也行），似乎编辑冲突也有些问题

没太细看，我先看其它pr

1234.mp4

cyfung1031 · 2026-02-24T00:42:02Z

有问题这个脚本我有多个版本，如果就是想保留几个不同的版本，体验不是很好（等有用户提再优化也行），似乎编辑冲突也有些问题

没太细看，我先看其它pr

1234.mp4

编辑冲突我改了一下

a726ce0

你有空测一下行不行

cyfung1031 · 2026-03-16T12:50:15Z

有问题这个脚本我有多个版本，如果就是想保留几个不同的版本，体验不是很好（等有用户提再优化也行），似乎编辑冲突也有些问题
没太细看，我先看其它pr
1234.mp4

编辑冲突我改了一下

a726ce0
你有空测一下行不行

@CodFrm

CodFrm · 2026-03-17T05:41:13Z

Code review

Found 1 issue:

编辑冲突检测在连续保存时会误触发: 保存成功后，setEditors 只更新了 name 字段，没有更新 updatetime。导致下次保存时 existingScript.updatetime（编辑器打开时的旧值）与 oldScript.updatetime（从 DB 读取的新值）不一致，每次连续保存都会弹出编辑冲突对话框，即使没有外部修改。建议在 setEditors 中同时更新 updatetime。

scriptcat/src/pages/options/routes/script/ScriptEditor.tsx

Lines 277 to 292 in d6c1131

    
                   hotKeys: hotKeys.current, 
        
                   isChanged: false, 
        
                 }; 
        
                 insertEditor(newEditor); 
        
                 setSelectSciptButtonAndTab(uuid); 
        
               } else { 
        
                 Message.error("Script Not Found"); 
        
               } 
        
             } else { 
        
               // 新建脚本 
        
               const e = await emptyScript(template || "", hotKeys.current, target || "blank"); 
        
               insertEditor(e); 
        
               setSelectSciptButtonAndTab(e.script.uuid); 
        
             } 
        
           }, 
        
           [scriptList, selectedScript]

🤖 Generated with Claude Code

_{- If this code review was useful, please react with 👍. Otherwise, react with 👎.}

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

+          script.namespace
+        ) {
+          const searchResult = await scriptDAO.findByNameAndNamespace(script.name, script.namespace);


+                title: t("scriptname_conflict"),
+                content: t("confirm_save_when_scriptname_conflict"),


+          if (modalResult === "no") {
+            Message.warning(t("save_abort_when_edit_conflict"));
+            return Promise.reject(new Error("The script was edited in another instance. Save Aborted."));
+          }


…e-conflict-002

CodFrm · 2026-03-17T06:34:18Z

看起来没问题了，只是有两个错误的弹窗，可以优化一下

用户在同名冲突或编辑冲突弹窗中点击取消属于主动取消，统一使用 SAVE_CANCELED 标识并在 catch 链中跳过错误 toast。

cyfung1031 linked an issue Feb 7, 2026 that may be closed by this pull request

[Feature] 提醒有相同名字的腳本（安裝/更新/改代碼） #808

Closed

cyfung1031 changed the title ~~ScriptEditor: 脚本名称冲突 (合并至 develop/scripteditor-1)~~ [v1.3] ScriptEditor: 脚本名称冲突 (合并至 develop/scripteditor-1) Feb 7, 2026

cyfung1031 force-pushed the pr-script-name-conflict-002 branch from b0d2926 to b563ab1 Compare February 8, 2026 03:39

CodFrm requested a review from Copilot February 12, 2026 08:04

Copilot started reviewing on behalf of CodFrm February 12, 2026 08:04 View session

Copilot AI reviewed Feb 12, 2026

View reviewed changes

CodFrm mentioned this pull request Feb 12, 2026

[v1.3] [Editor] (feat) Edit Conflict Detection (develop/scripteditor-1 -> improve/scripteditor-2) #1222

Closed

cyfung1031 marked this pull request as draft February 24, 2026 00:43

cyfung1031 force-pushed the pr-script-name-conflict-002 branch from 1f05905 to 04ed433 Compare February 24, 2026 01:14

cyfung1031 changed the title ~~[v1.3] ScriptEditor: 脚本名称冲突 (合并至 develop/scripteditor-1)~~ [v1.4] ScriptEditor: 编辑冲突&脚本名称冲突 (合并至 improve/scripteditor-2) Feb 24, 2026

cyfung1031 changed the base branch from develop/scripteditor-1 to improve/scripteditor-2 February 24, 2026 01:16

cyfung1031 linked an issue Feb 24, 2026 that may be closed by this pull request

[Editor] 多个分页编辑同一脚本时未检测到版本冲突 #789

Closed

cyfung1031 changed the base branch from improve/scripteditor-2 to release/v1.4 March 15, 2026 04:50

重新 commit

d6c1131

cyfung1031 force-pushed the pr-script-name-conflict-002 branch from 04ed433 to d6c1131 Compare March 15, 2026 04:54

cyfung1031 changed the title ~~[v1.4] ScriptEditor: 编辑冲突&脚本名称冲突 (合并至 improve/scripteditor-2)~~ [v1.4] ScriptEditor: 编辑冲突&脚本名称冲突 Mar 15, 2026

cyfung1031 marked this pull request as ready for review March 16, 2026 12:50

CodFrm requested a review from Copilot March 17, 2026 05:42

Copilot started reviewing on behalf of CodFrm March 17, 2026 05:42 View session

Copilot AI reviewed Mar 17, 2026

View reviewed changes

Merge remote-tracking branch 'origin/release/v1.4' into pr-script-nam…

ceece6d

…e-conflict-002

🐛 编辑冲突弹窗取消时不再弹出错误提示

c1ff2d3

用户在同名冲突或编辑冲突弹窗中点击取消属于主动取消，统一使用 SAVE_CANCELED 标识并在 catch 链中跳过错误 toast。

CodFrm merged commit 283c8d4 into scriptscat:release/v1.4 Mar 17, 2026
2 of 3 checks passed

cyfung1031 deleted the pr-script-name-conflict-002 branch March 22, 2026 16:26

cyfung1031 mentioned this pull request Mar 29, 2026

[Editor] 多个分页编辑同一脚本时未检测到版本冲突 #789

Closed

CodFrm mentioned this pull request Mar 29, 2026

(v1.4) 配合 ScriptCat 1.3.x 更新 @crontab 说明 #1322

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[v1.4] ScriptEditor: 编辑冲突&脚本名称冲突#1223

[v1.4] ScriptEditor: 编辑冲突&脚本名称冲突#1223
CodFrm merged 3 commits intoscriptscat:release/v1.4from
cyfung1031:pr-script-name-conflict-002

cyfung1031 commented Feb 7, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 12, 2026

Uh oh!

CodFrm commented Feb 12, 2026

Uh oh!

cyfung1031 commented Feb 24, 2026

Uh oh!

cyfung1031 commented Mar 16, 2026

Uh oh!

CodFrm commented Mar 17, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

CodFrm commented Mar 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	return Promise.reject(new Error("This script name is already used by another script. Save aborted."));
	// 用户主动取消保存：中止当前保存流程，但不触发 Promise rejection
	return;

		title: t("scriptname_conflict"),
		content: t("confirm_save_when_scriptname_conflict"),

Conversation

cyfung1031 commented Feb 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

CodFrm commented Feb 12, 2026

Uh oh!

cyfung1031 commented Feb 24, 2026

Uh oh!

cyfung1031 commented Mar 16, 2026

Uh oh!

CodFrm commented Mar 17, 2026

Code review

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

CodFrm commented Mar 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants