Merge branch '7.x' of https://e.coding.net/shancool/cool-admin/front-next into 7.x

package.json

@@ -12,7 +12,7 @@
 		"format": "prettier --write src/"
 	},
 	"dependencies": {
-		"@cool-vue/crud": "^7.2.2",
+		"@cool-vue/crud": "^7.2.3",
 		"@element-plus/icons-vue": "^2.3.1",
 		"@vueuse/core": "^11.1.0",
 		"@wangeditor/editor": "^5.1.23",

packages/crud/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cool-vue/crud",
-	"version": "7.2.2",
+	"version": "7.2.3",
 	"private": false,
 	"main": "./dist/index.umd.min.js",
 	"typings": "types/index.d.ts",

packages/crud/src/components/pagination/index.tsx

@@ -68,7 +68,7 @@ export default defineComponent({
 		return () => {
 			return h(
 				<el-pagination
-					small={style.size == "small" || browser.isMini}
+					size={browser.isMini ? 'small' : style.size}
 					background
 					page-sizes={[10, 20, 30, 40, 50, 100]}
 					pager-count={browser.isMini ? 5 : 7}

packages/crud/src/utils/form-hook.ts

@@ -100,7 +100,6 @@ function parse(method: "submit" | "bind", { value, hook: pipe, form, prop }: any
 	} else if (isArray(pipe)) {
 		pipes = pipe;
 	} else if (isObject(pipe)) {
-		// @ts-expect-error
 		pipes = isArray(pipe[method]) ? pipe[method] : [pipe[method]];
 	} else if (isFunction(pipe)) {
 		pipes = [pipe];

packages/crud/types/components/add-btn/index.d.ts

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

packages/crud/types/components/adv/btn.d.ts

@@ -1,48 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {
-	{},
+    Search: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	() => any,
+}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<{}> & Readonly<{}>,
-	{},
-	{},
-	{
-		Search: import("vue").DefineComponent<
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-	},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/adv/search.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="../index" />
 import { PropType } from "vue";
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     items: {
         type: PropType<ClForm.Item<any>[]>;
         default: () => never[];
@@ -16,18 +15,7 @@ declare const _default: import("vue").DefineComponent<
         default: () => string[];
     };
     onSearch: FunctionConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clear" | "reset")[], "clear" | "reset", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("clear" | "reset")[],
-	"clear" | "reset",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     items: {
         type: PropType<ClForm.Item<any>[]>;
         default: () => never[];
@@ -42,49 +30,14 @@ declare const _default: import("vue").DefineComponent<
         default: () => string[];
     };
     onSearch: FunctionConstructor;
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     onReset?: ((...args: any[]) => any) | undefined;
     onClear?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     size: string | number;
     items: ClForm.Item<any>[];
     op: unknown[];
-	},
+}, {}, {
-	{},
+    Close: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{
+}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-		Close: import("vue").DefineComponent<
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-	},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/context-menu/index.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="../index" />
 import { type PropType } from "vue";
-declare const ClContextMenu: import("vue").DefineComponent<
+declare const ClContextMenu: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     show: BooleanConstructor;
     options: {
         type: PropType<ClContextMenu.Options>;
@@ -11,18 +10,7 @@ declare const ClContextMenu: import("vue").DefineComponent<
         type: ObjectConstructor;
         default: () => {};
     };
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     show: BooleanConstructor;
     options: {
         type: PropType<ClContextMenu.Options>;
@@ -32,23 +20,11 @@ declare const ClContextMenu: import("vue").DefineComponent<
         type: ObjectConstructor;
         default: () => {};
     };
-		}>
+}>> & Readonly<{}>, {
-	> &
-		Readonly<{}>,
-	{
     options: ClContextMenu.Options;
     show: boolean;
     event: Record<string, any>;
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export declare const ContextMenu: {
     open(event: any, options: ClContextMenu.Options): ClContextMenu.Exposed;
 };

packages/crud/types/components/crud/index.d.ts

@@ -1,43 +1,19 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     name: StringConstructor;
     border: BooleanConstructor;
     padding: {
         type: StringConstructor;
         default: string;
     };
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     name: StringConstructor;
     border: BooleanConstructor;
     padding: {
         type: StringConstructor;
         default: string;
     };
-		}>
+}>> & Readonly<{}>, {
-	> &
-		Readonly<{}>,
-	{
     border: boolean;
     padding: string;
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/dialog/index.d.ts

@@ -1,5 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     modelValue: {
         type: BooleanConstructor;
         default: boolean;
@@ -30,24 +29,9 @@ declare const _default: import("vue").DefineComponent<
         type: BooleanConstructor;
         default: boolean;
     };
-	}>,
+}>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-	() => import("vue").VNode<
-		import("vue").RendererNode,
-		import("vue").RendererElement,
-		{
     [key: string]: any;
-		}
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "fullscreen-change")[], "update:modelValue" | "fullscreen-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	>,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("update:modelValue" | "fullscreen-change")[],
-	"update:modelValue" | "fullscreen-change",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     modelValue: {
         type: BooleanConstructor;
         default: boolean;
@@ -78,13 +62,10 @@ declare const _default: import("vue").DefineComponent<
         type: BooleanConstructor;
         default: boolean;
     };
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onFullscreen-change"?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     title: string;
     padding: string;
     width: string;
@@ -94,87 +75,9 @@ declare const _default: import("vue").DefineComponent<
     fullscreen: boolean;
     modelValue: boolean;
     scrollbar: boolean;
-	},
+}, {}, {
-	{},
+    Close: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{
+    FullScreen: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-		Close: import("vue").DefineComponent<
+    Minus: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-			{},
+}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-		FullScreen: import("vue").DefineComponent<
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-		Minus: import("vue").DefineComponent<
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-	},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/error-message/index.d.ts

@@ -1,30 +1,6 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     title: StringConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     title: StringConstructor;
-		}>
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	> &
-		Readonly<{}>,
-	{},
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/filter/index.d.ts

@@ -1,30 +1,6 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     label: StringConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     label: StringConstructor;
-		}>
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	> &
-		Readonly<{}>,
-	{},
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/flex1/index.d.ts

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

packages/crud/types/components/form-card/index.d.ts

