cabloy 5.1.65 → 5.1.67

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

@@ -5,12 +5,11 @@ import { ZovaJsx } from 'zova-jsx';
 import { Controller } from 'zova-module-a-bean';
 import {
   IDetailsScope,
+  IFormMeta,
   IJsxRenderContextDetails,
-  IPermissionHintDetailsActionBulk,
   IResourceBlockOptionsBase,
   IResourceRenderBlockOptionsBlock,
   ISchemaObjectExtensionField,
-  TypeFormScene,
 } from 'zova-module-a-openapi';
 import { BeanControllerTableBase } from 'zova-module-a-table';
 
@@ -24,8 +23,9 @@ export interface ControllerBlockDetailsProps<
   TData extends {} = {},
 > extends IResourceBlockOptionsBase {
   blocks?: IResourceRenderBlockOptionsBlock[];
-  formScene?: TypeFormScene;
+  formMeta?: IFormMeta;
   schemaRow?: ISchemaObjectExtensionField;
+  schemaForm?: ISchemaObjectExtensionField;
   getDetailItems?: () => TData[] | undefined;
   setDetailItems?: (detailItems: TData[]) => void;
 }
@@ -50,21 +50,24 @@ export class ControllerBlockDetails<TData extends {} = {}> extends BeanControlle
     return this.$props.getDetailItems?.() ?? [];
   }
 
+  set data(detailItems: TData[]) {
+    this.$props.setDetailItems?.(detailItems);
+  }
+
+  get formMeta() {
+    return this.$props.formMeta!;
+  }
+
   get formScene() {
-    return this.$props.formScene!;
+    return this.formMeta.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;
+  get schemaForm() {
+    return this.$props.schemaForm!;
   }
 
   private _prepareJsx() {
@@ -83,7 +86,20 @@ export class ControllerBlockDetails<TData extends {} = {}> extends BeanControlle
   }
 
   private _prepareJsxCelScope(): IDetailsScope {
-    return {};
+    // eslint-disable-next-line
+    const self = this;
+    const $$details = this.$customRef(() => {
+      return {
+        get() {
+          return self;
+        },
+        set(_value) {},
+      };
+    }) as any;
+    return {
+      formMeta: this.formMeta,
+      $$details,
+    };
   }
 
   protected render() {

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

@@ -0,0 +1,53 @@
+import type { IComponentOptions } from 'zova';
+import type { IResourceBlockOptionsBase, IJsxRenderContextDetail } from 'zova-module-a-openapi';
+
+import { BeanControllerBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+import { BeanControllerFormBase, ZForm } from 'zova-module-a-form';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceBlockRecord {
+    'basic-details:blockForm'?: ControllerBlockFormProps;
+  }
+}
+
+export interface ControllerBlockFormProps extends IResourceBlockOptionsBase {}
+
+@Controller()
+export class ControllerBlockForm extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  formRef: BeanControllerFormBase;
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextDetail;
+
+  protected async __init__() {}
+
+  protected render() {
+    const { $$detail } = this.$$renderContext;
+    return (
+      <ZForm
+        class={this.$props.class}
+        controllerRef={ref => {
+          this.formRef = ref;
+          $$detail.formRef = ref;
+        }}
+        data={$$detail.formData}
+        schema={$$detail.formSchema}
+        schemaScene={$$detail.schemaScene}
+        formMeta={$$detail.formMeta}
+        formProvider={$$detail.formProvider}
+        formScope={$$detail.jsxCelScope}
+        onSubmitData={data => $$detail.submitData(data)}
+        onShowError={async ({ error }) => {
+          await this.$performCommand('basic-commands:alert', {
+            type: 'error',
+            text: error.message,
+          });
+        }}
+      ></ZForm>
+    );
+  }
+}

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

@@ -27,7 +27,9 @@ export class ControllerBlockTable<TData extends {} = {}> extends BeanControllerB
 
   protected render() {
     const { $$details } = this.$$renderContext;
-    const data = [{ id: 1, name: 'yang' }] as any;
+    const data = ($$details.data as TData[]).filter(
+      item => (item as Record<string, any>).deleted !== true,
+    );
     return (
       <ZTable<TData>
         class={this.$props.class}
@@ -35,9 +37,12 @@ export class ControllerBlockTable<TData extends {} = {}> extends BeanControllerB
           this.tableRef = ref;
           $$details.tableRef = ref as unknown as BeanControllerTableBase<{}>;
         }}
-        data={data ?? ($$details.data as unknown as TData[])}
+        data={data}
         schema={$$details.schemaRow}
         tableScope={$$details.jsxCelScope}
+        getRowId={(_originalRow: TData, index: number) => {
+          return String(index);
+        }}
       ></ZTable>
     );
   }

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

