cabloy 5.1.61 → 5.1.63

package/zova/src/suite/cabloy-basic/modules/basic-app/tsconfig.build.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "allowImportingTsExtensions": true,
+    "noEmit": false
+  },
+  "include": ["src", "src/.metadata/**/*"]
+}

package/zova/src/suite/cabloy-basic/modules/basic-app/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {},
+  "include": ["src", "src/.metadata/**/*"]
+}

package/zova/src/suite/cabloy-basic/modules/basic-commands/package.json

@@ -48,5 +48,10 @@
       "exports.\\..import"
     ]
   },
-  "title": "basic-commands"
+  "title": "basic-commands",
+  "zovaModule": {
+    "dependencies": {
+      "basic-app": "5.0.0"
+    }
+  }
 }

package/zova/src/suite/cabloy-basic/modules/basic-commands/src/.metadata/index.ts

@@ -6,6 +6,7 @@ export * from '../bean/command.copy.jsx';
 export * from '../bean/command.create.jsx';
 export * from '../bean/command.delete.jsx';
 export * from '../bean/command.edit.jsx';
+export * from '../bean/command.prompt.jsx';
 export * from '../bean/command.setValue.jsx';
 export * from '../bean/command.view.jsx';
 import { ICommandOptionsAlert } from '../bean/command.alert.jsx';
@@ -14,6 +15,7 @@ import { ICommandOptionsCopy } from '../bean/command.copy.jsx';
 import { ICommandOptionsCreate } from '../bean/command.create.jsx';
 import { ICommandOptionsDelete } from '../bean/command.delete.jsx';
 import { ICommandOptionsEdit } from '../bean/command.edit.jsx';
+import { ICommandOptionsPrompt } from '../bean/command.prompt.jsx';
 import { ICommandOptionsSetValue } from '../bean/command.setValue.jsx';
 import { ICommandOptionsView } from '../bean/command.view.jsx';
 import 'zova-module-a-command';
@@ -26,6 +28,7 @@ declare module 'zova-module-a-command' {
 'basic-commands:create': ICommandOptionsCreate;
 'basic-commands:delete': ICommandOptionsDelete;
 'basic-commands:edit': ICommandOptionsEdit;
+'basic-commands:prompt': ICommandOptionsPrompt;
 'basic-commands:setValue': ICommandOptionsSetValue;
 'basic-commands:view': ICommandOptionsView;
     }
@@ -100,6 +103,17 @@ declare module 'zova-module-basic-commands' {
           get $onionOptions(): ICommandOptionsEdit;
         }
 
