fix(modal): adjust the title icon display of the modal (#1658)

* fix(modal): adjust the title icon display of the modal * fix: update modal package.json
opentiny · Jun 3, 2024 · 75a81d2 · 75a81d2
1 parent 268e190
commit 75a81d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/packages/vue/src/modal/package.json b/packages/vue/src/modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/vue-modal",
-  "version": "3.16.0",
+  "version": "3.16.1",
   "description": "",
   "main": "lib/index.js",
   "module": "index.ts",

diff --git a/packages/vue/src/modal/src/pc.vue b/packages/vue/src/modal/src/pc.vue
@@ -166,7 +166,7 @@ export default defineComponent({
                     }
                   },
                   [
-                    status && state.theme === 'saas'
+                    status
                       ? h(
                           'div',
                           {
@@ -188,18 +188,7 @@ export default defineComponent({
                       {
                         class: 'tiny-modal__title'
                       },
-                      [
-                        typeof status === 'string'
-                          ? h(STATUS_MAPPING_COMPINENT[status.toUpperCase()], {
-                              class: [constants.STATUS_MAPPING_CLASSS[status.toUpperCase()]],
-                              style: 'display: inline-block; margin-right: 5px;'
-                            })
-                          : h(status, {
-                              class: ['tiny-modal__status-icon'],
-                              style: 'display: inline-block; margin-right: 5px;'
-                            }),
-                        h('span', title || t('ui.alert.title'))
-                      ]
+                      title || t('ui.alert.title')
                     ),
                     resize
                       ? h(zoomLocat ? iconMinscreenLeft() : iconFullscreenLeft(), {
@@ -224,14 +213,14 @@ export default defineComponent({
                 class: ['tiny-modal__body', type === 'message' ? 'is-message' : '']
               },
               [
-                status && state.theme !== 'saas'
+                type === 'message'
                   ? h(
                       'div',
                       {
                         class: 'tiny-modal__status-wrapper'
                       },
                       [
-                        typeof status === 'string' && type === 'message'
+                        typeof status === 'string'
                           ? h(STATUS_MAPPING_COMPINENT[status.toUpperCase()], {
                               class: [constants.STATUS_MAPPING_CLASSS[status.toUpperCase()]]
                             })
@@ -310,6 +299,18 @@ export default defineComponent({
                           )
                         ]
                       : [
+                          type === 'confirm'
+                            ? h(
+                                Button,
+                                {
+                                  on: {
+                                    click: this.cancelEvent
+                                  },
+                                  props: { ...cancelButtonProps }
+                                },
+                                cancelButtonText
+                              )
+                            : null,
                           h(
                             Button,
                             {
@@ -322,19 +323,7 @@ export default defineComponent({
                               }
                             },
                             confirmButtonText
-                          ),
-                          type === 'confirm'
-                            ? h(
-                                Button,
-                                {
-                                  on: {
-                                    click: this.cancelEvent
-                                  },
-                                  props: { ...cancelButtonProps }
-                                },
-                                cancelButtonText
-                              )
-                            : null
+                          )
                         ]
                 )
               : null,