@@ -1,5 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     label: StringConstructor;
     expand: {
         type: BooleanConstructor;
@@ -9,18 +8,7 @@ declare const _default: import("vue").DefineComponent<
         type: BooleanConstructor;
         default: boolean;
     };
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     label: StringConstructor;
     expand: {
         type: BooleanConstructor;
@@ -30,69 +18,11 @@ declare const _default: import("vue").DefineComponent<
         type: BooleanConstructor;
         default: boolean;
     };
-		}>
+}>> & Readonly<{}>, {
-	> &
-		Readonly<{}>,
-	{
     expand: boolean;
     isExpand: boolean;
-	},
+}, {}, {
-	{},
+    ArrowDown: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{
+    ArrowUp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-		ArrowDown: import("vue").DefineComponent<
+}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-		ArrowUp: import("vue").DefineComponent<
-			{},
-			{},
-			{},
-			{},
-			{},
-			import("vue").ComponentOptionsMixin,
-			import("vue").ComponentOptionsMixin,
-			{},
-			string,
-			import("vue").VNodeProps &
-				import("vue").AllowedComponentProps &
-				import("vue").ComponentCustomProps,
-			Readonly<import("vue").ExtractPropTypes<{}>>,
-			{},
-			{},
-			{},
-			{},
-			string,
-			import("vue").ComponentProvideOptions,
-			true,
-			{},
-			any
-		>;
-	},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/form-tabs/index.d.ts

@@ -1,66 +1,38 @@
 import { PropType } from "vue";
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     modelValue: (NumberConstructor | StringConstructor)[];
     labels: {
         type: ArrayConstructor;
         default: () => never[];
     };
     justify: {
-			type: PropType<
+        type: PropType<"center" | "justify" | "left" | "right" | "start" | "end" | "match-parent">;
-				"center" | "justify" | "left" | "right" | "start" | "end" | "match-parent"
-			>;
         default: string;
     };
     type: {
         type: PropType<"default" | "card">;
         default: string;
     };
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue")[], "change" | "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("change" | "update:modelValue")[],
-	"change" | "update:modelValue",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     modelValue: (NumberConstructor | StringConstructor)[];
     labels: {
         type: ArrayConstructor;
         default: () => never[];
     };
     justify: {
-				type: PropType<
+        type: PropType<"center" | "justify" | "left" | "right" | "start" | "end" | "match-parent">;
-					"center" | "justify" | "left" | "right" | "start" | "end" | "match-parent"
-				>;
         default: string;
     };
     type: {
         type: PropType<"default" | "card">;
         default: string;
     };
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     type: "default" | "card";
     labels: unknown[];
     justify: "center" | "justify" | "left" | "right" | "start" | "end" | "match-parent";
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/form/helper/action.d.ts

@@ -1,9 +1,5 @@
 /// <reference types="../index" />
