Merge branch 'master' of code.aliyun.com:Doric/doric-js

This commit is contained in:
pengfei.zhou 2019-12-12 17:31:26 +08:00
commit fb47613b89
4 changed files with 12 additions and 8 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ node_modules/
build/ build/
bundle/ bundle/
demo/ demo/
.DS_Store

12
package-lock.json generated
View File

@ -10,9 +10,9 @@
"integrity": "sha512-p3KZgMto/JyxosKGmnLDJ/dG5wf+qTRMUjHJcspC2oQKa4jP7mz+tv0ND56lLBu3ojHlhzY33Ol+khLyNmilkA==" "integrity": "sha512-p3KZgMto/JyxosKGmnLDJ/dG5wf+qTRMUjHJcspC2oQKa4jP7mz+tv0ND56lLBu3ojHlhzY33Ol+khLyNmilkA=="
}, },
"@types/node": { "@types/node": {
"version": "12.12.14", "version": "12.12.17",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.14.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz",
"integrity": "sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==" "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA=="
}, },
"@types/resolve": { "@types/resolve": {
"version": "0.0.8", "version": "0.0.8",
@ -74,9 +74,9 @@
} }
}, },
"rollup": { "rollup": {
"version": "1.27.8", "version": "1.27.10",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.8.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.10.tgz",
"integrity": "sha512-EVoEV5rAWl+5clnGznt1KY8PeVkzVQh/R0d2s3gHEkN7gfoyC4JmvIVuCtPbYE8NM5Ep/g+nAmvKXBjzaqTsHA==", "integrity": "sha512-5PjBSKney8zLu7tTn/y4iVBL3OyK+G9rA/wfkcY78bZ9kAMtgNqb8nOfR5KpoDYyt8Vs5o2o8DyDjf9RpwYbAg==",
"requires": { "requires": {
"@types/estree": "*", "@types/estree": "*",
"@types/node": "*", "@types/node": "*",

View File

@ -22,7 +22,7 @@
"dependencies": { "dependencies": {
"@types/ws": "^6.0.4", "@types/ws": "^6.0.4",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"rollup": "^1.27.8", "rollup": "^1.27.10",
"rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-node-resolve": "^5.2.0",
"tslib": "^1.10.0", "tslib": "^1.10.0",
"typescript": "^3.7.3", "typescript": "^3.7.3",

View File

@ -26,6 +26,7 @@ export interface IImage extends IView {
imageUrl?: string imageUrl?: string
imageBase64?: string imageBase64?: string
scaleType?: ScaleType scaleType?: ScaleType
isBlur?: boolean
loadCallback?: (image: { width: number; height: number } | undefined) => void loadCallback?: (image: { width: number; height: number } | undefined) => void
} }
@ -36,6 +37,8 @@ export class Image extends View implements IImage {
imageBase64?: string imageBase64?: string
@Property @Property
scaleType?: ScaleType scaleType?: ScaleType
@Property
isBlur?: boolean
@Property @Property
loadCallback?: (image: { width: number; height: number } | undefined) => void loadCallback?: (image: { width: number; height: number } | undefined) => void