diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70b8c341fe4bd3fec338c92262c7ddae5b771238..92aa914e118f2aa8021ab940ecadf6de9125a757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Added
 
+- 表单新增支持分组图标，表单项图标
 - 新增图片裁剪上传组件
 
 ### Changed
diff --git a/src/control/form/form-detail/form-group-panel/form-group-panel.scss b/src/control/form/form-detail/form-group-panel/form-group-panel.scss
index ad8b642ae848330a83a65201f625b83561e44011..b8a96b79ea99d7f961cae659e77e45bb84480c9e 100644
--- a/src/control/form/form-detail/form-group-panel/form-group-panel.scss
+++ b/src/control/form/form-detail/form-group-panel/form-group-panel.scss
@@ -42,6 +42,10 @@ $form-group-content: (
     font-size: getCssVar('form-group-caption', 'font-size');
     font-weight: getCssVar('form-group-caption', 'font-weight');
     color: getCssVar('form-group-caption', 'text-color');
+
+    @include m('icon'){
+      padding-right: getCssVar(spacing,tight);
+    }
   }
 
   @include e(toolbar) {
diff --git a/src/control/form/form-detail/form-group-panel/form-group-panel.tsx b/src/control/form/form-detail/form-group-panel/form-group-panel.tsx
index 81e6ec2b1bb393a277ad654f6d0fe40c4b85d452..00ab5691cdd82691b8a0cd09f7645f26ad8a6719 100644
--- a/src/control/form/form-detail/form-group-panel/form-group-panel.tsx
+++ b/src/control/form/form-detail/form-group-panel/form-group-panel.tsx
@@ -94,6 +94,12 @@ export const FormGroupPanel = defineComponent({
         <div class={[this.ns.b('header')]} onClick={this.changeCollapse}>
           <div class={[this.ns.be('header', 'left')]}>
             <div class={[this.ns.e('caption'), ...this.controller.labelClass]}>
+              {this.modelData.sysImage && (
+                <iBizIcon
+                  class={this.ns.em('caption', 'icon')}
+                  icon={this.modelData.sysImage}
+                ></iBizIcon>
+              )}
               {this.captionText}
             </div>
           </div>
diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
index e0a0a1fdcc3d345108668ba6a302c2c3d61030a8..53c6aaa2f19ba25c537d8db672eb2bd918d58728 100644
--- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
+++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
@@ -43,6 +43,9 @@ $form-item-container: (
         color: getCssVar(color, fill-2);
       }
     }
+    @include m('icon'){
+      padding-right: getCssVar(spacing,tight);
+    }
   }
 
   @include e(popper) {
diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
index f172615d1db459186c8e308c188f2ba63eb27dcf..3f05bdc8f19ff6338e14083feb18c20fedfc52f0 100644
--- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
+++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
@@ -1,4 +1,4 @@
-import { useNamespace } from '@ibiz-template/vue3-util';
+import { IBizIcon, useNamespace } from '@ibiz-template/vue3-util';
 import { computed, defineComponent, ref } from 'vue';
 import './form-item-container.scss';
 import { showTitle } from '@ibiz-template/core';
@@ -39,6 +39,9 @@ export const IBizFormItemContainer = defineComponent({
     inputTipClosable: {
       type: Boolean,
     },
+    labelSysImg: {
+      type: Object,
+    },
   },
   setup(props) {
     const ns = useNamespace('form-item-container');
@@ -70,7 +73,17 @@ export const IBizFormItemContainer = defineComponent({
           >
             {{
               default: () => {
-                return <div class={classList}>{props.label}</div>;
+                return (
+                  <div class={classList}>
+                    {props.labelSysImg && (
+                      <IBizIcon
+                        class={ns.em('label', 'icon')}
+                        icon={props.labelSysImg}
+                      ></IBizIcon>
+                    )}
+                    {props.label}
+                  </div>
+                );
               },
               content: () => {
                 return (
@@ -96,6 +109,12 @@ export const IBizFormItemContainer = defineComponent({
       }
       return (
         <div class={classList} title={showTitle(props.label)}>
+          {props.labelSysImg && (
+            <IBizIcon
+              class={ns.em('label', 'icon')}
+              icon={props.labelSysImg}
+            ></IBizIcon>
+          )}
           {props.label}
         </div>
       );
diff --git a/src/control/form/form-detail/form-item/form-item.tsx b/src/control/form/form-detail/form-item/form-item.tsx
index b9e74d9ddd65cf3d0dc35d70c89885048f463383..4bef81f34d0e71e2fbd84a2daf474de3e62374df 100644
--- a/src/control/form/form-detail/form-item/form-item.tsx
+++ b/src/control/form/form-detail/form-item/form-item.tsx
@@ -129,6 +129,7 @@ export const FormItem = defineComponent({
         required={this.c.state.required}
         error={this.c.state.error}
         label={this.c.labelCaption}
+        labelSysImg={this.modelData.sysImage}
         labelClass={this.controller.labelClass}
         label-pos={this.c.model.labelPos}
         label-width={this.c.model.labelWidth}