cabloy 5.1.62 → 5.1.64

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

@@ -0,0 +1,116 @@
+// eslint-disable
+/** controller: begin */
+export * from '../component/actionCreate/controller.jsx';
+export * from '../component/blockDetails/controller.jsx';
+export * from '../component/blockDetailsToolbarBulk/controller.jsx';
+export * from '../component/formFieldDetails/controller.jsx';
+
+import 'zova';
+declare module 'zova' {
+  
+  
+}
+declare module 'zova-module-basic-details' {
+  
+        export interface ControllerActionCreate {
+          /** @internal */
+          get scope(): ScopeModuleBasicDetails;
+        }
+
+        export interface ControllerBlockDetails {
+          /** @internal */
+          get scope(): ScopeModuleBasicDetails;
+        }
+
+        export interface ControllerBlockDetailsToolbarBulk {
+          /** @internal */
+          get scope(): ScopeModuleBasicDetails;
+        }
+
+        export interface ControllerFormFieldDetails {
+          /** @internal */
+          get scope(): ScopeModuleBasicDetails;
+        } 
+}
+/** controller: end */
+/** controller: begin */
+import { ControllerActionCreate } from '../component/actionCreate/controller.jsx';
+import { ControllerBlockDetails } from '../component/blockDetails/controller.jsx';
+import { ControllerBlockDetailsToolbarBulk } from '../component/blockDetailsToolbarBulk/controller.jsx';
+import { ControllerFormFieldDetails } from '../component/formFieldDetails/controller.jsx';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordLocal {
+    'basic-details.controller.actionCreate': ControllerActionCreate;
+'basic-details.controller.blockDetails': ControllerBlockDetails;
+'basic-details.controller.blockDetailsToolbarBulk': ControllerBlockDetailsToolbarBulk;
+'basic-details.controller.formFieldDetails': ControllerFormFieldDetails;
+  }
+}
+/** controller: end */
+
+/** components: begin */
+export * from './component/actionCreate.js';
+import { ZActionCreate } from './component/actionCreate.js';
+export * from './component/blockDetails.js';
+import { ZBlockDetails } from './component/blockDetails.js';
+export * from './component/blockDetailsToolbarBulk.js';
+import { ZBlockDetailsToolbarBulk } from './component/blockDetailsToolbarBulk.js';
+export * from './component/formFieldDetails.js';
+import { ZFormFieldDetails } from './component/formFieldDetails.js';
+export const components = {
+  'actionCreate': ZActionCreate,
+'blockDetails': ZBlockDetails,
+'blockDetailsToolbarBulk': ZBlockDetailsToolbarBulk,
+'formFieldDetails': ZFormFieldDetails,
+};
+import 'zova';
+declare module 'zova' {
+export interface IComponentRecord {
+  'basic-details:actionCreate': ControllerActionCreate;
+'basic-details:blockDetails': ControllerBlockDetails;
+'basic-details:blockDetailsToolbarBulk': ControllerBlockDetailsToolbarBulk;
+'basic-details:formFieldDetails': ControllerFormFieldDetails;
+}
+export interface IZovaComponentRecord {
+  'basic-details:actionCreate': typeof ZActionCreate;
+'basic-details:blockDetails': typeof ZBlockDetails;
+'basic-details:blockDetailsToolbarBulk': typeof ZBlockDetailsToolbarBulk;
+'basic-details:formFieldDetails': typeof ZFormFieldDetails;
+}
+}
+/** components: end */
+/** locale: begin */
+import { locales } from './locales.js';
+/** locale: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, TypeModuleLocales, TypeLocaleBase } from 'zova';
+import { Scope } from 'zova-module-a-bean';
+
+@Scope()
+export class ScopeModuleBasicDetails extends BeanScopeBase {}
+
+export interface ScopeModuleBasicDetails {
+  util: BeanScopeUtil;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
+}
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanScopeRecord {
+    'basic-details': ScopeModuleBasicDetails;
+  }
+  
+  
+
+  export interface IBeanScopeLocale {
+    'basic-details': (typeof locales)[TypeLocaleBase];
+  }
+
+  
+}
+
+export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `basic-details::${K}` {
+  return `basic-details::${key}`;
+}  
+/** scope: end */

package/zova/src/suite/cabloy-basic/modules/basic-details/src/.metadata/locales.ts

@@ -0,0 +1,7 @@
+import locale_en_us from '../config/locale/en-us.js';
+import locale_zh_cn from '../config/locale/zh-cn.js';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};

package/zova/src/suite/cabloy-basic/modules/basic-details/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'basic-details';
+export { ScopeModuleBasicDetails as ScopeModule } from './index.js';

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

