cabloy 5.1.98 → 5.1.100

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.131",
+  "version": "5.1.132",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.76",
-    "zova-suite-a-zova": "^5.1.130"
+    "zova-core": "^5.1.77",
+    "zova-suite-a-zova": "^5.1.131"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.76",
+  "version": "5.1.77",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/bean/beanBase.ts

@@ -28,22 +28,18 @@ import type { AppEvent } from '../core/component/event.ts';
 import type { ILoggerChildRecord, ILoggerClientRecord } from '../core/logger/types.ts';
 import type { FunctionAsync } from '../decorator/type/functionable.ts';
 import type { MapSources, MaybeUndefined } from '../vueExtra/watch.ts';
-import type {
-  IErrorHandlerEventResult,
-  IModuleLocaleText,
-  IZovaComponentRecord,
-} from './resource/index.ts';
+import type { IErrorHandlerEventResult, IZovaComponentRecord } from './resource/index.ts';
 
 import { cast } from '../types/utils/cast.ts';
 import { BeanBaseSimple, SymbolModuleBelong } from './beanBaseSimple.ts';
 import { SymbolErrorInstanceInfo } from './resource/index.ts';
 
-const SymbolText = Symbol('SymbolText');
+// const SymbolText = Symbol('SymbolText');
 const SymbolLogger = Symbol('SymbolLogger');
 const SymbolLoggerChildren = Symbol('SymbolLoggerChildren');
 
 export class BeanBase extends BeanBaseSimple {
-  private [SymbolText]: IModuleLocaleText;
+  // private [SymbolText]: IModuleLocaleText;
   private [SymbolLogger]: Record<keyof ILoggerClientRecord, Logger> = {} as any;
   private [SymbolLoggerChildren]: Record<keyof ILoggerClientRecord, Record<string, Logger>> =
     {} as any;
@@ -55,12 +51,12 @@ export class BeanBase extends BeanBaseSimple {
     return this.ctx.meta.el;
   }
 
-  protected get $text(): IModuleLocaleText {
-    if (!this[SymbolText]) {
-      this[SymbolText] = this.app.meta.locale.createLocaleText(this[SymbolModuleBelong]);
-    }
-    return this[SymbolText];
-  }
+  // protected get $text(): IModuleLocaleText {
+  //   if (!this[SymbolText]) {
+  //     this[SymbolText] = this.app.meta.locale.createLocaleText(this[SymbolModuleBelong]);
+  //   }
+  //   return this[SymbolText];
+  // }
 
   protected get $logger() {
     return this.$loggerClient('default');

package/zova/pnpm-lock.yaml

@@ -133,7 +133,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.76
+        specifier: ^1.1.77
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -234,6 +234,9 @@ importers:
       zova-module-basic-details:
         specifier: workspace:^
         version: link:src/suite/cabloy-basic/modules/basic-details
+      zova-module-basic-file:
+        specifier: workspace:^
+        version: link:src/suite/cabloy-basic/modules/basic-file
       zova-module-basic-form:
         specifier: workspace:^
         version: link:src/suite/cabloy-basic/modules/basic-form
@@ -675,7 +678,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.38(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.76
+        specifier: ^5.1.77
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -816,10 +819,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.76
+        specifier: ^5.1.77
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.130
+        specifier: ^5.1.131
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -917,7 +920,7 @@ importers:
   src/suite-vendor/a-cabloy:
     dependencies:
       zova-module-rest-resource:
-        specifier: ^5.1.40
+        specifier: ^5.1.41
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/rest-resource:
@@ -971,10 +974,10 @@ importers:
         specifier: ^5.1.21
         version: link:modules/a-meta
       zova-module-a-model:
-        specifier: ^5.1.30
+        specifier: ^5.1.31
         version: link:modules/a-model
       zova-module-a-openapi:
-        specifier: ^5.1.42
+        specifier: ^5.1.43
         version: link:modules/a-openapi
       zova-module-a-router:
         specifier: ^5.1.29
@@ -1004,7 +1007,7 @@ importers:
         specifier: ^5.1.36
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.91
+        specifier: ^5.1.92
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1343,7 +1346,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.76
+        specifier: ^1.1.77
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':
@@ -1583,6 +1586,9 @@ importers:
       zova-module-basic-details:
         specifier: ^5.0.0
         version: link:modules/basic-details
+      zova-module-basic-file:
+        specifier: ^5.0.0
+        version: link:modules/basic-file
       zova-module-basic-form:
         specifier: ^5.0.7
         version: link:modules/basic-form
@@ -1690,6 +1696,15 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
+  src/suite/cabloy-basic/modules/basic-file:
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
   src/suite/cabloy-basic/modules/basic-form:
     devDependencies:
       clean-package:

package/zova/src/suite/a-demo/modules/demo-basic/src/page/toolOne/controller.tsx

@@ -7,7 +7,7 @@ import {
   ControllerForm,
   TypeFormOnSubmitData,
 } from 'zova-module-a-form';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { IFormMeta } from 'zova-module-a-openapi';
 import { ApiSchemaTestSsrDtoTestBodyPartial } from 'zova-module-home-api';
 
@@ -36,7 +36,7 @@ export class ControllerPageToolOne extends BeanControllerPageFormBase {
 
   protected async __init__() {
     const apiSchemas = this.$apiSchema.testSsrToolOne.test();
-    const querySdk = await $QueryAutoLoad(() => apiSchemas.sdk);
+    const querySdk = await $QueryEnsureLoaded(() => apiSchemas.sdk);
     this.schemaUpdate = this.$computed(() => {
       const schema = apiSchemas.requestBody;
       // eslint-disable-next-line

package/zova/src/suite/a-demo/modules/demo-todo/src/page/todo/controller.tsx

@@ -2,7 +2,7 @@ import { RouterLink } from '@cabloy/vue-router';
 import { withModifiers } from 'vue';
 import { BeanControllerPageBase, Use, uuid } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import type { ApiTodoEntity } from '../../api/todo.js';
@@ -18,7 +18,7 @@ export class ControllerPageTodo extends BeanControllerPageBase {
   currentTodoId?: string;
 
   protected async __init__() {
-    await $QueryAutoLoad(() => this.queryTodos);
+    await $QueryEnsureLoaded(() => this.queryTodos);
   }
 
   get queryTodos() {

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/controller.tsx

@@ -2,7 +2,7 @@ import type { ModelTabs, ModelTabsOptions } from 'zova-module-a-routertabs';
 
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { IServiceSsrLayoutOptions, ServiceLocale, ServiceSsrLayout } from 'zova-module-home-base';
 
 import { ModelLayout } from '../../model/layout.js';
@@ -67,7 +67,7 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
       await this.$passport.ensurePassport();
     }
     // menu
-    await $QueryAutoLoad(() => this.$$modelMenu.retrieveMenus());
+    await $QueryEnsureLoaded(() => this.$$modelMenu.retrieveMenus());
     // tabs
     await this._initTabs();
   }

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/controller.tsx

@@ -1,6 +1,6 @@
 import { BeanControllerBase, Use, UseScope } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ModelTabs, ModelTabsOptions, RouteTabInitial } from 'zova-module-a-routertabs';
 import { ScopeModuleASsr } from 'zova-module-a-ssr';
 import { IServiceSsrLayoutOptions, ServiceLocale, ServiceSsrLayout } from 'zova-module-home-base';
@@ -65,7 +65,7 @@ export class ControllerLayoutWeb extends BeanControllerBase {
       };
     });
     // menu
-    await $QueryAutoLoad(() => this.$$modelMenu.retrieveMenus());
+    await $QueryEnsureLoaded(() => this.$$modelMenu.retrieveMenus());
     // tabs
     await this._initTabs();
   }

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

@@ -1,7 +1,7 @@
 import { BeanControllerPageBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { TypeFormOnSubmitData } from 'zova-module-a-form';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ApiApiHomeUserPassportloginRequestBody } from 'zova-module-home-api';
 
 @Controller()
@@ -20,7 +20,7 @@ export class ControllerPageLogin extends BeanControllerPageBase {
       this.user.username = 'admin';
       this.user.password = '123456';
     }
-    await $QueryAutoLoad(() => this.$passport.apiSchemasLogin.sdk);
+    await $QueryEnsureLoaded(() => this.$passport.apiSchemasLogin.sdk);
   }
 
   get schema() {

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

@@ -35,7 +35,7 @@ export class ControllerBlockDetails<TData extends {} = {}> extends BeanControlle
   static $propsDefault = {};
   static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
 
-  tableRef: BeanControllerTableBase<TData>;
+  tableRef: BeanControllerTableBase<TData> | undefined;
 
   jsxZova: ZovaJsx;
   jsxCelScope: IDetailsScope;
@@ -70,6 +70,10 @@ export class ControllerBlockDetails<TData extends {} = {}> extends BeanControlle
     return this.$props.schemaForm!;
   }
 
+  public async setTableRef(tableRef: BeanControllerTableBase<TData> | undefined) {
+    this.tableRef = tableRef;
+  }
+
   private _prepareJsx() {
     const jsxCelEnv = celEnvBase.clone();
     this.jsxZova = this.bean._newBeanSimple(ZovaJsx, false, undefined, jsxCelEnv);

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

@@ -3,7 +3,8 @@ import type { IResourceBlockOptionsBase, IJsxRenderContextDetails } from 'zova-m
 
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { BeanControllerTableBase, ZTable } from 'zova-module-a-table';
+import { BeanControllerTableBase } from 'zova-module-a-table';
+import { ZTable } from 'zova-module-basic-table';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceBlockRecord {
@@ -15,7 +16,10 @@ export interface ControllerBlockTableProps extends IResourceBlockOptionsBase {}
 
 @Controller()
 export class ControllerBlockTable<TData extends {} = {}> extends BeanControllerBase {
-  static $propsDefault = {};
+  static $propsDefault = {
+    class: 'overflow-x-auto rounded-box border border-base-content/15 bg-base-100',
+  };
+
   static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
 
   tableRef: BeanControllerTableBase<TData>;
@@ -31,19 +35,20 @@ export class ControllerBlockTable<TData extends {} = {}> extends BeanControllerB
       item => (item as Record<string, any>).deleted !== true,
     );
     return (
-      <ZTable<TData>
-        class={this.$props.class}
-        controllerRef={ref => {
-          this.tableRef = ref;
-          $$details.tableRef = ref as unknown as BeanControllerTableBase<{}>;
-        }}
-        data={data}
-        schema={$$details.schemaRow}
-        tableScope={$$details.jsxCelScope}
-        getRowId={(_originalRow: TData, index: number) => {
-          return String(index);
-        }}
-      ></ZTable>
+      <div class={this.$props.class}>
+        <ZTable<TData>
+          tableRef={ref => {
+            this.tableRef = ref;
+            $$details.setTableRef(ref as unknown as BeanControllerTableBase<{}>);
+          }}
+          data={data}
+          schema={$$details.schemaRow}
+          tableScope={$$details.jsxCelScope}
+          getRowId={(_originalRow: TData, index: number) => {
+            return String(index);
+          }}
+        ></ZTable>
+      </div>
     );
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-details/src/service/detail.tsx

@@ -143,7 +143,12 @@ export class ServiceDetail<TData extends {} = {}> extends BeanBase {
     data: TypeFormOnSubmitData<TData>,
   ) {
     const renderProvider = property.rest?.render;
-    if (renderProvider !== 'basic-image:formFieldImage') return;
+    if (
+      renderProvider !== 'basic-image:formFieldImage' &&
+      renderProvider !== 'basic-file:formFieldFile'
+    ) {
+      return;
+    }
     const relationName = this._getRelationNameOfField(property, property.rest);
     if (!relationName) return;
     const relationValue = data.formApi.getFieldValue(relationName as never);

package/zova/src/suite/cabloy-basic/modules/basic-file/cli/openapi.config.ts

@@ -0,0 +1,9 @@
+import type { ZovaOpenapiConfigModule } from 'zova-openapi';
+
+export default function (): ZovaOpenapiConfigModule {
+  return {
+    operations: {
+      match: [/^File_*/],
+    },
+  };
+}

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

@@ -0,0 +1,58 @@
+{
+  "name": "zova-module-basic-file",
+  "version": "5.0.0",
+  "description": "",
+  "keywords": [
+    "Zova Module"
+  ],
+  "author": "",
+  "files": [
+    "mock",
+    "dist",
+    "src",
+    "icons",
+    "assets",
+    "cli"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": "./*"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/zova.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "replace": {
+      "exports.\\..types": "./dist/index.d.ts"
+    },
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "basic-file",
+  "zovaModule": {
+    "dependencies": {
+      "basic-app": "5.0.0"
+    }
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-file/src/.metadata/component/formFieldFile.ts

@@ -0,0 +1,31 @@
+import type { TypeControllerInnerProps } from 'zova';
+
+import { defineComponent } from 'vue';
+import { prepareComponentOptions, useController } from 'zova';
+
+import type { ControllerFormFieldFileProps } from '../../component/formFieldFile/controller.jsx';
+
+import { ControllerFormFieldFile } from '../../component/formFieldFile/controller.jsx';
+export type ZFormFieldFileProps = {
+  controllerRef?: (ref: ControllerFormFieldFile) => void;
+} & ControllerFormFieldFileProps;
+
+type ControllerInnerProps = TypeControllerInnerProps<
+  ControllerFormFieldFileProps,
+  keyof typeof ControllerFormFieldFile.$propsDefault
+>;
+declare module 'zova-module-basic-file' {
+  export interface ControllerFormFieldFile {
+    $props: ControllerInnerProps;
+  }
+}
+
+export const ZFormFieldFile = defineComponent((_props: ZFormFieldFileProps) => {
+  useController(ControllerFormFieldFile, undefined, undefined);
+  return () => {};
+}, prepareComponentOptions(ControllerFormFieldFile.$componentOptions));
+declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    'basic-file:formFieldFile': ControllerFormFieldFileProps;
+  }
+}