zova-ui-vuetify 5.1.65 → 5.1.67

package/.gitignore

@@ -46,9 +46,9 @@ yarn-error.log*
 *.njsproj
 *.sln
 
-# mine .env files
-env/.env*.mine
-/src/front/config/config/config*.mine.ts
+# local .env files
+env/.env*.local
+/src/front/config/config/config*.local.ts
 /src/front/typing/modules.d.ts
 **/.metadata/modules.d.ts
 # /package.json

package/.vscode/zova.code-snippets

@@ -112,6 +112,17 @@
     ],
     "description": "aop.actionsync"
   },
+  "aop.actionrender": {
+    "scope": "typescript,typescriptreact",
+    "prefix": "aopactionrender",
+    "body": [
+      "protected render: AopActionRender<ClassSome> = (_args, next, _receiver) => {",
+      "  const result = next();",
+      "  return result;",
+      "}"
+    ],
+    "description": "aop.actionrender"
+  },
   "aopmethod.get": {
     "scope": "typescript,typescriptreact",
     "prefix": "aopmethodget",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-ui-vuetify",
-  "version": "5.1.65",
-  "gitHead": "b69292484fa93e2c05d2f9d0ca27d297b536a545",
+  "version": "5.1.67",
+  "gitHead": "a247f88a55c663d313296039f874560ee5a13e01",
   "description": "A vue3 vuetify framework with ioc",
   "keywords": [
     "ioc",
@@ -58,11 +58,11 @@
     "@cabloy/compose": "^2.1.4",
     "@cabloy/deps": "^1.1.4",
     "@cabloy/json5": "^1.1.5",
-    "@cabloy/logger": "^1.1.9",
+    "@cabloy/logger": "^1.1.10",
     "@cabloy/module-info": "^2.0.0",
-    "@cabloy/utils": "^2.1.9",
+    "@cabloy/utils": "^2.1.15",
     "@cabloy/vue-router": "^4.4.16",
-    "@cabloy/word-utils": "^2.1.8",
+    "@cabloy/word-utils": "^2.1.9",
     "@cabloy/zod-openapi": "^1.1.5",
     "@date-io/luxon": "^3.2.0",
     "@fontsource/roboto": "^5.2.10",
@@ -88,37 +88,35 @@
     "vue-router": "npm:@cabloy/vue-router@^4.4.16",
     "vuetify": "^4.0.5",
     "zod": "^4.3.6",
-    "zova": "^5.1.42",
-    "zova-jsx": "^1.1.24",
-    "zova-module-a-action": "^5.1.11",
-    "zova-module-a-actions": "^5.1.10",
-    "zova-module-a-api": "^5.1.8",
-    "zova-module-a-app": "^5.1.9",
-    "zova-module-a-bean": "^5.1.10",
-    "zova-module-a-behavior": "^5.1.9",
-    "zova-module-a-behaviors": "^5.1.8",
-    "zova-module-a-boundary": "^5.1.8",
-    "zova-module-a-currency": "^5.1.9",
-    "zova-module-a-date": "^5.1.10",
-    "zova-module-a-fetch": "^5.1.8",
-    "zova-module-a-form": "^5.1.9",
-    "zova-module-a-icon": "^5.1.11",
-    "zova-module-a-interceptor": "^5.1.14",
-    "zova-module-a-logger": "^5.1.9",
-    "zova-module-a-meta": "^5.1.8",
-    "zova-module-a-model": "^5.1.11",
-    "zova-module-a-openapi": "^5.1.11",
-    "zova-module-a-pinia": "^5.1.8",
-    "zova-module-a-router": "^5.1.12",
-    "zova-module-a-routerstack": "^5.1.9",
-    "zova-module-a-routertabs": "^5.1.13",
-    "zova-module-a-ssr": "^5.1.10",
-    "zova-module-a-ssrhmr": "^5.1.9",
-    "zova-module-a-ssrserver": "^5.1.8",
-    "zova-module-a-style": "^5.1.12",
-    "zova-module-a-table": "^5.1.9",
-    "zova-module-a-zod": "^5.1.11",
-    "zova-module-a-zova": "^5.1.28",
+    "zova": "^5.1.44",
+    "zova-jsx": "^1.1.26",
+    "zova-module-a-action": "^5.1.12",
+    "zova-module-a-api": "^5.1.9",
+    "zova-module-a-app": "^5.1.10",
+    "zova-module-a-bean": "^5.1.12",
+    "zova-module-a-behavior": "^5.1.11",
+    "zova-module-a-behaviors": "^5.1.9",
+    "zova-module-a-boundary": "^5.1.9",
+    "zova-module-a-fetch": "^5.1.9",
+    "zova-module-a-form": "^5.1.10",
+    "zova-module-a-icon": "^5.1.12",
+    "zova-module-a-interceptor": "^5.1.15",
+    "zova-module-a-logger": "^5.1.10",
+    "zova-module-a-meta": "^5.1.9",
+    "zova-module-a-model": "^5.1.12",
+    "zova-module-a-openapi": "^5.1.12",
+    "zova-module-a-pinia": "^5.1.9",
+    "zova-module-a-router": "^5.1.13",
+    "zova-module-a-routerstack": "^5.1.10",
+    "zova-module-a-routertabs": "^5.1.14",
+    "zova-module-a-ssr": "^5.1.11",
+    "zova-module-a-ssrhmr": "^5.1.10",
+    "zova-module-a-ssrserver": "^5.1.9",
+    "zova-module-a-style": "^5.1.13",
+    "zova-module-a-table": "^5.1.10",
+    "zova-module-a-zod": "^5.1.12",
+    "zova-module-a-zova": "^5.1.30",
+    "zova-module-basic-actions": "^5.1.10",
     "zova-module-demo-basic": "workspace:^",
     "zova-module-home-api": "workspace:^",
     "zova-module-home-base": "workspace:^",
@@ -129,15 +127,14 @@
     "zova-module-home-login": "workspace:^",
     "zova-module-home-passport": "workspace:^",
     "zova-module-home-theme": "workspace:^",
-    "zova-module-rest-actions": "^5.1.10",
-    "zova-module-rest-resource": "^5.1.11",
+    "zova-module-rest-resource": "^5.1.12",
     "zova-module-vuetify-adapter": "workspace:^",
     "zova-module-vuetify-form": "workspace:^",
-    "zova-suite-a-cabloy": "^5.1.12"
+    "zova-suite-a-cabloy": "^5.1.13"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.9",
-    "@cabloy/lint": "^5.1.7",
+    "@cabloy/lint": "^5.1.8",
     "@cabloy/openapi-typescript": "^7.9.2",
     "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
     "@types/luxon": "^3.7.1",
@@ -149,7 +146,7 @@
     "less": "^4.6.4",
     "oxfmt": "^0.45.0",
     "oxlint": "^1.60.0",
-    "quasar-app-extension-zova": "^1.2.19",
+    "quasar-app-extension-zova": "^1.2.20",
     "sass-embedded": "^1.99.0",
     "typescript": "^5.9.3",
     "unplugin-fonts": "^1.4.0",
@@ -157,8 +154,8 @@
     "vite-plugin-fake-server-turbo": "^3.0.18",
     "vite-plugin-vuetify": "^2.1.3",
     "vue-tsc": "^3.2.6",
-    "zova-openapi": "^1.1.8",
-    "zova-vite": "^1.1.19"
+    "zova-openapi": "^1.1.9",
+    "zova-vite": "^1.1.20"
   },
   "packageManager": "pnpm@10.19.0",
   "pnpm": {

package/package.original.json

@@ -63,7 +63,7 @@
     "zova-suite-a-cabloy": "^5.1.12"
   },
   "devDependencies": {
-    "@cabloy/lint": "^5.1.7",
+    "@cabloy/lint": "^5.1.8",
     "@cabloy/openapi-typescript": "^7.9.2",
     "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
     "@types/node": "^22.19.17",

package/src/suite/a-home/modules/home-login/src/page/login/controller.tsx

@@ -27,11 +27,11 @@ export class ControllerPageLogin extends BeanControllerPageBase {
     return this.$passport.schemaLogin;
   }
 
-  async onSubmitLogin(data: TypeFormOnSubmitData<ApiApiHomeUserPassportloginRequestBody>) {
+  async submitLogin(data: TypeFormOnSubmitData<ApiApiHomeUserPassportloginRequestBody>) {
     await this.$passport.login().mutateAsync(data.value);
   }
 
-  async onSubmitLoginGitHub() {
+  async loginGitHub() {
     const apiUrl = this.$passport.getOauthLoginUrl('auth-github', 'github', 'default');
     window.location.assign(apiUrl);
   }

package/src/suite/a-home/modules/home-login/src/page/login/render.tsx

@@ -1,7 +1,7 @@
 import { VBtn, VCard, VCol, VDivider, VRow } from 'vuetify/components';
 import { BeanRenderBase } from 'zova';
 import { Render } from 'zova-module-a-bean';
-import { ZForm, ZFormField, ZFormFieldWrapper, ZFormSubscribe } from 'zova-module-a-form';
+import { ZForm, ZFormFieldBlank, ZFormFieldPreset } from 'zova-module-a-form';
 import { $iconName } from 'zova-module-a-icon';
 
 import { $useLocale } from '../../.metadata/locales.js';
@@ -60,17 +60,17 @@ export class RenderPageLogin extends BeanRenderBase {
         data={this.user}
         schema={this.schema}
         onSubmitData={data => {
-          return this.onSubmitLogin(data);
+          return this.submitLogin(data);
         }}
         onShowError={({ error }) => {
           // eslint-disable-next-line no-alert
           window.alert(error.message);
         }}
       >
-        <ZFormField name="username" iconPrefix=":daisy:person" label={this.scope.locale.YourUsername()}></ZFormField>
-        <ZFormField name="password" inputType="password" iconPrefix=":daisy:lock" label={this.scope.locale.YourPassword()}></ZFormField>
-        <ZFormFieldWrapper name="captcha"></ZFormFieldWrapper>
-        <ZFormSubscribe
+        <ZFormFieldPreset name="username" iconPrefix=":daisy:person" label={this.scope.locale.YourUsername()}></ZFormFieldPreset>
+        <ZFormFieldPreset name="password" inputType="password" iconPrefix=":daisy:lock" label={this.scope.locale.YourPassword()}></ZFormFieldPreset>
+        <ZFormFieldPreset name="captcha"></ZFormFieldPreset>
+        <ZFormFieldBlank
           slotDefault={$$form => {
             return (
               <div class="d-flex justify-center">
@@ -80,7 +80,7 @@ export class RenderPageLogin extends BeanRenderBase {
               </div>
             );
           }}
-        ></ZFormSubscribe>
+        ></ZFormFieldBlank>
       </ZForm>
     );
   }
@@ -92,7 +92,7 @@ export class RenderPageLogin extends BeanRenderBase {
           color="secondary"
           prependIcon={$iconName(':auth:github')}
           nativeOnClick={() => {
-            this.onSubmitLoginGitHub();
+            this.loginGitHub();
           }}
         >
           {this.scope.locale.LoginGitHub()}

package/src/suite/a-vuetify/modules/vuetify-adapter/src/.metadata/index.ts

@@ -142,6 +142,10 @@ declare module 'zova' {
   }
 }
 /** meta: end */
+/** config: begin */
+export * from '../config/config.js';
+import { config } from '../config/config.js';
+/** config: end */
 /** monkey: begin */
 export * from '../monkey.js';
 /** monkey: end */
@@ -149,7 +153,7 @@ export * from '../monkey.js';
 export * from '../monkeySys.js';
 /** monkeySys: end */
 /** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'zova';
+import { BeanScopeBase, type BeanScopeUtil, TypeModuleConfig } from 'zova';
 import { Scope } from 'zova-module-a-bean';
 
 @Scope()
@@ -157,6 +161,7 @@ export class ScopeModuleVuetifyAdapter extends BeanScopeBase {}
 
 export interface ScopeModuleVuetifyAdapter {
   util: BeanScopeUtil;
+config: TypeModuleConfig<typeof config>;
 }
 
 import 'zova';
@@ -165,7 +170,9 @@ declare module 'zova' {
     'vuetify-adapter': ScopeModuleVuetifyAdapter;
   }
   
-  
+  export interface IBeanScopeConfig {
+    'vuetify-adapter': ReturnType<typeof config>;
+  }
 
   
 

package/src/suite/a-vuetify/modules/vuetify-adapter/src/config/config.ts

@@ -0,0 +1,20 @@
+import type { ZovaSys } from 'zova';
+
+import { VTextField } from 'vuetify/components';
+import { IResourceProviders } from 'zova-module-a-openapi';
+
+export const config = (_sys: ZovaSys) => {
+  const resourceProviders: IResourceProviders = {
+    behaviors: {
+      FormField: 'vuetify-form:formField',
+      FormFieldLayout: 'vuetify-form:formFieldLayout',
+    },
+    formFields: {
+      Input: VTextField,
+      Captcha: 'vuetify-form:formFieldCaptcha',
+    },
+  };
+  return {
+    resourceProviders,
+  };
+};

package/src/suite/a-vuetify/modules/vuetify-adapter/src/monkeySys.ts

@@ -1,9 +1,8 @@
 import type { IMonkeySysInitialize } from 'zova';
-import type { IOpenapiOptionsResourceMeta } from 'zova-module-a-openapi';
 
-import { VTextField } from 'vuetify/components';
 import { BeanSimple, deepExtend } from 'zova';
 
+import { __ThisModule__ } from './.metadata/this.js';
 import { SysAppBar } from './bean/sys.appBar.jsx';
 import { SysIcon } from './bean/sys.icon.js';
 import { SysMain } from './bean/sys.main.js';
@@ -28,32 +27,9 @@ export class MonkeySys extends BeanSimple implements IMonkeySysInitialize {
     // appBar
     const sysAppBar = await this.bean._newBean(SysAppBar, false);
     await sysAppBar.initialize();
-    // config custom
-    const configCustom: IOpenapiOptionsResourceMeta = {
-      provider: {
-        components: {},
-      },
-      form: {
-        provider: {
-          components: {
-            text: VTextField,
-            captcha: 'vuetify-form:formFieldCaptcha',
-          },
-          behaviors: {
-            formField: 'vuetify-form:formField',
-            formFieldLayout: 'vuetify-form:formFieldLayout',
-          },
-        },
-      },
-      table: {
-        provider: {
-          components: {},
-          actions: {},
-        },
-      },
-    };
-    // rest
-    const scopeRestConfig = this.sys.util.getModuleConfigSafe('a-openapi');
-    scopeRestConfig.resourceMeta = deepExtend({}, scopeRestConfig.base, configCustom, scopeRestConfig.resourceMeta);
+    // config
+    const configSelf = this.sys.util.getModuleConfigSafe(__ThisModule__);
+    const configOpenapi = this.sys.util.getModuleConfigSafe('a-openapi');
+    configOpenapi.resourceProviders = deepExtend({}, configOpenapi.resourceProviders, configSelf.resourceProviders);
   }
 }

package/src/suite/a-vuetify/modules/vuetify-form/src/bean/behavior.formField.tsx

@@ -3,8 +3,8 @@ import type { ControllerFormField, IFormFieldRenderContext, IFormFieldRenderCont
 import { isEmptyObject, isNil } from '@cabloy/utils';
 import { VNode } from 'vue';
 import z from 'zod';
-import { cast, Use } from 'zova';
-import { isNativeElement } from 'zova-jsx';
+import { Use } from 'zova';
+import { isJsxComponent } from 'zova-jsx';
 import { BeanBehaviorBase, Behavior, IDecoratorBehaviorOptions, NextBehavior } from 'zova-module-a-behavior';
 
 export interface IBehaviorPropsInputFormField extends IFormFieldRenderContext {}
@@ -24,22 +24,21 @@ export class BehaviorFormField extends BeanBehaviorBase<IBehaviorOptionsFormFiel
   }
 
   private _patchProps(renderContext: IFormFieldRenderContext) {
+    const $$form = this.$$formField.$$form;
     const formMeta = this.$$formField.formMeta;
     const field = this.$$formField.field;
-    const componentName =
-      typeof renderContext.propsBucket.renderProvider === 'object'
-        ? cast(renderContext.propsBucket.renderProvider)?.name
-        : renderContext.propsBucket.renderProvider;
+    const needPatch = !isJsxComponent(renderContext.propsBucket.render) || $$form.isComponentFormField(renderContext.propsBucket.renderProvider);
+    if (!needPatch) return;
     // propsPatch
-    let propsPatch = isNativeElement(componentName) ? {} : this._patchProps_general(formMeta, field, renderContext);
-    // input
-    if (componentName === 'VTextField') {
-      propsPatch = this._patchProps_input(formMeta, field, renderContext, propsPatch);
-    }
+    const propsPatch = this._patchProps_general(formMeta, field, renderContext);
     // merge
     if (!isEmptyObject(propsPatch)) {
       renderContext.props = Object.assign({}, propsPatch, renderContext.props);
     }
+    // input
+    if (componentName === 'VTextField') {
+      propsPatch = this._patchProps_input(formMeta, field, renderContext, propsPatch);
+    }
   }
 
   private _patchProps_general(formMeta: IFormMeta | undefined, field: TypeFormField, renderContext: IFormFieldRenderContext) {

package/src/suite/a-vuetify/modules/vuetify-form/src/component/formFieldCaptcha/controller.tsx

@@ -1,18 +1,20 @@
 import { VTextField } from 'vuetify/components';
 import { BeanControllerBase, ClientOnly, IComponentOptions, TypeEventOff, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { ControllerForm, IFormFieldOptions, IFormFieldRenderContextProps, ZFormField } from 'zova-module-a-form';
-import { ICaptchaData, ICaptchaOptions } from 'zova-module-a-openapi';
+import { ControllerForm, IFormFieldPresetOptions, IFormFieldRenderContextProps, ZFormField } from 'zova-module-a-form';
+import { ICaptchaData } from 'zova-module-a-openapi';
 import { ToolV } from 'zova-module-a-zod';
 
-export interface ControllerFormFieldCaptchaProps extends IFormFieldOptions {
-  captcha?: ICaptchaOptions;
-}
+export interface ControllerFormFieldCaptchaProps extends IFormFieldPresetOptions {}
 
 @Controller()
 export class ControllerFormFieldCaptcha extends BeanControllerBase {
-  static $propsDefault = {};
-  static $componentOptions: IComponentOptions = { inheritAttrs: false };
+  static $propsDefault = {
+    preset: {
+      Captcha: { scene: 'captcha-simple:simple' },
+    },
+  };
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
 
   eventFormSubmission: TypeEventOff;
   captchaData?: ICaptchaData;
@@ -46,7 +48,7 @@ export class ControllerFormFieldCaptcha extends BeanControllerBase {
   }
 
   get captchaScene() {
-    return this.$props.captcha?.scene ?? 'captcha-simple:simple';
+    return this.$props.preset!.captcha!.scene!;
   }
 
   private async createCaptchaData() {
@@ -81,7 +83,6 @@ export class ControllerFormFieldCaptcha extends BeanControllerBase {
     return (
       <ZFormField
         {...this.$props}
-        render="text"
         slotDefault={({ props }, $$formField) => {
           const propsNew: IFormFieldRenderContextProps = {
             ...props,
@@ -91,7 +92,7 @@ export class ControllerFormFieldCaptcha extends BeanControllerBase {
               if (this.captchaData) {
                 this.captchaData.token = token;
               }
-              $$formField.field.api.handleChange({
+              $$formField.setValue({
                 id: this.captchaData?.id,
                 token,
               });