cabloy 5.1.61 → 5.1.62

package/zova/src/suite/cabloy-basic/modules/basic-select/src/component/select/controller.tsx

@@ -8,6 +8,8 @@ export interface ControllerSelectProps {
   items?: any[] | undefined;
   itemTitle?: string;
   itemValue?: string;
+  onChange?: (e: Event) => void;
+  onBlur?: (e: Event) => void;
 }
 
 export interface ControllerSelectModels {
@@ -28,13 +30,27 @@ export class ControllerSelect extends BeanControllerBase {
   }
 
   protected render() {
+    const {
+      items,
+      itemTitle,
+      itemValue,
+      placeholder,
+      modelValue,
+      controllerRef,
+      onChange,
+      onBlur,
+      'onUpdate:modelValue': _onUpdateModelValue,
+      ...props
+    } = this.$props as any;
     const domOptions: VNode[] = [];
-    if (this.$props.items) {
-      for (const item of this.$props.items) {
-        const title = item[this.$props.itemTitle];
-        const value = item[this.$props.itemValue];
+    const modelValueDom = isNil(this.modelValue) ? '' : String(this.modelValue);
+    if (items) {
+      for (const item of items) {
+        const title = item[itemTitle];
+        const value = item[itemValue];
+        const valueDom = isNil(value) ? '' : String(value);
         domOptions.push(
-          <option key={value} value={value} selected={String(this.modelValue) === String(value)}>
+          <option key={valueDom} value={valueDom} selected={modelValueDom === valueDom}>
             {title}
           </option>,
         );
@@ -42,18 +58,25 @@ export class ControllerSelect extends BeanControllerBase {
     }
     return (
       <select
+        {...props}
         onChange={(e: Event) => {
           const selectedValue = (e.target as HTMLSelectElement).value;
-          const item = this.$props.items?.find(
-            item => String(item[this.$props.itemValue]) === selectedValue,
-          );
-          const value = item ? item[this.$props.itemValue] : undefined;
+          const item = items?.find(item => {
+            const value = item[itemValue];
+            const valueDom = isNil(value) ? '' : String(value);
+            return valueDom === selectedValue;
+          });
+          const value = selectedValue === '' ? undefined : item?.[itemValue];
           this.modelValue = value;
+          onChange?.(e);
+        }}
+        onBlur={(e: Event) => {
+          onBlur?.(e);
         }}
       >
-        {!!this.$props.placeholder && (
+        {!!placeholder && (
           <option disabled={true} selected={isNil(this.modelValue)}>
-            {this.$props.placeholder}
+            {placeholder}
           </option>
         )}
         {domOptions}

package/zova/src/suite-vendor/a-zova/modules/a-table/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-table",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-table/src/component/table/controller.tsx

@@ -241,7 +241,7 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     const promises: Promise<any>[] = renderProviders.map(renderProvider =>
       (async () => {
         if (typeof renderProvider === 'string' && renderProvider.includes('.tableCell.')) {
-          return await this.sys.bean._getBean(renderProvider as any, true);
+          return await this.app.bean._getBean(renderProvider as any, true);
         }
       })(),
     );
@@ -259,7 +259,7 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     // beanInstance
     let beanInstance: ITableCellRender | undefined;
     if (typeof renderProvider === 'string' && renderProvider.includes('.tableCell.')) {
-      beanInstance = await this.sys.bean._getBean(renderProvider as any, true);
+      beanInstance = await this.app.bean._getBean(renderProvider as any, true);
       const beanOptions = appResource.getBean(renderProvider as any);
       const onionOptions = beanOptions?.options as IDecoratorTableCellOptions | undefined;
       columnProps = deepExtend({}, onionOptions, columnProps);
@@ -300,7 +300,7 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     // beanInstance
     let beanInstance: ITableCellRender | undefined;
     if (typeof renderProvider === 'string' && renderProvider.includes('.tableCell.')) {
-      beanInstance = this.sys.bean._getBeanSyncOnly(renderProvider as any);
+      beanInstance = this.app.bean._getBeanSyncOnly(renderProvider as any);
       const beanOptions = appResource.getBean(renderProvider as any);
       const onionOptions = beanOptions?.options as IDecoratorTableCellOptions | undefined;
       columnProps = deepExtend({}, onionOptions, columnProps);

package/zova/src/suite-vendor/a-zova/modules/a-table/src/lib/tableCell.ts

@@ -3,5 +3,5 @@ import { createBeanDecorator } from 'zova';
 import type { IDecoratorTableCellOptions } from '../types/tableCell.js';
 
 export function TableCell<T extends IDecoratorTableCellOptions>(options?: T): ClassDecorator {
-  return createBeanDecorator('tableCell', 'sys', true, options);
+  return createBeanDecorator('tableCell', 'app', true, options);
 }

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.102",
+  "version": "5.1.103",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "zova-module-a-ssrhmr": "^5.1.19",
     "zova-module-a-ssrserver": "^5.1.19",
     "zova-module-a-style": "^5.1.29",
-    "zova-module-a-table": "^5.1.31",
+    "zova-module-a-table": "^5.1.32",
     "zova-module-a-zod": "^5.1.30",
     "zova-module-a-zova": "^5.1.70"
   },