@antv/l7-component 2.16.0 → 2.16.1

package/lib/control/baseControl/buttonControl.js

@@ -1,35 +1,55 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ButtonControl = void 0;
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _control = _interopRequireDefault(require("./control"));
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 var ButtonControl = /*#__PURE__*/function (_Control) {
   (0, _inherits2.default)(ButtonControl, _Control);
+
   var _super = _createSuper(ButtonControl);
+
   function ButtonControl() {
     var _this;
+
     (0, _classCallCheck2.default)(this, ButtonControl);
+
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDisable", false);
     return _this;
   }
+
   (0, _createClass2.default)(ButtonControl, [{
     key: "setIsDisable",
     value:
@@ -39,11 +59,14 @@ var ButtonControl = /*#__PURE__*/function (_Control) {
      */
     function setIsDisable(newIsDisable) {
       this.isDisable = newIsDisable;
+
       if (newIsDisable) {
         var _this$button;
+
         (_this$button = this.button) === null || _this$button === void 0 ? void 0 : _this$button.setAttribute('disabled', 'true');
       } else {
         var _this$button2;
+
         (_this$button2 = this.button) === null || _this$button2 === void 0 ? void 0 : _this$button2.removeAttribute('disabled');
       }
     }
@@ -59,9 +82,9 @@ var ButtonControl = /*#__PURE__*/function (_Control) {
       this.button = this.createButton();
       this.isDisable = false;
       var _this$controlOption = this.controlOption,
-        title = _this$controlOption.title,
-        btnText = _this$controlOption.btnText,
-        btnIcon = _this$controlOption.btnIcon;
+          title = _this$controlOption.title,
+          btnText = _this$controlOption.btnText,
+          btnIcon = _this$controlOption.btnIcon;
       this.setBtnTitle(title);
       this.setBtnText(btnText);
       this.setBtnIcon(btnIcon);
@@ -73,92 +96,112 @@ var ButtonControl = /*#__PURE__*/function (_Control) {
       this.button = this.buttonIcon = this.buttonText = undefined;
       this.isDisable = false;
     }
-
     /**
      * 更新配置方法
      * @param newOptions
      */
+
   }, {
     key: "setOptions",
     value: function setOptions(newOptions) {
       var title = newOptions.title,
-        btnText = newOptions.btnText,
-        btnIcon = newOptions.btnIcon;
+          btnText = newOptions.btnText,
+          btnIcon = newOptions.btnIcon;
+
       if (this.checkUpdateOption(newOptions, ['title'])) {
         this.setBtnTitle(title);
       }
+
       if (this.checkUpdateOption(newOptions, ['btnIcon'])) {
         this.setBtnIcon(btnIcon);
       }
+
       if (this.checkUpdateOption(newOptions, ['btnText'])) {
         this.setBtnText(btnText);
       }
+
       (0, _get2.default)((0, _getPrototypeOf2.default)(ButtonControl.prototype), "setOptions", this).call(this, newOptions);
     }
-
     /**
      * 设置按钮 title
      * @param title
      */
+
   }, {
     key: "setBtnTitle",
     value: function setBtnTitle(title) {
       var _this$button3;
+
       (_this$button3 = this.button) === null || _this$button3 === void 0 ? void 0 : _this$button3.setAttribute('title', title !== null && title !== void 0 ? title : '');
     }
-
     /**
      * 设置按钮 Icon
      * @param newIcon
      */
+
   }, {
     key: "setBtnIcon",
     value: function setBtnIcon(newIcon) {
       if (this.buttonIcon) {
         _l7Utils.DOM.remove(this.buttonIcon);
       }
+
       if (newIcon) {
         var _this$button4;
+
         var firstChild = (_this$button4 = this.button) === null || _this$button4 === void 0 ? void 0 : _this$button4.firstChild;
+
         if (firstChild) {
           var _this$button5;
+
           (_this$button5 = this.button) === null || _this$button5 === void 0 ? void 0 : _this$button5.insertBefore(newIcon, firstChild);
         } else {
           var _this$button6;
+
           (_this$button6 = this.button) === null || _this$button6 === void 0 ? void 0 : _this$button6.appendChild(newIcon);
         }
+
         this.buttonIcon = newIcon;
       }
     }
-
     /**
      * 设置按钮文本
      * @param newText
      */
+
   }, {
     key: "setBtnText",
     value: function setBtnText(newText) {
       if (!this.button) {
         return;
       }
+
       _l7Utils.DOM.removeClass(this.button, 'l7-button-control--row');
+
       _l7Utils.DOM.removeClass(this.button, 'l7-button-control--column');
+
       if (newText) {
         var btnText = this.buttonText;
+
         if (!btnText) {
           var _this$button7;
+
           btnText = _l7Utils.DOM.create('div', 'l7-button-control__text');
           (_this$button7 = this.button) === null || _this$button7 === void 0 ? void 0 : _this$button7.appendChild(btnText);
           this.buttonText = btnText;
         }
+
         btnText.innerText = newText;
+
         _l7Utils.DOM.addClass(this.button, this.controlOption.vertical ? 'l7-button-control--column' : 'l7-button-control--row');
       } else if (!newText && this.buttonText) {
         _l7Utils.DOM.remove(this.buttonText);
+
         this.buttonText = undefined;
       }
     }
   }]);
   return ButtonControl;
 }(_control.default);
+
 exports.default = exports.ButtonControl = ButtonControl;

package/lib/control/baseControl/control.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,73 +13,95 @@ Object.defineProperty(exports, "PositionType", {
   }
 });
 exports.default = void 0;
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 var Control = /*#__PURE__*/function (_ref) {
   (0, _inherits2.default)(Control, _ref);
+
   var _super = _createSuper(Control);
+
   /**
    * 当前类型控件实例个数
    * @protected
    */
-
   function Control(option) {
     var _this;
+
     (0, _classCallCheck2.default)(this, Control);
     _this = _super.call(this);
     Control.controlCount++;
     _this.controlOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this.getDefault(option)), option || {});
     return _this;
   }
