morghulis 3.0.24 → 3.0.25

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

@@ -1,7 +1,7 @@
 import { DTableProps } from "./types";
-declare var __VLS_7: {};
+declare var __VLS_10: {};
 type __VLS_Slots = {} & {
-    header?: (props: typeof __VLS_7) => 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/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,14 +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, {
     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/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

@@ -2,9 +2,11 @@ import { type MTableProps } from "./types";
 declare function getSelection(): any;
 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_46: {}, __VLS_48: {}, __VLS_53: {
+}, __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_38) => any;
+    'header-cell'?: (props: typeof __VLS_38) => any;
+} & {
+    cell?: (props: typeof __VLS_40) => any;
 } & {
-    footer?: (props: typeof __VLS_46) => any;
+    footer?: (props: typeof __VLS_48) => any;
 } & {
-    'footer-tool'?: (props: typeof __VLS_48) => any;
+    'footer-tool'?: (props: typeof __VLS_50) => any;
 } & {
-    pop?: (props: typeof __VLS_53) => any;
+    pop?: (props: typeof __VLS_55) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<MTableProps, {
     getSelection: typeof getSelection;

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

@@ -7,7 +7,11 @@ type __VLS_Props = {
     searchable: boolean;
     metaEnable: 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;
     field: (...args: any[]) => void;
     order: (...args: any[]) => void;
@@ -16,4 +20,10 @@ declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {
     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/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-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

@@ -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-table/data/index.d.ts

@@ -1,8 +1,9 @@
 import { ComputedRef, Ref } from "vue";
 import { MetaView } from "../../use-mata/types";
-import { DataItem, Query, QueryConfig } from "../../use-query/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?: {

package/package.json

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

package/dist/types/components/table/data/search/FieldSearch.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-export default _default;

package/dist/types/components/table/data/search/SearchCell.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-export default _default;

package/dist/types/components/table/data/search/TableSearch.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-export default _default;