@fonixtree/magic-design 0.0.70 → 0.0.72

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

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var _lodash = require("lodash");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
@@ -16,25 +14,24 @@ 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;
@@ -44,50 +41,47 @@ 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 (callback) {
-      _this.step -= 1;
 
-      _this.doAction(callback);
+    this.redo = function () {
+      debug('redo click');
+      var newCursor = _this.cursor - 1;
+      _this.cursor = newCursor;
+      var newData = _this.list[newCursor];
+      return newData;
     };
     /**
-      * undo操作只修改当前的游标+1
-      * 并且返回前一步的json对象
-      */
-
+     * undo操作只修改当前的游标+1
+     * 并且返回前一步的json对象
+     */
 
-    this.undo = function (callback) {
-      _this.step += 1;
 
-      _this.doAction(callback);
+    this.undo = function () {
+      debug('undo click');
+      var newCursor = _this.cursor + 1;
+      _this.cursor = newCursor;
+      var newData = _this.list[newCursor];
+      return newData;
     };
 
-    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 = [(0, _cloneDeep["default"])(hist)];
+    this.list = [hist];
   }
 
   return History;

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

@@ -245,14 +245,6 @@ 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", {
@@ -270,7 +262,7 @@ function PageCompList(_a) {
     className: "list mt16"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "inner-list"
-  }, /*#__PURE__*/_react["default"].createElement("div", null, activeComponents.length > 0 && activeComponents.map(function (comp, i) {
+  }, /*#__PURE__*/_react["default"].createElement("div", null, components.length > 0 && components.map(function (comp, i) {
     return renderCard(comp, i);
   }))))));
 }

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

@@ -121,19 +121,19 @@
       display: block;
     }
   }
+}
 
-  &.active {
-    background: #E9F0FF;
-    color: #2F54EB;
+.active {
+  background: #E9F0FF;
+  color: #2F54EB;
 
-    .left {
-      .card-title {
-        font-weight: 600;
-      }
+  .left {
+    .card-title {
+      font-weight: 600;
     }
+  }
 
-    .more-btn {
-      display: block;
-    }
+  .more-btn {
+    display: block;
   }
 }

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

@@ -82,7 +82,7 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.onBtnClick = function (event) {
-      var code = event.currentTarget.dataset.code; // 保存和发布时需要清空组件和元组件的选中状态，否则截图中会看到选中状态
+      var code = event.currentTarget.dataset.code;
 
       if (code === _constants.quickMenuCode.SAVE || code === _constants.quickMenuCode.PUBLISH) {
         _mobx.store.setState({

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

@@ -17,12 +17,10 @@ var _constants = require("../../../constants");
 
 var _componentTypes = require("../../../constants/component-types");
 
-var _mobx = require("../../../mobx");
-
-var _coreUtil = require("../../../utils/coreUtil");
-
 require("./index.less");
 
+var _mobx = require("../../../mobx");
+
 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; }
@@ -88,22 +86,10 @@ 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);
-        });
-      }
+    };
 
-      return source;
+    _this.renderView = function () {
+      _this.setState({});
     };
 
     return _this;
