diff --git a/packages/amis-editor-core/scss/editor.scss b/packages/amis-editor-core/scss/editor.scss
index f60e64a15f8..ae5408fc662 100644
--- a/packages/amis-editor-core/scss/editor.scss
+++ b/packages/amis-editor-core/scss/editor.scss
@@ -459,9 +459,8 @@
   position: absolute;
   top: -24px;
   left: -2px;
-  z-index: 20;
+  z-index: 199; // 图层需要高于尺寸重置框，不遮挡工具栏按钮提示浮层
   border: 0;
-  padding-right: 8px;
   white-space: nowrap;
   background: $Editor-hlbox--onActive-bg;
   // border-radius: 3px 3px 0px 0px;
@@ -529,7 +528,7 @@
 
 .ae-Editor-toolbar {
   position: relative;
-  padding-left: 8px;
+  padding: 0 8px;
   display: inline-flex !important;
   pointer-events: all;
   align-items: center;
diff --git a/packages/amis-editor-core/src/component/HighlightBox.tsx b/packages/amis-editor-core/src/component/HighlightBox.tsx
index 685db8cd538..990b4e58a4a 100644
--- a/packages/amis-editor-core/src/component/HighlightBox.tsx
+++ b/packages/amis-editor-core/src/component/HighlightBox.tsx
@@ -330,7 +330,12 @@ export default observer(function ({
             ) : null}
           </div>
 
-          <div className="ae-Editor-toolbar" key="toolbar">
+          <div
+            className={cx('ae-Editor-toolbar', {
+              invisible: toolbars.length === 0
+            })}
+            key="toolbar"
+          >
             {toolbars.map(item => (
               <button
                 key={item.id}
diff --git a/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx b/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
index 2443ed8c43c..7661d538040 100644
--- a/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
+++ b/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
@@ -449,7 +449,8 @@ export class FlexPluginBase extends LayoutBasePlugin {
   regions: Array<RegionConfig> = [
     {
       key: 'items',
-      label: '子节点集合'
+      label: '子节点集合',
+      renderMethod: 'renderItems'
     }
   ];
 
diff --git a/packages/amis-editor/src/plugin/Tpl.tsx b/packages/amis-editor/src/plugin/Tpl.tsx
index ad3dfc0d900..ed033ae8640 100644
--- a/packages/amis-editor/src/plugin/Tpl.tsx
+++ b/packages/amis-editor/src/plugin/Tpl.tsx
@@ -290,7 +290,7 @@ export class TplPlugin extends BasePlugin {
     ]);
   };
 
-  popOverBody = [
+  popOverBody?: any[] = [
     getSchemaTpl('tpl:content'),
     getSchemaTpl('tpl:rich-text'),
     getSchemaTpl('tpl:wrapperComponent')
diff --git a/packages/amis/src/renderers/Flex.tsx b/packages/amis/src/renderers/Flex.tsx
index ba6d3121e49..ff61c902177 100644
--- a/packages/amis/src/renderers/Flex.tsx
+++ b/packages/amis/src/renderers/Flex.tsx
@@ -95,6 +95,18 @@ export default class Flex extends React.Component<FlexProps, object> {
     super(props);
   }
 
+  renderItems() {
+    const {items, render, disabled, classnames: cx} = this.props;
+    let children = Array.isArray(items) ? items : items ? [items] : [];
+
+    return children.map((item, key) =>
+      render(`items/${key}`, item, {
+        key: `items/${key}`,
+        disabled: (item as SchemaObject)?.disabled ?? disabled
+      })
+    );
+  }
+
   render() {
     const {
       items,
@@ -153,13 +165,7 @@ export default class Flex extends React.Component<FlexProps, object> {
         data-id={id}
         data-role="container"
       >
-        {(Array.isArray(items) ? items : items ? [items] : []).map(
-          (item, key) =>
-            render(`flexItem/${key}`, item, {
-              key: `flexItem/${key}`,
-              disabled: (item as SchemaObject)?.disabled ?? disabled
-            })
-        )}
+        {this.renderItems()}
         <CustomStyle
           {...this.props}
           config={{