cabloy 5.1.168 → 5.1.170

package/zova/src/suite-vendor/a-cabloy/modules/a-layoutprofile/src/apiSchema/layoutprofile.ts

@@ -0,0 +1,25 @@
+import type { IApiSchemaOptions } from 'zova-module-a-api';
+
+import { BeanBase } from 'zova';
+import { ApiSchema } from 'zova-module-a-api';
+
+import {
+  ApiApiLayoutprofileloadPath,
+  ApiApiLayoutprofilesavePath,
+  ApiApiLayoutprofileresetPath,
+} from '../api/layoutprofile.js';
+
+@ApiSchema()
+export class ApiSchemaLayoutprofile extends BeanBase {
+  load(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiLayoutprofileloadPath, 'get', options);
+  }
+
+  save(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiLayoutprofilesavePath, 'post', options);
+  }
+
+  reset(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiLayoutprofileresetPath, 'delete', options);
+  }
+}

package/zova/src/suite-vendor/a-cabloy/modules/a-layoutprofile/src/index.ts

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

package/zova/src/suite-vendor/a-cabloy/modules/a-layoutprofile/src/model/layoutprofile.ts

@@ -0,0 +1,76 @@
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+
+import { BeanModelBase, Model } from 'zova-module-a-model';
+
+import type {
+  ApiApiLayoutprofileloadResponseBody,
+  ApiApiLayoutprofileresetResponseBody,
+  ApiApiLayoutprofilesaveRequestBody,
+  ApiApiLayoutprofilesaveResponseBody,
+} from '../api/layoutprofile.js';
+
+export interface IModelOptionsLayoutProfile extends IDecoratorModelOptions {
+  enableSelector: true;
+}
+
+@Model<IModelOptionsLayoutProfile>({
+  enableSelector: true,
+})
+export class ModelLayoutProfile extends BeanModelBase {
+  layoutKey: string;
+
+  protected async __init__(layoutKey: string) {
+    if (!layoutKey) throw new Error('layout key not specified');
+    await super.__init__(layoutKey);
+    this.layoutKey = layoutKey;
+  }
+
+  load() {
+    if (this.$ssr.cookieDisabledOnServer || !this.$passport.isAuthenticated) return;
+    if (process.env.CLIENT && this.$ssr.profile === 'public' && this.$ssr.isRuntimeSsrPreHydration)
+      return;
+    return this.$useStateData<ApiApiLayoutprofileloadResponseBody>({
+      queryKey: ['load'],
+      queryFn: async () => {
+        return await this.scope.api.layoutprofile.load({
+          query: { layoutKey: this.layoutKey },
+        });
+      },
+      meta: {
+        disableErrorEffect: true,
+      },
+    });
+  }
+
+  save() {
+    return this.$useMutationData<
+      ApiApiLayoutprofilesaveResponseBody,
+      ApiApiLayoutprofilesaveRequestBody['profile']
+    >({
+      mutationKey: ['save'],
+      mutationFn: async profile => {
+        return await this.scope.api.layoutprofile.save({
+          layoutKey: this.layoutKey,
+          profile,
+        });
+      },
+      onSuccess: profile => {
+        this.$setQueryData<ApiApiLayoutprofilesaveResponseBody>(['load'], profile);
+      },
+    });
+  }
+
+  reset() {
+    return this.$useMutationData<ApiApiLayoutprofileresetResponseBody>({
+      mutationKey: ['reset'],
+      mutationFn: async () => {
+        return await this.scope.api.layoutprofile.reset({
+          query: { layoutKey: this.layoutKey },
+        });
+      },
+      onSuccess: async () => {
+        this.$setQueryData<ApiApiLayoutprofileloadResponseBody>(['load'], undefined);
+      },
+    });
+  }
+}

package/zova/src/suite-vendor/a-cabloy/modules/a-layoutprofile/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-vendor/a-cabloy/modules/a-layoutprofile/tsconfig.json

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

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.53",
+  "version": "5.1.54",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/lib/resourcePicker.ts

