From 6822d2d64f1a92e9b7265210dbf9fbcb0949af3e 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: Thu, 19 Oct 2023 14:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |  2 +-
 packages/crud/index.d.ts                    |  2 +-
 packages/crud/package.json                  |  2 +-
 packages/crud/src/components/form/index.tsx | 11 +++++++----
 packages/crud/src/static/index.scss         |  2 +-
 packages/crud/src/utils/parse.tsx           |  2 --
 src/modules/crud/config.ts                  |  8 ++++----
 yarn.lock                                   |  8 ++++----
 8 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 8cf963f..29a99a0 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 		"lint:eslint": "eslint \"{src}/**/*.{vue,ts,tsx}\" --fix"
 	},
 	"dependencies": {
-		"@cool-vue/crud": "^7.0.1-beta8",
+		"@cool-vue/crud": "^7.0.1-beta9",
 		"@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 2d415eb..217e177 100644
--- a/packages/crud/index.d.ts
+++ b/packages/crud/index.d.ts
@@ -703,7 +703,7 @@ declare interface Config {
 		size: ElementPlus.Size;
 		colors: string[];
 		form: {
-			labelPostion: ElementPlus.FormProps["labelPosition"];
+			labelPosition: ElementPlus.FormProps["labelPosition"];
 			labelWidth: ElementPlus.FormProps["labelWidth"];
 			span: number;
 		};
diff --git a/packages/crud/package.json b/packages/crud/package.json
index 86d34d3..138a107 100644
--- a/packages/crud/package.json
+++ b/packages/crud/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@cool-vue/crud",
-	"version": "7.0.1-beta8",
+	"version": "7.0.1-beta9",
 	"private": false,
 	"main": "./dist/index.umd.min.js",
 	"typings": "types/index.d.ts",
diff --git a/packages/crud/src/components/form/index.tsx b/packages/crud/src/components/form/index.tsx
index d8d2574..cdfe998 100644
--- a/packages/crud/src/components/form/index.tsx
+++ b/packages/crud/src/components/form/index.tsx
@@ -459,9 +459,6 @@ export default defineComponent({
 						<el-form
 							ref={Form}
 							size={style.size}
-							label-position={
-								browser.isMini && !props.inline ? "top" : style.form.labelPostion
-							}
 							label-width={style.form.labelWidth}
 							inline={props.inline}
 							disabled={saving.value}
@@ -472,7 +469,13 @@ export default defineComponent({
 								e.preventDefault();
 							}}
 						/>,
-						config.props,
+						{
+							...config.props,
+							labelPosition:
+								browser.isMini && !props.inline
+									? "top"
+									: config.props.labelPosition || style.form.labelPosition
+						},
 						{
 							default: () => {
 								return (
diff --git a/packages/crud/src/static/index.scss b/packages/crud/src/static/index.scss
index 51a2edc..da577de 100644
--- a/packages/crud/src/static/index.scss
+++ b/packages/crud/src/static/index.scss
@@ -405,7 +405,7 @@
 		grid-template-rows: 0fr;
 
 		> .cl-form-item__children {
-			margin: 10px 10px 10px 0px;
+			margin: 10px;
 			min-height: 0;
 			overflow: hidden;
 		}
diff --git a/packages/crud/src/utils/parse.tsx b/packages/crud/src/utils/parse.tsx
index f5d6508..a979a6f 100644
--- a/packages/crud/src/utils/parse.tsx
+++ b/packages/crud/src/utils/parse.tsx
@@ -40,8 +40,6 @@ export function parseTableDict(value: any, item: ClTable.Column) {
 		(e) => e !== undefined && e !== null && e !== ""
 	);
 
-	console.log(values);
-
 	// 返回值
 	const list = values.map((v) => {
 		const d = deepFind(v, options) || { label: v, value: v };
diff --git a/src/modules/crud/config.ts b/src/modules/crud/config.ts
index b00c963..6908e72 100644
--- a/src/modules/crud/config.ts
+++ b/src/modules/crud/config.ts
@@ -1,12 +1,12 @@
 import { Merge, ModuleConfig } from "/@/cool";
 
 // npm
-import Crud, { locale } from "@cool-vue/crud";
-import "@cool-vue/crud/dist/index.css";
+// import Crud, { locale } from "@cool-vue/crud";
+// import "@cool-vue/crud/dist/index.css";
 
 // 调试、自定义crud
-// import Crud, { locale } from "../../../packages/crud/src";
-// import "../../../packages/crud/src/static/index.scss";
+import Crud, { locale } from "../../../packages/crud/src";
+import "../../../packages/crud/src/static/index.scss";
 
 export default (): Merge<ModuleConfig, CrudOptions> => {
 	return {
diff --git a/yarn.lock b/yarn.lock
index 7d58c9b..43d35b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -282,10 +282,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cool-vue/crud@^7.0.1-beta8":
-  version "7.0.1-beta8"
-  resolved "https://registry.yarnpkg.com/@cool-vue/crud/-/crud-7.0.1-beta8.tgz#c853cf06d0fa0ac207899d3a41789435d978b445"
-  integrity sha512-9t4Joj4kBfw3oUtR36K2FsOykVL1/nQnLnFx/7sDNn0lc631wt4VCAtKbTYiHlZWn+bxxL7YAphlFYPaGk8hgA==
+"@cool-vue/crud@^7.0.1-beta9":
+  version "7.0.1-beta9"
+  resolved "https://registry.yarnpkg.com/@cool-vue/crud/-/crud-7.0.1-beta9.tgz#caacb1eab03f48bc6789209242b198ebd06435f5"
+  integrity sha512-PnukV6Q1sPsXZS2li2BrmCDmYKJdqFumE/wA2kaSTOcrIgmjYmrS/oa2c3C5BKXrwDD9561kq0q8vsKBTpGQxQ==
   dependencies:
     array.prototype.flat "^1.2.4"
     core-js "^3.21.1"