@@ -0,0 +1,42 @@
+import type { IComponentOptions } from 'zova';
+import type {
+  IJsxRenderContextDetails,
+  IResourceDetailsActionBulkOptionsBase,
+} from 'zova-module-a-openapi';
+
+import { BeanControllerBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceDetailsActionBulkRecord {
+    'basic-details:actionCreate'?: ControllerActionCreateProps;
+  }
+}
+
+export interface ControllerActionCreateProps extends IResourceDetailsActionBulkOptionsBase {}
+
+@Controller()
+export class ControllerActionCreate extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextDetails;
+
+  protected async __init__() {}
+
+  protected render() {
+    return (
+      <button
+        class={this.$props.class}
+        type="button"
+        onClick={async () => {
+          console.log('create');
+          // await this.$performCommand('basic-commands:create', this.$props, this.$$renderContext);
+        }}
+      >
+        {this.scope.locale.Create()}
+      </button>
+    );
+  }
+}

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

@@ -0,0 +1,114 @@
+import { celEnvBase } from '@cabloy/utils';
+import { VNode } from 'vue';
+import { BeanControllerBase, IComponentOptions } from 'zova';
+import { ZovaJsx } from 'zova-jsx';
+import { Controller } from 'zova-module-a-bean';
+import {
+  IDetailsScope,
+  IJsxRenderContextDetails,
+  IPermissionHintDetailsActionBulk,
+  IResourceBlockOptionsBase,
+  IResourceRenderBlockOptionsBlock,
+  ISchemaObjectExtensionField,
+  TypeFormScene,
+} from 'zova-module-a-openapi';
+import { BeanControllerTableBase } from 'zova-module-a-table';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceBlockRecord {
+    'basic-details:blockDetails'?: ControllerBlockDetailsProps;
+  }
+}
+
+export interface ControllerBlockDetailsProps<
+  TData extends {} = {},
+> extends IResourceBlockOptionsBase {
+  blocks?: IResourceRenderBlockOptionsBlock[];
+  formScene?: TypeFormScene;
+  schemaRow?: ISchemaObjectExtensionField;
+  getDetailItems?: () => TData[] | undefined;
+  setDetailItems?: (detailItems: TData[]) => void;
+}
+
+@Controller()
+export class ControllerBlockDetails<TData extends {} = {}> extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  tableRef: BeanControllerTableBase<TData>;
+
+  jsxZova: ZovaJsx;
+  jsxCelScope: IDetailsScope;
+  jsxRenderContext: IJsxRenderContextDetails<TData>;
+
+  protected async __init__() {
+    // jsx
+    this._prepareJsx();
+  }
+
+  get data() {
+    return this.$props.getDetailItems?.() ?? [];
+  }
+
+  get formScene() {
+    return this.$props.formScene!;
+  }
+
+  get schemaRow() {
+    return this.$props.schemaRow!;
+  }
+
+  public checkPermission(permissionHint?: IPermissionHintDetailsActionBulk): boolean {
+    const formScene = this.formScene;
+    const formSceneHint = permissionHint?.formScene;
+    if (!formSceneHint) return true;
+    if (Array.isArray(formSceneHint) && formSceneHint.includes(formScene!)) return true;
+    if (formSceneHint === formScene) return true;
+    return false;
+  }
+
+  private _prepareJsx() {
+    const jsxCelEnv = celEnvBase.clone();
+    this.jsxZova = this.bean._newBeanSimple(ZovaJsx, false, undefined, jsxCelEnv);
+    this.jsxCelScope = this._prepareJsxCelScope();
+    this.jsxRenderContext = {
+      app: this.app,
+      ctx: this.ctx,
+      $scene: 'details',
+      $host: this,
+      $celScope: this.jsxCelScope,
+      $jsx: this.jsxZova,
+      $$details: this,
+    };
+  }
+
+  private _prepareJsxCelScope(): IDetailsScope {
+    return {};
+  }
+
+  protected render() {
+    return <div class={this.$props.class}>{this._renderBlocks()}</div>;
+  }
+
+  private _renderBlocks() {
+    const blocks = this.$props.blocks;
+    if (!blocks || blocks.length === 0) return;
+    const domBlocks: VNode[] = [];
+    blocks.forEach((block, index) => {
+      const options = Object.assign({ key: index }, block.options);
+      const domBlock = this.jsxZova.render(
+        block.render!,
+        options,
+        this.jsxCelScope,
+        this.jsxRenderContext,
+      );
+      if (!domBlock) return;
+      if (Array.isArray(domBlock)) {
+        domBlocks.push(...domBlock);
+      } else {
+        domBlocks.push(domBlock);
+      }
+    });
+    return domBlocks;
+  }
+}

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

