@fonixtree/magic-design 1.0.52 → 1.0.53

package/es/common/ProductModal/SortableImageList/index.js

@@ -0,0 +1,118 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = SortableImageList;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
+
+var _Iconfont = _interopRequireDefault(require("../../Iconfont"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function SortableImageList(_a) {
+  var selectedList = _a.selectedList,
+      setSelectedList = _a.setSelectedList;
+
+  var _b = (0, _react.useState)(''),
+      dragId = _b[0],
+      setDragId = _b[1];
+
+  var _c = (0, _react.useState)(selectedList || []),
+      list = _c[0],
+      setList = _c[1];
+
+  var ref = (0, _react.useRef)();
+
+  var onDragEnd = function onDragEnd() {
+    console.log('onDragEnd');
+    setDragId('');
+
+    if (ref.current) {
+      setSelectedList(ref.current);
+    }
+  };
+
+  (0, _react.useEffect)(function () {
+    setList(selectedList || []);
+  }, [selectedList]);
+
+  var delSelectedItem = function delSelectedItem(index) {
+    var rows = JSON.parse(JSON.stringify(selectedList));
+    rows.splice(index, 1);
+    setSelectedList(rows);
+  };
+
+  var moveCard = (0, _react.useCallback)(function (dragNodeId, hoverNodeId) {
+    var dragIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(dragNodeId);
+    });
+    var hoverIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(hoverNodeId);
+    });
+    setList(function (prevCards) {
+      var newList = (0, _immutabilityHelper["default"])(prevCards, {
+        $splice: [[dragIndex, 1], [hoverIndex, 0, prevCards[dragIndex]]]
+      });
+      ref.current = newList;
+      return newList;
+    });
+  }, [list]);
+
+  var onDragEnter = function onDragEnter(e) {
+    console.log('onDragEnter');
+    var hoverNodeId = e.currentTarget.dataset.nodeid;
+
+    if (dragId === hoverNodeId) {
+      return;
+    }
+
+    moveCard(dragId, hoverNodeId);
+  };
+
+  var onDragStart = function onDragStart(e) {
+    setDragId(e.currentTarget.dataset.nodeid);
+    console.log('onDragStart');
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "imgListWrap"
+  }, list.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: index,
+      className: "selectedItem"
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
+      "data-nodeid": item.productId,
+      draggable: "true",
+      onDragEnd: onDragEnd,
+      onDragEnter: onDragEnter,
+      onDragOver: function onDragOver(e) {
+        e.preventDefault();
+      },
+      onDragStart: onDragStart,
+      src: item.productImageUrl,
+      title: item.productName
+    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      className: "selectedItemClose",
+      color: "#000",
+      onClick: function onClick() {
+        return delSelectedItem(index);
+      },
+      size: 12,
+      type: "icon-close"
+    }));
+  }));
+}

package/es/common/ProductModal/SortableImageList/index.less

@@ -0,0 +1,3 @@
+.imgListWrap {
+  display: flex;
+}

package/es/common/ProductModal/index.js

@@ -11,12 +11,12 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _SortableImageList = _interopRequireDefault(require("./SortableImageList"));
+
 var _commonUtil = require("../../utils/commonUtil");
 
 var _businessUtil = require("../../utils/businessUtil");
 
-var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-
 var _currencyUtil = require("../../utils/currencyUtil");
 
 require("./index.less");
@@ -224,8 +224,7 @@ var formatData = function formatData(list, type) {
 };
 
 exports.formatData = formatData;
