From 428f77220cf4ba7df867b5e8f6787be49c7d4a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E4=BB=99=E9=83=BD=E6=B2=A1=E7=94=A8?=
 <615206459@qq.com>
Date: Mon, 15 Jan 2024 13:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8Ccrud=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20prop=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 packages/crud/index.d.ts                      |  7 +-
 packages/crud/package.json                    |  2 +-
 packages/crud/src/App.vue                     | 76 +++++++------------
 .../src/components/table/helper/header.tsx    | 11 ++-
 packages/crud/src/hooks/crud.ts               | 10 +--
 .../types/components/form/helper/index.d.ts   | 10 +--
 .../types/components/table/helper/index.d.ts  |  3 +
 packages/crud/types/hooks/crud.d.ts           |  2 +-
 src/config/proxy.ts                           |  3 +-
 src/modules/demo/components/form-btn.vue      |  7 +-
 src/modules/demo/views/crud.vue               | 53 +++++++++----
 yarn.lock                                     |  8 +-
 13 files changed, 102 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 8ee0ea6..ce2925d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 		"lint:eslint": "eslint \"./src/**/*.{vue,ts,tsx}\" --fix"
 	},
 	"dependencies": {
-		"@cool-vue/crud": "^7.1.0",
+		"@cool-vue/crud": "^7.1.3",
 		"@element-plus/icons-vue": "^2.1.0",
 		"@vueuse/core": "^10.4.0",
 		"@wangeditor/editor": "^5.1.23",
diff --git a/packages/crud/index.d.ts b/packages/crud/index.d.ts
index df3b09e..27e69f7 100644
--- a/packages/crud/index.d.ts
+++ b/packages/crud/index.d.ts
@@ -40,8 +40,8 @@ declare type obj = {
 declare type DeepPartial<T> = T extends Function
 	? T
 	: T extends object
-	? { [P in keyof T]?: DeepPartial<T[P]> }
-	: T;
+	  ? { [P in keyof T]?: DeepPartial<T[P]> }
+	  : T;
 
 // 合并
 declare type Merge<A, B> = Omit<A, keyof B> & B;
@@ -333,6 +333,7 @@ declare namespace ClTable {
 		search: {
 			isInput: boolean;
 			value: any;
+			refreshOnChange: Boolean;
 			component: Render.Component;
 		};
 		dict: DictOptions | Vue.Ref<DictOptions>;
@@ -626,7 +627,7 @@ declare namespace ClUpsert {
 		mode: "add" | "update" | "info";
 	}
 
-	interface Options<T> extends DeepPartial<Config> {
+	interface Options<T = any> extends DeepPartial<Config<T>> {
 		items?: ClForm.Items<T>;
 	}
 }
diff --git a/packages/crud/package.json b/packages/crud/package.json
index 293f79e..7e9970d 100644
--- a/packages/crud/package.json
+++ b/packages/crud/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@cool-vue/crud",
-	"version": "7.1.0",
+	"version": "7.1.3",
 	"private": false,
 	"main": "./dist/index.umd.min.js",
 	"typings": "types/index.d.ts",
diff --git a/packages/crud/src/App.vue b/packages/crud/src/App.vue
index 40c51f1..c3b32a0 100644
--- a/packages/crud/src/App.vue
+++ b/packages/crud/src/App.vue
@@ -1,69 +1,23 @@
 <template>
 	<div>
-		<div>CRUD v7.0.0</div>
+		<div>CRUD DEMO v7.0.0</div>
 
 		<cl-crud>
 			<cl-add-btn />
-
 			<cl-upsert ref="Upsert"></cl-upsert>
 		</cl-crud>
 	</div>
 </template>
 
-<script setup lang="ts">
-import { ref } from "vue";
+<script setup lang="tsx">
 import { useTable, useForm, useSearch, useUpsert, useAdvSearch } from "./hooks";
-// Test
 
 interface Data {
 	name?: string;
 	age?: number;
-	formatter?(): string;
 	[key: string]: any;
 }
 
-type Form = {
-	data?: Data;
-	list?: Data[] | (() => any)[];
-};
-
-function useF<T>(options: Form): Form {
-	return options;
-}
-
-const form = useF({
-	list: [
-		{
-			name: "A"
-		},
-		() => {
-			return {
-				name: form.data?.age == 12 ? "A" : "B"
-			};
-		}
-	]
-});
-
-const Table = useTable<Data>({
-	columns: [
-		{
-			label: "xx",
-			prop: "a"
-		}
-	]
-});
-
-const Form = useForm<Data>();
-
-Form.value?.open({
-	items: [
-		{
-			type: "tabs",
-			prop: "age"
-		}
-	]
-});
-
 const Upsert = useUpsert<Data>({
 	items: [
 		{
@@ -79,6 +33,32 @@ const Upsert = useUpsert<Data>({
 				label: "x"
 			};
 		}
+	],
+	onOpened(data) {}
+});
+
+const Table = useTable<Data>({
+	columns: [
+		{
+			label: "xx",
+			prop: "a",
+			search: {
+				component: {
+					name: "el-date-picker"
+				}
+			}
+		}
+	]
+});
+
+const Form = useForm<Data>();
+
+Form.value?.open({
+	items: [
+		{
+			type: "tabs",
+			prop: "age"
+		}
 	]
 });
 
diff --git a/packages/crud/src/components/table/helper/header.tsx b/packages/crud/src/components/table/helper/header.tsx
index 6f37748..0571997 100644
--- a/packages/crud/src/components/table/helper/header.tsx
+++ b/packages/crud/src/components/table/helper/header.tsx
@@ -47,10 +47,13 @@ export function renderHeader(item: ClTable.Column, { scope, slots }: any) {
 			item.search.value = val;
 		},
 		onChange(val: any) {
-			crud.value?.refresh({
-				page: 1,
-				[item.prop]: val === "" ? undefined : val
-			});
+			// 更改时刷新列表
+			if (item.search.refreshOnChange) {
+				crud.value?.refresh({
+					page: 1,
+					[item.prop]: val === "" ? undefined : val
+				});
+			}
 		}
 	});
 
diff --git a/packages/crud/src/hooks/crud.ts b/packages/crud/src/hooks/crud.ts
index 5c15981..4229769 100644
--- a/packages/crud/src/hooks/crud.ts
+++ b/packages/crud/src/hooks/crud.ts
@@ -65,7 +65,7 @@ export function useCrud(options?: ClCrud.Options, cb?: (app: ClCrud.Ref) => void
 		provide("useCrud__options", options);
 	}
 
-	watch(Crud, (val: any) => {
+	watch(Crud, (val) => {
 		if (val) {
 			if (cb) {
 				cb(val);
@@ -77,7 +77,7 @@ export function useCrud(options?: ClCrud.Options, cb?: (app: ClCrud.Ref) => void
 }
 
 // 新增、编辑
-export function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.Ref> {
+export function useUpsert<T = any>(options?: ClUpsert.Options<T>) {
 	const Upsert = ref<ClUpsert.Ref>();
 	useParent("cl-upsert", Upsert);
 
@@ -87,7 +87,7 @@ export function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.
 
 	watch(
 		Upsert,
-		(val: any) => {
+		(val) => {
 			if (val) {
 				if (options) {
 					const event = useEvent(["onOpen", "onOpened", "onClosed"], {
@@ -105,7 +105,7 @@ export function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.
 		}
 	);
 
-	return Upsert as Ref<ClUpsert.Ref<T>>;
+	return Upsert;
 }
 
 // 表格
@@ -164,7 +164,7 @@ export function useDialog(options?: { onFullscreen(visible: boolean): void }) {
 
 	watch(
 		() => Dialog?.fullscreen.value,
-		(val: any) => {
+		(val) => {
 			options?.onFullscreen(val);
 		}
 	);
diff --git a/packages/crud/types/components/form/helper/index.d.ts b/packages/crud/types/components/form/helper/index.d.ts
index 994655d..0ce6b71 100644
--- a/packages/crud/types/components/form/helper/index.d.ts
+++ b/packages/crud/types/components/form/helper/index.d.ts
@@ -66,11 +66,9 @@ export declare function useForm(): {
             label?: string | undefined;
             renderLabel?: any;
             flex?: boolean | undefined;
-            hidden?: boolean | ((options: {
+            hidden?: ((options: {
                 scope: obj;
-            }) => boolean) | {
-                value: boolean;
-            } | undefined;
+            }) => boolean) | undefined;
             prepend?: {
                 [x: string]: any;
                 name?: string | undefined;
@@ -189,9 +187,9 @@ export declare function useForm(): {
         form: obj;
         isReset?: boolean | undefined;
         on?: {
-            open?: ((data: obj) => void) | undefined;
+            open?: ((data: any) => void) | undefined;
             close?: ((action: ClForm.CloseAction, done: fn) => void) | undefined;
-            submit?: ((data: obj, event: {
+            submit?: ((data: any, event: {
                 close: fn;
                 done: fn;
             }) => void) | undefined;
diff --git a/packages/crud/types/components/table/helper/index.d.ts b/packages/crud/types/components/table/helper/index.d.ts
index d147444..c55f28a 100644
--- a/packages/crud/types/components/table/helper/index.d.ts
+++ b/packages/crud/types/components/table/helper/index.d.ts
@@ -42,6 +42,9 @@ export declare function useTable(props: any): {
             search: {
                 isInput: boolean;
                 value: any;
+                refreshOnChange: {
+                    valueOf: () => boolean;
+                };
                 component: {
                     [x: string]: any;
                     name?: string | undefined;
diff --git a/packages/crud/types/hooks/crud.d.ts b/packages/crud/types/hooks/crud.d.ts
index 2256030..b8d23b2 100644
--- a/packages/crud/types/hooks/crud.d.ts
+++ b/packages/crud/types/hooks/crud.d.ts
@@ -1,7 +1,7 @@
 /// <reference types="../index" />
 import { Ref } from "vue";
 export declare function useCrud(options?: ClCrud.Options, cb?: (app: ClCrud.Ref) => void): Ref<ClCrud.Ref | undefined>;
-export declare function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.Ref<T> | undefined>;
+export declare function useUpsert<T = any>(options?: ClUpsert.Options<T>): Ref<ClUpsert.Ref<any> | undefined>;
 export declare function useTable<T = any>(options?: ClTable.Options<T>): Ref<ClTable.Ref<T> | undefined>;
 export declare function useForm<T = any>(cb?: (app: ClForm.Ref<T>) => void): Ref<ClForm.Ref<T> | undefined>;
 export declare function useAdvSearch<T = any>(options?: ClAdvSearch.Options<T>): Ref<ClAdvSearch.Ref<T> | undefined>;
diff --git a/src/config/proxy.ts b/src/config/proxy.ts
index bf7e9b8..9d6c263 100644
--- a/src/config/proxy.ts
+++ b/src/config/proxy.ts
@@ -1,7 +1,6 @@
 export const proxy = {
 	"/dev/": {
-		target: "https://test-admin.cool-js.cloud",
-		// target: "http://127.0.0.1:8001",
+		target: "http://127.0.0.1:8001",
 		changeOrigin: true,
 		rewrite: (path: string) => path.replace(/^\/dev/, "")
 	},
diff --git a/src/modules/demo/components/form-btn.vue b/src/modules/demo/components/form-btn.vue
index ff54b52..b45f54e 100644
--- a/src/modules/demo/components/form-btn.vue
+++ b/src/modules/demo/components/form-btn.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useCrud, useForm, useTable, useUpsert } from "@cool-vue/crud";
+import { useCrud, useForm, useTable, useUpsert, setFocus } from "@cool-vue/crud";
 import { useCool } from "/@/cool";
 
 const { refs, setRefs, service } = useCool();
@@ -57,7 +57,8 @@ const Upsert = useUpsert({
 				name: "el-date-picker"
 			}
 		}
-	]
+	],
+	plugins: [setFocus()]
 });
 
 // cl-table
@@ -104,7 +105,7 @@ function open() {
 			labelPosition: "top"
 		},
 		dialog: {
-			height: "500px",
+			height: "70vh",
 			width: "1000px"
 		},
 		items: [
diff --git a/src/modules/demo/views/crud.vue b/src/modules/demo/views/crud.vue
index 6459eee..7b40895 100644
--- a/src/modules/demo/views/crud.vue
+++ b/src/modules/demo/views/crud.vue
@@ -151,7 +151,8 @@ function refresh(params?: any) {
 }
 
 // 新增、编辑
-const Upsert = useUpsert({
+// 插入类型 <Eps.UserInfoEntity>，prop 和 data 会有提示
+const Upsert = useUpsert<Eps.UserInfoEntity>({
 	dialog: {
 		height: "600px", // 固定高
 		width: "1000px" // 固定宽
@@ -165,15 +166,15 @@ const Upsert = useUpsert({
 				type: "card",
 				labels: [
 					{
-						label: "基础",
+						label: "基础信息",
 						value: "base"
 					},
 					{
-						label: "选择",
+						label: "选择用户",
 						value: "select"
 					},
 					{
-						label: "其他",
+						label: "其他配置",
 						value: "other"
 					}
 				]
@@ -181,7 +182,7 @@ const Upsert = useUpsert({
 		},
 		{
 			label: "头像",
-			prop: "avatar",
+			prop: "avatarUrl",
 			group: "base",
 			component: {
 				name: "cl-upload"
@@ -240,13 +241,34 @@ const Upsert = useUpsert({
 			]
 		},
 		{
-			label: "省市区",
-			prop: "pca",
+			prop: "contact",
 			group: "base",
 			component: {
-				name: "cl-distpicker"
-			}
+				name: "cl-form-card",
+				props: {
+					label: "联系信息",
+					expand: false
+				}
+			},
+			children: [
+				{
+					label: "手机号",
+					prop: "phone",
+					component: {
+						name: "el-input"
+					}
+				},
+				{
+					label: "省市区",
+					prop: "pca",
+					group: "base",
+					component: {
+						name: "cl-distpicker"
+					}
+				}
+			]
 		},
+
 		{
 			label: "",
 			prop: "userIds",
@@ -400,7 +422,6 @@ const Table = useTable({
 
 			// 带搜索组件
 			search: {
-				// cool渲染方式
 				component: {
 					name: "el-input",
 					props: {
@@ -430,7 +451,6 @@ const Table = useTable({
 
 			// 带搜索组件
 			search: {
-				// jsx方式
 				component: {
 					name: "cl-select",
 					props: {
@@ -455,9 +475,14 @@ const Table = useTable({
 			prop: "createTime",
 			sortable: "custom",
 			search: {
-				component: (
-					<cl-date-picker type="date" value-format="YYYY-MM-DD" placeholder="搜索日期" />
-				)
+				component: {
+					name: "cl-date-picker",
+					props: {
+						type: "date",
+						valueFormat: "YYYY-MM-DD",
+						placeholder: "搜索日期"
+					}
+				}
 			}
 		},
 		{
diff --git a/yarn.lock b/yarn.lock
index 9fcdef0..9c4b4ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -344,10 +344,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cool-vue/crud@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@cool-vue/crud/-/crud-7.1.0.tgz#bed31f8059f55fba9dafa03b028216ac52685fe6"
-  integrity sha512-ai3QIim55AuWGSpRqgYU4b7vppfqFx4V7vP1htDIwhdY9oMGRiyzedjE1yvwuvHE7E9By9zuMfO5D8AuB9lXbQ==
+"@cool-vue/crud@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@cool-vue/crud/-/crud-7.1.3.tgz#494823c9b9d3db7c03624ee82b5d59330977989e"
+  integrity sha512-jSCLPfD/ADfarhI/4e6dWLWmXh2LxTGED4W1RwhgNZWFbM7zSjTc4bPfK3v8AMEcELs6e2ZIFGfcurlG/qc8AQ==
   dependencies:
     array.prototype.flat "^1.2.4"
     core-js "^3.21.1"