@flexem/fc-gui 3.0.0-alpha.169 → 3.0.0-alpha.170

package/elements/switch-indicator-light/switch-indicator-light-element.js

@@ -195,19 +195,20 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         }
     }
     initIndictorLightOperator() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const settings = this.model.indicatorLightSettings;
         if (settings.settings.variableName) {
             const variable = new VariableDefinition(settings.settings.variableName, settings.settings.variableGroupName, settings.settings.dataSourceCode, settings.settings.variableVersion);
             const convertedName = VariableUtil.getConvertedVariableName(this.variableStore, variable);
             this.addElementState(new VariableState(convertedName, undefined));
             this.initState();
-            const validNames = (_d = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.configStore) === null || _b === void 0 ? void 0 : _b.variableStore) === null || _c === void 0 ? void 0 : _c.getAllVariableNames) === null || _d === void 0 ? void 0 : _d.call(_c);
+            // 模拟模式下优先用后端 GetVariablesForDesigner 查出的有效变量(绑定了 manager)；
+            // 运行模式不填充 validVariableNames，回退到 variableStore.getAllVariableNames()
+            const validNames = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.validVariableNames) !== null && _b !== void 0 ? _b : (_f = (_e = (_d = (_c = this.guiContext) === null || _c === void 0 ? void 0 : _c.configStore) === null || _d === void 0 ? void 0 : _d.variableStore) === null || _e === void 0 ? void 0 : _e.getAllVariableNames) === null || _f === void 0 ? void 0 : _f.call(_e);
             if (validNames && !validNames.includes(convertedName)) {
                 this.updateElementStates([new VariableState(convertedName, VariableStateEnum.InvalidMonitor)]);
-                // 无效变量时先显示第一个状态样式，避免空白；
-                // 但仍继续初始化订阅，以便后续收到 Offline/Unbind 时能正确覆盖
                 this.switchToState(0);
+                return;
             }
         }
         switch (settings.type) {

package/gui/gui-context.d.ts

@@ -17,6 +17,12 @@ export interface GuiContext {
     readonly systemTextLibraryService?: SystemTextLibraryService;
     readonly configureViewId?: number;
     readonly configureViewCode?: string;
+    /**
+     * 模拟模式下由后端 GetVariablesForDesigner 查询出的"有效变量"名集合
+     * (IncludeCalculationVariable=true, HasRefVariable=true，即绑定了 manager 的变量)。
+     * 运行模式不填充，元件会回退到 variableStore.getAllVariableNames()。
+     */
+    readonly validVariableNames?: string[];
     readonly languageChanged$?: Subject<number | null>;
     getCurrentLanguageId?(): number | null;
     getDefaultLanguageId?(): number;

package/gui/gui-view.js

@@ -64,7 +64,7 @@ export class GuiView {
         this.logger.debug('[GUI] View loaded.');
     }
     loadElementState() {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.mainElement) {
             return;
         }
@@ -109,7 +109,7 @@ export class GuiView {
                 });
             normalVariablesForState.splice(normalVariablesForState.indexOf('设备状态'), 1);
         }
-        const validVariableNames = (_b = (_a = this.context.configStore.variableStore).getAllVariableNames) === null || _b === void 0 ? void 0 : _b.call(_a);
+        const validVariableNames = (_a = this.context.validVariableNames) !== null && _a !== void 0 ? _a : (_c = (_b = this.context.configStore.variableStore).getAllVariableNames) === null || _c === void 0 ? void 0 : _c.call(_b);
         if (validVariableNames) {
             const invalidVariables = normalVariablesForState.filter(name => !validVariableNames.includes(name));
             if (invalidVariables.length > 0) {

package/package.json

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