功能新增: - OSS 存储使用情况显示(文件页面) - OSS 当日流量统计(阿里云云监控API) - 分享页面路由修复(/s/xxx 格式支持) Bug修复: - 修复分享页面资源路径(相对路径改绝对路径) - 修复分享码获取逻辑(支持路径格式) - 修复OSS配额undefined显示问题 - 修复登录流程OSS配置检查 - 修复文件数为null时的显示问题 依赖更新: - 添加 @alicloud/cms20190101 云监控SDK - 添加 @alicloud/openapi-client Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
47 lines
1.2 KiB
JavaScript
47 lines
1.2 KiB
JavaScript
var clone = require('./clone');
|
|
|
|
module.exports = merge;
|
|
|
|
function typesMatch(a, b) {
|
|
return (typeof a === typeof b) && (Array.isArray(a) === Array.isArray(b));
|
|
}
|
|
|
|
/**
|
|
* A deep merge of the source based on the target.
|
|
* @param {Object} source [description]
|
|
* @param {Object} target [description]
|
|
* @return {Object} [description]
|
|
*/
|
|
function merge(source, target, result) {
|
|
if (result === undefined) {
|
|
result = clone(source);
|
|
}
|
|
|
|
// merge missing values from the target to the source
|
|
Object.getOwnPropertyNames(target).forEach(function (key) {
|
|
if (source[key] === undefined) {
|
|
result[key] = target[key];
|
|
}
|
|
});
|
|
|
|
Object.getOwnPropertyNames(source).forEach(function (key) {
|
|
var value = source[key];
|
|
|
|
if (target[key] && typesMatch(value, target[key])) {
|
|
// merge empty values
|
|
if (value === '') {
|
|
result[key] = target[key];
|
|
}
|
|
|
|
if (Array.isArray(value)) {
|
|
if (value.length === 0 && target[key].length) {
|
|
result[key] = target[key].slice(0);
|
|
}
|
|
} else if (typeof value === 'object') {
|
|
result[key] = merge(value, target[key]);
|
|
}
|
|
}
|
|
});
|
|
|
|
return result;
|
|
} |