cabloy 5.1.140 → 5.1.142

package/zova/src/suite/cabloy-basic/modules/basic-image/src/api/openapi/schemas.ts

@@ -535,17 +535,6 @@ export type ApiSchemaPayMockDtoMockRefundComplete =
   components['schemas']['pay-mock.dto.mockRefundComplete'];
 export type ApiSchemaPayMockDtoMockRefundCompletePartial =
   Partial<ApiSchemaPayMockDtoMockRefundComplete>;
-export type ApiSchemaAPaypalEntityPaypalRecord =
-  components['schemas']['a-paypal.entity.paypalRecord'];
-export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayload =
-  components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayloadPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordPayload>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptions =
-  components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptionsPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordOptions>;
 export type ApiSchemaTestCaptchaDtoSignin = components['schemas']['test-captcha.dto.signin'];
 export type ApiSchemaTestCaptchaDtoSigninPartial = Partial<ApiSchemaTestCaptchaDtoSignin>;
 export type ApiSchemaTestRestDtoProductCreate =

package/zova/src/suite/cabloy-basic/modules/basic-image/src/api/openapi/types.ts

@@ -1504,54 +1504,6 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/paypal/getRecord/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get: operations['Paypal_getRecord'];
-    put?: never;
-    post?: never;
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/captureOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_captureOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/cancelOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_cancelOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
   '/api/test/auth/passport/isAuthenticated': {
     parameters: {
       query?: never;
@@ -3954,7 +3906,29 @@ export interface components {
     'a-permission.dto.permissions': {
       roleIds?: (number | string)[] | undefined;
       roleNames?: string[] | undefined;
-      actions?: unknown;
+      actions?:
+        | {
+            [key: string]:
+              | boolean
+              | {
+                  key: string;
+                  allowed: boolean;
+                  matcher:
+                    | {
+                        /** @enum {string} */
+                        mode: 'all';
+                      }
+                    | {
+                        /** @enum {string} */
+                        mode: 'any';
+                        rules: {
+                          field: string;
+                          values: string[];
+                        }[];
+                      };
+                };
+          }
+        | undefined;
     };
     'home-base.dto.siteCatalogSelectRes': {
       list: components['schemas']['home-base.dto.siteCatalogSelectResItem'][];
@@ -4771,49 +4745,6 @@ export interface components {
       /** @enum {string} */
       outcome: 'succeeded' | 'failed' | 'cancelled';
     };
-    'a-paypal.entity.paypalRecord': {
-      /**
-       * Format: date-time
-       * @description Created At
-       */
-      createdAt: Date;
-      /**
-       * Format: date-time
-       * @description Updated At
-       */
-      updatedAt: Date;
-      /**
-       * @description Deleted
-       * @default false
-       */
-      deleted?: boolean;
-      /**
-       * @description Instance ID
-       * @default 0
-       */
-      iid?: number;
-      /** @description ID */
-      id: number | string;
-      userId: number | string;
-      /** @default 0 */
-      status?: number;
-      prepayId: string;
-      payload: components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-      options: components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-    };
-    'a-paypal.dto.paypalOrderRecordPayload': {
-      remark: string;
-      total: string;
-      currencyCode: string;
-    };
-    'a-paypal.dto.paypalOrderRecordOptions': {
-      brandName: string;
-      returnUrl: string;
-      cancelUrl: string;
-      returnTo: string;
-      scene: string;
-      orderId: number | string;
-    };
     'test-captcha.dto.signin': {
       username: string;
       password: string;
@@ -8544,84 +8475,6 @@ export interface operations {
     };
     authToken: true;
   };
-  Paypal_getRecord: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data: components['schemas']['a-paypal.entity.paypalRecord'];
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_captureOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_cancelOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
   TestAuthPassport_isAuthenticated: {
     parameters: {
       query?: never;

package/zova/src/suite/cabloy-basic/modules/basic-image/src/component/formFieldImage/controller.tsx

@@ -9,14 +9,7 @@ import { classes } from 'typestyle';
 import { BeanControllerBase, ClientOnly, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { ZFormField } from 'zova-module-a-form';
-import {
-  buildImagePreviewTitle,
-  inferImageRelationName,
-  openImagePreviewDialog,
-  resolveImagePreviewUrl,
-} from 'zova-module-basic-image';
 
-import type { IImageTransformOptions } from '../../types/image.js';
 import type {
   IImageUploaderRenderState,
   IImageUploaderResult,
@@ -25,20 +18,21 @@ import type {
 import { ZImageUploader } from '../../.metadata/component/imageUploader.js';
 import 'vue-advanced-cropper/dist/style.css';
 
+import { IImageResizeOptions } from '../../lib/imageTransform.jsx';
+import {
+  buildImagePreviewTitle,
+  inferImageRelationName,
+  resolveImagePreviewUrl,
+} from '../../lib/preview.js';
+import { openImagePreviewDialog } from '../../lib/previewDialog.jsx';
+
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
     'basic-image:formFieldImage'?: IResourceFormFieldImageOptions;
   }
 }
 
-export interface IResourceFormFieldImageResizeOptions {
-  width?: number;
-  height?: number;
-  fit?: 'scale-down' | 'contain' | 'cover' | 'crop' | 'pad';
-  background?: string;
-  quality?: number;
-  format?: IImageTransformOptions['format'];
-}
+export interface IResourceFormFieldImageResizeOptions extends IImageResizeOptions {}
 
 export interface IResourceFormFieldImageOptions extends IResourceFormFieldOptionsBase {
   imageScene?: keyof IImageSceneRecord | string;

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

@@ -34,13 +34,15 @@
   },
   "dependencies": {
     "@tiptap/core": "^3.30.0",
+    "@tiptap/extension-code-block-lowlight": "3.30.0",
     "@tiptap/extension-highlight": "^3.30.0",
     "@tiptap/extension-image": "^3.30.0",
     "@tiptap/extension-list": "^3.30.0",
     "@tiptap/extension-table": "^3.30.0",
     "@tiptap/markdown": "^3.30.0",
     "@tiptap/starter-kit": "^3.30.0",
-    "@tiptap/vue-3": "^3.30.0"
+    "@tiptap/vue-3": "^3.30.0",
+    "lowlight": "^3.3.0"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",
@@ -57,5 +59,11 @@
       "exports.\\..import"
     ]
   },
-  "title": "basic-markdown"
+  "title": "basic-markdown",
+  "zovaModule": {
+    "dependencies": {
+      "basic-app": "5.0.0",
+      "basic-image": "5.0.0"
+    }
+  }
 }

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

@@ -120,8 +120,11 @@ declare module 'zova' {
   }
 }
 /** style: end */
+/** locale: begin */
+import { locales } from './locales.js';
+/** locale: end */
 /** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'zova';
+import { BeanScopeBase, type BeanScopeUtil, TypeModuleLocales, TypeLocaleBase } from 'zova';
 import { Scope } from 'zova-module-a-bean';
 
 @Scope()
@@ -129,6 +132,7 @@ export class ScopeModuleBasicMarkdown extends BeanScopeBase {}
 
 export interface ScopeModuleBasicMarkdown {
   util: BeanScopeUtil;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
 }
 
 import 'zova';
@@ -139,9 +143,14 @@ declare module 'zova' {
 
 
 
-
+  export interface IBeanScopeLocale {
+    'basic-markdown': (typeof locales)[TypeLocaleBase];
+  }
 
 
 }
 
+export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `basic-markdown::${K}` {
+  return `basic-markdown::${key}`;
+}
 /** scope: end */

package/zova/src/suite/cabloy-basic/modules/basic-markdown/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,
+};