+
   (0, _createClass2.default)(Control, [{
     key: "getOptions",
     value: function getOptions() {
       return this.controlOption;
     }
-
     /**
      * 更新配置的方法，子类如果有自己的配置，也需要重写该方法
      * @param newOptions
      */
+
   }, {
     key: "setOptions",
     value: function setOptions(newOptions) {
       var defaultOptions = this.getDefault(newOptions);
       Object.entries(newOptions).forEach(function (_ref2) {
         var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-          key = _ref3[0],
-          value = _ref3[1];
+            key = _ref3[0],
+            value = _ref3[1];
+
         if (value === undefined) {
           newOptions[key] = defaultOptions[key];
         }
       });
+
       if ('position' in newOptions) {
         this.setPosition(newOptions.position);
       }
+
       if ('className' in newOptions) {
         this.setClassName(newOptions.className);
       }
+
       if ('style' in newOptions) {
         this.setStyle(newOptions.style);
       }
+
       this.controlOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.controlOption), newOptions);
     }
-
     /**
      * 当 Control 被添加至 Scene 中，被 controlService 调用的方法
      * @param sceneContainer
      */
+
   }, {
     key: "addTo",
     value: function addTo(sceneContainer) {
@@ -90,85 +113,95 @@ var Control = /*#__PURE__*/function (_ref) {
       this.configService = sceneContainer.get(_l7Core.TYPES.IGlobalConfigService);
       this.scene = sceneContainer.get(_l7Core.TYPES.ISceneService);
       this.sceneContainer = sceneContainer;
-      this.isShow = true;
+      this.isShow = true; // 初始化 container
 
-      // 初始化 container
       this.container = this.onAdd();
+
       _l7Utils.DOM.addClass(this.container, 'l7-control');
+
       var _this$controlOption = this.controlOption,
-        className = _this$controlOption.className,
-        style = _this$controlOption.style;
+          className = _this$controlOption.className,
+          style = _this$controlOption.style;
+
       if (className) {
         this.setClassName(className);
       }
+
       if (style) {
         this.setStyle(style);
-      }
-      // 将 container 插入容器中
+      } // 将 container 插入容器中
+
+
       this.insertContainer();
       this.emit('add', this);
       return this;
     }
-
     /**
      * 将控件移除时触发
      */
+
   }, {
     key: "remove",
     value: function remove() {
       if (!this.mapsService) {
         return this;
       }
+
       _l7Utils.DOM.remove(this.container);
+
       this.onRemove();
       this.emit('remove', this);
     }
-
     /**
      * Control 被添加的时候被调用，返回 Control 对应的 DOM 容器
      */
+
   }, {
     key: "onAdd",
     value: function onAdd() {
       return _l7Utils.DOM.create('div');
     }
-
     /**
      * Control 被移除时调用
      */
     // tslint:disable-next-line:no-empty
+
   }, {
     key: "onRemove",
     value: function onRemove() {}
-
     /**
      * 显示控件时触发
      */
+
   }, {
     key: "show",
     value: function show() {
       var container = this.container;
+
       _l7Utils.DOM.removeClass(container, 'l7-control--hide');
+
       this.isShow = true;
       this.emit('show', this);
     }
-
     /**
      * 隐藏控件时触发
      */
+
   }, {
     key: "hide",
     value: function hide() {
       var container = this.container;
+
       _l7Utils.DOM.addClass(container, 'l7-control--hide');
+
       this.isShow = false;
       this.emit('hide', this);
     }
-
     /**
      * 获取默认构造器参数
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "getDefault",
     value: function getDefault(option) {
@@ -178,19 +211,19 @@ var Control = /*#__PURE__*/function (_ref) {
         name: "".concat(Control.controlCount)
       };
     }
