nav tabs on admin dashboard
This commit is contained in:
+1
-1
@@ -41,7 +41,7 @@ if (process.env.NODE_ENV !== 'production') {
|
||||
? vm.options
|
||||
: vm._isVue
|
||||
? vm.$options || vm.constructor.options
|
||||
: vm || {}
|
||||
: vm
|
||||
let name = options.name || options._componentTag
|
||||
const file = options.__file
|
||||
if (!name && file) {
|
||||
|
||||
+3
-1
@@ -14,6 +14,8 @@ export const isEdge = UA && UA.indexOf('edge/') > 0
|
||||
export const isAndroid = (UA && UA.indexOf('android') > 0) || (weexPlatform === 'android')
|
||||
export const isIOS = (UA && /iphone|ipad|ipod|ios/.test(UA)) || (weexPlatform === 'ios')
|
||||
export const isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge
|
||||
export const isPhantomJS = UA && /phantomjs/.test(UA)
|
||||
export const isFF = UA && UA.match(/firefox\/(\d+)/)
|
||||
|
||||
// Firefox has a "watch" function on Object.prototype...
|
||||
export const nativeWatch = ({}).watch
|
||||
@@ -41,7 +43,7 @@ export const isServerRendering = () => {
|
||||
if (!inBrowser && !inWeex && typeof global !== 'undefined') {
|
||||
// detect presence of vue-server-renderer and avoid
|
||||
// Webpack shimming the process
|
||||
_isServer = global['process'].env.VUE_ENV === 'server'
|
||||
_isServer = global['process'] && global['process'].env.VUE_ENV === 'server'
|
||||
} else {
|
||||
_isServer = false
|
||||
}
|
||||
|
||||
+47
-13
@@ -3,25 +3,55 @@
|
||||
import config from '../config'
|
||||
import { warn } from './debug'
|
||||
import { inBrowser, inWeex } from './env'
|
||||
import { isPromise } from 'shared/util'
|
||||
import { pushTarget, popTarget } from '../observer/dep'
|
||||
|
||||
export function handleError (err: Error, vm: any, info: string) {
|
||||
if (vm) {
|
||||
let cur = vm
|
||||
while ((cur = cur.$parent)) {
|
||||
const hooks = cur.$options.errorCaptured
|
||||
if (hooks) {
|
||||
for (let i = 0; i < hooks.length; i++) {
|
||||
try {
|
||||
const capture = hooks[i].call(cur, err, vm, info) === false
|
||||
if (capture) return
|
||||
} catch (e) {
|
||||
globalHandleError(e, cur, 'errorCaptured hook')
|
||||
// Deactivate deps tracking while processing error handler to avoid possible infinite rendering.
|
||||
// See: https://github.com/vuejs/vuex/issues/1505
|
||||
pushTarget()
|
||||
try {
|
||||
if (vm) {
|
||||
let cur = vm
|
||||
while ((cur = cur.$parent)) {
|
||||
const hooks = cur.$options.errorCaptured
|
||||
if (hooks) {
|
||||
for (let i = 0; i < hooks.length; i++) {
|
||||
try {
|
||||
const capture = hooks[i].call(cur, err, vm, info) === false
|
||||
if (capture) return
|
||||
} catch (e) {
|
||||
globalHandleError(e, cur, 'errorCaptured hook')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
globalHandleError(err, vm, info)
|
||||
} finally {
|
||||
popTarget()
|
||||
}
|
||||
globalHandleError(err, vm, info)
|
||||
}
|
||||
|
||||
export function invokeWithErrorHandling (
|
||||
handler: Function,
|
||||
context: any,
|
||||
args: null | any[],
|
||||
vm: any,
|
||||
info: string
|
||||
) {
|
||||
let res
|
||||
try {
|
||||
res = args ? handler.apply(context, args) : handler.call(context)
|
||||
if (res && !res._isVue && isPromise(res)) {
|
||||
// issue #9511
|
||||
// reassign to res to avoid catch triggering multiple times when nested calls
|
||||
res = res.catch(e => handleError(e, vm, info + ` (Promise/async)`))
|
||||
}
|
||||
} catch (e) {
|
||||
handleError(e, vm, info)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
function globalHandleError (err, vm, info) {
|
||||
@@ -29,7 +59,11 @@ function globalHandleError (err, vm, info) {
|
||||
try {
|
||||
return config.errorHandler.call(null, err, vm, info)
|
||||
} catch (e) {
|
||||
logError(e, null, 'config.errorHandler')
|
||||
// if the user intentionally throws the original error in the handler,
|
||||
// do not log it twice
|
||||
if (e !== err) {
|
||||
logError(e, null, 'config.errorHandler')
|
||||
}
|
||||
}
|
||||
}
|
||||
logError(err, vm, info)
|
||||
|
||||
+8
-1
@@ -1,5 +1,12 @@
|
||||
/* @flow */
|
||||
|
||||
/**
|
||||
* unicode letters used for parsing html tags, component names and property paths.
|
||||
* using https://www.w3.org/TR/html53/semantics-scripting.html#potentialcustomelementname
|
||||
* skipping \u10000-\uEFFFF due to it freezing up PhantomJS
|
||||
*/
|
||||
export const unicodeRegExp = /a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/
|
||||
|
||||
/**
|
||||
* Check if a string starts with $ or _
|
||||
*/
|
||||
@@ -23,7 +30,7 @@ export function def (obj: Object, key: string, val: any, enumerable?: boolean) {
|
||||
/**
|
||||
* Parse simple path.
|
||||
*/
|
||||
const bailRE = /[^\w.$]/
|
||||
const bailRE = new RegExp(`[^${unicodeRegExp.source}.$_\\d]`)
|
||||
export function parsePath (path: string): any {
|
||||
if (bailRE.test(path)) {
|
||||
return
|
||||
|
||||
+56
-63
@@ -1,9 +1,11 @@
|
||||
/* @flow */
|
||||
/* globals MessageChannel */
|
||||
/* globals MutationObserver */
|
||||
|
||||
import { noop } from 'shared/util'
|
||||
import { handleError } from './error'
|
||||
import { isIOS, isNative } from './env'
|
||||
import { isIE, isIOS, isNative } from './env'
|
||||
|
||||
export let isUsingMicroTask = false
|
||||
|
||||
const callbacks = []
|
||||
let pending = false
|
||||
@@ -17,74 +19,69 @@ function flushCallbacks () {
|
||||
}
|
||||
}
|
||||
|
||||
// Here we have async deferring wrappers using both microtasks and (macro) tasks.
|
||||
// In < 2.4 we used microtasks everywhere, but there are some scenarios where
|
||||
// microtasks have too high a priority and fire in between supposedly
|
||||
// sequential events (e.g. #4521, #6690) or even between bubbling of the same
|
||||
// event (#6566). However, using (macro) tasks everywhere also has subtle problems
|
||||
// when state is changed right before repaint (e.g. #6813, out-in transitions).
|
||||
// Here we use microtask by default, but expose a way to force (macro) task when
|
||||
// needed (e.g. in event handlers attached by v-on).
|
||||
let microTimerFunc
|
||||
let macroTimerFunc
|
||||
let useMacroTask = false
|
||||
// Here we have async deferring wrappers using microtasks.
|
||||
// In 2.5 we used (macro) tasks (in combination with microtasks).
|
||||
// However, it has subtle problems when state is changed right before repaint
|
||||
// (e.g. #6813, out-in transitions).
|
||||
// Also, using (macro) tasks in event handler would cause some weird behaviors
|
||||
// that cannot be circumvented (e.g. #7109, #7153, #7546, #7834, #8109).
|
||||
// So we now use microtasks everywhere, again.
|
||||
// A major drawback of this tradeoff is that there are some scenarios
|
||||
// where microtasks have too high a priority and fire in between supposedly
|
||||
// sequential events (e.g. #4521, #6690, which have workarounds)
|
||||
// or even between bubbling of the same event (#6566).
|
||||
let timerFunc
|
||||
|
||||
// Determine (macro) task defer implementation.
|
||||
// Technically setImmediate should be the ideal choice, but it's only available
|
||||
// in IE. The only polyfill that consistently queues the callback after all DOM
|
||||
// events triggered in the same loop is by using MessageChannel.
|
||||
/* istanbul ignore if */
|
||||
if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
|
||||
macroTimerFunc = () => {
|
||||
setImmediate(flushCallbacks)
|
||||
}
|
||||
} else if (typeof MessageChannel !== 'undefined' && (
|
||||
isNative(MessageChannel) ||
|
||||
// PhantomJS
|
||||
MessageChannel.toString() === '[object MessageChannelConstructor]'
|
||||
)) {
|
||||
const channel = new MessageChannel()
|
||||
const port = channel.port2
|
||||
channel.port1.onmessage = flushCallbacks
|
||||
macroTimerFunc = () => {
|
||||
port.postMessage(1)
|
||||
}
|
||||
} else {
|
||||
/* istanbul ignore next */
|
||||
macroTimerFunc = () => {
|
||||
setTimeout(flushCallbacks, 0)
|
||||
}
|
||||
}
|
||||
|
||||
// Determine microtask defer implementation.
|
||||
// The nextTick behavior leverages the microtask queue, which can be accessed
|
||||
// via either native Promise.then or MutationObserver.
|
||||
// MutationObserver has wider support, however it is seriously bugged in
|
||||
// UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It
|
||||
// completely stops working after triggering a few times... so, if native
|
||||
// Promise is available, we will use it:
|
||||
/* istanbul ignore next, $flow-disable-line */
|
||||
if (typeof Promise !== 'undefined' && isNative(Promise)) {
|
||||
const p = Promise.resolve()
|
||||
microTimerFunc = () => {
|
||||
timerFunc = () => {
|
||||
p.then(flushCallbacks)
|
||||
// in problematic UIWebViews, Promise.then doesn't completely break, but
|
||||
// In problematic UIWebViews, Promise.then doesn't completely break, but
|
||||
// it can get stuck in a weird state where callbacks are pushed into the
|
||||
// microtask queue but the queue isn't being flushed, until the browser
|
||||
// needs to do some other work, e.g. handle a timer. Therefore we can
|
||||
// "force" the microtask queue to be flushed by adding an empty timer.
|
||||
if (isIOS) setTimeout(noop)
|
||||
}
|
||||
} else {
|
||||
// fallback to macro
|
||||
microTimerFunc = macroTimerFunc
|
||||
}
|
||||
|
||||
/**
|
||||
* Wrap a function so that if any code inside triggers state change,
|
||||
* the changes are queued using a (macro) task instead of a microtask.
|
||||
*/
|
||||
export function withMacroTask (fn: Function): Function {
|
||||
return fn._withTask || (fn._withTask = function () {
|
||||
useMacroTask = true
|
||||
const res = fn.apply(null, arguments)
|
||||
useMacroTask = false
|
||||
return res
|
||||
isUsingMicroTask = true
|
||||
} else if (!isIE && typeof MutationObserver !== 'undefined' && (
|
||||
isNative(MutationObserver) ||
|
||||
// PhantomJS and iOS 7.x
|
||||
MutationObserver.toString() === '[object MutationObserverConstructor]'
|
||||
)) {
|
||||
// Use MutationObserver where native Promise is not available,
|
||||
// e.g. PhantomJS, iOS7, Android 4.4
|
||||
// (#6466 MutationObserver is unreliable in IE11)
|
||||
let counter = 1
|
||||
const observer = new MutationObserver(flushCallbacks)
|
||||
const textNode = document.createTextNode(String(counter))
|
||||
observer.observe(textNode, {
|
||||
characterData: true
|
||||
})
|
||||
timerFunc = () => {
|
||||
counter = (counter + 1) % 2
|
||||
textNode.data = String(counter)
|
||||
}
|
||||
isUsingMicroTask = true
|
||||
} else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
|
||||
// Fallback to setImmediate.
|
||||
// Techinically it leverages the (macro) task queue,
|
||||
// but it is still a better choice than setTimeout.
|
||||
timerFunc = () => {
|
||||
setImmediate(flushCallbacks)
|
||||
}
|
||||
} else {
|
||||
// Fallback to setTimeout.
|
||||
timerFunc = () => {
|
||||
setTimeout(flushCallbacks, 0)
|
||||
}
|
||||
}
|
||||
|
||||
export function nextTick (cb?: Function, ctx?: Object) {
|
||||
@@ -102,11 +99,7 @@ export function nextTick (cb?: Function, ctx?: Object) {
|
||||
})
|
||||
if (!pending) {
|
||||
pending = true
|
||||
if (useMacroTask) {
|
||||
macroTimerFunc()
|
||||
} else {
|
||||
microTimerFunc()
|
||||
}
|
||||
timerFunc()
|
||||
}
|
||||
// $flow-disable-line
|
||||
if (!cb && typeof Promise !== 'undefined') {
|
||||
|
||||
+44
-14
@@ -2,8 +2,9 @@
|
||||
|
||||
import config from '../config'
|
||||
import { warn } from './debug'
|
||||
import { nativeWatch } from './env'
|
||||
import { set } from '../observer/index'
|
||||
import { unicodeRegExp } from './lang'
|
||||
import { nativeWatch, hasSymbol } from './env'
|
||||
|
||||
import {
|
||||
ASSET_TYPES,
|
||||
@@ -48,14 +49,24 @@ if (process.env.NODE_ENV !== 'production') {
|
||||
function mergeData (to: Object, from: ?Object): Object {
|
||||
if (!from) return to
|
||||
let key, toVal, fromVal
|
||||
const keys = Object.keys(from)
|
||||
|
||||
const keys = hasSymbol
|
||||
? Reflect.ownKeys(from)
|
||||
: Object.keys(from)
|
||||
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
key = keys[i]
|
||||
// in case the object is already observed...
|
||||
if (key === '__ob__') continue
|
||||
toVal = to[key]
|
||||
fromVal = from[key]
|
||||
if (!hasOwn(to, key)) {
|
||||
set(to, key, fromVal)
|
||||
} else if (isPlainObject(toVal) && isPlainObject(fromVal)) {
|
||||
} else if (
|
||||
toVal !== fromVal &&
|
||||
isPlainObject(toVal) &&
|
||||
isPlainObject(fromVal)
|
||||
) {
|
||||
mergeData(toVal, fromVal)
|
||||
}
|
||||
}
|
||||
@@ -136,13 +147,26 @@ function mergeHook (
|
||||
parentVal: ?Array<Function>,
|
||||
childVal: ?Function | ?Array<Function>
|
||||
): ?Array<Function> {
|
||||
return childVal
|
||||
const res = childVal
|
||||
? parentVal
|
||||
? parentVal.concat(childVal)
|
||||
: Array.isArray(childVal)
|
||||
? childVal
|
||||
: [childVal]
|
||||
: parentVal
|
||||
return res
|
||||
? dedupeHooks(res)
|
||||
: res
|
||||
}
|
||||
|
||||
function dedupeHooks (hooks) {
|
||||
const res = []
|
||||
for (let i = 0; i < hooks.length; i++) {
|
||||
if (res.indexOf(hooks[i]) === -1) {
|
||||
res.push(hooks[i])
|
||||
}
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
LIFECYCLE_HOOKS.forEach(hook => {
|
||||
@@ -253,11 +277,10 @@ function checkComponents (options: Object) {
|
||||
}
|
||||
|
||||
export function validateComponentName (name: string) {
|
||||
if (!/^[a-zA-Z][\w-]*$/.test(name)) {
|
||||
if (!new RegExp(`^[a-zA-Z][\\-\\.0-9_${unicodeRegExp.source}]*$`).test(name)) {
|
||||
warn(
|
||||
'Invalid component name: "' + name + '". Component names ' +
|
||||
'can only contain alphanumeric characters and the hyphen, ' +
|
||||
'and must start with a letter.'
|
||||
'should conform to valid custom element name in html5 specification.'
|
||||
)
|
||||
}
|
||||
if (isBuiltInTag(name) || config.isReservedTag(name)) {
|
||||
@@ -378,15 +401,22 @@ export function mergeOptions (
|
||||
normalizeProps(child, vm)
|
||||
normalizeInject(child, vm)
|
||||
normalizeDirectives(child)
|
||||
const extendsFrom = child.extends
|
||||
if (extendsFrom) {
|
||||
parent = mergeOptions(parent, extendsFrom, vm)
|
||||
}
|
||||
if (child.mixins) {
|
||||
for (let i = 0, l = child.mixins.length; i < l; i++) {
|
||||
parent = mergeOptions(parent, child.mixins[i], vm)
|
||||
|
||||
// Apply extends and mixins on the child options,
|
||||
// but only if it is a raw options object that isn't
|
||||
// the result of another mergeOptions call.
|
||||
// Only merged options has the _base property.
|
||||
if (!child._base) {
|
||||
if (child.extends) {
|
||||
parent = mergeOptions(parent, child.extends, vm)
|
||||
}
|
||||
if (child.mixins) {
|
||||
for (let i = 0, l = child.mixins.length; i < l; i++) {
|
||||
parent = mergeOptions(parent, child.mixins[i], vm)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const options = {}
|
||||
let key
|
||||
for (key in parent) {
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ if (process.env.NODE_ENV !== 'production') {
|
||||
perf.measure(name, startTag, endTag)
|
||||
perf.clearMarks(startTag)
|
||||
perf.clearMarks(endTag)
|
||||
perf.clearMeasures(name)
|
||||
// perf.clearMeasures(name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+42
-3
@@ -127,11 +127,10 @@ function assertProp (
|
||||
valid = assertedType.valid
|
||||
}
|
||||
}
|
||||
|
||||
if (!valid) {
|
||||
warn(
|
||||
`Invalid prop: type check failed for prop "${name}".` +
|
||||
` Expected ${expectedTypes.map(capitalize).join(', ')}` +
|
||||
`, got ${toRawType(value)}.`,
|
||||
getInvalidTypeMessage(name, value, expectedTypes),
|
||||
vm
|
||||
)
|
||||
return
|
||||
@@ -200,3 +199,43 @@ function getTypeIndex (type, expectedTypes): number {
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
function getInvalidTypeMessage (name, value, expectedTypes) {
|
||||
let message = `Invalid prop: type check failed for prop "${name}".` +
|
||||
` Expected ${expectedTypes.map(capitalize).join(', ')}`
|
||||
const expectedType = expectedTypes[0]
|
||||
const receivedType = toRawType(value)
|
||||
const expectedValue = styleValue(value, expectedType)
|
||||
const receivedValue = styleValue(value, receivedType)
|
||||
// check if we need to specify expected value
|
||||
if (expectedTypes.length === 1 &&
|
||||
isExplicable(expectedType) &&
|
||||
!isBoolean(expectedType, receivedType)) {
|
||||
message += ` with value ${expectedValue}`
|
||||
}
|
||||
message += `, got ${receivedType} `
|
||||
// check if we need to specify received value
|
||||
if (isExplicable(receivedType)) {
|
||||
message += `with value ${receivedValue}.`
|
||||
}
|
||||
return message
|
||||
}
|
||||
|
||||
function styleValue (value, type) {
|
||||
if (type === 'String') {
|
||||
return `"${value}"`
|
||||
} else if (type === 'Number') {
|
||||
return `${Number(value)}`
|
||||
} else {
|
||||
return `${value}`
|
||||
}
|
||||
}
|
||||
|
||||
function isExplicable (value) {
|
||||
const explicitTypes = ['string', 'number', 'boolean']
|
||||
return explicitTypes.some(elem => value.toLowerCase() === elem)
|
||||
}
|
||||
|
||||
function isBoolean (...args) {
|
||||
return args.some(elem => elem.toLowerCase() === 'boolean')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user