@ticatec/uniface-flexi-module 0.1.2 → 0.2.0

package/dist/FlexiContext.d.ts

@@ -5,11 +5,13 @@ export type Dictionaries = {
 export default class FlexiContext {
     private readonly _dicLoad;
     private static instance;
+    private readonly language?;
     /**
      * 初始化Context
-     * @param dictLoad
+     * @param dictLoad 数据字典加载函数
+     * @param language 当前语言
      */
-    static initialize(dictLoad: DictionaryLoad): FlexiContext;
+    static initialize(dictLoad: DictionaryLoad, language?: string): FlexiContext;
     /**
      * 获取单例实例
      */
@@ -17,7 +19,8 @@ export default class FlexiContext {
     /**
      * 构造函数
      * @private
-     * @param dictLoad
+     * @param dictLoad 数据字典加载函数
+     * @param language 当前语言
      */
     private constructor();
     /**
@@ -25,4 +28,13 @@ export default class FlexiContext {
      * @param dicNames
      */
     loadDictionaries(dicNames: Array<string> | string): Promise<Dictionaries>;
+    /**
+     * 简化多语言配置，在初始化时合并语言值和默认值
+     * @param config 多语言配置对象，包含 "default" 和其他语言键
+     * @returns 合并后的对象，当前语言的值已覆盖默认值，不存在的值使用 "Missing value" 提示
+     */
+    simplify<T extends Record<string, any>>(config: {
+        default: T;
+        [language: string]: Partial<T>;
+    }): T;
 }

package/dist/FlexiContext.js

@@ -3,15 +3,16 @@ import { registerCriteriaFieldBuilder } from "./criteria-panel";
 export default class FlexiContext {
     _dicLoad;
     static instance;
+    language;
     /**
      * 初始化Context
-     * @param dictLoad
+     * @param dictLoad 数据字典加载函数
+     * @param language 当前语言
      */
-    static initialize(dictLoad) {
+    static initialize(dictLoad, language) {
         if (FlexiContext.instance == null) {
             console.log('初始化FlexContext');
-            const instance = new FlexiContext(dictLoad);
-            FlexiContext.instance = instance;
+            FlexiContext.instance = new FlexiContext(dictLoad, language);
             registerFormFieldBuilder();
             registerCriteriaFieldBuilder();
         }
@@ -29,10 +30,12 @@ export default class FlexiContext {
     /**
      * 构造函数
      * @private
-     * @param dictLoad
+     * @param dictLoad 数据字典加载函数
+     * @param language 当前语言
      */
-    constructor(dictLoad) {
+    constructor(dictLoad, language) {
         this._dicLoad = dictLoad;
+        this.language = language;
     }
     /**
      * 读取数据字典
@@ -42,4 +45,15 @@ export default class FlexiContext {
         dicNames = Array.isArray(dicNames) ? dicNames : [dicNames];
         return dicNames.length > 0 ? await this._dicLoad(dicNames) : {};
     }
+    /**
+     * 简化多语言配置，在初始化时合并语言值和默认值
+     * @param config 多语言配置对象，包含 "default" 和其他语言键
+     * @returns 合并后的对象，当前语言的值已覆盖默认值，不存在的值使用 "Missing value" 提示
+     */
+    simplify(config) {
+        const defaultValues = config.default || {};
+        const languageValues = this.language ? (config[this.language] || {}) : {};
+        // 创建合并后的对象，当前语言的值覆盖默认值
+        return { ...defaultValues, ...languageValues };
+    }
 }

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

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

package/dist/flexi-datatable/FlexiDataTable.js

@@ -1,4 +1,4 @@
-import utils from "../flexi-form/lib/utils";
+import utils from "../utils";
 import FlexiContext from "..";
 export default class FlexiDataTable {
     #columns = [];
@@ -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,
+                text: colSchema.text.startsWith("@") ? utils.getVariable(colSchema.text) : colSchema.text,
                 field: colSchema.field,
                 frozen: colSchema.frozen,
                 align: colSchema.align,

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

@@ -1,9 +1,9 @@
 import FlexiCard from "../flexi_card/FlexiCard";
 import { Visibility } from "../lib";
 import ComponentBuilder from "../lib/ComponentBuilder";
-import utils from "../lib/utils";
+import utils from "../../utils";
 import i18nRes from "../../i18n-res";
-import i18n, { i18nUtils } from "@ticatec/i18n";
+import { i18nUtils } from "@ticatec/i18n";
 export default class FlexiField {
     #parent;
     data;
@@ -24,7 +24,7 @@ export default class FlexiField {
     constructor(parent, data, mode, schema) {
         this.#parent = parent;
         this.mode = mode;
-        this.label = schema.label;
+        this.label = schema.label.startsWith("@") ? utils.getVariable(schema.label) : schema.label;
         this.variant = schema.variant;
         this.isReadonly = schema.readonly == true;
         this.disabled = schema.disabled == true;

package/dist/utils.d.ts

@@ -1,4 +1,12 @@
 declare const _default: {
+    copyAttrs: (src: any, attrs: Array<string>) => any;
+    extractExpression: (str: string) => string | null;
+    getParentAndKey: (data: any, keyPath: string) => {
+        parent: any;
+        key: string;
+    };
+    formatText: (s: string, obj: any) => string;
     propsFilter: (attrs: any, excludes?: Array<string>) => any;
+    getVariable: (key: string) => any;
 };
 export default _default;

package/dist/utils.js

@@ -5,4 +5,61 @@ const propsFilter = (attrs, excludes = []) => {
     }
     return obj;
 };
-export default { propsFilter };
+const getVariable = (key) => {
+    let attrs = key.split('.');
+    if (attrs.length == 2) {
+        // @ts-ignore
+        return window[attrs[0]]?.[attrs[1]] ?? `Missing value ${key}`;
+    }
+    else {
+        return `Invalid key: ${key}`;
+    }
+};
+const copyAttrs = (src, attrs) => {
+    let obj = {};
+    for (let attr of attrs) {
+        obj[attr] = src?.[attr];
+    }
+    return obj;
+};
+const extractExpression = (str) => {
+    const match = /^\$exp\{([^}]*)\}$/.exec(str);
+    return match ? match[1] : null;
+};
+/**
+ * 根据点分路径字符串获取目标属性的父对象和键名。
+ * 过程中如果发现父级对象为空（null 或 undefined），会自动为其赋值一个空对象 {}。
+ * * @param {object} data - 待查找和/或修改的原始对象。
+ * @param data
+ * @param {string} keyPath - 点分路径字符串，例如 "a.b.c"。
+ */
+const getParentAndKey = (data, keyPath) => {
+    if (!keyPath || typeof keyPath !== 'string') {
+        throw Error('invalidate key field');
+    }
+    if (keyPath.includes('.')) {
+        const keys = keyPath.split('.');
+        const targetKey = keys.pop();
+        let current = data ?? {};
+        for (const key of keys) {
+            if (current[key] == null) {
+                current[key] = {};
+            }
+            current = current[key];
+        }
+        return {
+            parent: current,
+            key: targetKey
+        };
+    }
+    else {
+        return { parent: data, key: keyPath };
+    }
+};
+const formatText = (s, obj) => {
+    return s.replace(/\{\{(.*?)\}\}/g, (_, key) => {
+        key = key.trim();
+        return obj.hasOwnProperty(key) ? String(obj[key]) : `{{${key}}}`;
+    });
+};
+export default { copyAttrs, extractExpression, getParentAndKey, formatText, propsFilter, getVariable };

package/package.json

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

package/dist/flexi-form/lib/utils.d.ts

@@ -1,10 +0,0 @@
-declare const _default: {
-    copyAttrs: (src: any, attrs: Array<string>) => any;
-    extractExpression: (str: string) => string | null;
-    getParentAndKey: (data: any, keyPath: string) => {
-        parent: any;
-        key: string;
-    };
-    formatText: (s: string, obj: any) => string;
-};
-export default _default;

package/dist/flexi-form/lib/utils.js

@@ -1,48 +0,0 @@
-const copyAttrs = (src, attrs) => {
-    let obj = {};
-    for (let attr of attrs) {
-        obj[attr] = src?.[attr];
-    }
-    return obj;
-};
-const extractExpression = (str) => {
-    const match = /^\$exp\{([^}]*)\}$/.exec(str);
-    return match ? match[1] : null;
-};
-/**
- * 根据点分路径字符串获取目标属性的父对象和键名。
- * 过程中如果发现父级对象为空（null 或 undefined），会自动为其赋值一个空对象 {}。
- * * @param {object} data - 待查找和/或修改的原始对象。
- * @param data
- * @param {string} keyPath - 点分路径字符串，例如 "a.b.c"。
- */
-const getParentAndKey = (data, keyPath) => {
-    if (!keyPath || typeof keyPath !== 'string') {
-        throw Error('invalidate key field');
-    }
-    if (keyPath.includes('.')) {
-        const keys = keyPath.split('.');
-        const targetKey = keys.pop();
-        let current = data ?? {};
-        for (const key of keys) {
-            if (current[key] == null) {
-                current[key] = {};
-            }
-            current = current[key];
-        }
-        return {
-            parent: current,
-            key: targetKey
-        };
-    }
-    else {
-        return { parent: data, key: keyPath };
-    }
-};
-const formatText = (s, obj) => {
-    return s.replace(/\{\{(.*?)\}\}/g, (_, key) => {
-        key = key.trim();
-        return obj.hasOwnProperty(key) ? String(obj[key]) : `{{${key}}}`;
-    });
-};
-export default { copyAttrs, extractExpression, getParentAndKey, formatText };