+        export interface CommandPrompt {
+          /** @internal */
+          get scope(): ScopeModuleBasicCommands;
+        }
+
+        export interface CommandPrompt {
+          get $beanFullName(): 'basic-commands.command.prompt';
+          get $onionName(): 'basic-commands:prompt';
+          get $onionOptions(): ICommandOptionsPrompt;
+        }
+
         export interface CommandSetValue {
           /** @internal */
           get scope(): ScopeModuleBasicCommands;
@@ -130,6 +144,7 @@ import { CommandCopy } from '../bean/command.copy.jsx';
 import { CommandCreate } from '../bean/command.create.jsx';
 import { CommandDelete } from '../bean/command.delete.jsx';
 import { CommandEdit } from '../bean/command.edit.jsx';
+import { CommandPrompt } from '../bean/command.prompt.jsx';
 import { CommandSetValue } from '../bean/command.setValue.jsx';
 import { CommandView } from '../bean/command.view.jsx';
 import 'zova';
@@ -141,6 +156,7 @@ declare module 'zova' {
 'basic-commands.command.create': CommandCreate;
 'basic-commands.command.delete': CommandDelete;
 'basic-commands.command.edit': CommandEdit;
+'basic-commands.command.prompt': CommandPrompt;
 'basic-commands.command.setValue': CommandSetValue;
 'basic-commands.command.view': CommandView;
   }

package/zova/src/suite/cabloy-basic/modules/basic-commands/src/bean/command.alert.tsx

@@ -1,33 +1,27 @@
 import type { ICommandExecute, ICommandOptionsBase } from 'zova-module-a-command';
 import type { NextCommandExecute } from 'zova-module-a-command';
 import type { IJsxRenderContextBase } from 'zova-module-a-openapi';
+import type { IModalAlertOptions, IModalDialogOptions } from 'zova-module-basic-app';
 
 import { BeanBase } from 'zova';
 import { Command } from 'zova-module-a-command';
 
 export type TypeCommandAlertResult = unknown;
 
-export interface ICommandOptionsAlert extends ICommandOptionsBase<TypeCommandAlertResult> {
-  message: string;
-  wait?: boolean;
+export interface ICommandOptionsAlert
+  extends ICommandOptionsBase<TypeCommandAlertResult>, IModalAlertOptions {
+  dialogOptions?: IModalDialogOptions;
 }
 
-@Command<ICommandOptionsAlert>({ wait: true })
+@Command<ICommandOptionsAlert>()
 export class CommandAlert extends BeanBase implements ICommandExecute {
   execute(
     options: ICommandOptionsAlert,
-    _renderContext: IJsxRenderContextBase,
+    renderContext: IJsxRenderContextBase,
     next: NextCommandExecute,
   ) {
-    if (options.wait) {
-      // eslint-disable-next-line no-alert
-      window.alert(options.message);
-    } else {
-      setTimeout(() => {
-        // eslint-disable-next-line no-alert
-        window.alert(options.message);
-      }, 0);
-    }
+    const { $host } = renderContext;
+    $host.$appModal.alert(options, options.dialogOptions);
     return next();
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-commands/src/bean/command.confirm.tsx

@@ -1,3 +1,5 @@
+import type { IModalConfirmOptions, IModalDialogOptions } from 'zova-module-basic-app';
+
 import { BeanBase } from 'zova';
 import {
   Command,
@@ -7,21 +9,22 @@ import {
 } from 'zova-module-a-command';
 import { IJsxRenderContextBase } from 'zova-module-a-openapi';
 
-export type TypeCommandConfirmResult = boolean;
+export type TypeCommandConfirmResult = Promise<boolean>;
 
-export interface ICommandOptionsConfirm extends ICommandOptionsBase<TypeCommandConfirmResult> {
-  message: string;
+export interface ICommandOptionsConfirm
+  extends ICommandOptionsBase<TypeCommandConfirmResult>, IModalConfirmOptions {
+  dialogOptions?: IModalDialogOptions;
 }
 
 @Command<ICommandOptionsConfirm>()
 export class CommandConfirm extends BeanBase implements ICommandExecute {
-  execute(
+  async execute(
     options: ICommandOptionsConfirm,
-    _renderContext: IJsxRenderContextBase,
+    renderContext: IJsxRenderContextBase,
     next: NextCommandExecute,
   ) {
-    // eslint-disable-next-line no-alert
-    const res = window.confirm(options.message);
+    const { $host } = renderContext;
+    const res = await $host.$appModal.confirm(options, options.dialogOptions);
     return next(res);
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-commands/src/bean/command.prompt.tsx

@@ -0,0 +1,30 @@
+import type {
+  ICommandExecute,
+  ICommandOptionsBase,
+  NextCommandExecute,
+} from 'zova-module-a-command';
+import type { IJsxRenderContextBase } from 'zova-module-a-openapi';
+import type { IModalDialogOptions, IModalPromptOptions } from 'zova-module-basic-app';
+
+import { BeanBase } from 'zova';
+import { Command } from 'zova-module-a-command';
+
+export type TypeCommandPromptResult = unknown;
+
+export interface ICommandOptionsPrompt
+  extends ICommandOptionsBase<TypeCommandPromptResult>, IModalPromptOptions {
+  dialogOptions?: IModalDialogOptions;
+}
+
+@Command<ICommandOptionsPrompt>()
+export class CommandPrompt extends BeanBase implements ICommandExecute {
+  async execute(
+    options: ICommandOptionsPrompt,
+    renderContext: IJsxRenderContextBase,
+    next: NextCommandExecute,
+  ) {
+    const { $host } = renderContext;
+    const res = await $host.$appModal.prompt(options, options.dialogOptions);
+    return next(res);
+  }
+}

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

@@ -42,9 +42,11 @@ export class ControllerBlockForm extends BeanControllerBase {
         formProvider={$$pageEntry.formProvider}
         formScope={$$pageEntry.jsxCelScope}
         onSubmitData={data => $$pageEntry.submitData(data)}
-        onShowError={({ error }) => {
-          // eslint-disable-next-line no-alert
-          window.alert(error.message);
+        onShowError={async ({ error }) => {
+          await this.$performCommand('basic-commands:alert', {
+            type: 'error',
+            text: error.message,
+          });
         }}
         onChanged={data => {
           $$pageEntry.setPageMeta(data, true);

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

@@ -49,8 +49,12 @@ export class ControllerFormFieldSelect extends BeanControllerBase {
       <ZFormField
         {...this.$props}
         slotDefault={({ propsBucket, props }, $$formField) => {
-          const className = !propsBucket.needHandleBorder
-            ? classes(props.class, 'select select-ghost')
+          const needClearableEmptyOption = !propsBucket.needHandleBorder;
+          const className = needClearableEmptyOption
+            ? classes(
+                props.class,
+                'grow w-full h-full min-h-0 border-0 rounded-none bg-transparent pl-0 pr-8 py-0 shadow-none outline-none focus:outline-none focus:shadow-none focus:border-0',
+              )
             : classes(
                 props.class,
                 'select',
@@ -61,23 +65,41 @@ export class ControllerFormFieldSelect extends BeanControllerBase {
             'onUpdate:modelValue': (value: any) => {
               $$formField.setValue(value, propsBucket.disableNotifyChanged);
             },
+            'onBlur': () => {
+              $$formField.handleBlur();
+            },
             ...propsBucket.options,
             ...props,
             'class': className,
           };
-          propsNew.items = this._ensureEmptyItemFallback(propsNew.items, propsNew.placeholder);
+          if (needClearableEmptyOption) {
+            propsNew.items = this._ensureEmptyItemFallback(
+              propsNew.items,
+              propsNew.placeholder,
+              true,
+            );
+            propsNew.placeholder = undefined;
+          } else if (!propsNew.placeholder) {
+            propsNew.items = this._ensureEmptyItemFallback(propsNew.items, undefined);
+          }
           return <ZSelect {...propsNew}></ZSelect>;
         }}
       ></ZFormField>
     );
   }
 
-  private _ensureEmptyItemFallback(items: any[] | undefined, placeholder: unknown): any[] | undefined {
-    if (!!placeholder || !items?.length) return items;
+  private _ensureEmptyItemFallback(
+    items: any[] | undefined,
+    placeholder: unknown,
+    force = false,
+  ): any[] | undefined {
+    if (!items?.length) return items;
     const valueKey = String(this.$props.options.itemValue);
     const titleKey = String(this.$props.options.itemTitle);
-    if (items[0]?.[valueKey] === undefined) return items;
-    return [{ [valueKey]: undefined, [titleKey]: '' }, ...items];
+    const emptyValue = '';
+    if (items[0]?.[valueKey] === emptyValue) return items;
+    if (!force && !!placeholder) return items;
+    return [{ [valueKey]: emptyValue, [titleKey]: placeholder ?? '' }, ...items];
   }
 
   private _getValueByItems() {

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/cabloy-basic/modules/basic-table/package.json

@@ -48,5 +48,10 @@
       "exports.\\..import"
     ]
   },
-  "title": "basic-table"
+  "title": "basic-table",
+  "zovaModule": {
+    "dependencies": {
+      "basic-app": "5.0.0"
+    }
+  }
 }

package/zova/src/suite/cabloy-basic/modules/basic-table/src/bean/tableCell.actionDelete.tsx

@@ -32,8 +32,10 @@ export class TableCellActionDelete extends BeanBase implements ITableCellRender
         class={options.class}
         type="button"
         onClick={async () => {
-          // eslint-disable-next-line no-alert
-          if (!window.confirm(this.scope.locale.DeleteConfirm())) return;
+          const confirmed = await $host.$performCommand('basic-commands:confirm', {
+            text: this.scope.locale.DeleteConfirm(),
+          });
+          if (!confirmed) return;
           await $host.$performCommand('basic-commands:delete', options, renderContext);
         }}
       >

package/zova/src/suite/cabloy-basic/package.json

@@ -8,6 +8,7 @@
   "type": "module",
   "dependencies": {
     "zova-module-basic-adapter": "^5.0.5",
+    "zova-module-basic-app": "^5.0.0",
     "zova-module-basic-captcha": "^5.0.8",
     "zova-module-basic-commands": "^5.1.15",
     "zova-module-basic-commandssync": "^5.0.5",

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"
   },