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

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

@@ -1,56 +1,32 @@
 "use strict";
 
 var _flatMapInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/flat-map");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.rowDetail = rowDetail;
-
 var _toArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _extends4 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
-
 var _symbol = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _commonViews = require("../../common-views");
-
 var _internals = require("../../internals");
-
 var _utils = require("../../utils");
-
 var _others = require("../../utils/others");
-
 var _console = _interopRequireDefault(require("../../utils/console"));
-
 var _renderTemplates = _interopRequireDefault(require("../../base/renderTemplates"));
-
 var _base = require("../../base");
-
 var rowDetailSymbol = (0, _symbol.default)('row-detail');
-
 var fallbackRenderDetail = function fallbackRenderDetail() {
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -62,14 +38,11 @@ var fallbackRenderDetail = function fallbackRenderDetail() {
     }
   }, "\u8BBE\u7F6E ", /*#__PURE__*/_react.default.createElement("code", null, "rowDetail.renderDetail"), " \u6765\u81EA\u5B9A\u4E49\u8BE6\u60C5\u5185\u5BB9"));
 };
-
 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');
@@ -84,33 +57,26 @@ function rowDetail() {
     var openKeys = (_h = (_g = (_f = opts.openKeys) !== null && _f !== void 0 ? _f : pipeline.getStateAtKey(stateKey)) !== null && _g !== void 0 ? _g : opts.defaultOpenAll ? (0, _map.default)(_context = (0, _filter.default)(_context2 = pipeline.getDataSource()).call(_context2, hasDetail)).call(_context, function (row, rowIndex) {
       return _internals.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.default(openKeys);
-
     var toggle = function toggle(rowKey) {
       var expanded = openKeySet.has(rowKey);
-
       if (expanded) {
         onChangeOpenKeys((0, _filter.default)(openKeys).call(openKeys, function (key) {
           return key !== rowKey;
         }), rowKey, 'collapse');
       } else {
         var _context3;
-
         onChangeOpenKeys((0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(openKeys), [rowKey]), rowKey, 'expand');
       }
     };
-
     var detailPrimaryKey = typeof primaryKey === 'string' ? primaryKey : rowDetailMetaKey.toString() + 'PrimaryKey';
     return pipeline.dataSource((0, _flatMapInstanceProperty(_others))(pipeline.getDataSource(), function (row, rowIndex) {
       if (openKeySet.has(_internals.internals.safeGetRowKey(primaryKey, row, rowIndex))) {
@@ -126,35 +92,27 @@ function rowDetail() {
         };
       }
     });
-
     function processColumns(columns) {
       if (columns.length === 0) {
         return columns;
       }
-
       var expandColumnIndex = 0;
-
       if (opts.expandColumnCode) {
         expandColumnIndex = (0, _findIndex.default)(columns).call(columns, function (col) {
           return col.code === opts.expandColumnCode;
         });
-
         if (expandColumnIndex < 0) {
           _console.default.warn('没找到可展开的列，请检查设置的展开列code');
-
           return columns;
         }
       }
-
       var expandCol = columns[expandColumnIndex];
       var tableColumns = (0, _toConsumableArray2.default)(columns);
-
       var render = function render(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           // 第一列内容已经渲染
           if (expandColumnIndex !== 0) return;
           var renderRowDetail = (0, _renderTemplates.default)('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -163,12 +121,9 @@ function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = _internals.internals.safeRender(expandCol, row, rowIndex);
-
         if (!hasDetail(row, rowIndex)) {
           return /*#__PURE__*/_react.default.createElement(_commonViews.InlineFlexCell, {
             style: {
@@ -176,19 +131,14 @@ function rowDetail() {
             }
           }, content);
         }
-
         var rowKey = _internals.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 ? _base.Classes.expanded : _base.Classes.collapsed;
         var ExpandIcon = opts.expandIcon;
         return /*#__PURE__*/_react.default.createElement(_commonViews.ExpansionCell, {
@@ -210,10 +160,8 @@ function rowDetail() {
           onClick: clickArea === 'icon' ? onClick : undefined
         }), content);
       };
-
       var getCellProps = function getCellProps(value, row, rowIndex) {
         var _a;
-
         if (row[rowDetailMetaKey]) {
           return {
             style: (0, _extends4.default)({
@@ -222,19 +170,15 @@ 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 (0, _utils.mergeCellProps)(prevProps, {
           onClick: function onClick(e) {
             if (opts.stopClickEventPropagation) {
               e.stopPropagation();
             }
-
             toggle(_internals.internals.safeGetRowKey(primaryKey, row, rowIndex));
           },
           style: {
@@ -242,15 +186,12 @@ function rowDetail() {
           }
         });
       };
-
       var _tableColumns = (0, _toArray2.default)(tableColumns),
-          firstCol = _tableColumns[0],
-          others = (0, _slice.default)(_tableColumns).call(_tableColumns, 1);
-
+        firstCol = _tableColumns[0],
+        others = (0, _slice.default)(_tableColumns).call(_tableColumns, 1);
       var firstColRender = function firstColRender(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           var renderRowDetail = (0, _renderTemplates.default)('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -259,15 +200,11 @@ function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = _internals.internals.safeRender(firstCol, row, rowIndex);
-
         return content;
       };
-
       tableColumns[0] = (0, _extends4.default)((0, _extends4.default)({}, firstCol), {
         render: firstColRender,
         getSpanRect: function getSpanRect(value, row, rowIndex) {
@@ -283,12 +220,12 @@ function rowDetail() {
         }
       });
       tableColumns[expandColumnIndex] = (0, _extends4.default)((0, _extends4.default)({}, expandCol), {
-        title: /*#__PURE__*/_react.default.createElement("div", {
+        title: (/*#__PURE__*/_react.default.createElement("div", {
           style: {
             display: 'inline-block',
             marginLeft: textOffset
           }
-        }, _internals.internals.safeRenderHeader(expandCol)),
+        }, _internals.internals.safeRenderHeader(expandCol))),
         render: render,
         getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps,
         getSpanRect: function getSpanRect(value, row, rowIndex) {

package/lib/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 {};