releases 4.2.53

x-extends · Nov 13, 2024 · 50802a1 · 50802a1
1 parent fd87326
commit 50802a1
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.52",
+  "version": "4.2.53",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/form-design/src/layout-view-item.ts b/packages/form-design/src/layout-view-item.ts
@@ -47,11 +47,11 @@ export const ViewItemComponent = defineComponent({
       formDesignReactData.sortWidget = null
     }
 
-    let lastDragTime = Date.now()
-
     const sortDragenterEvent = (evnt: DragEvent) => {
       const { widgetObjList, sortWidget } = formDesignReactData
-      if (lastDragTime > Date.now() - 200) {
+      const formDesignInternalData = $xeFormDesign.internalData
+      const { lastDragTime } = formDesignInternalData
+      if (lastDragTime && lastDragTime > Date.now() - 300) {
         evnt.preventDefault()
         return
       }
@@ -72,9 +72,8 @@ export const ViewItemComponent = defineComponent({
                 currRest.items.splice(currRest.index, 1)
               }
               targetRest.items.splice(targetRest.index, 0, currRest.item)
+              formDesignInternalData.lastDragTime = Date.now()
               $xeFormDesign.dispatchEvent('drag-widget', { widget: currRest.item }, evnt)
-
-              lastDragTime = Date.now()
             }
           }
         }

diff --git a/packages/form-design/widget-row/row-view.ts b/packages/form-design/widget-row/row-view.ts
@@ -56,6 +56,7 @@ const ViewColItemComponent = defineComponent({
       const { parentWidget, colItemIndex } = props
       const { widgetObjList, sortWidget } = formDesignReactData
       const targetWidget = parentWidget.children[colItemIndex]
+      const formDesignInternalData = $xeFormDesign.internalData
       evnt.stopPropagation()
       if (sortWidget && parentWidget && sortWidget.id !== parentWidget.id) {
         if (hasFormDesignLayoutType(sortWidget)) {
@@ -76,13 +77,15 @@ const ViewColItemComponent = defineComponent({
               parentWidget.children[colItemIndex] = item
               parentWidget.children[index] = targetWidget
             } else {
-              parentWidget.children[colItemIndex] = item
-              if (targetWidget.name) {
-                items.splice(index, 1, targetWidget)
-              } else {
-                items.splice(index, 1)
+              // 如果已存在控件
+              if (targetWidget && targetWidget.name) {
+                return
               }
+              parentWidget.children[colItemIndex] = item
+              items.splice(index, 1)
             }
+            evnt.preventDefault()
+            formDesignInternalData.lastDragTime = Date.now()
             $xeFormDesign.dispatchEvent('drag-widget', { widget: item }, evnt)
           }
         }

diff --git a/packages/form-design/widget-subtable/subtable-view.ts b/packages/form-design/widget-subtable/subtable-view.ts
@@ -50,14 +50,14 @@ const ViewSubItemComponent = defineComponent({
       formDesignReactData.dragWidget = null
     }
 
-    let lastDragTime = Date.now()
-
     const sortDragenterSubItemEvent = (evnt: DragEvent) => {
       const { parentWidget, childIndex } = props
       const { widgetObjList, sortWidget } = formDesignReactData
       const targetWidget = parentWidget.children[childIndex]
+      const formDesignInternalData = $xeFormDesign.internalData
+      const { lastDragTime } = formDesignInternalData
       evnt.stopPropagation()
-      if (lastDragTime > Date.now() - 300) {
+      if (lastDragTime && lastDragTime > Date.now() - 300) {
         evnt.preventDefault()
         return
       }
@@ -83,7 +83,7 @@ const ViewSubItemComponent = defineComponent({
               parentWidget.children.splice(childIndex, 0, item)
               items.splice(index, 1)
             }
-            lastDragTime = Date.now()
+            formDesignInternalData.lastDragTime = Date.now()
             $xeFormDesign.dispatchEvent('drag-widget', { widget: item }, evnt)
           }
         }

diff --git a/styles/components/form-design.scss b/styles/components/form-design.scss
@@ -283,4 +283,12 @@
       padding: 0;
     }
   }
+  .vxe-form--item-inner {
+    height: 100%;
+  }
+  .vxe-form--item-title-content {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
diff --git a/styles/components/widget-form/widget-form-row.scss b/styles/components/widget-form/widget-form-row.scss
@@ -29,12 +29,13 @@
 .vxe-form-design--widget-row-view {
   position: relative;
   height: 100%;
+  padding: var(--vxe-ui-layout-padding-default);
 }
 .vxe-form-design--widget-row-view-item-inner {
   position: relative;
   height: 100%;
   min-height: 78px;
-  padding: var(--vxe-ui-layout-padding-default);
+  padding: 0;
   border: 1px solid transparent;
   cursor: grabbing;
   &::before {

diff --git a/styles/components/widget-form/widget-form-subtable.scss b/styles/components/widget-form/widget-form-subtable.scss
@@ -7,7 +7,6 @@
   border-radius: var(--vxe-ui-base-border-radius);
   overflow-y: hidden;
   overflow-x: auto;
-  padding-top: var(--vxe-ui-layout-padding-default);
 }
 .vxe-form-design--widget-subtable-view-box {
   border: 1px solid var(--vxe-ui-input-border-color);
@@ -106,6 +105,9 @@
   flex-wrap: nowrap;
   & > .vxe-form-design--widget-subtable-view-item {
     border-right: 1px solid var(--vxe-ui-input-border-color);
+    .vxe-form-design--preview-item-operate {
+      top: 0.4em;
+    }
   }
 }
 .vxe-form-design--widget-subtable-view-list-move {
@@ -191,7 +193,12 @@
   }
   .vxe-form-design--preview-item-view {
     .vxe-form-design--widget-subtable-form-item {
-      padding: 0;
+      & > .vxe-form--item-content {
+        padding: 0;
+      }
+    }
+    .vxe-form--group-content {
+      align-items: unset;
     }
   }
 }
diff --git a/types/components/form-design.d.ts b/types/components/form-design.d.ts
@@ -73,6 +73,7 @@ export interface FormDesignReactData<D = VxeFormDesignDefines.DefaultSettingForm
 }
 
 export interface FormDesignInternalData {
+  lastDragTime?: number
 }
 
 export interface FormDesignMethods {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     export interface FormDesignInternalData {
+      lastDragTime?: number
     }
     export interface FormDesignMethods {
@@ Expand Down @@