@flexem/fc-gui 3.0.0-alpha.33 → 3.0.0-alpha.37

package/CHANGELOG.md

@@ -145,3 +145,13 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-2171: 设备仪表盘:空气质量指数元件数值展示优化
+
+## 3.0.0-alpha.36(2022-09-02)
+### Web端
+#### Features
+    1. FLEXCLOUD-2218: 组态设计：历史曲线表，超过24小时，按天统计，X轴显示增加日期（年月日）
+
+## 3.0.0-alpha.37(2022-09-09)
+### Web端
+#### Features
+    1. FLEXCLOUD-2217: 设备仪表盘 & 运营仪表盘：组态页面，增加【主页】按钮，【刷新】按钮为当前页面刷新

package/bundles/@flexem/fc-gui.umd.js

@@ -22477,7 +22477,7 @@ var graph_store = __webpack_require__(249);
 var view_store = __webpack_require__(248);
 
 // EXTERNAL MODULE: ./.tmp/config/view/view.model.ts
-var view_model = __webpack_require__(28);
+var view_model = __webpack_require__(29);
 
 // EXTERNAL MODULE: ./.tmp/config/image/image-store.ts
 var image_store = __webpack_require__(247);
@@ -22625,7 +22625,7 @@ var global_settings = __webpack_require__(48);
 "use strict";
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
-var Subscriber = __webpack_require__(26);
+var Subscriber = __webpack_require__(27);
 
 // CONCATENATED MODULE: ./node_modules/rxjs/_esm5/internal/util/canReportError.js
 /** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */
@@ -23306,6 +23306,32 @@ function flattenUnsubscriptionErrors(errors) {
 /* 25 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ViewService; });
+/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_angular_core__WEBPACK_IMPORTED_MODULE_0__);
+var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+let ViewService = class ViewService {
+    constructor() {
+        this.toggleViews = new Map();
+    }
+};
+ViewService = __decorate([
+    Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Injectable"])()
+], ViewService);
+
+
+
+/***/ }),
+/* 26 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Guid; });
 class Guid {
@@ -23338,7 +23364,7 @@ class Guid {
 
 
 /***/ }),
-/* 26 */
+/* 27 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23587,7 +23613,7 @@ var SafeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 27 */
+/* 28 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23619,7 +23645,7 @@ class StringifyingMap {
 
 
 /***/ }),
-/* 28 */
+/* 29 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23632,7 +23658,7 @@ class ViewModel {
 
 
 /***/ }),
-/* 29 */
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26736,7 +26762,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             marginRight: 20,
             mobileMinWidth: 450,
             operationAreaHeight: 32,
-            operationAreaMarginTop: 10,
+            operationAreaMarginTop: 25,
             operationSelectFontSize: '16px',
             operationButtonWidth: 24,
             operationButtonHeight: 24,
