@fonixtree/magic-design 0.0.78 → 0.0.80

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.less

@@ -1,3 +1,15 @@
 .recommend_second_conf_wrap {
-  width: 354px;
+
+  .sourceOfProduct {
+    border-top: 1px solid #D2D9E5;
+    padding-top: 20px;
+    padding-bottom: 10px;
+
+    .greyBg {
+      background: #F5F6F7;
+      border-radius: 6px;
+      padding: 12px;
+      padding-bottom: 1px;
+    }
+  }
 }

package/lib/constants/component-types.js

@@ -31,6 +31,8 @@ var _Recommend = _interopRequireDefault(require("../composite-comp/dito/componen
 
 var _MobileNavigation = _interopRequireDefault(require("../composite-comp/dito/components/MobileNavigation"));
 
+var _PcNavigation = _interopRequireDefault(require("../composite-comp/dito/components/PcNavigation"));
+
 var _BannerConfig = _interopRequireDefault(require("../composite-comp/bol/config-panels/BannerConfig"));
 
 var _DividerConfig = _interopRequireDefault(require("../composite-comp/bol/config-panels/DividerConfig"));
@@ -57,6 +59,8 @@ var _RecommendConfig = _interopRequireDefault(require("../composite-comp/dito/co
 
 var _MobileNavigationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/MobileNavigationConfig"));
 
+var _PcNavigationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/PcNavigationConfig"));
+
 var _BannerSecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/BannerSecondConfig"));
 
 var _TextSecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/TextSecondConfig"));
@@ -69,6 +73,12 @@ var _RecommendSecondConfig = _interopRequireDefault(require("../composite-comp/d
 
 var _MobileNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/MobileNavigationSecondConfig"));
 
+var _TagSecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/TagSecondConfig"));
+
+var _ButtonSecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/ButtonSecondConfig"));
+
+var _PcNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/PcNavigationSecondConfig"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var _a, _b, _c; // 组件
@@ -77,17 +87,17 @@ var _a, _b, _c; // 组件
 /**
  * 渲染组件索引
  */
-var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a);
+var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a);
 /**
  * 一级配置面板索引
  */
 
 exports.componentMap = componentMap;
-var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b);
+var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b);
 /**
  * 二级配置面板索引
  */
 
 exports.configPanelMap = configPanelMap;
-var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c);
+var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c);
 exports.secondConfigPanelMap = secondConfigPanelMap;

package/lib/constants/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = void 0;
+exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = void 0;
 var STORAGE_KEY = {
   LOCALE: 'magicLocale'
 };
@@ -27,6 +27,11 @@ var deviceTypeMap = {
   PHONE: 'mobile'
 };
 exports.deviceTypeMap = deviceTypeMap;
