Merge pull request #11562 from toddWang23/feat-locationpicker-hide-co…

…ntrol feat: location picker 增加隐藏控件的参数
baidu · Feb 7, 2025 · ccc4744 · ccc4744
2 parents 42b0d75 + b0d74eb
commit ccc4744
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/packages/amis-ui/src/components/BaiduMapPicker.tsx b/packages/amis-ui/src/components/BaiduMapPicker.tsx
@@ -43,6 +43,7 @@ interface MapPickerProps {
   onlySelectCurrentLoc?: boolean;
   showSug?: boolean;
   showGeoLoc?: boolean;
+  hideViewControl?: boolean;
   mapStyle?: React.CSSProperties;
 }
 
@@ -138,10 +139,12 @@ export class BaiduMapPicker extends React.Component<
       map.centerAndZoom(point, zoom);
     }
 
-    map.addControl(
-      // @ts-ignore
-      new BMap.NavigationControl({type: BMAP_NAVIGATION_CONTROL_SMALL})
-    );
+    if (!this.props.hideViewControl) {
+      map.addControl(
+        // @ts-ignore
+        new BMap.NavigationControl({type: BMAP_NAVIGATION_CONTROL_SMALL})
+      );
+    }
 
     const geolocationControl = new BMap.GeolocationControl();
     geolocationControl.addEventListener('locationSuccess', (e: any) => {

diff --git a/packages/amis-ui/src/components/LocationPicker.tsx b/packages/amis-ui/src/components/LocationPicker.tsx
@@ -30,6 +30,7 @@ export interface LocationProps extends ThemeProps, LocaleProps {
   popOverContainer?: any;
   autoSelectCurrentLoc?: boolean;
   onlySelectCurrentLoc?: boolean;
+  hideViewControl?: boolean; // 隐藏地图控件，默认为false，即显示控件
 }
 
 export interface LocationState {
@@ -167,7 +168,8 @@ export class LocationPicker extends React.Component<
       ak,
       mobileUI,
       autoSelectCurrentLoc,
-      onlySelectCurrentLoc
+      onlySelectCurrentLoc,
+      hideViewControl = false
     } = this.props;
     const __ = this.props.translate;
     const {isFocused, isOpened} = this.state;
@@ -183,6 +185,7 @@ export class LocationPicker extends React.Component<
               autoSelectCurrentLoc={autoSelectCurrentLoc}
               onlySelectCurrentLoc={onlySelectCurrentLoc}
               onChange={this.handleChange}
+              hideViewControl={hideViewControl}
             />
           );
         case 'gaode':
@@ -254,6 +257,7 @@ export class LocationPicker extends React.Component<
                   autoSelectCurrentLoc={autoSelectCurrentLoc}
                   onlySelectCurrentLoc={onlySelectCurrentLoc}
                   onChange={this.handleTempChange}
+                  hideViewControl={hideViewControl}
                 />
               ) : (
                 <Alert2>{__('{{vendor}} 地图控件不支持', {vendor})}</Alert2>
@@ -282,6 +286,7 @@ export class LocationPicker extends React.Component<
                   autoSelectCurrentLoc={autoSelectCurrentLoc}
                   onlySelectCurrentLoc={onlySelectCurrentLoc}
                   onChange={this.handleChange}
+                  hideViewControl={hideViewControl}
                 />
               ) : (
                 <Alert2>{__('{{vendor}} 地图控件不支持', {vendor})}</Alert2>

diff --git a/packages/amis/src/renderers/Form/LocationPicker.tsx b/packages/amis/src/renderers/Form/LocationPicker.tsx
@@ -53,6 +53,11 @@ export interface LocationControlSchema extends FormBaseControlSchema {
    * 备注：区分下现有的placeholder（“请选择位置”）
    */
   getLocationPlaceholder?: string;
+
+  /**
+   * 是否隐藏地图控制组件，默认为false
+   */
+  hideViewControl?: boolean;
 }
 
 export interface LocationControlProps
@@ -144,7 +149,8 @@ export class LocationControl extends React.Component<LocationControlProps> {
       value,
       staticSchema,
       ak,
-      coordinatesType
+      coordinatesType,
+      hideViewControl = false
     } = this.props;
     const __ = this.props.translate;
 
@@ -173,6 +179,7 @@ export class LocationControl extends React.Component<LocationControlProps> {
               showSug={false}
               showGeoLoc={staticSchema.showGeoLoc}
               mapStyle={staticSchema.mapStyle}
+              hideViewControl={hideViewControl}
             />
           </>
         ) : (