linkmore-design 1.1.19 → 1.1.21

package/lib/LmDrag/LmDrag.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Root = _interopRequireDefault(require("./wrapper/Root"));
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var LmDrag = function LmDrag(_a, ref) {
+  var resetProps = __rest(_a, []);
+
+  var defaultRef = (0, _react.useRef)(null);
+  var defaultProps = Object.assign({
+    options: [],
+    rowKey: 'id'
+  }, resetProps);
+  return /*#__PURE__*/_react.default.createElement(_Root.default, Object.assign({
+    ref: ref || defaultRef
+  }, defaultProps));
+};
+
+var _default = /*#__PURE__*/(0, _react.forwardRef)(LmDrag);
+
+exports.default = _default;

package/lib/LmDrag/components/DndContainer.d.ts

@@ -0,0 +1,3 @@
+import type { LmDragProps } from '..';
+declare const DndContainer: ({ options, rowKey, children, move }: LmDragProps) => JSX.Element;
+export default DndContainer;

package/lib/LmDrag/components/DndContainer.js

@@ -0,0 +1,138 @@
+"use strict";
+
+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 = _interopRequireDefault(require("react"));
+
+var _core = require("@dnd-kit/core");
+
+var _modifiers = require("@dnd-kit/modifiers");
+
+var _sortable = require("@dnd-kit/sortable");
+
+var _sortableBox = _interopRequireDefault(require("./sortableBox"));
+
+var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
+  var instance = _ref.instance;
+  var isDragging = instance.isDragging,
+      activeId = instance.activeId,
+      rowKey = instance.rowKey,
+      children = instance.children,
+      options = instance.options;
+  var item = activeId && options.find(function (v) {
+    return v[rowKey] === activeId;
+  });
+  return /*#__PURE__*/_react.default.createElement(_core.DragOverlay, {
+    adjustScale: false
+  }, isDragging ? children({
+    item: item,
+    listeners: {}
+  }) : null);
+});
+/*
+ * restrictToParentElement 拖拽限制在父元素内
+ */
+// 可拖拽容器
+
+
+var DndContainer = function DndContainer(_ref2) {
+  var options = _ref2.options,
+      rowKey = _ref2.rowKey,
+      children = _ref2.children,
+      move = _ref2.move;
+
+  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 handleMove = function handleMove(activeItem, overItem) {
+    var fileMap = options.map(function (v) {
+      if (v[rowKey] === activeItem[rowKey]) {
+        return Object.assign({}, overItem);
+      }
+
+      if (v[rowKey] === overItem[rowKey]) {
+        return Object.assign({}, activeItem);
+      }
+
+      return v;
+    });
+    move === null || move === void 0 ? void 0 : move(activeItem, overItem, fileMap);
+  }; // 开始拖拽
+
+
+  var handleDragStart = function handleDragStart(_ref3) {
+    var active = _ref3.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) {
+      handleMove(active.data.current.item, over.data.current.item);
+    }
+  };
+
+  var instance = {
+    isDragging: isDragging,
+    activeId: activeId,
+    options: options,
+    rowKey: rowKey,
+    children: children,
+    move: move,
+    items: options === null || options === void 0 ? void 0 : options.map(function (v) {
+      return v[rowKey];
+    })
+  };
+  return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+    sensors: sensors,
+    onDragStart: handleDragStart,
+    onDragEnd: handleDragEnd,
+    onDragCancel: function onDragCancel() {
+      return setActiveId(null);
+    },
+    modifiers: [_modifiers.restrictToParentElement],
+    collisionDetection: _core.closestCenter
+  }, /*#__PURE__*/_react.default.createElement(_sortableBox.default, {
+    instance: instance
+  }), /*#__PURE__*/_react.default.createElement(DragOver, {
+    instance: instance
+  }));
+};
+
+var _default = DndContainer;
+exports.default = _default;

package/lib/LmDrag/components/sortableBox.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ instance }: {
+    instance: any;
+}) => JSX.Element>;
+export default _default;

package/lib/LmDrag/components/sortableBox.js

@@ -0,0 +1,37 @@
+"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 _sortable = require("@dnd-kit/sortable");
+
+var _sortableItem = _interopRequireDefault(require("./sortableItem"));
+
+// rectSortingStrategy 可交换策略
+var SortableBox = function SortableBox(_ref) {
+  var instance = _ref.instance;
+  var items = instance.items,
+      rowKey = instance.rowKey,
+      options = instance.options;
+  return /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+    items: items,
+    strategy: _sortable.rectSortingStrategy
+  }, options === null || options === void 0 ? void 0 : options.map(function (item, idx) {
+    return /*#__PURE__*/_react.default.createElement(_sortableItem.default, {
+      instance: instance,
+      index: idx,
+      key: item[rowKey] || idx,
+      item: item
+    });
+  }));
+};
+
+var _default = /*#__PURE__*/_react.default.memo(SortableBox);
+
+exports.default = _default;

