Merge branch 'qin_v2'

src/components/DesignForm/formControlAttr.vue

@@ -208,7 +208,7 @@
                 selectvalue = "default",
                 mathFormula = {}
             }: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any } = controlData.value
-            console.log("controlData.value--->",controlData.value)
+            // console.log("controlData.value--->",controlData.value)
             // console.log("controlData.value-1-->",control,selectvalue)
             let columnIndex = false // 是否显示序号列
             if (type === 'table') {
@@ -1084,12 +1084,12 @@
 									}
 									
 								}
-								console.log("字段编辑--fileSignAry-111-》",fileSignAry)
+								// console.log("字段编辑--fileSignAry-111-》",fileSignAry)
 							})
 					}
 				}
                 
-                console.log("字段编辑--fileSignAry--》",controlData.value)
+                // console.log("字段编辑--fileSignAry--》",controlData.value)
                 break
         }
         if (obj.path) {
@@ -1202,7 +1202,7 @@
     // 多选固定选项增加
     const addSelectOption = (type: any) => {
 
-		console.log("选择项添加",controlData.value.type)
+		// console.log("选择项添加",controlData.value.type)
 
         if (controlData.value.type === 'cascader') {
             // 级联时打开弹窗口
@@ -1216,7 +1216,7 @@
                 list: []
                 })
             } else {
-				console.log("选择项添加--->controlData.value.options-->",controlData.value.options)
+				// console.log("选择项添加--->controlData.value.options-->",controlData.value.options)
 				let maxVal = 1;
 				if(controlData.value.options && controlData.value.options.length > 0){
 					controlData.value.options.forEach((item:any)=>{
@@ -1499,7 +1499,7 @@
     defineExpose({ getFormFieldBySource })
     //判断输入框是否可写
     const isNotWrite = (val:any) =>{
-        console.log("判断输入框是否可写--->",val,props.customerformid)
+        // console.log("判断输入框是否可写--->",val,props.customerformid)
         if(val.key === "name" && props.customerformid != ""){
             return true
         }
@@ -1511,7 +1511,7 @@
     const subUnit = ref<any>()
     //默认值处理
     const digitPageSub = (val:any,envt:any) => {
-        console.log("默认值处理--->",val.value,envt,props.formData)
+        // console.log("默认值处理--->",val.value,envt,props.formData)
     
         // console.log("默认值处理-1-->",props.formList)
         // console.log("默认值处理-2-->",props.formConfig)
@@ -1539,13 +1539,13 @@
         // console.log("默认值处理-1-->",props.formList)
         // console.log("默认值处理-2-->",props.formConfig)
         // console.log("默认值处理--3->",props.formOtherData)
-        console.log("默认值处理--4->",val)
+        // console.log("默认值处理--4->",val)
         formConfig.value[key] = {
             mathsFormula:val.mathsFormula,
             takingMethod:val.takingMethod,
             digit:val.digit
         }
-        console.log("返回值处理--->",formConfig.value)
+        // console.log("返回值处理--->",formConfig.value)
         attrList.value.forEach((item:any)=>{
             // console.log("返回值处理--1->",item)
             if(item.type == "digitpage"){
@@ -1605,7 +1605,7 @@
     //上传失败钩子
     function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles){
         alert("上传失败,请重试")
-        console.log("上传失败"+error);
+        // console.log("上传失败"+error);
     }
     
     //liwenxuan 20240108 vidioupload  end
@@ -2547,7 +2547,7 @@ function optionsTypeChanged(){
     ]
     const layouytStyle = reactive<any>(controlData.value.styles)
     watch(()=>layouytStyle,(val : any)=>{
-      console.log("监听样式处理",val)
+    //   console.log("监听样式处理",val)
       controlData.value.styles = val
      // Object.assign(store.controlAttr.styles.divStyle, val)
     },
@@ -2584,7 +2584,7 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (
 }
 
 const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-	console.log("beforeAvatarUpload",rawFile.type)
+	// console.log("beforeAvatarUpload",rawFile.type)
   if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/gif' && rawFile.type !== 'image/icon') {
     ElMessage.error('请上传以下格式的图片(jpg、jpeg、png、gif、icon)!'+rawFile.type)
     return false
@@ -2614,7 +2614,7 @@ const gainFormGroupList = () =>{
 	}
 	customerFormGroupList(sendInfo)
 		.then((data)=>{
-			console.log("获取表单分组",data)
+			// console.log("获取表单分组",data)
 			formGroup.value = data.data
 		})
 		.finally(()=>{

src/components/DesignForm/formControlPropertiNew.vue

@@ -1555,8 +1555,8 @@ const isNotWrite = (val:any) =>{
         return false
     }
 const isNotWriteWord = (val:any) =>{
-	console.log("isNotWriteWord---->",val)
+	// console.log("isNotWriteWord---->",val)
-	console.log("isNotWriteWord--formField-->",props.formField)
+	// console.log("isNotWriteWord--formField-->",props.formField)
 	if(val.eventName === "filedNameKey" && props.customerformid != "" && props.formField && Array.isArray(props.formField) && props.formField.includes(val.value) ){
 		// if(props.formField.includes(val.value)){
 			return true

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

@@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				v-if="linksIf(element)"
 			>
 		
-				{{ element.type}}
+				
 			
 				<!--选项卡组件-->
 				<template v-if="element.type === 'tabs'">

src/directive/permission/index.ts

@@ -22,7 +22,7 @@ export const hasPerm: Directive = {
       const requiredPerms = value; // DOM绑定需要的按钮权限标识
 
       const hasPerm = perms?.some(perm => {
-        return requiredPerms.includes( );
+        return requiredPerms.includes(perm);
       });
 
       if (!hasPerm) {

src/views/powermanage/rolepower/setuprole/index.vue

@@ -176,7 +176,7 @@ onMounted(() => {
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" align="center">
                     <template #default="scope">
-                        <el-button v-hasPerm="['124067026950959104']" type="primary" link size="small"
+                        <el-button v-hasPerm="[124067026950959104]" type="primary" link size="small"
                             @click.stop="openSetupPwoerDialog(scope.row)">配置权限</el-button>
                         <el-button v-hasPerm="['124067108593086464']" type="primary" link size="small"
                             @click.stop="openSetupUsersDialog(scope.row)">使用人员</el-button>