@fonixtree/magic-design 2.0.63 → 2.0.66

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

@@ -32,12 +32,15 @@
     }
   }
   .chat_content_wrap {
+    display: flex;
+    flex-direction: column;
     position: relative;
-    padding-bottom: 40px;
     height: 100%;
     .content_wrap {
+      background: #F5F6F7;
+      flex: 1;
       padding: 16px;
-      height: 100%;
+      // height: 100%;
       overflow: scroll;
       font-family: 'Open Sans';
       font-size: 14px;
@@ -78,16 +81,18 @@
         display: flex;
         justify-content: flex-end;
         .messageWrap {
+          border: 1px solid #E6EAF0;
           border-radius: 4px;
-          background: #E9F0FF;
-          color: #2F54EB;
+          background: #FFF;
+          color: #232F46;
         }
       }
       .assistantMessage {
         .messageWrap {
           border-radius: 4px;
-          background: #F5F6F7;
-          color: #232F46;
+          background: #E9F0FF;
+          color: #2F54EB;
+          border: 1px solid #D6E4FF;
         }
       }
       .recent_response {
@@ -101,21 +106,36 @@
         }
       }
     }
-    .regenerate_btn {
+
+    .regenerate_btn_wrap {
+      background: #F5F6F7;
       display: flex;
       align-items: center;
-      position: absolute;
-      bottom: 10px;
-      border: 1px solid #E6EAF0;
-      border-radius: 4px;
-      padding: 4px 12px;
-      left: 50%;
-      transform: translateX(-50%);
-      cursor: pointer;
-      font-family: 'Open Sans';
-      font-style: normal;
-      font-weight: 400;
-      font-size: 13px;
+      justify-content: center;
+      padding-bottom: 12px;
+      .regenerate_btn {
+        background-color: #FFF;
+        bottom: 10px;
+        border: 1px solid #E6EAF0;
+        border-radius: 4px;
+        padding: 4px 12px;
+        cursor: pointer;
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 400;
+        font-size: 13px;
+      }
+    }
+    
+    .more_condition {
+      transition: all 0.4s;
+      max-height: 400px;
+      overflow: hidden;
+      box-shadow: 3px 3px 8px 0px #2D304008;
+      box-shadow: -3px -3px 8px 0px #2D304008;
+    }
+    .more_condition_hide {
+      max-height: 0;
     }
   }
   .dialog_bottom {
@@ -130,7 +150,7 @@
       }
       .image_btn {
         position: absolute;
-        right: 10px;
+        right: 40px;
         top: 6px;
       }
       .toggle_btn {

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

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var _lodash = require("lodash");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -79,7 +79,7 @@ function () {
       _this.doAction(callback);
     };
 
-    this.doAction = (0, _lodash.debounce)(function (callback) {
+    this.doAction = (0, _debounce["default"])(function (callback) {
       var newCursor = _this.cursor + _this.step;
       _this.cursor = newCursor;
       var newData = (0, _cloneDeep["default"])(_this.list[newCursor]);

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

@@ -15,7 +15,9 @@ var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"))
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _lodash = require("lodash");
+var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
+
+var _findLastIndex = _interopRequireDefault(require("lodash/findLastIndex"));
 
 var _common = require("../../../common");
 
@@ -61,7 +63,8 @@ function PageCompList(_a) {
       pageData = _a.pageData,
       onAdd = _a.onAdd,
       renderPagesManage = _a.renderPagesManage,
-      pageName = _a.pageName;
+      pageName = _a.pageName,
+      pageType = _a.pageType;
 
   var _b = (0, _react.useState)(pageData || []),
       components = _b[0],
@@ -139,7 +142,7 @@ function PageCompList(_a) {
 
   var getLastSameIndex = function getLastSameIndex(comps, index) {
     var lastComps = comps.slice(0, index);
-    var newIndex = (0, _lodash.findLastIndex)(lastComps, function (comp) {
+    var newIndex = (0, _findLastIndex["default"])(lastComps, function (comp) {
       return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
     });
     return newIndex;
@@ -147,7 +150,7 @@ function PageCompList(_a) {
 
   var getNextSameIndex = function getNextSameIndex(comps, index) {
     var nextComps = comps.slice(index + 1);
-    var newIndex = (0, _lodash.findIndex)(nextComps, function (comp) {
+    var newIndex = (0, _findIndex["default"])(nextComps, function (comp) {
       return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
     });
     return newIndex + index + 1;
@@ -313,7 +316,7 @@ function PageCompList(_a) {
     className: "page-comp-list"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "title mb16"
-  }, pageName), /*#__PURE__*/_react["default"].createElement(_common.Button, {
+  }, pageName), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_common.Button, {
     icon: "icon-add",
     onClick: onAdd,
     size: "large",

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

@@ -116,7 +116,8 @@ function (_super) {
         language = _a.language,
         outputType = _a.outputType,
         onHtmlSave = _a.onHtmlSave,
-        onHtmlBack = _a.onHtmlBack;
+        onHtmlBack = _a.onHtmlBack,
+        pageType = _a.pageType;
     var languageTemp = langBook[language] || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "quick_menu_wrap"
@@ -138,7 +139,7 @@ function (_super) {
       className: "menu_center"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "device_group"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }, pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('device_pc', {
         active: device === _constants.deviceTypeMap.PC
       }),
@@ -150,7 +151,8 @@ function (_super) {
       type: "icon-pc"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('device_phone', {
-        active: device === _constants.deviceTypeMap.PHONE
+        active: device === _constants.deviceTypeMap.PHONE,
+        only_mobile: pageType === 'Menu'
       }),
       "data-code": _constants.quickMenuCode.MODE_PHONE,
       onClick: this.onBtnClick

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

@@ -61,6 +61,10 @@
         align-items: center;
         justify-content: center;
       }
+      .only_mobile {
+        border-top-left-radius: 8px;
+        border-bottom-left-radius: 8px;
+      }
 
       .active {
         background: #E9F0FF;

package/lib/core/Designer/index.js

@@ -263,6 +263,7 @@ window.magicDesign = {
 
 var setDesignConfig = function setDesignConfig(data) {
   window.magicDesign = __assign(__assign(__assign({}, window.magicDesign), data), {
+    designMode: true,
     compWidth: Number(data.compWidth),
     compSpacing: Number(data.compSpacing),
     MBaseUrl: data.MBaseUrl || 'operation/v1',
@@ -593,6 +594,7 @@ function (_super) {
         onHtmlBack: _this.onHtmlBack,
         onHtmlSave: _this.onHtmlSave,
         outputType: _this.props.outputType,
+        pageType: _this.props.pageType,
         redoDisable: !_this.history.redoAble(),
         undoDisable: !_this.history.undoAble()
       });
@@ -751,7 +753,8 @@ function (_super) {
         pageName = _b.pageName,
         onCancelPublish = _b.onCancelPublish,
         leftTitle = _b.leftTitle,
-        outputType = _b.outputType;
+        outputType = _b.outputType,
+        pageType = _b.pageType;
     var renderPagesManage = pagesManager;
 
     if (outputType == 'html') {
@@ -775,6 +778,7 @@ function (_super) {
       onAdd: this.onAdd,
       pageData: MPageData,
       pageName: pageName,
+      pageType: pageType,
       renderPagesManage: renderPagesManage,
       setPageData: this.setPageData
     }), /*#__PURE__*/_react["default"].createElement(_CompListPanel["default"], {

package/lib/core/Renderer/index.js

@@ -43,11 +43,13 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
-      device = props.device;
+      device = props.device,
+      isPreview = props.isPreview;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
     device: device,
+    designMode: isPreview,
     navigatePreUrl: ''
   }, config), {
     compSpacing: Number(config.compSpacing),

package/lib/decorator/compositeDecorator.js

@@ -153,6 +153,19 @@ function compositeDecorator(WrappedComponent) {
 
         if (device === _constants.deviceTypeMap.PC && compWidth && !((_a = spacing === null || spacing === void 0 ? void 0 : spacing.pc) === null || _a === void 0 ? void 0 : _a.fillUp)) {
           wrapStyle.width = compWidth;
+        } // 如果是菜单 则需要设为fixed
+
+
+        if (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION') {
+          wrapStyle.position = 'absolute';
+          wrapStyle.left = 0;
+          wrapStyle.width = '100%';
+
+          if (nodeData.type === 'HEAD_NAVIGATION') {
+            wrapStyle.top = 0;
+          } else {
+            wrapStyle.bottom = 0;
+          }
         }
 
         return wrapStyle;
@@ -228,6 +241,15 @@ function compositeDecorator(WrappedComponent) {
         });
       };
 
+      _this.getOuterWrapStyle = function () {
+        var nodeData = _this.props.nodeData;
+
+        if (window.magicDesign.designMode && (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION')) {
+          var element = document.querySelector('.phone_view_area .device_border') || document.querySelector('#root .render_wrap');
+          element.style.position = 'relative';
+        }
+      };
+
       return _this;
     }
 
@@ -240,6 +262,7 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
+      this.getOuterWrapStyle();
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/lib/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/lib/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/lib/locale/id/id.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/lib/meta-comp/config-panels/ButtonConfig/index.js

@@ -11,7 +11,7 @@ var _antd = require("antd");
 
 require("./index.less");
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _locale = require("../../../locale");
 
@@ -106,11 +106,11 @@ function (_super) {
 
       _this.updateAttr(data, 'hover', {
         open: true,
-        buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
-        buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
-        buttonText: (0, _lodash.cloneDeep)(data.buttonText),
+        buttonBorder: (0, _cloneDeep["default"])(data.buttonBorder),
+        buttonIcon: (0, _cloneDeep["default"])(data.buttonIcon),
+        buttonText: (0, _cloneDeep["default"])(data.buttonText),
         content: {
-          backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
+          backgroundColor: (0, _cloneDeep["default"])(data.content.backgroundColor)
         }
       }); // console.log('--ffd, button hover first click', data);
 

package/lib/meta-comp/config-panels/ImageConfig/index.js

@@ -202,7 +202,7 @@ function (_super) {
   function ImageConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.onClick = function (event) {// console.log(event);
+    _this.onClick = function () {// console.log(event);
     };
 
     _this.getImg = function (v, way) {
@@ -320,7 +320,8 @@ function (_super) {
         needHover = _a.needHover,
         needClickArea = _a.needClickArea,
         needURL = _a.needURL,
-        recommendImgSize = _a.recommendImgSize;
+        recommendImgSize = _a.recommendImgSize,
+        onlySpecificCode = _a.onlySpecificCode;
     var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
@@ -348,6 +349,7 @@ function (_super) {
 
         _this.selfRender();
       },
+      onlySpecificCode: onlySpecificCode,
       value: data.content.clickUrl
     })));
 

package/lib/utils/businessUtil.js

@@ -7,7 +7,7 @@ exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToT
 
 var _qs = _interopRequireDefault(require("qs"));
 
-var _lodash = require("lodash");
+var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
 var _commonUtil = require("./commonUtil");
 
@@ -92,7 +92,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(value), function (value) {
             return value;
           })
         }
@@ -266,7 +266,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(arg1), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(arg1), function (value) {
             return value;
           })
         }

package/lib/utils/commonUtil.js

@@ -27,7 +27,7 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _uuid = require("uuid");
 
@@ -640,7 +640,7 @@ function pushGA(data, eventName) {
 
 
 function covertKey(data, func) {
-  var newData = (0, _lodash.cloneDeep)(data);
+  var newData = (0, _cloneDeep["default"])(data);
   func(newData);
   return JSON.stringify(newData);
 }

package/package.json

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