@@ -1 +1,43 @@
+import type { TableIdentity } from 'table-identity';
+import type {
+  IResourceRenderBlockOptionsBlock,
+  IResourceTableSelectionPayload,
+  ITableQuery,
+} from 'zova-module-a-openapi';
+
 export const resourcePickerPageContextKey = '$resourcePickerPageContext';
+export const resourcePickerPageHostKey = '$resourcePickerPageHost';
+
+export interface IResourcePickerPageOptions extends Record<string, unknown> {
+  resource: string;
+  actionPath?: string;
+  query?: ITableQuery;
+  selectionMode: 'single' | 'multiple';
+  selectionMax?: number;
+  selectedIds?: readonly TableIdentity[];
+}
+
+export interface IResourcePickerPageSession {
+  selectedIds: TableIdentity[];
+  selectedRows: Record<string, unknown>[];
+}
+
+export interface IResourcePickerPageDialog {
+  resolve(value: IResourceTableSelectionPayload): void;
+  cancel(): void;
+}
+
+export interface IResourcePickerPageContext {
+  options: IResourcePickerPageOptions;
+  session: IResourcePickerPageSession;
+  dialog: IResourcePickerPageDialog;
+}
+
+export interface IResourcePickerPageHost extends IResourcePickerPageDialog {
+  options: IResourcePickerPageOptions;
+  session: IResourcePickerPageSession;
+  prepareBlocks(
+    blocks: IResourceRenderBlockOptionsBlock[] | undefined,
+    context: IResourcePickerPageContext,
+  ): IResourceRenderBlockOptionsBlock[] | undefined;
+}

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/page/resourcePicker/controller.tsx

@@ -1,53 +1,25 @@
-import type { TableIdentity } from 'table-identity';
 import type { VNode } from 'vue';
-import type {
-  IResourceBlockOptionsBase,
-  IResourceRenderBlockOptionsBlock,
-  IResourceTableSelectionPayload,
-  ITableQuery,
-} from 'zova-module-a-openapi';
-import type { IRoutedDialogContext } from 'zova-module-basic-app';
 
 import { z } from 'zod';
 import { BeanControllerPageBase, deepExtend, Use, usePrepareArg } from 'zova';
 import { ZovaJsx } from 'zova-jsx';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
-import { routedDialogContextKey } from 'zova-module-basic-app';
 import { ZPage } from 'zova-module-home-base';
 
+import type {
+  IResourcePickerPageContext,
+  IResourcePickerPageHost,
+} from '../../lib/resourcePicker.js';
 import type { ModelResource } from '../../model/resource.js';
 
 import { ZResourcePickerContext } from '../../.metadata/component/resourcePickerContext.js';
+import { resourcePickerPageHostKey } from '../../lib/resourcePicker.js';
 
 export const ControllerPageResourcePickerSchemaParams = z.object({
   resource: z.string(),
 });
 
-export interface IResourcePickerPageOptions extends Record<string, unknown> {
-  resource: string;
-  actionPath?: string;
-  query?: ITableQuery;
-  selectionMode: 'single' | 'multiple';
-  selectionMax?: number;
-  selectedIds?: readonly TableIdentity[];
-}
-
-export interface IResourcePickerPageSession {
-  selectedIds: TableIdentity[];
-  selectedRows: Record<string, unknown>[];
-}
-
-export interface IResourcePickerPageContext {
-  options: IResourcePickerPageOptions;
-  session: IResourcePickerPageSession;
-  dialog: IRoutedDialogContext<
-    IResourceTableSelectionPayload,
-    IResourcePickerPageOptions,
-    IResourcePickerPageSession
-  >;
-}
-
 @Controller()
 export class ControllerPageResourcePicker extends BeanControllerPageBase {
   jsxZova: ZovaJsx;
@@ -57,27 +29,27 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
     return usePrepareArg(this.resource, true);
   }
 
