@fonixtree/magic-design 2.0.89 → 2.0.91

package/es/common/LinkModal/index.js

@@ -234,7 +234,7 @@ var LinkModal = function LinkModal(props) {
 
   var getLinkTypes = function getLinkTypes() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var types, type;
+      var types, type_1;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -248,12 +248,15 @@ var LinkModal = function LinkModal(props) {
             types = _a.sent();
 
             if (onlySpecificCode) {
-              type = types.filter(function (item) {
-                return item.linkTypeCode === onlySpecificCode;
+              type_1 = [];
+              onlySpecificCode.forEach(function (code) {
+                type_1.push(types.find(function (item) {
+                  return item.linkTypeCode === code;
+                }));
               });
 
-              if (type.length > 0) {
-                types = type;
+              if (type_1.length > 0) {
+                types = type_1;
               }
             }
 

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

@@ -79,9 +79,15 @@ function (_super) {
         onClick: function onClick() {
           return _this.onItemClick(item);
         }
-      }, /*#__PURE__*/_react["default"].createElement("div", null, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
+      }, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         className: "img",
         data: item.image,
+        disabled: true,
         maxWidth: "100%"
       }), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "title",

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

@@ -14,16 +14,16 @@
   justify-content: space-between;
   align-items: center;
 }
-.common-functions-mobile ul li > div {
+.common-functions-mobile ul li .content-wrap {
   display: flex;
   align-items: center;
 }
-.common-functions-mobile ul li > div .img {
+.common-functions-mobile ul li .content-wrap .img {
   width: 0.56rem;
   height: 0.56rem;
   margin-right: 0.08rem;
 }
-.common-functions-mobile ul li > div .title {
+.common-functions-mobile ul li .content-wrap .title {
   font-size: 0.28rem;
   font-weight: 500;
   line-height: 0.4rem;

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

@@ -323,6 +323,11 @@ function (_super) {
         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, {
@@ -331,7 +336,7 @@ function (_super) {
         onTextInput: function onTextInput(text) {
           item.title.text = text;
         }
-      }));
+      })));
     }))));
   };
 

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

