@fonixtree/magic-design 1.0.49 → 1.0.52

package/es/common/ProductModal/index.js

@@ -311,13 +311,17 @@ var ProductModal = function ProductModal(props) {
       selectedList = _w[0],
       setSelectedList = _w[1];
 
-  var _x = (0, _react.useState)({
+  var _x = (0, _react.useState)(''),
+      dragId = _x[0],
+      setDragId = _x[1];
+
+  var _y = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _x[0],
-      setPaginationParams = _x[1];
+      paginationParams = _y[0],
+      setPaginationParams = _y[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -351,6 +355,36 @@ var ProductModal = function ProductModal(props) {
     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('');
   }; // 请求商品列表
 
 
@@ -794,7 +828,14 @@ var ProductModal = function ProductModal(props) {
   }, selectedList.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: index,
-      className: "selectedItem"
+      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' : ''),

package/es/composite-comp/common/components/ProductItem/index.js

@@ -136,7 +136,7 @@ function (_super) {
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
-    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var oldPrice = data.marketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};

package/lib/common/ProductModal/index.js

@@ -311,13 +311,17 @@ var ProductModal = function ProductModal(props) {
       selectedList = _w[0],
       setSelectedList = _w[1];
 
-  var _x = (0, _react.useState)({
+  var _x = (0, _react.useState)(''),
+      dragId = _x[0],
+      setDragId = _x[1];
+
+  var _y = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _x[0],
-      setPaginationParams = _x[1];
+      paginationParams = _y[0],
+      setPaginationParams = _y[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -351,6 +355,36 @@ var ProductModal = function ProductModal(props) {
     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('');
   }; // 请求商品列表
 
 
@@ -794,7 +828,14 @@ var ProductModal = function ProductModal(props) {
   }, selectedList.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: index,
-      className: "selectedItem"
+      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' : ''),

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -136,7 +136,7 @@ function (_super) {
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
-    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var oldPrice = data.marketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};

package/package.json

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