@@ -26753,7 +26779,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         }, this.model.displaySetting.refreshInterval * 1000);
         this.isMobileMode = _tmp_settings["a" /* DisplayMode */].Mobile === injector.get(_tmp_settings["b" /* GlobalSettings */]).displayMode;
         if (this.isMobileMode) {
-            this.displayOption.operationAreaMarginTop = 20;
+            this.displayOption.operationAreaMarginTop = 35;
             if (this.model.displaySetting.size.width >= this.displayOption.mobileMinWidth) {
                 this.displayOption.operationAreaHeight = 68;
                 this.displayOption.operationSelectFontSize = '24px';
@@ -26919,7 +26945,12 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
     renderCommonProperty(chart, chartWidth, chartHeight, data) {
         chart.tooltip.headerFormatter(d => this.timeFormat(d, '%x %X'));
         if (this.model.displaySetting.showAxis) {
-            chart.xAxis.showMaxMin(true).tickFormat(d => this.timeFormat(d, '%X'));
+            chart.xAxis.showMaxMin(true).tickFormat(d => {
+                if (this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
+                    return this.timeFormat(d, '%y-%m-%d');
+                }
+                return this.timeFormat(Number(d), '%X');
+            });
             if (this.model.displaySetting.axisSetting) {
                 if (this.model.displaySetting.axisSetting.showAxisLabel && this.model.displaySetting.axisSetting.axisLabelFont) {
                     chart.xAxis.fontSize(this.model.displaySetting.axisSetting.axisLabelFont.fontSize);
@@ -26944,15 +26975,86 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             chart.update();
             this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         });
+        const fontSize = this.model.displaySetting.axisSetting.axisLabelFont.fontSize;
         this.rootElement.selectAll('.domain').style('stroke-opacity', 1);
         if (this.model.displaySetting.showAxis && this.model.displaySetting.axisSetting) {
             const axisColor = this.model.displaySetting.axisSetting.axisColor;
             this.rootElement.selectAll('.domain').style('stroke', axisColor);
             if (this.model.displaySetting.axisSetting.showAxisLabel) {
-                const fontSize = this.model.displaySetting.axisSetting.axisLabelFont.fontSize;
                 this.rootElement.selectAll('.nv-axisMaxMin').select('text').style('font-size', fontSize);
             }
         }
+        const self = this;
+        if (self.currentTimePeriod === 3 || self.currentTimePeriod === 4 || self.currentTimePeriod === 5) {
+            this.rootElement
+                .selectAll('.nv-x')
+                .selectAll('.tick')
+                .selectAll('text')
+                .data(function (d) {
+                return [self.timeFormat(Number(d), '%y-%m-%d'), self.timeFormat(Number(d), '%H:%M:%S')];
+            })
+                .enter()
+                .append('text')
+                .attr('class', 'full-date')
+                .attr('x', 0)
+                .attr('y', 0)
+                .attr('dy', '2.3em')
+                .style('text-anchor', 'middle')
+                .style('font-size', fontSize)
+                .text((d) => d);
+            this.rootElement
+                .selectAll('.nv-axisMaxMin-x')
+                .selectAll('text')
+                .data(function (d) {
+                return [self.timeFormat(Number(d), '%y-%m-%d'), self.timeFormat(Number(d), '%H:%M:%S')];
+            })
+                .enter()
+                .append('text')
+                .attr('class', 'full-date')
+                .attr('x', 0)
+                .attr('y', 0)
+                .attr('dy', '2.3em')
+                .style('text-anchor', 'middle')
+                .style('font-size', fontSize)
+                .text((d) => d);
+            const h = this.rootElement
+                .selectAll('.nv-focusWrap')
+                .attr('transform')
+                .slice(0, -1)
+                .split(',')[1];
+            this.rootElement
+                .selectAll('.nv-focusWrap')
+                .attr('transform', `translate(0,${Number(h) + 15})`);
+            const resizeObserver = new window.MutationObserver(() => {
+                this.rootElement
+                    .selectAll('.nv-x')
+                    .selectAll('.tick')
+                    .selectAll('.full-date')
+                    .remove();
+                this.rootElement
+                    .selectAll('.nv-x')
+                    .selectAll('.tick')
+                    .selectAll('text')
+                    .data(function (d) {
+                    return [self.timeFormat(Number(d), '%y-%m-%d'), self.timeFormat(Number(d), '%H:%M:%S')];
+                })
+                    .enter()
+                    .append('text')
+                    .attr('class', 'full-date')
+                    .attr('x', 0)
+                    .attr('y', 0)
+                    .attr('dy', '2.3em')
+                    .style('text-anchor', 'middle')
+                    .style('font-size', fontSize)
+                    .text((d) => d);
+            });
+            resizeObserver.observe(document.getElementsByClassName('extent')[0], { attributes: true });
+        }
+        else {
+            this.rootElement
+                .selectAll('.full-date')
+                .remove();
+        }
     }
     renderOperationArea(chartWidth, chartHeight) {
         const operationArea = this.rootElement.append('g').attr('transform', `translate(0,${chartHeight + this.displayOption.operationAreaMarginTop})`)
@@ -28439,7 +28541,7 @@ class CurrentStateIdValue {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/binary.ts
-var binary = __webpack_require__(30);
+var binary = __webpack_require__(31);
 
 // CONCATENATED MODULE: ./.tmp/elements/switch-indicator-light/bit-indicator-light-operator.ts
 
@@ -29382,7 +29484,7 @@ function defaultTouchable() {
 
 
 // EXTERNAL MODULE: ./.tmp/view/view.service.ts
-var view_service = __webpack_require__(31);
+var view_service = __webpack_require__(25);
 
 // CONCATENATED MODULE: ./.tmp/elements/view-operation/view-operation.element.ts
 
@@ -29694,7 +29796,7 @@ class hyperlink_element_HyperlinkElement extends conditional_dynamic_display_ele
 }
 
 // EXTERNAL MODULE: ./.tmp/utils/guid.ts
-var guid = __webpack_require__(25);
+var guid = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./.tmp/elements/video/video-element.ts
 
@@ -30880,7 +30982,7 @@ class gui_view_GuiView {
 
 
 /***/ }),
-/* 30 */
+/* 31 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30924,32 +31026,6 @@ class Binary {
 }
 
 
-/***/ }),
-/* 31 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ViewService; });
-/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_angular_core__WEBPACK_IMPORTED_MODULE_0__);
-var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-
-let ViewService = class ViewService {
-    constructor() {
-        this.toggleViews = new Map();
-    }
-};
-ViewService = __decorate([
-    Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Injectable"])()
-], ViewService);
-
-
-
 /***/ }),
 /* 32 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -40538,7 +40614,7 @@ var tslib_es6 = __webpack_require__(11);
 var Observable = __webpack_require__(14);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
-var Subscriber = __webpack_require__(26);
+var Subscriber = __webpack_require__(27);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscription.js + 1 modules
 var Subscription = __webpack_require__(24);
@@ -40797,10 +40873,10 @@ var logger = __webpack_require__(8);
 var shared = __webpack_require__(5);
 
 // EXTERNAL MODULE: ./.tmp/view/view.service.ts
-var view_service = __webpack_require__(31);
+var view_service = __webpack_require__(25);
 
 // EXTERNAL MODULE: ./.tmp/gui/gui-view.ts + 123 modules
-var gui_view = __webpack_require__(29);
+var gui_view = __webpack_require__(30);
 
 // EXTERNAL MODULE: external "rxjs/operators"
 var operators_ = __webpack_require__(16);
@@ -40981,7 +41057,7 @@ class gui_host_GuiHost {
 }
 
 // EXTERNAL MODULE: ./.tmp/utils/guid.ts
-var guid = __webpack_require__(25);
+var guid = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./.tmp/gui/gui.component.ts
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return gui_component_GuiComponent; });
@@ -41000,6 +41076,7 @@ var __param = (undefined && undefined.__param) || function (paramIndex, decorato
 
 
 
+
 let gui_component_GuiComponent = class GuiComponent {
     constructor(el, localization, injector, bsModalService) {
         this.el = el;
@@ -41011,6 +41088,7 @@ let gui_component_GuiComponent = class GuiComponent {
         this.lastScale = 1;
         this.isMobileMode = false;
         this.globalSettings = this.injector.get(settings["b" /* GlobalSettings */]);
