blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-05 19:41:42 +08:00
Code Issues Projects Releases Wiki Activity

[bugfix] Icon: should support render local image

Browse Source
This commit is contained in:
陈嘉涵 2019-06-03 20:46:16 +08:00
parent 6e4b82249b
commit c6a32879ec
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/icon/index.tsx
View File

@ -1,7 +1,6 @@
import { use } from '../utils';
import { inherit } from '../utils/functional';
import Info from '../info';
import { isSrc } from '../utils/validate/src';
// Types
import { CreateElement, RenderContext } from 'vue/types';
@ -22,13 +21,17 @@ export type IconEvents = {
const [sfc] = use('icon');
function isImage(name?: string): boolean {
return name ? name.indexOf('/') !== -1 : false;
}
function Icon(
h: CreateElement,
props: IconProps,
slots: DefaultSlots,
ctx: RenderContext<IconProps>
) {
const urlIcon = isSrc(props.name);
const urlIcon = isImage(props.name);
return (
<props.tag

5
packages/icon/test/__snapshots__/index.spec.js.snap
View File

@ -10,6 +10,11 @@ exports[`render icon with builtin icon name 1`] = `
<!----></i>
`;
exports[`render icon with local image 1`] = `
<i class="van-icon van-icon--image"><img src="/assets/icon.jpg">
<!----></i>
`;
exports[`render icon with url name 1`] = `
<i class="van-icon van-icon--image"><img src="https://img.yzcdn.com/icon.jpg">
<!----></i>

9
packages/icon/test/index.spec.js
View File

@ -19,6 +19,15 @@ test('render icon with url name', () => {
expect(wrapper).toMatchSnapshot();
});
test('render icon with local image', () => {
const wrapper = mount(Icon, {
propsData: {
name: '/assets/icon.jpg'
}
});
expect(wrapper).toMatchSnapshot();
});
test('render icon default slot', () => {
const wrapper = mount({
render(h) {

14
packages/utils/test/index.spec.js
View File

@ -2,7 +2,6 @@ import { deepClone } from '../deep-clone';
import { isAndroid, isDef, camelize, get } from '..';
import { raf, cancel } from '../raf';
import { later } from '../../../test/utils';
import { isSrc } from '../validate/src';
import { isEmail } from '../validate/email';
import { isMobile } from '../validate/mobile';
import { isNumber } from '../validate/number';
@ -77,16 +76,3 @@ test('is-number', () => {
expect(isNumber('abc')).toBeFalsy();
expect(isNumber('1b2')).toBeFalsy();
});
test('is-src', () => {
expect(isSrc('http://img.cdn.com')).toBeTruthy();
expect(isSrc('https://img.cdn.com')).toBeTruthy();
expect(isSrc('//img.cdn.com')).toBeTruthy();
expect(isSrc('data:image/jpeg;base64,/9j/4AAQSkZ')).toBeTruthy();
expect(isSrc('img.cdn.com')).toBeFalsy();
expect(isSrc('name')).toBeFalsy();
expect(isSrc('')).toBeFalsy();
expect(isSrc('blob:http://img.cdn.com')).toBeTruthy();
expect(isSrc('blob:https://img.cdn.com')).toBeTruthy();
expect(isSrc('xdata:image/jpeg;base64,/9j/4AAQSkZ')).toBeFalsy();
});

6
packages/utils/validate/src.ts
View File

@ -1,6 +0,0 @@
/**
* Is image source
*/
export function isSrc(url: string): boolean {
return /^(((blob:)?https?:)?\/\/|data:image)/.test(url);
}