@flexem/fc-gui 3.0.0-alpha.16 → 3.0.0-alpha.161

package/model/switch-indicator-light/switch-indicator-light.d.ts

@@ -1,33 +1,35 @@
-import { SwtichSettings } from './switch-settings';
-import { SwitchIndicatorState } from './switch-indicator-state';
-import { IndicatorLightSettings } from './indicator-light-settings';
-import { ConditionalEnableModel } from '../base/conditional-enable-model';
-import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
-import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
-import { SecurityModel } from '../base/security-model';
-export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
-    /**
-       * @type {(number)}
-       * @memberof GraphSetting
-       * @description 版本1增加动态行为设置
-       * @description 版本2增加固定点设置
-       */
-    readonly version?: number;
-    readonly id: number;
-    readonly category: string;
-    readonly useSwitch?: boolean;
-    readonly switchSettings?: SwtichSettings;
-    readonly useIndicatorLight?: boolean;
-    readonly indicatorLightSettings?: IndicatorLightSettings;
-    readonly states: SwitchIndicatorState[];
-    readonly useGraph?: boolean;
-    readonly graphSetting?: GraphSetting;
-    readonly location: Point;
-    readonly size: Size;
-    readonly isAwaysDisplay?: boolean;
-    readonly conditionItems?: ConditionItemModel[];
-    readonly dynamicSetting?: DynamicDisplayModel;
-    readonly isAwaysEnable?: boolean;
-    readonly enableItems?: ConditionItemModel[];
-    readonly fixedPositionType?: number;
-}
+import { SwtichSettings } from './switch-settings';
+import { SwitchIndicatorState } from './switch-indicator-state';
+import { IndicatorLightSettings } from './indicator-light-settings';
+import { ConditionalEnableModel } from '../base/conditional-enable-model';
+import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
+import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
+import { SecurityModel } from '../base/security-model';
+import { TextLibrarySetting } from '../base/font-setting-model';
+export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
+    /**
+       * @type {(number)}
+       * @memberof GraphSetting
+       * @description 版本1增加动态行为设置
+       * @description 版本2增加固定点设置
+       */
+    readonly version?: number;
+    readonly id: number;
+    readonly category: string;
+    readonly useSwitch?: boolean;
+    readonly switchSettings?: SwtichSettings;
+    readonly useIndicatorLight?: boolean;
+    readonly indicatorLightSettings?: IndicatorLightSettings;
+    readonly states: SwitchIndicatorState[];
+    readonly useGraph?: boolean;
+    readonly graphSetting?: GraphSetting;
+    readonly location: Point;
+    readonly size: Size;
+    readonly isAwaysDisplay?: boolean;
+    readonly conditionItems?: ConditionItemModel[];
+    readonly dynamicSetting?: DynamicDisplayModel;
+    readonly isAwaysEnable?: boolean;
+    readonly enableItems?: ConditionItemModel[];
+    readonly fixedPositionType?: number;
+    readonly textLibrary?: TextLibrarySetting;
+}

package/model/switch-indicator-light/switch-indicator-state.d.ts

@@ -1,8 +1,8 @@
-import { Text, Condition } from '../shared';
-import { FaultFlicker } from './fault-flicker';
-export interface SwitchIndicatorState {
-    readonly id: number;
-    readonly condition?: Condition;
-    readonly text: Text;
-    readonly faultFlicker?: FaultFlicker;
-}
+import { Text, Condition } from '../shared';
+import { FaultFlicker } from './fault-flicker';
+export interface SwitchIndicatorState {
+    readonly id: number;
+    readonly condition?: Condition;
+    readonly text: Text;
+    readonly faultFlicker?: FaultFlicker;
+}

package/model/switch-indicator-light/switch-settings.d.ts

@@ -1,7 +1,7 @@
-import { SwitchType } from './switch-type';
-import { WordSwitchSettings } from './word-switch-settings';
-import { BitSwitchSettings } from './bit-switch-settings';
-export interface SwtichSettings {
-    readonly type: SwitchType;
-    readonly settings: BitSwitchSettings | WordSwitchSettings;
-}
+import { SwitchType } from './switch-type';
+import { WordSwitchSettings } from './word-switch-settings';
+import { BitSwitchSettings } from './bit-switch-settings';
+export interface SwtichSettings {
+    readonly type: SwitchType;
+    readonly settings: BitSwitchSettings | WordSwitchSettings;
+}

