linkmore-design 1.1.13-alpha.1 → 1.1.13-alpha.12

package/lib/LmEditTable/components/DraggableContainer.d.ts

@@ -1,7 +1,10 @@
-declare const DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+declare const DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
     [x: string]: any;
     keys: any;
     onSortEnd: any;
     virtual: any;
+    rowKey: any;
+    options: any;
+    tableWidth: any;
 }) => JSX.Element;
 export default DraggableContainer;

package/lib/LmEditTable/components/DraggableContainer.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _DndContainer = _interopRequireDefault(require("../DndContainer"));
+var _DndContainerRow = _interopRequireDefault(require("../rowSort/DndContainerRow"));
 
 var _sortableBox = _interopRequireDefault(require("../sortableBox"));
 
@@ -32,10 +32,17 @@ var DraggableContainer = function DraggableContainer(_a) {
   var keys = _a.keys,
       onSortEnd = _a.onSortEnd,
       virtual = _a.virtual,
-      props = __rest(_a, ["keys", "onSortEnd", "virtual"]);
-
-  return /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
-    move: onSortEnd
+      rowKey = _a.rowKey,
+      options = _a.options,
+      tableWidth = _a.tableWidth,
+      props = __rest(_a, ["keys", "onSortEnd", "virtual", "rowKey", "options", "tableWidth"]);
+
+  return /*#__PURE__*/_react.default.createElement(_DndContainerRow.default, {
+    move: onSortEnd,
+    items: keys,
+    rowKey: rowKey,
+    options: options,
+    tableWidth: tableWidth
   }, /*#__PURE__*/_react.default.createElement(_sortableBox.default, {
     items: keys
   }, virtual ? /*#__PURE__*/_react.default.createElement(_virtual.VirtualWrapper, Object.assign({}, props)) : /*#__PURE__*/_react.default.createElement("tbody", Object.assign({}, props))));

package/lib/LmEditTable/components/QuickOpetate.d.ts

@@ -0,0 +1,12 @@
+import { FC } from 'react';
+interface IOpetateProps {
+    record: Record<string, any>;
+    rowKey?: string;
+    handleAdd?: (row?: any, addInChildren?: boolean) => void;
+    handleDelete?: (rowKey?: string) => void;
+    options?: string[];
+    getLength?: number;
+    quickOpetateClearAll?: boolean;
+}
+declare const QuickOpetate: FC<IOpetateProps>;
+export default QuickOpetate;

package/lib/LmEditTable/components/QuickOpetate.js

@@ -0,0 +1,96 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Button = _interopRequireDefault(require("../../Button"));
+
+var _IconFont = _interopRequireDefault(require("../../IconFont"));
+
+var _Popover = _interopRequireDefault(require("../../Popover"));
+
+var _DisabledContext = _interopRequireDefault(require("../../ConfigProvider/DisabledContext"));
+
+var QuickOpetate = function QuickOpetate(_ref) {
+  var record = _ref.record,
+      rowKey = _ref.rowKey,
+      handleAdd = _ref.handleAdd,
+      handleDelete = _ref.handleDelete,
+      _ref$options = _ref.options,
+      options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options,
+      getLength = _ref.getLength,
+      quickOpetateClearAll = _ref.quickOpetateClearAll;
+  var disabled = _react.default.useContext(_DisabledContext.default) || false;
+
+  var appendChildren = function appendChildren() {
+    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record, true);
+  };
+
+  var appendAdd = function appendAdd() {
+    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record);
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'flex-start',
+      marginLeft: '-4px'
+    }
+  }, options.includes('delete') && /*#__PURE__*/_react.default.createElement(_Button.default, {
+    type: "link",
+    size: "small",
+    disabled: !quickOpetateClearAll && getLength < 2 || disabled,
+    icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-minus-circle",
+      style: {
+        fontSize: 16
+      }
+    }),
+    onClick: function onClick() {
+      return handleDelete(record[rowKey]);
+    }
+  }), (options === null || options === void 0 ? void 0 : options.includes('add')) && (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_Popover.default, {
+    placement: "bottom",
+    overlayClassName: "lm_table_append_add_popover",
+    open: open,
+    title: null,
+    content: /*#__PURE__*/_react.default.createElement("ul", null, /*#__PURE__*/_react.default.createElement("li", {
+      onClick: appendAdd
+    }, "\u6DFB\u52A0\u5E73\u7EA7"), /*#__PURE__*/_react.default.createElement("li", {
+      onClick: appendChildren
+    }, "\u6DFB\u52A0\u5B50\u7EA7")),
+    trigger: "hover"
+  }, /*#__PURE__*/_react.default.createElement(_Button.default, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-plus-circle-fill",
+      style: {
+        fontSize: 16
+      }
+    })
+  })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_Button.default, {
+    type: "link",
+    size: "small",
+    disabled: disabled,
+    icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-plus-circle-fill",
+      style: {
+        fontSize: 16
+      }
+    }),
+    onClick: function onClick() {
+      return handleAdd(record, !!(options === null || options === void 0 ? void 0 : options.includes('addInChildren')));
+    }
+  }) : null);
+};
+
+var _default = QuickOpetate;
+exports.default = _default;

