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

package-lock.json

@@ -10,9 +10,9 @@
             "integrity": "sha512-p3KZgMto/JyxosKGmnLDJ/dG5wf+qTRMUjHJcspC2oQKa4jP7mz+tv0ND56lLBu3ojHlhzY33Ol+khLyNmilkA=="
         },
         "@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": {
             "version": "0.0.8",
@@ -35,13 +35,132 @@
         "doric": {
             "version": "file:../doric-js",
             "requires": {
-                "@types/ws": "^6.0.3",
+                "@types/ws": "^6.0.4",
                 "reflect-metadata": "^0.1.13",
-                "rollup": "^1.27.2",
+                "rollup": "^1.27.10",
                 "rollup-plugin-node-resolve": "^5.2.0",
                 "tslib": "^1.10.0",
-                "typescript": "^3.7.2",
+                "typescript": "^3.7.3",
                 "ws": "^7.2.0"
+            },
+            "dependencies": {
+                "@types/estree": {
+                    "version": "0.0.40",
+                    "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.40.tgz",
+                    "integrity": "sha512-p3KZgMto/JyxosKGmnLDJ/dG5wf+qTRMUjHJcspC2oQKa4jP7mz+tv0ND56lLBu3ojHlhzY33Ol+khLyNmilkA=="
+                },
+                "@types/node": {
+                    "version": "12.12.17",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz",
+                    "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA=="
+                },
+                "@types/resolve": {
+                    "version": "0.0.8",
+                    "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
+                    "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+                    "requires": {
+                        "@types/node": "*"
+                    }
+                },
+                "@types/ws": {
+                    "version": "6.0.4",
+                    "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
+                    "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
+                    "requires": {
+                        "@types/node": "*"
+                    }
+                },
+                "acorn": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+                    "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ=="
+                },
+                "async-limiter": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+                    "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+                },
+                "builtin-modules": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
+                    "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="
+                },
+                "estree-walker": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+                    "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="
+                },
+                "is-module": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+                    "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
+                },
+                "path-parse": {
+                    "version": "1.0.6",
+                    "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+                    "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+                },
+                "reflect-metadata": {
+                    "version": "0.1.13",
+                    "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+                    "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
+                },
+                "resolve": {
+                    "version": "1.13.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz",
+                    "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==",
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                },
+                "rollup": {
+                    "version": "1.27.10",
+                    "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.10.tgz",
+                    "integrity": "sha512-5PjBSKney8zLu7tTn/y4iVBL3OyK+G9rA/wfkcY78bZ9kAMtgNqb8nOfR5KpoDYyt8Vs5o2o8DyDjf9RpwYbAg==",
+                    "requires": {
+                        "@types/estree": "*",
+                        "@types/node": "*",
+                        "acorn": "^7.1.0"
+                    }
+                },
+                "rollup-plugin-node-resolve": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
+                    "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
+                    "requires": {
+                        "@types/resolve": "0.0.8",
+                        "builtin-modules": "^3.1.0",
+                        "is-module": "^1.0.0",
+                        "resolve": "^1.11.1",
+                        "rollup-pluginutils": "^2.8.1"
+                    }
+                },
+                "rollup-pluginutils": {
+                    "version": "2.8.2",
+                    "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+                    "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+                    "requires": {
+                        "estree-walker": "^0.6.1"
+                    }
+                },
+                "tslib": {
+                    "version": "1.10.0",
+                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+                    "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+                },
+                "typescript": {
+                    "version": "3.7.3",
+                    "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz",
+                    "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw=="
+                },
+                "ws": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz",
+                    "integrity": "sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==",
+                    "requires": {
+                        "async-limiter": "^1.0.0"
+                    }
+                }
             }
         },
         "estree-walker": {
@@ -96,9 +215,9 @@
             }
         },
         "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": {
                 "@types/estree": "*",
                 "@types/node": "*",

package.json

@@ -12,7 +12,7 @@
     "dependencies": {
         "doric": "file:../doric-js",
         "reflect-metadata": "^0.1.13",
-        "rollup": "^1.27.8",
+        "rollup": "^1.27.10",
         "rollup-plugin-commonjs": "^10.1.0",
         "rollup-plugin-node-resolve": "^5.2.0",
         "tslib": "^1.10.0",

src/FlowLayoutDemo.ts

@@ -17,7 +17,7 @@ class FlowDemo extends Panel {
     build(rootView: Group): void {
         flowlayout({
             layoutConfig: layoutConfig().atmost(),
-            itemCount: 500,
+            itemCount: 100,
             columnCount: 3,
             columnSpace: 10,
             rowSpace: 10,
@@ -35,6 +35,25 @@ class FlowDemo extends Panel {
                     }))
                 })
             },
+        }).also(it => {
+            it.loadMore = true
+            it.onLoadMore = () => {
+                setTimeout(() => {
+                    it.itemCount += 20
+                }, 1000)
+            }
+            it.loadMoreView = new FlowLayoutItem().apply({
+                backgroundColor: colors[500 % colors.length],
+                height: 50,
+                layoutConfig: layoutConfig().w(LayoutSpec.AT_MOST),
+            }).also(it => {
+                it.addChild(text({
+                    text: 'load more',
+                    textColor: Color.WHITE,
+                    textSize: 20,
+                    layoutConfig: layoutConfig().wrap().a(Gravity.Center)
+                }))
+            })
         })
             .in(rootView)
     }

src/ImageDemo.ts

@@ -53,6 +53,7 @@ class ImageDemo extends Panel {
                 imageUrl,
                 width: 300,
                 height: 300,
+                isBlur: true,
                 border: {
                     width: 2,
                     color: Color.GRAY,