package/model/switch-indicator-light/switch-type.d.ts

@@ -1,4 +1,4 @@
-export declare enum SwitchType {
-    Bit = 0,
-    Word = 1
-}
+export declare enum SwitchType {
+    Bit = 0,
+    Word = 1
+}

package/model/switch-indicator-light/switch-type.js

@@ -1,5 +1,5 @@
-export var SwitchType;
-(function (SwitchType) {
-    SwitchType[SwitchType["Bit"] = 0] = "Bit";
-    SwitchType[SwitchType["Word"] = 1] = "Word";
-})(SwitchType || (SwitchType = {}));
+export var SwitchType;
+(function (SwitchType) {
+    SwitchType[SwitchType["Bit"] = 0] = "Bit";
+    SwitchType[SwitchType["Word"] = 1] = "Word";
+})(SwitchType || (SwitchType = {}));

package/model/switch-indicator-light/word-indicator-light-settings.d.ts

@@ -1,6 +1,6 @@
-export interface WordIndicatorLightSettings {
-    readonly variableName: string;
-    readonly variableGroupName: string;
-    readonly dataSourceCode?: number;
-    readonly variableVersion?: number;
-}
+export interface WordIndicatorLightSettings {
+    readonly variableName: string;
+    readonly variableGroupName: string;
+    readonly dataSourceCode?: number;
+    readonly variableVersion?: number;
+}

package/model/switch-indicator-light/word-switch-operation.d.ts

@@ -1,5 +1,5 @@
-export declare enum WordSwitchOperation {
-    Add = 0,
-    Subtract = 1,
-    SetConstant = 2
-}
+export declare enum WordSwitchOperation {
+    Add = 0,
+    Subtract = 1,
+    SetConstant = 2
+}

package/model/switch-indicator-light/word-switch-operation.js

@@ -1,6 +1,6 @@
-export var WordSwitchOperation;
-(function (WordSwitchOperation) {
-    WordSwitchOperation[WordSwitchOperation["Add"] = 0] = "Add";
-    WordSwitchOperation[WordSwitchOperation["Subtract"] = 1] = "Subtract";
-    WordSwitchOperation[WordSwitchOperation["SetConstant"] = 2] = "SetConstant";
-})(WordSwitchOperation || (WordSwitchOperation = {}));
+export var WordSwitchOperation;
+(function (WordSwitchOperation) {
+    WordSwitchOperation[WordSwitchOperation["Add"] = 0] = "Add";
+    WordSwitchOperation[WordSwitchOperation["Subtract"] = 1] = "Subtract";
+    WordSwitchOperation[WordSwitchOperation["SetConstant"] = 2] = "SetConstant";
+})(WordSwitchOperation || (WordSwitchOperation = {}));

package/model/switch-indicator-light/word-switch-settings.d.ts

@@ -1,13 +1,13 @@
-import { WordSwitchOperation } from './word-switch-operation';
-export interface WordSwitchSettings {
-    readonly variableName: string;
-    readonly variableGroupName: string;
-    readonly dataSourceCode?: number;
-    readonly operation: WordSwitchOperation;
-    readonly operand: number;
-    readonly dataType?: number;
-    readonly isWriteOnly?: boolean;
-    readonly variableVersion?: number;
-    readonly minValue?: number;
-    readonly maxValue?: number;
-}
+import { WordSwitchOperation } from './word-switch-operation';
+export interface WordSwitchSettings {
+    readonly variableName: string;
+    readonly variableGroupName: string;
+    readonly dataSourceCode?: number;
+    readonly operation: WordSwitchOperation;
+    readonly operand: number;
+    readonly dataType?: number;
+    readonly isWriteOnly?: boolean;
+    readonly variableVersion?: number;
+    readonly minValue?: number;
+    readonly maxValue?: number;
+}

package/model/table/table-model.d.ts

@@ -1,9 +1,9 @@
-import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
-import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
-import { Point } from '../shared/point.model';
-export interface TableModel extends ConditionalDynamicDisplayModel {
-    readonly version?: number;
-    readonly dynamicSetting?: DynamicDisplayModel;
-    readonly fixedPositionType?: number;
-    readonly location: Point;
-}
+import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
+import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
+import { Point } from '../shared/point.model';
+export interface TableModel extends ConditionalDynamicDisplayModel {
+    readonly version?: number;
+    readonly dynamicSetting?: DynamicDisplayModel;
+    readonly fixedPositionType?: number;
+    readonly location: Point;
+}

