@ticatec/uniface-flexi-module 0.2.0 → 0.2.1

package/dist/criteria-panel/lib/FlexiCriteriaField.js

@@ -14,7 +14,7 @@ export default class FlexiCriteriaField {
         this.#set = set;
         this.visible = schema.visible != false;
         this.size = schema.size;
-        this.label = schema.label.startsWith("@") ? utils.getVariable(schema.label) : schema.label;
+        this.label = schema.label.startsWith("@") ? utils.getScopeVariable(schema.label) : schema.label;
         if (schema.events) {
             for (let key in schema.events) {
                 let eventHandler = schema.events[key];

package/dist/flexi-datatable/FlexiDataTable.js

@@ -33,7 +33,7 @@ export default class FlexiDataTable {
             const render = colSchema.render ? this[colSchema.render] : null;
             const compareFunction = colSchema.compareFunction ? this[colSchema.compareFunction] : null;
             const column = {
-                text: colSchema.text.startsWith("@") ? utils.getVariable(colSchema.text) : colSchema.text,
+                text: colSchema.text.startsWith("@") ? utils.getScopeVariable(colSchema.text) : colSchema.text,
                 field: colSchema.field,
                 frozen: colSchema.frozen,
                 align: colSchema.align,

package/dist/flexi-form/flexi_field/FlexiField.js

@@ -24,7 +24,7 @@ export default class FlexiField {
     constructor(parent, data, mode, schema) {
         this.#parent = parent;
         this.mode = mode;
-        this.label = schema.label.startsWith("@") ? utils.getVariable(schema.label) : schema.label;
+        this.label = schema.label.startsWith("@") ? utils.getScopeVariable(schema.label) : schema.label;
         this.variant = schema.variant;
         this.isReadonly = schema.readonly == true;
         this.disabled = schema.disabled == true;

package/dist/utils.d.ts

@@ -7,6 +7,6 @@ declare const _default: {
     };
     formatText: (s: string, obj: any) => string;
     propsFilter: (attrs: any, excludes?: Array<string>) => any;
-    getVariable: (key: string) => any;
+    getScopeVariable: (key: string) => any;
 };
 export default _default;

package/dist/utils.js

@@ -5,14 +5,20 @@ const propsFilter = (attrs, excludes = []) => {
     }
     return obj;
 };
-const getVariable = (key) => {
-    let attrs = key.split('.');
-    if (attrs.length == 2) {
-        // @ts-ignore
-        return window[attrs[0]]?.[attrs[1]] ?? `Missing value ${key}`;
+const getScopeVariable = (key) => {
+    if (key.startsWith("@")) {
+        let attrs = key.substring(1).split('.');
+        if (attrs.length == 2) {
+            let varName = attrs[0];
+            // @ts-ignore
+            return globalThis[varName]?.[attrs[1]] ?? `Missing value:${key}`;
+        }
+        else {
+            return `Missing key:${key}`;
+        }
     }
     else {
-        return `Invalid key: ${key}`;
+        return key;
     }
 };
 const copyAttrs = (src, attrs) => {
@@ -62,4 +68,4 @@ const formatText = (s, obj) => {
         return obj.hasOwnProperty(key) ? String(obj[key]) : `{{${key}}}`;
     });
 };
-export default { copyAttrs, extractExpression, getParentAndKey, formatText, propsFilter, getVariable };
+export default { copyAttrs, extractExpression, getParentAndKey, formatText, propsFilter, getScopeVariable };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-flexi-module",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A flexible form framework for Svelte applications with dynamic field types, criteria panels, and modular components",
   "keywords": [
     "svelte",