From 3740698f19c335d9ea672f6e3c026f764a3d4bca Mon Sep 17 00:00:00 2001
From: "jlj05024111@163.com" <jlj05024111@163.com>
Date: Thu, 2 Jan 2025 19:33:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=86=E7=BB=84=E5=9B=BE=E6=A0=87=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=B9=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../form-group-panel/form-group-panel.scss    |  4 ++++
 .../form-group-panel/form-group-panel.tsx     |  6 +++++
 .../form-item-container.scss                  |  3 +++
 .../form-item-container.tsx                   | 23 +++++++++++++++++--
 .../form/form-detail/form-item/form-item.tsx  |  1 +
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70b8c341f..92aa914e1 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 ad8b642ae..b8a96b79e 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 81e6ec2b1..00ab5691c 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 e0a0a1fdc..53c6aaa2f 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 f172615d1..3f05bdc8f 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 b9e74d9dd..4bef81f34 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}
-- 
Gitee