fix(wechat): 修复 Map 组件 polygons 属性不生效的问题 (#1038)

fix #1035
remaxjs · Jun 5, 2020 · 48487b2 · 48487b2 · vercel · Jun 5, 2020
1 parent 7fade58
commit 48487b2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/...emax-cli/src/__tests__/integration/fixtures/createHostComponent/expected/wechat/base.wxml b/...emax-cli/src/__tests__/integration/fixtures/createHostComponent/expected/wechat/base.wxml
@@ -1044,7 +1044,7 @@ latitude="{{_h.v(i.props['latitude'])}}"
 layer-style="{{_h.v(i.props['layer-style'])}}"
 longitude="{{_h.v(i.props['longitude'])}}"
 markers="{{_h.v(i.props['markers'])}}"
-polygon="{{_h.v(i.props['polygon'])}}"
+polygons="{{_h.v(i.props['polygons'])}}"
 polyline="{{_h.v(i.props['polyline'])}}"
 rotate="{{_h.v(i.props['rotate'])}}"
 scale="{{_h.v(i.props['scale'])}}"

diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/base.wxml b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/wechat/base.wxml
@@ -797,7 +797,7 @@ latitude="{{_h.v(i.props['latitude'])}}"
 layer-style="{{_h.v(i.props['layer-style'])}}"
 longitude="{{_h.v(i.props['longitude'])}}"
 markers="{{_h.v(i.props['markers'])}}"
-polygon="{{_h.v(i.props['polygon'])}}"
+polygons="{{_h.v(i.props['polygons'])}}"
 polyline="{{_h.v(i.props['polyline'])}}"
 rotate="{{_h.v(i.props['rotate'])}}"
 scale="{{_h.v(i.props['scale'])}}"

diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/typescript/expected/wechat/base.wxml b/packages/remax-cli/src/__tests__/integration/fixtures/typescript/expected/wechat/base.wxml
@@ -854,7 +854,7 @@ latitude="{{_h.v(i.props['latitude'])}}"
 layer-style="{{_h.v(i.props['layer-style'])}}"
 longitude="{{_h.v(i.props['longitude'])}}"
 markers="{{_h.v(i.props['markers'])}}"
-polygon="{{_h.v(i.props['polygon'])}}"
+polygons="{{_h.v(i.props['polygons'])}}"
 polyline="{{_h.v(i.props['polyline'])}}"
 rotate="{{_h.v(i.props['rotate'])}}"
 scale="{{_h.v(i.props['scale'])}}"

diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/universe/expected/wechat/base.wxml b/packages/remax-cli/src/__tests__/integration/fixtures/universe/expected/wechat/base.wxml
@@ -854,7 +854,7 @@ latitude="{{_h.v(i.props['latitude'])}}"
 layer-style="{{_h.v(i.props['layer-style'])}}"
 longitude="{{_h.v(i.props['longitude'])}}"
 markers="{{_h.v(i.props['markers'])}}"
-polygon="{{_h.v(i.props['polygon'])}}"
+polygons="{{_h.v(i.props['polygons'])}}"
 polyline="{{_h.v(i.props['polyline'])}}"
 rotate="{{_h.v(i.props['rotate'])}}"
 scale="{{_h.v(i.props['scale'])}}"

diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/wechat/expected/base.wxml b/packages/remax-cli/src/__tests__/integration/fixtures/wechat/expected/base.wxml
@@ -854,7 +854,7 @@ latitude="{{_h.v(i.props['latitude'])}}"
 layer-style="{{_h.v(i.props['layer-style'])}}"
 longitude="{{_h.v(i.props['longitude'])}}"
 markers="{{_h.v(i.props['markers'])}}"
-polygon="{{_h.v(i.props['polygon'])}}"
+polygons="{{_h.v(i.props['polygons'])}}"
 polyline="{{_h.v(i.props['polyline'])}}"
 rotate="{{_h.v(i.props['rotate'])}}"
 scale="{{_h.v(i.props['scale'])}}"

diff --git a/packages/remax-wechat/src/__tests__/components/__snapshots__/Map.test.tsx.snap b/packages/remax-wechat/src/__tests__/components/__snapshots__/Map.test.tsx.snap
@@ -14,6 +14,7 @@ exports[`Map render correctly 1`] = `
  longitude={0}
  rotate={0}
  scale={16}
+ setting={Object {}}
  showCompass={false}
  showLocation={false}
  showScale={false}

diff --git a/packages/remax-wechat/src/hostComponents/Map/index.ts b/packages/remax-wechat/src/hostComponents/Map/index.ts
@@ -50,6 +50,8 @@ export interface MapProps extends BaseProps {
  enableSatellite?: boolean;
  /** (default: false) 是否开启实时路况 2.7.0 */
  enableTraffic?: boolean;
+ /** 配置项 2.8.2 */
+ setting?: any;
  /** 点击标记点时触发，e.detail = {markerId} 1.0.0 */
  onMarkerClick?: (event: any) => any;
  /** 点击控件时触发，e.detail = {controlId} 1.0.0 */
@@ -81,4 +83,5 @@ Map.defaultProps = {
  enableRotate: false,
  enableSatellite: false,
  enableTraffic: false,
+ setting: {},
 };
diff --git a/packages/remax-wechat/src/hostComponents/Map/node.ts b/packages/remax-wechat/src/hostComponents/Map/node.ts
@@ -10,7 +10,7 @@ export const alias = {
  polyline: 'polyline',
  circles: 'circles',
  controls: 'controls',
- polygon: 'polygon',
+ polygons: 'polygons',
  showLocation: 'show-location',
  includePoints: 'include-points',
  includePadding: 'include-padding',