package/lib/LmDrag/components/sortableItem.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ index, item, instance }: {
+    index: any;
+    item: any;
+    instance: any;
+}) => JSX.Element>;
+export default _default;

package/lib/LmDrag/components/sortableItem.js

@@ -0,0 +1,54 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _sortable = require("@dnd-kit/sortable");
+
+var _utilities = require("@dnd-kit/utilities");
+
+var SortableItem = function SortableItem(_ref) {
+  var index = _ref.index,
+      item = _ref.item,
+      instance = _ref.instance;
+  var children = instance.children,
+      rowKey = instance.rowKey;
+
+  var _useSortable = (0, _sortable.useSortable)({
+    id: item[rowKey] || index,
+    data: {
+      item: item
+    }
+  }),
+      attributes = _useSortable.attributes,
+      listeners = _useSortable.listeners,
+      setNodeRef = _useSortable.setNodeRef,
+      transform = _useSortable.transform,
+      transition = _useSortable.transition;
+
+  var resetStyle = (0, _react.useMemo)(function () {
+    return {
+      transform: _utilities.CSS.Transform.toString(transform),
+      transition: transition
+    };
+  }, [transform, transition]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", Object.assign({
+    className: "lm_drag_item",
+    ref: setNodeRef,
+    style: resetStyle
+  }, attributes), children === null || children === void 0 ? void 0 : children({
+    item: item,
+    listeners: listeners,
+    index: index
+  })));
+};
+
+var _default = /*#__PURE__*/_react.default.memo(SortableItem);
+
+exports.default = _default;

package/lib/LmDrag/index.d.ts

@@ -0,0 +1,10 @@
+import React, { ReactNode } from 'react';
+import LmDrag from './LmDrag';
+export default LmDrag;
+export { LmDrag };
+export interface LmDragProps {
+    options?: Array<any>;
+    rowKey: string;
+    move?: (activeId: string, overId: string, fileList: Array<any>) => void;
+    children?: ReactNode | React.FC | null;
+}

package/lib/LmDrag/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "LmDrag", {
+  enumerable: true,
+  get: function get() {
+    return _LmDrag.default;
+  }
+});
+exports.default = void 0;
+
+var _LmDrag = _interopRequireDefault(require("./LmDrag"));
+
+var _default = _LmDrag.default;
+exports.default = _default;

package/lib/LmDrag/style/index.d.ts

@@ -0,0 +1 @@
+import './index.less';

package/lib/LmDrag/style/index.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("./index.css");

package/lib/LmDrag/style/variables.d.ts

@@ -0,0 +1 @@
+import './variables.less';

package/lib/LmDrag/style/variables.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("./variables.css");

package/lib/LmDrag/wrapper/Root.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/LmDrag/wrapper/Root.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _DndContainer = _interopRequireDefault(require("../components/DndContainer"));
+
+var Root = function Root(props, ref) {
+  // 向外暴露出的方法
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {};
+  });
+  return /*#__PURE__*/_react.default.createElement(_DndContainer.default, Object.assign({}, props));
+};
+
+var _default = /*#__PURE__*/(0, _react.forwardRef)(Root);
+
+exports.default = _default;

package/lib/LmUpload/LmUpload.js