-
     /**
      * 获取当前控件对应的 DOM 容器
      */
+
   }, {
     key: "getContainer",
     value: function getContainer() {
       return this.container;
     }
-
     /**
      * 获取当前 Control 是否展示
      */
+
   }, {
     key: "getIsShow",
     value: function getIsShow() {
@@ -202,91 +235,101 @@ var Control = /*#__PURE__*/function (_ref) {
       // if map exists and event is not a keyboard event
       if (this.mapsService && e && e.screenX > 0 && e.screenY > 0) {
         var container = this.mapsService.getContainer();
+
         if (container !== null) {
           container.focus();
         }
       }
     }
-
     /**
      * 设置当前控件位置
      * @param position
      */
+
   }, {
     key: "setPosition",
     value: function setPosition() {
       var position = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _l7Core.PositionType.TOPLEFT;
       // 考虑组件的自动布局，需要销毁重建
       var controlService = this.controlService;
+
       if (controlService) {
         controlService.removeControl(this);
       }
+
       this.controlOption.position = position;
+
       if (controlService) {
         controlService.addControl(this, this.sceneContainer);
       }
+
       return this;
     }
-
     /**
      * 设置容器 container 的样式相关位置，包含 className
      * @param className
      */
+
   }, {
     key: "setClassName",
     value: function setClassName(className) {
       var container = this.container;
       var oldClassName = this.controlOption.className;
+
       if (oldClassName) {
         _l7Utils.DOM.removeClass(container, oldClassName);
       }
+
       if (className) {
         _l7Utils.DOM.addClass(container, className);
       }
     }
-
     /**
      * 设置容器 container 的样式相关位置，包含 style
      * @param style
      */
+
   }, {
     key: "setStyle",
     value: function setStyle(style) {
       var container = this.container;
+
       if (style) {
         container.setAttribute('style', style);
       } else {
         container.removeAttribute('style');
       }
     }
-
     /**
      * 将控件 DOM 插入到对应 position 的容器中
      * @protected
      */
+
   }, {
     key: "insertContainer",
     value: function insertContainer() {
       var position = this.controlOption.position;
       var container = this.container;
+
       if (position instanceof Element) {
         position.appendChild(container);
       } else {
         var corner = this.controlService.controlCorners[position];
-        if (position.indexOf('bottom') !== -1) {
+
+        if (['bottomleft', 'bottomright', 'righttop', 'rightbottom'].includes(position)) {
           corner.insertBefore(container, corner.firstChild);
         } else {
           corner.appendChild(container);
         }
       }
     }
-
     /**
      * 检查当前传入 option 是否包含 keys 字段
      * @param option
      * @param keys
      * @protected
      */
+
   }, {
     key: "checkUpdateOption",
     value: function checkUpdateOption(option, keys) {
@@ -297,5 +340,6 @@ var Control = /*#__PURE__*/function (_ref) {
   }]);
   return Control;
 }(_eventemitter.default);
+
 exports.default = exports.Control = Control;
 (0, _defineProperty2.default)(Control, "controlCount", 0);

package/lib/control/baseControl/index.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
 var _buttonControl = require("./buttonControl");
+
 Object.keys(_buttonControl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _buttonControl[key]) return;
@@ -14,7 +16,9 @@ Object.keys(_buttonControl).forEach(function (key) {
     }
   });
 });
+
 var _control = require("./control");
+
 Object.keys(_control).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _control[key]) return;
@@ -25,7 +29,9 @@ Object.keys(_control).forEach(function (key) {
     }
   });
 });
+
 var _popperControl = require("./popperControl");
+
 Object.keys(_popperControl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _popperControl[key]) return;
@@ -36,7 +42,9 @@ Object.keys(_popperControl).forEach(function (key) {
     }
   });
 });
+
 var _selectControl = require("./selectControl");
+
 Object.keys(_selectControl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _selectControl[key]) return;