@cabloy/vue-runtime-core 3.5.24 → 3.5.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/runtime-core.cjs.js
CHANGED
|
@@ -7735,6 +7735,8 @@ function mergeProps(...args) {
|
|
|
7735
7735
|
const incoming = toMerge[key];
|
|
7736
7736
|
if (incoming && existing !== incoming && !(shared.isArray(existing) && existing.includes(incoming))) {
|
|
7737
7737
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
7738
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
7739
|
+
ret[key] = incoming;
|
|
7738
7740
|
}
|
|
7739
7741
|
} else if (key !== "") {
|
|
7740
7742
|
ret[key] = toMerge[key];
|
|
@@ -6213,6 +6213,8 @@ function mergeProps(...args) {
|
|
|
6213
6213
|
const incoming = toMerge[key];
|
|
6214
6214
|
if (incoming && existing !== incoming && !(shared.isArray(existing) && existing.includes(incoming))) {
|
|
6215
6215
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
6216
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
6217
|
+
ret[key] = incoming;
|
|
6216
6218
|
}
|
|
6217
6219
|
} else if (key !== "") {
|
|
6218
6220
|
ret[key] = toMerge[key];
|
|
@@ -7792,6 +7792,8 @@ function mergeProps(...args) {
|
|
|
7792
7792
|
const incoming = toMerge[key];
|
|
7793
7793
|
if (incoming && existing !== incoming && !(isArray(existing) && existing.includes(incoming))) {
|
|
7794
7794
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
7795
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
7796
|
+
ret[key] = incoming;
|
|
7795
7797
|
}
|
|
7796
7798
|
} else if (key !== "") {
|
|
7797
7799
|
ret[key] = toMerge[key];
|