bbj-screen-widget 2.4.57 → 2.4.58

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

@@ -19110,7 +19110,7 @@
         __metadata("design:type", Object)
     ], exports.ɵdt.prototype, "dataChange", void 0);
     exports.ɵdt = __decorate([
-        bbjWidgetBase.Widget('临时数据'),
+        bbjWidgetBase.Widget('临时数据', { group: 'component', image: 'assets/img/screen/temporary-data.png', icon: 'iconmokuai' }),
         __metadata("design:paramtypes", [i0.Renderer2, i0.ElementRef])
     ], exports.ɵdt);
 
@@ -19431,7 +19431,7 @@
         __metadata("design:returntype", void 0)
     ], exports.ɵdw.prototype, "setUrl", null);
     exports.ɵdw = __decorate([
-        bbjWidgetBase.Widget('iframe'),
+        bbjWidgetBase.Widget('iframe', { group: 'component', image: 'assets/img/screen/iframe.png', icon: 'iconmokuai' }),
         __metadata("design:paramtypes", [])
     ], exports.ɵdw);
 
@@ -19578,7 +19578,7 @@
         __metadata("design:type", Object)
     ], exports.ɵdy.prototype, "data", void 0);
     exports.ɵdy = __decorate([
-        bbjWidgetBase.Widget('视频宫格'),
+        bbjWidgetBase.Widget('视频宫格', { group: 'component', image: 'assets/img/screen/video-grid.png', icon: 'iconmokuai' }),
         __metadata("design:paramtypes", [])
     ], exports.ɵdy);
 
@@ -19888,13 +19888,13 @@
                 },
             });
             widgetService.register(exports.ɵbp, {
-                title: '我的视频一号',
+                title: '视频demo',
                 option: {
                     type: 'video',
                     src: 'https://xiche.oss-cn-beijing.aliyuncs.com/video/20180417154421.mp4',
                 },
             }, {
-                title: '我的视频二号',
+                title: '音频demo',
                 option: {
                     type: 'audio',
                     src: 'https://xiche.oss-cn-beijing.aliyuncs.com/video/20180417154421.mp4',
@@ -20333,6 +20333,17 @@
         { type: bbjWidgetBase.WidgetService }
     ]; };
 
+    var dayFormat = 'yyyy-MM-dd';
+    /**
+     * 如果结束时间是仅日期的格式，加上一天
+     * @param event
+     */
+    function updateEndTime(event) {
+        if (typeof event.end === 'string' && dateFns.isMatch(event.end, dayFormat)) {
+            event.end = dateFns.format(dateFns.addDays(dateFns.parse(event.end, dayFormat, new Date()), 1), dayFormat);
+        }
+    }
+
     var ɵ0$d = { type: 'string', title: 'id' };
     exports.ɵeg = /** @class */ (function () {
         function CalendarComponent(router, cd) {
@@ -20347,7 +20358,7 @@
                 { end: '2020-07-22', start: '2020-07-20', title: 'event 5' },
             ];
             this.dataClick = new i0.EventEmitter();
-            this.typeChange = new i0.EventEmitter();
+            this.datesSetChange = new i0.EventEmitter();
             this.eventMap = new Map();
             this.eventClick = function (event) {
                 _this.dataClick.emit({ id: event.id, title: event.title });
@@ -20358,9 +20369,13 @@
             var _a;
             if (changes.data) {
                 if ((_a = this.data) === null || _a === void 0 ? void 0 : _a.length) {
-                    var events = this.data.map(function (item) { return (Object.assign(Object.assign({}, item), { extendedProps: {
-                            eventClick: _this.eventClick,
-                        } })); });
+                    var events = this.data.map(function (item) {
+                        var event = Object.assign(Object.assign({}, item), { extendedProps: {
+                                eventClick: _this.eventClick,
+                            } });
+                        updateEndTime(event);
+                        return event;
+                    });
                     this.setEvents(this.id, events);
                 }
                 else {
@@ -20435,9 +20450,12 @@
                     // this.dataClick.emit({ id: info.event.id, title: info.event.title });
                 },
                 datesSet: function (arg) {
+                    console.log(arg);
                     var type = arg.view.type;
                     type = type.substring(type.indexOf('Grid') + 4).toLowerCase();
-                    _this.typeChange.emit(type);
+                    var start = dateFns.format(arg.start, 'yyyy-MM-dd');
+                    var end = dateFns.format(arg.end, 'yyyy-MM-dd');
+                    _this.datesSetChange.emit({ type: type, start: start, end: end });
                 },
             };
             this.cd.markForCheck();
@@ -20479,9 +20497,15 @@
         __metadata("design:type", Object)
     ], exports.ɵeg.prototype, "dataClick", void 0);
     __decorate([
-        bbjWidgetBase.DataOutput('视图类型'),
+        bbjWidgetBase.DataOutput({
+            properties: {
+                type: { type: 'string', title: '视图类型' },
+                start: { type: 'string', title: '开始时间' },
+                end: { type: 'string', title: '结束时间' },
+            },
+        }, { triggerLink: false }),
         __metadata("design:type", Object)
-    ], exports.ɵeg.prototype, "typeChange", void 0);
+    ], exports.ɵeg.prototype, "datesSetChange", void 0);
     exports.ɵeg = __decorate([
         bbjWidgetBase.Widget('日历', {
             group: 'component',
@@ -20497,17 +20521,9 @@
             this.parent = parent;
         }
         CalendarEventsChild.prototype.ngOnChanges = function (changes) {
-            var _this = this;
             if (changes.data) {
                 if (this.data) {
                     var events = this.getEvents(this.data);
-                    if (events && this.eventClick) {
-                        events = events.map(function (event) {
-                            return Object.assign(Object.assign({}, event), { extendedProps: {
-                                    eventClick: _this.eventClick,
-                                } });
-                        });
-                    }
                     this.parent.setEvents(this.id, events);
                 }
                 else {
@@ -20547,6 +20563,7 @@
                 if (!event.color && _this.color) {
                     event.color = _this.color;
                 }
+                updateEndTime(event);
                 return event;
             });
         };
@@ -20607,10 +20624,13 @@
         EventsComponent.prototype.getEvents = function (data) {
             var _this = this;
             return data.map(function (item) {
-                var event = Object.assign({}, item);
+                var event = Object.assign(Object.assign({}, item), { extendedProps: {
+                        eventClick: _this.eventClick,
+                    } });
                 if (!event.color && _this.color) {
                     event.color = _this.color;
                 }
+                updateEndTime(event);
                 return event;
             });
         };
@@ -20745,7 +20765,7 @@
     ], exports.ɵed.prototype, "tabBarGutter", void 0);
     exports.ɵed = __decorate([
         bbjWidgetBase.Widget('标签页', {
-            group: 'component',
+            group: 'component', image: 'assets/img/screen/tabs.png', icon: 'iconmokuai',
             children: [
                 {
                     title: '选项卡1',
@@ -21186,13 +21206,13 @@
                 size: { width: 7, height: 3 },
             });
             widgetService.register(exports.ɵbp, {
-                title: '我的视频一号',
+                title: '视频demo',
                 option: {
                     type: 'video',
                     src: 'https://xiche.oss-cn-beijing.aliyuncs.com/video/20180417154421.mp4',
                 },
             }, {
-                title: '我的视频二号',
+                title: '音频demo',
                 option: {
                     type: 'audio',
                     src: 'https://xiche.oss-cn-beijing.aliyuncs.com/video/20180417154421.mp4',