releases 4.2.1

x-extends · Sep 23, 2024 · 188fd72 · 188fd72
1 parent 0adf042
commit 188fd72
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 13 deletions.
diff --git a/examples/views/form/FormTest.vue b/examples/views/form/FormTest.vue
@@ -26,7 +26,7 @@
       </vxe-form-item>
     </vxe-form>
 
-    <vxe-form border title-background :data="demo1.formData1" @submit="searchEvent" @reset="resetEvent" size="medium">
+    <vxe-form title-background :data="demo1.formData1" @submit="searchEvent" @reset="resetEvent" size="medium">
       <vxe-form-item title="名称" field="name" :item-render="{}">
         <template #default="{ data }">
           <vxe-input v-model="data.name" placeholder="请输入名称" clearable></vxe-input>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/drawer/src/drawer.ts b/packages/drawer/src/drawer.ts
@@ -43,6 +43,14 @@ export default defineComponent({
       type: Boolean as PropType<VxeDrawerPropTypes.EscClosable>,
       default: () => getConfig().drawer.escClosable
     },
+    cancelClosable: {
+      type: Boolean as PropType<VxeDrawerPropTypes.CancelClosable>,
+      default: () => getConfig().drawer.cancelClosable
+    },
+    confirmClosable: {
+      type: Boolean as PropType<VxeDrawerPropTypes.ConfirmClosable>,
+      default: () => getConfig().drawer.confirmClosable
+    },
     showHeader: {
       type: Boolean as PropType<VxeDrawerPropTypes.ShowHeader>,
       default: () => getConfig().drawer.showHeader
@@ -199,15 +207,21 @@ export default defineComponent({
     }
 
     const confirmEvent = (evnt: Event) => {
+      const { confirmClosable } = props
       const type = 'confirm'
       dispatchEvent(type, { type }, evnt)
-      closeDrawer(type)
+      if (confirmClosable) {
+        closeDrawer(type)
+      }
     }
 
     const cancelEvent = (evnt: Event) => {
+      const { cancelClosable } = props
       const type = 'cancel'
       dispatchEvent(type, { type }, evnt)
-      closeDrawer(type)
+      if (cancelClosable) {
+        closeDrawer(type)
+      }
     }
 
     const openDrawer = () => {

diff --git a/packages/modal/src/modal.ts b/packages/modal/src/modal.ts
@@ -77,6 +77,14 @@ export default defineComponent({
       type: Boolean as PropType<VxeModalPropTypes.EscClosable>,
       default: () => getConfig().modal.escClosable
     },
+    cancelClosable: {
+      type: Boolean as PropType<VxeModalPropTypes.CancelClosable>,
+      default: () => getConfig().modal.cancelClosable
+    },
+    confirmClosable: {
+      type: Boolean as PropType<VxeModalPropTypes.ConfirmClosable>,
+      default: () => getConfig().modal.confirmClosable
+    },
     resize: Boolean as PropType<VxeModalPropTypes.Resize>,
     showHeader: {
       type: Boolean as PropType<VxeModalPropTypes.ShowHeader>,
@@ -367,15 +375,21 @@ export default defineComponent({
     }
 
     const confirmEvent = (evnt: Event) => {
+      const { confirmClosable } = props
       const type = 'confirm'
       dispatchEvent(type, { type }, evnt)
-      closeModal(type)
+      if (confirmClosable) {
+        closeModal(type)
+      }
     }
 
     const cancelEvent = (evnt: Event) => {
+      const { cancelClosable } = props
       const type = 'cancel'
       dispatchEvent(type, { type }, evnt)
-      closeModal(type)
+      if (cancelClosable) {
+        closeModal(type)
+      }
     }
 
     const getStorageMap = (key: string) => {

diff --git a/packages/ui/index.ts b/packages/ui/index.ts
@@ -85,7 +85,9 @@ setConfig({
     mask: true,
     showTitleOverflow: true,
     showClose: true,
-    padding: true
+    padding: true,
+    cancelClosable: true,
+    confirmClosable: true
   },
   form: {
     // preventSubmit: false,
@@ -181,6 +183,8 @@ setConfig({
     padding: true,
     draggable: true,
     showConfirmButton: null,
+    cancelClosable: true,
+    confirmClosable: true,
     zoomConfig: {
       minimizeMaxSize: 10,
       minimizeVerticalOffset: {

diff --git a/styles/components/form.scss b/styles/components/form.scss
@@ -93,11 +93,14 @@
 .vxe-form--item-content {
   display: flex;
   flex-direction: row;
-  align-items: flex-start;
+  align-items: center;
   position: relative;
   flex-grow: 1;
   word-break: break-all;
 }
+.vxe-form--group-content {
+  align-items: flex-start;
+}
 
 .vxe-form--item-trigger-node {
   font-size: 12px;
@@ -203,6 +206,11 @@
       }
     }
   }
+  &.is--tbg { 
+    & > .vxe-form--item-title {
+      background-color: var(--vxe-ui-form-title-background-color);
+    }
+  }
   &.is--vertical {
     flex-direction: column;
     align-items: initial;
@@ -382,11 +390,6 @@
           }
         }
       }
-      &.is--tbg { 
-        & > .vxe-form--item-title {
-          background-color: var(--vxe-ui-form-title-background-color);
-        }
-      }
     }
   }
 }

diff --git a/types/components/drawer.d.ts b/types/components/drawer.d.ts
@@ -50,6 +50,8 @@ export namespace VxeDrawerPropTypes {
   export type Mask = boolean
   export type MaskClosable = boolean
   export type EscClosable = boolean
+  export type CancelClosable = boolean
+  export type ConfirmClosable = boolean
   export type ShowHeader = boolean
   export type ShowFooter = boolean
   export type ShowClose = boolean
@@ -82,6 +84,8 @@ export interface VxeDrawerProps {
   mask?: VxeDrawerPropTypes.Mask
   maskClosable?: VxeDrawerPropTypes.MaskClosable
   escClosable?: VxeDrawerPropTypes.EscClosable
+  cancelClosable?: VxeDrawerPropTypes.CancelClosable
+  confirmClosable?: VxeDrawerPropTypes.ConfirmClosable
   showHeader?: VxeDrawerPropTypes.ShowHeader
   showFooter?: VxeDrawerPropTypes.ShowFooter
   showClose?: VxeDrawerPropTypes.ShowClose

diff --git a/types/components/modal.d.ts b/types/components/modal.d.ts
@@ -70,6 +70,8 @@ export namespace VxeModalPropTypes {
   export type Mask = boolean
   export type MaskClosable = boolean
   export type EscClosable = boolean
+  export type CancelClosable = boolean
+  export type ConfirmClosable = boolean
   export type Resize = boolean
   export type ShowHeader = boolean
   export type ShowFooter = boolean
@@ -143,6 +145,8 @@ export interface VxeModalProps {
   mask?: VxeModalPropTypes.Mask
   maskClosable?: VxeModalPropTypes.MaskClosable
   escClosable?: VxeModalPropTypes.EscClosable
+  cancelClosable?: VxeModalPropTypes.CancelClosable
+  confirmClosable?: VxeModalPropTypes.ConfirmClosable
   resize?: VxeModalPropTypes.Resize
   showHeader?: VxeModalPropTypes.ShowHeader
   showFooter?: VxeModalPropTypes.ShowFooter