bbj-screen-widget 2.4.67 → 2.4.69

package/bundles/bbj-screen-widget.umd.js

@@ -13948,50 +13948,12 @@
         };
         CustomBaiduMapComponent.prototype.ngOnInit = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (this.scale$) {
                                 // 这是为了解决地图缩放中心不在鼠标所在位置的问题
-                                this.scale$.pipe(operators.takeUntil(this.destroy$)).subscribe(function (scale) {
-                                    var sx = scale.x, sy = scale.y, scaleContent = scale.scaleContent;
-                                    var style = _this.element.style;
-                                    if (scaleContent === false) {
-                                        _this.zone.onStable.pipe(operators.take(1)).subscribe(function () {
-                                            var parent = _this.element.parentNode;
-                                            if (parent) {
-                                                var match = /translate\(([-\d.]+)px, ([-\d.]+)px\)/.exec(parent.style.transform);
-                                                if (match) {
-                                                    var offsetX = parseFloat(match[1]);
-                                                    var offsetY = parseFloat(match[2]);
-                                                    style.transform = "translate(" + -offsetX + "px," + -offsetY + "px)";
-                                                    style.height = parent.clientHeight + offsetY + 'px';
-                                                    style.width = parent.clientWidth + offsetX + 'px';
-                                                    style.padding = offsetY + "px 0 0 " + offsetX + "px";
-                                                    // this.containerStyle = {
-                                                    //   transformOrigin: `0 0`,
-                                                    //   transform: `translate(${-offsetX}px,${-offsetY}px)`,
-                                                    //   height: parent.clientHeight + offsetY + 'px',
-                                                    //   width: parent.clientWidth + offsetX + 'px',
-                                                    //   padding: `${offsetY}px 0 0 ${offsetX}px`,
-                                                    // };
-                                                }
-                                            }
-                                            // this.cd.markForCheck();
-                                        });
-                                    }
-                                    else {
-                                        var _a = _this.widgetRef.widget, position = _a.position, size = _a.size;
-                                        var x = position.x, y = position.y;
-                                        var width = size.width, height = size.height;
-                                        style.transform = "translate(" + -x + "px," + -y + "px) scale(" + 1 / sx + "," + 1 / sy + ")";
-                                        style.height = (y + height) * sy + 'px';
-                                        style.width = (x + width) * sx + 'px';
-                                        style.padding = y * sy + "px 0 0 " + x * sx + "px";
-                                    }
-                                    // this.cd.markForCheck();
-                                });
+                                i1.scaleAdapter(this.scale$, this.destroy$, this.zone, this.elementRef.nativeElement, this.widgetRef);
                             }
                             return [4 /*yield*/, this.initMap()];
                         case 1:
@@ -14384,7 +14346,7 @@
         { type: i0.Component, args: [{
                     selector: 'sc-custom-baidu-map',
                     template: "<ng-template *ngFor=\"let child of children\" widget-host [widget]=\"child\"></ng-template>\n\n<!-- {{children|json}} -->\n<!-- <div class=\"map-container\" [ngStyle]=\"containerStyle\"> -->\n<div #container class=\"map\"></div>\n<nz-radio-group\n  *ngIf=\"showMapTypeRadio\"\n  class=\"map-type-radio\"\n  [(ngModel)]=\"mapTypeValue\"\n  (ngModelChange)=\"mapTypeChange($event)\"\n  nzButtonStyle=\"solid\"\n>\n  <label *ngFor=\"let item of mapTypeEnum\" nz-radio-button [nzValue]=\"item.value\">{{ item.label }}</label>\n</nz-radio-group>\n<!-- </div> -->\n",
-                    styles: [":host{display:block;height:100%;width:100%;overflow:hidden;transform-origin:0 0;z-index:0;pointer-events:none}:host>*{pointer-events:auto}.map{height:100%;width:100%}:host::ng-deep .BMap_bubble_pop{background-color:var(--info-window-background,#fff)!important;border-color:var(--info-window-border-color,#ddd)!important}:host::ng-deep .BMap_bubble_content{color:var(--info-window-color,\"#555555\")!important}:host::ng-deep .BMap_pop div{background-color:var(--info-window-background,#fff)!important}:host::ng-deep .BMap_pop>div:nth-child(8){background-color:transparent!important}:host.hideInfoWindowTail::ng-deep .BMap_bubble_pop>img,:host.hideInfoWindowTail::ng-deep .BMap_pop>div:nth-child(8),:host::ng-deep .BMap_noprint.anchorTR,:host::ng-deep img[src$=\"/image/api/iws3.png\"]{display:none}:host.hideInfoWindowTop::ng-deep .BMap_bubble_pop{transform:translateY(31px)}:host.hideInfoWindowTop::ng-deep .BMap_bubble_pop>img{transform:translateY(-31px)}:host.hideInfoWindowTop::ng-deep .BMap_bubble_top,:host::ng-deep .anchorBL{display:none}.map-type-radio{position:absolute;bottom:20px;right:20px;z-index:10}"]
+                    styles: [":host{display:block;height:100%;width:100%;overflow:hidden;transform-origin:0 0;z-index:0;pointer-events:none;position:relative}:host>*{pointer-events:auto}.map{height:100%;width:100%}:host::ng-deep .BMap_bubble_pop{background-color:var(--info-window-background,#fff)!important;border-color:var(--info-window-border-color,#ddd)!important}:host::ng-deep .BMap_bubble_content{color:var(--info-window-color,\"#555555\")!important}:host::ng-deep .BMap_pop div{background-color:var(--info-window-background,#fff)!important}:host::ng-deep .BMap_pop>div:nth-child(8){background-color:transparent!important}:host.hideInfoWindowTail::ng-deep .BMap_bubble_pop>img,:host.hideInfoWindowTail::ng-deep .BMap_pop>div:nth-child(8),:host::ng-deep .BMap_noprint.anchorTR,:host::ng-deep img[src$=\"/image/api/iws3.png\"]{display:none}:host.hideInfoWindowTop::ng-deep .BMap_bubble_pop{transform:translateY(31px)}:host.hideInfoWindowTop::ng-deep .BMap_bubble_pop>img{transform:translateY(-31px)}:host.hideInfoWindowTop::ng-deep .BMap_bubble_top,:host::ng-deep .anchorBL{display:none}.map-type-radio{position:absolute;bottom:20px;right:20px;z-index:10}"]
                 },] }
     ];
     exports.ɵcy.ctorParameters = function () { return [
@@ -20556,85 +20518,1224 @@
         { type: bbjWidgetBase.WidgetService }
     ]; };
 
