jmash-core 0.0.59 → 0.0.61

package/dts/src/api/types.d.ts

@@ -1,19 +1,19 @@
 import type { AxiosPromise } from "axios";
-export interface EntityApi {
-    getKey(model: EntityModel): EntityKey;
-    findPage?(query: EntityReq): AxiosPromise<EntityPage>;
-    findList?(query: EntityReq): AxiosPromise<EntityList>;
-    findById(key: EntityKey): AxiosPromise<EntityModel>;
-    create(data: EntityCreateReq): AxiosPromise<EntityModel>;
-    update(data: EntityUpdateReq): AxiosPromise<EntityModel>;
-    delete?(key: EntityKey): AxiosPromise<EntityModel>;
-    batchDelete?(keys: EntityKey[]): AxiosPromise<number>;
-    enable?(key: EntityKey, enabled: boolean): AxiosPromise<boolean>;
-    move?(key: EntityKey, up: boolean): AxiosPromise<boolean>;
+export interface EntityApi<T> {
+    getKey(model: EntityModel<T>): EntityKey<T>;
+    findPage?(query: EntityReq<T>): AxiosPromise<EntityPage<T>>;
+    findList?(query: EntityReq<T>): AxiosPromise<EntityList<T>>;
+    findById(key: EntityKey<T>): AxiosPromise<EntityModel<T>>;
+    create(data: EntityCreateReq<T>): AxiosPromise<EntityModel<T>>;
+    update(data: EntityUpdateReq<T>): AxiosPromise<EntityModel<T>>;
+    delete?(key: EntityKey<T>): AxiosPromise<EntityModel<T>>;
+    batchDelete?(keys: EntityKey<T>[]): AxiosPromise<number>;
+    enable?(key: EntityKey<T>, enabled: boolean): AxiosPromise<boolean>;
+    move?(key: EntityKey<T>, up: boolean): AxiosPromise<boolean>;
     downloadTemplate?(): AxiosPromise;
-    exportExcel?(data: EntityExportReq): AxiosPromise;
-    exportPdf?(data: EntityExportReq): AxiosPromise;
-    importExcel?(data: EntityImportReq): AxiosPromise<string>;
+    exportExcel?(data: EntityExportReq<T>): AxiosPromise;
+    exportPdf?(data: EntityExportReq<T>): AxiosPromise;
+    importExcel?(data: EntityImportReq<T>): AxiosPromise<string>;
 }
 export interface EnumEntryReq {
     className: string;
@@ -29,54 +29,54 @@ export interface LayEntry {
     parentId: string;
     children: LayEntry[];
 }
-export interface EntityExportReq {
+export interface EntityExportReq<T> {
     type: number;
     data: any;
 }
-export interface EntityReq {
+export interface EntityReq<T> {
     curPage?: number;
     pageSize?: number;
     orderName?: string;
     orderAsc?: boolean;
 }
-export interface EntityModel {
+export interface EntityModel<T> {
 }
-export interface EntityList {
-    results: Array<EntityModel>;
+export interface EntityList<T> {
+    results: Array<EntityModel<T>>;
 }
-export interface EntityPage {
-    results: Array<EntityModel>;
+export interface EntityPage<T> {
+    results: Array<EntityModel<T>>;
     curPage: number;
     pageSize: number;
     totalSize: number;
-    subTotalDto: EntityTotal;
-    totalDto: EntityTotal;
+    subTotalDto: EntityTotal<T>;
+    totalDto: EntityTotal<T>;
 }
-export interface EntityTotal {
+export interface EntityTotal<T> {
     totalSize: number;
 }
-export interface EntityKey {
+export interface EntityKey<T> {
 }
-export interface EntityKeyList {
+export interface EntityKeyList<T> {
 }
-export interface EntityCreateReq {
+export interface EntityCreateReq<T> {
     tenant?: string;
     requestId?: string;
     validateOnly?: boolean;
 }
-export interface EntityUpdateReq {
+export interface EntityUpdateReq<T> {
     tenant?: string;
     requestId?: string;
     validateOnly?: boolean;
     updateMask: string;
 }
-export type EntityFormReq = EntityCreateReq | EntityUpdateReq;
-export interface EntityExportReq {
+export type EntityFormReq<T> = EntityCreateReq<T> | EntityUpdateReq<T>;
+export interface EntityExportReq<T> {
     title?: string;
     fileName?: string;
-    req?: EntityReq;
+    req?: EntityReq<T>;
 }
-export interface EntityImportReq {
+export interface EntityImportReq<T> {
     tenant?: string;
     requestId: string;
     fileNames?: string;

package/dts/src/hooks/table.d.ts

@@ -1,27 +1,27 @@
 import type { EntityApi, EntityReq, EntityModel, EntityTotal, EntityImportReq } from "../api/types";
 import type { Ref } from "vue";
 /** use table hooks */
-export declare function useTableHooks(t: any, api: EntityApi, query: Ref<EntityReq>): {
-    tableHooks: TableHooks;
+export declare function useTableHooks<T>(t: any, api: EntityApi<T>, query: Ref<EntityReq<T>>): {
+    tableHooks: TableHooks<T>;
     multipleTableRef: Ref<any>;
     queryFormRef: Ref<any>;
     listLoading: Ref<boolean>;
-    tableData: Ref<EntityModel[]>;
+    tableData: Ref<EntityModel<T>[]>;
     total: Ref<number>;
 };
 /** 表格Hooks */
-export declare class TableHooks {
+export declare class TableHooks<T> {
     multipleTableRef: Ref<any>;
     queryFormRef: Ref<any>;
     listLoading: Ref<boolean>;
-    tableData: Ref<EntityModel[]>;
+    tableData: Ref<EntityModel<T>[]>;
     total: Ref<number>;
-    totalRecord: Ref<EntityTotal>;
-    selectionRows: Ref<EntityModel[]>;
-    queryData: Ref<EntityReq>;
-    api: EntityApi;
+    totalRecord: Ref<EntityTotal<T>>;
+    selectionRows: Ref<EntityModel<T>[]>;
+    queryData: Ref<EntityReq<T>>;
+    api: EntityApi<T>;
     t: any;
-    constructor(t: any, api: EntityApi, query: Ref<EntityReq>);
+    constructor(t: any, api: EntityApi<T>, query: Ref<EntityReq<T>>);
     /** 获取Page列表数据. */
     getList(): void;
     /** 处理查询,如果查询数据中存在当前页数，则重置为第一页. */
@@ -29,13 +29,13 @@ export declare class TableHooks {
     handleSort(prop: string, order: string | null): void;
     resetQuery(): void;
     /** 删除记录 */
-    deleteRecord(row: EntityModel): void;
+    deleteRecord(row: EntityModel<T>): void;
     /** 删除多项记录 */
     deleteRecords(): void;
-    handleMove(row: EntityModel, up: boolean): void;
-    enableRecord(row: EntityModel, enabled: boolean): void;
+    handleMove(row: EntityModel<T>, up: boolean): void;
+    enableRecord(row: EntityModel<T>, enabled: boolean): void;
     handleExport(name: string): void;
     handleExportPdf(name: string): void;
     downloadTemplate(name: string): void;
-    importExcel(val: EntityImportReq): Promise<boolean>;
+    importExcel(val: EntityImportReq<T>): Promise<boolean>;
 }

package/dts/src/lang/package/en.d.ts

@@ -187,6 +187,7 @@ declare const _default: {
         name: string;
         target: string;
         routeName: string;
+        resourceCode: string;
         url: string;
         status: string;
         operatePerm: string;
@@ -199,6 +200,7 @@ declare const _default: {
         parentRequired: string;
         nameRequired: string;
         routeNameRequired: string;
+        resourceCodeRequired: string;
         urlRequired: string;
         statusRequired: string;
         targetRequired: string;

package/dts/src/lang/package/zh-cn.d.ts

@@ -191,6 +191,7 @@ declare const _default: {
         name: string;
         target: string;
         routeName: string;
+        resourceCode: string;
         url: string;
         status: string;
         operatePerm: string;
@@ -203,6 +204,7 @@ declare const _default: {
         parentRequired: string;
         nameRequired: string;
         routeNameRequired: string;
+        resourceCodeRequired: string;
         urlRequired: string;
         urlExistSlash: string;
         statusRequired: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/src/index.d.ts",