-  @Use({ name: routedDialogContextKey, injectionScope: 'host' })
-  $$routedDialogContext: IRoutedDialogContext<
-    IResourceTableSelectionPayload,
-    IResourcePickerPageOptions,
-    IResourcePickerPageSession
-  >;
+  @Use({ name: resourcePickerPageHostKey, injectionScope: 'host' })
+  $$pickerHost: IResourcePickerPageHost | undefined;
 
   get resource() {
     return this.$params.resource;
   }
 
   get pickerContext(): IResourcePickerPageContext {
-    const options = this.$$routedDialogContext.props;
-    const session = this.$$routedDialogContext.session;
-    if (!options || !session || options.resource !== this.resource) {
+    const host = this.$$pickerHost;
+    if (!host) {
+      throw new Error('resource picker requires a page host');
+    }
+    const options = host.options;
+    const session = host.session;
+    if (options.resource !== this.resource) {
       throw new Error('resource picker context does not match route resource');
     }
     return {
       options,
       session,
-      dialog: this.$$routedDialogContext,
+      dialog: host,
     };
   }
 
@@ -91,7 +63,8 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
   }
 
   public render() {
-    const blocks = this._prepareBlocks(this.schemaRow?.rest?.blocks);
+    const pickerContext = this.pickerContext;
+    const blocks = this.$$pickerHost!.prepareBlocks(this.schemaRow?.rest?.blocks, pickerContext);
     if (!blocks || blocks.length === 0) return;
     const domBlocks: VNode[] = [];
     blocks.forEach((block, index) => {
@@ -102,43 +75,11 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
       else domBlocks.push(domBlock);
     });
     return (
-      <ZResourcePickerContext context={this.pickerContext}>
+      <ZResourcePickerContext context={pickerContext}>
         <ZPage>{domBlocks}</ZPage>
       </ZResourcePickerContext>
     );
   }
-
-  private _prepareBlocks(blocks: IResourceRenderBlockOptionsBlock[] | undefined) {
-    if (!blocks) return;
-    return blocks.map(block => {
-      if (block.render !== 'basic-page:blockPage') return block;
-      const pickerContext = this.pickerContext;
-      return {
-        ...block,
-        options: deepExtend({}, block.options, {
-          actionPath: pickerContext.options.actionPath,
-          queryFixed: pickerContext.options.query,
-          selectionPolicy: 'always',
-          selectionMode: pickerContext.options.selectionMode,
-          selectionMax: pickerContext.options.selectionMax,
-          selectedIds: pickerContext.session.selectedIds,
-          selectedRows: pickerContext.session.selectedRows,
-          onSelectionChange: (selection: IResourceTableSelectionPayload) => {
-            pickerContext.session.selectedIds = [...selection.ids];
-            pickerContext.session.selectedRows = selection.rows.map(row => ({ ...row }));
-          },
-          blocks: [
-            ...((
-              block.options as IResourceBlockOptionsBase & {
-                blocks?: IResourceRenderBlockOptionsBlock[];
-              }
-            ).blocks ?? []),
-            {
-              render: 'basic-resource:blockResourcePickerActions',
-            },
-          ],
-        }),
-      };
-    });
-  }
 }
+
+export type { IResourcePickerPageContext } from '../../lib/resourcePicker.js';

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

@@ -1,14 +1,15 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.54",
+  "version": "5.1.56",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
+    "zova-module-a-layoutprofile": "^5.0.2",
     "zova-module-a-rbac": "^5.0.1",
-    "zova-module-rest-resource": "^5.1.53"
+    "zova-module-rest-resource": "^5.1.54"
   },
   "title": "a-cabloy"
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.34",
+  "version": "5.1.35",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.53",
+  "version": "5.1.54",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/resource/tableActionBulk.ts

@@ -20,9 +20,12 @@ export interface IResourceTableSelectionPayload<TData extends {} = Record<string
 }
 
 /** Declarative bulk-action metadata authored by a resource schema. */
