@fonixtree/magic-design 1.0.125 → 1.0.128

package/lib/core/Designer/ConfigPanel/index.js

@@ -66,6 +66,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return;
   }
 
+  console.log('....', selectedNode, _mobx.store.clickedGroup);
   var panelProps = selectedNode.groupSource.find(function (src) {
     return src.id === clickedGroup;
   });
@@ -73,6 +74,15 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return src.id === clickedGroup;
   });
 
+  if (!panelProps) {
+    panelProps = selectedNode.groupSource2.find(function (src) {
+      return src.id === clickedGroup;
+    });
+    panelIndex = selectedNode.groupSource2.findIndex(function (src) {
+      return src.id === clickedGroup;
+    });
+  }
+
   if (!panelProps) {
     return;
   }
@@ -133,7 +143,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       break;
 
     case 'PERSONAL_INFOMATION':
-    case 'ORDERS':
       groupName = panelProps.sourceType;
       break;
   }
@@ -291,6 +300,14 @@ function (_super) {
         });
       }, null);
 
+      if (!panelProps) {
+        panelProps = (0, _commonUtil.ensure)(function () {
+          return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2.find(function (src) {
+            return src.id === _this.state.clickedGroup;
+          });
+        }, null);
+      }
+
       if (panelProps) {
         var instance = Clazz ? /*#__PURE__*/_react["default"].createElement(Clazz, {
           panelProps: panelProps,

package/lib/decorator/compositeDecorator.js

@@ -144,7 +144,7 @@ function compositeDecorator(WrappedComponent) {
         var zIndex = '0';
         var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 

package/lib/decorator/metaDecorator.js

@@ -220,8 +220,7 @@ function metaDecorator(WrappedComponent) {
           className = _a.className,
           rest = __rest(_a, ["className"]);
 
-      var hoverStyle = this.getInteractStyle(); // console.log(rest);
-
+      var hoverStyle = this.getInteractStyle();
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: className,
         style: this.getStyle()

package/lib/mobx/Store.js

@@ -81,6 +81,18 @@ function () {
       });
       return !!group;
     });
+
+    if (!componentFloor) {
+      componentFloor = this.MPageData.find(function (floor) {
+        var _a;
+
+        var group = (_a = floor.groupSource2) === null || _a === void 0 ? void 0 : _a.find(function (grp) {
+          return grp.id === id;
+        });
+        return !!group;
+      });
+    }
+
     return componentFloor === null || componentFloor === void 0 ? void 0 : componentFloor.id;
   };
   /**

package/package.json

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

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

@@ -1,89 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDefaultJSON = exports.OrdersGroupSourceJSON = void 0;
-
-var _uuid = require("uuid");
-
-var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
-  var groupId = (0, _uuid.v4)();
-  return {
-    id: groupId,
-    title: {
-      parentId: groupId,
-      id: (0, _uuid.v4)(),
-      open: true,
-      type: 'TEXT',
-      specialContent: [],
-      text: text || 'Name',
-      content: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Montserrat',
-        fontWeight: 500,
-        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: text
-  };
-};
-
-exports.OrdersGroupSourceJSON = OrdersGroupSourceJSON;
-
-var getDefaultJSON = function getDefaultJSON() {
-  return {
-    id: (0, _uuid.v4)(),
-    type: 'ORDERS',
-    groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
-    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/es/composite-comp/dito/components/Orders/index.js

@@ -1,84 +0,0 @@
-"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 Orders =
-/** @class */
-function (_super) {
-  __extends(Orders, _super);
-
-  function Orders() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-
-  Orders.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
-    }));
-  };
-
-  Orders.defaultProps = {};
-  Orders.type = 'ORDERS';
-  Orders.getDefaultJSON = _defaultJSON.getDefaultJSON;
-  Orders = __decorate([_compositeDecorator["default"]], Orders);
-  return Orders;
-}(_react.Component);
-
-var _default = Orders;
-exports["default"] = _default;

package/es/composite-comp/dito/components/Orders/mobile/index.js