+        this.viewService = injector.get(view_service["a" /* ViewService */]);
     }
     get viewResizeMode() {
         switch (this.resizeMode) {
@@ -41113,11 +41191,11 @@ let gui_component_GuiComponent = class GuiComponent {
             this.$svg = $(this.el.nativeElement).find('div.svgView').first();
             this.$svg.empty();
             const svgRootClass = 'S' + guid["a" /* Guid */].newGuid().toString('n');
-            const hostContainerId = 'H' + guid["a" /* Guid */].newGuid().toString('n');
+            this.hostContainerId = 'H' + guid["a" /* Guid */].newGuid().toString('n');
             this.$svg.addClass(svgRootClass);
             const guiOptions = {
                 svgRootClass: svgRootClass,
-                hostContainerId: hostContainerId,
+                hostContainerId: this.hostContainerId,
                 el: this.el
             };
             const host = new gui_host_GuiHost(this.injector, this.bsModalService, newValue, guiOptions, this.el);
@@ -41172,6 +41250,16 @@ let gui_component_GuiComponent = class GuiComponent {
         this.isMobileMode = this.displayMode === 'Mobile';
         this.globalSettings.displayMode = this.isMobileMode ? settings["a" /* DisplayMode */].Mobile : settings["a" /* DisplayMode */].Web;
     }
+    refreshCurrentPage() {
+        const viewIndex = this.host.currentViewIndex;
+        if (null != viewIndex) {
+            const toggleView = this.viewService.toggleViews.get(this.el);
+            if (!toggleView) {
+                return;
+            }
+            toggleView(viewIndex, this.hostContainerId, this.el).subscribe();
+        }
+    }
 };
 __decorate([
     Object(core_["Input"])()
@@ -61228,7 +61316,7 @@ access_permission_service_AccessPermissionService = __decorate([
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _stringifying_map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
+/* harmony import */ var _stringifying_map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _stringifying_map__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
 
@@ -62465,7 +62553,7 @@ var operators_ = __webpack_require__(16);
 var _tmp_config = __webpack_require__(12);
 
 // EXTERNAL MODULE: ./.tmp/core/stringifying-map.ts
-var stringifying_map = __webpack_require__(27);
+var stringifying_map = __webpack_require__(28);
 
 // CONCATENATED MODULE: ./.tmp/remote/config/graph/remote-graph-store.ts
 
@@ -62574,7 +62662,7 @@ class remote_graph_store_RemoteGraphStore {
 var remote_view_protocol = __webpack_require__(76);
 
 // EXTERNAL MODULE: ./.tmp/config/view/view.model.ts
-var view_model = __webpack_require__(28);
+var view_model = __webpack_require__(29);
 
 // CONCATENATED MODULE: ./.tmp/remote/config/view/remote-view-store.ts
 
@@ -63103,7 +63191,7 @@ class RelationConditionResultState {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/binary.ts
-var binary = __webpack_require__(30);
+var binary = __webpack_require__(31);
 
 // CONCATENATED MODULE: ./.tmp/model/shared/condition/bit-condition-item-observer.ts
 
@@ -64687,7 +64775,7 @@ var isScheduler = __webpack_require__(50);
 var tslib_es6 = __webpack_require__(11);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
-var Subscriber = __webpack_require__(26);
+var Subscriber = __webpack_require__(27);
 
 // CONCATENATED MODULE: ./node_modules/rxjs/_esm5/internal/InnerSubscriber.js
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
@@ -70840,7 +70928,7 @@ var fraction_digit_service = __webpack_require__(44);
 var numerical_operation_service = __webpack_require__(41);
 
 // EXTERNAL MODULE: ./.tmp/view/view.service.ts
-var view_service = __webpack_require__(31);
+var view_service = __webpack_require__(25);
 
 // EXTERNAL MODULE: ./.tmp/logger/index.ts + 2 modules
 var logger = __webpack_require__(8);
@@ -83387,7 +83475,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _gui_gui_component__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GuiComponent", function() { return _gui_gui_component__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-/* harmony import */ var _gui_gui_view__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
+/* harmony import */ var _gui_gui_view__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GuiView", function() { return _gui_gui_view__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
 /* harmony import */ var _gui_gui_context__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85);