zishuo/tiny-rdm
1
0
Fork 0
mirror of https://github.com/tiny-craft/tiny-rdm.git synced 2025-12-24 13:27:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: omitted keys are ignored during merging (#501)

Browse Source
This commit is contained in:
Lykin
2025-11-21 11:06:04 +08:00
parent 10cb916faa
commit 551c4d3db4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/stores/connections.js
View File

@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'
import { get, isEmpty, isObject, uniq } from 'lodash'
import { get, isEmpty, isObject, union, uniq } from 'lodash'
import {
CreateGroup,
DeleteConnection,
@@ -210,7 +210,8 @@ const useConnectionStore = defineStore('connections', {
mergeConnectionProfile(dest, src) {
const mergeObj = (destObj, srcObj) => {
for (const k in srcObj) {
const keys = union(Object.keys(destObj), Object.keys(srcObj))
for (const k of keys) {
const t = typeof srcObj[k]
if (t === 'string') {
destObj[k] = srcObj[k] || destObj[k] || ''