morghulis 3.0.23 → 3.0.25

package/dist/types/components/table/data/DTable.vue.d.ts

@@ -1,7 +1,7 @@
 import { DTableProps } from "./types";
-declare var __VLS_15: {};
+declare var __VLS_10: {};
 type __VLS_Slots = {} & {
-    header?: (props: typeof __VLS_15) => any;
+    header?: (props: typeof __VLS_10) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<DTableProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<DTableProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;

package/dist/types/components/table/data/controller/DTableController.vue.d.ts

@@ -3,7 +3,10 @@ declare const _default: import("vue").DefineComponent<{
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     remove: (...args: any[]) => void;
     open: (...args: any[]) => void;
-    copy: (...args: any[]) => void;
+    check: (...args: any[]) => void;
+    paste: (...args: any[]) => void;
+    uncheck: (...args: any[]) => void;
+    clone: (...args: any[]) => void;
     upload: (...args: any[]) => void;
     download: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<{
@@ -11,7 +14,10 @@ declare const _default: import("vue").DefineComponent<{
 }> & Readonly<{
     onRemove?: ((...args: any[]) => any) | undefined;
     onOpen?: ((...args: any[]) => any) | undefined;
-    onCopy?: ((...args: any[]) => any) | undefined;
+    onCheck?: ((...args: any[]) => any) | undefined;
+    onPaste?: ((...args: any[]) => any) | undefined;
+    onUncheck?: ((...args: any[]) => any) | undefined;
+    onClone?: ((...args: any[]) => any) | undefined;
     onUpload?: ((...args: any[]) => any) | undefined;
     onDownload?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/types/components/table/data/popover/DCellPopover.vue.d.ts

@@ -1,18 +1,19 @@
 import { MetaDatabase, MetaView } from "../../../../hooks/use-mata/types";
-import { DataItem } from "../../../../hooks/use-query/types";
+import { DataItem, Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
     data: {
         prop: string;
         row: DataItem;
     };
+    query: Query;
     db: MetaDatabase;
 };
 declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (...args: any[]) => void;
-    change: (...args: any[]) => void;
+    reset: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClose?: ((...args: any[]) => any) | undefined;
-    onChange?: ((...args: any[]) => any) | undefined;
+    onReset?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/dist/types/components/table/data/popover/DFieldPopover.vue.d.ts

@@ -1,14 +1,16 @@
 import { MetaDatabase, MetaField, MetaView } from "../../../../hooks/use-mata/types";
+import { Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
     data: MetaField;
     db: MetaDatabase;
+    query: Query;
 };
 declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (...args: any[]) => void;
-    change: (...args: any[]) => void;
+    reset: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClose?: ((...args: any[]) => any) | undefined;
-    onChange?: ((...args: any[]) => any) | undefined;
+    onReset?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/dist/types/components/table/data/popover/DIndexPopover.vue.d.ts

@@ -1,15 +1,16 @@
 import { MetaDatabase, MetaView } from "../../../../hooks/use-mata/types";
-import { DataItem } from "../../../../hooks/use-query/types";
+import { DataItem, Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
     data: DataItem;
     db: MetaDatabase;
+    query: Query;
 };
 declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (...args: any[]) => void;
-    change: (...args: any[]) => void;
+    reset: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClose?: ((...args: any[]) => any) | undefined;
-    onChange?: ((...args: any[]) => any) | undefined;
+    onReset?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/dist/types/components/table/data/popover/DMetaPopover.vue.d.ts

@@ -1,7 +1,16 @@
 import { MetaDatabase, MetaView } from "../../../../hooks/use-mata/types";
+import { Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
+    data: any;
+    query: Query;
     db: MetaDatabase;
 };
-declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    close: (...args: any[]) => void;
+    reset: (...args: any[]) => void;
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+    onClose?: ((...args: any[]) => any) | undefined;
+    onReset?: ((...args: any[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/dist/types/components/table/data/popover/DSearchPopover.vue.d.ts

@@ -1,14 +1,16 @@
 import { MetaDatabase, MetaField, MetaView } from "../../../../hooks/use-mata/types";
+import { Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
+    query: Query;
     data: MetaField;
     db: MetaDatabase;
 };
 declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (...args: any[]) => void;
-    change: (...args: any[]) => void;
+    reset: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClose?: ((...args: any[]) => any) | undefined;
-    onChange?: ((...args: any[]) => any) | undefined;
+    onReset?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/dist/types/components/table/data/widgets/DPopoverWrapper.vue.d.ts

@@ -1,8 +1,10 @@
 import { MTablePopperType } from "../../simple/types";
 import { MetaDatabase, MetaView } from "../../../../hooks/use-mata/types";
+import { Query } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     type: MTablePopperType;
     db: MetaDatabase;
+    query: Query;
     view: MetaView;
     data: any;
 };

package/dist/types/components/table/data/widgets/DTableHeader.vue.d.ts

@@ -0,0 +1,8 @@
+import { Finder } from "../../../../hooks/use-query/types";
+import { MetaField } from "../../../../hooks/use-mata/types";
+type __VLS_Props = {
+    field: MetaField;
+    finder: Finder;
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+export default _default;

package/dist/types/components/table/simple/MTable.vue.d.ts

@@ -1,10 +1,12 @@
 import { type MTableProps } from "./types";
 declare function getSelection(): any;
-declare var __VLS_1: {}, __VLS_3: {}, __VLS_35: {
+declare var __VLS_1: {}, __VLS_3: {}, __VLS_38: {
+    field: import("../../../hooks/use-mata/types").MetaField;
+}, __VLS_40: {
     field: import("../../../hooks/use-mata/types").MetaField;
     row: any;
     prop: string | number;
-}, __VLS_43: {}, __VLS_45: {}, __VLS_50: {
+}, __VLS_48: {}, __VLS_50: {}, __VLS_55: {
     type: import("./types").MTablePopperType;
     data: any;
 };
@@ -13,13 +15,15 @@ type __VLS_Slots = {} & {
 } & {
     'header-tool'?: (props: typeof __VLS_3) => any;
 } & {
-    cell?: (props: typeof __VLS_35) => any;
+    'header-cell'?: (props: typeof __VLS_38) => any;
+} & {
+    cell?: (props: typeof __VLS_40) => any;
 } & {
-    footer?: (props: typeof __VLS_43) => any;
+    footer?: (props: typeof __VLS_48) => any;
 } & {
-    'footer-tool'?: (props: typeof __VLS_45) => any;
+    'footer-tool'?: (props: typeof __VLS_50) => any;
 } & {
-    pop?: (props: typeof __VLS_50) => any;
+    pop?: (props: typeof __VLS_55) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<MTableProps, {
     getSelection: typeof getSelection;

package/dist/types/components/table/simple/types.d.ts

@@ -2,6 +2,7 @@ import type { Component } from "vue";
 import { type CSSProperties, type VNode } from "vue";
 import { type ElTooltipProps, type Sort, type TreeNode } from "element-plus";
 import { MetaView } from "../../../hooks/use-mata/types";
+import { Orders } from "../../../hooks/use-query/types";
 /**
  * style function
  */
@@ -120,25 +121,25 @@ export interface TableProps {
 export type MTableProps = TableProps & {
     loading?: boolean;
     view: MetaView;
+    orders?: Orders;
     buttons?: MTableButton[];
     columns?: MTableColumn[];
-    sortableCallback?: MTableSortableFn;
-};
-export type MTablePopperRef = {
-    getBoundingClientRect: () => {
-        x: number;
-        y: number;
-    };
+    sortCallback?: (newIndex: number, oldIndex: number) => void;
+    orderCallback?: (prop: string, dir: 1 | -1) => void;
 };
 export type MTablePopperType = 'meta' | 'search' | 'field' | 'cell' | 'index' | null | undefined;
 export type MTablePopper = {
-    vRef: MTablePopperRef;
+    vRef: {
+        getBoundingClientRect: () => {
+            x: number;
+            y: number;
+        };
+    };
     visible: boolean;
     type: MTablePopperType;
     data: any;
     placement?: 'left' | 'right' | 'top' | 'bottom' | null | string;
 };
-export type MTableSortableFn = (newIndex: number, oldIndex: number) => void;
 export type MTableButton = {
     size?: 'default' | 'small' | 'large' | "";
     handler?: (row: any, event?: Event) => void;

package/dist/types/components/table/simple/widgets/MTableHeader.vue.d.ts

@@ -1,19 +1,29 @@
-import { MetaField, MetaView } from "../../../../hooks/use-mata/types";
+import type { MetaField, MetaView } from "../../../../hooks/use-mata/types";
+import { Orders } from "../../../../hooks/use-query/types";
 type __VLS_Props = {
     view: MetaView;
     field: MetaField;
-    order: object;
+    orders?: Orders;
     searchable: boolean;
     metaEnable: boolean;
-    sortable: boolean;
 };
-declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare var __VLS_14: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_14) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     search: (...args: any[]) => void;
-    meta: (...args: any[]) => void;
+    field: (...args: any[]) => void;
     order: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onSearch?: ((...args: any[]) => any) | undefined;
-    onMeta?: ((...args: any[]) => any) | undefined;
+    onField?: ((...args: any[]) => any) | undefined;
     onOrder?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/types/components/table/simple/widgets/MTableIndex.vue.d.ts

@@ -2,11 +2,15 @@ declare const _default: import("vue").DefineComponent<{
     disabled?: any;
     selection?: any;
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    click: (...args: any[]) => void;
+    check: (...args: any[]) => void;
+    meta: (...args: any[]) => void;
+    uncheck: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<{
     disabled?: any;
     selection?: any;
 }> & Readonly<{
-    onClick?: ((...args: any[]) => any) | undefined;
+    onCheck?: ((...args: any[]) => any) | undefined;
+    onMeta?: ((...args: any[]) => any) | undefined;
+    onUncheck?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/types/hooks/use-channel/tools.d.ts

@@ -1,2 +1,3 @@
 import type { MorghulisChannel, MorghulisChannelConfig } from "./types";
-export declare function createChannel(url: string, channel?: MorghulisChannelConfig, auth?: boolean): MorghulisChannel;
+import { AxiosInstance } from "axios";
+export declare function createChannel(request: AxiosInstance, url: string, channel?: MorghulisChannelConfig): MorghulisChannel;

package/dist/types/hooks/use-channel/types.d.ts

@@ -13,7 +13,6 @@ export type MorghulisChannel = {
     payload: Ref<any>;
     loading: Ref<boolean>;
     activate: (body: any) => void;
-    $url: string;
     $start: () => void;
     $stop: () => void;
     $proceed: (payload: any) => void;

package/dist/types/hooks/use-dao/index.d.ts

@@ -1,14 +1,14 @@
 import { type Ref } from "vue";
 import { type Meta, MetaView } from "../use-mata/types";
 import { MorghulisChannelConfig } from "../use-channel/types";
-import { DataItem, Query } from "../use-query/types";
+import { DataItem, IQuery, Query } from "../use-query/types";
 /**
  * http和socket的loading冲突问题
  */
 export declare function useMDao(meta: Ref<Meta>, channelConfig?: MorghulisChannelConfig, auth?: boolean): {
     loading: import("vue").ComputedRef<boolean>;
     payload: Ref<any, any>;
-    find_many: (query: Query) => Promise<{
+    find_many: (query: Query | IQuery) => Promise<{
         results: DataItem[];
         total?: number;
     }>;
@@ -19,8 +19,8 @@ export declare function useMDao(meta: Ref<Meta>, channelConfig?: MorghulisChanne
     find_one: (id: string | number) => Promise<{
         item: DataItem;
     }>;
-    delete_many: (query: Query) => Promise<boolean>;
-    update_many: (query: Query, template: DataItem) => Promise<boolean>;
+    delete_many: (query: Query | IQuery) => Promise<boolean>;
+    update_many: (query: Query | IQuery, template: DataItem) => Promise<boolean>;
     load_view: () => Promise<MetaView>;
     save_many: (array: DataItem[]) => void;
 };

package/dist/types/hooks/use-mata/types.d.ts

@@ -8,7 +8,7 @@ export type MetaView = {
     fields?: {
         [key: string]: MetaField;
     };
-    path?: string;
+    entity?: string;
     code?: string;
     meta_name?: string;
     view_name?: string;
@@ -28,11 +28,18 @@ export type MetaView = {
     allow_download?: boolean;
     allow_upload?: boolean;
 };
+export type ManyField = 'ManyToManyField' | 'ManyToManyRel' | 'ManyToOneRef';
+export type RefField = 'OneOnOneField' | 'OneOnOneRel' | 'ForeignKey';
+export type SimpleField = 'CharField' | 'TextField' | 'BooleanField';
+export type NumberField = 'IntegerField' | 'FloatField' | 'BigIntegerField' | 'DecimalField' | 'SmallIntegerField';
+export type DateField = 'DateField' | 'DateTimeField' | 'TimeField';
+export type SpecialField = 'JSONField' | 'FileField';
+export type ReadonlyField = 'UUIDField' | 'BigAutoField' | 'Custom';
 export type MetaField = {
     prop?: string;
     label?: string;
     name?: string;
-    domain?: string;
+    domain?: SimpleField | ManyField | RefField | SpecialField | ReadonlyField | NumberField | DateField;
     tool?: string;
     refer?: MetaRefer;
     format?: MetaFormat;

package/dist/types/hooks/use-query/index.d.ts

@@ -1,3 +1,3 @@
-import { Query, QueryConfig } from "./types";
+import { Finder, Query, QueryConfig } from "./types";
 import { ComputedRef, Ref } from "vue";
-export declare function useMQuery(config?: Ref<QueryConfig>): ComputedRef<Query>;
+export declare function useMQuery(config?: Ref<QueryConfig>, finder?: Ref<Finder>): ComputedRef<Query>;

package/dist/types/hooks/use-query/tool.d.ts

@@ -0,0 +1,4 @@
+import { Query, SearchParam } from "./types";
+import { MetaView } from "../use-mata/types";
+export declare function queryFinder(query: Query, view: MetaView): void;
+export declare function checkFinder(param: SearchParam): boolean;

package/dist/types/hooks/use-query/types.d.ts

@@ -3,10 +3,10 @@ export type DataItem = {
     [key: string]: any;
 };
 type DataItemId = string | number;
-type Orders = {
+export type Orders = {
     [key: string]: 1 | -1;
 };
-type Condition = {
+export type Condition = {
     includes?: DataItem;
     excludes?: DataItem;
 };
@@ -18,11 +18,31 @@ export type QueryConfig = {
     size?: number;
 };
 export type Query = {
+    condition: Condition;
+    orders: Orders;
+    page: number;
+    size: number;
+    template: DataItem;
+    search: Condition[];
+    finder: Finder;
+};
+export type IQuery = {
     condition?: Condition;
     orders?: Orders;
     page?: number;
     size?: number;
     template?: DataItem;
     search?: Condition[];
+    finder?: Finder;
+};
+export type Finder = {
+    [key: string]: SearchParam;
+};
+export type SearchParam = {
+    type: 'includes' | 'excludes';
+    isnull: boolean;
+    decorate: boolean;
+    suffix: 'contains' | 'exact' | 'startswith' | 'endswith' | 'gt' | 'lt' | 'isnull';
+    value: any;
 };
 export {};

package/dist/types/hooks/use-request/index.d.ts

@@ -1,6 +1,7 @@
+import { AxiosInstance } from 'axios';
 import 'nprogress/nprogress.css';
 export declare function useMRequest(): {
-    getHttpRequest: (auth?: boolean) => import("axios").AxiosInstance;
-    getMinioRequest: () => import("axios").AxiosInstance;
+    getHttpRequest: (auth?: boolean) => AxiosInstance;
+    getMinioRequest: () => AxiosInstance;
     all: () => void;
 };

package/dist/types/hooks/{use-table-data → use-table/data}/index.d.ts

@@ -1,8 +1,10 @@
 import { ComputedRef, Ref } from "vue";
-import { MetaView } from "../use-mata/types";
-import { DataItem, QueryConfig } from "../use-query/types";
-import { DTableInfo, DTableProps } from "../../components/table/data/types";
+import { MetaView } from "../../use-mata/types";
+import { DataItem, Finder, Query, QueryConfig } from "../../use-query/types";
+import { DTableInfo, DTableProps } from "../../../components/table/data/types";
 export declare function useDTable(table: Ref, props: DTableProps): {
+    finder: Ref<Finder, Finder>;
+    query: ComputedRef<Query>;
     config: Ref<{
         includes?: {
             [x: string]: any;
@@ -12,9 +14,7 @@ export declare function useDTable(table: Ref, props: DTableProps): {
             [x: string]: any;
             id?: (string | number) | undefined;
         } | undefined;
-        orders?: {
-            [key: string]: 1 | -1;
-        } | undefined;
+        orders?: import("../../use-query/types").Orders | undefined;
         page?: number | undefined;
         size?: number | undefined;
     }, QueryConfig | {
@@ -26,18 +26,16 @@ export declare function useDTable(table: Ref, props: DTableProps): {
             [x: string]: any;
             id?: (string | number) | undefined;
         } | undefined;
-        orders?: {
-            [key: string]: 1 | -1;
-        } | undefined;
+        orders?: import("../../use-query/types").Orders | undefined;
         page?: number | undefined;
         size?: number | undefined;
     }>;
     payload: Ref<any, any>;
     view: Ref<{
         fields?: {
-            [key: string]: import("../use-mata/types").MetaField;
+            [key: string]: import("../../use-mata/types").MetaField;
         } | undefined;
-        path?: string | undefined;
+        entity?: string | undefined;
         code?: string | undefined;
         meta_name?: string | undefined;
         view_name?: string | undefined;
@@ -58,9 +56,9 @@ export declare function useDTable(table: Ref, props: DTableProps): {
         allow_upload?: boolean | undefined;
     }, MetaView | {
         fields?: {
-            [key: string]: import("../use-mata/types").MetaField;
+            [key: string]: import("../../use-mata/types").MetaField;
         } | undefined;
-        path?: string | undefined;
+        entity?: string | undefined;
         code?: string | undefined;
         meta_name?: string | undefined;
         view_name?: string | undefined;
@@ -100,4 +98,5 @@ export declare function useDTable(table: Ref, props: DTableProps): {
     collect: (callback: (item: DataItem) => void) => void;
     upload: (array: any[]) => void;
     remove: (id?: number | string) => void;
+    clip: () => void;
 };

package/dist/types/hooks/{use-table-morghulis → use-table/simple}/index.d.ts

@@ -1,6 +1,8 @@
 import { type Ref } from "vue";
-import { MTablePopperType, MTableProps } from "../../components/table/simple/types";
+import { MTablePopperType, MTableProps } from "../../../components/table/simple/types";
 export declare function useMTable(table: Ref, props: MTableProps): {
+    handleOrder: (prop: string, dir: 1 | -1) => void;
+    check: (flag: boolean) => void;
     visible: import("vue").ComputedRef<{
         popover: {
             meta: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morghulis",
-  "version": "3.0.23",
+  "version": "3.0.25",
   "type": "module",
   "files": [
     "dist"