From ff0c0f2b5350c2aab97e69235ff635a612e52901 Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Wed, 31 May 2023 16:56:43 +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                 |  4 ++--
 packages/crud/package.json               |  2 +-
 packages/crud/src/utils/vnode.tsx        |  5 +++--
 src/modules/base/views/param.vue         |  4 ++++
 src/modules/extend/excel/export-btn.tsx  |  3 +--
 src/modules/extend/excel/import-btn.vue  |  3 +--
 src/modules/upload/components/upload.vue | 23 +++++++++++++++++++++--
 src/modules/upload/config.ts             |  2 --
 yarn.lock                                |  8 ++++----
 10 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index d3c978b..ff1d81b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 		"lint:eslint": "eslint \"{src}/**/*.{vue,ts,tsx}\" --fix"
 	},
 	"dependencies": {
-		"@cool-vue/crud": "^6.2.0",
+		"@cool-vue/crud": "^6.2.2",
 		"@element-plus/icons-vue": "^2.0.10",
 		"@vueuse/core": "^9.1.0",
 		"@wangeditor/editor": "^5.1.23",
diff --git a/packages/crud/index.d.ts b/packages/crud/index.d.ts
index 68abf44..8fb2a77 100644
--- a/packages/crud/index.d.ts
+++ b/packages/crud/index.d.ts
@@ -454,7 +454,7 @@ declare namespace ClForm {
 	}) => void;
 
 	interface Config {
-		title?: string;
+		title?: any;
 		width?: string;
 		props: ElementPlus.FormProps;
 		items: Item[];
@@ -473,7 +473,7 @@ declare namespace ClForm {
 			buttons?: Array<CloseAction | Render.OpButton>;
 		};
 		dialog: {
-			title?: string;
+			title?: any;
 			width?: string;
 			hideHeader?: boolean;
 			controls?: Array<"fullscreen" | "close">;
diff --git a/packages/crud/package.json b/packages/crud/package.json
index 88d36a9..d5266bd 100644
--- a/packages/crud/package.json
+++ b/packages/crud/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@cool-vue/crud",
-	"version": "6.2.1",
+	"version": "6.2.2",
 	"private": false,
 	"main": "./dist/index.umd.min.js",
 	"typings": "types/index.d.ts",
diff --git a/packages/crud/src/utils/vnode.tsx b/packages/crud/src/utils/vnode.tsx
index c96e272..d8364c7 100644
--- a/packages/crud/src/utils/vnode.tsx
+++ b/packages/crud/src/utils/vnode.tsx
@@ -38,7 +38,7 @@ export function parseNode(vnode: any, options: Options): VNode {
 		const rn = slots[vnode.name];
 
 		if (rn) {
-			return rn({ scope, ...options._data });
+			return rn({ scope, prop, ..._data });
 		} else {
 			return <cl-error-message title={`${vnode.name} is not found`} />;
 		}
@@ -52,13 +52,14 @@ export function parseNode(vnode: any, options: Options): VNode {
 
 	// 处理 props
 	if (isFunction(vnode.props)) {
-		vnode.props = vnode.props({ scope, ...options._data });
+		vnode.props = vnode.props({ scope, prop, ..._data });
 	}
 
 	// 组件参数
 	const props = {
 		...vnode.props,
 		..._data,
+		prop,
 		scope
 	};
 
diff --git a/src/modules/base/views/param.vue b/src/modules/base/views/param.vue
index ae41703..e3c626c 100644
--- a/src/modules/base/views/param.vue
+++ b/src/modules/base/views/param.vue
@@ -122,6 +122,7 @@ const Upsert = useUpsert({
 			prop: "dataType",
 			label: "类型",
 			value: 0,
+			required: true,
 			component: {
 				name: "el-radio-group",
 				options: options.dataType
@@ -133,6 +134,7 @@ const Upsert = useUpsert({
 			hidden({ scope }) {
 				return scope.dataType != 0;
 			},
+			required: true,
 			component: {
 				name: "el-input",
 				props: {
@@ -147,6 +149,7 @@ const Upsert = useUpsert({
 			hidden({ scope }) {
 				return scope.dataType != 1;
 			},
+			required: true,
 			component: {
 				name: "cl-editor",
 				props: {
@@ -157,6 +160,7 @@ const Upsert = useUpsert({
 		{
 			prop: "data_2",
 			label: "数据",
+			required: true,
 			hidden({ scope }) {
 				return scope.dataType != 2;
 			},
diff --git a/src/modules/extend/excel/export-btn.tsx b/src/modules/extend/excel/export-btn.tsx
index b615fc8..cf24113 100644
--- a/src/modules/extend/excel/export-btn.tsx
+++ b/src/modules/extend/excel/export-btn.tsx
@@ -20,8 +20,7 @@ export default defineComponent({
 		},
 		header: Array,
 		columns: {
-			type: Array as PropType<any[]>,
-			required: true
+			type: Array as PropType<any[]>
 		},
 		data: [Function, Array],
 		maxExportLimit: Number // 最大导出条数，不传或者小于等于0为不限制
diff --git a/src/modules/extend/excel/import-btn.vue b/src/modules/extend/excel/import-btn.vue
index ede7259..1169887 100644
--- a/src/modules/extend/excel/import-btn.vue
+++ b/src/modules/extend/excel/import-btn.vue
@@ -40,8 +40,7 @@ import { extname } from "/@/cool/utils";
 const props = defineProps({
 	onConfig: Function,
 	onSubmit: {
-		type: Function,
-		required: true
+		type: Function
 	},
 	template: {
 		type: String,
diff --git a/src/modules/upload/components/upload.vue b/src/modules/upload/components/upload.vue
index 0f8ae58..59de68d 100644
--- a/src/modules/upload/components/upload.vue
+++ b/src/modules/upload/components/upload.vue
@@ -169,7 +169,7 @@
 </template>
 
 <script lang="ts" setup name="cl-upload">
-import { computed, ref, watch, PropType } from "vue";
+import { computed, ref, watch, PropType, nextTick } from "vue";
 import { isArray, isNumber } from "lodash-es";
 import Draggable from "vuedraggable";
 import { ElMessage } from "element-plus";
@@ -180,6 +180,7 @@ import { useBase } from "/$/base";
 import { fileName, fileType, getUrls } from "../utils";
 import { Upload } from "../types";
 import ItemViewer from "./items/viewer.vue";
+import { useForm } from "@cool-vue/crud";
 
 const props = defineProps({
 	modelValue: {
@@ -223,6 +224,7 @@ const props = defineProps({
 	// 穿透值
 	isEdit: null,
 	scope: null,
+	prop: null,
 	isDisabled: Boolean
 });
 
@@ -230,6 +232,7 @@ const emit = defineEmits(["update:modelValue", "upload", "success", "error", "pr
 
 const { service, refs, setRefs } = useCool();
 const { user } = useBase();
+const Form = useForm();
 
 // 模块配置
 const { options } = module.get("upload");
@@ -257,7 +260,19 @@ const limit = props.limit || options.limit.upload;
 const limitSize = props.limitSize || options.limit.size;
 
 // 文案
-const text = props.text === undefined ? options.text : props.text;
+const text = computed(() => {
+	if (props.text) {
+		return props.text;
+	} else {
+		switch (props.type) {
+			case "file":
+				return "选择文件";
+
+			case "image":
+				return "选择图片";
+		}
+	}
+});
 
 // 请求头
 const headers = computed(() => {
@@ -507,6 +522,10 @@ function update() {
 
 	if (!check) {
 		emit("update:modelValue", getUrls(list.value));
+
+		nextTick(() => {
+			Form.value?.validateField(props.prop);
+		});
 	}
 }
 
diff --git a/src/modules/upload/config.ts b/src/modules/upload/config.ts
index 5dc9c81..ff02c21 100644
--- a/src/modules/upload/config.ts
+++ b/src/modules/upload/config.ts
@@ -9,8 +9,6 @@ export default () => {
 		options: {
 			// 尺寸
 			size: 120,
-			// 显示文案
-			text: "选择图片",
 			// 限制
 			limit: {
 				// 上传最大数量
diff --git a/yarn.lock b/yarn.lock
index c3af1bb..c5b6635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -280,10 +280,10 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@cool-vue/crud@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@cool-vue/crud/-/crud-6.2.0.tgz#37bae71336b89925186e82cfe9ff978a0f3495c7"
-  integrity sha512-XMiJfh72d/LsiWAkLd3euYKVyQHuAPVFmWyypQDeaiZbkaZomOLjuT4oJwiZKpGOYsbH9QiaeJbbaKfJa3G0LA==
+"@cool-vue/crud@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@cool-vue/crud/-/crud-6.2.2.tgz#4e24bfb157307b5aef249476b4a41acd61217e30"
+  integrity sha512-0NBn8ZtbjJ85HkuVWueEmJ8+Uvc+yNezGO12f3AuHn0Ru1uVk5Dmy3EFDK5XhoWurOmTgk1lDaG3/G+CCgtCtw==
   dependencies:
     array.prototype.flat "^1.2.4"
     core-js "^3.21.1"