@fonixtree/magic-design 0.0.58 → 0.0.61

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

@@ -54,7 +54,6 @@ function () {
       _this.list.splice(0, _this.cursor, cloneData);
 
       _this.cursor = 0;
-      console.log('list', _this.list);
       return data;
     };
     /**
@@ -81,7 +80,6 @@ function () {
     };
 
     this.doAction = (0, _lodash.debounce)(function (callback) {
-      console.log(_this.step);
       var newCursor = _this.cursor + _this.step;
       _this.cursor = newCursor;
       var newData = (0, _cloneDeep["default"])(_this.list[newCursor]);

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

@@ -245,6 +245,14 @@ function PageCompList(_a) {
     })));
   };
 
+  var getActiveComponents = function getActiveComponents() {
+    var filter = components.filter(function (comp) {
+      return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
+    });
+    return filter;
+  };
+
+  var activeComponents = getActiveComponents();
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "page-comp-wrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -262,7 +270,7 @@ function PageCompList(_a) {
     className: "list mt16"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "inner-list"
-  }, /*#__PURE__*/_react["default"].createElement("div", null, components.length > 0 && components.map(function (comp, i) {
+  }, /*#__PURE__*/_react["default"].createElement("div", null, activeComponents.length > 0 && activeComponents.map(function (comp, i) {
     return renderCard(comp, i);
   }))))));
 }

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

@@ -17,10 +17,12 @@ var _constants = require("../../../constants");
 
 var _componentTypes = require("../../../constants/component-types");
 
-require("./index.less");
-
 var _mobx = require("../../../mobx");
 
+var _coreUtil = require("../../../utils/coreUtil");
+
+require("./index.less");
+
 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; }
