diff --git a/docs/api/changelog.zh.md b/docs/api/changelog.zh.md index a09432cb25..af235d7735 100644 --- a/docs/api/changelog.zh.md +++ b/docs/api/changelog.zh.md @@ -18,10 +18,10 @@ order: 10 - 支持 arc 弧线反向 - ### 🐞 Bug Fixes - 修复使用多个文字标注图层时存在的问题 + ## 2020.04.20 2.2 正式版本 ###✨ Features diff --git a/packages/component/src/control/BaseControl.ts b/packages/component/src/control/BaseControl.ts index c032928f53..ac67a86c68 100644 --- a/packages/component/src/control/BaseControl.ts +++ b/packages/component/src/control/BaseControl.ts @@ -44,7 +44,7 @@ export default class Control extends EventEmitter { name: `${controlId++}`, }; } - + public setPosition(position: PositionName = 'bottomright') { // 考虑组件的自动布局,需要销毁重建 const controlService = this.controlService; diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 039cff3a65..628775ba44 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.3.11'; +const version = '2.4.0'; export { version }; diff --git a/packages/layers/src/line/models/arc.ts b/packages/layers/src/line/models/arc.ts index 18c2814cd3..ad3534c58b 100644 --- a/packages/layers/src/line/models/arc.ts +++ b/packages/layers/src/line/models/arc.ts @@ -6,7 +6,7 @@ import { ILayerConfig, IModel, IModelUniform, - ITexture2D + ITexture2D, } from '@antv/l7-core'; import BaseModel from '../../core/BaseModel'; @@ -63,7 +63,6 @@ export default class ArcModel extends BaseModel { } public initModels(): IModel[] { - this.updateTexture(); this.iconService.on('imageUpdate', this.updateTexture); diff --git a/packages/layers/src/line/models/arc_3d.ts b/packages/layers/src/line/models/arc_3d.ts index 6a530eb4bd..02da32a2e6 100644 --- a/packages/layers/src/line/models/arc_3d.ts +++ b/packages/layers/src/line/models/arc_3d.ts @@ -10,8 +10,8 @@ import { import BaseModel from '../../core/BaseModel'; import { ILineLayerStyleOptions, lineStyleType } from '../../core/interface'; import { LineArcTriangulation } from '../../core/triangulation'; -import line_arc_vert from '../shaders/line_arc_3d_vert.glsl'; import line_arc_frag from '../shaders/line_arc_3d_frag.glsl'; +import line_arc_vert from '../shaders/line_arc_3d_vert.glsl'; const lineStyleObj: { [key: string]: number } = { solid: 0.0, dash: 1.0, diff --git a/stories/Map/components/amap2demo_arcLine3DTex.tsx b/stories/Map/components/amap2demo_arcLine3DTex.tsx index 8a3e7b3b61..2bd9c9b1eb 100644 --- a/stories/Map/components/amap2demo_arcLine3DTex.tsx +++ b/stories/Map/components/amap2demo_arcLine3DTex.tsx @@ -19,7 +19,7 @@ export default class Amap2demo_arcLine3DTex extends React.Component { center: [107.77791556935472, 35.443286920228644], zoom: 2.9142882493605033, viewMode: '3D', - style: "dark" + style: 'dark', }), }); this.scene = scene; @@ -60,15 +60,13 @@ export default class Amap2demo_arcLine3DTex extends React.Component { // lineTexture: true, // 开启线的贴图功能 // iconStep: 100, // 设置贴图纹理的间距 // // opacity: 0 - }) + }); // .animate({ // duration: 50, // interval: 0.3, // trailLength: 0.1, // }); scene.addLayer(layer); - - }); } diff --git a/stories/Map/components/amap2demo_arcLineTex.tsx b/stories/Map/components/amap2demo_arcLineTex.tsx index 7dee3d2b2c..63255830fb 100644 --- a/stories/Map/components/amap2demo_arcLineTex.tsx +++ b/stories/Map/components/amap2demo_arcLineTex.tsx @@ -19,7 +19,7 @@ export default class Amap2demo_arcLineTex extends React.Component { center: [107.77791556935472, 35.443286920228644], zoom: 2.9142882493605033, viewMode: '3D', - style: "dark" + style: 'dark', }), }); this.scene = scene; @@ -59,13 +59,13 @@ export default class Amap2demo_arcLineTex extends React.Component { forward: false, lineTexture: true, // 开启线的贴图功能 iconStep: 100, // 设置贴图纹理的间距 - opacity: 0 + opacity: 0, }) - .animate({ - duration: 50, - interval: 0.3, - trailLength: 0.1, - }); + .animate({ + duration: 50, + interval: 0.3, + trailLength: 0.1, + }); scene.addLayer(layer); }); }