Skip to content

Commit 79703e3

Browse files
fix: resolve missing arrow in compose file comparison during app upgrade (#12663)
1 parent aee4e4e commit 79703e3

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

frontend/src/components/fu/FuTable.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ElTable } from 'element-plus';
2-
import { computed, defineComponent, h, onMounted, ref, watch, type PropType, type VNode } from 'vue';
2+
import { cloneVNode, computed, defineComponent, h, onMounted, ref, watch, type PropType, type VNode } from 'vue';
33

44
import {
55
FU_TABLE_STORAGE_PREFIX,
@@ -145,7 +145,15 @@ export default defineComponent({
145145
);
146146
return resolvedColumns.value
147147
.filter((column) => column.show !== false)
148-
.map((column) => columnNodeMap.get(column.key))
148+
.map((column) => {
149+
const vnode = columnNodeMap.get(column.key);
150+
if (!vnode) {
151+
return null;
152+
}
153+
return cloneVNode(vnode, {
154+
key: column.key,
155+
});
156+
})
149157
.filter((column): column is VNode => Boolean(column));
150158
});
151159

frontend/src/views/app-store/installed/upgrade/diff/index.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,11 @@ const initEditor = async () => {
105105
readOnly: false,
106106
automaticLayout: true,
107107
folding: true,
108+
glyphMargin: true,
108109
roundedSelection: false,
109110
overviewRulerBorder: false,
111+
renderMarginRevertIcon: true,
112+
renderGutterMenu: false,
110113
});
111114
112115
editor.setModel({

frontend/src/views/host/file-management/code-editor/history/index.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,11 @@ const renderDiff = async () => {
439439
readOnly: true,
440440
automaticLayout: true,
441441
folding: true,
442+
glyphMargin: true,
442443
roundedSelection: false,
443444
overviewRulerBorder: false,
445+
renderMarginRevertIcon: true,
446+
renderGutterMenu: false,
444447
});
445448
diffEditor.setModel({
446449
original: originalModel,

0 commit comments

Comments
 (0)