package/model/text/text.model.d.ts

@@ -1,7 +1,7 @@
-import { GraphSetting } from '../shared';
-import { ConditionalDynamicDisplayModel } from '../base';
-import { FontSettingModel } from '../base/font-setting-model';
-export interface TextModel extends ConditionalDynamicDisplayModel, FontSettingModel {
-    readonly useGraph?: boolean;
-    readonly graphSetting?: GraphSetting;
-}
+import { GraphSetting } from '../shared';
+import { ConditionalDynamicDisplayModel } from '../base';
+import { FontSettingModel } from '../base/font-setting-model';
+export interface TextModel extends ConditionalDynamicDisplayModel, FontSettingModel {
+    readonly useGraph?: boolean;
+    readonly graphSetting?: GraphSetting;
+}

package/model/video/video.model.d.ts

@@ -1,8 +1,8 @@
-import { ConditionalDisplayModel } from '../base/conditional-display-model';
-import { Size } from '../shared/size.model';
-export interface VideoModel extends ConditionalDisplayModel {
-    readonly size: Size;
-    readonly version: number;
-    readonly videoTag?: string;
-    readonly location?: any;
-}
+import { ConditionalDisplayModel } from '../base/conditional-display-model';
+import { Size } from '../shared/size.model';
+export interface VideoModel extends ConditionalDisplayModel {
+    readonly size: Size;
+    readonly version: number;
+    readonly videoTag?: string;
+    readonly location?: any;
+}

package/model/view-operation/index.d.ts

@@ -1,2 +1,2 @@
-export { ViewOperationType } from './view-operation-type';
-export { ViewOperationElementModel } from './view-operation-element.model';
+export { ViewOperationType } from './view-operation-type';
+export { ViewOperationElementModel } from './view-operation-element.model';

package/model/view-operation/index.js

@@ -1 +1 @@
-export { ViewOperationType } from './view-operation-type';
+export { ViewOperationType } from './view-operation-type';

package/model/view-operation/view-operation-element.model.d.ts

@@ -1,19 +1,25 @@
-import { Size, Text, GraphSetting } from '../shared';
-import { ConditionalEnableModel } from '../base/conditional-enable-model';
-import { SecurityModel } from '../base';
-import { ViewOperationType } from './view-operation-type';
-export interface ViewOperationElementModel extends ConditionalEnableModel, SecurityModel {
-    /**
-     * 版本 2 : 动态行为调整
-     * 版本 3 ：使能控制调整
-     * 版本 4 ：新增操作记录
-     * 版本 5 ：新增页面操作类型，之前类型都为“切换页面”
-     */
-    readonly version?: number;
-    readonly viewIndex?: number;
-    readonly label: Text;
-    readonly size: Size;
-    readonly useGraph: boolean;
-    readonly graphSetting: GraphSetting;
-    readonly operationType: ViewOperationType;
-}
+import { Size, Text, GraphSetting } from '../shared';
+import { ConditionalEnableModel } from '../base/conditional-enable-model';
+import { SecurityModel } from '../base';
+import { ViewOperationType } from './view-operation-type';
+import { TextLibrarySetting } from '../base/font-setting-model';
+export interface ViewOperationElementModel extends ConditionalEnableModel, SecurityModel {
+    /**
+     * 版本 2 : 动态行为调整
+     * 版本 3 ：使能控制调整
+     * 版本 4 ：新增操作记录
+     * 版本 5 ：新增页面操作类型，之前类型都为"切换页面"
+     * 版本 6 ：新增文本库支持
+     */
+    readonly version?: number;
+    readonly viewIndex?: number;
+    readonly label: Text;
+    readonly size: Size;
+    readonly useGraph: boolean;
+    readonly graphSetting: GraphSetting;
+    readonly operationType: ViewOperationType;
+    /**
+     * 文本库配置（版本6新增）
+     */
+    readonly textLibrary?: TextLibrarySetting;
+}

package/model/view-operation/view-operation-type.d.ts