+var deviceTypeWidthMap = {
+  pc: 1240,
+  mobile: 375
+};
+exports.deviceTypeWidthMap = deviceTypeWidthMap;
 var magicMode = {
   DESIGNER: 'designer',
   RENDERER: 'renderer'
@@ -94,6 +99,10 @@ var compInfoMap = {
   MOBILE_NAVIGATION: {
     name: 'Mobile Navigation',
     icon: 'icon-navigation'
+  },
+  PC_NAVIGATION: {
+    name: 'PC Navigation',
+    icon: 'icon-navigation'
   }
 };
 /**
@@ -149,4 +158,13 @@ var metaInst = {
     type: metaType.BUTTON
   }
 };
-exports.metaInst = metaInst;
+/**
+ * 全局事件类型
+ */
+
+exports.metaInst = metaInst;
+var eventType = {
+  // 二级配置面板返回时，更新一级面板事件
+  UPDATE_FIRST_CONFIG: 'update-first-config'
+};
+exports.eventType = eventType;

package/lib/constants/layout.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.newsletterLayout = exports.mobileNavigationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = void 0;
+exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.mobileNavigationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = void 0;
 
 var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
 
@@ -39,16 +39,20 @@ var _newsletter = _interopRequireDefault(require("../assets/images/layout-icon/n
 
 var _layoutRecommend = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-1.png"));
 
-var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-3.png"));
+var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-2.png"));
 
-var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-4.png"));
+var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-3.png"));
 
-var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
+var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-4.png"));
+
+var _layoutRecommend5 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
 
 var _layoutNavigationNewline = _interopRequireDefault(require("../assets/images/layout-icon/layout-navigation-newline.png"));
 
 var _layoutNavigationTile = _interopRequireDefault(require("../assets/images/layout-icon/layout-navigation-tile.png"));
 
+var _layoutNavigationNormal = _interopRequireDefault(require("../assets/images/layout-icon/layout-navigation-normal.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 // import p3 from '../assets/images/layout-icon/layout-imagetext-p3.png';
@@ -134,20 +138,36 @@ var recommendLayoutMobile = [{
   id: 'layout1',
   name: 'layout1',
   image: _layoutRecommend["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _layoutRecommend2["default"]
+}, {
+  id: 'layout3',
+  name: 'layout3',
+  image: _layoutRecommend3["default"]
+}, {
+  id: 'layout4',
+  name: 'layout4',
+  image: _layoutRecommend4["default"]
+}, {
+  id: 'layout5',
+  name: 'layout5',
+  image: _layoutRecommend5["default"]
 }];
 exports.recommendLayoutMobile = recommendLayoutMobile;
 var recommendLayoutPc = [{
   id: 'layout1',
   name: 'layout1',
-  image: _layoutRecommend2["default"]
+  image: _layoutRecommend3["default"]
 }, {
   id: 'layout2',
   name: 'layout2',
-  image: _layoutRecommend3["default"]
+  image: _layoutRecommend4["default"]
 }, {
   id: 'layout3',
   name: 'layout3',
-  image: _layoutRecommend4["default"]
+  image: _layoutRecommend5["default"]
 }];
 exports.recommendLayoutPc = recommendLayoutPc;
 var mobileNavigationLayout = [{
@@ -159,4 +179,10 @@ var mobileNavigationLayout = [{
   name: 'tile',
   image: _layoutNavigationTile["default"]
 }];
-exports.mobileNavigationLayout = mobileNavigationLayout;
+exports.mobileNavigationLayout = mobileNavigationLayout;
+var pcNavigationLayout = [{
+  id: 'normal',
+  name: 'normal',
+  image: _layoutNavigationNormal["default"]
+}];
+exports.pcNavigationLayout = pcNavigationLayout;

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

@@ -19,6 +19,8 @@ require("./index.less");
 
 var _locale = require("../../../locale");
 
+var _coreUtil = require("../../../utils/coreUtil");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -114,10 +116,12 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("h5", {
         className: "cat-name"
       }, compCat, "(", "" + compSource[compCat].length, ")"), compSource[compCat].map(function (comp) {
-        return /*#__PURE__*/_react["default"].createElement(_CompCard["default"], _extends({}, comp, {
+        return (0, _coreUtil.isActiveFloor)(comp.terminalType) ? /*#__PURE__*/_react["default"].createElement(_CompCard["default"], _extends({}, comp, {
           key: comp.moduleId,
-          onAdd: _this.onAddClick
-        }));
+          onAdd: function onAdd() {
+            return _this.onAddClick(comp);
+          }
+        })) : null;
       }));
     })));
   };
@@ -125,34 +129,5 @@ function (_super) {
   return CompListPanel;
 }(_react.Component);
 
-var _default = CompListPanel; // export default function CompListPanel({ visible, onClose, compSource, onAdd }) {
-//   useEffect(() => {
-//     if (visible) {
-//       document.getElementsByClassName('component-list')[0].scrollTop = 0;
-//     }
-//   }, [visible]);
-//   return (
-//     <div className={classNames('compListPanel', { visible })}>
-//       <header className="header">
-//         <Button icon="icon-close" onClick={onClose} type="icon" />
-//       </header>
-//       <h2 className="title">{i18n('ADD_COMPONENT')}</h2>
-//       <div className="component-list">
-//         {
-//           Object.keys(compSource).map(compCat => (
-//             <div key={compCat} className="cat-list">
-//               <h5 className="cat-name">{compCat}({`${compSource[compCat].length}`})</h5>
-//               {
-//                 compSource[compCat].map(comp => (
-//                   <CompCard {...comp} key={comp.moduleId} onAdd={onAdd} />
-//                 ))
-//               }
-//             </div>
-//           ))
-//         }
-//       </div>
-//     </div>
-//   );
-// }
-
+var _default = CompListPanel;
 exports["default"] = _default;

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

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = TerminalSelect;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _common = require("../../../../common");
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function TerminalSelect(_a) {
+  var value = _a.value,
+      onChange = _a.onChange,
+      terminalType = _a.terminalType;
+  var isActiveMobile = !value || ['MOBILE', 'ALL'].includes(value);
+  var isActivePc = !value || ['PC', 'ALL'].includes(value);
+
+  var onTerminalClick = function onTerminalClick(terminal) {
+    // 至少选中一种终端
+    if (value === terminal) {
+      return;
+    }
+
+    if (!value || value === 'ALL') {
+      if (terminal === 'PC') {
+        onChange('MOBILE');
+      } else {
+        onChange('PC');
+      }
+    } else {
+      onChange('ALL');
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "terminal_wrap"
+  }, ['MOBILE', 'ALL', undefined, null].includes(terminalType) && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "terminal_item",
+    onClick: function onClick() {
+      return onTerminalClick('MOBILE');
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    color: isActiveMobile ? '#2F54EB' : '#C4C4C4',
+    size: 20,
+    type: "icon-mobile"
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "select"
+  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    color: isActiveMobile ? '#00AC5A' : '#A3AEC3',
+    size: 9,
+    type: "icon-select"
+  }))), ['PC', 'ALL', undefined, null].includes(terminalType) && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "terminal_item",
+    onClick: function onClick() {
+      return onTerminalClick('PC');
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    color: isActivePc ? '#2F54EB' : '#C4C4C4',
+    size: 20,
+    type: "icon-pc"
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "select"
+  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    color: isActivePc ? '#00AC5A' : '#A3AEC3',
+    size: 9,
+    type: "icon-select"
+  }))));
+}

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