-var Option = _antd.Select.Option,
-    OptGroup = _antd.Select.OptGroup;
+var Option = _antd.Select.Option;
 var InputGroup = _antd.Input.Group;
 
 var ProductModal = function ProductModal(props) {
@@ -311,17 +310,13 @@ var ProductModal = function ProductModal(props) {
       selectedList = _w[0],
       setSelectedList = _w[1];
 
-  var _x = (0, _react.useState)(''),
-      dragId = _x[0],
-      setDragId = _x[1];
-
-  var _y = (0, _react.useState)({
+  var _x = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _y[0],
-      setPaginationParams = _y[1];
+      paginationParams = _x[0],
+      setPaginationParams = _x[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -349,45 +344,8 @@ var ProductModal = function ProductModal(props) {
         name: record.name
       };
     }
-  };
-
-  var delSelectedItem = function delSelectedItem(index) {
-    var rows = JSON.parse(JSON.stringify(selectedList));
-    rows.splice(index, 1);
-    setSelectedList(rows);
-  };
-
-  var moveItem = function moveItem(dragNodeId, hoverNodeId) {
-    var source = JSON.parse(JSON.stringify(selectedList));
-    var dragIndex = source.findIndex(function (obj) {
-      return obj.productId == dragNodeId;
-    });
-    var hoverIndex = source.findIndex(function (obj) {
-      return obj.productId == hoverNodeId;
-    });
-    var list = (0, _commonUtil.dragSource)(source, dragIndex, hoverIndex);
-    setSelectedList(list);
-  };
-
-  var onDragStart = function onDragStart(e) {
-    setDragId(e.currentTarget.dataset.nodeid);
-  };
-
-  var onDragEnter = function onDragEnter(e) {
-    var hoverNodeId = e.currentTarget.dataset.nodeid;
-
-    if (dragId === hoverNodeId) {
-      return;
-    }
-
-    moveItem(dragId, hoverNodeId);
-  };
-
-  var onDragEnd = function onDragEnd() {
-    setDragId('');
   }; // 请求商品列表
 
-
   var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
       var _list, total, params, res_1, res;
@@ -825,31 +783,9 @@ var ProductModal = function ProductModal(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"
-  }, selectedList.map(function (item, index) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      key: index,
-      className: "selectedItem",
-      "data-nodeid": item.productId,
-      onDragEnd: onDragEnd,
-      onDragEnter: onDragEnter,
-      onDragOver: function onDragOver(e) {
-        e.preventDefault();
-      },
-      onDragStart: onDragStart
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      alt: "",
-      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
-      src: item.productImageUrl,
-      title: item.productName
-    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      className: "selectedItemClose",
-      color: "#000",
-      onClick: function onClick() {
-        return delSelectedItem(index);
-      },
-      size: 12,
-      type: "icon-close"
-    }));
+  }, /*#__PURE__*/_react["default"].createElement(_SortableImageList["default"], {
+    selectedList: selectedList,
+    setSelectedList: setSelectedList
   })))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/common/ProductModal/SortableImageList/index.js

@@ -0,0 +1,118 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = SortableImageList;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
+
+var _Iconfont = _interopRequireDefault(require("../../Iconfont"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function SortableImageList(_a) {
+  var selectedList = _a.selectedList,
+      setSelectedList = _a.setSelectedList;
+
+  var _b = (0, _react.useState)(''),
+      dragId = _b[0],
+      setDragId = _b[1];
+
+  var _c = (0, _react.useState)(selectedList || []),
+      list = _c[0],
+      setList = _c[1];
+
+  var ref = (0, _react.useRef)();
+
+  var onDragEnd = function onDragEnd() {
+    console.log('onDragEnd');
+    setDragId('');
+
+    if (ref.current) {
+      setSelectedList(ref.current);
+    }
+  };
+
+  (0, _react.useEffect)(function () {
+    setList(selectedList || []);
+  }, [selectedList]);
+
+  var delSelectedItem = function delSelectedItem(index) {
+    var rows = JSON.parse(JSON.stringify(selectedList));
+    rows.splice(index, 1);
+    setSelectedList(rows);
+  };
+
+  var moveCard = (0, _react.useCallback)(function (dragNodeId, hoverNodeId) {
+    var dragIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(dragNodeId);
+    });
+    var hoverIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(hoverNodeId);
+    });
+    setList(function (prevCards) {
+      var newList = (0, _immutabilityHelper["default"])(prevCards, {
+        $splice: [[dragIndex, 1], [hoverIndex, 0, prevCards[dragIndex]]]
+      });
+      ref.current = newList;
+      return newList;
+    });
+  }, [list]);
+
+  var onDragEnter = function onDragEnter(e) {
+    console.log('onDragEnter');
+    var hoverNodeId = e.currentTarget.dataset.nodeid;
+
+    if (dragId === hoverNodeId) {
+      return;
+    }
+
+    moveCard(dragId, hoverNodeId);
+  };
+
+  var onDragStart = function onDragStart(e) {
+    setDragId(e.currentTarget.dataset.nodeid);
+    console.log('onDragStart');
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "imgListWrap"
+  }, list.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: index,
+      className: "selectedItem"
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
+      "data-nodeid": item.productId,
+      draggable: "true",
+      onDragEnd: onDragEnd,
+      onDragEnter: onDragEnter,
+      onDragOver: function onDragOver(e) {
+        e.preventDefault();
+      },
+      onDragStart: onDragStart,
+      src: item.productImageUrl,
+      title: item.productName
+    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      className: "selectedItemClose",
+      color: "#000",
+      onClick: function onClick() {
+        return delSelectedItem(index);
+      },
+      size: 12,
+      type: "icon-close"
+    }));
+  }));
+}

