From c0f274898e5345eba164eba6941b7d277d0763a5 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Wed, 7 Aug 2024 14:16:04 +0800 Subject: [PATCH 1/2] 111 --- src/components/DesignForm/formControlAttr.vue | 26 +++++++++---------- .../DesignForm/formControlPropertiNew.vue | 4 +-- .../DesignForm/public/form/formGroup.vue | 2 +- src/directive/permission/index.ts | 4 +-- .../powermanage/rolepower/setuprole/index.vue | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index ccc7f77..285e39e 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/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() //默认值处理 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(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(()=>{ diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 3bea718..1c04e41 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/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--formField-->",props.formField) + // console.log("isNotWriteWord---->",val) + // 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 diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index c1c407d..37d2255 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){ v-if="linksIf(element)" > - {{ element.type}} +