venus-design 0.9.1 → 0.9.2

package/dist/Approval/index.js

@@ -27,7 +27,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useImperativeHandle } from 'react';
+import React, { useState, useImperativeHandle, useEffect } from 'react';
 import SelectRoleAndUser from "./components/SelectRoleAndUser";
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
 import { startData, findByOptionCode, findByUserid, SubmitDataStatus, updateProcessInstance } from "./service";
@@ -316,12 +316,16 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
       addFn: addFn
     };
   });
+  useEffect(function () {
+    if (userdata && (userdata === null || userdata === void 0 ? void 0 : userdata.length) > 0) {
+      setVisible(true);
+    }
+  }, [userdata]);
   var addFn = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(record, code, name) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            setVisible(true);
             setrecord(record);
             if (record.actionId != undefined) {
               setActionId(record.actionId);
@@ -332,7 +336,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
               setisReturn(true);
             }
             findByOption(record, code, name);
-          case 5:
+          case 4:
           case "end":
             return _context3.stop();
         }

package/dist/VirtTable/config.d.ts

@@ -8,11 +8,6 @@ export declare const defaultConfig: {
     HEADER_BG_COLOR: string;
     ENABLE_EDIT_SINGLE_CLICK: boolean;
     HEIGHT: number;
-    ENABLE_KEYBOARD: boolean;
-    HIGHLIGHT_HOVER_ROW: boolean;
-    HIGHLIGHT_HOVER_ROW_COLOR: string;
-    HIGHLIGHT_SELECTED_ROW: boolean;
-    HIGHLIGHT_SELECTED_ROW_COLOR: string;
     TREE_INDENT: number;
     HEADER_CELL_STYLE_METHOD: ({ column }: any) => {
         color: string;

package/dist/VirtTable/config.js

@@ -19,16 +19,11 @@ export var defaultConfig = {
   //单击进入编辑
   HEIGHT: 300,
   // 高度
-  ENABLE_KEYBOARD: true,
-  // 开启键盘操作
-  HIGHLIGHT_HOVER_ROW: true,
-  // 开启行悬停高亮
-  HIGHLIGHT_HOVER_ROW_COLOR: "#eeeeeeff",
-  //悬停高亮颜色
-  HIGHLIGHT_SELECTED_ROW: true,
-  // 开启选中行高亮
-  HIGHLIGHT_SELECTED_ROW_COLOR: "#d5f2ffff",
-  //选中高亮颜色
+  //ENABLE_KEYBOARD: true, // 开启键盘操作
+  //HIGHLIGHT_HOVER_ROW:true, // 开启行悬停高亮
+  //HIGHLIGHT_HOVER_ROW_COLOR:"#eeeeeeff",//悬停高亮颜色
+  //HIGHLIGHT_SELECTED_ROW:true, // 开启选中行高亮
+  //HIGHLIGHT_SELECTED_ROW_COLOR:"#d5f2ffff",//选中高亮颜色
   TREE_INDENT: 5,
   // 默认树形缩进宽度
   // 列头单元格样式方法

package/dist/VirtTable/src/DragGhost.d.ts

@@ -11,11 +11,14 @@ export default class DragGhost {
     private targetY;
     private flatData;
     constructor(ctx: Context);
+    private lastSwapIndex;
+    private throttleSwap;
     private onMouseDown;
     private createGhost;
     private lastMoveTime;
     private slideTimer;
     private hasMoved;
+    private slideRow;
     private onMouseMove;
     private onMouseUp;
     private animateBounce;

package/dist/VirtTable/src/DragGhost.js

@@ -12,6 +12,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { throttle } from 'lodash';
 var DragGhost = /*#__PURE__*/function () {
   function DragGhost(ctx) {
     var _this = this;
@@ -27,68 +28,71 @@ var DragGhost = /*#__PURE__*/function () {
     _defineProperty(this, "targetX", 0);
     _defineProperty(this, "targetY", 0);
     _defineProperty(this, "flatData", []);
+    _defineProperty(this, "lastSwapIndex", -1);
+    // 防止重复交换
+    _defineProperty(this, "throttleSwap", throttle(function (newIndex) {
+      if (newIndex === _this.dragIndex || newIndex === _this.lastSwapIndex) return;
+      var oldIndex = _this.dragIndex;
+
+      // 数据交换
+      var _this$flatData$splice = _this.flatData.splice(oldIndex, 1),
+        _this$flatData$splice2 = _slicedToArray(_this$flatData$splice, 1),
+        moved = _this$flatData$splice2[0];
+      _this.flatData.splice(newIndex, 0, moved);
+
+      // 动画偏移
+      var direction = newIndex > oldIndex ? -1 : 1;
+      var affectedRows = _this.ctx.body.renderRows.slice(Math.min(oldIndex, newIndex), Math.max(oldIndex, newIndex) + 1);
+      affectedRows.forEach(function (row, i) {
+        var offset = direction * row.height;
+        row.setSlideOffset(i === 0 ? offset : -offset); // 被交换的行反向偏移
+      });
+
+      // 更新索引
+      _this.ctx.placeholderIndex = newIndex;
+      _this.dragIndex = newIndex;
+      _this.lastSwapIndex = newIndex;
+
+      // 同步数据
+      _this.ctx.database.setData(_this.flatData);
+      _this.ctx.emit('draw');
+
+      // 动画结束后清除偏移
+      setTimeout(function () {
+        affectedRows.forEach(function (row) {
+          return row.setSlideOffset(0);
+        });
+        _this.ctx.emit('draw');
+      }, 250); // 与 CSS transition 时间一致
+    }, 150));
     _defineProperty(this, "lastMoveTime", 0);
     _defineProperty(this, "slideTimer", 0);
     _defineProperty(this, "hasMoved", false);
     // ★ 第一次放行
+    /* === 新增：实时滑动相关的两行 === */
+    _defineProperty(this, "slideRow", null);
+    // ← 指向正在被拖的那一行
     _defineProperty(this, "onMouseMove", function (e) {
       if (!_this.ghostEl) return;
       e.preventDefault();
-
-      /* 1. 16ms 节流，但第一次必放行 */
-      var now = performance.now();
-      if (_this.hasMoved && now - _this.lastMoveTime < 16) return;
-      _this.lastMoveTime = now;
-      _this.hasMoved = true;
-
-      /* 2. 幽灵行跟随（不变） */
-      var curX = e.clientX + 12;
-      var curY = e.clientY - 12;
-      _this.ghostEl.style.left = "".concat(curX, "px");
-      _this.ghostEl.style.top = "".concat(curY, "px");
-
-      /* 3. 死区交换逻辑（不变） */
       var rect = _this.ctx.containerElement.getBoundingClientRect();
       var mouseY = e.clientY - rect.top + _this.ctx.scrollY;
-      var deadBand = 8;
-      var insertIndex = _this.ctx.placeholderIndex;
-      if (_this.ctx.placeholderIndex < _this.flatData.length - 1) {
-        var next = _this.ctx.database.getPositionForRowIndex(_this.ctx.placeholderIndex + 1);
-        if (mouseY >= next.top + deadBand) insertIndex = _this.ctx.placeholderIndex + 1;
-      }
-      if (_this.ctx.placeholderIndex > 0) {
-        var curr = _this.ctx.database.getPositionForRowIndex(_this.ctx.placeholderIndex);
-        if (mouseY <= curr.top + curr.height - deadBand) insertIndex = _this.ctx.placeholderIndex - 1;
-      }
-      var oldIndex = _this.ctx.placeholderIndex;
-      if (insertIndex === oldIndex) return;
 
-      /* 4. 清旧动画 + 滑动（150ms） */
-      if (_this.slideTimer) clearTimeout(_this.slideTimer);
-      var oldRow = _this.ctx.body.renderRows.find(function (r) {
-        return r.rowIndex === oldIndex;
-      });
-      var newRow = _this.ctx.body.renderRows.find(function (r) {
-        return r.rowIndex === insertIndex;
-      });
-      if (!oldRow || !newRow) return;
-      var dy = newRow.y - oldRow.y;
-      oldRow.setSlideOffset(dy);
-      newRow.setSlideOffset(-dy);
-      _this.ctx.emit('draw');
-
-      /* 数据交换 */
-      var _this$flatData$splice = _this.flatData.splice(oldIndex, 1),
-        _this$flatData$splice2 = _slicedToArray(_this$flatData$splice, 1),
-        movedRow = _this$flatData$splice2[0];
-      _this.flatData.splice(insertIndex, 0, movedRow);
-      _this.ctx.placeholderIndex = insertIndex;
-      _this.dragIndex = insertIndex;
+      // 幽灵行跟随鼠标
+      _this.ghostEl.style.top = "".concat(e.clientY - 12, "px");
+      _this.ghostEl.style.left = "".concat(e.clientX + 12, "px");
 
-      /* ★ 立即更新 renderRows 引用 + 重绘 */
-      _this.ctx.database.setData(_this.flatData);
-      _this.ctx.body.renderRows = _this.ctx.body.renderRows.slice(); // 新引用
-      _this.ctx.emit('draw');
+      // 找到目标行索引
+      var targetIndex = 0;
+      for (var i = 0; i < _this.flatData.length; i++) {
+        var pos = _this.ctx.database.getPositionForRowIndex(i);
+        if (mouseY >= pos.top + pos.height / 2) {
+          targetIndex = i;
+        } else {
+          break;
+        }
+      }
+      _this.throttleSwap(targetIndex);
     });
     /* ---------- 松手 ---------- */
     _defineProperty(this, "onMouseUp", function () {
@@ -132,11 +136,13 @@ var DragGhost = /*#__PURE__*/function () {
       return _this.onMouseDown(e);
     });
   }
-
-  /* ---------- 抓起 ---------- */
   _createClass(DragGhost, [{
     key: "onMouseDown",
-    value: function onMouseDown(e) {
+    value:
+    // 节流 150ms
+
+    /* ---------- 抓起 ---------- */
+    function onMouseDown(e) {
       var _this2 = this,
         _row$cells$find;
       if (e.button !== 0) return;
@@ -154,6 +160,10 @@ var DragGhost = /*#__PURE__*/function () {
       var nameCell = (_row$cells$find = row === null || row === void 0 ? void 0 : row.cells.find(function (c) {
         return c.column.key === 'name';
       })) !== null && _row$cells$find !== void 0 ? _row$cells$find : cell;
+      if (row) {
+        row.data._dragging = true; // 打标记
+        this.slideRow = row; // 保存引用
+      }
       this.createGhost(nameCell);
       this.ctx.placeholderIndex = this.dragIndex;
       document.addEventListener('mousemove', this.onMouseMove, {
@@ -210,9 +220,14 @@ var DragGhost = /*#__PURE__*/function () {
       cancelAnimationFrame(this.animId);
       (_this$ghostEl = this.ghostEl) === null || _this$ghostEl === void 0 || _this$ghostEl.remove();
       this.ghostEl = null;
-      this.ctx.pickedRowIndex = -1;
-      this.ctx.placeholderIndex = -1;
+
+      /* === 清理拖拽样式标记 === */
+      if (this.slideRow) {
+        delete this.slideRow.data._dragging;
+        this.slideRow = null;
+      }
       document.removeEventListener('mousemove', this.onMouseMove);
+      this.dragIndex = -1;
     }
 
     /* ---------- 工具 ---------- */

package/dist/VirtTable/src/Row.js

@@ -96,6 +96,14 @@ var Row = /*#__PURE__*/function () {
   }, {
     key: "drawCenter",
     value: function drawCenter() {
+      if (this.data._dragging) {
+        this.ctx.paint.drawRect(this.x, this.y - this.ctx.scrollY, this.width, this.height, {
+          fillColor: 'rgba(24,144,255,0.08)',
+          borderColor: '#1890ff',
+          borderWidth: 1,
+          radius: 6
+        });
+      }
       if (this.slideOffsetY !== 0) this.ctx.paint.save();
       if (this.slideOffsetY !== 0) this.ctx.paint.translate(0, this.slideOffsetY);
       this.noFixedCells.forEach(function (c) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",