package/lib/LmEditTable/components/bottomOpetateComponent.d.ts

@@ -0,0 +1,13 @@
+interface IBottomOpetateCompoentProps {
+    isShowAddAction?: boolean;
+    handleAdd?: () => void;
+    recordCreatorProps?: {
+        creatorButtonText?: string;
+        style?: Record<string, any>;
+        initData?: Record<string, any> | (() => Record<string, any>);
+        customAddClick?: () => void;
+    };
+    disabled?: boolean;
+}
+declare const BottomOpetateComponent: (props: IBottomOpetateCompoentProps) => JSX.Element;
+export default BottomOpetateComponent;

package/lib/LmEditTable/components/bottomOpetateComponent.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _index = require("../../index");
+
+var BottomOpetateComponent = function BottomOpetateComponent(props) {
+  var isShowAddAction = props.isShowAddAction,
+      recordCreatorProps = props.recordCreatorProps,
+      handleAdd = props.handleAdd,
+      _props$disabled = props.disabled,
+      disabled = _props$disabled === void 0 ? false : _props$disabled;
+  return isShowAddAction ? /*#__PURE__*/_react.default.createElement(_index.Button, {
+    className: "lm_editTable_add_bar",
+    type: "dashed",
+    disabled: disabled,
+    onClick: (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.customAddClick) || handleAdd,
+    style: Object.assign({
+      marginTop: 8
+    }, (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.style) || {})
+  }, /*#__PURE__*/_react.default.createElement(_index.IconFont, {
+    type: "lmweb-plus"
+  }), (recordCreatorProps === null || recordCreatorProps === void 0 ? void 0 : recordCreatorProps.creatorButtonText) || '新增') : null;
+};
+
+var _default = BottomOpetateComponent;
+exports.default = _default;

package/lib/LmEditTable/components/index.d.ts

@@ -1,11 +1,16 @@
 import DraggableContainer from './DraggableContainer';
-export { DraggableContainer };
+import BottomOpetateComponent from './bottomOpetateComponent';
+import QuickOpetate from './QuickOpetate';
+export { DraggableContainer, BottomOpetateComponent, QuickOpetate };
 declare const _default: {
-    DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+    DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
         [x: string]: any;
         keys: any;
         onSortEnd: any;
         virtual: any;
+        rowKey: any;
+        options: any;
+        tableWidth: any;
     }) => JSX.Element;
 };
 export default _default;

package/lib/LmEditTable/components/index.js

@@ -5,16 +5,32 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "BottomOpetateComponent", {
+  enumerable: true,
+  get: function get() {
+    return _bottomOpetateComponent.default;
+  }
+});
 Object.defineProperty(exports, "DraggableContainer", {
   enumerable: true,
   get: function get() {
     return _DraggableContainer.default;
   }
 });
+Object.defineProperty(exports, "QuickOpetate", {
+  enumerable: true,
+  get: function get() {
+    return _QuickOpetate.default;
+  }
+});
 exports.default = void 0;
 
 var _DraggableContainer = _interopRequireDefault(require("./DraggableContainer"));
 
+var _bottomOpetateComponent = _interopRequireDefault(require("./bottomOpetateComponent"));
+
+var _QuickOpetate = _interopRequireDefault(require("./QuickOpetate"));
+
 var _default = {
   DraggableContainer: _DraggableContainer.default
 };

