@ticatec/uniface-flexi-module 0.0.11 → 0.1.0

package/dist/criteria-panel/CriteriaFieldsPanel.svelte

@@ -2,10 +2,10 @@
 import SearchField from "./components/SearchField.svelte";
 export let criteriaSet;
 export let criteria;
-let variant = criteriaSet.variant;
+let variant = criteriaSet._variant;
 let fields = [...criteriaSet.fields];
-let arrangement = criteriaSet.arrangement;
-let label$style = criteriaSet.label$style;
+let arrangement = criteriaSet._arrangement;
+let label$style = criteriaSet._label$style;
 onMount(async () => {
     criteriaSet.setInvalidateHandler(() => {
         fields = [...criteriaSet.fields];

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

@@ -12,13 +12,15 @@ export default class FlexiCriteriaSet {
     protected field: {
         [key: string]: FlexiCriteriaField;
     };
-    readonly arrangement: Arrangement;
-    readonly label$style?: string;
-    readonly variant?: "outlined" | 'filled';
-    constructor(schema: FlexiCriteriaSetSchema);
-    initialize(): Promise<void>;
+    private _arrangement;
+    private _label$style?;
+    private _variant?;
+    initialize(schema: FlexiCriteriaSetSchema): Promise<void>;
     setInvalidateHandler(value: InvalidateHandler | null): void;
     invalidate(): void;
     get fields(): Array<FlexiCriteriaField>;
     getDictionary(key: string): any;
+    get arrangement(): Arrangement;
+    get label$style(): string | undefined;
+    get variant(): "outlined" | "filled" | undefined;
 }

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

@@ -5,33 +5,27 @@ export default class FlexiCriteriaSet {
     field = {};
     #onInvalidate = null;
     #dictionaries;
-    arrangement;
-    label$style;
-    variant;
-    #schema;
-    constructor(schema) {
+    _arrangement;
+    _label$style;
+    _variant;
+    async initialize(schema) {
         this.#fields = [];
         this.#dictionaries = {};
-        this.#schema = schema;
-        this.arrangement = schema.arrangement ?? 'vertical';
-        this.label$style = schema.label$style;
-        this.variant = schema.variant ?? 'outlined';
-    }
-    async initialize() {
+        this._arrangement = schema.arrangement ?? 'vertical';
+        this._label$style = schema.label$style;
+        this._variant = schema.variant ?? 'outlined';
         const dicts = [];
-        for (const schema of this.#schema.fields) {
-            if (schema.dictName && !dicts.includes(schema.dictName)) {
-                dicts.push(schema.dictName);
+        for (const fieldSchema of schema.fields) {
+            if (fieldSchema.dictName && !dicts.includes(fieldSchema.dictName)) {
+                dicts.push(fieldSchema.dictName);
             }
-        }
-        this.#dictionaries = FlexiContext.getInstance().loadDictionaries(dicts);
-        for (const schema of this.#schema.fields) {
-            const field = new FlexiCriteriaField(this, schema);
+            const field = new FlexiCriteriaField(this, fieldSchema);
             this.#fields.push(field);
-            if (schema.name) {
-                this.field[schema.name] = field;
+            if (fieldSchema.name) {
+                this.field[fieldSchema.name] = field;
             }
         }
+        this.#dictionaries = await FlexiContext.getInstance().loadDictionaries(dicts);
     }
     setInvalidateHandler(value) {
         this.#onInvalidate = value;
@@ -45,4 +39,13 @@ export default class FlexiCriteriaSet {
     getDictionary(key) {
         return this.#dictionaries[key] ?? [];
     }
+    get arrangement() {
+        return this._arrangement ?? "vertical";
+    }
+    get label$style() {
+        return this._label$style;
+    }
+    get variant() {
+        return this._variant;
+    }
 }

package/dist/flexi-datatable/FlexiDataTable.d.ts

@@ -76,18 +76,18 @@ export interface ActionsColumnSchema {
 }
 export interface FlexiDataTableSchema {
     round?: boolean;
-    indicatorColumn: IndicatorColumnSchema;
+    indicatorColumn?: IndicatorColumnSchema;
     actionsColumn?: ActionsColumnSchema;
     columns: Array<FlexiDataTableColumnSchema>;
     dicts?: Array<string>;
 }
 export default class FlexiDataTable {
     #private;
-    readonly round?: boolean;
-    readonly indicatorColumn: IndicatorColumn;
-    constructor(schema: FlexiDataTableSchema);
-    initialize(): Promise<void>;
+    protected _round: boolean;
+    protected _indicatorColumn?: IndicatorColumn;
+    initialize(schema: FlexiDataTableSchema): Promise<void>;
     protected set actionsColumn(value: ActionsColumn);
+    get isRound(): boolean;
     get actionsColumn(): ActionsColumn | undefined;
     /**
      * 设置数据列

package/dist/flexi-datatable/FlexiDataTable.js

@@ -2,52 +2,50 @@ import utils from "../flexi-form/lib/utils";
 import FlexiContext from "..";
 export default class FlexiDataTable {
     #columns = [];
-    round;
-    indicatorColumn;
+    _round;
+    _indicatorColumn;
     #actionsColumn;
-    #schema;
     #dictionaries;
-    constructor(schema) {
-        this.#schema = schema;
-        this.round = schema.round;
-        this.indicatorColumn = { displayNo: true, ...schema.indicatorColumn };
-    }
-    async initialize() {
-        if (this.#schema.dicts && this.#schema.dicts.length > 0) {
-            this.#dictionaries = FlexiContext.getInstance().loadDictionaries(this.#schema.dicts);
+    async initialize(schema) {
+        this._round = schema.round == true;
+        if (schema.indicatorColumn) {
+            this._indicatorColumn = { displayNo: true, ...schema.indicatorColumn };
+        }
+        if (schema.dicts && schema.dicts.length > 0) {
+            this.#dictionaries = FlexiContext.getInstance().loadDictionaries(schema.dicts);
         }
-        if (this.#schema.actionsColumn) {
-            const getActions = this[this.#schema.actionsColumn.getActions];
+        if (schema.actionsColumn) {
+            const getActions = this[schema.actionsColumn.getActions];
             if (getActions) {
                 this.#actionsColumn = {
-                    width: this.#schema.actionsColumn.width,
-                    align: this.#schema.actionsColumn.align,
+                    width: schema.actionsColumn.width,
+                    align: schema.actionsColumn.align,
                     getActions: getActions.bind(this)
                 };
             }
         }
         this.#columns = [];
-        for (const schema of this.#schema.columns) {
-            const formatter = schema.formatter ? this[schema.formatter] : null;
-            const href = schema.href ? this[schema.href] : null;
-            const hint = schema.hint ? this[schema.hint] : null;
-            const render = schema.render ? this[schema.render] : null;
-            const compareFunction = schema.compareFunction ? this[schema.compareFunction] : null;
+        for (const colSchema of schema.columns) {
+            const formatter = colSchema.formatter ? this[colSchema.formatter] : null;
+            const href = colSchema.href ? this[colSchema.href] : null;
+            const hint = colSchema.hint ? this[colSchema.hint] : null;
+            const render = colSchema.render ? this[colSchema.render] : null;
+            const compareFunction = colSchema.compareFunction ? this[colSchema.compareFunction] : null;
             const column = {
-                text: schema.text,
-                field: schema.field,
-                frozen: schema.frozen,
-                align: schema.align,
-                width: schema.width,
-                minWidth: schema.minWidth,
-                warp: schema.warp,
+                text: colSchema.text,
+                field: colSchema.field,
+                frozen: colSchema.frozen,
+                align: colSchema.align,
+                width: colSchema.width,
+                minWidth: colSchema.minWidth,
+                warp: colSchema.warp,
                 formatter: formatter ? formatter.bind(this) : undefined,
-                escapeHTML: schema.escapeHTML,
+                escapeHTML: colSchema.escapeHTML,
                 href: href ? href.bind(this) : undefined,
                 hint: hint ? hint.bind(this) : undefined,
-                render: render ? render.apply(this) : undefined,
-                visible: schema.visible,
-                resizable: schema.resizable,
+                render: render ? render.bind(this) : undefined,
+                visible: colSchema.visible,
+                resizable: colSchema.resizable,
                 compareFunction: compareFunction ? compareFunction.bind(this) : undefined
             };
             this.#columns.push(column);
@@ -56,6 +54,9 @@ export default class FlexiDataTable {
     set actionsColumn(value) {
         this.#actionsColumn = value;
     }
+    get isRound() {
+        return this._round;
+    }
     get actionsColumn() {
         return this.#actionsColumn;
     }

package/dist/flexi-form/FlexiFormDialog.svelte

@@ -3,8 +3,8 @@ import FlexiFormPanel from "./flexi_form/FlexiFormPanel.svelte";
 import { onMount } from "svelte";
 export let form;
 let title = form.getTitle();
-let width = form.props.width ?? "800px";
-let height = form.props.height ?? "600px";
+let width = form._props.width ?? "800px";
+let height = form._props.height ?? "600px";
 let actions = [];
 const closeConfirm = async () => {
     let confirm = form.closeConfirm;

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

@@ -46,18 +46,18 @@ export interface FlexiFormSchema {
 export type FormInvalidateHandler = () => void;
 export default abstract class FlexiForm {
     #private;
-    readonly mode: LayoutMode;
-    readonly props: any;
-    readonly arrangement: Arrangement;
-    readonly label$style?: string;
-    readonly variant: 'filled' | 'outlined' | '';
-    protected readonly elements: FormElements;
-    readonly style: string;
-    protected constructor(data: any, formSchema: FlexiFormSchema);
+    private _mode;
+    private _props;
+    private _arrangement;
+    private _label$style?;
+    private _variant;
+    private _elements;
+    private _style;
+    protected constructor(data: any);
     /**
      * 构造表单
      */
-    initialize(): Promise<void>;
+    initialize(formSchema: FlexiFormSchema): Promise<void>;
     /**
      * 构造所有的卡片
      * @protected
@@ -124,4 +124,11 @@ export default abstract class FlexiForm {
      */
     get actions(): ButtonActions;
     getBlocks(): Array<FormBlockSchema> | undefined;
+    get mode(): LayoutMode;
+    get props(): any;
+    get arrangement(): Arrangement;
+    get label$style(): string | undefined;
+    get variant(): "" | "outlined" | "filled";
+    get style(): string;
+    protected get elements(): FormElements;
 }

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

@@ -4,35 +4,33 @@ import FlexiContext from "../..";
 export default class FlexiForm {
     #blocks;
     #cards = [];
-    mode = "flex";
-    props = {};
-    arrangement = "vertical";
+    _mode = "flex";
+    _props = {};
+    _arrangement = "vertical";
     #data;
-    label$style = '';
-    variant;
-    elements;
+    _label$style = '';
+    _variant;
+    _elements;
     #invalidateHandler;
     #actions;
     #dictionaries;
-    style;
-    constructor(data, formSchema) {
-        this.#blocks = formSchema.blocks;
+    _style;
+    constructor(data) {
         this.#data = data;
-        this.mode = formSchema.mode ?? 'flex';
-        this.arrangement = formSchema.arrangement ?? 'vertical';
-        this.props = formSchema.props ?? {};
-        this.label$style = formSchema.label$style;
-        this.variant = formSchema.variant ?? 'filled';
-        this.elements = formSchema.elements;
-        this.#actions = this.parseFormActions(formSchema.actions);
-        this.#dictionaries = {};
-        this.style = formSchema.style ?? '';
     }
     /**
      * 构造表单
      */
-    async initialize() {
-        console.log('构造表单');
+    async initialize(formSchema) {
+        this.#blocks = formSchema.blocks;
+        this._mode = formSchema.mode ?? 'flex';
+        this._arrangement = formSchema.arrangement ?? 'vertical';
+        this._props = formSchema.props ?? {};
+        this._label$style = formSchema.label$style;
+        this._variant = formSchema.variant ?? 'filled';
+        this._elements = formSchema.elements;
+        this.#actions = this.parseFormActions(formSchema.actions);
+        this._style = formSchema.style ?? '';
         let dicts = this.extractDictionaries();
         this.#dictionaries = await FlexiContext.getInstance().loadDictionaries(dicts);
         this.buildCards();
@@ -43,7 +41,7 @@ export default class FlexiForm {
      * @param name
      */
     getCompositeSchema(name) {
-        return this.elements[name];
+        return this._elements[name];
     }
     /**
      *
@@ -86,8 +84,8 @@ export default class FlexiForm {
     }
     extractDictionaries() {
         let dicts = [];
-        for (let key in this.elements) {
-            const element = this.elements[key];
+        for (let key in this._elements) {
+            const element = this._elements[key];
             if (element.type == "block") {
                 this.extractDictFromFields(dicts, element.fields);
             }
@@ -157,4 +155,25 @@ export default class FlexiForm {
     getBlocks() {
         return this.#blocks;
     }
+    get mode() {
+        return this._mode;
+    }
+    get props() {
+        return this._props;
+    }
+    get arrangement() {
+        return this._arrangement;
+    }
+    get label$style() {
+        return this._label$style;
+    }
+    get variant() {
+        return this._variant;
+    }
+    get style() {
+        return this._style;
+    }
+    get elements() {
+        return this._elements;
+    }
 }

package/dist/flexi-form/flexi_form/FlexiFormPanel.svelte

@@ -7,7 +7,7 @@ export let actions = null;
 export let readonly = false;
 export let form;
 export let onFormInvalidate = null;
-let style = form.style;
+let style = form._style;
 let blocks;
 onMount(async () => {
     form.setInvalidateHandler(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-flexi-module",
-  "version": "0.0.11",
+  "version": "0.1.0",
   "description": "A flexible form framework for Svelte applications with dynamic field types, criteria panels, and modular components",
   "keywords": [
     "svelte",
@@ -113,7 +113,7 @@
     "@ticatec/uniface-element": "^0.3.4",
     "@ticatec/uniface-filter-panel": "^0.1.1",
     "@ticatec/uniface-google-material-icons": "^0.1.2",
-    "@ticatec/uniface-micro-frame": "^0.0.1",
+    "@ticatec/uniface-micro-frame": "^0.0.2",
     "@ticatec/web-bean-validator": "^0.1.9",
     "dayjs": "^1.11.13",
     "dotenv": "^16.5.0",
@@ -124,11 +124,11 @@
     "svelte-preprocess": "^6.0.3",
     "tslib": "^2.3.1",
     "typescript": "^5.7.3",
-    "vite": "^6.3.5"
+    "vite": "^6.3.5",
+    "@ticatec/dyna-js": "^0.1.1"
   },
   "peerDependencies": {
-    "svelte": "^5.0.0",
-    "@ticatec/dyna-js": "^0.0.2"
+    "svelte": "^5.0.0"
   },
   "author": "Henry Feng",
   "license": "MIT",