@@ -0,0 +1,61 @@
+import type { IComponentOptions } from 'zova';
+import type {
+  IResourceBlockOptionsBase,
+  IJsxRenderContextDetails,
+  IResourceRenderDetailsActionBulkOptionsAction,
+} from 'zova-module-a-openapi';
+
+import { VNode } from 'vue';
+import { BeanControllerBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceBlockRecord {
+    'basic-details:blockDetailsToolbarBulk'?: ControllerBlockDetailsToolbarBulkProps;
+  }
+}
+
+export interface ControllerBlockDetailsToolbarBulkProps extends IResourceBlockOptionsBase {
+  actions?: IResourceRenderDetailsActionBulkOptionsAction[];
+}
+
+@Controller()
+export class ControllerBlockDetailsToolbarBulk extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextDetails;
+
+  protected async __init__() {}
+
+  protected render() {
+    const domActions = this._renderActions();
+    if (!domActions || domActions.length === 0) return;
+    return (
+      <div class={this.$props.class}>
+        <div class="join">{domActions}</div>
+      </div>
+    );
+  }
+
+  private _renderActions() {
+    const { $jsx, $celScope, $$details } = this.$$renderContext;
+    const actions = this.$props.actions;
+    if (!actions || actions.length === 0) return;
+    const domActions: VNode[] = [];
+    actions.forEach((action, index) => {
+      const permissionHint = action.options?.permission;
+      if (!$$details.checkPermission(permissionHint)) return;
+      const options = Object.assign({ key: index }, action.options);
+      const domAction = $jsx.render(action.render!, options, $celScope, this.$$renderContext);
+      if (!domAction) return;
+      if (Array.isArray(domAction)) {
+        domActions.push(...domAction);
+      } else {
+        domActions.push(domAction);
+      }
+    });
+    return domActions;
+  }
+}

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