package/lib/LmEditTable/hooks/useForkRef.d.ts

@@ -0,0 +1,2 @@
+import { Ref } from 'react';
+export default function useForkRef<InstanceA, InstanceB>(refA: Ref<InstanceA> | null | undefined, refB: Ref<InstanceB> | null | undefined): Ref<InstanceA & InstanceB> | null;

package/lib/LmEditTable/hooks/useForkRef.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useForkRef;
+
+var _react = require("react");
+
+function setRef(ref, value) {
+  if (typeof ref === 'function') {
+    ref(value);
+  } else if (ref) {
+    ref.current = value;
+  }
+}
+
+function useForkRef(refA, refB) {
+  return (0, _react.useMemo)(function () {
+    if (refA == null && refB == null) {
+      return null;
+    }
+
+    return function (refValue) {
+      setRef(refA, refValue);
+      setRef(refB, refValue);
+    };
+  }, [refA, refB]);
+}

package/lib/LmEditTable/rowSort/DndContainerRow.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ children, options, move, rowKey, items, tableWidth }: {
+    children: any;
+    options: any;
+    move: any;
+    rowKey: any;
+    items: any;
+    tableWidth: any;
+}) => JSX.Element>;
+export default _default;

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -0,0 +1,99 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _core = require("@dnd-kit/core");
+
+var _modifiers = require("@dnd-kit/modifiers");
+
+var _sortable = require("@dnd-kit/sortable");
+
+// 可拖拽容器
+var DndContainer = function DndContainer(_ref) {
+  var children = _ref.children,
+      options = _ref.options,
+      move = _ref.move,
+      rowKey = _ref.rowKey,
+      items = _ref.items,
+      tableWidth = _ref.tableWidth;
+
+  var _React$useState = _react.default.useState(false),
+      _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
+      isDragging = _React$useState2[0],
+      setIsDragging = _React$useState2[1]; // 是否拖拽中
+
+
+  var _React$useState3 = _react.default.useState(null),
+      _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
+      activeId = _React$useState4[0],
+      setActiveId = _React$useState4[1]; // 是否拖拽中
+
+
+  var sensors = (0, _core.useSensors)((0, _core.useSensor)(_core.PointerSensor), (0, _core.useSensor)(_core.KeyboardSensor, {
+    coordinateGetter: _sortable.sortableKeyboardCoordinates
+  })); // 开始拖拽
+
+  var handleDragStart = function handleDragStart(_ref2) {
+    var active = _ref2.active;
+    setIsDragging(true);
+
+    if (!active) {
+      return;
+    }
+
+    setActiveId(active.id);
+  }; // 拖拽结束
+
+
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+        over = event.over;
+    setActiveId(null); // 未移入时触发
+
+    if (!(over === null || over === void 0 ? void 0 : over.id)) {
+      return;
+    } // 移入时触发更新数据
+
+
+    if (active.id !== over.id) {
+      move(active.id, over.id);
+    }
+  };
+
+  var instance = {
+    isDragging: isDragging,
+    activeId: activeId,
+    options: options,
+    rowKey: rowKey,
+    children: children,
+    move: move,
+    items: items,
+    tableWidth: tableWidth
+  };
+  console.log('instance', instance);
+  return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+    sensors: sensors,
+    onDragStart: handleDragStart,
+    onDragCancel: function onDragCancel() {
+      return setActiveId(null);
+    },
+    collisionDetection: _core.closestCenter,
+    onDragEnd: handleDragEnd,
+    modifiers: [_modifiers.restrictToParentElement, _modifiers.restrictToVerticalAxis]
+  }, children);
+};
+
+var _default = /*#__PURE__*/(0, _react.memo)(DndContainer);
+
+exports.default = _default;

package/lib/LmEditTable/sortableItem.js

