diff --git a/scss/components/form/_location.scss b/scss/components/form/_location.scss
index 2ce517745..0c67aa277 100644
--- a/scss/components/form/_location.scss
+++ b/scss/components/form/_location.scss
@@ -72,6 +72,7 @@
 
 .#{$ns}LocationControl {
   position: relative;
+  width: 100%;
 }
 
 .#{$ns}LocationControl:not(.is-inline) > .#{$ns}LocationPicker {
diff --git a/src/components/LocationPicker.tsx b/src/components/LocationPicker.tsx
index 4ad2649ea..7296873ef 100644
--- a/src/components/LocationPicker.tsx
+++ b/src/components/LocationPicker.tsx
@@ -186,6 +186,7 @@ export class LocationPicker extends React.Component<
             onHide={this.close}
             overlay
             onClick={this.handlePopOverClick}
+            style={{width: this.getTarget()?.offsetWidth}}
           >
             {vendor === 'baidu' ? (
               <BaiduMapPicker ak={ak} value={value} onChange={this.handleChange} />
diff --git a/src/renderers/Table.tsx b/src/renderers/Table.tsx
index af9a45576..b7efb3a98 100644
--- a/src/renderers/Table.tsx
+++ b/src/renderers/Table.tsx
@@ -52,6 +52,7 @@ export interface TableProps extends RendererProps {
   footerClassName?: string;
   store: ITableStore;
   columns?: Array<Column>;
+  headingClassName?: string;
   tableClassName?: string;
   source?: string;
   selectable?: boolean;
@@ -109,6 +110,7 @@ export default class Table extends React.Component<TableProps, object> {
     'expandConfig',
     'placeholder',
     'tableClassName',
+    'headingClassName',
     'source',
     'selectable',
     'columnsTogglable',
@@ -939,7 +941,8 @@ export default class Table extends React.Component<TableProps, object> {
       hideQuickSaveBtn,
       data,
       classnames: cx,
-      saveImmediately
+      saveImmediately,
+      headingClassName
     } = this.props;
 
     if (
@@ -948,7 +951,7 @@ export default class Table extends React.Component<TableProps, object> {
       store.moved
     ) {
       return (
-        <div className={cx('Table-heading')} key="heading">
+        <div className={cx('Table-heading', headingClassName)} key="heading">
           {!saveImmediately && store.modified && !hideQuickSaveBtn ? (
             <span>
               {`当前有 ${
@@ -1888,7 +1891,6 @@ export default class Table extends React.Component<TableProps, object> {
           'Table--unsaved': !!store.modified || !!store.moved
         })}
       >
-        {this.renderAffixHeader(tableClassName)}
         {heading}
         {header}
         <div
@@ -1916,6 +1918,7 @@ export default class Table extends React.Component<TableProps, object> {
           {this.renderTableContent()}
           {~store.hoverIndex ? this.renderItemActions() : null}
         </div>
+        {this.renderAffixHeader(tableClassName)}
         {footer}
       </div>
     );