@@ -0,0 +1,29 @@
+.terminal_wrap {
+  display: flex;
+  .terminal_item {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    background-color: #EDF0F4;
+    border-radius: 2px;
+    cursor: pointer;
+    .select {
+      position: absolute;
+      right: -4px;
+      top: -4px;
+      line-height: 0;
+    }
+  }
+  .terminal_item + .terminal_item {
+    margin-left: 16px;
+  }
+  .active {
+    background-color: #2F54EB;
+  }
+}
+.terminal_wrap+ span {
+  margin-left: 14px;
+}

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _TerminalSelect = _interopRequireDefault(require("./TerminalSelect"));
+
 var _coreUtil = require("../../../utils/coreUtil");
 
 var _commonUtil = require("../../../utils/commonUtil");
@@ -72,6 +74,34 @@ function (_super) {
       selectedNode: {}
     };
 
+    _this.resetState = function (propsData, clickedFloor) {
+      var pageData = propsData.pageData;
+      var selectedNode = pageData.find(function (floor) {
+        return floor.id === clickedFloor;
+      });
+
+      _this.setState({
+        clickedGroup: _mobx.store.clickedGroup,
+        selectedNode: selectedNode
+      }); // 展开一级面板
+
+
+      if (selectedNode) {
+        _this.openConfig();
+      } else {
+        _this.closeConfig();
+      } // 展开二级面板
+
+
+      if (!_mobx.store.clickedGroup && _this.preClickedGroup) {
+        _this.closeSecConfig();
+      } else if (Boolean(_mobx.store.clickedGroup) != Boolean(_this.preClickedGroup)) {
+        _this.openSecConfig();
+      }
+
+      _this.preClickedGroup = _mobx.store.clickedGroup;
+    };
+
     _this.animation = function (type) {
       document.getElementsByClassName('config_wrap')[0].setAttribute('style', "animation-name:" + type + ";animation-duration: 0.3s;animation-fill-mode:both");
     };
@@ -157,6 +187,13 @@ function (_super) {
         device: device
       };
       var instance = Clazz ? /*#__PURE__*/_react["default"].createElement(Clazz, panelProps) : null;
+
+      if (!instance) {
+        _mobx.store.setState({
+          clickedFloor: null
+        });
+      }
+
       return instance;
     };
 
@@ -209,11 +246,15 @@ function (_super) {
           break;
 
         case 'MOBILE_NAVIGATION':
+        case 'PC_NAVIGATION':
           groupName = ((_f = panelProps.groupName) === null || _f === void 0 ? void 0 : _f.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
           break;
 
         case 'RECOMMEND':
           groupName = panelProps.groupName.text;
+
+        case 'TAG':
+          groupName = '';
       }
 
       return groupName || 'Group Name';
@@ -223,40 +264,41 @@ function (_super) {
       _mobx.store.setState({
         clickedGroup: null
       });
-    };
 
-    return _this;
-  }
-
-  ConfigPanel.prototype.componentDidMount = function () {
-    var _this = this;
+      window.document.dispatchEvent(new Event(_constants.eventType.UPDATE_FIRST_CONFIG, {
+        bubbles: false
+      }));
+    };
 
-    this.distroy = (0, _mobx.autorun)(function () {
-      var selectedNode = _mobx.store.getFloorInfo();
+    _this.onTerminalChange = function (terminal) {
+      var selectedNode = _this.state.selectedNode;
+      selectedNode.activeTerminal = terminal;
 
       _this.setState({
-        clickedGroup: _mobx.store.clickedGroup,
         selectedNode: selectedNode
-      }); // 展开以及面板
+      }); // 刷新页面组件列表 和 viewArea
 
 
-      if (selectedNode) {
-        _this.openConfig();
-      } else {
-        _this.closeConfig();
-      } // 展开首期二级面板
+      (0, _coreUtil.renderPreview)();
+    };
 