@@ -58,6 +58,7 @@ var SortableItem = function SortableItem(props) {
 
   return /*#__PURE__*/_react.default.createElement(_virtual.VirtualRow, Object.assign({}, resetField, {
     ref: setNodeRef,
+    pref: setNodeRef,
     key: key,
     style: style
   }, attributes), children);

package/lib/LmEditTable/sortableItemCol.js

@@ -26,20 +26,47 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
+// interface ItemType {
+//   children: React.ReactNode
+// }
+// interface ItemInstance {}
+// @ts-ignore
 var Item = /*#__PURE__*/(0, _react.forwardRef)(function (_a, ref) {
-  var _b;
-
   var children = _a.children,
-      props = __rest(_a, ["children"]);
+      props = __rest(_a, ["children"]); // const rProps = omit({ ...props, ...children.props }, [
+  //   'isSticky',
+  //   'colStart',
+  //   'colEnd',
+  //   'prefixCls',
+  //   'fixLeft',
+  //   'fixRight',
+  //   'lastFixLeft',
+  //   'firstFixRight',
+  //   'lastFixRight',
+  //   'firstFixLeft',
+  //   'isSticky',
+  //   'additionalProps',
+  //   'rowType',
+  // ])
+
 
-  return /*#__PURE__*/_react.default.createElement("th", Object.assign({}, props, {
-    ref: ref
-  }), ((_b = children === null || children === void 0 ? void 0 : children.props) === null || _b === void 0 ? void 0 : _b.children) || children);
+  return (
+    /*#__PURE__*/
+    // <th {...rProps} ref={ref as any} />
+    _react.default.createElement("th", Object.assign({}, props, children.props, {
+      ref: ref
+    })) // <th {...props} ref={ref as any}>
+    //   {(children as any)?.props?.children || children}
+    // </th>
+
+  );
 });
 
 function SortableItem(props) {
+  var id = props.id;
+
   var _useSortable = (0, _sortable.useSortable)({
-    id: props.id
+    id: id
   }),
       attributes = _useSortable.attributes,
       listeners = _useSortable.listeners,
@@ -49,7 +76,9 @@ function SortableItem(props) {
 
   var style = {
     position: 'relative',
-    transform: _utilities.CSS.Translate.toString(transform),
+    transform: _utilities.CSS.Translate.toString(transform ? Object.assign(Object.assign({}, transform), {
+      y: 0
+    }) : transform),
     transition: transition,
     touchAction: 'none',
     height: '40px',

package/lib/LmEditTable/style/index.css

@@ -538,6 +538,9 @@ p {
   width: 32px;
   padding: 0 8px;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  height: 100%;
+}
 .lm_editTable_warpper .lm_editTable_cell {
   cursor: pointer;
   height: 40px;
@@ -552,6 +555,18 @@ p {
 .lm_editTable_warpper .lm_custom_cell_td {
   position: relative;
 }
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
+.lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
+  flex: 1 1 auto;
+}
 .lm_editTable_warpper .lm_custom_cell_td .ant-form-item-control-input-content {
   display: flex;
   flex-direction: row;
@@ -600,6 +615,9 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table-body {
+  scroll-behavior: smooth;
+}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }
@@ -613,6 +631,12 @@ p {
   padding-left: 8px;
   padding-right: 8px;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+}
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -656,3 +680,6 @@ p {
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}

package/lib/LmEditTable/style/variables.css

@@ -26,6 +26,9 @@
   width: 32px;
   padding: 0 8px;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  height: 100%;
+}
 .lm_editTable_warpper .lm_editTable_cell {
   cursor: pointer;
   height: 40px;
@@ -40,6 +43,18 @@
 .lm_editTable_warpper .lm_custom_cell_td {
   position: relative;
 }
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
+.lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
+  flex: 1 1 auto;
+}
 .lm_editTable_warpper .lm_custom_cell_td .ant-form-item-control-input-content {
   display: flex;
   flex-direction: row;
@@ -88,6 +103,9 @@
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table-body {
+  scroll-behavior: smooth;
+}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }
@@ -101,6 +119,12 @@
   padding-left: 8px;
   padding-right: 8px;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+}
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -144,3 +168,6 @@
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}

package/lib/LmEditTable/util.d.ts

@@ -4,6 +4,11 @@ export declare function isExpandRow(children: any): boolean;
 export declare function checkRowKeyByDataSource(dataSource: any, rowKey: any): any;
 export declare function getExpandStatus(children: any): any;
 export declare function checkMemoShouldUploadSpecialFun(prev: any, next: any): any;
+export declare function checkExpandIconColumnIndex({ rowSelection, sortOpen, indexCol }: {
+    rowSelection: any;
+    sortOpen: any;
+    indexCol: any;
+}): number;
 declare const _default: {
     isObjEmpty: typeof isObjEmpty;
 };