package/lib/common/ProductModal/SortableImageList/index.less

@@ -0,0 +1,3 @@
+.imgListWrap {
+  display: flex;
+}

package/lib/common/ProductModal/index.js

@@ -11,12 +11,12 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _SortableImageList = _interopRequireDefault(require("./SortableImageList"));
+
 var _commonUtil = require("../../utils/commonUtil");
 
 var _businessUtil = require("../../utils/businessUtil");
 
-var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-
 var _currencyUtil = require("../../utils/currencyUtil");
 
 require("./index.less");
@@ -224,8 +224,7 @@ var formatData = function formatData(list, type) {
 };
 
 exports.formatData = formatData;
-var Option = _antd.Select.Option,
-    OptGroup = _antd.Select.OptGroup;
+var Option = _antd.Select.Option;
 var InputGroup = _antd.Input.Group;
 
 var ProductModal = function ProductModal(props) {
@@ -311,17 +310,13 @@ var ProductModal = function ProductModal(props) {
       selectedList = _w[0],
       setSelectedList = _w[1];
 
-  var _x = (0, _react.useState)(''),
-      dragId = _x[0],
-      setDragId = _x[1];
-
-  var _y = (0, _react.useState)({
+  var _x = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _y[0],
-      setPaginationParams = _y[1];
+      paginationParams = _x[0],
+      setPaginationParams = _x[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -349,45 +344,8 @@ var ProductModal = function ProductModal(props) {
         name: record.name
       };
     }
-  };
-
-  var delSelectedItem = function delSelectedItem(index) {
-    var rows = JSON.parse(JSON.stringify(selectedList));
-    rows.splice(index, 1);
-    setSelectedList(rows);
-  };
-
-  var moveItem = function moveItem(dragNodeId, hoverNodeId) {
-    var source = JSON.parse(JSON.stringify(selectedList));
-    var dragIndex = source.findIndex(function (obj) {
-      return obj.productId == dragNodeId;
-    });
-    var hoverIndex = source.findIndex(function (obj) {
-      return obj.productId == hoverNodeId;
-    });
-    var list = (0, _commonUtil.dragSource)(source, dragIndex, hoverIndex);
-    setSelectedList(list);
-  };
-
-  var onDragStart = function onDragStart(e) {
-    setDragId(e.currentTarget.dataset.nodeid);
-  };
-
-  var onDragEnter = function onDragEnter(e) {
-    var hoverNodeId = e.currentTarget.dataset.nodeid;
-
-    if (dragId === hoverNodeId) {
-      return;
-    }
-
-    moveItem(dragId, hoverNodeId);
-  };
-
-  var onDragEnd = function onDragEnd() {
-    setDragId('');
   }; // 请求商品列表
 
-
   var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
       var _list, total, params, res_1, res;
@@ -825,31 +783,9 @@ var ProductModal = function ProductModal(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"
-  }, selectedList.map(function (item, index) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      key: index,
-      className: "selectedItem",
-      "data-nodeid": item.productId,
-      onDragEnd: onDragEnd,
-      onDragEnter: onDragEnter,
-      onDragOver: function onDragOver(e) {
-        e.preventDefault();
-      },
-      onDragStart: onDragStart
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      alt: "",
-      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
-      src: item.productImageUrl,
-      title: item.productName
-    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      className: "selectedItemClose",
-      color: "#000",
-      onClick: function onClick() {
-        return delSelectedItem(index);
-      },
-      size: 12,
-      type: "icon-close"
-    }));
+  }, /*#__PURE__*/_react["default"].createElement(_SortableImageList["default"], {
+    selectedList: selectedList,
+    setSelectedList: setSelectedList
   })))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",