@@ -139,7 +125,7 @@ function (_super) {
       style: {
         background: window.magicDesign.pageBackground
       }
-    }, this.filterCompFloor(pageData).map(function (nodeData) {
+    }, pageData && pageData.map(function (nodeData) {
       var Clazz = _componentTypes.componentMap[nodeData.type];
 
       if (!Clazz) {

package/es/core/Designer/index.js

@@ -97,13 +97,11 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   return r;
 };
 
-window.magicDesign = {
-  mode: 'designer',
-  device: _constants.deviceTypeMap.PHONE
-};
-
 var setDesignConfig = function setDesignConfig(data) {
-  window.magicDesign = __assign(__assign(__assign({}, window.magicDesign), data), {
+  window.magicDesign = __assign(__assign({
+    mode: 'designer',
+    device: _constants.deviceTypeMap.PHONE
+  }, data), {
     MBaseUrl: data.MBaseUrl || ''
   });
 };
@@ -171,16 +169,14 @@ function (_super) {
       _this.configRef.current.closeMobileConfig();
     };
 
-    _this.reRenderViewArea = function (e) {
-      if (e.changeHistory) {
-        _this.history.push(_this.state.MPageData);
+    _this.reRenderViewArea = function () {
+      if (!_this.viewAreaRef || !_this.viewAreaRef.current) {
+        return;
       }
 
-      _mobx.store.setState({
-        MPageData: _this.state.MPageData
-      });
+      _this.history.push(_this.state.MPageData);
 
-      _this.setState({});
+      _this.viewAreaRef.current.renderView();
     };
 
     _this.componentClick = function (event) {
@@ -190,12 +186,12 @@ function (_super) {
     };
     /**
      * 楼层 的 新增、删除、拷贝、顺序调整、属性修改时调用
-     * @param {*} newPageData 模版信息
+     * @param {*} pageData 模版信息
      */
 
 
-    _this.setPageData = function (newPageData) {
-      var MPageData = _this.history.push(newPageData);
+    _this.setPageData = function (pageData) {
+      var MPageData = _this.history.push(pageData);
 
       _this.setState({
         MPageData: MPageData
@@ -251,8 +247,7 @@ function (_super) {
     };
 
     _this.addComponent = function (_a) {
-      var type = _a.type,
-          terminalType = _a.terminalType;
+      var type = _a.type;
       var MPageData = _this.state.MPageData;
       var compType = _componentTypes.componentMap[type];
 
@@ -263,10 +258,7 @@ function (_super) {
 
       var compInst = compType.getDefaultJSON();
 
-      var newData = __spreadArrays(MPageData, [__assign(__assign({}, compInst), {
-        terminalType: terminalType,
-        activeTerminal: terminalType
-      })]);
+      var newData = __spreadArrays(MPageData, [compInst]);
 
       _this.history.push(newData);
 
@@ -306,24 +298,18 @@ function (_super) {
         device: device
       };
 
-      var callback = function callback(newPageData) {
-        _mobx.store.setState({
-          MPageData: newPageData
-        });
-
-        _this.setState({
-          MPageData: newPageData
-        });
-      };
-
       switch (code) {
         case _constants.quickMenuCode.UNDO:
-          _this.history.undo(callback);
+          _this.setState({
+            MPageData: _this.history.undo()
+          });
 
           break;
 
         case _constants.quickMenuCode.REDO:
-          _this.history.redo(callback);
+          _this.setState({
+            MPageData: _this.history.redo()
+          });
 
           break;
 
@@ -349,6 +335,8 @@ function (_super) {
 
           break;
       }
+
+      console.log(JSON.stringify(handleParams.pageData));
     };
 
     _this.renderHeader = function () {
@@ -365,20 +353,27 @@ function (_super) {
         config = props.config,
         locale = props.locale;
     var MPageData = pageData.childNodes || [];
-    _this.configRef = /*#__PURE__*/_react["default"].createRef(); // this.viewAreaRef = React.createRef();
 
-    _this.compListRef = /*#__PURE__*/_react["default"].createRef();
-    _this.history = new _History["default"](MPageData);
+    _mobx.store.setState({
+      MPageData: MPageData
+    });
+    /** 使用默认国际化 */
+    // if (!store.locale) {
+
 
     _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;
   }
@@ -403,7 +398,6 @@ function (_super) {
     var pageData = nextProps.pageData,
         config = nextProps.config;
     var MPageData = pageData.childNodes || [];
-    this.history = new _History["default"](MPageData);
     this.setState({
       MPageData: MPageData
     });
@@ -412,6 +406,7 @@ function (_super) {
       MPageData: MPageData
     });
 
+    this.history = new _History["default"](MPageData);
     setDesignConfig(config);
   };
 
@@ -472,8 +467,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,8 +9,6 @@ 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 () {
@@ -50,27 +48,14 @@ var setDesignConfig = function setDesignConfig(props) {
 
 var Renderer = function Renderer(props) {
   var pageData = props.pageData;
-  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;
-  };
-
+  setDesignConfig(props);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "render_wrap",
     magic_design: "",
     style: {
       background: window.magicDesign.pageBackground
     }
-  }, filterCompFloor().map(function (nodeData) {
+  }, pageData && pageData.childNodes && pageData.childNodes.map(function (nodeData) {
     var Clazz = _componentTypes.componentMap[nodeData.type];
 
     if (!Clazz) {

package/es/decorator/compositeDecorator.js

@@ -41,22 +41,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 function compositeDecorator(WrappedComponent) {
   var Wrapper =
   /** @class */
@@ -90,43 +74,26 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.getStyle = function () {
-        var wrapStyle = {
+        var style = {
           border: 'none'
-        };
-        var _a = window.magicDesign,
-            device = _a.device,
-            mode = _a.mode;
-        var nodeData = _this.props.nodeData;
-        var spacing = nodeData.spacing,
-            background = nodeData.background; // 处理复合组件的选中状态
-
-        if (mode === 'designer') {
+        }; // 处理复合组件的选中状态
+
+        if (window.magicDesign.mode === 'designer') {
           // style.border = '1px solid transparent';
-          wrapStyle.border = 'none';
+          style.border = 'none';
 
-          if (nodeData.id === _this.state.clickedFloor) {
-            wrapStyle.border = '1px dashed red';
+          if (_this.props.nodeData.id === _this.state.clickedFloor) {
+            style.border = '1px dashed red';
           }
-        } // 边距
-
+        } // 处理复合组件的下边距
 
-        if (spacing && spacing[device]) {
-          wrapStyle = __assign(__assign({}, wrapStyle), spacing[device]);
-        } // 背景
 
-
-        if (background) {
-          if (background.bgType === 'color') {
-            wrapStyle.backgroundColor = background.color;
-            wrapStyle.opacity = background.opacity ? background.opacity : 1;
-          } else {
-            wrapStyle.backgroundImage = "url(" + background.image + ")";
-            wrapStyle.backgroundPosition = 'center';
-            wrapStyle.backgroundSize = 'cover';
-          }
+        if (Wrapper.type !== 'DIVIDER') {
+          var rate = window.magicDesign.device === 'pc' ? 1.5 : 1;
+          style.marginBottom = Number(window.magicDesign.compSpacing) * rate + "px";
         }
 
-        return wrapStyle;
+        return style;
       };
 
       return _this;

package/es/decorator/index.js

@@ -15,17 +15,9 @@ Object.defineProperty(exports, "metaDecorator", {
     return _metaDecorator["default"];
   }
 });
-Object.defineProperty(exports, "updateConfigDecorator", {
-  enumerable: true,
-  get: function get() {
-    return _updateConfigDecorator["default"];
-  }
-});
 
 var _compositeDecorator = _interopRequireDefault(require("./compositeDecorator"));
 
 var _metaDecorator = _interopRequireDefault(require("./metaDecorator"));
 
-var _updateConfigDecorator = _interopRequireDefault(require("./updateConfigDecorator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/es/decorator/metaDecorator.js

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

package/es/locale/en/en.json

@@ -1,18 +1,4 @@
 {
-  "SEARCH_BOX": "Search Box",
-  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
-  "SHOPPING_CART": "Shopping Cart",
-  "ADD_BUTTON": "Add Button",
-  "BUTTON_TAG": "Button Tag",
-  "ADD_TAG": "Add Tag",
-  "LAST_CATEGORY": "Last Category",
-  "SECONDARY_CATEGORY": "Secondary Category",
-  "FIRST_CATEGORY": "First Category",
-  "ALL_CATEGORY": "All Category",
-  "HOME": "Home",
-  "ADD_CLICKABLE_AREA": "Add Clickable Area",
-  "ADD_AREA": "Add Area",
-  "CLICKABLE_AREA": "Clickable Area",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
@@ -98,6 +84,7 @@
   "INPUT_FIELD": "Input Field",
   "CONFIRMATION": "Confirmation",
   "IMAGE_TAG": "Image Tag",
+  "BUTTON_TAG": "Button Tag",
   "SECONDARY_BUTTON_TAG": "Secondary Button Tag",
   "TITLE": "Title",
   "HOVER": "Hover",

package/es/locale/es/es.json

@@ -1,18 +1,4 @@
 {
-  "SEARCH_BOX": "Search Box",
-  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
-  "SHOPPING_CART": "Shopping Cart",
-  "ADD_BUTTON": "Add Button",
-  "BUTTON_TAG": "Etiqueta de botón",
-  "ADD_TAG": "Add Tag",
-  "LAST_CATEGORY": "Last Category",
-  "SECONDARY_CATEGORY": "Secondary Category",
-  "FIRST_CATEGORY": "First Category",
-  "ALL_CATEGORY": "All Category",
-  "HOME": "Home",
-  "ADD_CLICKABLE_AREA": "Add Clickable Area",
-  "ADD_AREA": "Add Area",
-  "CLICKABLE_AREA": "Clickable Area",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Guardar",
@@ -98,6 +84,7 @@
   "INPUT_FIELD": "Campo de entrada",
   "CONFIRMATION": "Confirmación",
   "IMAGE_TAG": "Etiqueta de imagen",
+  "BUTTON_TAG": "Etiqueta de botón",
   "SECONDARY_BUTTON_TAG": "Etiqueta de botón secundario",
   "TITLE": "Título",
   "HOVER": "Hover",

package/es/locale/id/id.json

@@ -1,18 +1,4 @@
 {
-  "SEARCH_BOX": "Search Box",
-  "PLEASE_INPUT_KEYWORDS": "Please input keywords",
-  "SHOPPING_CART": "Shopping Cart",
-  "ADD_BUTTON": "Add Button",
-  "BUTTON_TAG": "Button Tag",
-  "ADD_TAG": "Add Tag",
-  "LAST_CATEGORY": "Last Category",
-  "SECONDARY_CATEGORY": "Secondary Category",
-  "FIRST_CATEGORY": "First Category",
-  "ALL_CATEGORY": "All Category",
-  "HOME": "Home",
-  "ADD_CLICKABLE_AREA": "Add Clickable Area",
-  "ADD_AREA": "Add Area",
-  "CLICKABLE_AREA": "Clickable Area",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
@@ -98,6 +84,7 @@
   "INPUT_FIELD": "Input Field",
   "CONFIRMATION": "Confirmation",
   "IMAGE_TAG": "Image Tag",
+  "BUTTON_TAG": "Button Tag",
   "SECONDARY_BUTTON_TAG": "Secondary Button Tag",
   "TITLE": "Title",
   "HOVER": "Hover",