@fonixtree/magic-design 0.0.62 → 0.0.63

package/es/common/Collapse/index.js

@@ -94,19 +94,7 @@ function (_super) {
         return;
       }
 
-      var activeItem = source.find(function (src) {
-        return src.active;
-      });
-
-      if (activeItem) {
-        actives.push(activeItem.key);
-
-        _this.setState({
-          activeKey: actives
-        });
-
-        return;
-      } else if (type === 'switch') {
+      if (type === 'switch') {
         var first = source.find(function (src) {
           var _a;
 
@@ -120,6 +108,13 @@ function (_super) {
 
           actives.push(((_b = first.metaOption) === null || _b === void 0 ? void 0 : _b.id) || first.key);
         }
+      } else if (type === 'triangle' && _mobx.store.clickedMeta && !_mobx.store.clickedGroup) {
+        var activeItem = source.find(function (src) {
+          var _a, _b;
+
+          return JSON.stringify(((_b = (_a = src.value) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.panelProps) || '').includes(_mobx.store.clickedMeta);
+        });
+        actives.push(activeItem === null || activeItem === void 0 ? void 0 : activeItem.key);
       } else {
         var first = source.find(function (src) {
           var _a;

package/es/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -152,16 +152,13 @@ exports.recommendGroupSourceJSON = recommendGroupSourceJSON;
 
 var getDefaultJSON = function getDefaultJSON() {
   var groupId = (0, _uuid.v4)();
-  var contentId = (0, _uuid.v4)();
   return {
     id: groupId,
     type: 'RECOMMEND',
     groupSource: [recommendGroupSourceJSON(groupId, '', 'Tab1'), recommendGroupSourceJSON(groupId, '', 'Tab2')],
     content: {
-      id: contentId,
       label: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -204,7 +201,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       productName: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
@@ -228,7 +224,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       activityPrice: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
@@ -252,7 +247,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       salesPrice: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],

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

@@ -25,8 +25,6 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _locale = require("../../../../locale");
 
-var _mobx = require("../../../../mobx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -81,10 +79,6 @@ function (_super) {
       _this.selfRender();
     };
 
-    _this.getIsContentActive = function (content) {
-      return JSON.stringify(content).includes(_mobx.store.clickedMetaParent);
-    };
-
     return _this;
   }
 
@@ -106,8 +100,7 @@ function (_super) {
         name: (0, _locale.i18n)('CONTENT'),
         value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigContent["default"], {
           panelProps: data.content
-        }),
-        active: this.getIsContentActive(data.content)
+        })
       }, {
         key: '3',
         name: (0, _locale.i18n)('SPACING'),

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

@@ -83,19 +83,19 @@ function (_super) {
       _this.setState({
         clickedGroup: _mobx.store.clickedGroup,
         selectedNode: selectedNode
-      }); // 展开以及面板
+      }); // 展开一级面板
 
 
       if (selectedNode) {
         _this.openConfig();
       } else {
         _this.closeConfig();
-      } // 展开首期二级面板
+      } // 展开二级面板
 
 
-      if (!_mobx.store.clickedGroup) {
+      if (!_mobx.store.clickedGroup && _this.preClickedGroup) {
         _this.closeSecConfig();
-      } else if (_mobx.store.clickedGroup !== _this.preClickedGroup) {
+      } else if (Boolean(_mobx.store.clickedGroup) != Boolean(_this.preClickedGroup)) {
         _this.openSecConfig();
       }
 
@@ -294,7 +294,9 @@ function (_super) {
   };
 
   ConfigPanel.prototype.componentWillReceiveProps = function (nextProps) {
-    this.resetState(nextProps, _mobx.store.clickedFloor);
+    if (JSON.stringify(this.props) !== JSON.stringify(nextProps)) {
+      this.resetState(nextProps, _mobx.store.clickedFloor);
+    }
   };
 
   ConfigPanel.prototype.componentWillUnmount = function () {

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

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _mobx = require("../../../mobx");
+
 var _Button = _interopRequireDefault(require("../../../common/Button"));
 
 var _Iconfont = _interopRequireDefault(require("../../../common/Iconfont"));
@@ -80,9 +82,13 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.onBtnClick = function (event) {
-      var code = event.currentTarget.dataset.code; // if (code === quickMenuCode.SAVE || code === quickMenuCode.PUBLISH) {
-      //   store.setState({ clickedFloor: '' });
-      // }
+      var code = event.currentTarget.dataset.code; // 保存和发布时需要清空组件和元组件的选中状态，否则截图中会看到选中状态
+
+      if (code === _constants.quickMenuCode.SAVE || code === _constants.quickMenuCode.PUBLISH) {
+        _mobx.store.setState({
+          clickedFloor: ''
+        });
+      }
 
       if (_this.props.device === _constants.deviceTypeMap.PC) {}
 

package/es/decorator/metaDecorator.js

@@ -69,7 +69,7 @@ function metaDecorator(WrappedComponent) {
       }; // 元组件点击事件
 
       _this.onMetaClick = function (event) {
-        var _a, _b, _c;
+        var _a, _b;
 
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -79,8 +79,7 @@ function metaDecorator(WrappedComponent) {
         event.preventDefault();
         event.stopPropagation();
         var parentId = (_a = _this.props.data) === null || _a === void 0 ? void 0 : _a.parentId;
-        var conentId = (_b = _this.props.data) === null || _b === void 0 ? void 0 : _b.contentId;
-        var metaId = (_c = _this.props.data) === null || _c === void 0 ? void 0 : _c.id;
+        var metaId = (_b = _this.props.data) === null || _b === void 0 ? void 0 : _b.id;
         var floorId = null; // group中的元组件
 
         if (parentId) {
@@ -93,8 +92,7 @@ function metaDecorator(WrappedComponent) {
         _mobx.store.setState({
           clickedMeta: metaId,
           clickedGroup: parentId,
-          clickedFloor: floorId,
-          clickedMetaParent: conentId
+          clickedFloor: floorId
         });
       };
 

package/es/mobx/Store.js

@@ -14,7 +14,7 @@ var _storeUtil = require("../utils/storeUtil");
 var debug = require('debug')('worker:mobx');
 
 var CACHE_KEY = 'STORE';
-var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedMetaParent', 'clickedFloor', 'textSelection', 'MPageData'];
+var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'textSelection', 'MPageData'];
 
 var Store =
 /** @class */
@@ -28,8 +28,6 @@ function () {
 
     this.clickedGroup = ''; // 点击的元组的上一层Id,即groupSourceId(元组件在Group中)
 
-    this.clickedMetaParent = ''; // 点击的元组的上一层Id(元组件不在Group中，Recommend组件)
-
     this.clickedFloor = ''; // 点击的楼层Id
 
     this.textSelection = null; // 文本元组件选中区域
@@ -44,7 +42,6 @@ function () {
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
       clickedGroup: _mobx.observable,
-      clickedMetaParent: _mobx.observable,
       clickedFloor: _mobx.observable,
       CarouselStore: _mobx.observable,
       setState: _mobx.action.bound

package/lib/common/Collapse/index.js

@@ -94,19 +94,7 @@ function (_super) {
         return;
       }
 
-      var activeItem = source.find(function (src) {
-        return src.active;
-      });
-
-      if (activeItem) {
-        actives.push(activeItem.key);
-
-        _this.setState({
-          activeKey: actives
-        });
-
-        return;
-      } else if (type === 'switch') {
+      if (type === 'switch') {
         var first = source.find(function (src) {
           var _a;
 
@@ -120,6 +108,13 @@ function (_super) {
 
           actives.push(((_b = first.metaOption) === null || _b === void 0 ? void 0 : _b.id) || first.key);
         }
+      } else if (type === 'triangle' && _mobx.store.clickedMeta && !_mobx.store.clickedGroup) {
+        var activeItem = source.find(function (src) {
+          var _a, _b;
+
+          return JSON.stringify(((_b = (_a = src.value) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.panelProps) || '').includes(_mobx.store.clickedMeta);
+        });
+        actives.push(activeItem === null || activeItem === void 0 ? void 0 : activeItem.key);
       } else {
         var first = source.find(function (src) {
           var _a;

package/lib/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -152,16 +152,13 @@ exports.recommendGroupSourceJSON = recommendGroupSourceJSON;
 
 var getDefaultJSON = function getDefaultJSON() {
   var groupId = (0, _uuid.v4)();
-  var contentId = (0, _uuid.v4)();
   return {
     id: groupId,
     type: 'RECOMMEND',
     groupSource: [recommendGroupSourceJSON(groupId, '', 'Tab1'), recommendGroupSourceJSON(groupId, '', 'Tab2')],
     content: {
-      id: contentId,
       label: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -204,7 +201,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       productName: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
@@ -228,7 +224,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       activityPrice: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
@@ -252,7 +247,6 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       salesPrice: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],

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

@@ -25,8 +25,6 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _locale = require("../../../../locale");
 
-var _mobx = require("../../../../mobx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -81,10 +79,6 @@ function (_super) {
       _this.selfRender();
     };
 
-    _this.getIsContentActive = function (content) {
-      return JSON.stringify(content).includes(_mobx.store.clickedMetaParent);
-    };
-
     return _this;
   }
 
@@ -106,8 +100,7 @@ function (_super) {
         name: (0, _locale.i18n)('CONTENT'),
         value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigContent["default"], {
           panelProps: data.content
-        }),
-        active: this.getIsContentActive(data.content)
+        })
       }, {
         key: '3',
         name: (0, _locale.i18n)('SPACING'),

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

@@ -83,19 +83,19 @@ function (_super) {
       _this.setState({
         clickedGroup: _mobx.store.clickedGroup,
         selectedNode: selectedNode
-      }); // 展开以及面板
+      }); // 展开一级面板
 
 
       if (selectedNode) {
         _this.openConfig();
       } else {
         _this.closeConfig();
-      } // 展开首期二级面板
+      } // 展开二级面板
 
 
-      if (!_mobx.store.clickedGroup) {
+      if (!_mobx.store.clickedGroup && _this.preClickedGroup) {
         _this.closeSecConfig();
-      } else if (_mobx.store.clickedGroup !== _this.preClickedGroup) {
+      } else if (Boolean(_mobx.store.clickedGroup) != Boolean(_this.preClickedGroup)) {
         _this.openSecConfig();
       }
 
@@ -294,7 +294,9 @@ function (_super) {
   };
 
   ConfigPanel.prototype.componentWillReceiveProps = function (nextProps) {
-    this.resetState(nextProps, _mobx.store.clickedFloor);
+    if (JSON.stringify(this.props) !== JSON.stringify(nextProps)) {
+      this.resetState(nextProps, _mobx.store.clickedFloor);
+    }
   };
 
   ConfigPanel.prototype.componentWillUnmount = function () {

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

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _mobx = require("../../../mobx");
+
 var _Button = _interopRequireDefault(require("../../../common/Button"));
 
 var _Iconfont = _interopRequireDefault(require("../../../common/Iconfont"));
@@ -80,9 +82,13 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.onBtnClick = function (event) {
-      var code = event.currentTarget.dataset.code; // if (code === quickMenuCode.SAVE || code === quickMenuCode.PUBLISH) {
-      //   store.setState({ clickedFloor: '' });
-      // }
+      var code = event.currentTarget.dataset.code; // 保存和发布时需要清空组件和元组件的选中状态，否则截图中会看到选中状态
+
+      if (code === _constants.quickMenuCode.SAVE || code === _constants.quickMenuCode.PUBLISH) {
+        _mobx.store.setState({
+          clickedFloor: ''
+        });
+      }
 
       if (_this.props.device === _constants.deviceTypeMap.PC) {}
 

package/lib/decorator/metaDecorator.js

@@ -69,7 +69,7 @@ function metaDecorator(WrappedComponent) {
       }; // 元组件点击事件
 
       _this.onMetaClick = function (event) {
-        var _a, _b, _c;
+        var _a, _b;
 
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -79,8 +79,7 @@ function metaDecorator(WrappedComponent) {
         event.preventDefault();
         event.stopPropagation();
         var parentId = (_a = _this.props.data) === null || _a === void 0 ? void 0 : _a.parentId;
-        var conentId = (_b = _this.props.data) === null || _b === void 0 ? void 0 : _b.contentId;
-        var metaId = (_c = _this.props.data) === null || _c === void 0 ? void 0 : _c.id;
+        var metaId = (_b = _this.props.data) === null || _b === void 0 ? void 0 : _b.id;
         var floorId = null; // group中的元组件
 
         if (parentId) {
@@ -93,8 +92,7 @@ function metaDecorator(WrappedComponent) {
         _mobx.store.setState({
           clickedMeta: metaId,
           clickedGroup: parentId,
-          clickedFloor: floorId,
-          clickedMetaParent: conentId
+          clickedFloor: floorId
         });
       };
 

package/lib/mobx/Store.js

@@ -14,7 +14,7 @@ var _storeUtil = require("../utils/storeUtil");
 var debug = require('debug')('worker:mobx');
 
 var CACHE_KEY = 'STORE';
-var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedMetaParent', 'clickedFloor', 'textSelection', 'MPageData'];
+var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'textSelection', 'MPageData'];
 
 var Store =
 /** @class */
@@ -28,8 +28,6 @@ function () {
 
     this.clickedGroup = ''; // 点击的元组的上一层Id,即groupSourceId(元组件在Group中)
 
-    this.clickedMetaParent = ''; // 点击的元组的上一层Id(元组件不在Group中，Recommend组件)
-
     this.clickedFloor = ''; // 点击的楼层Id
 
     this.textSelection = null; // 文本元组件选中区域
@@ -44,7 +42,6 @@ function () {
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
       clickedGroup: _mobx.observable,
-      clickedMetaParent: _mobx.observable,
       clickedFloor: _mobx.observable,
       CarouselStore: _mobx.observable,
       setState: _mobx.action.bound

package/package.json

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