@@ -1,18 +1,18 @@
-export declare enum ViewOperationType {
-    /**
-     * 切换画面
-     */
-    ToggleView = 0,
-    /**
-     * 弹出画面
-     */
-    PopupView = 1,
-    /**
-     * 关闭画面
-     */
-    CloseView = 2,
-    /**
-     * 控制页面
-     */
-    ControlView = 3
-}
+export declare enum ViewOperationType {
+    /**
+     * 切换画面
+     */
+    ToggleView = 0,
+    /**
+     * 弹出画面
+     */
+    PopupView = 1,
+    /**
+     * 关闭画面
+     */
+    CloseView = 2,
+    /**
+     * 控制页面
+     */
+    ControlView = 3
+}

package/model/view-operation/view-operation-type.js

@@ -1,19 +1,19 @@
-export var ViewOperationType;
-(function (ViewOperationType) {
-    /**
-     * 切换画面
-     */
-    ViewOperationType[ViewOperationType["ToggleView"] = 0] = "ToggleView";
-    /**
-     * 弹出画面
-     */
-    ViewOperationType[ViewOperationType["PopupView"] = 1] = "PopupView";
-    /**
-     * 关闭画面
-     */
-    ViewOperationType[ViewOperationType["CloseView"] = 2] = "CloseView";
-    /**
-     * 控制页面
-     */
-    ViewOperationType[ViewOperationType["ControlView"] = 3] = "ControlView";
-})(ViewOperationType || (ViewOperationType = {}));
+export var ViewOperationType;
+(function (ViewOperationType) {
+    /**
+     * 切换画面
+     */
+    ViewOperationType[ViewOperationType["ToggleView"] = 0] = "ToggleView";
+    /**
+     * 弹出画面
+     */
+    ViewOperationType[ViewOperationType["PopupView"] = 1] = "PopupView";
+    /**
+     * 关闭画面
+     */
+    ViewOperationType[ViewOperationType["CloseView"] = 2] = "CloseView";
+    /**
+     * 控制页面
+     */
+    ViewOperationType[ViewOperationType["ControlView"] = 3] = "ControlView";
+})(ViewOperationType || (ViewOperationType = {}));

package/model/weather/weather-info.d.ts

@@ -1,11 +1,11 @@
-export declare class WeatherInfo {
-    hasAddress: boolean;
-    gettingAddress: boolean;
-    supported: boolean;
-    temperature: string;
-    humidity: string;
-    weatherPhenomenon: string;
-    weatherIcon: string;
-    wind: string;
-    location: string;
-}
+export declare class WeatherInfo {
+    hasAddress: boolean;
+    gettingAddress: boolean;
+    supported: boolean;
+    temperature: string;
+    humidity: string;
+    weatherPhenomenon: string;
+    weatherIcon: string;
+    wind: string;
+    location: string;
+}

package/model/weather/weather-info.js

@@ -1,2 +1,2 @@
-export class WeatherInfo {
-}
+export class WeatherInfo {
+}

package/model/weather/weather.model.d.ts

@@ -1,7 +1,7 @@
-import { Size } from '../shared';
-import { ConditionalDisplayModel } from '../base';
-export interface WeatherModel extends ConditionalDisplayModel {
-    size: Size;
-    stroke: string;
-    fill: string;
-}
+import { Size } from '../shared';
+import { ConditionalDisplayModel } from '../base';
+export interface WeatherModel extends ConditionalDisplayModel {
+    size: Size;
+    stroke: string;
+    fill: string;
+}

package/package.json

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

package/public_api.d.ts

@@ -1,14 +1,14 @@
-export { GuiComponent } from './gui/gui.component';
-export { GuiView } from './gui/gui-view';
-export { GuiContext } from './gui/gui-context';
-export * from './core';
-export * from './config';
-export * from './communication';
-export * from './model';
-export * from './localization';
-export * from './security';
-export * from './shared';
-export { GuiModule } from './gui.module';
-export * from './remote';
-export * from './service';
-export { LOGGER_SERVICE_TOKEN, LoggerService, ConsoleLoggerService } from './logger';
+export { GuiComponent } from './gui/gui.component';
+export { GuiView } from './gui/gui-view';
+export { GuiContext } from './gui/gui-context';
+export * from './core';
+export * from './config';
+export * from './communication';
+export * from './model';
+export * from './localization';
+export * from './security';
+export * from './shared';
+export { GuiModule } from './gui.module';
+export * from './remote';
+export * from './service';
+export { LOGGER_SERVICE_TOKEN, LoggerService, ConsoleLoggerService } from './logger';

package/public_api.js

