@fonixtree/magic-design 0.1.67 → 0.1.69

package/es/composite-comp/bol/components/Banner/index.js

@@ -49,22 +49,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 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,
@@ -82,33 +66,21 @@ function (_super) {
 
   function Banner() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   // 兼容新功能： 轮播的 dots 点 区分pc 移动
+  //   const { nodeData } = this.props;
+  //   if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
+  //     nodeData.setting.dots = { ...nodeData.setting.dots,
+  //       ...{
+  //         color: { pc: '#fff', mobile: '#fff' },
+  //         hoverColor: { pc: '#fff', mobile: '#fff' },
+  //         size: { pc: 16, mobile: 8 },
+  //         hoverSize: { pc: 16, mobile: 8 },
+  //       },
+  //     };
+  //   }
+  // }
 
-  Banner.prototype.componentWillMount = function () {
-    // 兼容新功能： 轮播的 dots 点 区分pc 移动
-    var nodeData = this.props.nodeData;
-
-    if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
-      nodeData.setting.dots = __assign(__assign({}, nodeData.setting.dots), {
-        color: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        hoverColor: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        size: {
-          pc: 16,
-          mobile: 8
-        },
-        hoverSize: {
-          pc: 16,
-          mobile: 8
-        }
-      });
-    }
-  };
 
   Banner.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---banner', nodeData);

