@flexem/fc-gui 3.0.0-alpha.175 → 3.0.0-alpha.177

package/elements/base/readable-element.js

@@ -95,7 +95,7 @@ export class ReadableElement extends ConditionalEnableElement {
                         name = isTraditionalChinese ? '離線' : (isChinese ? '离线' : 'Offline');
                         break;
                     case 4:
-                        name = isTraditionalChinese ? '告警' : (isChinese ? '告警' : 'Alarming');
+                        name = isTraditionalChinese ? '告警' : (isChinese ? '告警' : 'Alarm');
                         break;
                     case 5:
                         name = isTraditionalChinese ? '未綁定' : (isChinese ? '未绑定' : 'Unbound');
@@ -103,6 +103,9 @@ export class ReadableElement extends ConditionalEnableElement {
                     default:
                 }
             }
+            if (value.state === 4) {
+                name = isTraditionalChinese ? '告警' : (isChinese ? '告警' : 'Alarm');
+            }
             this.updateVariableValue(name, '设备状态');
             return; // 处理完"设备状态"后直接返回
         }

package/elements/historical-curve/historical-curve.element.js

@@ -627,27 +627,24 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             .style('margin-left', this.displayOption.marginLeft + 'px')
             .style('vertical-align', 'middle');
         const selectedText = this.timePeriods.find(t => t.key === Number(this.currentTimePeriod));
+        const arrowIconUrl = 'url("data:image/svg+xml,'
+            + '%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%228%22 height=%225%22 viewBox=%220 0 8 5%22%3E'
+            + '%3Cpath d=%22M0 0L4 5L8 0z%22 fill=%22%23666%22/%3E%3C/svg%3E")';
         const dropdownTrigger = dropdownWrapper.append('div')
             .attr('class', 'hc-dropdown-trigger')
             .style('background-color', backgroundColor)
+            .style('background-image', arrowIconUrl)
+            .style('background-repeat', 'no-repeat')
+            .style('background-position', 'right 4px center')
             .style('font-size', this.displayOption.operationSelectFontSize)
             .style('cursor', 'pointer')
             .style('padding', '0 18px 0 4px')
             .style('border', '1px solid #ccc')
             .style('border-radius', '2px')
-            .style('position', 'relative')
             .style('white-space', 'nowrap')
             .style('line-height', (this.displayOption.operationAreaHeight - 8) + 'px')
             .style('min-height', (this.displayOption.operationAreaHeight - 8) + 'px')
             .text(selectedText ? selectedText.name : '');
-        dropdownTrigger.append('span')
-            .style('position', 'absolute')
-            .style('right', '4px')
-            .style('top', '50%')
-            .style('transform', 'translateY(-50%)')
-            .style('font-size', '10px')
-            .style('pointer-events', 'none')
-            .text('▼');
         const dropdownListEl = document.createElement('div');
         dropdownListEl.style.cssText = 'display:none;position:fixed;background:' + dropdownBg
             + ';border:1px solid #ccc;border-radius:2px;z-index:9999;box-shadow:0 2px 6px rgba(0,0,0,0.15);';
@@ -685,14 +682,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 const currentPeriod = this.timePeriods.find(p => p.key === tp.key);
                 const currentName = currentPeriod ? currentPeriod.name : tp.name;
                 dropdownTrigger.text(currentName);
-                dropdownTrigger.append('span')
-                    .style('position', 'absolute')
-                    .style('right', '4px')
-                    .style('top', '50%')
-                    .style('transform', 'translateY(-50%)')
-                    .style('font-size', '10px')
-                    .style('pointer-events', 'none')
-                    .text('▼');
                 // 更新选中状态
                 dropdownList.selectAll('.hc-dropdown-item')
                     .classed('hc-dropdown-selected', false)
@@ -822,8 +811,15 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0));
         const defaultEnd = this.fmtDatetimeLocal(this.customEndTime ? this.customEndTime.toDate()
             : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59));
+        // 临时将 <html lang> 切换为当前应用语言，使原生 datetime-local
+        // 弹出日历的 UI（星期/月份文字等）跟随应用语种显示，关闭时还原
+        const currentLang = this.getCurrentCulture();
+        const prevDocLang = document.documentElement.lang;
+        document.documentElement.lang = currentLang;
         const overlay = document.createElement('div');
         overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.5);z-index:9999;';
+        // 部分浏览器可直接读取元素上的 lang 属性来本地化原生控件
+        overlay.lang = currentLang;
         const modal = document.createElement('div');
         let modalCss = 'position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);'
             + 'background:#fff;border-radius:4px;';
