@fonixtree/magic-design 0.0.177 → 0.0.179

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

@@ -83,8 +83,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data; // const { ready } = this.state;
-
-    console.log('----nav mobile', data); // if (data.background.bgType === 'color') {
+    // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;
     // } else {

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

@@ -1,8 +1,8 @@
 .config_wrap {
   width: 354px;
   background: #ffffff;
-  height: 100vh;
-  overflow: scroll;
+  max-height: 100vh;
+  // overflow: scroll;
   transition-property: transform;
   transition-duration: .3s;
   transition-timing-function: ease;
@@ -20,6 +20,8 @@
   .first_config_wrap {
     height: 100%;
     padding: 24px;
+    height: 100vh;
+    overflow: auto;
 
     .config_header {
       font-size: 26px;
@@ -48,7 +50,10 @@
 
   .sec_config_wrap {
     position: absolute;
+    height: 100vh;
+    overflow: auto;
     width: 354px;
+    z-index: 201;
     left: -354px;
     bottom: 0;
     top: 0;

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

@@ -78,6 +78,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       id: "render-html-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Renderer["default"], _extends({}, renderProps, {
+      noSetWindow: true,
       outputType: "html"
     })));
   };

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

@@ -174,7 +174,8 @@ function (_super) {
       }
 
       var newInstanceProps = {
-        nodeData: nodeData
+        nodeData: nodeData,
+        mode: 'designer'
       };
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: nodeData.id,

package/es/core/Renderer/index.js

