From e0ac1dff8855d0642948a638bd8f2beb136d4d40 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 17 Apr 2025 09:45:04 +0800 Subject: [PATCH 1/3] * [refac bug #61548] transfer syncData value when create programplan. --- module/programplan/js/create.ui.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js index 682ad81e48..b2e920de8a 100644 --- a/module/programplan/js/create.ui.js +++ b/module/programplan/js/create.ui.js @@ -140,6 +140,7 @@ window.handleRenderRow = function($row, index, data) } if($row.find('input[data-name="milestone"]:checked').length == 0) $row.find('input[data-name="milestone"]').eq(1).prop('checked', true); //里程碑默认选择“否”。 + if($prevLevelRow.length && $prevLevelRow.find('input[data-name="syncData"]').val() == '1') $row.find('input[data-name="syncData"]').val(1); /* 处理已有数据字段状态。隐藏的删除按钮,禁用管理方法字段。 */ if(typeof data != 'undefined' && typeof data.id != 'undefined') From 25074d349c9392c8cd86059f8c292ebf384bbea1 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 17 Apr 2025 09:54:20 +0800 Subject: [PATCH 2/3] * [bug#61562] adjust monaco editor selected style. --- lib/zin/wg/monaco/js/v1.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/zin/wg/monaco/js/v1.js b/lib/zin/wg/monaco/js/v1.js index 3d8ec1e2c3..68ea5ab8fe 100644 --- a/lib/zin/wg/monaco/js/v1.js +++ b/lib/zin/wg/monaco/js/v1.js @@ -122,26 +122,16 @@ function createMonaco(id, action, options, diffContent, onMouseDown, onMouseMove decorations = editor.deltaDecorations([], decorations); } - editor.onDidChangeCursorSelection(function() + editor.onDidChangeCursorSelection(function(e) { - // 只有当没有程序化选择时才更新装饰器 - if(!programmaticSelectionRange) return; + if(!programmaticSelectionRange) return; // 只有当没有程序化选择时才更新装饰器 - // 如果用户手动改变了选择,清除程序化选择的样式 - if(e.selections.some(sel => !rangesEqual(sel, programmaticSelectionRange))) + if(e.selection.startLineNumber == programmaticSelectionRange.startLineNumber || e.selection.endLineNumber == programmaticSelectionRange.endLineNumber) { programmaticSelectionRange = null; updateDecorations(); } }); - - function rangesEqual(r1, r2) - { - return r1.startLineNumber === r2.startLineNumber && - r1.startColumn === r2.startColumn && - r1.endLineNumber === r2.endLineNumber && - r1.endColumn === r2.endColumn; - } }); } From f676e1b98d56db2c206c1cafdb75c9ab537635fe Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 17 Apr 2025 10:12:39 +0800 Subject: [PATCH 3/3] * [bug#56638] adjust code review page style. --- lib/zin/wg/monaco/css/v1.css | 2 ++ lib/zin/wg/monaco/js/v1.js | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/zin/wg/monaco/css/v1.css b/lib/zin/wg/monaco/css/v1.css index 8533efe6c4..0d9b84fee0 100644 --- a/lib/zin/wg/monaco/css/v1.css +++ b/lib/zin/wg/monaco/css/v1.css @@ -3,3 +3,5 @@ /* 半透明黄色 */ .monaco-editor .yellow-decoration {background-color: rgba(255, 255, 0, 0.2);} + +.monaco-editor .margin .line-numbers {padding-left: 16px;} diff --git a/lib/zin/wg/monaco/js/v1.js b/lib/zin/wg/monaco/js/v1.js index 68ea5ab8fe..24851083a8 100644 --- a/lib/zin/wg/monaco/js/v1.js +++ b/lib/zin/wg/monaco/js/v1.js @@ -37,6 +37,7 @@ function createMonaco(id, action, options, diffContent, onMouseDown, onMouseMove fontSize: 14, lineHeight: 24, lineNumbersMinChars: 2, + glyphMargin: true, // 启用装饰器边距 // 内边距设置 padding: {top: 8, bottom: 8}