@@ -86,10 +88,22 @@ function (_super) {
     _this.isPhoneEdit = function () {
       var device = _this.props.device;
       return device === _constants.deviceTypeMap.PHONE && !(0, _isEmpty["default"])(_this.state.clickedFloor);
-    };
+    }; // renderView = () => {
+    //   this.setState({});
+    // }
+    // 根据楼层展示设备进行过滤
+
+
+    _this.filterCompFloor = function (dataSource) {
+      var source = [];
+
+      if (dataSource && dataSource.length) {
+        source = dataSource.filter(function (node) {
+          return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
+        });
+      }
 
-    _this.renderView = function () {
-      _this.setState({});
+      return source;
     };
 
     return _this;
@@ -125,7 +139,7 @@ function (_super) {
       style: {
         background: window.magicDesign.pageBackground
       }
-    }, pageData && pageData.map(function (nodeData) {
+    }, this.filterCompFloor(pageData).map(function (nodeData) {
       var Clazz = _componentTypes.componentMap[nodeData.type];
 
       if (!Clazz) {

package/es/core/Designer/index.js

@@ -170,15 +170,15 @@ function (_super) {
     };
 
     _this.reRenderViewArea = function (e) {
-      if (!_this.viewAreaRef || !_this.viewAreaRef.current) {
-        return;
-      }
-
       if (e.changeHistory) {
         _this.history.push(_this.state.MPageData);
       }
 
-      _this.viewAreaRef.current.renderView();
+      _mobx.store.setState({
+        MPageData: _this.state.MPageData
+      });
+
+      _this.setState({});
     };
 
     _this.componentClick = function (event) {
@@ -188,12 +188,12 @@ function (_super) {
     };
     /**
      * 楼层 的 新增、删除、拷贝、顺序调整、属性修改时调用
-     * @param {*} pageData 模版信息
+     * @param {*} newPageData 模版信息
      */
 
 
-    _this.setPageData = function (pageData) {
-      var MPageData = _this.history.push(pageData);
+    _this.setPageData = function (newPageData) {
+      var MPageData = _this.history.push(newPageData);
 
       _this.setState({
         MPageData: MPageData
@@ -249,7 +249,8 @@ function (_super) {
     };
 
     _this.addComponent = function (_a) {
-      var type = _a.type;
+      var type = _a.type,
+          terminalType = _a.terminalType;
       var MPageData = _this.state.MPageData;
       var compType = _componentTypes.componentMap[type];
 
@@ -260,7 +261,10 @@ function (_super) {
 
       var compInst = compType.getDefaultJSON();
 
-      var newData = __spreadArrays(MPageData, [compInst]);
+      var newData = __spreadArrays(MPageData, [__assign(__assign({}, compInst), {
+        terminalType: terminalType,
+        activeTerminal: terminalType
+      })]);
 
       _this.history.push(newData);
 
@@ -359,27 +363,20 @@ function (_super) {
         config = props.config,
         locale = props.locale;
     var MPageData = pageData.childNodes || [];
+    _this.configRef = /*#__PURE__*/_react["default"].createRef(); // this.viewAreaRef = React.createRef();
 
-    _mobx.store.setState({
-      MPageData: MPageData
-    });
-    /** 使用默认国际化 */
-    // if (!store.locale) {
-
+    _this.compListRef = /*#__PURE__*/_react["default"].createRef();
+    _this.history = new _History["default"](MPageData);
 
     _mobx.store.setState({
+      MPageData: MPageData,
       locale: locale
-    }); // }
-
+    });
 
-    _this.configRef = /*#__PURE__*/_react["default"].createRef();
-    _this.viewAreaRef = /*#__PURE__*/_react["default"].createRef();
-    _this.compListRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       MPageData: MPageData,
       device: _constants.deviceTypeMap.PHONE
     };
-    _this.history = new _History["default"](MPageData);
     setDesignConfig(config);
     return _this;
   }
@@ -404,6 +401,7 @@ function (_super) {
     var pageData = nextProps.pageData,
         config = nextProps.config;
     var MPageData = pageData.childNodes || [];
+    this.history = new _History["default"](MPageData);
     this.setState({
       MPageData: MPageData
     });
@@ -412,7 +410,6 @@ function (_super) {
       MPageData: MPageData
     });
 
-    this.history = new _History["default"](MPageData);
     setDesignConfig(config);
   };
 
@@ -445,7 +442,6 @@ function (_super) {
         pagesManager = _b.pagesManager,
         compSource = _b.compSource,
         pageName = _b.pageName;
-    console.log('MPageData', MPageData);
     return /*#__PURE__*/_react["default"].createElement(_mobxReact.Provider, {
       store: _mobx.store
     }, /*#__PURE__*/_react["default"].createElement(_antd.ConfigProvider, {
@@ -474,8 +470,8 @@ function (_super) {
       device: device,
       onClose: this.onPropsPanelClose,
       pageData: MPageData
-    }), /*#__PURE__*/_react["default"].createElement(_ViewArea["default"], {
-      ref: this.viewAreaRef,
+    }), /*#__PURE__*/_react["default"].createElement(_ViewArea["default"] // ref={this.viewAreaRef}
+    , {
       device: device,
       pageData: MPageData,
       renderHeader: this.renderHeader

package/es/core/Renderer/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _componentTypes = require("../../constants/component-types");
 
+var _coreUtil = require("../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -48,14 +50,27 @@ var setDesignConfig = function setDesignConfig(props) {
 
 var Renderer = function Renderer(props) {
   var pageData = props.pageData;
-  setDesignConfig(props);
+  setDesignConfig(props); // 根据楼层展示设备进行过滤
+
+  var filterCompFloor = function filterCompFloor() {
+    var source = [];
+
+    if (pageData && pageData.childNodes && pageData.childNodes.length) {
+      source = pageData.childNodes.filter(function (node) {
+        return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
+      });
+    }
+
+    return source;
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "render_wrap",
     magic_design: "",
     style: {
       background: window.magicDesign.pageBackground
     }
-  }, pageData && pageData.childNodes && pageData.childNodes.map(function (nodeData) {
+  }, filterCompFloor().map(function (nodeData) {
     var Clazz = _componentTypes.componentMap[nodeData.type];
 
     if (!Clazz) {

package/es/decorator/compositeDecorator.js

@@ -126,7 +126,6 @@ function compositeDecorator(WrappedComponent) {
           }
         }
 
-        console.log('---wrapStyle', wrapStyle);
         return wrapStyle;
       };
 

package/es/decorator/updateConfigDecorator.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = metaDecorator;
+exports["default"] = updateConfigDecorator;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -41,7 +41,7 @@ var __extends = void 0 && (void 0).__extends || function () {
  */
 
 
-function metaDecorator(WrappedComponent) {
+function updateConfigDecorator(WrappedComponent) {
   var Wrapper =
   /** @class */
   function (_super) {

package/es/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
+  "SHOPPING_CART": "Shopping Cart",
   "ADD_BUTTON": "Add Button",
   "BUTTON_TAG": "Button Tag",
   "ADD_TAG": "Add Tag",

package/es/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
+  "SHOPPING_CART": "Shopping Cart",
   "ADD_BUTTON": "Add Button",
   "BUTTON_TAG": "Etiqueta de botón",
   "ADD_TAG": "Add Tag",

package/es/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
+  "SHOPPING_CART": "Shopping Cart",
   "ADD_BUTTON": "Add Button",
   "BUTTON_TAG": "Button Tag",
   "ADD_TAG": "Add Tag",

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

@@ -172,7 +172,7 @@ function (_super) {
       })
     }, (iconLayout === 'right' || iconLayout === 'bottom') && btnText, iconUrl && /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
-      className: "item",
+      className: "icon",
       src: iconUrl
     }), (iconLayout === 'left' || iconLayout === 'top') && btnText));
   };

package/es/meta-comp/components/Button/index.less

@@ -2,6 +2,7 @@
   transition: all 0.25s;
 
   .btnContent {
+    width: 100%;
     cursor: pointer;
     display: inline-flex;
     align-items: center;
@@ -12,6 +13,10 @@
       flex-direction: row;
     }
 
+    .item {
+      width: 100%;
+    }
+
     img {
       height: 20px;
       margin: 0 5px;

package/es/mobx/Store.js

@@ -13,6 +13,9 @@ var _storeUtil = require("../utils/storeUtil");
 
 var debug = require('debug')('worker:mobx');
 
+var CACHE_KEY = 'STORE';
+var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'textSelection', 'MPageData'];
+
 var Store =
 /** @class */
 function () {
@@ -55,6 +58,7 @@ function () {
     propertyList.forEach(function (field) {
       _this[field] = data[field];
     });
+    (0, _storeUtil.persistence)(CACHE_KEY, this, whiteList);
   };
   /**
    *根据groupId 获取楼层Id

package/es/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -33,6 +33,13 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var _this = void 0;
 
+/** 根据楼层设置的终端类型，判断是否展示该楼层 */
+var isActiveFloor = function isActiveFloor(activeTerminal) {
+  return activeTerminal === 'ALL' || activeTerminal === window.magicDesign.device.toUpperCase();
+};
+
+exports.isActiveFloor = isActiveFloor;
+
 var isDesignMode = function isDesignMode() {
   return window.magicDesign.mode === 'designer';
 };

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1667959188485') format('woff2'),
-       url('magic-box-iconfont.woff?t=1667959188485') format('woff'),
-       url('magic-box-iconfont.ttf?t=1667959188485') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
+       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
+       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-edit:before {
+  content: "\e72e";
+}
+
+.magic-box-icon-ChatDots:before {
+  content: "\e641";
+}
+
+.magic-box-icon-ShoppingCartSimple:before {
+  content: "\e640";
+}
+
+.magic-box-icon-select:before {
+  content: "\e65b";
+}
+
 .magic-box-icon-message:before {
   content: "\e7b0";
 }
@@ -21,7 +37,7 @@
   content: "\e63f";
 }
 
-.magic-box-icon-Mobile:before {
+.magic-box-icon-mobile:before {
   content: "\e63e";
 }
 
@@ -233,10 +249,6 @@
   content: "\e609";
 }
 
-.magic-box-icon-mobile:before {
-  content: "\e60a";
-}
-
 .magic-box-icon-menu:before {
   content: "\e60b";
 }

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1667959188485') format('woff2'),
-       url('magic-box-iconfont.woff?t=1667959188485') format('woff'),
-       url('magic-box-iconfont.ttf?t=1667959188485') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
+       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
+       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-edit:before {
+  content: "\e72e";
+}
+
+.icon-ChatDots:before {
+  content: "\e641";
+}
+
+.icon-ShoppingCartSimple:before {
+  content: "\e640";
+}
+
+.icon-select:before {
+  content: "\e65b";
+}
+
 .icon-message:before {
   content: "\e7b0";
 }
@@ -21,7 +37,7 @@
   content: "\e63f";
 }
 
-.icon-Mobile:before {
+.icon-mobile:before {
   content: "\e63e";
 }
 
@@ -233,10 +249,6 @@
   content: "\e609";
 }
 
-.icon-mobile:before {
-  content: "\e60a";
-}
-
 .icon-menu:before {
   content: "\e60b";
 }