+export type TypeResourceTableActionBulkPlacement = 'start' | 'end';
+
 export interface IResourceTableActionBulkOptionsBase {
   class?: any;
   style?: types.NestedCSSProperties;
+  placement?: TypeResourceTableActionBulkPlacement;
   resource?: string;
   permission?: IPermissionHintTableActionBulk;
   requiresSelection?: boolean;

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.36",
+  "version": "5.1.37",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-routerstack",
-  "version": "5.1.28",
+  "version": "5.1.29",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.38",
+  "version": "5.1.39",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/bodyReadyObserver.ts

@@ -1,19 +1,21 @@
 export function getBodyReadyObserverScript() {
   return `<script id="ssr-body-ready-observer">
         window.ssr_bodyReadyObserverClear=()=>{
-          if(window.ssr_bodyReadyObserver){
-            window.ssr_body_ready_condition=undefined;
-            window.ssr_body_ready_callback=undefined;
-            window.ssr_bodyReadyObserver.disconnect();
-            window.ssr_bodyReadyObserver=undefined;
-            document.body.style.display='block';
-            document.querySelector('#ssr-body-ready-observer').remove();
-          }
+          window.ssr_body_ready_condition=undefined;
+          window.ssr_body_ready_callback=undefined;
+          window.ssr_bodyReadyObserver?.disconnect();
+          window.ssr_bodyReadyObserver=undefined;
+          document.body.style.display='block';
+          document.querySelector('#ssr-body-ready-observer')?.remove();
         };
         window.ssr_bodyReadyObserver = new MutationObserver(() => {
-          if(window.ssr_body_ready_condition && window.ssr_body_ready_condition()){
-            window.ssr_body_ready_callback();
-            window.ssr_bodyReadyObserverClear();
+          const __targets=window.ssr_body_ready_condition?.();
+          if(__targets){
+            try{
+              window.ssr_body_ready_callback?.(__targets);
+            }finally{
+              window.ssr_bodyReadyObserverClear();
+            }
           }
         });
         window.ssr_bodyReadyObserver.observe(document.body, {

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

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

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

@@ -45,13 +45,16 @@ import type {
   ITableScope,
   TypeTableCellRender,
 } from '../../types/tableColumn.js';
+import type { ITableLayout } from '../../types/tableLayout.js';
 
 import { BeanControllerTableBase } from '../../lib/beanControllerTableBase.js';
 import { TableColumnIdSelection } from '../../types/table.js';
 import { ITableCellRenderColumnOptions } from '../../types/tableColumn.js';
+import { reconcileTableLayout } from '../../types/tableLayout.js';
 
 export interface ControllerTableProps<TData extends {} = {}> {
   data?: TData[];
+  layout?: ITableLayout;
   schema?: SchemaObject;
   schemaOrder?: SchemaObject;
   sorting?: SortingState;
@@ -102,6 +105,13 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
         await this.refreshMeta();
       },
     );
+    this.$watch(
+      () => this.$props.layout,
+      async (newValue, oldValue) => {
+        if (deepEqual(newValue, oldValue)) return;
+        await this.refreshMeta();
+      },
+    );
     // table
     this._createTable();
   }
@@ -122,6 +132,14 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     return this.$props.rowSelection ?? {};
   }
 
+  public get layout(): ITableLayout {
+    return reconcileTableLayout(this.layoutProperties, this.$props.layout);
+  }
+
+  public get layoutProperties(): readonly ISchemaObjectExtensionField[] {
+    return this.tableMeta?.properties ?? [];
+  }
+
   public async refreshMeta() {
     this.tableMeta = await this._createTableMeta();
     this.columns = await this._createColumns();
@@ -148,6 +166,15 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
         get rowSelection() {
           return self.rowSelection;
         },
+        get columnVisibility() {
+          return self._getColumnVisibility();
+        },
+        get columnOrder() {
+          return self._getColumnOrder();
+        },
+        get columnSizing() {
+          return self._getColumnSizing();
+        },
       },
       onSortingChange: updater => {
         const sorting = functionalUpdate(updater, self.sorting).slice(0, 1);
@@ -235,10 +262,15 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
             return property?.title || key;
           },
           cell: props => tableMeta.renders[key](props),
-          size: property.rest?.width,
+          size: this._getLayoutWidth(key),
           enableSorting: property.rest?.enableSorting === true && this._isOrderable(property),
           sortDescFirst: property.rest?.sortDescFirst === true,
-          meta: { rest: property.rest },
+          meta: {
+            rest: {
+              ...property.rest,
+              width: this._getLayoutWidth(key),
+            },
+          },
         }),
       );
     }
@@ -262,6 +294,36 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     return typeof enableRowSelection === 'function' ? enableRowSelection(row) : true;
   }
 
+  private _getLayoutColumn(key: string) {
+    return this.layout.columns.find(column => column.key === key);
+  }
+
+  private _getLayoutWidth(key: string) {
+    const width = this._getLayoutColumn(key)?.width;
+    return typeof width === 'number' ? width : undefined;
+  }
+
+  private _getColumnVisibility() {
+    return Object.fromEntries(
+      this.layout.columns
+        .filter(column => column.key !== TableColumnIdSelection)
+        .map(column => [column.key, column.visible]),
+    );
+  }
+
+  private _getColumnOrder() {
+    const keys = this.layout.columns.map(column => column.key);
+    return this.$props.enableRowSelection ? [TableColumnIdSelection, ...keys] : keys;
+  }
+
+  private _getColumnSizing() {
+    return Object.fromEntries(
+      this.layout.columns
+        .filter(column => typeof column.width === 'number')
+        .map(column => [column.key, column.width as number]),
+    );
+  }
+
   private _getColumnPinning() {
     const left: string[] = this.$props.enableRowSelection ? [TableColumnIdSelection] : [];
     const right: string[] = [];

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

@@ -11,10 +11,9 @@ export class RenderTable extends BeanRenderBase {
   private _getColumnStyle(column: any): CSSProperties {
     const rest = (column.columnDef.meta as any)?.rest;
     const fixed = column.getIsPinned();
-    const width = rest?.width ? `${rest.width}px` : undefined;
+    const width = column.getSize();
     return {
-      width,
-      minWidth: width,
+      ...(typeof rest?.width === 'number' ? { width: `${width}px`, minWidth: `${width}px` } : {}),
       textAlign: rest?.align,
       position: fixed ? ('sticky' as const) : undefined,
       left: fixed === 'left' ? `${column.getStart('left')}px` : undefined,

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

@@ -1,15 +1,25 @@
 import type { Table } from '@tanstack/table-core';
 import type { TableOptionsWithReactiveData } from '@tanstack/vue-table';
+import type { ISchemaObjectExtensionField } from 'zova-module-a-openapi';
 
 import { useVueTable } from '@tanstack/vue-table';
 import { markRaw } from 'vue';
 import { BeanControllerBase } from 'zova';
 
 import { TypeTable } from '../types/table.js';
+import { ITableLayout } from '../types/tableLayout.js';
 
 export class BeanControllerTableBase<TData extends {} = {}> extends BeanControllerBase {
   table: TypeTable<TData>;
 
+  public get layout(): ITableLayout {
+    throw new Error('should implement layout');
+  }
+
+  public get layoutProperties(): readonly ISchemaObjectExtensionField[] {
+    throw new Error('should implement layoutProperties');
+  }
+
   public $useTable(initialOptions: TableOptionsWithReactiveData<TData>): Table<TData> {
     return this.ctx.util.instanceScope(() => {
       return markRaw(useVueTable(initialOptions));

package/zova/src/suite-vendor/a-zova/modules/a-table/src/types/index.ts

@@ -1,3 +1,4 @@
 export * from './table.js';
 export * from './tableCell.js';
 export * from './tableColumn.js';
+export * from './tableLayout.js';