From e3818ba878d5a5590d90416b63eaa1cde80bce4e Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Tue, 25 Feb 2025 21:06:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E8=A6=81=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                           |  1 +
 src/common/button-list/button-list.tsx                 |  6 +++++-
 .../form/form-detail/form-button/form-button.tsx       |  1 +
 src/control/toolbar/toolbar.scss                       |  6 ++++++
 src/control/toolbar/toolbar.tsx                        | 10 +++++++++-
 .../upload/ibiz-file-upload/ibiz-file-upload.tsx       |  1 +
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf96588e8..974175332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Added
 
 - 补充表单设计移动端编辑器的预览呈现
+- 更新添加主要按钮样式
 
 ## [0.7.38-alpha.61] - 2025-02-24
 
diff --git a/src/common/button-list/button-list.tsx b/src/common/button-list/button-list.tsx
index e1e2ee45a..34457ebf0 100644
--- a/src/common/button-list/button-list.tsx
+++ b/src/common/button-list/button-list.tsx
@@ -186,11 +186,13 @@ export const IBizButtonList = defineComponent({
      *
      * @param {IAppDEUIActionGroupDetail} item
      * @param {boolean} [disabled=false]
+     * @param {string} [type='']
      * @return {*}  {(JSX.Element | null)}
      */
     const renderButton = (
       item: IAppDEUIActionGroupDetail,
       disabled: boolean = false,
+      type: string = '',
     ): JSX.Element | null => {
       if (props.buttonsState[item.id!].visible) {
         return (
@@ -200,6 +202,7 @@ export const IBizButtonList = defineComponent({
               ns.em('item', `${item.id?.toLowerCase()}`),
               `${item.sysCss?.cssName || ''}`,
             ]}
+            type={type}
             title={item.tooltip || item.caption}
             disabled={props.buttonsState[item.id!].disabled || disabled}
             onClick={(event: MouseEvent) => handleClick(event, item)}
@@ -267,11 +270,12 @@ export const IBizButtonList = defineComponent({
                 <el-button-group>
                   {actionGroupExtractMode === 'ITEMX' &&
                     item &&
-                    renderButton(item, props.disabled)}
+                    renderButton(item, props.disabled, 'primary')}
                   {(actionGroupExtractMode !== 'ITEMX' || item) && (
                     <el-button
                       disabled={props.disabled}
                       class={ns.e('more-button')}
+                      type='primary'
                       title={
                         actionGroupExtractMode !== 'ITEMX'
                           ? caption || ibiz.i18n.t('app.more')
diff --git a/src/control/form/form-detail/form-button/form-button.tsx b/src/control/form/form-detail/form-button/form-button.tsx
index e46321037..c19535d95 100644
--- a/src/control/form/form-detail/form-button/form-button.tsx
+++ b/src/control/form/form-detail/form-button/form-button.tsx
@@ -47,6 +47,7 @@ export const FormButton = defineComponent({
       >
         <el-button
           sime='small'
+          type='primary'
           onClick={this.controller.onClick.bind(this.controller)}
           loading={this.controller.state.loading}
           disabled={this.controller.state.disabled}
diff --git a/src/control/toolbar/toolbar.scss b/src/control/toolbar/toolbar.scss
index 9355ca6cc..804b5eb96 100644
--- a/src/control/toolbar/toolbar.scss
+++ b/src/control/toolbar/toolbar.scss
@@ -236,6 +236,12 @@ $control-toolbar-actions: (
         padding: getCssVar('spacing', 'none');
       }
 
+      &>.el-button:nth-child(1) .el-button {
+        color: currentcolor;
+        background-color: transparent;
+        border: none;
+      }
+
       &>.el-button:nth-child(2):focus-visible {
         outline: none;
         outline-offset: 0;
diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx
index 8b143be20..46b108640 100644
--- a/src/control/toolbar/toolbar.tsx
+++ b/src/control/toolbar/toolbar.tsx
@@ -277,7 +277,11 @@ export const ToolbarControl = defineComponent({
             },
             title: () => {
               return (
-                <el-button loading={ploading} disabled={pdisabled}>
+                <el-button
+                  loading={ploading}
+                  disabled={pdisabled}
+                  type={groupButtonStyle.toLowerCase()}
+                >
                   {btnContent(item, c.state)}
                 </el-button>
               );
@@ -290,9 +294,11 @@ export const ToolbarControl = defineComponent({
     // 绘制行为项按钮
     const renderActionButton = (detail: IAppDEUIActionGroupDetail) => {
       if (c.state.buttonsState[detail.id!].visible) {
+        const buttonStyle = (detail as IParams).buttonStyle?.toLowerCase();
         return [
           <el-button
             title={showTitle(detail.tooltip || detail.caption)}
+            type={buttonStyle}
             size={btnSize.value}
             class={[calcCssName(detail)]}
             loading={c.state.buttonsState[detail.id!].loading}
@@ -335,6 +341,7 @@ export const ToolbarControl = defineComponent({
         const groupButtonStyle = (item as IDETBGroupItem).buttonStyle || '';
         return (
           <el-dropdown
+            type={groupButtonStyle.toLowerCase()}
             popper-class={[
               ns2.b('dropdown-popper'),
               ns2.bm('dropdown-popper', toolbarStyle),
@@ -390,6 +397,7 @@ export const ToolbarControl = defineComponent({
           return (
             <el-dropdown
               split-button={enableDropdown}
+              type={groupButtonStyle.toLowerCase()}
               popper-class={[
                 ns2.b('dropdown-popper'),
                 ns2.bm('dropdown-popper', toolbarStyle),
diff --git a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx
index c499939a2..be6a6431d 100644
--- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx
+++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx
@@ -120,6 +120,7 @@ export const IBizFileUpload = defineComponent({
             <el-button
               class={[this.ns.b('button')]}
               size={this.isGridEditor ? 'small' : 'default'}
+              type='primary'
             >
               {ibiz.i18n.t('editor.upload.uploadFiles')}
             </el-button>
-- 
Gitee