From: edison Date: Mon, 12 Apr 2021 10:31:11 +0000 (+0800) Subject: chore: use isArray to keep the code consistency X-Git-Tag: v3.1.0-beta.1~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7db8c9c19ab6720ab091844999d74c97997268d6;p=thirdparty%2Fvuejs%2Fcore.git chore: use isArray to keep the code consistency --- diff --git a/packages/server-renderer/src/helpers/ssrRenderSlot.ts b/packages/server-renderer/src/helpers/ssrRenderSlot.ts index bcb393dea0..8b9a3971e2 100644 --- a/packages/server-renderer/src/helpers/ssrRenderSlot.ts +++ b/packages/server-renderer/src/helpers/ssrRenderSlot.ts @@ -1,5 +1,6 @@ import { ComponentInternalInstance, Slots } from 'vue' import { Props, PushFn, renderVNodeChildren, SSRBufferItem } from '../render' +import { isArray } from '@vue/shared' export type SSRSlots = Record export type SSRSlot = ( @@ -32,7 +33,7 @@ export function ssrRenderSlot( parentComponent, slotScopeId ? ' ' + slotScopeId : '' ) - if (Array.isArray(ret)) { + if (isArray(ret)) { // normal slot renderVNodeChildren(push, ret, parentComponent, slotScopeId) } else { diff --git a/packages/server-renderer/src/helpers/ssrVModelHelpers.ts b/packages/server-renderer/src/helpers/ssrVModelHelpers.ts index 959d5dcfb5..c6986f1b75 100644 --- a/packages/server-renderer/src/helpers/ssrVModelHelpers.ts +++ b/packages/server-renderer/src/helpers/ssrVModelHelpers.ts @@ -1,4 +1,4 @@ -import { looseEqual, looseIndexOf } from '@vue/shared' +import { looseEqual, looseIndexOf, isArray } from '@vue/shared' import { ssrRenderAttr } from './ssrRenderAttrs' export const ssrLooseEqual = looseEqual as (a: unknown, b: unknown) => boolean @@ -17,7 +17,7 @@ export function ssrRenderDynamicModel( case 'radio': return looseEqual(model, value) ? ' checked' : '' case 'checkbox': - return (Array.isArray(model) + return (isArray(model) ? ssrLooseContain(model, value) : model) ? ' checked' @@ -38,7 +38,7 @@ export function ssrGetDynamicModelProps( case 'radio': return looseEqual(model, value) ? { checked: true } : null case 'checkbox': - return (Array.isArray(model) + return (isArray(model) ? ssrLooseContain(model, value) : model) ? { checked: true }