cabloy 5.1.95 → 5.1.97

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

@@ -0,0 +1,18 @@
+export default {
+  AddImage: 'Add Image',
+  AdjustImage: 'Drag or resize the crop area to adjust the image.',
+  ApplyCrop: 'Apply Crop',
+  CancelCrop: 'Cancel',
+  CropImage: 'Crop Image',
+  ImageTooLarge: 'Image size exceeds the limit: {0}',
+  ImageTooSmall: 'Image size is smaller than the limit: {0}',
+  ImageUploadFailed: 'Image upload failed',
+  InvalidImageType: 'Unsupported image type',
+  NoImageSelected: 'No image selected',
+  PreviewImage: 'Preview',
+  RemoveImage: 'Remove',
+  ReplaceImage: 'Replace Image',
+  SelectImage: 'Select Image',
+  TooManyImages: 'You can upload up to {0} images',
+  Uploading: 'Uploading...',
+};

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

@@ -0,0 +1,18 @@
+export default {
+  AddImage: '继续添加图片',
+  AdjustImage: '请拖拽或缩放裁剪区域，调整图片显示范围。',
+  ApplyCrop: '应用裁剪',
+  CancelCrop: '取消',
+  CropImage: '裁剪图片',
+  ImageTooLarge: '图片大小超过限制：{0}',
+  ImageTooSmall: '图片大小小于限制：{0}',
+  ImageUploadFailed: '图片上传失败',
+  InvalidImageType: '图片类型不受支持',
+  NoImageSelected: '尚未选择图片',
+  PreviewImage: '预览',
+  RemoveImage: '移除',
+  ReplaceImage: '替换图片',
+  SelectImage: '选择图片',
+  TooManyImages: '最多允许上传 {0} 张图片',
+  Uploading: '正在上传...',
+};

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

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

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

@@ -0,0 +1,2 @@
+export * from './preview.js';
+export * from './previewDialog.js';

package/zova/src/suite/cabloy-basic/modules/basic-image/src/lib/preview.ts

@@ -0,0 +1,105 @@
+export interface IImagePreviewItemBase {
+  url?: string;
+  filename?: string;
+}
+
+export interface IImagePreviewItem extends IImagePreviewItemBase {
+  url: string;
+}
+
+export function inferImageRelationName(fieldName?: string, relationName?: string) {
+  if (relationName) return relationName;
+  if (!fieldName) return undefined;
+  if (fieldName.endsWith('Ids')) {
+    return `${fieldName.slice(0, -3)}s`;
+  }
+  if (fieldName.endsWith('Id')) {
+    return fieldName.slice(0, -2);
+  }
+  return undefined;
+}
+
+export function resolveImagePreviewUrl(url: string | undefined, baseURL?: string) {
+  if (!url || !url.startsWith('/api/')) return url;
+  if (!baseURL) return url;
+  return `${baseURL.replace(/\/$/, '')}${url}`;
+}
+
+export function buildImagePreviewTitle(
+  fieldTitle: string | undefined,
+  count: number,
+  fallbackTitle: string | (() => string),
+) {
+  const normalizedTitle =
+    fieldTitle ?? (typeof fallbackTitle === 'function' ? fallbackTitle() : fallbackTitle);
+  if (count <= 1) return normalizedTitle;
+  return `${normalizedTitle}（${count}）`;
+}
+
+export function summarizeImageRelationPreviewValue(value: unknown): {
+  count: number;
+  item?: IImagePreviewItem;
+} {
+  if (!Array.isArray(value)) {
+    if (!isImagePreviewItem(value)) return { count: 0, item: undefined };
+    return { count: 1, item: value };
+  }
+  let count = 0;
+  let item: IImagePreviewItem | undefined;
+  for (const valueItem of value) {
+    if (!isImagePreviewItem(valueItem)) continue;
+    count += 1;
+    if (!item) item = valueItem;
+  }
+  return { count, item };
+}
+
+export function summarizeImageUrlPreviewValue(value: unknown): {
+  count: number;
+  item?: IImagePreviewItem;
+} {
+  if (!Array.isArray(value)) {
+    if (!value) return { count: 0, item: undefined };
+    return { count: 1, item: { url: String(value) } };
+  }
+  let count = 0;
+  let item: IImagePreviewItem | undefined;
+  for (const valueItem of value) {
+    if (!valueItem) continue;
+    count += 1;
+    if (!item) item = { url: String(valueItem) };
+  }
+  return { count, item };
+}
+
+export function collectImageRelationPreviewItems(value: unknown): IImagePreviewItem[] {
+  if (!Array.isArray(value)) {
+    if (!isImagePreviewItem(value)) return [];
+    return [value];
+  }
+  const items: IImagePreviewItem[] = [];
+  for (const valueItem of value) {
+    if (!isImagePreviewItem(valueItem)) continue;
+    items.push(valueItem);
+  }
+  return items;
+}
+
+export function collectImageUrlPreviewItems(value: unknown): IImagePreviewItem[] {
+  if (!Array.isArray(value)) {
+    if (!value) return [];
+    return [{ url: String(value) }];
+  }
+  const items: IImagePreviewItem[] = [];
+  for (const valueItem of value) {
+    if (!valueItem) continue;
+    items.push({ url: String(valueItem) });
+  }
+  return items;
+}
+
+export function isImagePreviewItem(value: unknown): value is IImagePreviewItem {
+  if (!value || typeof value !== 'object') return false;
+  if (!('url' in value)) return false;
+  return typeof value.url === 'string' && !!value.url;
+}

