@ticatec/uniface-flexi-module 0.2.6 → 0.2.8

package/dist/criteria-panel/components/InputOptionSelectSearchField.svelte

@@ -6,4 +6,4 @@ export let variant;
 export let events = null;
 </script>
 
-<InputOptionSelect {...props} {...events} {variant} bind:value={criteria[keyField]} {...events}/>
+<InputOptionSelect {...props} {...events} {variant} bind:value={criteria[keyField]}/>

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

@@ -84,8 +84,8 @@ const buildCascadeField = (schema, dictLoader) => {
     const props = schema.props;
     return {
         component: CascadeSelectSearchField,
-        keyFields: { keyField: schema.keys.valueField, textField: schema.keys.textField },
-        props: utils.propsFilter(props, ['value', "disabled", "readonly", "mandatory", "displayMode"])
+        keyFields: { keyField: schema.keys.valueField },
+        props: { ...utils.propsFilter(props, ['value', "disabled", "readonly", "mandatory", "displayMode"]), nodes: [dictLoader(schema.dictName)] }
     };
 };
 const buildInputOptionsField = (schema, dictLoader) => {

package/dist/criteria-panel/lib/FlexiCriteriaField.d.ts

@@ -17,6 +17,8 @@ export interface FlexiCriteriaFieldSchema {
     label: string;
     /** 事件 */
     events?: Record<string, string>;
+    /** 事件 */
+    methods?: Record<string, string>;
     /** 在卡片/Block中所在单元格的属性，flex布局和grid布局对应的属性也不一样*/
     size?: 'x15' | 'x20' | 'x25' | 'x30' | 'x35' | 'x40';
     /** 字段的属性 */

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

@@ -29,6 +29,12 @@ export default class FlexiCriteriaField {
                 this.#props[key] = utils.getScopeVariable(cellField.props[key]);
             }
         }
+        if (schema.methods) {
+            for (let key in schema.methods) {
+                let method = schema.methods[key];
+                this.#props[key] = (...args) => set[method]?.(...args);
+            }
+        }
         this.keys = cellField.keyFields;
     }
     get props() {

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

@@ -14,18 +14,15 @@ export default class FlexiCriteriaSet {
         this._arrangement = schema.arrangement ?? 'vertical';
         this._label$style = schema.label$style;
         this._variant = schema.variant ?? 'outlined';
-        const dicts = [];
+        const dicts = schema.fields.filter(item => item.dictName != null).map(item => item.dictName);
+        this.#dictionaries = dicts.length > 0 ? await FlexiContext.getInstance().loadDictionaries(dicts) : {};
         for (const fieldSchema of schema.fields) {
-            if (fieldSchema.dictName && !dicts.includes(fieldSchema.dictName)) {
-                dicts.push(fieldSchema.dictName);
-            }
             const field = new FlexiCriteriaField(this, fieldSchema);
             this.#fields.push(field);
             if (fieldSchema.name) {
                 this.field[fieldSchema.name] = field;
             }
         }
-        this.#dictionaries = await FlexiContext.getInstance().loadDictionaries(dicts);
     }
     setInvalidateHandler(value) {
         this.#onInvalidate = value;

package/dist/flexi-form/flexi_form/FlexiForm.d.ts

@@ -66,6 +66,17 @@ export default abstract class FlexiForm {
      * @private
      */
     private isProxy;
+    /**
+     * 将响应式数据转换为纯对象（用于序列化）
+     * @param obj 响应式数据对象
+     * @returns 纯对象
+     */
+    private toRawObject;
+    /**
+     * 获取可序列化的表单数据（不包含Proxy）
+     * @returns 纯对象数据
+     */
+    getRawData(): any;
     /**
      * 构造表单
      */

package/dist/flexi-form/flexi_form/FlexiForm.js

@@ -29,6 +29,17 @@ export default class FlexiForm {
     createReactiveData(data) {
         const self = this;
         const createProxy = (target, path = '') => {
+            // 添加toJSON方法到目标对象，用于JSON序列化
+            if (!target.toJSON) {
+                Object.defineProperty(target, 'toJSON', {
+                    enumerable: false,
+                    configurable: true,
+                    writable: false,
+                    value: function () {
+                        return self.toRawObject(this);
+                    }
+                });
+            }
             return new Proxy(target, {
                 set(obj, prop, value) {
                     if (typeof prop === 'symbol') {
@@ -75,6 +86,33 @@ export default class FlexiForm {
             return false;
         }
     }
+    /**
+     * 将响应式数据转换为纯对象（用于序列化）
+     * @param obj 响应式数据对象
+     * @returns 纯对象
+     */
+    toRawObject(obj) {
+        if (obj === null || typeof obj !== 'object') {
+            return obj;
+        }
+        if (Array.isArray(obj)) {
+            return obj.map(item => this.toRawObject(item));
+        }
+        const result = {};
+        for (const key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                result[key] = this.toRawObject(obj[key]);
+            }
+        }
+        return result;
+    }
+    /**
+     * 获取可序列化的表单数据（不包含Proxy）
+     * @returns 纯对象数据
+     */
+    getRawData() {
+        return this.toRawObject(this.#data);
+    }
     /**
      * 构造表单
      */

package/package.json

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