Merge branch 'vue3-ts-vite' of https://e.coding.net/shancool/cool-admin/front-next into vue3-ts-vite

apgzs · apgzs · commit 1f23801b391f · 2021-12-06T18:23:16.000+08:00
diff --git a/build/config/rules.ts b/build/config/rules.ts
@@ -75,16 +75,20 @@ export default [
 		form: {
 			name: "el-date-picker",
 			props: {
-				type: "date"
+				type: "date",
+				valueFormat: "YYYY-MM-DD"
 			}
 		}
 	},
 	{
 		test: ["dates", "dateRange", "dateScope"],
 		form: {
-			name: "el-date-picker",
-			props: {
-				type: "daterange"
+			component: {
+				name: "el-date-picker",
+				props: {
+					type: "daterange",
+					valueFormat: "YYYY-MM-DD"
+				}
 			}
 		}
 	},
@@ -93,16 +97,20 @@ export default [
 		form: {
 			name: "el-date-picker",
 			props: {
-				type: "datetime"
+				type: "datetime",
+				valueFormat: "YYYY-MM-DD HH:mm:ss"
 			}
 		}
 	},
 	{
 		test: ["times", "timeRange", "timeScope"],
 		form: {
-			name: "el-date-picker",
-			props: {
-				type: "datetimerange"
+			component: {
+				name: "el-date-picker",
+				props: {
+					type: "datetimerange",
+					valueFormat: "YYYY-MM-DD HH:mm:ss"
+				}
 			}
 		}
 	},
diff --git a/build/plugins/cool.ts b/build/plugins/cool.ts
@@ -20,7 +20,6 @@ function format(data: any) {
 
 // 颜色
 const colors = [
-	"",
 	"#409EFF",
 	"#67C23A",
 	"#E6A23C",
@@ -35,6 +34,9 @@ const colors = [
 
 // 组件处理器
 const handler = {
+	// 临时变量
+	d: {},
+
 	// 单选
 	dict({ comment }) {
 		const [label, ...arr] = comment.split(" ");
@@ -47,7 +49,7 @@ const handler = {
 				value: isNaN(Number(value)) ? value : Number(value)
 			};
 
-			if (colors[i]) {
+			if (i > 0 && colors[i]) {
 				d.color = colors[i];
 			}
 
@@ -192,6 +194,26 @@ function getPageName(router: string) {
 	return router ? `name: "${router.replace("/", "-")}",` : "";
 }
 
+// 时间合并
+function datetimeMerge({ columns, item }: any) {
+	if (["startTime", "startDate"].includes(item.prop)) {
+		const key = item.prop.replace("start", "");
+
+		if (columns.find((e: any) => e.propertyName == "end" + key)) {
+			item.label = key == "time" ? "时间范围" : "日期访问";
+			item.prop = key.toLocaleLowerCase();
+			item.hook = "datetimeRange";
+			item.component = {
+				name: "el-date-picker",
+				props: {
+					type: key == "time" ? "datetimerange" : "daterange",
+					valueFormat: "YYYY-MM-DD HH:mm:ss"
+				}
+			};
+		}
+	}
+}
+
 // 创建文件
 function createVue({ router, columns, prefix, api, module, filename }: any): void {
 	const upsert: any = {
@@ -212,7 +234,10 @@ function createVue({ router, columns, prefix, api, module, filename }: any): voi
 			item.required = true;
 		}
 
-		if (!["createTime", "updateTime", "id"].includes(item.prop)) {
+		// 忽略部分字段
+		if (!["createTime", "updateTime", "id", "endTime", "endDate"].includes(item.prop)) {
+			datetimeMerge({ columns, item });
+
 			if (!item.component) {
 				item.component = {
 					name: "el-input"

Original file line number	Diff line number	Diff line change
`@@ -75,16 +75,20 @@ export default [`
`75`	`75`	`form: {`
`76`	`76`	`name: "el-date-picker",`
`77`	`77`	`props: {`
`78`		`- type: "date"`
	`78`	`+ type: "date",`
	`79`	`+ valueFormat: "YYYY-MM-DD"`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`	`},`
`82`	`83`	`{`
`83`	`84`	`test: ["dates", "dateRange", "dateScope"],`
`84`	`85`	`form: {`
`85`		`- name: "el-date-picker",`
`86`		`- props: {`
`87`		`- type: "daterange"`
	`86`	`+ component: {`
	`87`	`+ name: "el-date-picker",`
	`88`	`+ props: {`
	`89`	`+ type: "daterange",`
	`90`	`+ valueFormat: "YYYY-MM-DD"`
	`91`	`+ }`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`	`},`
`@@ -93,16 +97,20 @@ export default [`
`93`	`97`	`form: {`
`94`	`98`	`name: "el-date-picker",`
`95`	`99`	`props: {`
`96`		`- type: "datetime"`
	`100`	`+ type: "datetime",`
	`101`	`+ valueFormat: "YYYY-MM-DD HH:mm:ss"`
`97`	`102`	`}`
`98`	`103`	`}`
`99`	`104`	`},`
`100`	`105`	`{`
`101`	`106`	`test: ["times", "timeRange", "timeScope"],`
`102`	`107`	`form: {`
`103`		`- name: "el-date-picker",`
`104`		`- props: {`
`105`		`- type: "datetimerange"`
	`108`	`+ component: {`
	`109`	`+ name: "el-date-picker",`
	`110`	`+ props: {`
	`111`	`+ type: "datetimerange",`
	`112`	`+ valueFormat: "YYYY-MM-DD HH:mm:ss"`
	`113`	`+ }`
`106`	`114`	`}`
`107`	`115`	`}`
`108`	`116`	`},`