-export declare function useAction({
+export declare function useAction({ config, form, Form }: {
-	config,
-	form,
-	Form
-}: {
     config: ClForm.Config;
     form: obj;
     Form: Vue.Ref<any>;

packages/crud/types/components/form/helper/api.d.ts

@@ -1,2 +1,4 @@
 /// <reference types="../index" />
-export declare function useApi({ Form }: { Form: Vue.Ref<any> }): obj;
+export declare function useApi({ Form }: {
+    Form: Vue.Ref<any>;
+}): obj;

packages/crud/types/components/form/helper/index.d.ts

@@ -24,19 +24,16 @@ export declare function useForm(): {
             [x: string]: any;
             type?: "tabs" | undefined;
             prop?: (string & {}) | undefined;
-			props?:
+            props?: {
-				| {
                 [x: string]: any;
-						labels?:
+                labels?: {
-							| {
                     [x: string]: any;
                     label: string;
                     value: string;
                     name?: string | undefined;
                     icon?: any;
                     lazy?: boolean | undefined;
-							  }[]
+                }[] | undefined;
-							| undefined;
                 justify?: "center" | "left" | "right" | undefined;
                 color?: string | undefined;
                 mergeProp?: boolean | undefined;
@@ -45,11 +42,9 @@ export declare function useForm(): {
                 showMessage?: boolean | undefined;
                 inlineMessage?: boolean | undefined;
                 size?: "default" | "small" | "medium" | undefined;
-				  }
+            } | undefined;
-				| undefined;
             span?: number | undefined;
-			col?:
+            col?: {
-				| {
                 span: number;
                 offset: number;
                 push: number;
@@ -60,35 +55,30 @@ export declare function useForm(): {
                 lg: any;
                 xl: any;
                 tag: string;
-				  }
+            } | undefined;
-				| undefined;
             group?: string | undefined;
             collapse?: boolean | undefined;
             value?: any;
             label?: string | undefined;
             renderLabel?: any;
             flex?: boolean | undefined;
-			hook?:
+            hook?: ClForm.HookKey | {
-				| ClForm.HookKey
-				| {
                 bind?: ClForm.HookPipe | ClForm.HookPipe[] | undefined;
                 submit?: ClForm.HookPipe | ClForm.HookPipe[] | undefined;
-				  }
+            } | undefined;
-				| undefined;
+            hidden?: boolean | ((options: {
-			hidden?: boolean | ((options: { scope: obj }) => boolean) | undefined;
+                scope: obj;
-			prepend?:
+            }) => boolean) | undefined;
-				| {
+            prepend?: {
                 [x: string]: any;
                 name?: string | undefined;
-						options?:
+                options?: {
-							| {
                     [x: string]: any;
                     label?: string | undefined;
                     value?: any;
                     color?: string | undefined;
                     type?: string | undefined;
-							  }[]
+                }[] | {
-							| {
                     value: {
                         [x: string]: any;
                         label?: string | undefined;
@@ -96,42 +86,32 @@ export declare function useForm(): {
                         color?: string | undefined;
                         type?: string | undefined;
                     }[];
-							  }
+                } | undefined;
-							| undefined;
+                props?: {
-						props?:
-							| {
                     [x: string]: any;
                     onChange?: ((value: any) => void) | undefined;
-							  }
+                } | {
-							| {
                     value: {
                         [x: string]: any;
                         onChange?: ((value: any) => void) | undefined;
                     };
-							  }
+                } | undefined;
-							| undefined;
                 style?: obj | undefined;
-						slots?:
+                slots?: {
-							| {
                     [key: string]: (data?: any) => any;
-							  }
+                } | undefined;
-							| undefined;
                 vm?: any;
-				  }
+            } | undefined;
-				| undefined;
+            component?: {
-			component?:
-				| {
                 [x: string]: any;
                 name?: string | undefined;
-						options?:
+                options?: {
-							| {
                     [x: string]: any;
                     label?: string | undefined;
                     value?: any;
                     color?: string | undefined;
                     type?: string | undefined;
-							  }[]
+                }[] | {
-							| {
                     value: {
                         [x: string]: any;
                         label?: string | undefined;
@@ -139,42 +119,32 @@ export declare function useForm(): {
                         color?: string | undefined;
                         type?: string | undefined;
                     }[];
-							  }
+                } | undefined;
-							| undefined;
+                props?: {
-						props?:
-							| {
                     [x: string]: any;
                     onChange?: ((value: any) => void) | undefined;
-							  }
+                } | {
-							| {
                     value: {
                         [x: string]: any;
                         onChange?: ((value: any) => void) | undefined;
                     };
-							  }
+                } | undefined;
-							| undefined;
                 style?: obj | undefined;
-						slots?:
+                slots?: {
-							| {
                     [key: string]: (data?: any) => any;
-							  }
+                } | undefined;
-							| undefined;
                 vm?: any;
-				  }
+            } | undefined;
-				| undefined;
+            append?: {
-			append?:
-				| {
                 [x: string]: any;
                 name?: string | undefined;
-						options?:
+                options?: {
-							| {
                     [x: string]: any;
                     label?: string | undefined;
                     value?: any;
                     color?: string | undefined;
                     type?: string | undefined;
-							  }[]
+                }[] | {
-							| {
                     value: {
                         [x: string]: any;
                         label?: string | undefined;
@@ -182,134 +152,69 @@ export declare function useForm(): {
                         color?: string | undefined;
                         type?: string | undefined;
                     }[];
-							  }
+                } | undefined;
-							| undefined;
+                props?: {
-						props?:
-							| {
                     [x: string]: any;
                     onChange?: ((value: any) => void) | undefined;
-							  }
+                } | {
-							| {
                     value: {
                         [x: string]: any;
                         onChange?: ((value: any) => void) | undefined;
                     };
-							  }
+                } | undefined;
-							| undefined;
                 style?: obj | undefined;
-						slots?:
+                slots?: {
-							| {
                     [key: string]: (data?: any) => any;
-							  }
+                } | undefined;
-							| undefined;
                 vm?: any;
-				  }
+            } | undefined;
-				| undefined;
+            rules?: {
-			rules?:
-				| {
                 [x: string]: any;
-						type?:
+                type?: "string" | "number" | "boolean" | "object" | "method" | "regexp" | "integer" | "float" | "array" | "enum" | "date" | "url" | "hex" | "email" | "any" | undefined;
-							| "string"
-							| "number"
-							| "boolean"
-							| "object"
-							| "method"
-							| "regexp"
-							| "integer"
-							| "float"
-							| "array"
-							| "enum"
-							| "date"
-							| "url"
-							| "hex"
-							| "email"
-							| "any"
-							| undefined;
                 required?: boolean | undefined;
                 message?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 trigger?: any;
-						validator?:
+                validator?: ((rule: any, value: any, callback: (error?: Error | undefined) => void) => void) | undefined;
-							| ((
+            } | {
-									rule: any,
-									value: any,
-									callback: (error?: Error | undefined) => void
-							  ) => void)
-							| undefined;
-				  }
-				| {
                 [x: string]: any;
-						type?:
+                type?: "string" | "number" | "boolean" | "object" | "method" | "regexp" | "integer" | "float" | "array" | "enum" | "date" | "url" | "hex" | "email" | "any" | undefined;
-							| "string"
-							| "number"
-							| "boolean"
-							| "object"
-							| "method"
-							| "regexp"
-							| "integer"
-							| "float"
-							| "array"
-							| "enum"
-							| "date"
-							| "url"
-							| "hex"
-							| "email"
-							| "any"
-							| undefined;
                 required?: boolean | undefined;
                 message?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 trigger?: any;
-						validator?:
+                validator?: ((rule: any, value: any, callback: (error?: Error | undefined) => void) => void) | undefined;
-							| ((
+            }[] | undefined;
-									rule: any,
-									value: any,
-									callback: (error?: Error | undefined) => void
-							  ) => void)
-							| undefined;
-				  }[]
-				| undefined;
             required?: boolean | undefined;
             children?: any[] | undefined;
         }[];
         form: obj;
         isReset?: boolean | undefined;
-		on?:
+        on?: {
-			| {
             open?: ((data: any) => void) | undefined;
             close?: ((action: ClForm.CloseAction, done: fn) => void) | undefined;
-					submit?:
+            submit?: ((data: any, event: {
-						| ((
-								data: any,
-								event: {
                 close: fn;
                 done: fn;
-								}
+            }) => void) | undefined;
-						  ) => void)
-						| undefined;
             change?: ((data: any, prop: string) => void) | undefined;
-			  }
+        } | undefined;
-			| undefined;
         op: {
             hidden?: boolean | undefined;
             saveButtonText?: string | undefined;
             closeButtonText?: string | undefined;
             justify?: "center" | "flex-start" | "flex-end" | undefined;
-			buttons?:
+            buttons?: (ClForm.CloseAction | `slot-${string}` | {
-				| (
-						| ClForm.CloseAction
-						| `slot-${string}`
-						| {
                 [x: string]: any;
                 label: string;
                 type?: string | undefined;
                 hidden?: boolean | undefined;
-								onClick: (options: { scope: obj }) => void;
+                onClick: (options: {
-						  }
+                    scope: obj;
-				  )[]
+                }) => void;
-				| undefined;
+            })[] | undefined;
         };
         dialog: {
             [x: string]: any;

packages/crud/types/components/form/helper/plugins.d.ts

@@ -1,13 +1,8 @@
 /// <reference types="../index" />
 import { Ref } from "vue";
-export declare function usePlugins(
+export declare function usePlugins(enable: boolean, { visible }: {
-	enable: boolean,
-	{
-		visible
-	}: {
     visible: Ref<boolean>;
-	}
+}): {
-): {
     create: (plugins?: ClForm.Plugin[]) => false | undefined;
     submit: (data: any) => Promise<any>;
 };

packages/crud/types/components/form/helper/tabs.d.ts

@@ -1,5 +1,8 @@
 /// <reference types="../index" />
-export declare function useTabs({ config, Form }: { config: ClForm.Config; Form: Vue.Ref<any> }): {
+export declare function useTabs({ config, Form }: {
+    config: ClForm.Config;
+    Form: Vue.Ref<any>;
+}): {
     active: import("vue").Ref<string | undefined, string | undefined>;
     list: import("vue").ComputedRef<ClFormTabs.labels>;
     isLoaded: (value: any) => any;
@@ -9,5 +12,9 @@ export declare function useTabs({ config, Form }: { config: ClForm.Config; Form:
     change: (value: any, isValid?: boolean) => Promise<unknown>;
     clear: () => void;
     mergeProp: (item: ClForm.Item) => void;
-	toGroup: (opts: { config: ClForm.Config; prop: string; refs: any }) => void;
+    toGroup: (opts: {
+        config: ClForm.Config;
+        prop: string;
+        refs: any;
+    }) => void;
 };

packages/crud/types/components/form/index.d.ts

@@ -1,44 +1,20 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     inner: BooleanConstructor;
     inline: BooleanConstructor;
     enablePlugin: {
         type: BooleanConstructor;
         default: boolean;
     };
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     inner: BooleanConstructor;
     inline: BooleanConstructor;
     enablePlugin: {
         type: BooleanConstructor;
         default: boolean;
     };
-		}>
+}>> & Readonly<{}>, {
-	> &
-		Readonly<{}>,
-	{
     inline: boolean;
     inner: boolean;
     enablePlugin: boolean;
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/multi-delete-btn/index.d.ts

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

packages/crud/types/components/pagination/index.d.ts

@@ -1,29 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<{}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-	{},
-	() => import("vue").VNode<
-		import("vue").RendererNode,
-		import("vue").RendererElement,
-		{
     [key: string]: any;
-		}
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	>,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	{},
-	string,
-	import("vue").PublicProps,
-	Readonly<{}> & Readonly<{}>,
-	{},
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/refresh-btn/index.d.ts

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

packages/crud/types/components/row/index.d.ts

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

packages/crud/types/components/search-key/index.d.ts

@@ -1,18 +1,15 @@
 import { type PropType } from "vue";
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     modelValue: StringConstructor;
     field: {
         type: StringConstructor;
         default: string;
     };
     fieldList: {
-			type: PropType<
+        type: PropType<{
-				{
             label: string;
             value: string;
-				}[]
+        }[]>;
-			>;
         default: () => never[];
     };
     onSearch: FunctionConstructor;
@@ -22,30 +19,17 @@ declare const _default: import("vue").DefineComponent<
         default: number;
     };
     refreshOnInput: BooleanConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue" | "field-change")[], "change" | "update:modelValue" | "field-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("change" | "update:modelValue" | "field-change")[],
-	"change" | "update:modelValue" | "field-change",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     modelValue: StringConstructor;
     field: {
         type: StringConstructor;
         default: string;
     };
     fieldList: {
-				type: PropType<
+        type: PropType<{
-					{
             label: string;
             value: string;
-					}[]
+        }[]>;
-				>;
         default: () => never[];
     };
     onSearch: FunctionConstructor;
@@ -55,14 +39,11 @@ declare const _default: import("vue").DefineComponent<
         default: number;
     };
     refreshOnInput: BooleanConstructor;
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onField-change"?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     width: string | number;
     refreshOnInput: boolean;
     field: string;
@@ -70,14 +51,5 @@ declare const _default: import("vue").DefineComponent<
         label: string;
         value: string;
     }[];
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/search/index.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="../index" />
 import { PropType } from "vue";
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     inline: {
         type: BooleanConstructor;
         default: boolean;
@@ -24,18 +23,7 @@ declare const _default: import("vue").DefineComponent<
     };
     onLoad: FunctionConstructor;
     onSearch: FunctionConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "reset"[], "reset", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	"reset"[],
-	"reset",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     inline: {
         type: BooleanConstructor;
         default: boolean;
@@ -58,25 +46,13 @@ declare const _default: import("vue").DefineComponent<
     };
     onLoad: FunctionConstructor;
     onSearch: FunctionConstructor;
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     onReset?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     items: ClForm.Item<any>[];
     props: Record<string, any>;
     inline: boolean;
     data: Record<string, any>;
     resetBtn: boolean;
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/table/helper/data.d.ts

@@ -1,8 +1,5 @@
 /// <reference types="../index" />
-export declare function useData({
+export declare function useData({ config, Table }: {
-	config,
-	Table
-}: {
     config: ClTable.Config;
     Table: Vue.Ref<any>;
 }): {

packages/crud/types/components/table/helper/height.d.ts

@@ -1,8 +1,5 @@
 /// <reference types="../index" />
-export declare function useHeight({
+export declare function useHeight({ config, Table }: {
-	config,
-	Table
-}: {
     Table: Vue.Ref<any>;
     config: ClTable.Config;
 }): {

packages/crud/types/components/table/helper/index.d.ts

@@ -5,23 +5,19 @@ export declare function useTable(props: any): {
         columns: {
             [x: string]: any;
             type: ClTable.ColumnType;
-			hidden:
+            hidden: boolean | {
-				| boolean
-				| {
                 value: boolean;
             };
             component: {
                 [x: string]: any;
                 name?: string | undefined;
-				options?:
+                options?: {
-					| {
                     [x: string]: any;
                     label?: string | undefined;
                     value?: any;
                     color?: string | undefined;
                     type?: string | undefined;
-					  }[]
+                }[] | {
-					| {
                     value: {
                         [x: string]: any;
                         label?: string | undefined;
@@ -29,46 +25,36 @@ export declare function useTable(props: any): {
                         color?: string | undefined;
                         type?: string | undefined;
                     }[];
-					  }
+                } | undefined;
-					| undefined;
+                props?: {
-				props?:
-					| {
                     [x: string]: any;
                     onChange?: ((value: any) => void) | undefined;
-					  }
+                } | {
-					| {
                     value: {
                         [x: string]: any;
                         onChange?: ((value: any) => void) | undefined;
                     };
-					  }
+                } | undefined;
-					| undefined;
                 style?: obj | undefined;
-				slots?:
+                slots?: {
-					| {
                     [key: string]: (data?: any) => any;
-					  }
+                } | undefined;
-					| undefined;
                 vm?: any;
             };
             search: {
                 isInput: boolean;
                 value: any;
-				refreshOnChange: {
+                refreshOnChange: boolean;
-					valueOf: () => boolean;
-				};
                 component: {
                     [x: string]: any;
                     name?: string | undefined;
-					options?:
+                    options?: {
-						| {
                         [x: string]: any;
                         label?: string | undefined;
                         value?: any;
                         color?: string | undefined;
                         type?: string | undefined;
-						  }[]
+                    }[] | {
-						| {
                         value: {
                             [x: string]: any;
                             label?: string | undefined;
@@ -76,38 +62,30 @@ export declare function useTable(props: any): {
                             color?: string | undefined;
                             type?: string | undefined;
                         }[];
-						  }
+                    } | undefined;
-						| undefined;
+                    props?: {
-					props?:
-						| {
                         [x: string]: any;
                         onChange?: ((value: any) => void) | undefined;
-						  }
+                    } | {
-						| {
                         value: {
                             [x: string]: any;
                             onChange?: ((value: any) => void) | undefined;
                         };
-						  }
+                    } | undefined;
-						| undefined;
                     style?: obj | undefined;
-					slots?:
+                    slots?: {
-						| {
                         [key: string]: (data?: any) => any;
-						  }
+                    } | undefined;
-						| undefined;
                     vm?: any;
                 };
             };
-			dict:
+            dict: {
-				| {
                 [x: string]: any;
                 label?: string | undefined;
                 value?: any;
                 color?: string | undefined;
                 type?: string | undefined;
-				  }[]
+            }[] | {
-				| {
                 value: {
                     [x: string]: any;
                     label?: string | undefined;
@@ -120,22 +98,17 @@ export declare function useTable(props: any): {
             dictColor: boolean;
             dictSeparator: string;
             dictAllLevels: boolean;
-			buttons:
+            buttons: ((options: {
-				| ((options: { scope: any }) => ClTable.OpButton)
+                scope: any;
-				| (
+            }) => ClTable.OpButton) | ("info" | "delete" | "edit" | AnyString | `slot-${string}` | {
-						| "info"
-						| "delete"
-						| "edit"
-						| AnyString
-						| `slot-${string}`
-						| {
                 [x: string]: any;
                 label: string;
                 type?: string | undefined;
                 hidden?: boolean | undefined;
-								onClick: (options: { scope: obj }) => void;
+                onClick: (options: {
-						  }
+                    scope: obj;
-				  )[];
+                }) => void;
+            })[];
             align: ElementPlus.Align;
             label: any;
             className: string;
@@ -143,7 +116,10 @@ export declare function useTable(props: any): {
             orderNum: number;
             width: number;
             minWidth: string | number;
-			renderHeader: (options: { column: any; $index: number }) => any;
+            renderHeader: (options: {
+                column: any;
+                $index: number;
+            }) => any;
             sortable: boolean | "asc" | "desc" | "custom" | "descending" | "ascending";
             sortMethod: fn;
             sortBy: string | any[] | ((row: any, index: number) => any);
@@ -166,13 +142,7 @@ export declare function useTable(props: any): {
         }[];
         autoHeight: boolean;
         height: any;
-		contextMenu: (
+        contextMenu: ("info" | "update" | "delete" | "edit" | "refresh" | {
-			| "info"
-			| "update"
-			| "delete"
-			| "edit"
-			| "refresh"
-			| {
             [x: string]: any;
             label: string;
             prefixIcon?: any;
@@ -183,12 +153,7 @@ export declare function useTable(props: any): {
             children?: any[] | undefined;
             showChildren?: boolean | undefined;
             callback?: ((done: fn) => void) | undefined;
-			  }
+        } | ((row: obj, column: obj, event: PointerEvent) => ClContextMenu.Item) | "check" | "order-desc" | "order-asc")[];
-			| ((row: obj, column: obj, event: PointerEvent) => ClContextMenu.Item)
-			| "check"
-			| "order-desc"
-			| "order-asc"
-		)[];
         defaultSort: {
             prop: string;
             order: "descending" | "ascending";

packages/crud/types/components/table/helper/op.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="../index" />
-export declare function useOp({ config }: { config: ClTable.Config }): {
+export declare function useOp({ config }: {
+    config: ClTable.Config;
+}): {
     visible: import("vue").Ref<boolean, boolean>;
     reBuild: (cb?: fn) => Promise<void>;
     showColumn: (prop: string | string[], status?: boolean) => void;

packages/crud/types/components/table/helper/render.d.ts

@@ -1,15 +1,8 @@
 /// <reference types="../index" />
 export declare function useRender(): {
-	renderColumn: (columns: ClTable.Column[]) => (
+    renderColumn: (columns: ClTable.Column[]) => (import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-		| import("vue").VNode<
-				import("vue").RendererNode,
-				import("vue").RendererElement,
-				{
         [key: string]: any;
-				}
+    }> | null)[];
-		  >
-		| null
-	)[];
     renderEmpty: (emptyText: string) => any;
     renderAppend: () => any;
 };

packages/crud/types/components/table/helper/row.d.ts

@@ -1,9 +1,5 @@
 /// <reference types="../index" />
-export declare function useRow({
+export declare function useRow({ Table, config, Sort }: {
-	Table,
-	config,
-	Sort
-}: {
     Table: Vue.Ref<any>;
     config: ClTable.Config;
     Sort: {

packages/crud/types/components/table/helper/selection.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="../index" />
-export declare function useSelection({ emit }: { emit: Vue.Emit }): {
+export declare function useSelection({ emit }: {
+    emit: Vue.Emit;
+}): {
     selection: obj[];
     onSelectionChange: (selection: any[]) => void;
 };

packages/crud/types/components/table/helper/sort.d.ts

@@ -1,22 +1,19 @@
 /// <reference types="../index" />
-export declare function useSort({
+export declare function useSort({ config, Table, emit }: {
-	config,
-	Table,
-	emit
-}: {
     config: ClTable.Config;
     Table: Vue.Ref<any>;
     emit: Vue.Emit;
 }): {
-	defaultSort:
+    defaultSort: {
-		| {
         prop: string;
         order: "descending" | "ascending";
-		  }
+    } | {
-		| {
         prop?: undefined;
         order?: undefined;
     };
-	onSortChange: ({ prop, order }: { prop: string | undefined; order: string }) => void;
+    onSortChange: ({ prop, order }: {
+        prop: string | undefined;
+        order: string;
+    }) => void;
     changeSort: (prop: string, order: string) => void;
 };

packages/crud/types/components/table/index.d.ts

@@ -1,5 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     columns: {
         type: ArrayConstructor;
         default: () => never[];
@@ -23,26 +22,9 @@ declare const _default: import("vue").DefineComponent<
         type: StringConstructor;
         default: string;
     };
-	}>,
+}>, () => false | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-	() =>
-		| false
-		| import("vue").VNode<
-				import("vue").RendererNode,
-				import("vue").RendererElement,
-				{
     [key: string]: any;
-				}
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("selection-change" | "sort-change")[], "selection-change" | "sort-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-		  >,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("selection-change" | "sort-change")[],
-	"selection-change" | "sort-change",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     columns: {
         type: ArrayConstructor;
         default: () => never[];
@@ -66,26 +48,14 @@ declare const _default: import("vue").DefineComponent<
         type: StringConstructor;
         default: string;
     };
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     "onSelection-change"?: ((...args: any[]) => any) | undefined;
     "onSort-change"?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     columns: unknown[];
     autoHeight: boolean;
     contextMenu: boolean | unknown[];
     sortRefresh: boolean;
     rowKey: string;
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/components/upsert/index.d.ts

@@ -1,5 +1,4 @@
-declare const _default: import("vue").DefineComponent<
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-	import("vue").ExtractPropTypes<{
     items: {
         type: ArrayConstructor;
         default: () => never[];
@@ -14,18 +13,7 @@ declare const _default: import("vue").DefineComponent<
     onClosed: FunctionConstructor;
     onInfo: FunctionConstructor;
     onSubmit: FunctionConstructor;
-	}>,
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("opened" | "closed")[], "opened" | "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-	() => any,
-	{},
-	{},
-	{},
-	import("vue").ComponentOptionsMixin,
-	import("vue").ComponentOptionsMixin,
-	("opened" | "closed")[],
-	"opened" | "closed",
-	import("vue").PublicProps,
-	Readonly<
-		import("vue").ExtractPropTypes<{
     items: {
         type: ArrayConstructor;
         default: () => never[];
@@ -40,23 +28,11 @@ declare const _default: import("vue").DefineComponent<
     onClosed: FunctionConstructor;
     onInfo: FunctionConstructor;
     onSubmit: FunctionConstructor;
-		}>
+}>> & Readonly<{
-	> &
-		Readonly<{
     onOpened?: ((...args: any[]) => any) | undefined;
     onClosed?: ((...args: any[]) => any) | undefined;
-		}>,
+}>, {
-	{
     sync: boolean;
     items: unknown[];
-	},
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-	{},
-	{},
-	{},
-	string,
-	import("vue").ComponentProvideOptions,
-	true,
-	{},
-	any
->;
 export default _default;

packages/crud/types/hooks/crud.d.ts

@@ -1,24 +1,11 @@
 /// <reference types="../index" />
 import { Ref } from "vue";
-export declare function useCrud(
+export declare function useCrud(options?: ClCrud.Options, cb?: (app: ClCrud.Ref) => void): Ref<ClCrud.Ref | undefined, ClCrud.Ref | undefined>;
-	options?: ClCrud.Options,
+export declare function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.Ref<any> | undefined, ClUpsert.Ref<any> | undefined>;
-	cb?: (app: ClCrud.Ref) => void
+export declare function useTable<T = any>(options?: ClTable.Options<T>): Ref<ClTable.Ref<T> | undefined, ClTable.Ref<T> | undefined>;
-): Ref<ClCrud.Ref | undefined, ClCrud.Ref | undefined>;
+export declare function useForm<T = any>(cb?: (app: ClForm.Ref<T>) => void): Ref<ClForm.Ref<T> | undefined, ClForm.Ref<T> | undefined>;
-export declare function useUpsert<T = any>(
+export declare function useAdvSearch<T = any>(options?: ClAdvSearch.Options<T>): Ref<ClAdvSearch.Ref<T> | undefined, ClAdvSearch.Ref<T> | undefined>;
-	options?: ClUpsert.Options<T>
+export declare function useSearch<T = any>(options?: ClSearch.Options<T>): Ref<ClSearch.Ref<T> | undefined, ClSearch.Ref<T> | undefined>;
-): Ref<ClUpsert.Ref<any> | undefined, ClUpsert.Ref<any> | undefined>;
-export declare function useTable<T = any>(
-	options?: ClTable.Options<T>
-): Ref<ClTable.Ref<T> | undefined, ClTable.Ref<T> | undefined>;
-export declare function useForm<T = any>(
-	cb?: (app: ClForm.Ref<T>) => void
-): Ref<ClForm.Ref<T> | undefined, ClForm.Ref<T> | undefined>;
-export declare function useAdvSearch<T = any>(
-	options?: ClAdvSearch.Options<T>
-): Ref<ClAdvSearch.Ref<T> | undefined, ClAdvSearch.Ref<T> | undefined>;
-export declare function useSearch<T = any>(
-	options?: ClSearch.Options<T>
-): Ref<ClSearch.Ref<T> | undefined, ClSearch.Ref<T> | undefined>;
 export declare function useDialog(options?: {
     onFullscreen(visible: boolean): void;
 }): ClDialog.Provide;

packages/crud/types/index.d.ts

@@ -2,10 +2,7 @@
 import type { App } from "vue";
 import "./static/index.scss";
 declare const Crud: {
-	install(
+    install(app: App, options?: Options): {
-		app: App,
-		options?: Options
-	): {
         name: string;
     };
 };

packages/crud/types/test/service.d.ts

@@ -1,9 +1,13 @@
 declare class TestService {
     page(params: any): Promise<unknown>;
-	update(params: { id: any; [key: string]: any }): Promise<void>;
+    update(params: {
+        id: any;
+        [key: string]: any;
+    }): Promise<void>;
     add(params: any): Promise<string>;
-	info(params: { id: any }): Promise<
+    info(params: {
-		| {
+        id: any;
+    }): Promise<{
         id: number;
         name: string;
         createTime: string;
@@ -12,12 +16,11 @@ declare class TestService {
         account: string;
         occupation: number;
         phone: number;
-		  }
+    } | undefined>;
-		| undefined
+    delete(params: {
-	>;
+        ids: any[];
-	delete(params: { ids: any[] }): Promise<void>;
+    }): Promise<void>;
-	list(): Promise<
+    list(): Promise<{
-		{
         id: number;
         name: string;
         createTime: string;
@@ -26,7 +29,6 @@ declare class TestService {
         account: string;
         occupation: number;
         phone: number;
-		}[]
+    }[]>;
-	>;
 }
 export { TestService };

packages/crud/types/utils/index.d.ts

@@ -7,11 +7,7 @@ export declare function merge(d1: any, d2: any): any;
 export declare function addClass(el: Element, name: string): void;
 export declare function removeClass(el: Element, name: string): void;
 export declare function getValue(data: any, params?: any): any;
-export declare function deepFind(
+export declare function deepFind(value: any, list: any[], options?: {
-	value: any,
-	list: any[],
-	options?: {
     allLevels: boolean;
-	}
+}): any;
-): any;
 export declare function uuid(separator?: string): string;

packages/crud/types/utils/parse.d.ts

@@ -6,18 +6,9 @@ export declare function parseFormHidden(value: any, { scope }: any): any;
 /**
  * 解析 table.dict
  */
-export declare function parseTableDict(
+export declare function parseTableDict(value: any, item: ClTable.Column): string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-	value: any,
-	item: ClTable.Column
-):
-	| string
-	| import("vue").VNode<
-			import("vue").RendererNode,
-			import("vue").RendererElement,
-			{
     [key: string]: any;
-			}
+}>[];
-	  >[];
 /**
  * 解析 table.op.buttons
  */
@@ -25,10 +16,8 @@ export declare function parseTableOpButtons(buttons: any[], { scope }: any): any
 /**
  * 解析扩展组件
  */
-export declare function parseExtensionComponent(vnode: any):
+export declare function parseExtensionComponent(vnode: any): {
-	| {
     children: any;
-	  }
+} | {
-	| {
     children?: undefined;
-	  };
+};

src/modules/base/components/icon/svg.vue

@@ -20,7 +20,8 @@ export default defineComponent({
 
 	setup(props) {
 		const style = reactive({
-			fontSize: parsePx(props.size!)
+			fontSize: parsePx(props.size!),
+			fill: props.color
 		});
 
 		const iconName = computed(() => `#icon-${props.name}`);

src/modules/base/components/image/index.vue

@@ -6,7 +6,7 @@
 		}"
 	>
 		<el-image
-			:src="urls[0]"
+			:src="url"
 			:fit="fit"
 			:lazy="lazy"
 			:preview-src-list="urls"
@@ -49,7 +49,8 @@ export default defineComponent({
 		fit: {
 			type: String as PropType<'' | 'contain' | 'cover' | 'none' | 'fill' | 'scale-down'>,
 			default: 'cover'
-		}
+		},
+		compress: String as PropType<'oss' | 'none'>
 	},
 
 	setup(props) {
@@ -76,7 +77,20 @@ export default defineComponent({
 			};
 		});
 
+		const url = computed(() => {
+			const v = urls.value[0];
+
+			if (props.compress == 'oss') {
+				return (
+					v + `?x-oss-process=image/resize,m_fill,h_${style.value.h},w_${style.value.w}`
+				);
+			}
+
+			return v;
+		});
+
 		return {
+			url,
 			urls,
 			style
 		};

src/modules/helper/views/ai-code.vue

@@ -168,7 +168,7 @@
 				</div>
 
 				<div class="btns">
-					<el-button class="btn-primary" @click="code.create()">
+					<el-button class="btn-primary" @click="code.create(true)">
 						生成代码
 						<cl-svg name="code" />
 					</el-button>
@@ -204,11 +204,17 @@
 									}
 								"
 							>
-								{{ item.label }}
+								<span>{{ item.label }}</span>
+								<el-switch
+									class="lock"
+									size="small"
+									v-model="code.lock[item.value]"
+									v-if="item.value != 'vue' && !code.loading"
+								/>
 							</div>
 
 							<div v-if="!isEmpty(code.list) && !code.loading" class="op">
-								<el-tooltip v-if="code.active == 'vue'" content="重新生成">
+								<el-tooltip content="重新生成">
 									<el-icon @click="code.refresh()">
 										<refresh />
 									</el-icon>
@@ -287,7 +293,7 @@ import {
 	QuestionFilled,
 	Refresh
 } from '@element-plus/icons-vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus';
 import { assign, isEmpty } from 'lodash-es';
 import { useMenu, useAi } from '../hooks';
 import { config, isDev } from '/@/config';
@@ -379,7 +385,7 @@ const lang = reactive({
 		code.active = lang.value.toLocaleLowerCase() + '-entity';
 	},
 
-	tpl() {
+	get tpl() {
 		const d = {
 			Node: 'typescript',
 			Java: 'java',
@@ -398,6 +404,9 @@ const code = reactive({
 	// 代码列表
 	list: [] as CodeItem[],
 
+	// 代码锁
+	lock: {} as { [key: string]: boolean },
+
 	// 其他数据
 	data: {
 		router: '',
@@ -460,7 +469,6 @@ const code = reactive({
 	clear() {
 		code.list = [];
 		code.logs = [];
-		code.req = null;
 		code.loading = false;
 	},
 
@@ -482,12 +490,10 @@ const code = reactive({
 
 	// 生成 Node
 	async createNode() {
-		code.tips('Entity 代码生成中');
-
 		// entity 代码
 		const entity = await code.setContent('Entity 实体', 'node-entity');
 
-		code.tips('Entity 生成成功，开始解析');
+		code.tips('Entity 开始解析');
 
 		// entity 关键数据
 		const entityData = await ai.invokeFlow('comm-parse-entity', {
@@ -504,15 +510,13 @@ const code = reactive({
 		// 解析字段
 		code.parseColumn();
 
-		code.tips('Service 代码生成中');
-
 		// service 代码
 		const service = await code.setContent('Service 服务', 'node-service', {
 			...entityData,
 			entity
 		});
 
-		code.tips('Service 生成成功，开始解析');
+		code.tips('Service 开始解析');
 
 		// service 关键数据
 		const serviceData = await ai.invokeFlow('comm-parse-service', {
@@ -521,8 +525,6 @@ const code = reactive({
 
 		code.tips(`Service 解析成功，${JSON.stringify(serviceData)}`);
 
-		code.tips('Controller 代码生成中');
-
 		// controller 代码
 		const controller = await code.setContent('Controller 控制器', 'node-controller', {
 			...serviceData,
@@ -531,7 +533,7 @@ const code = reactive({
 			entity
 		});
 
-		code.tips('Controller 生成成功，开始解析');
+		code.tips('Controller 开始解析');
 
 		// controller 关键数据
 		const controllerData = await ai.invokeFlow('comm-parse-controller', {
@@ -547,12 +549,10 @@ const code = reactive({
 
 	// 生成 Java
 	async createJava() {
-		code.tips('Entity 代码生成中');
-
 		// entity 代码
 		const entity = await code.setContent('Entity 实体', 'java-entity');
 
-		code.tips('Entity 生成成功，开始解析');
+		code.tips('Entity 开始解析');
 
 		// entity 关键数据
 		const entityData = await ai.invokeFlow('comm-parse-entity', {
@@ -569,51 +569,41 @@ const code = reactive({
 		// 解析字段
 		code.parseColumn();
 
-		code.tips('Mapper 代码生成中');
-
 		// mapper 代码
 		await code.setContent('Mapper 映射', 'java-mapper', {
 			...entityData,
 			entity
 		});
 
-		code.tips('Mapper 生成成功');
-
-		code.tips('Service 代码生成中');
-
 		// service 接口类
-		const _service = await code.setContent('Service 接口类', 'java-service', {
+		const serviceInterface = await code.setContent('Service 接口类', 'java-service', {
 			...entityData,
 			entity
 		});
 
 		// service 实现类
-		const service = await code.setContent('Service 实现类', 'java-service-impl', {
+		const serviceImpl = await code.setContent('Service 实现类', 'java-service-impl', {
 			...entityData,
 			entity,
-			service: _service
+			service: serviceInterface
 		});
 
-		code.tips('Service 生成成功，开始解析');
-
 		// service 关键数据
 		const serviceData = await ai.invokeFlow('comm-parse-service', {
-			service
+			service: serviceImpl
 		});
 
 		code.tips(`Service 解析成功，${JSON.stringify(serviceData)}`);
 
-		code.tips('Controller 代码生成中');
-
 		// controller 代码
 		const controller = await code.setContent('Controller 控制器', 'java-controller', {
 			...serviceData,
 			...entityData,
-			service,
+			service: serviceImpl,
 			entity
 		});
 
-		code.tips('Controller 生成成功，开始解析');
+		code.tips('Controller 开始解析');
 
 		// controller 关键数据
 		const controllerData = await ai.invokeFlow('comm-parse-controller', {
@@ -627,7 +617,7 @@ const code = reactive({
 	},
 
 	// 生成代码
-	async create() {
+	async create(isNew?: boolean) {
 		if (!form.entity) {
 			return ElMessage.warning('请填写实体名称');
 		}
@@ -640,19 +630,21 @@ const code = reactive({
 			return ElMessage.warning('请填写字段');
 		}
 
-		code.loading = true;
+		if (isNew) {
-
 			// 清空
 			code.clear();
 
 			// 下一步
 			step.next();
+		}
+
+		code.loading = true;
+		code.req = null;
 
 		code.tips('AI 开始编码');
 
 		await sleep(300);
 
-		// @ts-ignore
 		await code[`create${lang.value}`]();
 
 		await code.createVue();
@@ -779,16 +771,24 @@ const code = reactive({
 	},
 
 	// 设置内容
-	async setContent(label: string, flow: string, data?: any) {
+	async setContent(label: string, flow: string, data?: any): Promise<string> {
 		return new Promise(resolve => {
 			const item = code.add(label, flow);
 
+			// 锁住不生成
+			if (code.lock[flow]) {
+				resolve(item.content);
+				return;
+			}
+
 			// 是否结束
 			let isEnd = false;
 
 			// 所有内容
 			let content = '';
 
+			code.tips(`${label}生成中`);
+
 			ai.invokeFlow(flow, { ...form, ...data }, res => {
 				isEnd = res.isEnd;
 
@@ -815,7 +815,8 @@ const code = reactive({
 					if (!v) {
 						clearInterval(timer);
 						resolve(item.content);
-						return false;
+						code.tips(`${label}生成成功`);
+						return;
 					}
 				}
 
@@ -841,11 +842,16 @@ const code = reactive({
 	},
 
 	// 重新生成
-	async refresh() {
+	refresh() {
-		code.loading = true;
+		// 清空没有锁的代码
-		code.req = null;
+		code.list.forEach(e => {
-		await code.createVue();
+			if (!code.lock[e.value]) {
-		code.loading = false;
+				e.content = '';
+			}
+		});
+
+		// 重新创建
+		code.create();
 	}
 });
 
@@ -1095,6 +1101,13 @@ onMounted(() => {
 			assign(form, storage.get('ai-code.form'));
 		}
 	}
+
+	// 新功能提示
+	ElNotification({
+		title: '新功能提示',
+		message: '支持自定义修改内容，开启后跳过生成',
+		duration: 5000
+	});
 });
 </script>
 
@@ -1556,8 +1569,17 @@ $color: #41d1ff;
 						cursor: pointer;
 						color: var(--el-color-info);
 
+						& > span {
+							line-height: 1;
+							user-select: none;
+						}
+
+						.lock {
+							margin-left: 10px;
+						}
+
 						&.active {
-							background-color: #0f151e;
+							background-color: #1d1f24;
 							color: #fff;
 						}
 
@@ -1581,7 +1603,7 @@ $color: #41d1ff;
 							border-radius: 5px;
 
 							&:hover {
-								background-color: #0f151e;
+								background-color: #1d1f24;
 							}
 						}
 					}