package/zova/src/suite/cabloy-basic/modules/basic-image/src/lib/previewDialog.tsx

@@ -0,0 +1,190 @@
+import type { VNode } from 'vue';
+
+import { classes } from 'typestyle';
+import { nextTick, reactive } from 'vue';
+
+import { IImagePreviewItem, resolveImagePreviewUrl } from './preview.js';
+
+interface IImagePreviewDialogState {
+  activeIndex: number;
+}
+
+interface IImagePreviewDialogAppModal {
+  dialog(
+    options?: {
+      title?: string;
+      slotDefault?: () => VNode;
+    },
+    dialogOptions?: {
+      maxWidth?: number | string;
+      maxHeight?: number | string;
+      closeOnBackdrop?: boolean;
+      closeOnEscape?: boolean;
+      showCloseButton?: boolean;
+    },
+  ): unknown;
+}
+
+export interface IOpenImagePreviewDialogOptions {
+  appModal: IImagePreviewDialogAppModal;
+  title: string;
+  items: IImagePreviewItem[];
+  initialIndex?: number;
+  baseURL?: string;
+}
+
+export function openImagePreviewDialog(options: IOpenImagePreviewDialogOptions) {
+  const items = options.items.filter(item => !!item.url);
+  if (items.length === 0) return;
+  const dialogState = reactive<IImagePreviewDialogState>({
+    activeIndex: _normalizePreviewDialogIndex(items.length, options.initialIndex),
+  });
+  const bodyRefHolder: { value?: HTMLElement } = {};
+  options.appModal.dialog(
+    {
+      title: options.title,
+      slotDefault: () =>
+        _renderPreviewDialogBody(items, dialogState, bodyRefHolder, options.baseURL),
+    },
+    {
+      maxWidth: 960,
+      maxHeight: 'calc(100vh - 2rem)',
+      closeOnBackdrop: true,
+      closeOnEscape: true,
+      showCloseButton: true,
+    },
+  );
+}
+
+function _renderPreviewDialogBody(
+  items: IImagePreviewItem[],
+  dialogState: IImagePreviewDialogState,
+  bodyRefHolder: { value?: HTMLElement },
+  baseURL?: string,
+): VNode {
+  const leadItem = items[dialogState.activeIndex] ?? items[0];
+  const leadPreviewUrl = resolveImagePreviewUrl(leadItem?.url, baseURL);
+  return (
+    <div
+      ref={ref => {
+        const element = ref as HTMLElement | null;
+        if (!element) return;
+        const isNewElement = bodyRefHolder.value !== element;
+        bodyRefHolder.value = element;
+        if (isNewElement) {
+          nextTick(() => {
+            element.focus();
+          });
+        }
+      }}
+      class="space-y-4 focus:outline-none"
+      tabindex={0}
+      onKeydown={event => {
+        _handlePreviewDialogKeydown(event, items.length, dialogState);
+      }}
+    >
+      {leadPreviewUrl && (
+        <div class="overflow-hidden rounded-box bg-base-200 p-2">
+          <img
+            class="mx-auto max-h-[70vh] w-full object-contain"
+            src={leadPreviewUrl}
+            alt={leadItem?.filename ?? 'image'}
+          />
+        </div>
+      )}
+      {(!!leadItem?.filename || items.length > 1) && (
+        <div class="flex items-center justify-between gap-3">
+          <div class="min-w-0 text-sm font-medium text-base-content/70">
+            {!!leadItem?.filename && <div class="truncate">{leadItem.filename}</div>}
+          </div>
+          {items.length > 1 && (
+            <div class="shrink-0 text-sm font-medium text-base-content/60">
+              {_getPreviewCounterText(items.length, dialogState.activeIndex)}
+            </div>
+          )}
+        </div>
+      )}
+      {items.length > 1 && (
+        <div class="grid grid-cols-2 gap-3 sm:grid-cols-3">
+          {items.map((item, index) =>
+            _renderPreviewDialogItem(
+              item,
+              index,
+              index === dialogState.activeIndex,
+              dialogState,
+              baseURL,
+            ),
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
+
+function _renderPreviewDialogItem(
+  item: IImagePreviewItem,
+  index: number,
+  active: boolean,
+  dialogState: IImagePreviewDialogState,
+  baseURL?: string,
+): VNode {
+  const previewUrl = resolveImagePreviewUrl(item.url, baseURL);
+  return (
+    <button
+      key={`${item.url}-${index}`}
+      type="button"
+      class={classes(
+        'space-y-2 rounded-box bg-base-200 p-2 text-left transition duration-150',
+        active && 'ring-2 ring-primary shadow-md',
+        !active && 'hover:shadow-sm hover:ring-1 hover:ring-base-300',
+      )}
+      title={item.filename ?? `image-${index + 1}`}
+      onClick={() => {
+        dialogState.activeIndex = index;
+      }}
+    >
+      <div class="aspect-square overflow-hidden rounded-box bg-base-100">
+        <img
+          class="h-full w-full object-cover"
+          loading="lazy"
+          src={previewUrl}
+          alt={item.filename ?? `image-${index + 1}`}
+        />
+      </div>
+      {!!item.filename && <div class="truncate text-sm text-base-content/70">{item.filename}</div>}
+    </button>
+  );
+}
+
+function _handlePreviewDialogKeydown(
+  event: KeyboardEvent,
+  count: number,
+  dialogState: IImagePreviewDialogState,
+) {
+  if (count <= 1) return;
+  if (event.key === 'ArrowLeft') {
+    event.preventDefault();
+    dialogState.activeIndex = _movePreviewDialogSelection(count, dialogState.activeIndex, -1);
+    return;
+  }
+  if (event.key === 'ArrowRight') {
+    event.preventDefault();
+    dialogState.activeIndex = _movePreviewDialogSelection(count, dialogState.activeIndex, 1);
+  }
+}
+
+function _movePreviewDialogSelection(count: number, activeIndex: number, step: number) {
+  return (activeIndex + step + count) % count;
+}
+
+function _getPreviewCounterText(count: number, activeIndex: number) {
+  return `${activeIndex + 1} / ${count}`;
+}
+
+function _normalizePreviewDialogIndex(count: number, initialIndex?: number) {
+  if (!count) return 0;
+  if (initialIndex === undefined) return 0;
+  if (initialIndex < 0) return 0;
+  if (initialIndex >= count) return count - 1;
+  return initialIndex;
+}

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

@@ -0,0 +1,5 @@
+import type { components } from '../api/openapi/index.js';
+
+export type IImageTransformOptions = NonNullable<
+  NonNullable<components['schemas']['a-image.dto.imageUploadResponse']['variants']>[string]
+>;

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

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

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

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

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

@@ -16,6 +16,7 @@
     "zova-module-basic-date": "^5.0.6",
     "zova-module-basic-details": "^5.0.0",
     "zova-module-basic-form": "^5.0.7",
+    "zova-module-basic-image": "^5.0.0",
     "zova-module-basic-input": "^5.0.7",
     "zova-module-basic-page": "^5.0.7",
     "zova-module-basic-pageentry": "^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.41",
+  "version": "5.1.42",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -0,0 +1 @@
+export interface IImageSceneRecord {}

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

@@ -1,5 +1,6 @@
 export * from './action.js';
 export * from './captcha.js';
+export * from './image.js';
 export * from './database.js';
 export * from './formMeta.js';
 export * from './formProvider.js';

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.90",
+  "version": "5.1.91",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -37,16 +37,16 @@
     "@cabloy/compose": "^2.1.8",
     "@cabloy/deps": "^1.1.8",
     "@cabloy/json5": "^1.1.9",
-    "@cabloy/module-info": "^2.0.0",
-    "@cabloy/utils": "^2.1.25",
+    "@cabloy/module-info": "^2.0.3",
+    "@cabloy/utils": "^2.1.26",
     "@cabloy/vue-router": "^4.4.16",
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.75"
+    "zova-jsx": "^1.1.76"
   },
   "devDependencies": {
-    "@cabloy/cli": "^3.1.27",
+    "@cabloy/cli": "^3.1.28",
     "@types/luxon": "^3.7.1",
     "clean-package": "^2.2.0",
     "fs-extra": "^11.3.5",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.129",
+  "version": "5.1.130",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.30",
-    "zova-module-a-openapi": "^5.1.41",
+    "zova-module-a-openapi": "^5.1.42",
     "zova-module-a-router": "^5.1.29",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.32",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.37",
     "zova-module-a-zod": "^5.1.36",
-    "zova-module-a-zova": "^5.1.90"
+    "zova-module-a-zova": "^5.1.91"
   },
   "title": "a-zova"
 }

package/vona/packages-vona/vona-core/src/lib/utils/sqlite3.ts

@@ -1,50 +0,0 @@
-import fse from 'fs-extra';
-import { createRequire } from 'node:module';
-import path from 'node:path';
-
-import type { VonaApplication } from '../core/application.ts';
-
-import { getHomeVonaAppDir } from '../core/config.ts';
-import { pathToHref } from './util.ts';
-
-export function getSqlite3DatabaseNameDefault(app: VonaApplication) {
-  const mode = app.meta.env.META_MODE;
-  if (mode !== 'prod') return '';
-  const dbPath = path.join(getHomeVonaAppDir(app), 'sqlite3');
-  fse.ensureDirSync(dbPath);
-  return path.join(dbPath, `${app.name}.db`);
-}
-
-// string/true/false
-export function getSqlite3NativeBinding(_app: VonaApplication, nativeBinding: string | undefined) {
-  nativeBinding = prepareNativeBinding(nativeBinding);
-  if (!nativeBinding) return nativeBinding;
-  const nativeBindingPath = path.isAbsolute(nativeBinding)
-    ? nativeBinding
-    : path.join(import.meta.dirname, nativeBinding);
-  const require = createRequire(import.meta.url);
-  const addon = require(nativeBindingPath);
-  return addon as any;
-}
-
-export async function copySqlite3NativeBinding(
-  projectPath: string,
-  outDir: string,
-  env: NodeJS.ProcessEnv,
-) {
-  // dest
-  const nativeBinding = prepareNativeBinding(env.DATABASE_CLIENT_SQLITE3_NATIVEBINDING);
-  if (!nativeBinding || path.isAbsolute(nativeBinding)) return;
-  const fileDest = path.join(outDir, nativeBinding);
-  // src
-  const require = createRequire(pathToHref(path.join(projectPath, '/')));
-  const modulePath = require.resolve('better-sqlite3/package.json');
-  const fileSrc = path.join(path.dirname(modulePath), 'build/Release/better_sqlite3.node');
-  // copy
-  await fse.copy(fileSrc, fileDest);
-}
-
-function prepareNativeBinding(nativeBinding: string | undefined) {
-  if (!nativeBinding || nativeBinding === 'false') return null as unknown as undefined;
-  return nativeBinding === 'true' ? 'node/better_sqlite3.node' : nativeBinding;
-}