@ticatec/uniface-flexi-module 0.0.8 → 0.0.10

package/dist/criteria-panel/index.d.ts

@@ -2,5 +2,8 @@ import FlexiCriteriaSet from "./lib/FlexiCriteriaSet";
 import FlexiCriteriaField from "./lib/FlexiCriteriaField";
 import CriteriaFieldsPanel from "./CriteriaFieldsPanel.svelte";
 import { registerCriteriaFieldBuilder } from "./lib/CriteriaFieldBuilder";
+import type { FlexiCriteriaSetSchema } from "./lib/FlexiCriteriaSet";
+import type { FlexiCriteriaFieldSchema } from "./lib/FlexiCriteriaField";
 export default CriteriaFieldsPanel;
 export { FlexiCriteriaSet, FlexiCriteriaField, registerCriteriaFieldBuilder };
+export type { FlexiCriteriaSetSchema, FlexiCriteriaFieldSchema };

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

@@ -2,6 +2,8 @@ import FlexiCard from "../flexi_card/FlexiCard";
 import { Visibility } from "../lib";
 import ComponentBuilder from "../lib/ComponentBuilder";
 import utils from "../lib/utils";
+import i18nRes from "../../i18n-res";
+import i18n, { i18nUtils } from "@ticatec/i18n";
 export default class FlexiField {
     #parent;
     data;
@@ -26,7 +28,7 @@ export default class FlexiField {
         this.variant = schema.variant;
         this.isReadonly = schema.readonly == true;
         this.disabled = schema.disabled == true;
-        this.required = schema.required = true;
+        this.required = schema.required == true;
         this.#cell = schema.cell;
         const card = parent instanceof FlexiCard ? parent : parent.card;
         if (schema.events) {
@@ -51,35 +53,36 @@ export default class FlexiField {
             let valueType = typeof value;
             if (value == null || (valueType == "string" && value.trim().length == 0)) {
                 if (this.required) {
-                    this.#error = '请输入数值';
+                    this.#error = i18nRes.flexi.validation.textRequired;
                     valid = false;
                 }
             }
             else {
                 if (valueType == "string") { //检查字符串类型
-                    if (this.#validation?.minLength && this.data.length < this.#validation?.minLength) {
-                        this.#error = '低于最小长度';
+                    if (this.#validation?.minLength && value.length < this.#validation?.minLength) {
+                        this.#error = i18nUtils.formatText(i18nRes.flexi.validation.textMinimalRequired, { length: this.#validation.minLength });
                         valid = false;
                     }
                     if (valid && this.#validation?.format) { //如果有正则表达式，检查正则表达式
-                        if (!this.#validation.format.regex.test(this.data)) {
+                        valid = this.#validation.format.regex.test(value);
+                        if (!valid) {
                             this.#error = this.#validation.format.message;
                         }
                     }
                 }
                 else if (valueType == "number") { //如果是数字，检查最大/最小值
-                    if (this.#validation?.minValue && this.data < this.#validation.minValue) {
-                        this.#error = '低于最小值';
+                    if (this.#validation?.minValue && value < this.#validation.minValue) {
+                        this.#error = i18nUtils.formatText(i18nRes.flexi.validation.textMinimumValue, { value: this.#validation.minValue });
                         valid = false;
                     }
-                    else if (this.#validation?.maxValue && this.data > this.#validation.maxValue) {
-                        this.#error = '超过最大值';
+                    else if (this.#validation?.maxValue && value > this.#validation.maxValue) {
+                        this.#error = i18nUtils.formatText(i18nRes.flexi.validation.textMaximumValue, { value: this.#validation.minValue });
                         valid = false;
                     }
                 }
             }
             if (valid && this.#validation?.check) { //如果有自定义检查，通过自定义方法检查
-                const result = this.#validation.check(this.data, this.#parent.data);
+                const result = this.#validation.check(value, this.#parent.data);
                 if (!result.valid) {
                     valid = false;
                     this.#error = result.message;

package/dist/i18n-res/i18nRes.js

@@ -1,7 +1,12 @@
 import { i18nUtils } from "@ticatec/i18n";
 const langRes = {
     flexi: {
-        validation: {}
+        validation: {
+            textRequired: "Please enter a value",
+            textMinimalRequired: "The input must be at least {{len}} characters long.",
+            textMinimumValue: "Please enter an integer no less than {{value}}",
+            textMaximumValue: "Please enter an integer no more than {{value}}"
+        }
     }
 };
 const i18nRes = i18nUtils.createResourceProxy(langRes, 'uniface');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-flexi-module",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A flexible form framework for Svelte applications with dynamic field types, criteria panels, and modular components",
   "keywords": [
     "svelte",
@@ -104,14 +104,14 @@
     "@sveltejs/package": "^2.4.1",
     "@sveltejs/vite-plugin-svelte": "^6.1.1",
     "@ticatec/app-data-manager": "^1.2.4",
-    "@ticatec/app-data-service": "^1.1.3",
+    "@ticatec/app-data-service": "^1.1.4",
     "@ticatec/enhanced-utils": "^1.0.1",
-    "@ticatec/i18n": "^0.2.2",
+    "@ticatec/i18n": "^0.2.3",
     "@ticatec/restful_service_api": "^0.1.7",
-    "@ticatec/uniface-app-component": "^0.2.2",
+    "@ticatec/uniface-app-component": "^0.2.3",
     "@ticatec/uniface-dev-shell": "^0.0.6",
     "@ticatec/uniface-element": "^0.3.4",
-    "@ticatec/uniface-filter-panel": "^0.1.0",
+    "@ticatec/uniface-filter-panel": "^0.1.1",
     "@ticatec/uniface-google-material-icons": "^0.1.2",
     "@ticatec/uniface-micro-frame": "^0.0.1",
     "@ticatec/web-bean-validator": "^0.1.9",