@@ -1,11 +1,12 @@
-export { GuiComponent } from './gui/gui.component';
-export { GuiView } from './gui/gui-view';
-export * from './core';
-export * from './config';
-export * from './communication';
-export * from './model';
-export * from './localization';
-export * from './shared';
-export { GuiModule } from './gui.module';
-export * from './remote';
-export { LOGGER_SERVICE_TOKEN, ConsoleLoggerService } from './logger';
+export { GuiComponent } from './gui/gui.component';
+export { GuiView } from './gui/gui-view';
+export * from './core';
+export * from './config';
+export * from './communication';
+export * from './model';
+export * from './localization';
+export * from './shared';
+export { GuiModule } from './gui.module';
+export * from './remote';
+export * from './service';
+export { LOGGER_SERVICE_TOKEN, ConsoleLoggerService } from './logger';

package/remote/communication/variable/remote-variable-communicator.d.ts

@@ -1,30 +1,59 @@
-import { Observable } from 'rxjs';
-import { VariableCommunicator, VariableValue, VariableState } from '../../../communication';
-import { LoggerService } from '../../../logger';
-import { RemoteVariableProtocol } from './remote-variable-protocol';
-export declare class RemoteVariableCommunicator implements VariableCommunicator {
-    private readonly remoteVariableProtocol;
-    private readonly logger;
-    private observers;
-    private appIdVariablesMap;
-    private connectedSubscription;
-    private variableValuesChangedSubscription;
-    private variablesToBeOpened;
-    private variablesToBeClosed;
-    private variableValueCache;
-    private variableStateObservers;
-    private variableStatesChangedSubscription;
-    private variableStateCache;
-    private variableStatesToBeOpened;
-    private variableStatesToBeClosed;
-    constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
-    private doVariableValuesChanged;
-    private doVariableStatesChanged;
-    subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
-    subscribeVariableState(variableName: string): Observable<VariableState>;
-    openVariables(variableNames: string[], appId?: string): Observable<VariableValue[]>;
-    openVariable(variableName: string, appId?: string): Observable<VariableValue>;
-    write(variableName: string, value: any): Observable<VariableValue>;
-    writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
-    dispose(): void;
-}
+import { Observable } from 'rxjs';
+import { VariableCommunicator, VariableValue, VariableState } from '../../../communication';
+import { LoggerService } from '../../../logger';
+import { RemoteVariableProtocol } from './remote-variable-protocol';
+export declare class RemoteVariableCommunicator implements VariableCommunicator {
+    private readonly remoteVariableProtocol;
+    private readonly logger;
+    private observers;
+    private appIdVariablesMap;
+    private connectedSubscription;
+    private variableValuesChangedSubscription;
+    private virtualDeviceStatesChangedSubscription;
+    private variablesToBeOpened;
+    private variablesToBeClosed;
+    private variableValueCache;
+    private variableStateObservers;
+    private variableStatesChangedSubscription;
+    private variableStateCache;
+    private variableStatesToBeOpened;
+    private variableStatesToBeClosed;
+    private alarmObservers;
+    private alarmChangedSubscription;
+    private systemVariableHandlers;
+    private offlineValueCache;
+    constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
+    private doAlarmChanged;
+    private doVariableValuesChanged;
+    private doVirtualDeviceStatesChanged;
+    private doVariableStatesChanged;
+    /**
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用。
+     * 若状态推送早于接口返回，变量已在 Offline 状态，则直接推送；
+     * 否则缓存等待状态事件到来时推送。
+     */
+    setOfflineValueCache(variableName: string, value: any): void;
+    subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
+    subscribeVariableState(variableName: string): Observable<VariableState>;
+    requestVirtualDeviceState(): Observable<void>;
+    openVariables(variableNames: string[], appId?: string): Observable<VariableValue[]>;
+    openVariable(variableName: string, appId?: string): Observable<VariableValue>;
+    write(variableName: string, value: any): Observable<VariableValue>;
+    writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
+    subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
+    /**
+     * 注册系统变量处理器
+     * @param variableName 变量名（如"当前语种ID"）
+     * @param getValue 获取值的函数
+     * @param setValue 设置值的函数
+     */
+    registerSystemVariableHandler(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    /**
+     * 通知系统变量值变化
+     * 用于在系统变量值改变时通知所有订阅者
+     * @param variableName 变量名
+     * @param value 新值
+     */
+    notifySystemVariableChange(variableName: string, value: any): void;
+    dispose(): void;
+}