@@ -9,6 +9,8 @@ import { VNode } from 'vue';
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+import { checkPermission } from '../../lib/utils.js';
+
 declare module 'zova-module-a-openapi' {
   export interface IResourceBlockRecord {
     'basic-details:blockToolbarBulk'?: ControllerBlockToolbarBulkProps;
@@ -46,7 +48,7 @@ export class ControllerBlockToolbarBulk extends BeanControllerBase {
     const domActions: VNode[] = [];
     actions.forEach((action, index) => {
       const permissionHint = action.options?.permission;
-      if (!$$details.checkPermission(permissionHint)) return;
+      if (!checkPermission($$details.formScene, permissionHint)) return;
       const options = Object.assign({ key: index }, action.options);
       const domAction = $jsx.render(action.render!, options, $celScope, this.$$renderContext);
       if (!domAction) return;

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

@@ -14,7 +14,7 @@ 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';
+import { formMetaFromFormScene, ZFormField } from 'zova-module-a-form';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
@@ -22,7 +22,9 @@ declare module 'zova-module-a-openapi' {
   }
 }
 
-export interface IResourceFormFieldDetailsOptions extends IResourceFormFieldOptionsBase {}
+export interface IResourceFormFieldDetailsOptions extends IResourceFormFieldOptionsBase {
+  // schemaRow?:
+}
 
 export interface ControllerFormFieldDetailsProps extends IFormFieldComponentOptions {
   options?: IResourceFormFieldDetailsOptions;
@@ -60,19 +62,17 @@ export class ControllerFormFieldDetails extends BeanControllerBase {
     $$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;
+    // schemaRow
+    const schemaRow = this._getSchemaRow($$formField);
     if (!schemaRow) return;
-    // formScene
+    // schemaForm
+    const schemaForm = $$formField.property!.items;
+    if (!schemaForm) return;
+    // formMeta
     const formScene: TypeFormScene = propsBucket.readonly
       ? 'view'
       : $$formField.formMeta!.formScene!;
+    const formMeta = formMetaFromFormScene(formScene);
     // blocks
     const blocks = schemaRow?.rest?.blocks;
     if (!blocks || blocks.length === 0) return;
@@ -81,8 +81,9 @@ export class ControllerFormFieldDetails extends BeanControllerBase {
       const options = deepExtend(
         { key: index },
         {
-          formScene,
+          formMeta,
           schemaRow,
+          schemaForm,
           getDetailItems: () => {
             return propsBucket.value;
           },
@@ -102,4 +103,15 @@ export class ControllerFormFieldDetails extends BeanControllerBase {
     });
     return <div>{domBlocks}</div>;
   }
+
+  private _getSchemaRow($$formField: ControllerFormField): ISchemaObjectExtensionField | undefined {
+    const fieldNameAux = `_${$$formField.name}`;
+    const propertyAux = $$formField.$$form.getFieldProperty(fieldNameAux);
+    // schema
+    const schemaName = propertyAux?.items?.$ref;
+    if (!schemaName) {
+      throw new Error(`Should specify the schemaRow of detail by auxiliary Field: ${fieldNameAux}`);
+    }
+    return this.$sdk.getSchema(schemaName!).data;
+  }
 }

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

@@ -1,3 +1,7 @@
 export default {
   AddDetail: 'Add Detail',
+  EditDetail: 'Edit Detail',
+  Cancel: 'Cancel',
+  OK: 'OK',
+  DeleteConfirm: 'Are you sure you want to delete this detail?',
 };

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

@@ -1,3 +1,7 @@
 export default {
   AddDetail: '新增明细',
+  EditDetail: '编辑明细',
+  Cancel: '取消',
+  OK: '确认',
+  DeleteConfirm: '您确认要删除本明细吗？',
 };

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

@@ -1,3 +1,4 @@
+export * from './lib/index.js';
 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/lib/index.ts

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

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

@@ -0,0 +1,12 @@
+import { IPermissionHintDetailsActionBulk, TypeFormScene } from 'zova-module-a-openapi';
+
+export function checkPermission(
+  formScene: TypeFormScene,
+  permissionHint?: IPermissionHintDetailsActionBulk,
+): boolean {
+  const formSceneHint = permissionHint?.formScene;
+  if (!formSceneHint) return true;
+  if (Array.isArray(formSceneHint) && formSceneHint.includes(formScene!)) return true;
+  if (formSceneHint === formScene) return true;
+  return false;
+}

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

@@ -0,0 +1,172 @@
+import { celEnvBase } from '@cabloy/utils';
+import { classes } from 'typestyle';
+import { VNode } from 'vue';
+import { BeanBase, UseScope } from 'zova';
+import { ZovaJsx } from 'zova-jsx';
+import { Service } from 'zova-module-a-bean';
+import {
+  BeanControllerFormBase,
+  formMetaFromFormScene,
+  TypeFormOnSubmitData,
+} from 'zova-module-a-form';
+import {
+  IDetailScope,
+  IFormMeta,
+  IFormProvider,
+  IJsxRenderContextDetail,
+  ISchemaObjectExtensionField,
+  ScopeModuleAOpenapi,
+  TypeFormScene,
+  TypeFormSchemaScene,
+} from 'zova-module-a-openapi';
+import { AppModalItem } from 'zova-module-basic-app';
+
+import { IDialogFormOptions } from '../types/dialogForm.js';
+
+@Service()
+export class ServiceDetail<TData extends {} = {}> extends BeanBase {
+  private options: IDialogFormOptions<TData>;
+  private dialogInstance: AppModalItem | undefined;
+
+  formRef: BeanControllerFormBase<TData> | undefined;
+
+  formScene: TypeFormScene;
+  schemaScene: TypeFormSchemaScene;
+
+  formMeta: IFormMeta;
+  formProvider: IFormProvider;
+  formSchema?: ISchemaObjectExtensionField;
+  formData?: TData;
+
+  jsxZova: ZovaJsx;
+  jsxCelScope: IDetailScope;
+  jsxRenderContext: IJsxRenderContextDetail<TData>;
+
+  @UseScope()
+  $$scopeOpenapi: ScopeModuleAOpenapi;
+
+  protected async __init__(options: IDialogFormOptions<TData>) {
+    this.options = options;
+    this.formScene = options.formScene;
+    this.schemaScene = options.schemaScene;
+    this.formMeta = formMetaFromFormScene(this.formScene);
+    this.formProvider = this.$$scopeOpenapi.config.formProvider;
+    this.formSchema = options.schema;
+    this.formData = options.data;
+    // jsx
+    this._prepareJsx();
+  }
+
+  private _prepareJsx() {
+    const jsxCelEnv = celEnvBase.clone();
+    this.jsxZova = this.bean._newBeanSimple(
+      ZovaJsx,
+      false,
+      this.formProvider.components,
+      jsxCelEnv,
+    );
+    this.jsxCelScope = this._prepareJsxCelScope();
+    this.jsxRenderContext = {
+      app: this.app,
+      ctx: this.ctx,
+      $scene: 'detail',
+      $host: this,
+      $celScope: this.jsxCelScope,
+      $jsx: this.jsxZova,
+      $$detail: this,
+    };
+  }
+
+  private _prepareJsxCelScope(): IDetailScope {
+    // eslint-disable-next-line
+    const self = this;
+    const $$detail = this.$customRef(() => {
+      return {
+        get() {
+          return self;
+        },
+        set(_value) {},
+      };
+    }) as any;
+    return {
+      formMeta: this.formMeta,
+      $$detail,
+    };
+  }
+
+  private _renderBlocks() {
+    const blocks = this.formSchema?.rest?.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;
+  }
+
+  public closeDialog() {
+    if (this.dialogInstance) {
+      this.dialogInstance.close();
+      this.dialogInstance = undefined;
+    }
+  }
+
+  public submitData(data: TypeFormOnSubmitData<TData>) {
+    this.options.onSubmitData?.(data, this.dialogInstance!);
+  }
+
+  openDialogForm() {
+    const options = this.options;
+    this.dialogInstance = this.$appModal.dialog(
+      {
+        icon: options.icon,
+        title: options.title,
+        slotDefault: () => {
+          return <>{this._renderBlocks()}</>;
+        },
+        slotActions: () => {
+          const isSubmitting = this.formRef?.formState.isSubmitting;
+          return (
+            <>
+              {isSubmitting && <span class="loading loading-spinner text-primary"></span>}
+              <button
+                type="button"
+                class="btn btn-ghost"
+                onClick={() => {
+                  this.closeDialog();
+                }}
+              >
+                {options.locale.Cancel()}
+              </button>
+              {this.formScene !== 'view' && (
+                <button
+                  type="button"
+                  class={classes('btn btn-primary', isSubmitting && 'btn-disabled')}
+                  onClick={async () => {
+                    if (isSubmitting) return;
+                    await this.formRef?.submit();
+                  }}
+                >
+                  {options.locale.OK()}
+                </button>
+              )}
+            </>
+          );
+        },
+      },
+      options.dialogOptions,
+    );
+  }
+}

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

@@ -0,0 +1,18 @@
+import { IDetailScope } from 'zova-module-a-openapi';
+import 'zova-module-a-form';
+import 'zova-module-a-openapi';
+import type { ServiceDetail } from '../service/detail.jsx';
+
+declare module 'zova-module-a-openapi' {
+  export interface IJsxRenderContextDetail<TData extends {} = {}> {
+    $$detail: ServiceDetail<TData>;
+  }
+
+  export interface IDetailScope {
+    $$detail?: ServiceDetail;
+  }
+}
+
+declare module 'zova-module-a-form' {
+  export interface IFormScope extends IDetailScope {}
+}

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

@@ -1,8 +1,19 @@
+import 'zova-module-a-table';
 import 'zova-module-a-openapi';
+import type { IDetailsScope } from '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>;
   }
+
+  export interface IDetailsScope {
+    $$details?: ControllerBlockDetails<any>;
+  }
+}
+
+declare module 'zova-module-a-table' {
+  export interface ITableScope extends IDetailsScope {}
 }

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

@@ -0,0 +1,22 @@
+import { TypeFormOnSubmitData } from 'zova-module-a-form';
+import { IIconRecord } from 'zova-module-a-icon';
+import { TypeFormScene, TypeFormSchemaScene } from 'zova-module-a-openapi';
+import { AppModalItem, IModalDialogOptions } from 'zova-module-basic-app';
+
+export interface IDialogFormOptions<TData extends {} = {}> {
+  locale: {
+    Cancel: () => string;
+    OK: () => string;
+  };
+  schema: any;
+  data: TData;
+  formScene: TypeFormScene;
+  schemaScene: TypeFormSchemaScene;
+  dialogOptions?: IModalDialogOptions;
+  icon?: keyof IIconRecord;
+  title: string;
+  onSubmitData?: (
+    data: TypeFormOnSubmitData<TData>,
+    dialogInstance: AppModalItem,
+  ) => void | Promise<void>;
+}

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

@@ -1 +1,3 @@
 export * from './details.js';
+export * from './dialogForm.js';
+export * from './detail.js';

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

@@ -31,7 +31,7 @@
     "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 && npm run clean"
+    "postpack": "clean-package restore"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -31,7 +31,7 @@
     "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 && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {},
   "devDependencies": {

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

@@ -31,7 +31,7 @@
     "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 && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {},
   "devDependencies": {

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

@@ -31,7 +31,7 @@
     "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 && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {},
   "devDependencies": {

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

@@ -0,0 +1,52 @@
+{
+  "name": "zova-module-basic-resource",
+  "version": "5.0.0",
+  "description": "",
+  "keywords": [
+    "Zova Module"
+  ],
+  "author": "",
+  "files": [
+    "mock",
+    "dist",
+    "src",
+    "icons",
+    "assets"
+  ],
+  "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-resource"
+}

package/zova/src/suite/cabloy-basic/modules/basic-resource/src/.metadata/component/formFieldResourcePicker.ts

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