-    var ScreenWidgetModule = /** @class */ (function () {
-        function ScreenWidgetModule(widgetService) {
-            widgetService.register(exports.ɵp, { size: { width: 60, height: 30 } });
-            widgetService.register(exports.ɵx, {
-                size: { width: 200, height: 36 },
-                option: {
-                    borderColor: '#3285ff',
-                    background: 'rgba(50,133,255,0.2)',
-                    dropdownBackgroundColor: '#3285ff',
-                    selectDropDownColor: '#fff',
-                    selectHoverColor: '#fff',
-                    selectHoverBackgroundColor: '#3285ff',
-                    font: { color: '#ffffff' },
-                    dropdownBg: 'rgba(50,133,255,0.2)',
-                    dropdownBorderColor: '#3285ff',
-                },
+    exports.ɵeb = /** @class */ (function () {
+        function TiandituComponent(lazy, elementRef, zone, scale$, widgetRef) {
+            var _this = this;
+            this.lazy = lazy;
+            this.elementRef = elementRef;
+            this.zone = zone;
+            this.scale$ = scale$;
+            this.widgetRef = widgetRef;
+            this.coordinateType = 'BD-09';
+            //  @Property('地图类型', {
+            //     enum: MapTypeEnum,
+            //   })
+            //   mapType = 'normal';
+            //   mapTypeValue: string;
+            //   @Property('上传样式', { type: 'string', ui: { widget: 'myUploadAudio', visibleIf: { mapType: ['custom'] } } })
+            //   uploadStyle: string;
+            //   @Property('切换按钮')
+            //   showMapTypeRadio: boolean;
+            //   @Property('全景地图', { type: 'boolean' })
+            //   minMapShow = false;
+            //   @Property('显示信息', {
+            //     ui: { widget: 'select' },
+            //     enum: [
+            //       { label: '点击', value: 'click' },
+            //       { label: '悬停', value: 'mouseover' },
+            //     ],
+            //   })
+            //   showType = 'click';
+            //   @Property('信息窗背景', { ui: { widget: 'myColor' } })
+            //   infoWindowBackground: string;
+            //   @Property('信息窗字体', { ui: { widget: 'myColor' } })
+            //   infoWindowColor: string;
+            //   @Property('信息窗宽度')
+            //   infoWindowWidth: number;
+            //   @Property('信息窗高度')
+            //   infoWindowHeight: number;
+            //   @Property('信息窗模板', { ui: { widget: 'textarea' } })
+            //   infoWindowTemplate: string;
+            //   @Property('信息窗边框', {
+            //     ui: { widget: 'myColor' },
+            //     example: ['#ffffff', '#F5A623', '#F8E71C', '#50E3C2', '#3285FF', '#B45FFF', '#9B9B9B', null],
+            //   })
+            //   infoWindowBorderColor: string;
+            //   @Property('隐藏尖角')
+            //   @HostBinding('class.hideInfoWindowTail')
+            //   hideInfoWindowTail: boolean;
+            //   @Property('隐藏关闭按钮')
+            //   @HostBinding('class.hideInfoWindowTop')
+            //   hideInfoWindowTop: boolean;
+            this.dragging = true;
+            // @Property('遮罩颜色', {
+            //   ui: { widget: 'myColor' },
+            //   example: ['#ffffff', '#F5A623', '#F8E71C', '#50E3C2', '#3285FF', '#B45FFF', '#9B9B9B', null],
+            // })
+            // shadeColor = '#004395';
+            // @Property('背景颜色', {
+            //   ui: { widget: 'myColor' },
+            //   example: ['#ffffff', '#F5A623', '#F8E71C', '#50E3C2', '#3285FF', '#B45FFF', '#9B9B9B', null],
+            // })
+            // mapBackColor: string;
+            // @Property('多边线色', {
+            //   ui: { widget: 'myColor' },
+            //   example: ['#ffffff', '#F5A623', '#F8E71C', '#50E3C2', '#3285FF', '#B45FFF', '#9B9B9B', null],
+            // })
+            // mapCityColor = '#41b7ff';
+            this.zoom = 12;
+            // @Property('遮罩透明', { type: 'number' })
+            // fillOpacity = 0;
+            // @Property('多边线粗', { type: 'number' })
+            // strokesize = 2;
+            // @Property('黑夜模式', { type: 'boolean', ui: { hidden: true } })
+            // nightMode = false;
+            // @Property('3D视角')
+            // enable3D: boolean;
+            // @Property('定位控件')
+            // showLocationControl: boolean;
+            // @Property('初始角度', { type: 'number', ui: { visibleIf: { enable3D: [true] } } })
+            // tilt = 73;
+            // centerLng = 120.7;
+            // centerLat = 28;
+            // @Property('显示省市', {
+            //   ui: {
+            //     widget: 'myUrlSelect',
+            //     allowClear: true,
+            //     url: '/assets/mapListItem.json',
+            //   },
+            // })
+            // cityName = null;
+            this.data = [{ lng: 120.7, lat: 28 }];
+            this.dataChange = new i0.EventEmitter();
+            this.zoomChange = new i0.EventEmitter();
+            this.mapClick = new i0.EventEmitter();
+            this.destroy$ = new rxjs.Subject();
+            this.init$ = new Promise(function (resolve) {
+                _this.inited = resolve;
             });
-            for (var i = 1; i <= 82; i++) {
-                widgetService.register(exports.ɵb, {
-                    option: { image: "assets/img/screen/picture" + i + ".png" },
+        }
+        TiandituComponent.prototype.ngOnInit = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    i1.scaleAdapter(this.scale$, this.destroy$, this.zone, this.elementRef.nativeElement, this.widgetRef);
+                    this.initMap();
+                    return [2 /*return*/];
                 });
-            }
-            icons.forEach(function (icon) {
-                widgetService.register(exports.ɵbn, {
-                    option: { icon: icon },
+            });
+        };
+        TiandituComponent.prototype.initMap = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.lazy.loadScript('https://api.tianditu.gov.cn/api?v=4.0&tk=acbe009b9b9cc2c8f369b6415fc8dc99')];
+                        case 1:
+                            _a.sent();
+                            if (!this.destroyed) {
+                                this.zone.runOutsideAngular(function () {
+                                    _this.map = new T.Map(_this.container.nativeElement, {
+                                        center: _this.createLngLat(_this.centerLng, _this.centerLat),
+                                        zoom: _this.zoom,
+                                    });
+                                    // this.mapTypeChange(this.mapTypeValue);
+                                    if (_this.edit || _this.dragging === false) {
+                                        _this.map.disableDrag();
+                                    }
+                                    // if (this.enable3D) {
+                                    //   this.map.setTilt(this.tilt == null ? 73 : this.tilt, { noAnimation: true });
+                                    //   this.map.setDisplayOptions({ skyColors: ['rgba(0, 0, 0, 0)'] }); // 隐藏天空
+                                    //   // const navi3DCtrl = new BMapGL.NavigationControl3D(); // 添加3D控件
+                                    //   // this.map.addControl(navi3DCtrl);
+                                    // } else {
+                                    //   this.map.disableTilt();
+                                    //   this.map.disableRotate();
+                                    // }
+                                    // if (this.showLocationControl) {
+                                    //   const options = {
+                                    //     // 控件的停靠位置（可选，默认左上角）
+                                    //     anchor: BMAP_ANCHOR_TOP_LEFT,
+                                    //     // 控件基于停靠位置的偏移量（可选）
+                                    //     offset: new BMapGL.Size(20, 20),
+                                    //   };
+                                    //   let locationControl = new BMapGL.LocationControl(options);
+                                    //   // 将控件添加到地图上
+                                    //   this.map.addControl(locationControl);
+                                    // }
+                                    // if (this.minMapShow) {
+                                    //   const stCtrl = new BMapGL.PanoramaControl();
+                                    //   stCtrl.setOffset(new BMapGL.Size(20, 20));
+                                    //   this.map.addControl(stCtrl);
+                                    // }
+                                    // if (this.infoWindowBackground) {
+                                    //   this.element.style.setProperty('--info-window-background', this.infoWindowBackground);
+                                    // }
+                                    // if (this.infoWindowColor) {
+                                    //   this.element.style.setProperty('--info-window-color', this.infoWindowColor);
+                                    // }
+                                    // if (this.infoWindowBorderColor) {
+                                    //   this.element.style.setProperty('--info-window-border-color', this.infoWindowBorderColor);
+                                    // }
+                                    _this.map.addEventListener('moveend', function (event) {
+                                        var center = _this.map.getCenter();
+                                        _this.dataChange.emit(_this.transferCoordinate(center));
+                                    });
+                                    _this.map.addEventListener('click', function (event) {
+                                        console.log(event);
+                                        _this.mapClick.emit(_this.transferCoordinate(event.latlng));
+                                    });
+                                    _this.map.addEventListener('zoomend', function (event) {
+                                        _this.zoomChange.emit(_this.map.getZoom());
+                                        _this.dataChange.emit(_this.transferCoordinate(_this.map.getCenter()));
+                                    });
+                                    _this.mapLoaded(_this.map);
+                                });
+                                this.inited(this.map);
+                            }
+                            return [2 /*return*/];
+                    }
                 });
             });
-            widgetService.register(exports.ɵbi, {
-                className: 'big-title title',
-                title: '大标题',
-                option: {
-                    title: '大标题',
-                    font: { family: '', color: '#ffffff', weight: 'normal', size: 36, space: 0, lineHeight: 50 },
-                },
-            }, {
-                className: 'normal-title title',
-                title: '标题',
-                option: {
-                    title: '标题',
-                    font: { family: '', color: '#ffffff', weight: 'normal', size: 32, space: 0, lineHeight: 45 },
-                },
-            }, {
-                className: 'subtitle title',
-                title: '副标题',
-                option: {
-                    title: '副标题',
-                    font: { family: '', color: '#ffffff', weight: 'normal', size: 24, space: 0, lineHeight: 33 },
-                },
-            }, {
-                className: 'small-title title',
-                title: '小标题',
-                option: {
-                    title: '小标题',
-                    font: { family: '', color: '#ffffff', weight: 'normal', size: 16, space: 0, lineHeight: 22 },
-                },
-            }, {
-                className: 'content title',
-                title: '正文内容',
-                option: {
-                    title: '正文内容',
-                    font: { family: '', color: '#ffffff', weight: 'normal', size: 13, space: 0, lineHeight: 18 },
-                },
+        };
+        TiandituComponent.prototype.ngOnChanges = function (changes) {
+            if (changes.data && this.data[0]) {
+                this.centerLng = +this.data[0].lng;
+                this.centerLat = +this.data[0].lat;
+                this.setCenter(this.centerLng, this.centerLat);
+            }
+        };
+        TiandituComponent.prototype.ngOnDestroy = function () {
+            this.destroy$.next();
+            this.destroy$.complete();
+            this.destroyed = true;
+        };
+        TiandituComponent.prototype.createLngLat = function (lng, lat) {
+            var _a, _b;
+            if (this.coordinateType === 'BD-09') {
+                _a = __read(i1.bd09towgs84(lng, lat), 2), lng = _a[0], lat = _a[1];
+            }
+            else if (this.coordinateType === 'GCJ-02') {
+                _b = __read(i1.gcj02towgs84(lng, lat), 2), lng = _b[0], lat = _b[1];
+            }
+            return new T.LngLat(lng, lat);
+        };
+        TiandituComponent.prototype.transferCoordinate = function (latlng) {
+            var _a, _b;
+            var lng = latlng.lng, lat = latlng.lat;
+            if (this.coordinateType === 'BD-09') {
+                _a = __read(i1.wgs84tobd09(lng, lat), 2), lng = _a[0], lat = _a[1];
+            }
+            else if (this.coordinateType === 'GCJ-02') {
+                _b = __read(i1.wgs84togcj02(lng, lat), 2), lng = _b[0], lat = _b[1];
+            }
+            else {
+                return latlng;
+            }
+            return { lng: lng, lat: lat };
+        };
+        TiandituComponent.prototype.setCenter = function (lng, lat) {
+            if (this.map && lng && lat) {
+                var center = this.map.getCenter();
+                if (center.lng != lng || center.lat != lat) {
+                    this.setCenterAndZoom(lng, lat, this.map.getZoom());
+                }
+            }
+        };
+        TiandituComponent.prototype.setCenterAndZoom = function (lng, lat, zoom) {
+            var center = this.map.getCenter();
+            var currentZoom = this.map.getZoom();
+            // 误差范围内不移动,防止背景抖动
+            if (zoom != currentZoom || Math.abs(lng - center.lng) > 1e-13 || Math.abs(lat - center.lat) > 1e-7) {
+                var point = this.createLngLat(lng, lat);
+                this.map.centerAndZoom(point, zoom);
+            }
+        };
+        /**
+         * 根据经纬度范围设置中心和缩放等级
+         * @param minLng
+         * @param maxLng
+         * @param minLat
+         * @param maxLat
+         */
+        TiandituComponent.prototype.setRectCenterAndZoom = function (minLng, maxLng, minLat, maxLat) {
+            var pointB = this.createLngLat(minLng, minLat);
+            var pointA = this.createLngLat(maxLng, maxLat);
+            this.map.setViewport([pointA, pointB]);
+        };
+        TiandituComponent.prototype.mapLoaded = function (map) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/];
+                });
             });