@@ -44,11 +44,15 @@
   margin-bottom: 0.02rem;
 }
 .orders-mobile .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.orders-mobile .fixed-wrap .list .item .content-wrap {
+  width: 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  flex: 1;
 }
 .orders-mobile .fixed-wrap .list .item .img-wrap {
   position: relative;

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

@@ -551,6 +551,11 @@ function (_super) {
         onClick: function onClick() {
           return _this.onItemClick(item.sourceType);
         }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
       }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "number",
         data: __assign(__assign({}, item.number), {
@@ -563,7 +568,7 @@ function (_super) {
         onTextInput: function onTextInput(text) {
           item.title.text = text;
         }
-      }));
+      })));
     })), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
       onClose: function onClose() {
         _this.setState({

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

@@ -96,11 +96,6 @@
   margin-top: 0.48rem;
 }
 .personal-information-mobile .bottom .item {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  flex: 1;
   position: relative;
 }
 .personal-information-mobile .bottom .item:after {
@@ -116,6 +111,13 @@
 .personal-information-mobile .bottom .item:last-child:after {
   display: none;
 }
+.personal-information-mobile .bottom .item .content-wrap {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  flex: 1;
+}
 .personal-information-mobile .bottom .item .number {
   width: 70% !important;
   font-size: 0.36rem;

package/es/composite-comp/dito/second-config-panels/HeadNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needHover: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/es/composite-comp/dito/second-config-panels/MenuNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/es/constants/index.js

@@ -84,6 +84,7 @@ var urlTypeMap = {
   MINI_APP: 'MiniApp',
   STORE: 'Store',
   AFFILIATE_PRODUCT: 'AffiliateProduct',
+  AFFILIATE_STORE: 'AffiliateStore',
   ANCHOR: 'Anchor'
 };
 exports.urlTypeMap = urlTypeMap;

package/es/decorator/index.js

@@ -55,11 +55,14 @@ function shouldUpdate() {
     descriptor.value = function (nextProps, nextState) {
       var nowPropsJson = JSON.stringify(nextProps);
       var nowStateJson = JSON.stringify(nextState);
+      var nowDevice = window.magicDesign.device;
       var should1 = nowPropsJson != this.preProps;
       var should2 = nowStateJson != this.preState;
+      var should3 = nowDevice != this.preDevice;
       this.preProps = nowPropsJson;
       this.preState = nowStateJson;
-      var result = should1 || should2;
+      this.preDevice = nowDevice;
+      var result = should1 || should2 || should3;
       return result && fn.apply(this, {
         nextProps: nextProps
       });

package/es/utils/businessUtil.js

@@ -182,6 +182,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.AFFILIATE_STORE:
+      // 分销店铺
+      link = "/storeDetail/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'AFFILIATE_STORE',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',

package/es/utils/commonUtil.js

@@ -296,7 +296,9 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
+var navigateTo = function navigateTo(url, state) {
+  console.log('navigateTo', url);
+
   if (!url) {
     return;
   }
@@ -309,7 +311,7 @@ var navigateTo = function navigateTo(url) {
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push(url, state);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -748,8 +750,8 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      };
-      console.log('GA push', eventName, eventData);
+      }; // console.log('GA push', eventName, eventData);
+
       if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {

package/es/utils/coreUtil.js

@@ -320,14 +320,9 @@ var clickUrl = function clickUrl(url) {
       data = _b.data;
 
   var _c = data.params,
-      params = _c === void 0 ? {} : _c;
-  console.log('clicked data:', data);
-  console.log({
-    type: 'jumpBrowser',
-    params: {
-      url: params.link
-    }
-  });
+      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
+  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
+
   /** 锚点跳转 */
 
   if (params.type === 'ANCHOR') {

package/lib/common/LinkModal/index.js

@@ -234,7 +234,7 @@ var LinkModal = function LinkModal(props) {
 
   var getLinkTypes = function getLinkTypes() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var types, type;
+      var types, type_1;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -248,12 +248,15 @@ var LinkModal = function LinkModal(props) {
             types = _a.sent();
 
             if (onlySpecificCode) {
-              type = types.filter(function (item) {
-                return item.linkTypeCode === onlySpecificCode;
+              type_1 = [];
+              onlySpecificCode.forEach(function (code) {
+                type_1.push(types.find(function (item) {
+                  return item.linkTypeCode === code;
+                }));
               });
 
-              if (type.length > 0) {
-                types = type;
+              if (type_1.length > 0) {
+                types = type_1;
               }
             }
 

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

@@ -79,9 +79,15 @@ function (_super) {
         onClick: function onClick() {
           return _this.onItemClick(item);
         }
-      }, /*#__PURE__*/_react["default"].createElement("div", null, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
+      }, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         className: "img",
         data: item.image,
+        disabled: true,
         maxWidth: "100%"
       }), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "title",

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

@@ -14,16 +14,16 @@
   justify-content: space-between;
   align-items: center;
 }
-.common-functions-mobile ul li > div {
+.common-functions-mobile ul li .content-wrap {
   display: flex;
   align-items: center;
 }
-.common-functions-mobile ul li > div .img {
+.common-functions-mobile ul li .content-wrap .img {
   width: 0.56rem;
   height: 0.56rem;
   margin-right: 0.08rem;
 }
-.common-functions-mobile ul li > div .title {
+.common-functions-mobile ul li .content-wrap .title {
   font-size: 0.28rem;
   font-weight: 500;
   line-height: 0.4rem;

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

@@ -323,6 +323,11 @@ function (_super) {
         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, {
@@ -331,7 +336,7 @@ function (_super) {
         onTextInput: function onTextInput(text) {
           item.title.text = text;
         }
-      }));
+      })));
     }))));
   };
 

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

@@ -44,11 +44,15 @@
   margin-bottom: 0.02rem;
 }
 .orders-mobile .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.orders-mobile .fixed-wrap .list .item .content-wrap {
+  width: 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  flex: 1;
 }
 .orders-mobile .fixed-wrap .list .item .img-wrap {
   position: relative;

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

@@ -551,6 +551,11 @@ function (_super) {
         onClick: function onClick() {
           return _this.onItemClick(item.sourceType);
         }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
       }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "number",
         data: __assign(__assign({}, item.number), {
@@ -563,7 +568,7 @@ function (_super) {
         onTextInput: function onTextInput(text) {
           item.title.text = text;
         }
-      }));
+      })));
     })), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
       onClose: function onClose() {
         _this.setState({

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

@@ -96,11 +96,6 @@
   margin-top: 0.48rem;
 }
 .personal-information-mobile .bottom .item {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  flex: 1;
   position: relative;
 }
 .personal-information-mobile .bottom .item:after {
@@ -116,6 +111,13 @@
 .personal-information-mobile .bottom .item:last-child:after {
   display: none;
 }
+.personal-information-mobile .bottom .item .content-wrap {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  flex: 1;
+}
 .personal-information-mobile .bottom .item .number {
   width: 70% !important;
   font-size: 0.36rem;

package/lib/composite-comp/dito/second-config-panels/HeadNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needHover: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/lib/composite-comp/dito/second-config-panels/MenuNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/lib/constants/index.js

@@ -84,6 +84,7 @@ var urlTypeMap = {
   MINI_APP: 'MiniApp',
   STORE: 'Store',
   AFFILIATE_PRODUCT: 'AffiliateProduct',
+  AFFILIATE_STORE: 'AffiliateStore',
   ANCHOR: 'Anchor'
 };
 exports.urlTypeMap = urlTypeMap;

package/lib/decorator/index.js

@@ -55,11 +55,14 @@ function shouldUpdate() {
     descriptor.value = function (nextProps, nextState) {
       var nowPropsJson = JSON.stringify(nextProps);
       var nowStateJson = JSON.stringify(nextState);
+      var nowDevice = window.magicDesign.device;
       var should1 = nowPropsJson != this.preProps;
       var should2 = nowStateJson != this.preState;
+      var should3 = nowDevice != this.preDevice;
       this.preProps = nowPropsJson;
       this.preState = nowStateJson;
-      var result = should1 || should2;
+      this.preDevice = nowDevice;
+      var result = should1 || should2 || should3;
       return result && fn.apply(this, {
         nextProps: nextProps
       });

package/lib/utils/businessUtil.js

@@ -182,6 +182,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.AFFILIATE_STORE:
+      // 分销店铺
+      link = "/storeDetail/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'AFFILIATE_STORE',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',

package/lib/utils/commonUtil.js

@@ -296,7 +296,9 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
+var navigateTo = function navigateTo(url, state) {
+  console.log('navigateTo', url);
+
   if (!url) {
     return;
   }
@@ -309,7 +311,7 @@ var navigateTo = function navigateTo(url) {
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push(url, state);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -748,8 +750,8 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      };
-      console.log('GA push', eventName, eventData);
+      }; // console.log('GA push', eventName, eventData);
+
       if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {

package/lib/utils/coreUtil.js

@@ -320,14 +320,9 @@ var clickUrl = function clickUrl(url) {
       data = _b.data;
 
   var _c = data.params,
-      params = _c === void 0 ? {} : _c;
-  console.log('clicked data:', data);
-  console.log({
-    type: 'jumpBrowser',
-    params: {
-      url: params.link
-    }
-  });
+      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
+  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
+
   /** 锚点跳转 */
 
   if (params.type === 'ANCHOR') {

package/package.json

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