@@ -85,7 +85,7 @@ var LmUpload = function LmUpload(_a, ref) {
     size: 100,
     fileSize: 10,
     fileSizeType: 'M',
-    uid: 'uid',
+    uid: 'fileName',
     accept: '',
     type: ['jpg', 'jpeg', 'png'],
     listType: 'card',
@@ -100,6 +100,7 @@ var LmUpload = function LmUpload(_a, ref) {
     itemRender: null,
     enabledPreview: true,
     enabledCrop: false,
+    enableDrag: false,
     enabledOss: false,
     // oss配置
     ossConfig: function ossConfig() {

package/lib/LmUpload/UploadList/ItemPictureCard.d.ts

@@ -1,6 +1,7 @@
-declare const PictureItem: ({ file, index, instance }: {
+declare const PictureItem: ({ file, index, instance, listeners }: {
     file: any;
     index: any;
     instance: any;
+    listeners: any;
 }) => JSX.Element;
 export default PictureItem;

package/lib/LmUpload/UploadList/ItemPictureCard.js

@@ -78,7 +78,8 @@ var renderThumb = function renderThumb(file) {
 var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
       index = _ref.index,
-      instance = _ref.instance;
+      instance = _ref.instance,
+      listeners = _ref.listeners;
   var dispatch = instance.dispatch,
       readOnly = instance.readOnly,
       size = instance.size,
@@ -162,6 +163,13 @@ var PictureItem = function PictureItem(_ref) {
     style: {
       fontSize: resetSize.fontSize
     }
+  })), /*#__PURE__*/_react.default.createElement("div", Object.assign({
+    className: "action_preview"
+  }, listeners), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-drag",
+    style: {
+      fontSize: resetSize.fontSize
+    }
   })), !readOnly && /*#__PURE__*/_react.default.createElement("div", {
     className: "action_delete",
     onClick: function onClick() {

package/lib/LmUpload/UploadList/index.js

@@ -11,17 +11,23 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _utils = require("../utils");
 
 var _RenderItem = _interopRequireDefault(require("./RenderItem"));
 
 var LmUploadList = function LmUploadList(_ref) {
   var instance = _ref.instance;
-  var getFileHasValue = instance.getFileHasValue,
+  var uid = instance.uid,
+      dispatch = instance.dispatch,
+      getFileHasValue = instance.getFileHasValue,
       getFileList = instance.getFileList,
       itemRender = instance.itemRender,
       listType = instance.listType,
-      showUploadList = instance.showUploadList;
+      showUploadList = instance.showUploadList,
+      enableDrag = instance.enableDrag,
+      fileNames = instance.fileNames;
   if (!showUploadList) return null;
   var fileList = (0, _react.useMemo)(function () {
     var _a;
@@ -30,6 +36,54 @@ var LmUploadList = function LmUploadList(_ref) {
       return a.seq - b.seq;
     });
   }, [getFileList]);
+
+  var handleMove = function handleMove(active, over, fileList) {
+    try {
+      var fileMap = fileList.map(function (v) {
+        if (getFileHasValue(v) === getFileHasValue(active)) {
+          return Object.assign(Object.assign({}, v), {
+            seq: over[fileNames.seq]
+          });
+        }
+
+        if (getFileHasValue(v) === getFileHasValue(over)) {
+          return Object.assign(Object.assign({}, v), {
+            seq: active[fileNames.seq]
+          });
+        }
+
+        return v;
+      });
+      dispatch({
+        type: 'changeFileList',
+        fileList: fileMap
+      });
+    } catch (error) {
+      console.log('移动出现了错误', error);
+    }
+  };
+
+  if (enableDrag) {
+    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.LmDrag, {
+      options: fileList,
+      rowKey: uid,
+      move: handleMove
+    }, function (_ref2) {
+      var item = _ref2.item,
+          listeners = _ref2.listeners,
+          index = _ref2.index;
+      return (0, _utils.render)(itemRender || _RenderItem.default, {
+        type: listType,
+        key: getFileHasValue(item) || index,
+        index: index,
+        file: item,
+        fileList: fileList,
+        instance: instance,
+        listeners: listeners
+      });
+    });
+  }
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fileList === null || fileList === void 0 ? void 0 : fileList.map(function (file, idx) {
     return (0, _utils.render)(itemRender || _RenderItem.default, {
       type: listType,

package/lib/LmUpload/fns/index.js

@@ -78,10 +78,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [uid]); // 从对象中读取存在的指定属性
 
   var getFileHasValue = (0, _react.useCallback)(function (obj) {
+    if (!obj) return '';
     var extend = [uid, 'fileName'];
     var val = '';
     extend.forEach(function (v) {
-      if (!val) val = obj[v];
+      if (!val && obj[v]) val = obj[v];
     });
     return val;
   }, [uid]); // 获取当前的文件列表

package/lib/index.d.ts

@@ -125,3 +125,4 @@ export { default as CropImg } from './CropImg';
 export type { CropImgProps } from './CropImg';
 export { default as ImageViewer } from './ImageViewer';
 export type { ImageViewerProps } from './ImageViewer';
+export * from './LmDrag';

package/lib/index.js

@@ -776,4 +776,18 @@ Object.keys(_LmImgList).forEach(function (key) {
 
 var _CropImg = _interopRequireDefault(require("./CropImg"));
 
-var _ImageViewer = _interopRequireDefault(require("./ImageViewer"));
+var _ImageViewer = _interopRequireDefault(require("./ImageViewer"));
+
+var _LmDrag = require("./LmDrag");
+
+Object.keys(_LmDrag).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _LmDrag[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _LmDrag[key];
+    }
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"