-            widgetService.register(exports.ɵbl, {
-                className: 'wordart1 wordart',
-                title: '可视化数字大屏',
-                option: {
-                    title: '可视化数字大屏',
-                    font: { family: 'cursive', color: '#3285FF', weight: 'normal', size: 24, space: 0, lineHeight: '' },
-                },
-            }, {
-                className: 'wordart2 wordart',
-                title: '可视化数字大屏',
-                option: {
-                    title: '可视化数字大屏',
-                    font: { family: 'sans-serif', color: '#7ee5ce', weight: 'bold', size: 24, space: 0, lineHeight: '' },
+        };
+        TiandituComponent.prototype.decodePolygon = function (coordinate, encodeOffsets, encodeScale) {
+            var result = [];
+            var prevX = encodeOffsets[0];
+            var prevY = encodeOffsets[1];
+            for (var i = 0; i < coordinate.length; i += 2) {
+                var x = coordinate.charCodeAt(i) - 64;
+                var y = coordinate.charCodeAt(i + 1) - 64;
+                // ZigZag decoding
+                x = (x >> 1) ^ -(x & 1);
+                y = (y >> 1) ^ -(y & 1);
+                // Delta deocding
+                x += prevX;
+                y += prevY;
+                prevX = x;
+                prevY = y;
+                // Dequantize
+                result.push([x / encodeScale, y / encodeScale]);
+            }
+            return result;
+        };
+        return TiandituComponent;
+    }());
+    exports.ɵeb.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'sc-tianditu',
+                    template: "<div #container class=\"tianditu\"></div>\n<ng-template *ngFor=\"let child of children\" widget-host [widget]=\"child\"></ng-template>\n",
+                    styles: [":host{display:block;overflow:hidden;transform-origin:0 0;z-index:0;position:relative}.tianditu,:host{height:100%;width:100%}"]
+                },] }
+    ];
+    exports.ɵeb.ctorParameters = function () { return [
+        { type: util.LazyService },
+        { type: i0.ElementRef },
+        { type: i0.NgZone },
+        { type: bbjWidgetBase.ScaleSubject, decorators: [{ type: i0.Optional }] },
+        { type: bbjWidgetBase.WidgetRef }
+    ]; };
+    exports.ɵeb.propDecorators = {
+        container: [{ type: i0.ViewChild, args: ['container',] }]
+    };
+    __decorate([
+        bbjWidgetBase.Property('坐标系', {
+            enum: [
+                { label: '百度坐标', value: 'BD-09' },
+                { label: '高德/腾讯坐标', value: 'GCJ-02' },
+                { label: '天地图坐标', value: 'WGS84' },
+            ],
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "coordinateType", void 0);
+    __decorate([
+        bbjWidgetBase.Property('地图拖动', { type: 'boolean' }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "dragging", void 0);
+    __decorate([
+        bbjWidgetBase.Property('地图缩放', {
+            ui: { widget: 'myRange', min: 1, max: 40, step: 1 },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "zoom", void 0);
+    __decorate([
+        bbjWidgetBase.Data({
+            properties: {
+                lng: { type: 'number', title: '经度' },
+                lat: { type: 'number', title: '纬度' },
+            },
+        }),
+        __metadata("design:type", Array)
+    ], exports.ɵeb.prototype, "data", void 0);
+    __decorate([
+        bbjWidgetBase.DataOutput(['lng', 'lat']),
+        bbjWidgetBase.Event('中心点改变', {
+            params: { properties: { lng: { title: '经度', type: 'number' }, lat: { title: '纬度', type: 'number' } } },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "dataChange", void 0);
+    __decorate([
+        bbjWidgetBase.DataOutput('缩放等级'),
+        bbjWidgetBase.Event('缩放', {
+            params: '缩放等级',
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "zoomChange", void 0);
+    __decorate([
+        bbjWidgetBase.Event('地图点击', {
+            params: { properties: { lng: { title: '经度', type: 'number' }, lat: { title: '纬度', type: 'number' } } },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵeb.prototype, "mapClick", void 0);
+    exports.ɵeb = __decorate([
+        bbjWidgetBase.Widget('天地图', {
+            children: [
+                {
+                    title: '标记层',
+                    type: 'sc-tianditu-marker',
+                    option: {},
+                    hidden: true,
+                    hideChild: true,
                 },
-            }, {
-                className: 'wordart3 wordart',
+            ],
+            childTypes: ['sc-tianditu-marker'],
+            description: 'hasChildItem',
+        }),
+        __metadata("design:paramtypes", [util.LazyService,
+            i0.ElementRef,
+            i0.NgZone,
+            bbjWidgetBase.ScaleSubject,
+            bbjWidgetBase.WidgetRef])
+    ], exports.ɵeb);
+
+    var BaseLayer$1 = /** @class */ (function () {
+        function BaseLayer(parent, zone) {
+            this.parent = parent;
+            this.zone = zone;
+            this.layers = [];
+            this.overlays = [];
+            this.destroy$ = new rxjs.Subject();
+        }
+        BaseLayer.prototype.ngOnInit = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.parent.init$];
+                        case 1:
+                            _a.sent();
+                            this.init();
+                            this.inited = true;
+                            this.zone.runOutsideAngular(function () {
+                                _this.updateOverlays();
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        BaseLayer.prototype.ngOnChanges = function (changes) {
+            var _this = this;
+            if (this.inited) {
+                this.zone.runOutsideAngular(function () {
+                    _this.updateOverlays();
+                });
+            }
+        };
+        BaseLayer.prototype.ngOnDestroy = function () {
+            this.destroy$.next();
+            this.destroy$.complete();
+            this.removeOverlays();
+        };
+        BaseLayer.prototype.init = function () { };
+        BaseLayer.prototype.updateOverlays = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    this.removeOverlays();
+                    this.overlays = this.createOverlays();
+                    this.overlays.forEach(function (overlay) {
+                        _this.parent.map.addOverLay(overlay);
+                    });
+                    this.inited = true;
+                    return [2 /*return*/];
+                });
+            });
+        };
+        BaseLayer.prototype.removeOverlays = function () {
+            var _this = this;
+            if (this.overlays.length) {
+                this.overlays.forEach(function (overlay) {
+                    _this.parent.map.removeOverLay(overlay);
+                });
+                this.overlays = [];
+            }
+            // if (this.layers.length) {
+            //   this.layers.forEach((layer) => {
+            //     this.parent.removeLayer(layer);
+            //   });
+            //   this.layers = [];
+            // }
+        };
+        BaseLayer.prototype.getTextOptions = function (font) {
+            var textOptions = {};
+            if (font) {
+                if (font.size)
+                    textOptions.fontSize = font.size;
+                if (font.family)
+                    textOptions.fontFamily = font.family;
+                if (font.color)
+                    textOptions.color = font.color;
+            }
+            return textOptions;
+        };
+        return BaseLayer;
+    }());
+    BaseLayer$1.decorators = [
+        { type: i0.Directive }
+    ];
+    BaseLayer$1.ctorParameters = function () { return [
+        { type: exports.ɵeb },
+        { type: i0.NgZone }
+    ]; };
+
+    var ɵ0$e = { type: 'string', title: 'id' }, ɵ1$c = { type: 'string', title: 'id' }, ɵ2$a = { type: 'string', title: 'id' };
+    exports.ɵec = /** @class */ (function (_super_1) {
+        __extends(TiandituMarkerComponent, _super_1);
+        function TiandituMarkerComponent(parent, zone, fileUrlService, nzContextMenuService) {
+            var _this = _super_1.call(this, parent, zone) || this;
+            _this.parent = parent;
+            _this.zone = zone;
+            _this.fileUrlService = fileUrlService;
+            _this.nzContextMenuService = nzContextMenuService;
+            _this.iconUrl = 'assets/img/screen/marker.png';
+            _this.iconWidth = 20;
+            _this.iconHeight = 30;
+            _this.iconOffsetX = 10;
+            _this.iconOffsetY = 30;
+            // @Property('分组', {type: 'string'})
+            // group = '';
+            _this.toCenter = false;
+            // @Property('标签底色', { ui: { widget: 'myColor', visibleIf: { showLabel: [true] } } })
+            // labelBackground: string;
+            _this.labelFont = {
+                family: '',
+                color: '#000000',
+                weight: 'normal',
+                size: 16,
+                space: 0,
+                lineHeight: 0,
+            };
+            // @Property('阴影', { ui: { widget: 'myShadow' } })
+            // shadow: any = { color: '', X: 0, Y: 0, Z: 0 };
+            _this.labelOffsetX = -50;
+            _this.labelOffsetY = 10;
+            _this.unselectOnClickBlank = true;
+            _this.groups = [];
+            _this.data = [
+                {
+                    id: '1',
+                    address: '',
+                    information: '暂无信息',
+                    group: '',
+                    lng: '120.7',
+                    lat: '28',
+                },
+            ];
+            // id: string;
+            _this.makerClick = new i0.EventEmitter();
+            _this.onClick = new i0.EventEmitter();
+            _this.layers = [];
+            // defaultLayer: any;
+            _this.optionsMap = {};
+            _this.dataMap = {};
+            return _this;
+        }
+        TiandituMarkerComponent.prototype.ngOnInit = function () {
+            var _super = Object.create(null, {
+                ngOnInit: { get: function () { return _super_1.prototype.ngOnInit; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, _super.ngOnInit.call(this)];
+                        case 1:
+                            _b.sent();
+                            if (this.showLabel && this.showLabelMinZoom != null) {
+                                this.parent.zoomChange.pipe(operators.takeUntil(this.destroy$)).subscribe(function (zoom) {
+                                    _this.updateTextVisible(zoom);
+                                });
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        TiandituMarkerComponent.prototype.ngOnChanges = function (changes) {
+            var _this = this;
+            if (this.inited) {
+                if (changes.data) {
+                    this.zone.runOutsideAngular(function () {
+                        _this.updateOverlays();
+                    });
+                }
+                if (changes.selectedId) {
+                    if (this.selectedId != this.currentSelectedId) {
+                        this.select(this.selectedId, { move: true });
+                    }
+                }
+            }
+        };
+        TiandituMarkerComponent.prototype.ngOnDestroy = function () {
+            _super_1.prototype.ngOnDestroy.call(this);
+            this.destroy$.next();
+            this.destroy$.complete();
+        };
+        TiandituMarkerComponent.prototype.init = function () {
+            var _this = this;
+            var _a;
+            this.optionsMap = {};
+            var defaultOptions = this.createOptions();
+            this.optionsMap[''] = defaultOptions;
+            if ((_a = this.groups) === null || _a === void 0 ? void 0 : _a.length) {
+                this.groups.forEach(function (group) {
+                    if (group.group) {
+                        var options = _this.createOptions(group);
+                        _this.optionsMap[group.group] = options;
+                    }
+                });
+            }
+            if (this.unselectOnClickBlank) {
+                this.parent.mapClick.pipe(operators.takeUntil(this.destroy$)).subscribe(function () {
+                    _this.selectedId = null;
+                    _this.select(null);
+                });
+            }
+            // if (!this.enableMarkerClusterer && this.showLabel) {
+            //   const textOptions = {
+            //     ...this.getTextOptions(this.labelFont),
+            //     // color: '#fff',
+            //     // fontFamily: 'Microsoft Yahei',
+            //     // fontSize: 14,
+            //     flat: false,
+            //     collides: true,
+            //     offset: [this.labelOffsetX || 0, this.labelOffsetY || 0],
+            //     stroke: {
+            //       color: this.stroke,
+            //     },
+            //     padding: [2, 2],
+            //     margin: [0, 0],
+            //   };
+            //   if (this.stroke && this.stroke !== 'rgba(0,0,0,0)') {
+            //     textOptions.stroke = { color: this.stroke };
+            //   }
+            //   if (this.strokeWidth) {
+            //     textOptions.lineWidth = this.strokeWidth;
+            //   }
+            //   if (this.shadow) {
+            //     textOptions.shadow = {
+            //       color: this.shadow.color,
+            //       blur: this.shadow.Z,
+            //       offsetX: this.shadow.X,
+            //       offsetY: this.shadow.Y,
+            //     };
+            //   }
+            //   this.textLayer = new mapvgl.TextLayer(textOptions);
+            //   if (this.showLabelMinZoom != null) {
+            //     this.parent.init$.then(() => {
+            //       const zoom = this.parent.map.getZoom();
+            //       this.updateTextVisible(zoom);
+            //     });
+            //   }
+            //   layers.push(this.textLayer);
+            // }
+        };
+        TiandituMarkerComponent.prototype.createOptions = function (group) {
+            var iconOptions = this.getIconOptions(group);
+            return { icon: iconOptions };
+            // if (this.enableMarkerClusterer || group?.enableMarkerClusterer) {
+            //   const options: any = {
+            //     iconOptions,
+            //     textOptions: this.getTextOptions(this.clusterFont),
+            //     minSize: this.clusterMinSize || 25,
+            //     maxSize: this.clusterMaxSize || 40,
+            //   };
+            //   if (this.clusterGradient?.length) {
+            //     const gradient: any = {};
+            //     gradient[0] = this.clusterGradient[0];
+            //     this.clusterGradient.slice(1).forEach((g, i) => {
+            //       gradient[(i + 1) / this.clusterGradient.length] = g;
+            //     });
+            //     options.gradient = gradient;
+            //   }
+            //   if (this.clusterMaxZoom != null) {
+            //     options.maxZoom = this.clusterMaxZoom;
+            //   }
+            //   this.addPickEvent(options);
+            //   layer = new mapvgl.ClusterLayer(options);
+            // } else {
+            //   this.addPickEvent(iconOptions);
+            //   layer = new mapvgl.IconLayer(iconOptions);
+            // }
+        };
+        TiandituMarkerComponent.prototype.updateTextVisible = function (zoom) {
+            if (this.textLayer) {
+                if (zoom >= this.showLabelMinZoom) {
+                    this.textLayer.show();
+                }
+                else {
+                    this.textLayer.hide();
+                }
+            }
+        };
+        TiandituMarkerComponent.prototype.createOverlays = function () {
+            var _this = this;
+            var overlays = [];
+            this.dataMap = {};
+            if (this.toCenter && this.data.length > 0) {
+                var maxLng_1 = -180;
+                var minLng_1 = 180;
+                var maxLat_1 = -90;
+                var minLat_1 = 90;
+                this.data.forEach(function (res) {
+                    maxLng_1 = Math.max(maxLng_1, res.lng);
+                    minLng_1 = Math.min(minLng_1, res.lng);
+                    maxLat_1 = Math.max(maxLat_1, res.lat);
+                    minLat_1 = Math.min(minLat_1, res.lat);
+                });
+                this.parent.setRectCenterAndZoom(minLng_1, maxLng_1, minLat_1, maxLat_1);
+            }
+            var groupData = {};
+            this.groupData = groupData;
+            var textData = [];
+            var groups = Object.keys(this.optionsMap);
+            groups.forEach(function (group) {
+                groupData[group] = [];
+            });
+            // const defaultData = [];
+            this.data.forEach(function (record) {
+                var groupName = record.group;
+                if (groupName == null || _this.optionsMap[groupName] == null) {
+                    groupName = '';
+                }
+                var id = record.id_value || record.id;
+                if (id == null || id == '') {
+                    id = getUUID();
+                }
+                // MapVGL的bug，ClusterLayer的iconOptions无效，只能通过properties设置
+                var options = _this.optionsMap[groupName];
+                // if (layer != null && layer instanceof mapvgl.ClusterLayer) {
+                //   const options = layer.getOptions();
+                //   if (options.iconOptions) {
+                //     const { height, width, offset, icon } = options.iconOptions;
+                //     item.properties = { height, width, offset, icon, ...item.properties };
+                //   }
+                // }
+                var point = _this.parent.createLngLat(record.lng, record.lat);
+                var marker = new T.Marker(point, options); // 创建标注
+                marker.addEventListener('click', function (e) {
+                    _this.selectedId = id;
+                    _this.select(id);
+                    _this.zone.run(function () {
+                        _this.onClick.emit(Object.assign(Object.assign({}, record), { id: id }));
+                    });
+                    if (record.information) {
+                        _this.openInfo(record.information, e);
+                    }
+                });
+                overlays.push(marker);
+                if (_this.showLabel && record.address) {
+                    var label = new T.Label({
+                        text: "" + record.address,
+                        position: marker.getLngLat(),
+                        offset: new T.Point(_this.labelOffsetX || -50, _this.labelOffsetY || 10),
+                    });
+                    label.setBorderLine(_this.strokeWidth || 0);
+                    label.setBorderColor(_this.stroke);
+                    label.setBackgroundColor('rgba(0,0,0,0)');
+                    label.setFontColor(_this.labelFont.color);
+                    label.setFontSize(_this.labelFont.size);
+                    overlays.push(label);
+                }
+                // if (this.selectedId && this.selectedId == id) {
+                //   this.updateSize(item, 1.5);
+                //   this.lastSelect = item;
+                // }
+                groupData[groupName].push(record);
+                _this.dataMap[id] = record;
+                if (_this.textLayer) {
+                    textData.push(record);
+                }
+            });
+            // if (this.selectedId) {
+            //   this.select(this.selectedId, { move: this.selectedId != this.currentSelectedId, resetLayer: false, force: true });
+            // }
+            // groups.forEach((group) => {
+            //   const layer = this.layerMap[group];
+            //   const data = groupData[group];
+            //   layer.setData(data);
+            // });
+            // if (this.textLayer) {
+            //   this.textLayer.setData(textData);
+            // }
+            return overlays;
+        };
+        TiandituMarkerComponent.prototype.getIconOptions = function (group) {
+            var icon = this.iconUrl || 'assets/img/screen/marker.png';
+            var height = this.iconHeight || 30;
+            var width = this.iconWidth || 20;
+            var offsetX = this.iconOffsetX == null ? width / 2 : this.iconOffsetX;
+            var offsetY = this.iconOffsetY == null ? height : this.iconOffsetY;
+            if (group && group.imageUrl) {
+                icon = this.fileUrlService.getUrl(group.imageUrl);
+                width = group.width || width;
+                height = group.height || height;
+                offsetX = group.XOffset != null ? group.XOffset : width / 2;
+                offsetY = group.YOffset != null ? group.YOffset : height;
+            }
+            var iconOptions = new T.Icon({
+                iconUrl: icon,
+                iconSize: new T.Point(width, height),
+                iconAnchor: new T.Point(offsetX, offsetY),
+            });
+            return iconOptions;
+        };
+        TiandituMarkerComponent.prototype.openInfo = function (content, e) {
+            var point = e.lnglat;
+            var markerInfoWin = new T.InfoWindow(content, { offset: new T.Point(0, -30) }); // 创建信息窗口对象
+            this.parent.map.openInfoWindow(markerInfoWin, point); //开启信息窗口
+        };
+        TiandituMarkerComponent.prototype.addPickEvent = function (options) {
+            // options.enablePicked = true;
+            // options.onClick = ({ dataItem }) => {
+            //   // 每个图层都会触发一次click事件，如果每个图层都没有点中标记点，传出null
+            //   if (dataItem) {
+            //     this.clickData = dataItem;
+            //   }
+            //   if (this.unselectOnClickBlank !== false && this.clickTimeout == null) {
+            //     this.clickTimeout = setTimeout(() => {
+            //       if (this.clickData == null) {
+            //         this.selectedId = null;
+            //         this.select(null);
+            //       }
+            //       this.clickTimeout = null;
+            //       this.clickData = null;
+            //       this.subMarkers = null;
+            //     });
+            //   }
+            //   if (dataItem) {
+            //     if (dataItem.type === 'Feature') {
+            //       const coordinates = dataItem.geometry.coordinates;
+            //       this.parent.setCenterAndZoom(coordinates[0], coordinates[1], this.parent.map.getZoom() + 2);
+            //     } else {
+            //       const data = dataItem.properties.raw;
+            //       if (data) {
+            //         this.selectedId = dataItem.properties.id;
+            //         this.select(dataItem.properties.id);
+            //         this.zone.run(() => {
+            //           this.onClick.emit({ ...data, id: data.id_value || data.id });
+            //         });
+            //       }
+            //     }
+            //   }
+            // };
+            // if (this.parent.showType === 'mouseover') {
+            //   let infoWindow = null;
+            //   let infoWindowData = null;
+            //   options.onMousemove = ({ dataItem }) => {
+            //     const data = dataItem != null ? dataItem.properties.raw : null;
+            //     if (infoWindow != null && infoWindowData != data) {
+            //       infoWindow.close();
+            //       infoWindow = null;
+            //     }
+            //     if (data && data.information && infoWindow == null) {
+            //       infoWindowData = data;
+            //       infoWindow = this.parent.openInfoWindow(data, data.lng, data.lat);
+            //     }
+            //   };
+            // }
+        };
+        TiandituMarkerComponent.prototype.select = function (id, options) {
+            var _this = this;
+            if (options === void 0) { options = {}; }
+            if (id != this.currentSelectedId || options.force) {
+                var item = void 0;
+                if (id != null && id !== '') {
+                    item = this.dataMap[id];
+                    // 如果找不到数据，可能是数据还没加载，等数据加载了再执行
+                    if (item == null) {
+                        return;
+                    }
+                }
+                this.currentSelectedId = id;
+                // let lastSelectGroup: string;
+                // let currentSelectGroup: string;
+                var selectedData_1;
+                if (this.lastSelect) {
+                    // lastSelectGroup = this.lastSelect.properties.group;
+                    this.updateSize(this.lastSelect, 1);
+                    this.lastSelect = null;
+                }
+                if (item) {
+                    // currentSelectGroup = item.properties.group;
+                    // this.updateSize(item, this.selectedSize ?? 1.5);
+                    this.lastSelect = item;
+                    selectedData_1 = item;
+                    if (options.move) {
+                        // const layer = this.optionsMap[currentSelectGroup];
+                        var zoom = this.parent.map.getZoom();
+                        if (this.selectedMapZoom) {
+                            zoom = this.selectedMapZoom;
+                        }
+                        // else if (
+                        //   layer instanceof mapvgl.ClusterLayer &&
+                        //   this.clusterMaxZoom != null &&
+                        //   Math.floor(zoom) <= this.clusterMaxZoom
+                        // ) {
+                        //   zoom = this.clusterMaxZoom + 2;
+                        // }
+                        this.parent.setCenterAndZoom(selectedData_1.lng, selectedData_1.lat, zoom);
+                    }
+                    // if (selectedData.information && this.parent.showType !== 'mouseover') {
+                    //   // 防止其他图层将信息窗口关闭
+                    //   setTimeout(() => {
+                    //     this.parent.openInfoWindow(selectedData, selectedData.lng, selectedData.lat);
+                    //   });
+                    // }
+                }
+                else {
+                    selectedData_1 = {};
+                }
+                // if (options.resetLayer !== false) {
+                //   if (currentSelectGroup != null) {
+                //     this.resetLayerData(currentSelectGroup);
+                //   }
+                //   if (lastSelectGroup != null && lastSelectGroup !== currentSelectGroup) {
+                //     this.resetLayerData(lastSelectGroup);
+                //   }
+                // }
+                // 如果选中的id找不到对应数据,可能是数据还没加载，
+                if (id == null || item != null) {
+                    this.zone.run(function () {
+                        _this.makerClick.emit(Object.assign(Object.assign({}, selectedData_1), { id: selectedData_1.id_value || selectedData_1.id }));
+                    });
+                }
+            }
+        };
+        TiandituMarkerComponent.prototype.resetLayerData = function (group) {
+            // const layer = this.layerMap[group];
+            // const data = this.groupData[group];
+            // if (layer && data) {
+            //   layer.setData(data);
+            // }
+        };
+        TiandituMarkerComponent.prototype.updateSize = function (item, scale) {
+            // if (item && this.enlargeOnSelect) {
+            //   const layer = this.layerMap[item.properties.group];
+            //   let options: any;
+            //   if (layer instanceof mapvgl.ClusterLayer) {
+            //     options = layer.getOptions().iconOptions;
+            //   } else {
+            //     options = layer.getOptions();
+            //   }
+            //   const { height, width, offset } = options;
+            //   item.properties.height = height * scale;
+            //   item.properties.width = width * scale;
+            //   if (item.properties.offset) {
+            //     item.properties.offset = [offset[0] * scale, offset[1] * scale];
+            //   }
+            // }
+        };
+        return TiandituMarkerComponent;
+    }(BaseLayer$1));
+    exports.ɵec.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'sc-tianditu-marker',
+                    template: "",
+                    styles: [""]
+                },] }
+    ];
+    exports.ɵec.ctorParameters = function () { return [
+        { type: exports.ɵeb },
+        { type: i0.NgZone },
+        { type: FileUrlService },
+        { type: dropdown.NzContextMenuService }
+    ]; };
+    exports.ɵec.propDecorators = {
+        menu: [{ type: i0.ViewChild, args: ['menu',] }]
+    };
+    __decorate([
+        bbjWidgetBase.Property('', { min: 1, ui: { widget: 'myPicture', spanLabel: 0, spanControl: 24 } }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "iconUrl", void 0);
+    __decorate([
+        bbjWidgetBase.Property('图标宽', { type: 'number' }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "iconWidth", void 0);
+    __decorate([
+        bbjWidgetBase.Property('图标高', { type: 'number' }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "iconHeight", void 0);
+    __decorate([
+        bbjWidgetBase.Property('图标偏移x', { type: 'number' }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "iconOffsetX", void 0);
+    __decorate([
+        bbjWidgetBase.Property('图标偏移y', { type: 'number' }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "iconOffsetY", void 0);
+    __decorate([
+        bbjWidgetBase.Property('移至中心'),
+        __metadata("design:type", Boolean)
+    ], exports.ɵec.prototype, "toCenter", void 0);
+    __decorate([
+        bbjWidgetBase.Property('显示标签', { ui: { visibleIf: { enableMarkerClusterer: [false] } } }),
+        __metadata("design:type", Boolean)
+    ], exports.ɵec.prototype, "showLabel", void 0);
+    __decorate([
+        bbjWidgetBase.Property('标签显示缩放等级', { ui: { visibleIf: { showLabel: [true] } } }),
+        __metadata("design:type", Number)
+    ], exports.ɵec.prototype, "showLabelMinZoom", void 0);
+    __decorate([
+        bbjWidgetBase.Property('标签字体', { ui: { widget: 'myFont', visibleIf: { showLabel: [true] } } }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "labelFont", void 0);
+    __decorate([
+        bbjWidgetBase.Property('描边颜色', {
+            ui: {
+                widget: 'myColor',
+            },
+        }),
+        __metadata("design:type", String)
+    ], exports.ɵec.prototype, "stroke", void 0);
+    __decorate([
+        bbjWidgetBase.Property('描边粗细', { type: 'integer' }),
+        __metadata("design:type", Number)
+    ], exports.ɵec.prototype, "strokeWidth", void 0);
+    __decorate([
+        bbjWidgetBase.Property('标签偏移x', { ui: { widget: 'number', visibleIf: { showLabel: [true] } } }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "labelOffsetX", void 0);
+    __decorate([
+        bbjWidgetBase.Property('标签偏移y', { ui: { widget: 'number', visibleIf: { showLabel: [true] } } }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "labelOffsetY", void 0);
+    __decorate([
+        bbjWidgetBase.Property('选中时地图缩放', { type: 'number' }),
+        __metadata("design:type", Number)
+    ], exports.ɵec.prototype, "selectedMapZoom", void 0);
+    __decorate([
+        bbjWidgetBase.Property('点击空白取消选中', { type: 'boolean', default: true }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "unselectOnClickBlank", void 0);
+    __decorate([
+        bbjWidgetBase.Property('标记分组', {
+            type: 'array',
+            title: '标记分组',
+            maxItems: 10,
+            items: {
+                type: 'object',
+                properties: {
+                    group: {
+                        type: 'string',
+                        title: '分组',
+                    },
+                    // type: {
+                    //   title: '类型',
+                    //   type: 'string',
+                    //   enum: [
+                    //     {
+                    //       label: '图标',
+                    //       value: 'icon',
+                    //     },
+                    //     {
+                    //       label: '圆点',
+                    //       value: 'circle',
+                    //     },
+                    //     {
+                    //       label: '正方形',
+                    //       value: 'square',
+                    //     },
+                    //     {
+                    //       label: '波纹',
+                    //       value: 'wave',
+                    //     },
+                    //     {
+                    //       label: '扩散',
+                    //       value: 'bubble',
+                    //     },
+                    //   ],
+                    //   default: 'icon',
+                    // },
+                    // color: {
+                    //   type: 'string',
+                    //   title: '颜色',
+                    //   ui: { widget: 'myColor', visibleIf: { type: ['circle', 'square'] } },
+                    // },
+                    // size: {
+                    //   type: 'number',
+                    //   title: '尺寸',
+                    //   ui: { visibleIf: { type: ['circle', 'square', 'wave', 'bubble'] } },
+                    // },
+                    imageUrl: {
+                        type: 'string',
+                        title: '图片',
+                        ui: {
+                            widget: 'myPicture',
+                            visibleIf: { type: ['icon'] },
+                        },
+                    },
+                    width: {
+                        type: 'number',
+                        title: '宽度',
+                        default: 19,
+                        ui: { visibleIf: { type: ['icon'] } },
+                    },
+                    height: {
+                        type: 'number',
+                        title: '高度',
+                        default: 25,
+                        ui: { visibleIf: { type: ['icon'] } },
+                    },
+                    XOffset: {
+                        type: 'number',
+                        title: 'X轴偏移',
+                        ui: { visibleIf: { type: ['icon'] } },
+                    },
+                    YOffset: {
+                        type: 'number',
+                        title: 'Y轴偏移',
+                        ui: { visibleIf: { type: ['icon'] } },
+                    },
+                },
+                required: [],
+            },
+            ui: { grid: { arraySpan: 24 }, spanControl: 24 },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "groups", void 0);
+    __decorate([
+        bbjWidgetBase.Data({
+            properties: {
+                id: ɵ0$e,
+                address: { type: 'string', title: '地点' },
+                information: { type: 'string', title: '信息' },
+                group: { type: 'string', title: '标记分组' },
+                lng: { type: 'number', title: '经度' },
+                lat: { type: 'number', title: '纬度' },
+                icon: { type: 'string', title: '图标' },
+            },
+        }),
+        __metadata("design:type", Array)
+    ], exports.ɵec.prototype, "data", void 0);
+    __decorate([
+        bbjWidgetBase.DataOutput(['id', 'address', 'lng', 'lat']),
+        bbjWidgetBase.Event('选中值改变', {
+            params: {
+                properties: {
+                    id: ɵ1$c,
+                    address: { type: 'string', title: '地点' },
+                    lng: { type: 'number', title: '经度' },
+                    lat: { type: 'number', title: '纬度' },
+                },
+            },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "makerClick", void 0);
+    __decorate([
+        bbjWidgetBase.DataInput('选中id'),
+        __metadata("design:type", String)
+    ], exports.ɵec.prototype, "selectedId", void 0);
+    __decorate([
+        bbjWidgetBase.Event('点击', {
+            params: {
+                properties: {
+                    id: ɵ2$a,
+                    address: { type: 'string', title: '地点' },
+                    lng: { type: 'number', title: '经度' },
+                    lat: { type: 'number', title: '纬度' },
+                },
+            },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵec.prototype, "onClick", void 0);
+    exports.ɵec = __decorate([
+        bbjWidgetBase.Widget('标记层', {
+            hidden: true,
+        }),
+        __metadata("design:paramtypes", [exports.ɵeb,
+            i0.NgZone,
+            FileUrlService,
+            dropdown.NzContextMenuService])
+    ], exports.ɵec);
+
+    var TiandituModule = /** @class */ (function () {
+        function TiandituModule(widgetService) {
+            widgetService.register(exports.ɵeb, { scaleContent: false });
+            widgetService.register(exports.ɵec);
+        }
+        return TiandituModule;
+    }());
+    TiandituModule.decorators = [
+        { type: i0.NgModule, args: [{
+                    declarations: [exports.ɵeb, exports.ɵec],
+                    imports: [common.CommonModule, bbjWidgetBase.WidgetBaseModule],
+                },] }
+    ];
+    TiandituModule.ctorParameters = function () { return [
+        { type: bbjWidgetBase.WidgetService }
+    ]; };
+
+    var ScreenWidgetModule = /** @class */ (function () {
+        function ScreenWidgetModule(widgetService) {
+            widgetService.register(exports.ɵp, { size: { width: 60, height: 30 } });
+            widgetService.register(exports.ɵx, {
+                size: { width: 200, height: 36 },
+                option: {
+                    borderColor: '#3285ff',
+                    background: 'rgba(50,133,255,0.2)',
+                    dropdownBackgroundColor: '#3285ff',
+                    selectDropDownColor: '#fff',
+                    selectHoverColor: '#fff',
+                    selectHoverBackgroundColor: '#3285ff',
+                    font: { color: '#ffffff' },
+                    dropdownBg: 'rgba(50,133,255,0.2)',
+                    dropdownBorderColor: '#3285ff',
+                },
+            });
+            for (var i = 1; i <= 82; i++) {
+                widgetService.register(exports.ɵb, {
+                    option: { image: "assets/img/screen/picture" + i + ".png" },
+                });
+            }
+            icons.forEach(function (icon) {
+                widgetService.register(exports.ɵbn, {
+                    option: { icon: icon },
+                });
+            });
+            widgetService.register(exports.ɵbi, {
+                className: 'big-title title',
+                title: '大标题',
+                option: {
+                    title: '大标题',
+                    font: { family: '', color: '#ffffff', weight: 'normal', size: 36, space: 0, lineHeight: 50 },
+                },
+            }, {
+                className: 'normal-title title',
+                title: '标题',
+                option: {
+                    title: '标题',
+                    font: { family: '', color: '#ffffff', weight: 'normal', size: 32, space: 0, lineHeight: 45 },
+                },
+            }, {
+                className: 'subtitle title',
+                title: '副标题',
+                option: {
+                    title: '副标题',
+                    font: { family: '', color: '#ffffff', weight: 'normal', size: 24, space: 0, lineHeight: 33 },
+                },
+            }, {
+                className: 'small-title title',
+                title: '小标题',
+                option: {
+                    title: '小标题',
+                    font: { family: '', color: '#ffffff', weight: 'normal', size: 16, space: 0, lineHeight: 22 },
+                },
+            }, {
+                className: 'content title',
+                title: '正文内容',
+                option: {
+                    title: '正文内容',
+                    font: { family: '', color: '#ffffff', weight: 'normal', size: 13, space: 0, lineHeight: 18 },
+                },
+            });
+            widgetService.register(exports.ɵbl, {
+                className: 'wordart1 wordart',
+                title: '可视化数字大屏',
+                option: {
+                    title: '可视化数字大屏',
+                    font: { family: 'cursive', color: '#3285FF', weight: 'normal', size: 24, space: 0, lineHeight: '' },
+                },
+            }, {
+                className: 'wordart2 wordart',
+                title: '可视化数字大屏',
+                option: {
+                    title: '可视化数字大屏',
+                    font: { family: 'sans-serif', color: '#7ee5ce', weight: 'bold', size: 24, space: 0, lineHeight: '' },
+                },
+            }, {
+                className: 'wordart3 wordart',
                 title: '可视化数字大屏',
                 option: {
                     title: '可视化数字大屏',
@@ -21004,6 +22105,11 @@
                         IframeModule,
                         VideoGridModule,
                         Scatter3dModule,
+                        TiandituModule
+                        // DropDownDetailListModule,
+                        // DynamicListModule,
+                        // MyBaiduMapModule,
+                        // DataMapModule
                     ],
                     exports: [],
                     declarations: [],
@@ -21013,7 +22119,7 @@
         { type: bbjWidgetBase.WidgetService }
     ]; };
 
-    exports.ɵec = /** @class */ (function () {
+    exports.ɵef = /** @class */ (function () {
         function AnnouncementComponent(element) {
             this.element = element;
             this.headIconDisplay = true;
@@ -21051,32 +22157,32 @@
         };
         return AnnouncementComponent;
     }());
-    exports.ɵec.decorators = [
+    exports.ɵef.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-announcement',
                     template: "<ng-container *ngIf=\"data[0]\">\n    {{data[0].content}}\n</ng-container>",
                     styles: [":host{height:100%;overflow:auto;display:block}"]
                 },] }
     ];
-    exports.ɵec.ctorParameters = function () { return [
+    exports.ɵef.ctorParameters = function () { return [
         { type: i0.ElementRef }
     ]; };
     __decorate([
         bbjWidgetBase.Property('显示图标', { type: 'boolean' }),
         __metadata("design:type", Object)
-    ], exports.ɵec.prototype, "headIconDisplay", void 0);
+    ], exports.ɵef.prototype, "headIconDisplay", void 0);
     __decorate([
         bbjWidgetBase.Property('内边距', { ui: { widget: 'myGrid' } }),
         __metadata("design:type", Object)
-    ], exports.ɵec.prototype, "padding", void 0);
+    ], exports.ɵef.prototype, "padding", void 0);
     __decorate([
         bbjWidgetBase.Property('字体', { ui: { widget: 'myFont' } }),
         __metadata("design:type", Object)
-    ], exports.ɵec.prototype, "font", void 0);
+    ], exports.ɵef.prototype, "font", void 0);
     __decorate([
         bbjWidgetBase.Property('图标', { ui: { hidden: true } }),
         __metadata("design:type", Object)
-    ], exports.ɵec.prototype, "icon", void 0);
+    ], exports.ɵef.prototype, "icon", void 0);
     __decorate([
         bbjWidgetBase.Data({
             properties: {
@@ -21084,23 +22190,23 @@
             },
         }),
         __metadata("design:type", Object)
-    ], exports.ɵec.prototype, "data", void 0);
-    exports.ɵec = __decorate([
+    ], exports.ɵef.prototype, "data", void 0);
+    exports.ɵef = __decorate([
         bbjWidgetBase.Widget('公告', { group: 'component', image: 'assets/img/screen/announcement.png', icon: 'iconmokuai' }),
         __metadata("design:paramtypes", [i0.ElementRef])
-    ], exports.ɵec);
+    ], exports.ɵef);
 
     var AnnouncementModule = /** @class */ (function () {
         function AnnouncementModule(widgetService) {
             this.widgetService = widgetService;
-            widgetService.register(exports.ɵec);
+            widgetService.register(exports.ɵef);
         }
         return AnnouncementModule;
     }());
     AnnouncementModule.decorators = [
         { type: i0.NgModule, args: [{
                     declarations: [
-                        exports.ɵec
+                        exports.ɵef
                     ],
                     imports: [
                         common.CommonModule,
@@ -21123,8 +22229,8 @@
         }
     }
 
-    var ɵ0$e = { type: 'string', title: 'id' };
-    exports.ɵeh = /** @class */ (function () {
+    var ɵ0$f = { type: 'string', title: 'id' };
+    exports.ɵek = /** @class */ (function () {
         function CalendarComponent(router, cd) {
             var _this = this;
             this.router = router;
@@ -21244,40 +22350,40 @@
         };
         return CalendarComponent;
     }());
-    exports.ɵeh.decorators = [
+    exports.ɵek.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-calendar',
                     template: "<full-calendar *ngIf=\"calendarOptions\" [options]=\"calendarOptions\"></full-calendar>\n<ng-template *ngFor=\"let child of children\" widget-host [widget]=\"child\"></ng-template>\n",
                     styles: [":host ::ng-deep .fc-direction-ltr{height:100%}:host ::ng-deep .fc .fc-view-harness{padding-bottom:0!important}:host ::ng-deep .fc-license-message{display:none}:host ::ng-deep .fc-daygrid-event{white-space:normal}"]
                 },] }
     ];
-    exports.ɵeh.ctorParameters = function () { return [
+    exports.ɵek.ctorParameters = function () { return [
         { type: router.Router },
         { type: i0.ChangeDetectorRef }
     ]; };
     __decorate([
         bbjWidgetBase.Property('是否自定义初始日期', { ui: { format: 'date', widget: 'checkbox', spanLabel: 0, spanControl: 24 } }),
         __metadata("design:type", Object)
-    ], exports.ɵeh.prototype, "isInitialDate", void 0);
+    ], exports.ɵek.prototype, "isInitialDate", void 0);
     __decorate([
         bbjWidgetBase.Property('', { ui: { type: 'date', format: 'date', spanLabel: 0, spanControl: 24 } }),
         __metadata("design:type", Object)
-    ], exports.ɵeh.prototype, "initialDate", void 0);
+    ], exports.ɵek.prototype, "initialDate", void 0);
     __decorate([
         bbjWidgetBase.Data({
             properties: {
-                id: ɵ0$e,
+                id: ɵ0$f,
                 start: { type: 'string', title: '开始日期' },
                 end: { type: 'string', title: '结束日期' },
                 title: { type: 'string', title: '内容' },
             },
         }),
         __metadata("design:type", Array)
-    ], exports.ɵeh.prototype, "data", void 0);
+    ], exports.ɵek.prototype, "data", void 0);
     __decorate([
         bbjWidgetBase.DataOutput(['id', 'title']),
         __metadata("design:type", Object)
-    ], exports.ɵeh.prototype, "dataClick", void 0);
+    ], exports.ɵek.prototype, "dataClick", void 0);
     __decorate([
         bbjWidgetBase.DataOutput({
             properties: {
@@ -21287,8 +22393,8 @@
             },
         }, { triggerLink: false }),
         __metadata("design:type", Object)
-    ], exports.ɵeh.prototype, "datesSetChange", void 0);
-    exports.ɵeh = __decorate([
+    ], exports.ɵek.prototype, "datesSetChange", void 0);
+    exports.ɵek = __decorate([
         bbjWidgetBase.Widget('日历', {
             group: 'component',
             image: 'assets/img/screen/rili.png',
@@ -21296,7 +22402,7 @@
             childTypes: ['sc-calendar-events', 'sc-calendar-background-events'],
         }),
         __metadata("design:paramtypes", [router.Router, i0.ChangeDetectorRef])
-    ], exports.ɵeh);
+    ], exports.ɵek);
 
     var CalendarEventsChild = /** @class */ (function () {
         function CalendarEventsChild(parent) {
@@ -21322,11 +22428,11 @@
         { type: i0.Directive }
     ];
     CalendarEventsChild.ctorParameters = function () { return [
-        { type: exports.ɵeh }
+        { type: exports.ɵek }
     ]; };
 
-    var ɵ0$f = { type: 'string', title: 'id' };
-    exports.ɵei = /** @class */ (function (_super) {
+    var ɵ0$g = { type: 'string', title: 'id' };
+    exports.ɵel = /** @class */ (function (_super) {
         __extends(BackgroundEventsComponent, _super);
         function BackgroundEventsComponent(parent) {
             var _this = _super.call(this, parent) || this;
@@ -21351,15 +22457,15 @@
         };
         return BackgroundEventsComponent;
     }(CalendarEventsChild));
-    exports.ɵei.decorators = [
+    exports.ɵel.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-calendar-background-events',
                     template: "",
                     styles: [""]
                 },] }
     ];
-    exports.ɵei.ctorParameters = function () { return [
-        { type: exports.ɵeh }
+    exports.ɵel.ctorParameters = function () { return [
+        { type: exports.ɵek }
     ]; };
     __decorate([
         bbjWidgetBase.Property('颜色', {
@@ -21368,11 +22474,11 @@
             },
         }),
         __metadata("design:type", String)
-    ], exports.ɵei.prototype, "color", void 0);
+    ], exports.ɵel.prototype, "color", void 0);
     __decorate([
         bbjWidgetBase.Data({
             properties: {
-                id: ɵ0$f,
+                id: ɵ0$g,
                 start: { type: 'string', title: '开始日期' },
                 end: { type: 'string', title: '结束日期' },
                 title: { type: 'string', title: '标题' },
@@ -21380,14 +22486,14 @@
             },
         }),
         __metadata("design:type", Array)
-    ], exports.ɵei.prototype, "data", void 0);
-    exports.ɵei = __decorate([
+    ], exports.ɵel.prototype, "data", void 0);
+    exports.ɵel = __decorate([
         bbjWidgetBase.Widget('背景颜色', { hidden: true }),
-        __metadata("design:paramtypes", [exports.ɵeh])
-    ], exports.ɵei);
+        __metadata("design:paramtypes", [exports.ɵek])
+    ], exports.ɵel);
 
-    var ɵ0$g = { type: 'string', title: 'id' };
-    exports.ɵek = /** @class */ (function (_super) {
+    var ɵ0$h = { type: 'string', title: 'id' };
+    exports.ɵen = /** @class */ (function (_super) {
         __extends(EventsComponent, _super);
         function EventsComponent(parent) {
             var _this = _super.call(this, parent) || this;
@@ -21418,15 +22524,15 @@
         };
         return EventsComponent;
     }(CalendarEventsChild));
-    exports.ɵek.decorators = [
+    exports.ɵen.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-calendar-events',
                     template: "",
                     styles: [""]
                 },] }
     ];
-    exports.ɵek.ctorParameters = function () { return [
-        { type: exports.ɵeh }
+    exports.ɵen.ctorParameters = function () { return [
+        { type: exports.ɵek }
     ]; };
     __decorate([
         bbjWidgetBase.Property('颜色', {
@@ -21435,11 +22541,11 @@
             },
         }),
         __metadata("design:type", String)
-    ], exports.ɵek.prototype, "color", void 0);
+    ], exports.ɵen.prototype, "color", void 0);
     __decorate([
         bbjWidgetBase.Data({
             properties: {
-                id: ɵ0$g,
+                id: ɵ0$h,
                 start: { type: 'string', title: '开始日期' },
                 end: { type: 'string', title: '结束日期' },
                 title: { type: 'string', title: '标题' },
@@ -21447,15 +22553,15 @@
             },
         }),
         __metadata("design:type", Array)
-    ], exports.ɵek.prototype, "data", void 0);
+    ], exports.ɵen.prototype, "data", void 0);
     __decorate([
         bbjWidgetBase.DataOutput(['id', 'title']),
         __metadata("design:type", Object)
-    ], exports.ɵek.prototype, "dataClick", void 0);
-    exports.ɵek = __decorate([
+    ], exports.ɵen.prototype, "dataClick", void 0);
+    exports.ɵen = __decorate([
         bbjWidgetBase.Widget('事件', { hidden: true }),
-        __metadata("design:paramtypes", [exports.ɵeh])
-    ], exports.ɵek);
+        __metadata("design:paramtypes", [exports.ɵek])
+    ], exports.ɵen);
 
     var CalendarModule = /** @class */ (function () {
         function CalendarModule(widgetService) {
@@ -21464,15 +22570,15 @@
                 timeGridPlugin__default['default'],
                 interactionPlugin__default['default'],
             ]);
-            widgetService.register(exports.ɵeh);
             widgetService.register(exports.ɵek);
-            widgetService.register(exports.ɵei);
+            widgetService.register(exports.ɵen);
+            widgetService.register(exports.ɵel);
         }
         return CalendarModule;
     }());
     CalendarModule.decorators = [
         { type: i0.NgModule, args: [{
-                    declarations: [exports.ɵeh, exports.ɵei, exports.ɵek],
+                    declarations: [exports.ɵek, exports.ɵel, exports.ɵen],
                     imports: [common.CommonModule, bbjWidgetBase.WidgetBaseModule, angular.FullCalendarModule],
                 },] }
     ];
@@ -21480,7 +22586,7 @@
         { type: bbjWidgetBase.WidgetService }
     ]; };
 
-    exports.ɵee = /** @class */ (function () {
+    exports.ɵeh = /** @class */ (function () {
         function TabsComponent() {
             this.type = 'line';
             this.size = 'default';
@@ -21499,14 +22605,14 @@
         };
         return TabsComponent;
     }());
-    exports.ɵee.decorators = [
+    exports.ɵeh.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-tabs',
                     template: "<nz-tabset\n  [style]=\"tabPosition === 'top' || tabPosition === 'bottom' ? 'padding:0 10px' : ''\"\n  [(nzSelectedIndex)]=\"selectedIndex\"\n  [nzAnimated]=\"animated\"\n  [nzSize]=\"size\"\n  [nzTabPosition]=\"tabPosition\"\n  [nzType]=\"type\"\n  [nzTabBarGutter]=\"tabBarGutter\"\n>\n  <nz-tab *ngFor=\"let child of children\" [nzTitle]=\"child.option.title\" nzForceRender>\n    <ng-template widgetHost [widget]=\"child\"></ng-template>\n  </nz-tab>\n</nz-tabset>\n",
                     styles: [":host{display:block}.ant-tabs,:host{height:100%}.ant-tabs ::ng-deep>.ant-tabs-nav{margin:0}.ant-tabs ::ng-deep .ant-tabs-content{height:100%}.ant-tabs ::ng-deep .ant-tabs-content .ant-tabs-tabpane{overflow:auto}.ant-tabs{display:flex}.ant-tabs ::ng-deep .ant-tabs-content{flex:1}.ant-tabs ::ng-deep.ant-tabs-bottom,.ant-tabs ::ng-deep.ant-tabs-top{flex-direction:column}.ant-tabs ::ng-deep.ant-tabs-bottom ::ng-deep>.ant-tabs-bar,.ant-tabs ::ng-deep.ant-tabs-right ::ng-deep>.ant-tabs-bar{order:1}"]
                 },] }
     ];
-    exports.ɵee.ctorParameters = function () { return []; };
+    exports.ɵeh.ctorParameters = function () { return []; };
     __decorate([
         bbjWidgetBase.Property('页签样式', {
             enum: [
@@ -21515,7 +22621,7 @@
             ],
         }),
         __metadata("design:type", Object)
-    ], exports.ɵee.prototype, "type", void 0);
+    ], exports.ɵeh.prototype, "type", void 0);
     __decorate([
         bbjWidgetBase.Property('尺寸', {
             enum: [
@@ -21525,7 +22631,7 @@
             ],
         }),
         __metadata("design:type", Object)
-    ], exports.ɵee.prototype, "size", void 0);
+    ], exports.ɵeh.prototype, "size", void 0);
     __decorate([
         bbjWidgetBase.Property('页签位置', {
             enum: [
@@ -21536,16 +22642,16 @@
             ],
         }),
         __metadata("design:type", Object)
-    ], exports.ɵee.prototype, "tabPosition", void 0);
+    ], exports.ɵeh.prototype, "tabPosition", void 0);
     __decorate([
         bbjWidgetBase.Property('切换动画', { type: 'boolean', ui: { visibleIf: { tabPosition: ['top', 'bottom'] } } }),
         __metadata("design:type", Object)
-    ], exports.ɵee.prototype, "animated", void 0);
+    ], exports.ɵeh.prototype, "animated", void 0);
     __decorate([
         bbjWidgetBase.Property('间隙'),
         __metadata("design:type", Number)
-    ], exports.ɵee.prototype, "tabBarGutter", void 0);
-    exports.ɵee = __decorate([
+    ], exports.ɵeh.prototype, "tabBarGutter", void 0);
+    exports.ɵeh = __decorate([
         bbjWidgetBase.Widget('标签页', {
             group: 'component', image: 'assets/img/screen/tabs.png', icon: 'iconmokuai',
             children: [
@@ -21560,42 +22666,42 @@
             childTypes: ['sc-tab'],
         }),
         __metadata("design:paramtypes", [])
-    ], exports.ɵee);
+    ], exports.ɵeh);
 
-    exports.ɵef = /** @class */ (function () {
+    exports.ɵei = /** @class */ (function () {
         function TabComponent() {
             this.title = 'New Tab';
         }
         TabComponent.prototype.ngOnInit = function () { };
         return TabComponent;
     }());
-    exports.ɵef.decorators = [
+    exports.ɵei.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-tab',
                     template: "<ng-template [widgetChildren]=\"children\"></ng-template>\n",
                     styles: [""]
                 },] }
     ];
-    exports.ɵef.ctorParameters = function () { return []; };
+    exports.ɵei.ctorParameters = function () { return []; };
     __decorate([
         bbjWidgetBase.Property('标题'),
         __metadata("design:type", Object)
-    ], exports.ɵef.prototype, "title", void 0);
-    exports.ɵef = __decorate([
+    ], exports.ɵei.prototype, "title", void 0);
+    exports.ɵei = __decorate([
         bbjWidgetBase.Widget('选项卡', { hidden: true }),
         __metadata("design:paramtypes", [])
-    ], exports.ɵef);
+    ], exports.ɵei);
 
     var TabsModule = /** @class */ (function () {
         function TabsModule(widgetService) {
-            widgetService.register(exports.ɵee);
-            widgetService.register(exports.ɵef);
+            widgetService.register(exports.ɵeh);
+            widgetService.register(exports.ɵei);
         }
         return TabsModule;
     }());
     TabsModule.decorators = [
         { type: i0.NgModule, args: [{
-                    declarations: [exports.ɵee, exports.ɵef],
+                    declarations: [exports.ɵeh, exports.ɵei],
                     imports: [common.CommonModule, bbjWidgetBase.WidgetBaseModule, tabs.NzTabsModule],
                 },] }
     ];
@@ -21603,7 +22709,7 @@
         { type: bbjWidgetBase.WidgetService }
     ]; };
 
-    exports.ɵem = /** @class */ (function () {
+    exports.ɵep = /** @class */ (function () {
         function GanttComponent(ele) {
             this.ele = ele;
             this.contentRenderers = new Map();
@@ -21762,27 +22868,27 @@
         };
         return GanttComponent;
     }());
-    exports.ɵem.decorators = [
+    exports.ɵep.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-gantt',
                     template: "<!--<nz-date-picker [(ngModel)]=\"initDate\" (ngModelChange)=\"onChange(initDate)\"></nz-date-picker>-->\n<full-calendar *ngIf=\"calendarOptions\" [options]=\"calendarOptions\" ></full-calendar>\n<ng-template #fcEventContent let-data=\"data\">\n\n  <div class=\"progress\" nz-tooltip [nzTooltipTitle]=\"titleTemplate\" [ngStyle]=\"data.progressStyle\">\n    <span class=\"bar\" [ngStyle]=\"data.barStyle\">{{data.title}}</span>\n  </div>\n  <ng-template #titleTemplate><i nz-icon nzType=\"file\" style=\"margin-right: 8px\"></i> <span>{{data.title}}<br/>\u5F00\u59CB:{{data.start}}<br/>\u7ED3\u675F:{{data.end}}<br/>\u8FDB\u5EA6:{{data.progress}}</span></ng-template>\n</ng-template>\n\n",
                     styles: [":host ::ng-deep .fc-direction-ltr{height:100%}:host ::ng-deep .fc .fc-view-harness{padding-bottom:0!important}:host ::ng-deep .progress{overflow:hidden;height:var(--height);background-color:#f7f7f7;background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#fff5f5f5\",endColorstr=\"#fff9f9f9\",GradientType=0);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);border-radius:4px;width:100%}:host ::ng-deep .progress .bar{white-space:nowrap;width:0;height:100%;color:#fff;float:left;font-size:12px;text-align:center;align-items:center;display:flex;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#0e90d2;background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#ff149bdf\",endColorstr=\"#ff0480be\",GradientType=0);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-sizing:border-box;transition:width .6s ease}:host ::ng-deep .fc-license-message{display:none!important}:host ::ng-deep .fc table{font-size:17px!important}:host ::ng-deep .fc-resource .fc-datagrid-cell-main{font-size:var(--fontSize);color:var(--color);font-weight:var(--weight);font-family:var(--family);line-height:var(--lineHeight)}"]
                 },] }
     ];
-    exports.ɵem.ctorParameters = function () { return [
+    exports.ɵep.ctorParameters = function () { return [
         { type: i0.ElementRef }
     ]; };
-    exports.ɵem.propDecorators = {
+    exports.ɵep.propDecorators = {
         eventContent: [{ type: i0.ViewChild, args: ['fcEventContent', { static: true },] }]
     };
     __decorate([
         bbjWidgetBase.Property('头部名称', { type: 'string' }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "headerContent", void 0);
+    ], exports.ɵep.prototype, "headerContent", void 0);
     __decorate([
         bbjWidgetBase.Property('项目字体', { ui: { widget: 'myFont' } }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "contentFont", void 0);
+    ], exports.ɵep.prototype, "contentFont", void 0);
     __decorate([
         bbjWidgetBase.Property('系列颜色', {
             ui: {
@@ -21791,19 +22897,19 @@
             },
         }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "lineColor", void 0);
+    ], exports.ɵep.prototype, "lineColor", void 0);
     __decorate([
         bbjWidgetBase.Property('进度透明', { type: 'number', max: 1 }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "progressTransparency", void 0);
+    ], exports.ɵep.prototype, "progressTransparency", void 0);
     __decorate([
         bbjWidgetBase.Property('区域占比', { type: 'number' }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "areaRate", void 0);
+    ], exports.ɵep.prototype, "areaRate", void 0);
     __decorate([
         bbjWidgetBase.Property('进度条高度', { type: 'number' }),
         __metadata("design:type", Object)
-    ], exports.ɵem.prototype, "progressHeight", void 0);
+    ], exports.ɵep.prototype, "progressHeight", void 0);
     __decorate([
         bbjWidgetBase.Data({
             properties: {
@@ -21815,11 +22921,11 @@
             },
         }),
         __metadata("design:type", Array)
-    ], exports.ɵem.prototype, "data", void 0);
-    exports.ɵem = __decorate([
+    ], exports.ɵep.prototype, "data", void 0);
+    exports.ɵep = __decorate([
         bbjWidgetBase.Widget('甘特图', { group: 'component', image: 'assets/img/screen/gantt.png', icon: 'iconmokuai' }),
         __metadata("design:paramtypes", [i0.ElementRef])
-    ], exports.ɵem);
+    ], exports.ɵep);
 
     // import {FormsModule} from '@angular/forms';
     // import {NzDatePickerModule} from 'ng-zorro-antd/date-picker';
