Merge remote-tracking branch 'origin/develop' into develop

web/src/router/backEnd.ts

@@ -146,13 +146,10 @@ export function backEndComponent(routes: any) {
 				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/iframes')
 			}
 		}else{
-			console.log(item.is_iframe,item.web_path)
-			console.log(router.getRoutes())
 			if(item.is_iframe){
 				const iframeRoute:RouteRecordRaw = {
 					...item
 				}
-				console.log(iframeRoute)
 				router.addRoute(iframeRoute)
 				item.meta.isLink = item.path
 				item.path = `${item.path}Link`

web/src/settings.ts

@@ -122,5 +122,24 @@ export default {
 		dictComponentList.forEach((val) => {
 			getType(val).column.component.color = 'auto';
 		});
+		// 设置placeholder 的默认值
+        const placeholderComponentList = [
+            {key: 'text', placeholder: "请输入"},
+            {key: 'textarea', placeholder: "请输入"},
+            {key: 'input', placeholder: "请输入"},
+            {key: 'password', placeholder: "请输入"}
+        ]
+        placeholderComponentList.forEach((val) => {
+            if (getType(val.key)?.search?.component) {
+                getType(val.key).search.component.placeholder = val.placeholder;
+            } else if(getType(val.key)?.search) {
+                getType(val.key).search.component = {placeholder: val.placeholder};
+            }
+            if (getType(val.key)?.form?.component) {
+                getType(val.key).form.component.placeholder = val.placeholder;
+            } else if(getType(val.key)?.form) {
+                getType(val.key).form.component = {placeholder: val.placeholder};
+            }
+        });
 	},
 };