@fonixtree/magic-design 2.0.81 → 2.0.83

package/lib/common/GroupList/index.js

@@ -52,8 +52,11 @@ var renderCardDefault = function renderCardDefault(src) {
     alt: "",
     src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "name"
-  }, src.title.text));
+    className: "name",
+    dangerouslySetInnerHTML: {
+      __html: src.title.text
+    }
+  }));
 };
 
 var GroupList =

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");
@@ -310,13 +310,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) {
@@ -346,10 +350,34 @@ var ProductModal = function ProductModal(props) {
     }
   };
 
-  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 = 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('');
   }; // 请求商品列表
 
 
@@ -790,24 +818,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"
-    }, /*#__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/composite-comp/common/config-panels/SpacingConfig/index.js

@@ -92,6 +92,7 @@ function (_super) {
         _this.selfRender();
       }
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      split: "dashed",
       title: (0, _locale.i18n)('PADDING')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-wrap"

package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
+
+var _uuid = require("uuid");
+
+var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: 'Function Name',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 600,
+        fontSize: 14,
+        color: '#2C2C2C',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    }
+  };
+};
+
+exports.CommonFunctionsGroupSourceJSON = CommonFunctionsGroupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'COMMON_FUNCTIONS',
+    groupSource: [CommonFunctionsGroupSourceJSON()],
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#FFFFFF',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/lib/composite-comp/dito/components/CommonFunctions/index.js

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+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 _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); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var CommonFunctions =
+/** @class */
+function (_super) {
+  __extends(CommonFunctions, _super);
+
+  function CommonFunctions() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  CommonFunctions.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      data: nodeData
+    }));
+  };
+
+  CommonFunctions.defaultProps = {};
+  CommonFunctions.type = 'COMMON_FUNCTIONS';
+  CommonFunctions.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  CommonFunctions = __decorate([_compositeDecorator["default"]], CommonFunctions);
+  return CommonFunctions;
+}(_react.Component);
+
+var _default = CommonFunctions;
+exports["default"] = _default;

package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js

@@ -0,0 +1,105 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _components = require("../../../../../meta-comp/components");
+
+var _common = require("../../../../../common");
+
+var _commonUtil = require("../../../../../utils/commonUtil");
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var CommonFunctionsMobile =
+/** @class */
+function (_super) {
+  __extends(CommonFunctionsMobile, _super);
+
+  function CommonFunctionsMobile() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+
+    _this.onItemClick = function (item) {
+      var url = (0, _commonUtil.ensure)(function () {
+        return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+      }, '');
+      (0, _commonUtil.navigateTo)(url);
+    };
+
+    return _this;
+  }
+
+  CommonFunctionsMobile.prototype.render = function () {
+    var _this = this;
+
+    var data = this.props.data;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('common-functions-mobile')
+    }, /*#__PURE__*/_react["default"].createElement("ul", null, data.groupSource.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement("li", {
+        key: item.id,
+        onClick: function onClick() {
+          return _this.onItemClick(item);
+        }
+      }, /*#__PURE__*/_react["default"].createElement("div", null, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        className: "img",
+        data: item.image,
+        maxWidth: "100%"
+      }), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+        className: "title",
+        data: item.title,
+        onTextInput: function onTextInput(text) {
+          item.title.text = text;
+        }
+      })), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+        color: "#C7C7C7",
+        size: 14,
+        type: "icon-outlined-right"
+      }));
+    })));
+  };
+
+  CommonFunctionsMobile.defaultProps = {
+    data: {}
+  };
+  return CommonFunctionsMobile;
+}(_react["default"].Component);
+
+var _default = CommonFunctionsMobile;
+exports["default"] = _default;

package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.less

@@ -0,0 +1,33 @@
+.common-functions-mobile {
+  background: #ffffff;
+  padding-top: 1.7rem;
+  height: calc(100vh - 6.36rem);
+  box-sizing: border-box;
+  overflow: auto;
+}
+.common-functions-mobile ul {
+  margin: 0;
+  padding: 0;
+}
+.common-functions-mobile ul li {
+  padding: 0.24rem 0.32rem;
+  box-sizing: border-box;
+  background: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.common-functions-mobile ul li > div {
+  display: flex;
+  align-items: center;
+}
+.common-functions-mobile ul li > div .img {
+  width: 0.32rem;
+  height: 0.32rem;
+  margin-right: 0.24rem;
+}
+.common-functions-mobile ul li > div .title {
+  font-size: 0.28rem;
+  font-weight: 500;
+  line-height: 0.4rem;
+}

package/lib/composite-comp/dito/components/Orders/defaultJSON.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = exports.OrdersGroupSourceJSON = void 0;
+
+var _uuid = require("uuid");
+
+var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: 'To pay',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
+        fontSize: 12,
+        color: '#2C2C2C',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    sourceType: 'To pay'
+  };
+};
+
+exports.OrdersGroupSourceJSON = OrdersGroupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'ORDERS',
+    groupSource: [OrdersGroupSourceJSON()],
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#FFFFFF',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;