Merge branch 'qin_v4'

src/components/DesignForm/assembly/index.ts

@@ -360,26 +360,26 @@ export default [
 					inputStyle: {}
 				}
 			},
-			{
+			// {
-				type: 'description',
+			// 	type: 'description',
-				label: '描述说明',
+			// 	label: '描述说明',
-				unitName: '描述说明',
+			// 	unitName: '描述说明',
-				icon: 'number',
+			// 	icon: 'number',
-				iconFont: 'fa-question-circle-o',
+			// 	iconFont: 'fa-question-circle-o',
-				control: {
+			// 	control: {
-					modelValue: 0
+			// 		modelValue: 0
-				},
+			// 	},
-				config: {},
+			// 	config: {},
-				styles: {
+			// 	styles: {
-					divStyle: {
+			// 		divStyle: {
-						marginBot: "10"
+			// 			marginBot: "10"
-					},
+			// 		},
-					labelStyle: {
+			// 		labelStyle: {
-						paddingLeft: "7",
+			// 			paddingLeft: "7",
-					},
+			// 		},
-					inputStyle: {}
+			// 		inputStyle: {}
-				}
+			// 	}
-			},
+			// },
 
 
 

src/components/DesignForm/formControlPropertiNew.vue

@@ -2729,8 +2729,8 @@ watch(()=>controlData.value.control,(newVal) => {
 
 //radio,select添加选项时同步配置选项
 watch(()=>controlData.value.options, (changedOptions:any) => {
-	console.log("radio,select添加选项时同步配置选项",changedOptions)
+	// console.log("radio,select添加选项时同步配置选项",changedOptions)
-	console.log("radio,select添加选项时同步配置选项------>",controlData.value)
+	// console.log("radio,select添加选项时同步配置选项------>",controlData.value)
     if(controlData.value.type === "radio" || controlData.value.type === "select"){
         if(controlData.value.config.optionsType==0){
             if(changedOptions.length===0){

src/components/DesignForm/public/form/formItem.vue

@@ -539,7 +539,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
 @ 功能: 判断此组件是否可见
 */
 const judgeIsShow = (key:string) => {
-	console.log("判断此组件是否可见---->",key)
+	// console.log("判断此组件是否可见---->",key)
 	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
 		if(props.purview.length < 1){
 			return true;