@kdcloudjs/table 1.2.1-canary.6 → 1.2.2-canary.3

package/es/table/pipeline/features/rowDetail.js

@@ -18,9 +18,7 @@ import { always, flatMap } from '../../utils/others';
 import console from '../../utils/console';
 import getTableRenderTemplate from '../../base/renderTemplates';
 import { Classes } from '../../base';
-
 var rowDetailSymbol = _Symbol('row-detail');
-
 var fallbackRenderDetail = function fallbackRenderDetail() {
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -32,14 +30,11 @@ var fallbackRenderDetail = function fallbackRenderDetail() {
     }
   }, "\u8BBE\u7F6E ", /*#__PURE__*/React.createElement("code", null, "rowDetail.renderDetail"), " \u6765\u81EA\u5B9A\u4E49\u8BE6\u60C5\u5185\u5BB9"));
 };
-
 export function rowDetail() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function rowDetailStep(pipeline) {
     var _context, _context2;
-
     var _a, _b, _c, _d, _e, _f, _g, _h;
-
     var stateKey = 'rowDetail';
     var rowDetailMetaKey = (_a = opts.rowDetailMetaKey) !== null && _a !== void 0 ? _a : rowDetailSymbol;
     var primaryKey = pipeline.ensurePrimaryKey('rowDetail');
@@ -54,33 +49,26 @@ export function rowDetail() {
     var openKeys = (_h = (_g = (_f = opts.openKeys) !== null && _f !== void 0 ? _f : pipeline.getStateAtKey(stateKey)) !== null && _g !== void 0 ? _g : opts.defaultOpenAll ? _mapInstanceProperty(_context = _filterInstanceProperty(_context2 = pipeline.getDataSource()).call(_context2, hasDetail)).call(_context, function (row, rowIndex) {
       return internals.safeGetRowKey(primaryKey, row, rowIndex);
     }) : opts.defaultOpenKeys) !== null && _h !== void 0 ? _h : [];
-
     var onChangeOpenKeys = function onChangeOpenKeys(nextKeys, key, action) {
       var _a;
-
       (_a = opts.onChangeOpenKeys) === null || _a === void 0 ? void 0 : _a.call(opts, nextKeys, key, action);
       pipeline.setStateAtKey(stateKey, nextKeys, {
         key: key,
         action: action
       });
     };
-
     var openKeySet = new _Set(openKeys);
-
     var toggle = function toggle(rowKey) {
       var expanded = openKeySet.has(rowKey);
-
       if (expanded) {
         onChangeOpenKeys(_filterInstanceProperty(openKeys).call(openKeys, function (key) {
           return key !== rowKey;
         }), rowKey, 'collapse');
       } else {
         var _context3;
-
         onChangeOpenKeys(_concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(openKeys), [rowKey]), rowKey, 'expand');
       }
     };
-
     var detailPrimaryKey = typeof primaryKey === 'string' ? primaryKey : rowDetailMetaKey.toString() + 'PrimaryKey';
     return pipeline.dataSource(flatMap(pipeline.getDataSource(), function (row, rowIndex) {
       if (openKeySet.has(internals.safeGetRowKey(primaryKey, row, rowIndex))) {
@@ -96,35 +84,27 @@ export function rowDetail() {
         };
       }
     });
-
     function processColumns(columns) {
       if (columns.length === 0) {
         return columns;
       }
-
       var expandColumnIndex = 0;
-
       if (opts.expandColumnCode) {
         expandColumnIndex = _findIndexInstanceProperty(columns).call(columns, function (col) {
           return col.code === opts.expandColumnCode;
         });
-
         if (expandColumnIndex < 0) {
           console.warn('没找到可展开的列，请检查设置的展开列code');
           return columns;
         }
       }
-
       var expandCol = columns[expandColumnIndex];
-
       var tableColumns = _toConsumableArray(columns);
-
       var render = function render(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           // 第一列内容已经渲染
           if (expandColumnIndex !== 0) return;
           var renderRowDetail = getTableRenderTemplate('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -133,12 +113,9 @@ export function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = internals.safeRender(expandCol, row, rowIndex);
-
         if (!hasDetail(row, rowIndex)) {
           return /*#__PURE__*/React.createElement(InlineFlexCell, {
             style: {
@@ -146,18 +123,14 @@ export function rowDetail() {
             }
           }, content);
         }
-
         var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
         var expanded = openKeySet.has(rowKey);
-
         var onClick = function onClick(e) {
           if (opts.stopClickEventPropagation) {
             e.stopPropagation();
           }
-
           toggle(rowKey);
         };
-
         var expandCls = expanded ? Classes.expanded : Classes.collapsed;
         var ExpandIcon = opts.expandIcon;
         return /*#__PURE__*/React.createElement(ExpansionCell, {
@@ -179,10 +152,8 @@ export function rowDetail() {
           onClick: clickArea === 'icon' ? onClick : undefined
         }), content);
       };
-
       var getCellProps = function getCellProps(value, row, rowIndex) {
         var _a;
-
         if (row[rowDetailMetaKey]) {
           return {
             style: _extends({
@@ -191,19 +162,15 @@ export function rowDetail() {
             }, opts.detailCellStyle)
           };
         }
-
         var prevProps = (_a = expandCol.getCellProps) === null || _a === void 0 ? void 0 : _a.call(expandCol, value, row, rowIndex);
-
         if (!hasDetail(row, rowIndex)) {
           return prevProps;
         }
-
         return mergeCellProps(prevProps, {
           onClick: function onClick(e) {
             if (opts.stopClickEventPropagation) {
               e.stopPropagation();
             }
-
             toggle(internals.safeGetRowKey(primaryKey, row, rowIndex));
           },
           style: {
@@ -211,15 +178,12 @@ export function rowDetail() {
           }
         });
       };
-
       var _tableColumns = _toArray(tableColumns),
-          firstCol = _tableColumns[0],
-          others = _sliceInstanceProperty(_tableColumns).call(_tableColumns, 1);
-
+        firstCol = _tableColumns[0],
+        others = _sliceInstanceProperty(_tableColumns).call(_tableColumns, 1);
       var firstColRender = function firstColRender(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           var renderRowDetail = getTableRenderTemplate('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -228,14 +192,11 @@ export function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = internals.safeRender(firstCol, row, rowIndex);
         return content;
       };
-
       tableColumns[0] = _extends(_extends({}, firstCol), {
         render: firstColRender,
         getSpanRect: function getSpanRect(value, row, rowIndex) {
@@ -251,12 +212,12 @@ export function rowDetail() {
         }
       });
       tableColumns[expandColumnIndex] = _extends(_extends({}, expandCol), {
-        title: /*#__PURE__*/React.createElement("div", {
+        title: (/*#__PURE__*/React.createElement("div", {
           style: {
             display: 'inline-block',
             marginLeft: textOffset
           }
-        }, internals.safeRenderHeader(expandCol)),
+        }, internals.safeRenderHeader(expandCol))),
         render: render,
         getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps,
         getSpanRect: function getSpanRect(value, row, rowIndex) {

package/es/table/pipeline/features/rowDrag.d.ts

@@ -1,13 +1,5 @@
 import { TablePipeline } from '../pipeline';
-import { ArtColumn } from '../../interfaces';
-interface RowDragEvent {
-    startRowIndex: number;
-    startRow: any;
-    endRowIndex: number;
-    endRow: any;
-    isFinished: boolean;
-    dragPosition: string;
-}
+import { ArtColumn, RowDragEvent } from '../../interfaces';
 export interface RowDragFeatureOptions {
     /** 拖拽开始事件 */
     onDragStart?: (event: RowDragEvent) => void;
@@ -15,16 +7,22 @@ export interface RowDragFeatureOptions {
     onDragMove?: (event: RowDragEvent) => void;
     /** 拖拽结束事件 */
     onDragEnd?: (event: RowDragEvent) => void;
+    /** 拖拽离开事件 */
+    onDragLeave?: (event: RowDragEvent) => void;
+    /** 拖拽进入事件 */
+    onDragEnter?: (event: RowDragEvent) => void;
     /** 判断一行是否要禁用拖拽 */
     isDisabled?: (row: any, rowIndex: number) => boolean;
+    /** 拖拽时显示的文本 */
+    rowDragText: (row: any, rowIndex: number) => string;
     /** 拖拽列定义 */
     rowDragColumn?: ArtColumn;
-    /** 行高 */
-    rowHeight?: number;
     /** 拖拽过程中是否禁止滚动条滚动 */
     suppressScrollMove?: boolean;
+    /** 树型表格是否允许拖拽插入行 */
+    allowDragIntoRow?: boolean;
 }
 export declare const ROW_DRAG_COLUMN_CODE = "$_row_drag_column_&";
 export declare const rowDragKey = "rowDragKey";
+export declare const rowDragOptionsKey = "rowDragOptions";
 export declare function rowDrag(opt: RowDragFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
-export {};