@@ -1,352 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.orderData = exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _components = require("../../../../../meta-comp/components");
-
-var _locale = require("../../../../../locale");
-
-var _Iconfont = _interopRequireDefault(require("../../../../../common/Iconfont"));
-
-var _commonUtil = require("../../../../../utils/commonUtil");
-
-var _index = require("../../PersonalInformation/mobile/index");
-
-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 __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
-  var _ = {
-    label: 0,
-    sent: function sent() {
-      if (t[0] & 1) throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  },
-      f,
-      y,
-      t,
-      g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-
-    while (_) {
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-        if (y = 0, t) op = [op[0] & 2, t.value];
-
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [0];
-            continue;
-
-          case 7:
-            op = _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-
-              _.ops.push(op);
-
-              break;
-            }
-
-            if (t[2]) _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-        }
-
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [6, e];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    }
-
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-
-var getAccountPageValue = function getAccountPageValue(key) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  return accountPageValue ? accountPageValue[key] || '' : '';
-};
-
-var orderData = {
-  'To Pay': {
-    key: 'toPayNum',
-    route: '/main/order/1'
-  },
-  'To Ship': {
-    key: 'toDeliveryNum',
-    route: '/main/order/2'
-  },
-  'To Receive': {
-    key: 'toReceiveNum',
-    route: '/main/order/3'
-  },
-  Done: {
-    key: 'toRatingNum',
-    route: '/main/order/4'
-  },
-  Cancelled: {
-    key: 'returnsNum',
-    route: '/main/order/5'
-  }
-};
-exports.orderData = orderData;
-
-var OrdersMobile =
-/** @class */
-function (_super) {
-  __extends(OrdersMobile, _super);
-
-  function OrdersMobile() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.state = {
-      orderStatus: getAccountPageValue('orderStatus') || {}
-    };
-
-    _this.onItemClick = function (v) {
-      var _a;
-
-      if ((0, _commonUtil.checkLogin)(true)) {
-        var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
-        var selfUrl = (0, _commonUtil.ensure)(function () {
-          return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
-        }, '');
-        (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
-      }
-    };
-
-    _this.getInit = function () {
-      return __awaiter(_this, void 0, void 0, function () {
-        var orderStatus;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/orders/status/num', {}, 'GET')];
-
-            case 1:
-              orderStatus = _a.sent();
-              this.setState({
-                orderStatus: orderStatus
-              });
-              (0, _index.setAccountPageValue)({
-                orderStatus: orderStatus
-              });
-              return [2
-              /*return*/
-              ];
-          }
-        });
-      });
-    };
-
-    _this.getImageHtml = function (item) {
-      var orderStatus = _this.state.orderStatus;
-      var num = (0, _commonUtil.ensure)(function () {
-        return orderStatus[orderData[item.sourceType].key];
-      }, '');
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
-        data: item.image,
-        maxWidth: "100%"
-      }), num ? /*#__PURE__*/_react["default"].createElement("span", {
-        className: "pot"
-      }, num) : null);
-    };
-
-    return _this;
-  }
-
-  OrdersMobile.prototype.componentDidMount = function () {
-    if ((0, _commonUtil.isLogin)()) {
-      this.getInit();
-    }
-  };
-
-  OrdersMobile.prototype.render = function () {
-    var _this = this;
-
-    var data = this.props.data;
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('orders-mobile')
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "fixed-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "top"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "title"
-    }, (0, _locale.i18n)('ORDERS')), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "btn-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "text",
-      onClick: function onClick() {
-        if ((0, _commonUtil.checkLogin)(true)) (0, _commonUtil.navigateTo)('/main/order/0');
-      }
-    }, (0, _locale.i18n)('VIEW_ALL_ORDERS')), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      color: "#C7C7C7",
-      size: 13,
-      type: "icon-outlined-right"
-    }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "list"
-    }, data.groupSource.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        key: item.id,
-        className: "item",
-        onClick: function onClick() {
-          return _this.onItemClick(item.sourceType);
-        }
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "content-wrap",
-        style: {
-          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "img-wrap"
-      }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-        className: "title",
-        data: item.title,
-        onTextInput: function onTextInput(text) {
-          item.title.text = text;
-        }
-      })));
-    }))));
-  };
-
-  OrdersMobile.defaultProps = {
-    data: {}
-  };
-  return OrdersMobile;
-}(_react["default"].Component);
-
-var _default = OrdersMobile;
-exports["default"] = _default;