form-driver 0.4.21 → 0.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-driver",
-  "version": "0.4.21",
+  "version": "0.4.23",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [
@@ -58,6 +58,9 @@
     "@ant-design/icons": "^4.3.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.7.4",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@babel/runtime": "^7.9.2",
     "ali-oss": "^6.17.1",
     "antd": "4.18.7",

package/src/ui/editor/basic/ARangePicker.tsx

@@ -78,7 +78,9 @@ export class ARangePicker extends Viewer<State> {
    */
   _data2rangePicker(d: ARangePickerData): AntData {
     const dataFormat = this.props.schema.dataFormat ?? "x";
-    return [d[0] ? moment(d[0], dataFormat) : null, d[1] ? moment(d[1], dataFormat) : null];
+    // 若 tillNow=true，结束时间传 null，避免 RangePicker 缓存旧结束时间
+    const endTime = d[2] === true ? null : (d[1] ? moment(d[1], dataFormat) : null);
+    return [d[0] ? moment(d[0], dataFormat) : null, endTime];
   }
 
   element() {
@@ -172,7 +174,8 @@ export class ARangePicker extends Viewer<State> {
       } else if (precision === 'month') {
         extraProps.picker = 'month';
       } else if (pcShowTime) {
-        extraProps.showTime = true;
+        // precision 为 minute 时只展示时分，不展示秒
+        extraProps.showTime = precision === 'minute' ? { format: 'HH:mm' } : true;
       }
 
       // 构造元素
@@ -204,7 +207,16 @@ export class ARangePicker extends Viewer<State> {
           this._onCalendarChangeValue = d;
         }}
         onChange={(vv) => {
-          super.changeValueEx(this._rangePicker2Data(vv, false), true, true)
+          // 用户清空日期范围时，直接置空
+          if (!vv) {
+            super.changeValueEx(undefined, true, true);
+            return;
+          }
+          const currentData = super.getValue();
+          const isTillNow = _.get(currentData, '[2]') === true;
+          // 若当前是"至今"且用户只改了开始时间（结束时间仍为 null），保留 tillNow
+          const newTillNow = isTillNow && vv[1] == null;
+          super.changeValueEx(this._rangePicker2Data(vv, newTillNow), true, true);
         }}
         {...extraProps}
       />;

package/src/ui/widget/EnhancedSortDrag.less

@@ -21,6 +21,8 @@
   border-radius: 6px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
   transition: all 0.3s ease;
+  user-select: none;
+  -webkit-user-select: none;
 
   // 水平方向布局
   &.direction-horizontal {
@@ -99,6 +101,31 @@
       }
     }
   }
+
+  // 移动端拖拽句柄触控区域增大
+  .enhanced-dragHandleWrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 44px;
+    min-height: 44px;
+    cursor: grab;
+    margin-left: 4px;
+    touch-action: none;
+    -webkit-touch-callout: none;
+
+    &:active {
+      .enhanced-dragHandleIcon {
+        color: #1890ff;
+      }
+    }
+  }
+
+  .enhanced-dragHandleIcon {
+    font-size: 20px;
+    color: #999;
+    transition: color 0.2s;
+  }
 }
 
 // 拖拽动画
@@ -140,3 +167,37 @@
     }
   }
 }
+
+// ========== DragOverlay 预览 — 简洁浮动卡片 ==========
+.enhanced-sortDrag-overlay {
+  background: #ffffff;
+  border-radius: 8px;
+  box-shadow:
+    0 1px 3px rgba(0, 0, 0, 0.08),
+    0 8px 24px rgba(0, 0, 0, 0.12);
+  border: 1px solid rgba(0, 0, 0, 0.06);
+
+  // 普通模式预览
+  .enhanced-sortDrag-overlay-content {
+    padding: 10px 16px;
+
+    .enhanced-sortDrag-overlay-body {
+      font-size: 14px;
+      color: #262626;
+    }
+  }
+
+  // 表格行模式预览
+  .enhanced-sortDrag-overlay-row {
+    display: flex;
+    align-items: center;
+    padding: 10px 16px;
+    gap: 8px;
+
+    .enhanced-sortDrag-overlay-label {
+      font-size: 14px;
+      color: #262626;
+      font-weight: 500;
+    }
+  }
+}