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

package/CHANGELOG.md

@@ -129,3 +129,19 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-1969: 天津亿晟：组态中的历史曲线增加时间筛选刻度
+
+## 3.0.0-alpha.31(2021-12-16)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-1817: 组件更改其中一变量，其余变量应不生效，模板中删除、更改变量，删除与更改变量应不生效
+
+## 3.0.0-alpha.32(2022-05-17)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2100: 苏州水星：历史曲线组件支持Y轴自定义设定范围
+
+
+## 3.0.0-alpha.33(2022-07-08)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2171: 设备仪表盘:空气质量指数元件数值展示优化

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

@@ -26704,6 +26704,13 @@ var CurveType;
     CurveType[CurveType["BarStack"] = 2] = "BarStack";
 })(CurveType || (CurveType = {}));
 
+// CONCATENATED MODULE: ./.tmp/model/historical-curve/historical-curve-axis-settings.ts
+var AxisRangeType;
+(function (AxisRangeType) {
+    AxisRangeType[AxisRangeType["Auto"] = 0] = "Auto";
+    AxisRangeType[AxisRangeType["Custom"] = 1] = "Custom"; // 自定义范围
+})(AxisRangeType || (AxisRangeType = {}));
+
 // CONCATENATED MODULE: ./.tmp/elements/historical-curve/historical-curve.element.ts
 
 
@@ -26717,6 +26724,7 @@ var CurveType;
 
 
 
+
 class historical_curve_element_HistoricalCurveElement extends conditional_display_element_ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
@@ -26859,6 +26867,9 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         const chart = nv_d3["models"].lineChart().showLegend(true)
             .margin({ top: 0, bottom: 0, left: this.displayOption.marginLeft, right: this.displayOption.marginRight })
             .noData(this.localization.chartNoData);
+        if (this.model.displaySetting.axisSetting.yAxisRangeType === AxisRangeType.Custom) {
+            chart.yDomain([this.model.displaySetting.axisSetting.yAxisMin, this.model.displaySetting.axisSetting.yAxisMax]);
+        }
         if (!this.isMobileMode) {
             chart.focusEnable(true);
             chart.focus.margin({ top: 10, right: 0, bottom: 0, left: 0 });
@@ -26883,6 +26894,9 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             chart.multibar.stacked(true);
             chart.multibar2.stacked(true);
         }
+        if (this.model.displaySetting.axisSetting.yAxisRangeType === AxisRangeType.Custom) {
+            chart.yDomain([this.model.displaySetting.axisSetting.yAxisMin, this.model.displaySetting.axisSetting.yAxisMax]);
+        }
         if (!this.isMobileMode) {
             chart.focusEnable(true);
             chart.focusShowAxisX(false);
@@ -28008,6 +28022,9 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         if (!this.model.variableId) {
             return '';
         }
+        if (!this.model.variableId.variableName || !this.model.variableId.variableName.name) {
+            return undefined;
+        }
         const variable = new variable_definition["a" /* VariableDefinition */](this.model.variableId.variableName.name, this.model.variableId.variableName.groupName, this.model.variableId.dataSourceCode, this.model.variableId.variableName.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
@@ -28015,14 +28032,20 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         if (!this.model.minValueType) {
             return undefined;
         }
-        const variable = new variable_definition["a" /* VariableDefinition */](this.model.minVariable.variableName.name, this.model.minVariable.variableName.groupName, this.model.minVariable.dataSourceCode, this.model.minVariable.variableName.variableVersion);
+        if (!this.model.minVariable || !this.model.minVariable.name) {
+            return undefined;
+        }
+        const variable = new variable_definition["a" /* VariableDefinition */](this.model.minVariable.name, this.model.minVariable.groupName, this.model.minVariable.dataSourceCode, this.model.minVariable.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
     get maxVariableName() {
         if (!this.model.maxValueType) {
             return undefined;
         }
-        const variable = new variable_definition["a" /* VariableDefinition */](this.model.maxVariable.variableName.name, this.model.maxVariable.variableName.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableName.variableVersion);
+        if (!this.model.maxVariable || !this.model.maxVariable.name) {
+            return undefined;
+        }
+        const variable = new variable_definition["a" /* VariableDefinition */](this.model.maxVariable.name, this.model.maxVariable.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
     initFrameNode() {
@@ -28049,11 +28072,11 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
             this.isNeedUpdateScale = false;
             this.valueObj.value = value;
         }
-        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.variableName.name) === variableName) {
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
             this.isNeedUpdateScale = true;
             this.valueObj.min = value;
         }
-        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.variableName.name) === variableName) {
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
             this.isNeedUpdateScale = true;
             this.valueObj.max = value;
         }
@@ -30118,9 +30141,9 @@ class air_quality_element_AirQualityElement extends conditional_display_element_
         this.buildBackgroudRect(airQualitySvg, backgroundColor);
         this.buildLocGroup(airQualitySvg, airQuality.city, fontColor);
         this.buildAirQualityText(airQualitySvg, 130, 55, airQuality.aqi, fontColor, 53);
-        this.buildAirQualityText(airQualitySvg, 190, 28, '空气质量', fontColor);
+        this.buildAirQualityText(airQualitySvg, 220, 28, '空气质量', fontColor);
         this.buildRectBackgroundForAqi(airQualitySvg, airQuality.level);
-        this.buildAirQualityText(airQualitySvg, 190, 49, airQuality.category, fontColor);
+        this.buildAirQualityText(airQualitySvg, 220, 49, airQuality.category, fontColor);
         this.buildAirQualityText(airQualitySvg, 30, 75, 'PM2.5', fontColor, 12, 0.8);
         this.buildAirQualityText(airQualitySvg, 30, 95, airQuality.pm25, fontColor, 15);
         this.buildAirQualityText(airQualitySvg, 80, 75, 'PM10', fontColor, 12, 0.8);
@@ -30183,7 +30206,7 @@ class air_quality_element_AirQualityElement extends conditional_display_element_
             backgroundColor = '#A10E0E';
         }
         airQualitySvg.append('rect')
-            .attr('x', '165')
+            .attr('x', '195')
             .attr('y', '35')
             .attr('rx', '5')
             .attr('width', '50')
@@ -40776,7 +40799,7 @@ var shared = __webpack_require__(5);
 // EXTERNAL MODULE: ./.tmp/view/view.service.ts
 var view_service = __webpack_require__(31);
 
-// EXTERNAL MODULE: ./.tmp/gui/gui-view.ts + 122 modules
+// EXTERNAL MODULE: ./.tmp/gui/gui-view.ts + 123 modules
 var gui_view = __webpack_require__(29);
 
 // EXTERNAL MODULE: external "rxjs/operators"