@fonixtree/magic-design 1.0.128 → 1.0.131

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

@@ -222,6 +222,20 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
+
+var setAccountPageValue = function setAccountPageValue(obj) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+};
+
+exports.setAccountPageValue = setAccountPageValue;
+
+var getAccountPageValue = function getAccountPageValue(key) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  return accountPageValue ? accountPageValue[key] || '' : '';
+};
+
 var pInfoData = {
   Wishlist: {
     route: '/favourite/list'
@@ -237,20 +251,6 @@ var pInfoData = {
   }
 };
 exports.pInfoData = pInfoData;
-var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
-
-var setAccountPageValue = function setAccountPageValue(obj) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
-};
-
-exports.setAccountPageValue = setAccountPageValue;
-
-var getAccountPageValue = function getAccountPageValue(key) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  return accountPageValue ? accountPageValue[key] || '' : '';
-};
-
 var orderData = {
   'To Pay': {
     key: 'toPayNum',
@@ -503,7 +503,7 @@ function (_super) {
       }
     };
 
-    _this.onItemClick = function (v) {
+    _this.onOrderItemClick = function (v) {
       var _a;
 
       if ((0, _commonUtil.checkLogin)(true)) {
@@ -580,7 +580,9 @@ function (_super) {
         selectedImgFile = _a.selectedImgFile;
     var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('personal-information-mobile')
+      className: (0, _classnames["default"])('personal-information-mobile', {
+        higher: (0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()
+      })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -691,7 +693,7 @@ function (_super) {
         key: item.id,
         className: "item",
         onClick: function onClick() {
-          return _this.onItemClick(item.sourceType);
+          return _this.onOrderItemClick(item.sourceType);
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "content-wrap",

package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less

@@ -1,6 +1,11 @@
 .personal-information-mobile {
   padding: 0.44rem 0.32rem;
   box-sizing: border-box;
+  height: 5rem;
+}
+.personal-information-mobile.higher {
+  border-bottom: 1.52rem solid #fff;
+  height: 6.8rem;
 }
 .personal-information-mobile .top {
   display: flex;

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

@@ -66,7 +66,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return;
   }
 
-  console.log('....', selectedNode, _mobx.store.clickedGroup);
   var panelProps = selectedNode.groupSource.find(function (src) {
     return src.id === clickedGroup;
   });
@@ -74,7 +73,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return src.id === clickedGroup;
   });
 
-  if (!panelProps) {
+  if (!panelProps && selectedNode.groupSource2) {
     panelProps = selectedNode.groupSource2.find(function (src) {
       return src.id === clickedGroup;
     });
@@ -300,7 +299,7 @@ function (_super) {
         });
       }, null);
 
-      if (!panelProps) {
+      if (!panelProps && (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2)) {
         panelProps = (0, _commonUtil.ensure)(function () {
           return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2.find(function (src) {
             return src.id === _this.state.clickedGroup;

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

@@ -222,6 +222,20 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
+
+var setAccountPageValue = function setAccountPageValue(obj) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+};
+
+exports.setAccountPageValue = setAccountPageValue;
+
+var getAccountPageValue = function getAccountPageValue(key) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  return accountPageValue ? accountPageValue[key] || '' : '';
+};
+
 var pInfoData = {
   Wishlist: {
     route: '/favourite/list'
@@ -237,20 +251,6 @@ var pInfoData = {
   }
 };
 exports.pInfoData = pInfoData;
-var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
-
-var setAccountPageValue = function setAccountPageValue(obj) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
-};
-
-exports.setAccountPageValue = setAccountPageValue;
-
-var getAccountPageValue = function getAccountPageValue(key) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  return accountPageValue ? accountPageValue[key] || '' : '';
-};
-
 var orderData = {
   'To Pay': {
     key: 'toPayNum',
@@ -503,7 +503,7 @@ function (_super) {
       }
     };
 
-    _this.onItemClick = function (v) {
+    _this.onOrderItemClick = function (v) {
       var _a;
 
       if ((0, _commonUtil.checkLogin)(true)) {
@@ -580,7 +580,9 @@ function (_super) {
         selectedImgFile = _a.selectedImgFile;
     var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('personal-information-mobile')
+      className: (0, _classnames["default"])('personal-information-mobile', {
+        higher: (0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()
+      })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -691,7 +693,7 @@ function (_super) {
         key: item.id,
         className: "item",
         onClick: function onClick() {
-          return _this.onItemClick(item.sourceType);
+          return _this.onOrderItemClick(item.sourceType);
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "content-wrap",

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

@@ -1,6 +1,11 @@
 .personal-information-mobile {
   padding: 0.44rem 0.32rem;
   box-sizing: border-box;
+  height: 5rem;
+}
+.personal-information-mobile.higher {
+  border-bottom: 1.52rem solid #fff;
+  height: 6.8rem;
 }
 .personal-information-mobile .top {
   display: flex;

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

@@ -66,7 +66,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return;
   }
 
-  console.log('....', selectedNode, _mobx.store.clickedGroup);
   var panelProps = selectedNode.groupSource.find(function (src) {
     return src.id === clickedGroup;
   });
@@ -74,7 +73,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return src.id === clickedGroup;
   });
 
-  if (!panelProps) {
+  if (!panelProps && selectedNode.groupSource2) {
     panelProps = selectedNode.groupSource2.find(function (src) {
       return src.id === clickedGroup;
     });
@@ -300,7 +299,7 @@ function (_super) {
         });
       }, null);
 
-      if (!panelProps) {
+      if (!panelProps && (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2)) {
         panelProps = (0, _commonUtil.ensure)(function () {
           return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2.find(function (src) {
             return src.id === _this.state.clickedGroup;

package/package.json

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