cabloy 5.1.108 → 5.1.110

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/.metadata/index.ts

@@ -0,0 +1,81 @@
+// eslint-disable
+/** ssrSite: begin */
+export * from '../bean/ssrSite.commerce.ts';
+import type { ISsrSiteOptionsCommerce } from '../bean/ssrSite.commerce.ts';
+import 'vona-module-a-ssr';
+declare module 'vona-module-a-ssr' {
+  
+    export interface ISsrSiteRecord {
+      'commerce-siteweb:commerce': ISsrSiteOptionsCommerce;
+    }
+
+  
+}
+declare module 'vona-module-commerce-siteweb' {
+  
+        export interface SsrSiteCommerce {
+          /** @internal */
+          get scope(): ScopeModuleCommerceSiteweb;
+        }
+
+          export interface SsrSiteCommerce {
+            get $beanFullName(): 'commerce-siteweb.ssrSite.commerce';
+            get $onionName(): 'commerce-siteweb:commerce';
+            get $onionOptions(): ISsrSiteOptionsCommerce;
+          } 
+}
+/** ssrSite: end */
+/** ssrMenu: begin */
+export * from '../bean/ssrMenu.home.ts';
+import type { ISsrMenuOptionsHome } from '../bean/ssrMenu.home.ts';
+import 'vona-module-a-ssr';
+declare module 'vona-module-a-ssr' {
+  
+    export interface ISsrMenuRecord {
+      'commerce-siteweb:home': ISsrMenuOptionsHome;
+    }
+
+  
+}
+declare module 'vona-module-commerce-siteweb' {
+  
+        export interface SsrMenuHome {
+          /** @internal */
+          get scope(): ScopeModuleCommerceSiteweb;
+        }
+
+          export interface SsrMenuHome {
+            get $beanFullName(): 'commerce-siteweb.ssrMenu.home';
+            get $onionName(): 'commerce-siteweb:home';
+            get $onionOptions(): ISsrMenuOptionsHome;
+          } 
+}
+/** ssrMenu: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleCommerceSiteweb extends BeanScopeBase {}
+
+export interface ScopeModuleCommerceSiteweb {
+  util: BeanScopeUtil;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'commerce-siteweb': ScopeModuleCommerceSiteweb;
+  }
+
+  export interface IBeanScopeContainer {
+    commerceSiteweb: ScopeModuleCommerceSiteweb;
+  }
+  
+  
+
+  
+
+  
+}
+/** scope: end */

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'commerce-siteweb';
+export { ScopeModuleCommerceSiteweb as ScopeModule } from './index.ts';

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/bean/ssrMenu.home.ts

@@ -0,0 +1,20 @@
+import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
+
+import { BeanBase } from 'vona';
+import { $order } from 'vona-module-a-openapiutils';
+import { SsrMenu } from 'vona-module-a-ssr';
+
+import type { ISsrSiteOptionsCommerce } from './ssrSite.commerce.ts';
+
+export interface ISsrMenuOptionsHome extends IDecoratorSsrMenuOptions<ISsrSiteOptionsCommerce> {}
+
+@SsrMenu<ISsrMenuOptionsHome>({
+  item: {
+    title: 'Commerce',
+    order: $order(1),
+    icon: undefined,
+    link: '/',
+  },
+  site: ['commerce-siteweb:commerce'],
+})
+export class SsrMenuHome extends BeanBase {}

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/bean/ssrSite.commerce.ts

@@ -0,0 +1,34 @@
+import type { IDecoratorSsrSiteOptions } from 'vona-module-a-ssr';
+import type { IIconRecord, IPagePathRecord } from 'zova-rest-cabloy-commerce';
+
+import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
+
+declare module 'vona-module-a-ssr' {
+  export interface ISsrSiteIdRecord {
+    commerce: never;
+  }
+
+  export interface ISsrSitePublicPathRecord {
+    commerce: never;
+  }
+}
+
+export interface ISsrSiteOptionsCommercePages extends IPagePathRecord {}
+
+export interface ISsrSiteOptionsCommercePagesData {}
+
+export interface ISsrSiteOptionsCommerce extends IDecoratorSsrSiteOptions<
+  ISsrSiteOptionsCommercePages,
+  ISsrSiteOptionsCommercePagesData,
+  IIconRecord
+> {}
+
+@SsrSite<ISsrSiteOptionsCommerce>({
+  siteId: 'commerce',
+  publicPath: 'commerce',
+  bundlePath: 'ssr-cabloyCommerce-5.0.0',
+  diagnostics: {
+    buildCommand: 'npm run build:zova:commerce:web',
+  },
+})
+export class SsrSiteCommerce extends BeanSsrSiteBase<ISsrSiteOptionsCommerce> {}

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/index.ts