@@ -59,9 +59,13 @@ var setDesignConfig = function setDesignConfig(props) {
 
 var Renderer = function Renderer(props) {
   var pageData = props.pageData,
-      outputType = props.outputType; // console.log('pageData: ', pageData);
+      outputType = props.outputType,
+      noSetWindow = props.noSetWindow; // console.log('pageData: ', pageData);
+
+  if (!noSetWindow) {
+    setDesignConfig(props);
+  }
 
-  setDesignConfig(props);
   window.magicDesignPageData = pageData;
   var pageBackground = window.magicDesign.pageBackground; // 根据楼层展示设备进行过滤
 

package/es/meta-comp/components/Text/index.js

@@ -322,9 +322,11 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data) {
-      var mode = window.magicDesign.mode;
+    _this.renderText = function (data, mode) {
       var outputType = _this.props.outputType || window.magicDesign.outputType;
+
+      var _mode = mode || window.magicDesign.mode;
+
       if (!_this.textRef.current) return;
 
       _this.textRef.current.blur();
@@ -337,7 +339,7 @@ function (_super) {
       /** 渲染html */
 
       if (data.specialContent.length == 0) {
-        if (outputType == 'html' && mode == 'renderer') {
+        if (outputType == 'html' && _mode == 'renderer') {
           if (data === null || data === void 0 ? void 0 : data.content.clickUrl) {
             var a = document.createElement('a');
             a.href = data.content.clickUrl;
@@ -361,12 +363,12 @@ function (_super) {
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
 
           if (c === null || c === void 0 ? void 0 : c.content.clickUrl) {
-            if (outputType == 'html' && mode == 'renderer') {
+            if (outputType == 'html' && _mode == 'renderer') {
               var a = document.createElement('a');
               a.href = c.content.clickUrl;
               a.target = '_blank';
 
-              if (mode == 'designer') {
+              if (_mode == 'designer') {
                 a.onclick = function (e) {
                   e.preventDefault();
                 };
@@ -441,14 +443,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data);
+    this.renderText(this.props.data, this.props.mode);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data);
+        _this.renderText(_this.props.data, _this.props.mode);
       }
     });
   };
@@ -460,7 +462,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data);
+      this.renderText(nextProps.data, nextProps.mode);
     }
 
     return result;
@@ -477,8 +479,11 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput;
-    var mode = window.magicDesign.mode;
+        onTextInput = _a.onTextInput,
+        mode = _a.mode;
+
+    var _mode = mode || window.magicDesign.mode;
+
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -507,7 +512,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
-      contentEditable: mode == 'designer' && !readonly,
+      contentEditable: _mode == 'designer' && !readonly,
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
       },

package/es/utils/coreUtil.js

@@ -367,7 +367,7 @@ var copyNode = function copyNode(value, parentId) {
     if (name === 'parentId') {
       newNode.parentId = parentId;
     } else {
-      newNode[name] = copyNode(value[name], newNode.id);
+      newNode[name] = copyNode(value[name], newNode.id || parentId);
     }
   });
   return newNode;

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

@@ -83,8 +83,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data; // const { ready } = this.state;
-
-    console.log('----nav mobile', data); // if (data.background.bgType === 'color') {
+    // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;
     // } else {

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

@@ -1,8 +1,8 @@
 .config_wrap {
   width: 354px;
   background: #ffffff;
-  height: 100vh;
-  overflow: scroll;
+  max-height: 100vh;
+  // overflow: scroll;
   transition-property: transform;
   transition-duration: .3s;
   transition-timing-function: ease;
@@ -20,6 +20,8 @@
   .first_config_wrap {
     height: 100%;
     padding: 24px;
+    height: 100vh;
+    overflow: auto;
 
     .config_header {
       font-size: 26px;
@@ -48,7 +50,10 @@
 
   .sec_config_wrap {
     position: absolute;
+    height: 100vh;
+    overflow: auto;
     width: 354px;
+    z-index: 201;
     left: -354px;
     bottom: 0;
     top: 0;

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

@@ -78,6 +78,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       id: "render-html-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Renderer["default"], _extends({}, renderProps, {
+      noSetWindow: true,
       outputType: "html"
     })));
   };

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

@@ -174,7 +174,8 @@ function (_super) {
       }
 
       var newInstanceProps = {
-        nodeData: nodeData
+        nodeData: nodeData,
+        mode: 'designer'
       };
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: nodeData.id,

package/lib/core/Renderer/index.js

@@ -59,9 +59,13 @@ var setDesignConfig = function setDesignConfig(props) {
 
 var Renderer = function Renderer(props) {
   var pageData = props.pageData,
-      outputType = props.outputType; // console.log('pageData: ', pageData);
+      outputType = props.outputType,
+      noSetWindow = props.noSetWindow; // console.log('pageData: ', pageData);
+
+  if (!noSetWindow) {
+    setDesignConfig(props);
+  }
 
-  setDesignConfig(props);
   window.magicDesignPageData = pageData;
   var pageBackground = window.magicDesign.pageBackground; // 根据楼层展示设备进行过滤
 

package/lib/meta-comp/components/Text/index.js

@@ -322,9 +322,11 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data) {
-      var mode = window.magicDesign.mode;
+    _this.renderText = function (data, mode) {
       var outputType = _this.props.outputType || window.magicDesign.outputType;
+
+      var _mode = mode || window.magicDesign.mode;
+
       if (!_this.textRef.current) return;
 
       _this.textRef.current.blur();
@@ -337,7 +339,7 @@ function (_super) {
       /** 渲染html */
 
       if (data.specialContent.length == 0) {
-        if (outputType == 'html' && mode == 'renderer') {
+        if (outputType == 'html' && _mode == 'renderer') {
           if (data === null || data === void 0 ? void 0 : data.content.clickUrl) {
             var a = document.createElement('a');
             a.href = data.content.clickUrl;
@@ -361,12 +363,12 @@ function (_super) {
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
 
           if (c === null || c === void 0 ? void 0 : c.content.clickUrl) {
-            if (outputType == 'html' && mode == 'renderer') {
+            if (outputType == 'html' && _mode == 'renderer') {
               var a = document.createElement('a');
               a.href = c.content.clickUrl;
               a.target = '_blank';
 
-              if (mode == 'designer') {
+              if (_mode == 'designer') {
                 a.onclick = function (e) {
                   e.preventDefault();
                 };
@@ -441,14 +443,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data);
+    this.renderText(this.props.data, this.props.mode);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data);
+        _this.renderText(_this.props.data, _this.props.mode);
       }
     });
   };
@@ -460,7 +462,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data);
+      this.renderText(nextProps.data, nextProps.mode);
     }
 
     return result;
@@ -477,8 +479,11 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput;
-    var mode = window.magicDesign.mode;
+        onTextInput = _a.onTextInput,
+        mode = _a.mode;
+
+    var _mode = mode || window.magicDesign.mode;
+
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -507,7 +512,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
-      contentEditable: mode == 'designer' && !readonly,
+      contentEditable: _mode == 'designer' && !readonly,
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
       },

package/lib/utils/coreUtil.js

@@ -367,7 +367,7 @@ var copyNode = function copyNode(value, parentId) {
     if (name === 'parentId') {
       newNode.parentId = parentId;
     } else {
-      newNode[name] = copyNode(value[name], newNode.id);
+      newNode[name] = copyNode(value[name], newNode.id || parentId);
     }
   });
   return newNode;

package/package.json

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