@@ -21832,13 +22938,13 @@
                 interactionPlugin__default['default'],
                 resourceTimelinePlugin__default['default'],
             ]);
-            widgetService.register(exports.ɵem);
+            widgetService.register(exports.ɵep);
         }
         return GanttModule;
     }());
     GanttModule.decorators = [
         { type: i0.NgModule, args: [{
-                    declarations: [exports.ɵem],
+                    declarations: [exports.ɵep],
                     imports: [
                         common.CommonModule,
                         bbjWidgetBase.WidgetBaseModule,
@@ -21854,7 +22960,7 @@
     var WorkbenchWidgetModule = /** @class */ (function () {
         function WorkbenchWidgetModule(widgetService) {
             widgetService.register(exports.ɵp, { option: {}, size: { width: 3, height: 3 } });
-            widgetService.register(exports.ɵeh, { option: {}, size: { width: 16, height: 12 } });
+            widgetService.register(exports.ɵek, { option: {}, size: { width: 16, height: 12 } });
             for (var i = 1; i <= 82; i++) {
                 widgetService.register(exports.ɵb, {
                     option: { image: "assets/img/screen/picture" + i + ".png", hideHead: true },
@@ -22302,7 +23408,7 @@
                     size: { width: 10, height: 10 },
                 });
             }
-            widgetService.register(exports.ɵec, { size: { width: 14, height: 6 } });
+            widgetService.register(exports.ɵef, { size: { width: 14, height: 6 } });
             widgetService.register(exports.ɵbo, {
                 option: {
                     image: 'assets/img/screen/table.png',
@@ -22426,6 +23532,7 @@
     exports.ScreenWidgetModule = ScreenWidgetModule;
     exports.SelectModule = SelectModule;
     exports.TableModule = TableModule;
+    exports.TiandituModule = TiandituModule;
     exports.TreeControlModule = TreeControlModule;
     exports.TreeRingChartModule = TreeRingChartModule;
     exports.VideoGridModule = VideoGridModule;
@@ -22470,11 +23577,12 @@
     exports.ɵdu = TemporaryDataModule;
     exports.ɵdw = LineLightFlowModule;
     exports.ɵe = LineBarChartModule;
-    exports.ɵeb = AnnouncementModule;
-    exports.ɵed = TabsModule;
-    exports.ɵeg = CalendarModule;
-    exports.ɵej = CalendarEventsChild;
-    exports.ɵel = GanttModule;
+    exports.ɵed = BaseLayer$1;
+    exports.ɵee = AnnouncementModule;
+    exports.ɵeg = TabsModule;
+    exports.ɵej = CalendarModule;
+    exports.ɵem = CalendarEventsChild;
+    exports.ɵeo = GanttModule;
     exports.ɵo = ButtonModule;
     exports.ɵq = HttpService;
     exports.ɵr = TimerModule;