+    return _this;
+  }
 
-      if (!_mobx.store.clickedGroup) {
-        _this.closeSecConfig();
-      } else if (_mobx.store.clickedGroup !== _this.preClickedGroup) {
-        _this.openSecConfig();
-      }
+  ConfigPanel.prototype.componentDidMount = function () {
+    var _this = this;
 
-      _this.preClickedGroup = _mobx.store.clickedGroup;
+    this.distroy = (0, _mobx.autorun)(function () {
+      _this.resetState(_this.props, _mobx.store.clickedFloor);
     });
   };
 
+  ConfigPanel.prototype.componentWillReceiveProps = function (nextProps) {
+    if (JSON.stringify(this.props) !== JSON.stringify(nextProps)) {
+      this.resetState(nextProps, _mobx.store.clickedFloor);
+    }
+  };
+
   ConfigPanel.prototype.componentWillUnmount = function () {
     this.distroy();
   };
@@ -275,10 +317,17 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "title",
       title: (_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name
-    }, (_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name), device === _constants.deviceTypeMap.PC && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, (_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "right_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_TerminalSelect["default"], {
+      onChange: this.onTerminalChange,
+      terminalType: selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.terminalType,
+      value: selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.activeTerminal
+    }), device === _constants.deviceTypeMap.PC && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       onClick: this.onDoneClick,
+      size: "small",
       type: "light"
-    }, (0, _locale.i18n)('DONE'))), this.getConfigPanelInstance()), /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _locale.i18n)('DONE')))), this.getConfigPanelInstance()), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sec_config_wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "config_header"

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

@@ -39,6 +39,10 @@
         line-height: 32px;
         color: #232F46;
       }
+      .right_wrap {
+        display: flex;
+        align-items: center;
+      }
     }
   }
 

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
+var _lodash = require("lodash");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
@@ -14,24 +16,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * 有新的操作时存入数组的0位置，游标设置为0
  *
  */
-var debug = require('debug')('worker:History');
-
 var History =
 /** @class */
 function () {
   function History(hist) {
     var _this = this;
     /**
-     * 游标位置
-     */
+      * 游标位置
+      */
 
 
     this.cursor = 0;
     /**
-     * 历史数据
-     */
+      * 历史数据
+      */
 
     this.list = [];
+    /** 前进或者后退步数 */
+
+    this.step = 0;
 
     this.redoAble = function () {
       return _this.cursor !== 0;
@@ -41,47 +44,50 @@ function () {
       return _this.cursor !== _this.list.length - 1;
     };
     /**
-     * 清空0～cursor之间的数据，将data插入 位置0
-     */
+      * 清空0～cursor之间的数据，将data插入 位置0
+      */
 
 
     this.push = function (data) {
-      debug('push data', data);
       var cloneData = (0, _cloneDeep["default"])(data);
 
       _this.list.splice(0, _this.cursor, cloneData);
 
+      _this.cursor = 0;
       return data;
     };
     /**
-     * redu操作只修改当前游标-1
-     * 并且返回后一步的json对象
-     */
+      * redu操作只修改当前游标-1
+      * 并且返回后一步的json对象
+      */
 
 
-    this.redo = function () {
-      debug('redo click');
-      var newCursor = _this.cursor - 1;
-      _this.cursor = newCursor;
-      var newData = _this.list[newCursor];
-      return newData;
+    this.redo = function (callback) {
+      _this.step -= 1;
+
+      _this.doAction(callback);
     };
     /**
-     * undo操作只修改当前的游标+1
-     * 并且返回前一步的json对象
-     */
+      * undo操作只修改当前的游标+1
+      * 并且返回前一步的json对象
+      */
 
 
-    this.undo = function () {
-      debug('undo click');
-      var newCursor = _this.cursor + 1;
-      _this.cursor = newCursor;
-      var newData = _this.list[newCursor];
-      return newData;
+    this.undo = function (callback) {
+      _this.step += 1;
+
+      _this.doAction(callback);
     };
 
+    this.doAction = (0, _lodash.debounce)(function (callback) {
+      var newCursor = _this.cursor + _this.step;
+      _this.cursor = newCursor;
+      var newData = (0, _cloneDeep["default"])(_this.list[newCursor]);
+      _this.step = 0;
+      callback(newData);
+    }, 300);
     this.cursor = 0;
-    this.list = [hist];
+    this.list = [(0, _cloneDeep["default"])(hist)];
   }
 
   return History;