package/es/composite-comp/bol/components/Video/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _uuid = require("uuid");
-
 var _pc = _interopRequireDefault(require("./pc"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
@@ -68,31 +66,29 @@ function (_super) {
 
   function Video() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   console.log('--video WillMount');
+  //   // 兼容新开发的功能： video新增播放按钮 的设置
+  //   const { nodeData } = this.props;
+  //   if (nodeData.groupSource && nodeData.groupSource.length > 0) {
+  //     nodeData.groupSource.forEach(group => {
+  //       if (!group.playIcon) {
+  //         console.log('--video add group.playIcon ');
+  //         group.playIcon = {
+  //           open: true,
+  //           parentId: group.id,
+  //           id: uuidv4(),
+  //           type: 'PLAY',
+  //           size: 48,
+  //           pcSize: 60,
+  //           iconType: 'light-playicon-01',
+  //           iconColor: 'Light',
+  //         };
+  //       }
+  //     });
+  //   }
+  // }
 
-  Video.prototype.componentWillMount = function () {
-    console.log('--video WillMount'); // 兼容新开发的功能： video新增播放按钮 的设置
-
-    var nodeData = this.props.nodeData;
-
-    if (nodeData.groupSource && nodeData.groupSource.length > 0) {
-      nodeData.groupSource.forEach(function (group) {
-        if (!group.playIcon) {
-          console.log('--video add group.playIcon ');
-          group.playIcon = {
-            open: true,
-            parentId: group.id,
-            id: (0, _uuid.v4)(),
-            type: 'PLAY',
-            size: 48,
-            pcSize: 60,
-            iconType: 'light-playicon-01',
-            iconColor: 'Light'
-          };
-        }
-      });
-    }
-  };
 
   Video.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---Video', nodeData);

package/es/core/Designer/index.js

@@ -614,9 +614,8 @@ function (_super) {
     var pageData = props.pageData,
         config = props.config,
         outputType = props.outputType,
-        locale = props.locale;
-    console.log('constructor-- pageData', pageData);
-    (0, _commonUtil.compatibleNewPageData)(pageData);
+        locale = props.locale; // console.log('constructor-- pageData', pageData);
+
     var MPageData = pageData.childNodes || [];
     _this.configRef = /*#__PURE__*/_react["default"].createRef(); // this.viewAreaRef = React.createRef();
 
@@ -644,12 +643,19 @@ function (_super) {
   }
 
   Designer.prototype.componentDidMount = function () {
-    var _this = this; // 复合组件点击事件
+    var _this = this;
+
+    var _a; // 复合组件点击事件
 
 
     window.document.addEventListener('component-click', this.componentClick); // 复合组件重新渲染事件
 
-    window.document.addEventListener('render-view', this.reRenderViewArea);
+    window.document.addEventListener('render-view', this.reRenderViewArea); // 兼容 旧组件新增 新功能的问题（本地）
+
+    if ((_a = this.props.pageData) === null || _a === void 0 ? void 0 : _a.childNodes) {
+      (0, _commonUtil.compatibleNewPageData)(this.props.pageData);
+    }
+
     this.destory = (0, _mobx.autorun)(function () {
       var stateObj = {
         imgGenVisible: _mobx.store.imgGenVisible
@@ -666,8 +672,12 @@ function (_super) {
   Designer.prototype.componentWillReceiveProps = function (nextProps) {
     var pageData = nextProps.pageData,
         config = nextProps.config;
-    var MPageData = pageData.childNodes || [];
-    console.log('componentWillReceiveProps-- pageData', pageData);
+    var MPageData = pageData.childNodes || []; // 兼容 旧组件新增 新功能的问题（线上）
+
+    if (pageData === null || pageData === void 0 ? void 0 : pageData.childNodes) {
+      (0, _commonUtil.compatibleNewPageData)(pageData);
+    }
+
     this.history = new _History["default"](MPageData);
     this.setState({
       MPageData: MPageData

package/es/utils/commonUtil.js

@@ -35,6 +35,22 @@ var _qs = _interopRequireDefault(require("qs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -781,12 +797,35 @@ exports.pxToRem = pxToRem;
 var compatibleNewPageData = function compatibleNewPageData(pageData) {
   if (pageData.childNodes && pageData.childNodes.length > 0) {
     pageData.childNodes.forEach(function (child) {
-      // 兼容新开发的功能： video新增播放按钮 的设置
+      // 兼容新功能：banner 轮播的 dots 点 区分pc 移动
+      if (child.type === 'BANNER') {
+        if (!child.setting.dots.color.pc || !child.setting.dots.hoverColor.pc || !child.setting.dots.size.pc) {
+          child.setting.dots = __assign(__assign({}, child.setting.dots), {
+            color: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            hoverColor: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            size: {
+              pc: 16,
+              mobile: 8
+            },
+            hoverSize: {
+              pc: 16,
+              mobile: 8
+            }
+          });
+        }
+      } // 兼容新开发的功能： video新增播放按钮 的设置
+
+
       if (child.type === 'VIDEO') {
-        console.log('--compatibleNewPageData -- video ');
+        // console.log('--compatibleNewPageData -- video ');
         child.groupSource.forEach(function (group) {
           if (!group.playIcon) {
-            console.log('--compatibleNewPageData -- video add group.playIcon ');
             group.playIcon = {
               open: true,
               parentId: group.id,
@@ -798,7 +837,7 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
               iconColor: 'Light'
             };
           }
-        });
+        }); // console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
       }
     });
   }

package/lib/composite-comp/bol/components/Banner/index.js

@@ -49,22 +49,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 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,
@@ -82,33 +66,21 @@ function (_super) {
 
   function Banner() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   // 兼容新功能： 轮播的 dots 点 区分pc 移动
+  //   const { nodeData } = this.props;
+  //   if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
+  //     nodeData.setting.dots = { ...nodeData.setting.dots,
+  //       ...{
+  //         color: { pc: '#fff', mobile: '#fff' },
+  //         hoverColor: { pc: '#fff', mobile: '#fff' },
+  //         size: { pc: 16, mobile: 8 },
+  //         hoverSize: { pc: 16, mobile: 8 },
+  //       },
+  //     };
+  //   }
+  // }
 
-  Banner.prototype.componentWillMount = function () {
-    // 兼容新功能： 轮播的 dots 点 区分pc 移动
-    var nodeData = this.props.nodeData;
-
-    if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
-      nodeData.setting.dots = __assign(__assign({}, nodeData.setting.dots), {
-        color: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        hoverColor: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        size: {
-          pc: 16,
-          mobile: 8
-        },
-        hoverSize: {
-          pc: 16,
-          mobile: 8
-        }
-      });
-    }
-  };
 
   Banner.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---banner', nodeData);

package/lib/composite-comp/bol/components/Video/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _uuid = require("uuid");
-
 var _pc = _interopRequireDefault(require("./pc"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
@@ -68,31 +66,29 @@ function (_super) {
 
   function Video() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   console.log('--video WillMount');
+  //   // 兼容新开发的功能： video新增播放按钮 的设置
+  //   const { nodeData } = this.props;
+  //   if (nodeData.groupSource && nodeData.groupSource.length > 0) {
+  //     nodeData.groupSource.forEach(group => {
+  //       if (!group.playIcon) {
+  //         console.log('--video add group.playIcon ');
+  //         group.playIcon = {
+  //           open: true,
+  //           parentId: group.id,
+  //           id: uuidv4(),
+  //           type: 'PLAY',
+  //           size: 48,
+  //           pcSize: 60,
+  //           iconType: 'light-playicon-01',
+  //           iconColor: 'Light',
+  //         };
+  //       }
+  //     });
+  //   }
+  // }
 
-  Video.prototype.componentWillMount = function () {
-    console.log('--video WillMount'); // 兼容新开发的功能： video新增播放按钮 的设置
-
-    var nodeData = this.props.nodeData;
-
-    if (nodeData.groupSource && nodeData.groupSource.length > 0) {
-      nodeData.groupSource.forEach(function (group) {
-        if (!group.playIcon) {
-          console.log('--video add group.playIcon ');
-          group.playIcon = {
-            open: true,
-            parentId: group.id,
-            id: (0, _uuid.v4)(),
-            type: 'PLAY',
-            size: 48,
-            pcSize: 60,
-            iconType: 'light-playicon-01',
-            iconColor: 'Light'
-          };
-        }
-      });
-    }
-  };
 
   Video.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---Video', nodeData);

package/lib/core/Designer/index.js

@@ -614,9 +614,8 @@ function (_super) {
     var pageData = props.pageData,
         config = props.config,
         outputType = props.outputType,
-        locale = props.locale;
-    console.log('constructor-- pageData', pageData);
-    (0, _commonUtil.compatibleNewPageData)(pageData);
+        locale = props.locale; // console.log('constructor-- pageData', pageData);
+
     var MPageData = pageData.childNodes || [];
     _this.configRef = /*#__PURE__*/_react["default"].createRef(); // this.viewAreaRef = React.createRef();
 
@@ -644,12 +643,19 @@ function (_super) {
   }
 
   Designer.prototype.componentDidMount = function () {
-    var _this = this; // 复合组件点击事件
+    var _this = this;
+
+    var _a; // 复合组件点击事件
 
 
     window.document.addEventListener('component-click', this.componentClick); // 复合组件重新渲染事件
 
-    window.document.addEventListener('render-view', this.reRenderViewArea);
+    window.document.addEventListener('render-view', this.reRenderViewArea); // 兼容 旧组件新增 新功能的问题（本地）
+
+    if ((_a = this.props.pageData) === null || _a === void 0 ? void 0 : _a.childNodes) {
+      (0, _commonUtil.compatibleNewPageData)(this.props.pageData);
+    }
+
     this.destory = (0, _mobx.autorun)(function () {
       var stateObj = {
         imgGenVisible: _mobx.store.imgGenVisible
@@ -666,8 +672,12 @@ function (_super) {
   Designer.prototype.componentWillReceiveProps = function (nextProps) {
     var pageData = nextProps.pageData,
         config = nextProps.config;
-    var MPageData = pageData.childNodes || [];
-    console.log('componentWillReceiveProps-- pageData', pageData);
+    var MPageData = pageData.childNodes || []; // 兼容 旧组件新增 新功能的问题（线上）
+
+    if (pageData === null || pageData === void 0 ? void 0 : pageData.childNodes) {
+      (0, _commonUtil.compatibleNewPageData)(pageData);
+    }
+
     this.history = new _History["default"](MPageData);
     this.setState({
       MPageData: MPageData

package/lib/utils/commonUtil.js

@@ -35,6 +35,22 @@ var _qs = _interopRequireDefault(require("qs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -781,12 +797,35 @@ exports.pxToRem = pxToRem;
 var compatibleNewPageData = function compatibleNewPageData(pageData) {
   if (pageData.childNodes && pageData.childNodes.length > 0) {
     pageData.childNodes.forEach(function (child) {
-      // 兼容新开发的功能： video新增播放按钮 的设置
+      // 兼容新功能：banner 轮播的 dots 点 区分pc 移动
+      if (child.type === 'BANNER') {
+        if (!child.setting.dots.color.pc || !child.setting.dots.hoverColor.pc || !child.setting.dots.size.pc) {
+          child.setting.dots = __assign(__assign({}, child.setting.dots), {
+            color: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            hoverColor: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            size: {
+              pc: 16,
+              mobile: 8
+            },
+            hoverSize: {
+              pc: 16,
+              mobile: 8
+            }
+          });
+        }
+      } // 兼容新开发的功能： video新增播放按钮 的设置
+
+
       if (child.type === 'VIDEO') {
-        console.log('--compatibleNewPageData -- video ');
+        // console.log('--compatibleNewPageData -- video ');
         child.groupSource.forEach(function (group) {
           if (!group.playIcon) {
-            console.log('--compatibleNewPageData -- video add group.playIcon ');
             group.playIcon = {
               open: true,
               parentId: group.id,
@@ -798,7 +837,7 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
               iconColor: 'Light'
             };
           }
-        });
+        }); // console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
       }
     });
   }

package/package.json

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