@@ -839,7 +835,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         header.style.cssText = 'display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-bottom:1px solid #e8e8e8;';
         const title = document.createElement('span');
         title.style.cssText = 'font-size:16px;font-weight:500;color:#333;';
-        title.textContent = this.getTimePeriodText(TIME_PERIOD_KEYS.CUSTOM);
+        title.textContent = this.localization.customTimeRange;
         const closeBtn = document.createElement('span');
         closeBtn.style.cssText = 'cursor:pointer;font-size:18px;color:#999;line-height:1;';
         closeBtn.textContent = '×';
@@ -854,6 +850,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const startInput = document.createElement('input');
         startInput.type = 'datetime-local';
         startInput.setAttribute('step', '1');
+        startInput.setAttribute('lang', currentLang);
         startInput.value = defaultStart;
         startInput.style.cssText = inputStyle;
         const separator = document.createElement('span');
@@ -862,6 +859,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const endInput = document.createElement('input');
         endInput.type = 'datetime-local';
         endInput.setAttribute('step', '1');
+        endInput.setAttribute('lang', currentLang);
         endInput.value = defaultEnd;
         endInput.style.cssText = inputStyle;
         body.appendChild(label);
@@ -884,6 +882,8 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         overlay.appendChild(modal);
         document.body.appendChild(overlay);
         const close = (revert) => {
+            // 还原弹窗打开前的 <html lang>，避免影响页面其他部分
+            document.documentElement.lang = prevDocLang;
             document.body.removeChild(overlay);
             if (revert) {
                 const selectEl = this.$element && this.$element.find('select');

package/localization/localization.service.d.ts

@@ -3,6 +3,7 @@ export declare const LOCALIZATION: InjectionToken<Localization>;
 export interface Localization {
     loadFailed: any;
     setting: any;
+    save: any;
     submit: any;
     submitting: any;
     numericalValueRequired: any;

package/localization/localization.service.js

@@ -2,7 +2,8 @@ import { InjectionToken } from '@angular/core';
 export const LOCALIZATION = new InjectionToken('fc.gui.loc');
 export const DefaultLocalization = {
     loadFailed: 'Load failed.',
-    setting: 'Setting',
+    setting: 'Setting ',
+    save: 'Save',
     submit: 'Submit',
     submitting: 'Submitting···',
     numericalValueRequired: 'Numerical value can\'t be emtpy',
@@ -47,7 +48,7 @@ export const DefaultLocalization = {
     endTime: 'End Time',
     grouped: 'Grouped',
     stacked: 'Stacked',
-    passwordVerify: 'Password verifiers',
+    passwordVerify: 'Password Verification',
     passwordError: 'Password error',
     password: 'Password',
     passwordToolTip: 'Password error, please re-enter',

package/localization/localization.service.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","invalidMonitor":"Element binding monitor point is invalid","variableChanged":"Variable changed, please re-import the device template","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 6 months","customTimeRange":"Custom","timeRange":"Time Range","startTime":"Start Time","endTime":"End Time","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting ","save":"Save","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","invalidMonitor":"Element binding monitor point is invalid","variableChanged":"Variable changed, please re-import the device template","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 6 months","customTimeRange":"Custom","timeRange":"Time Range","startTime":"Start Time","endTime":"End Time","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password Verification","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]

package/localization/localization.service.zh_CN.js

@@ -2,6 +2,7 @@ export const Localization_zh_CN = {
     loadFailed: '加载失败.',
     setting: '设置',
     submit: '提交',
+    save: '保存',
     submitting: '提交中···',
     numericalValueRequired: '数值不能为空',
     invalidNumericalValue: '数值格式不正确',

package/localization/localization.service.zh_CN.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","submitting":"提交中···","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","writeValueTimeout":"写值错误：超时","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","invalidMonitor":"元件绑定的监控点无效","variableChanged":"变量已变更，请重新导入设备模板","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastThirtyMinutes":"最近30分钟","lastOneHour":"最近1小时","lastEightHour":"最近8小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近半年","customTimeRange":"自定义","timeRange":"时间范围","startTime":"开始时间","endTime":"结束时间","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","save":"保存","submitting":"提交中···","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","writeValueTimeout":"写值错误：超时","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","invalidMonitor":"元件绑定的监控点无效","variableChanged":"变量已变更，请重新导入设备模板","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastThirtyMinutes":"最近30分钟","lastOneHour":"最近1小时","lastEightHour":"最近8小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近半年","customTimeRange":"自定义","timeRange":"时间范围","startTime":"开始时间","endTime":"结束时间","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.175",
+	"version": "3.0.0-alpha.177",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",