@@ -0,0 +1,105 @@
+import type { IComponentOptions } from 'zova';
+import type {
+  ControllerFormField,
+  IFormFieldComponentOptions,
+  IFormFieldRenderContext,
+} from 'zova-module-a-form';
+import type {
+  IResourceFormFieldOptionsBase,
+  ISchemaObjectExtensionField,
+  TypeFormScene,
+} from 'zova-module-a-openapi';
+
+import { VNode } from 'vue';
+import { BeanControllerBase, deepExtend } from 'zova';
+import { ZovaJsx } from 'zova-jsx';
+import { Controller } from 'zova-module-a-bean';
+import { ZFormField } from 'zova-module-a-form';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceFormFieldRecord {
+    'basic-details:formFieldDetails'?: IResourceFormFieldDetailsOptions;
+  }
+}
+
+export interface IResourceFormFieldDetailsOptions extends IResourceFormFieldOptionsBase {}
+
+export interface ControllerFormFieldDetailsProps extends IFormFieldComponentOptions {
+  options?: IResourceFormFieldDetailsOptions;
+}
+
+@Controller()
+export class ControllerFormFieldDetails extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  jsxZova: ZovaJsx;
+
+  protected async __init__() {
+    // jsx
+    this._prepareJsx();
+  }
+
+  private _prepareJsx() {
+    this.jsxZova = this.bean._newBeanSimple(ZovaJsx, false);
+  }
+
+  protected render() {
+    return (
+      <ZFormField
+        {...this.$props}
+        slotDefault={(formFieldRenderContext, $$formField) => {
+          return this._renderBlocks(formFieldRenderContext, $$formField) ?? <></>;
+        }}
+      ></ZFormField>
+    );
+  }
+
+  private _renderBlocks(
+    formFieldRenderContext: IFormFieldRenderContext,
+    $$formField: ControllerFormField,
+  ) {
+    const { propsBucket } = formFieldRenderContext;
+    // schema
+    const schemaName = $$formField.property?.items?.$ref;
+    if (!schemaName) {
+      return <div>Should specify the detail schema</div>;
+    }
+    const schemaRow: ISchemaObjectExtensionField | undefined = this.$sdk.getSchema(
+      schemaName!,
+    ).data;
+    if (!schemaRow) return;
+    // formScene
+    const formScene: TypeFormScene = propsBucket.readonly
+      ? 'view'
+      : $$formField.formMeta!.formScene!;
+    // blocks
+    const blocks = schemaRow?.rest?.blocks;
+    if (!blocks || blocks.length === 0) return;
+    const domBlocks: VNode[] = [];
+    blocks.forEach((block, index) => {
+      const options = deepExtend(
+        { key: index },
+        {
+          formScene,
+          schemaRow,
+          getDetailItems: () => {
+            return propsBucket.value;
+          },
+          setDetailItems: (detailItems: any[]) => {
+            $$formField.setValue(detailItems);
+          },
+        },
+        block.options,
+      );
+      const domBlock = this.jsxZova.render(block.render!, options);
+      if (!domBlock) return;
+      if (Array.isArray(domBlock)) {
+        domBlocks.push(...domBlock);
+      } else {
+        domBlocks.push(domBlock);
+      }
+    });
+    return <div>{domBlocks}</div>;
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-details/src/config/locale/en-us.ts

@@ -0,0 +1,3 @@
+export default {
+  Create: 'Create',
+};

package/zova/src/suite/cabloy-basic/modules/basic-details/src/config/locale/zh-cn.ts

@@ -0,0 +1,3 @@
+export default {
+  Create: '创建',
+};

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

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

package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/details.ts

@@ -0,0 +1,8 @@
+import 'zova-module-a-openapi';
+import { ControllerBlockDetails } from '../component/blockDetails/controller.jsx';
+
+declare module 'zova-module-a-openapi' {
+  export interface IJsxRenderContextDetails<TData extends {} = {}> {
+    $$details: ControllerBlockDetails<TData>;
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/index.ts

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

package/zova/src/suite/cabloy-basic/modules/basic-details/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-details/tsconfig.json

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

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-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,11 +8,13 @@
   "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",
     "zova-module-basic-currency": "^5.1.15",
     "zova-module-basic-date": "^5.0.6",
+    "zova-module-basic-details": "^5.0.0",
     "zova-module-basic-form": "^5.0.7",
     "zova-module-basic-input": "^5.0.7",
     "zova-module-basic-page": "^5.0.7",

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

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

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

@@ -33,6 +33,8 @@ export interface IJsxRenderSceneRecord {
   tableCell: never;
   // form: never;
   formField: never;
+  //
+  details: never;
 }
 
 export interface IPageScope {

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/details.ts

@@ -0,0 +1,7 @@
+import { IJsxRenderContextBase } from '../action.js';
+
+export interface IDetailsScope {}
+
+export interface IJsxRenderContextDetails extends IJsxRenderContextBase {
+  $celScope: IDetailsScope;
+}

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/detailsActionBulk.ts

@@ -0,0 +1,24 @@
+import { types } from 'typestyle';
+import { TypeRenderComponentJsx } from 'zova-jsx';
+
+import type { IPermissionHintDetailsActionBulk } from '../permissions.js';
+
+export type IResourceDetailsActionBulkNameRecord = {
+  [KEY in keyof IResourceDetailsActionBulkRecord as KEY extends `${string}:action${infer Name}`
+    ? Uncapitalize<Name>
+    : KEY]: IResourceDetailsActionBulkRecord[KEY];
+};
+
+export interface IResourceDetailsActionBulkRecord {}
+
+export interface IResourceDetailsActionBulkOptionsBase {
+  class?: any;
+  style?: types.NestedCSSProperties;
+  permission?: IPermissionHintDetailsActionBulk;
+}
+
+export interface IResourceRenderDetailsActionBulkOptionsAction {
+  name?: keyof IResourceDetailsActionBulkNameRecord; // not omit operationsBulk
+  render?: keyof IResourceDetailsActionBulkRecord | TypeRenderComponentJsx;
+  options?: IResourceDetailsActionBulkOptionsBase;
+}

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

@@ -0,0 +1,2 @@
+export * from './details.js';
+export * from './detailsActionBulk.js';

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

@@ -10,3 +10,4 @@ export * from './rest.js';
 export * from './schema.js';
 export * from './sdk.js';
 export * from './table.js';
+export * from './detail/index.js';

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

@@ -34,3 +34,9 @@ export interface IPermissionHintTableActionBulk {
   actionInherit?: keyof IResourceTableActionBulkNameRecord;
   public?: boolean;
 }
+
+export interface IPermissionHintDetailsActionBulk {
+  // actionInherit?: keyof IResourceDetailsActionBulkNameRecord;
+  // public?: boolean;
+  formScene?: TypeFormScene | TypeFormScene[];
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.103",
+  "version": "5.1.104",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "zova-module-a-logger": "^5.1.23",
     "zova-module-a-meta": "^5.1.18",
     "zova-module-a-model": "^5.1.27",
-    "zova-module-a-openapi": "^5.1.34",
+    "zova-module-a-openapi": "^5.1.35",
     "zova-module-a-router": "^5.1.26",
     "zova-module-a-routerstack": "^5.1.23",
     "zova-module-a-routertabs": "^5.1.29",