@ticatec/uniface-flexi-module 0.2.5 → 0.2.6

package/dist/flexi-form/components/CascadeOptionSelectField.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">import CascadeOptionSelect from "@ticatec/uniface-element/CascadeOptionsSelect";
 import FlexiField from "../flexi_field/FlexiField";
+import utils from "../../utils";
 export let field;
 export let readonly;
 export let disabled;
@@ -7,7 +8,8 @@ export let variant;
 $: props = field.props;
 $: data = field.data;
 $: events = field.events;
+$: text = field.dataFields['textField'] ? utils.extractFieldValue(field.rawData, field.dataFields['textField']) ?? '' : '';
 </script>
 
-<CascadeOptionSelect bind:value={data[field.keyField]} variant={variant??field.variant} readonly={readonly || field.isReadonly}
+<CascadeOptionSelect bind:value={data[field.keyField]} variant={variant??field.variant} readonly={readonly || field.isReadonly} {text}
                      disabled={disabled || field.disabled} {...props} {...events}/>

package/dist/flexi-form/components/CellFieldBuilder.js

@@ -106,7 +106,7 @@ const buildUnitNumberField = (schema, dictLoader) => {
 const buildCascadeOptionSelect = (schema, dictLoader) => {
     const props = schema.props;
     if (schema.dictName) {
-        props.options = dictLoader(schema.dictName);
+        props.nodes = [dictLoader(schema.dictName)];
     }
     return {
         component: CascadeOptionSelectField,

package/dist/flexi-form/flexi_field/FlexiField.d.ts

@@ -22,6 +22,8 @@ export interface FlexiFieldSchema {
     type: string;
     /** 字段的名称 */
     keyField: string;
+    /** 其他的数据字段 */
+    dataFields: Record<string, string>;
     /** 字段的名称 */
     name: string;
     /** 关联的数据字典项目 */
@@ -49,8 +51,10 @@ export interface FlexiFieldSchema {
 }
 export default class FlexiField {
     #private;
+    readonly rawData: any;
     readonly data: any;
     readonly keyField: string;
+    readonly dataFields: Record<string, string>;
     readonly component: typeof SvelteComponent;
     readonly variant?: "" | "outlined" | "filled";
     visibility: Visibility;

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

@@ -6,8 +6,10 @@ import i18nRes from "../../i18n-res";
 import { i18nUtils } from "@ticatec/i18n";
 export default class FlexiField {
     #parent;
+    rawData;
     data;
     keyField;
+    dataFields;
     component;
     variant;
     visibility = Visibility.View;
@@ -29,6 +31,7 @@ export default class FlexiField {
         this.isReadonly = schema.readonly == true;
         this.disabled = schema.disabled == true;
         this.required = schema.required == true;
+        this.dataFields = schema.dataFields;
         this.#cell = schema.cell;
         const card = parent instanceof FlexiCard ? parent : parent.card;
         if (schema.events) {
@@ -52,6 +55,7 @@ export default class FlexiField {
                 this.#props[key] = (...args) => card[classMethod]?.(...args);
             }
         }
+        this.rawData = data;
         const result = utils.getParentAndKey(data, schema.keyField);
         this.keyField = result?.key;
         this.data = result?.parent;

package/dist/utils.d.ts

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

package/dist/utils.js

@@ -62,10 +62,19 @@ const getParentAndKey = (data, keyPath) => {
         return { parent: data, key: keyPath };
     }
 };
+/**
+ * 萃取字段值
+ * @param data
+ * @param keyPath
+ */
+const extractFieldValue = (data, keyPath) => {
+    let nestObj = getParentAndKey(data, keyPath);
+    return nestObj.parent[nestObj.key];
+};
 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, getScopeVariable };
+export default { copyAttrs, extractExpression, getParentAndKey, formatText, propsFilter, getScopeVariable, extractFieldValue };

package/package.json

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