@@ -0,0 +1 @@
+export * from './.metadata/index.ts';

package/vona/src/suite/a-commerce/modules/commerce-siteweb/tsconfig.build.json

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

package/vona/src/suite/a-commerce/modules/commerce-siteweb/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json", "test"]
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "vona-module-commerce-trade",
+  "version": "5.0.0",
+  "description": "",
+  "keywords": [
+    "Vona Module"
+  ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.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,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "commerce-trade",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
+  }
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts

@@ -0,0 +1,29 @@
+// eslint-disable
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleCommerceTrade extends BeanScopeBase {}
+
+export interface ScopeModuleCommerceTrade {
+  util: BeanScopeUtil;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'commerce-trade': ScopeModuleCommerceTrade;
+  }
+
+  export interface IBeanScopeContainer {
+    commerceTrade: ScopeModuleCommerceTrade;
+  }
+  
+  
+
+  
+
+  
+}
+/** scope: end */

package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'commerce-trade';
+export { ScopeModuleCommerceTrade as ScopeModule } from './index.ts';

package/vona/src/suite/a-commerce/modules/commerce-trade/src/index.ts

@@ -0,0 +1 @@
+export * from './.metadata/index.ts';

package/vona/src/suite/a-commerce/modules/commerce-trade/tsconfig.build.json

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

package/vona/src/suite/a-commerce/modules/commerce-trade/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json", "test"]
+}

package/vona/src/suite/a-commerce/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "vona-suite-a-commerce",
+  "version": "5.0.0",
+  "description": "",
+  "author": "",
+  "files": [],
+  "type": "module",
+  "dependencies": {
+    "vona-module-commerce-catalog": "^5.0.0",
+    "vona-module-commerce-member": "^5.0.0",
+    "vona-module-commerce-payment": "^5.0.0",
+    "vona-module-commerce-promotion": "^5.0.0",
+    "vona-module-commerce-siteadmin": "^5.0.0",
+    "vona-module-commerce-siteweb": "^5.0.0",
+    "vona-module-commerce-trade": "^5.0.0"
+  },
+  "title": "a-commerce"
+}

package/vona/src/suite/a-commerce/tsconfig.base.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.base",
+  "compilerOptions": {}
+}

package/vona/src/suite/a-commerce/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "extends": "./tsconfig.base",
+  "compilerOptions": {},
+  "references": [
+    {
+      "path": "modules/commerce-catalog/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-trade/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-promotion/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-payment/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-member/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-siteweb/tsconfig.build.json"
+    },
+    {
+      "path": "modules/commerce-siteadmin/tsconfig.build.json"
+    }
+  ],
+  "exclude": ["modules"]
+}

package/vona/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts

@@ -1,6 +1,8 @@
 export default {
   Description: 'Description',
   Level: 'Training Stage',
+  BasicInformation: 'Basic Information',
+  StudentProfile: 'Student Profile',
   LevelAdvanced: 'Advanced Workshop',
   LevelBeginner: 'Foundation Track',
   LevelIntermediate: 'Progress Track',

package/vona/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts

@@ -1,6 +1,8 @@
 export default {
   Description: '描述',
   Level: '培训阶段',
+  BasicInformation: '基本信息',
+  StudentProfile: '学生资料',
   LevelAdvanced: '高级研修班',
   LevelBeginner: '基础班',
   LevelIntermediate: '提升班',

package/vona/src/suite/a-training/modules/training-student/src/dto/studentCreate.tsx

@@ -16,7 +16,56 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions {}
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'tabs',
+                    children: [
+                      {
+                        type: 'tab',
+                        title: $locale('BasicInformation'),
+                        children: [
+                          {
+                            type: 'group',
+                            title: $locale('StudentProfile'),
+                            children: [
+                              {
+                                type: 'section',
+                                columns: { default: 1, md: 2 },
+                                children: [
+                                  { type: 'field', name: 'name' },
+                                  { type: 'field', name: 'mobile' },
+                                  { type: 'field', name: 'imageId' },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                      {
+                        type: 'tab',
+                        title: $locale('TrainingRecords'),
+                        children: [
+                          { type: 'field', name: 'level' },
+                          {
+                            type: 'section',
+                            children: [{ type: 'field', name: 'trainingRecords' }],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+          // blocks: [
+          //   ZovaRender.block('')
+          // ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionSubmit', {

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectResItem.tsx

@@ -15,7 +15,27 @@ export interface IDtoOptionsStudentSelectResItem extends IDecoratorDtoOptions {}
   blocks: [
     ZovaRender.block('basic-page:blockPage', {
       blocks: [
-        ZovaRender.block('basic-page:blockFilter'),
+        ZovaRender.block('basic-page:blockFilter', {
+          formFieldLayout: { inline: true },
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'section',
+                    layout: 'flow',
+                    children: [
+                      { type: 'field', name: 'name' },
+                      { type: 'field', name: 'level' },
+                      { type: 'field', name: 'createdAt' },
+                    ],
+                  } as any,
+                ],
+              },
+            }),
+            ZovaRender.block('basic-page:blockFilterActions'),
+          ],
+        }),
         ZovaRender.block('basic-page:blockToolbarBulk', {
           actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
         }),

package/vona/src/suite/a-training/modules/training-student/src/dto/studentUpdate.tsx

@@ -16,7 +16,53 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'tabs',
+                    children: [
+                      {
+                        type: 'tab',
+                        title: $locale('BasicInformation'),
+                        children: [
+                          {
+                            type: 'group',
+                            title: $locale('StudentProfile'),
+                            children: [
+                              {
+                                type: 'section',
+                                columns: { default: 1, md: 2 },
+                                children: [
+                                  { type: 'field', name: 'name' },
+                                  { type: 'field', name: 'mobile' },
+                                  { type: 'field', name: 'imageId' },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                      {
+                        type: 'tab',
+                        title: $locale('TrainingRecords'),
+                        children: [
+                          { type: 'field', name: 'level' },
+                          {
+                            type: 'section',
+                            children: [{ type: 'field', name: 'trainingRecords' }],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionSubmit', {

package/vona/src/suite/a-training/modules/training-student/src/dto/studentView.tsx

@@ -17,7 +17,53 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'tabs',
+                    children: [
+                      {
+                        type: 'tab',
+                        title: $locale('BasicInformation'),
+                        children: [
+                          {
+                            type: 'group',
+                            title: $locale('StudentProfile'),
+                            children: [
+                              {
+                                type: 'section',
+                                columns: { default: 1, md: 2 },
+                                children: [
+                                  { type: 'field', name: 'name' },
+                                  { type: 'field', name: 'mobile' },
+                                  { type: 'field', name: 'imageId' },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                      {
+                        type: 'tab',
+                        title: $locale('TrainingRecords'),
+                        children: [
+                          { type: 'field', name: 'level' },
+                          {
+                            type: 'section',
+                            children: [{ type: 'field', name: 'trainingRecords' }],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -1,16 +1,75 @@
 import type {
-  DtoStudentCreate,
   DtoStudentSelectRes,
   DtoStudentSummary,
-  DtoStudentUpdate,
   EntityStudent,
 } from 'vona-module-training-student';
 
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
+import {
+  DtoStudentCreate,
+  DtoStudentSelectResItem,
+  DtoStudentUpdate,
+  DtoStudentView,
+} from 'vona-module-training-student';
 
 describe('student.test.ts', () => {
+  it('action:student:formLayoutMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      for (const DtoClass of [DtoStudentCreate, DtoStudentUpdate, DtoStudentView]) {
+        const apiJson = await app.bean.openapi.generateJsonOfClass(DtoClass);
+        const component = Object.values(apiJson.components!.schemas as any).find(item => {
+          return (item as any).properties?.trainingRecords;
+        });
+        const blocks = (component as any)?.rest?.blocks;
+        const formLayout =
+          blocks?.[0]?.options?.blocks?.[0]?.options?.blocks?.[0]?.options?.formLayout;
+        const tabs = formLayout?.children[0];
+        const profileSection = tabs?.children[0]?.children[0]?.children[0];
+        const trainingRecordsSection = tabs?.children[1]?.children[1];
+        assert.equal(tabs?.type, 'tabs');
+        assert.equal(tabs?.id, undefined);
+        assert.equal(tabs?.children[1]?.type, 'tab');
+        assert.equal(tabs?.children[1]?.id, undefined);
+        assert.deepEqual(profileSection?.columns, { default: 1, md: 2 });
+        assert.deepEqual(
+          profileSection?.children.map(item => item.name),
+          ['name', 'mobile', 'imageId'],
+        );
+        assert.equal(tabs?.children[1]?.children[0]?.name, 'level');
+        assert.deepEqual(
+          trainingRecordsSection?.children.map(item => item.name),
+          ['trainingRecords'],
+        );
+      }
+    });
+  });
+
+  it('action:student:filterFormLayoutMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const apiJson = await app.bean.openapi.generateJsonOfClass(DtoStudentSelectResItem);
+      const component = Object.values(apiJson.components!.schemas as any).find(item => {
+        return (item as any).properties?._operationsRow;
+      });
+      const filterBlock = (component as any)?.rest?.blocks?.[0]?.options?.blocks?.[0];
+      assert.equal(filterBlock?.render, 'basic-page:blockFilter');
+      assert.equal(filterBlock?.options?.formFieldLayout?.inline, true);
+      assert.deepEqual(
+        filterBlock?.options?.blocks?.map(item => item.render),
+        ['basic-form:blockFormLayout', 'basic-page:blockFilterActions'],
+      );
+      const formLayout = filterBlock?.options?.blocks?.[0]?.options?.formLayout;
+      assert.equal(formLayout?.children[0]?.layout, 'flow');
+      assert.equal(formLayout?.children[0]?.columns, undefined);
+      assert.deepEqual(
+        formLayout?.children[0]?.children.map(item => item.name),
+        ['name', 'level', 'createdAt'],
+      );
+      assert.equal(formLayout?.children[0]?.children[2]?.span, undefined);
+    });
+  });
+
   it('action:student', async () => {
     await app.bean.executor.mockCtx(async () => {
       // data

package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/bean/bean.database.ts

@@ -3,13 +3,13 @@ import type { FunctionAsync } from 'vona';
 import { BeanBase, beanFullNameFromOnionName } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
+import type { ServiceDatabaseDialectBase } from '../service/databaseDialectBase_.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type {
   IDatabaseClientDialectRecord,
   IDatabaseClientRecord,
   IDbInfo,
 } from '../types/database.ts';
-import type { ServiceDatabaseDialectBase } from '../service/databaseDialectBase_.ts';
 
 import { ServiceDatabaseAsyncLocalStorage } from '../service/databaseAsyncLocalStorage_.ts';
 import { ServiceDatabaseClient } from '../service/databaseClient_.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/bean/schedule.softDeletionPrune.ts

@@ -4,8 +4,8 @@ import type { IScheduleExecute } from 'vona-module-a-schedule';
 import { BeanBase } from 'vona';
 import { Schedule } from 'vona-module-a-schedule';
 
-import type { IModelRecord, ISoftDeletionPrune } from '../types/onion/model.ts';
 import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
+import type { IModelRecord, ISoftDeletionPrune } from '../types/onion/model.ts';
 
 @Schedule({ repeat: { every: 24 * 3600 * 1000 } })
 export class ScheduleSoftDeletionPrune extends BeanBase implements IScheduleExecute {