zmdms-webui 0.0.77 → 0.0.78

package/dist/es/dynamicsetting/useDynamic.js

@@ -85,8 +85,6 @@ function getCurrentDynamicItems(dynamicKey, parentDynamicKey, list) {
         else {
             // 递归比对 用户传入配置 和 缓存中的配置。转换成正确的数据
             recursionDynamicItems(list, currentDynamicList_1);
-            console.log(currentDynamicList_1);
-            debugger;
         }
         // 最终需要过滤掉 没从传入配置中找到的字段
         // 如果没从传入配置中找到改字段 说明 该字段已经被业务弃用删除了

package/dist/es/table/components/EnhanceBodyRow.js

@@ -1,5 +1,6 @@
 import { __rest, __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
+import { useMemo } from 'react';
 import classNames from '../../node_modules/classnames/index.js';
 import useDragRef from './useDragRef.js';
 
@@ -10,12 +11,14 @@ var BasicBodyRow = function (props) {
 };
 // 拖拽行配置
 var MoveBodyRow = function (props) {
-    var className = props.className, style = props.style, index = props.index, moveRow = props.moveRow, resetProps = __rest(props, ["className", "style", "index", "moveRow"]);
-    var ref = useDragRef(index, moveRow).ref;
-    var classes = classNames("ztxk-table__enhance-row", className
-    // isOver ? dropClassName : ""
-    );
-    return (jsx("tr", __assign({ ref: ref, style: __assign({ cursor: "move" }, style), className: classes }, resetProps)));
+    var className = props.className, style = props.style, index = props.index, moveRow = props.moveRow, vRow = props.vRow, resetProps = __rest(props, ["className", "style", "index", "moveRow", "vRow"]);
+    var _a = useDragRef(index, moveRow), ref = _a.ref, isOver = _a.isOver, dropClassName = _a.dropClassName;
+    var memoStyle = useMemo(function () { return (__assign({ cursor: !moveRow ? "default" : "move" }, style)); }, [moveRow, style]);
+    var classes = classNames("ztxk-table__enhance-row", className, isOver ? dropClassName : "");
+    var tempProps = useMemo(function () {
+        return __assign({ ref: ref, className: classes, style: memoStyle }, resetProps);
+    }, [classes, resetProps, memoStyle, ref]);
+    return vRow ? (vRow(tempProps, ref)) : (jsx("tr", __assign({ ref: ref, style: __assign({ cursor: "move" }, style), className: classes }, resetProps)));
 };
 
 export { BasicBodyRow, MoveBodyRow };

package/dist/es/table/components/useDragRef.js

@@ -14,10 +14,9 @@ function useDragRef(index, moveRow) {
                 return {};
             }
             return {
-            // 这里暂时不做拖放的样式 使用浏览器的默认样式
-            // isOver: monitor.isOver(),
-            // dropClassName:
-            //   dragIndex < index ? " drop-over-downward" : " drop-over-upward",
+                // 这里暂时不做拖放的样式 使用浏览器的默认样式
+                isOver: monitor.isOver(),
+                dropClassName: dragIndex < index ? " drop-over-downward" : " drop-over-upward",
             };
         },
         drop: function (item) {
@@ -26,9 +25,9 @@ function useDragRef(index, moveRow) {
             }
             moveRow(item.index, index);
         },
-    }); }, [index]), drop = _a[1];
+    }); }, [index]), _b = _a[0], isOver = _b.isOver, dropClassName = _b.dropClassName, drop = _a[1];
     // 定义拖拽项
-    var _b = useDrag({
+    var _c = useDrag({
         type: TABLE_DRAG_ROW_TYPE,
         item: { index: index },
         collect: function (monitor) { return ({
@@ -37,19 +36,19 @@ function useDragRef(index, moveRow) {
         canDrag: function (monitor) { var _a; 
         // 解决拖拽行中有input 选中时 不让其拖拽
         return !((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase().match(/input|textarea/)); },
-    }), drag = _b[1];
+    }), drag = _c[1];
     drop(drag(ref));
     if (moveRow) {
         return {
             ref: ref,
-            // isOver,
-            // dropClassName,
+            isOver: isOver,
+            dropClassName: dropClassName,
         };
     }
     return {
         ref: ref,
-        // isOver: null,
-        // dropClassName: null,
+        isOver: null,
+        dropClassName: null,
     };
 }
 

package/dist/es/table/table.js

@@ -100,7 +100,6 @@ var Table = function (props) {
         // 伸缩列
         isResizableColumn: isResizableColumn,
     }).newColumns;
-    console.log(newColumns);
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
@@ -160,7 +159,7 @@ var Table = function (props) {
                 vComponents.body.cell = components.body.cell;
             }
             // 需要支持拖拽
-            if ((_b = components === null || components === void 0 ? void 0 : components.body) === null || _b === void 0 ? void 0 : _b.row) {
+            if (((_b = components === null || components === void 0 ? void 0 : components.body) === null || _b === void 0 ? void 0 : _b.row) && isMove) {
                 var row_1 = vComponents.body.row;
                 vComponents.body.row = function (props) {
                     return jsx(MoveBodyRow, __assign({}, props, { vRow: row_1 }));

package/dist/es/table/useColumns.js

@@ -1,8 +1,8 @@
 import { __assign, __spreadArray } from '../_virtual/_tslib.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { getTableColumns } from './utils.js';
-import '../node_modules/classnames/index.js';
 import 'react';
+import '../node_modules/classnames/index.js';
 import './components/EnhanceHeaderCell.js';
 import ColumnDynamic from './components/ColumnDynamic.js';
 import ColumnAddDel, { ColumnDelAll } from './components/ColumnAddDel.js';