超级管理员 1 year ago
parent
commit
7bc98ac853
  1. 39
      src/components/DesignForm/formControlPropertiNew.vue
  2. 2
      src/components/DesignForm/public/form/formGroup.vue

39
src/components/DesignForm/formControlPropertiNew.vue

@ -72,8 +72,9 @@ const emits = defineEmits<{
const { formConfig, formData } = toRefs(props) const { formConfig, formData } = toRefs(props)
const store = useDesignFormStore() as any const store = useDesignFormStore() as any
const controlData = computed(() => { const controlData = computed(() => {
// console.log("----------------->",props.formInfo) console.log("注册自定义事件----------------->",props.formInfo)
// console.log("--------1--------->",store.controlAttr) console.log("注册自定义事件--------1--------->",store.controlAttr)
// console.log("---------3-------->",controlData.value.customRules)
return store.controlAttr return store.controlAttr
}) })
//Demo //Demo
@ -134,8 +135,12 @@ const state = reactive({
@ 时间: 2024-08-14 08:41:02 @ 时间: 2024-08-14 08:41:02
@ 功能: 必填 @ 功能: 必填
*/ */
const ValidateTextTypes = reactive({ const ValidateText = reactive<ValidateTextTypes>({
type: 'required',
label: '必填',
regExp: /^\s*$/,
message: '必填项',
checkbox: false
}) })
const formAttr = computed(() => { const formAttr = computed(() => {
@ -816,8 +821,6 @@ const attrList = computed(() => {
vIf: state.isSearch, vIf: state.isSearch,
vShow: ['videoUpAndPlay'] vShow: ['videoUpAndPlay']
}, },
{ {
label: '上传地址', label: '上传地址',
value: control.action, value: control.action,
@ -1007,7 +1010,7 @@ const attrList = computed(() => {
} else { } else {
return [] return []
} }
}) })
watch( watch(
() => store.activeKey, () => store.activeKey,
@ -2421,6 +2424,7 @@ function handleDetermineFillRoles(){
watch(()=>store.activeKey, () => { watch(()=>store.activeKey, () => {
// console.log("activeKey",store.activeKey);
if(controlData.value.type==='associatedForms'){ if(controlData.value.type==='associatedForms'){
setTimeout(() => { setTimeout(() => {
formidChanged() formidChanged()
@ -2502,6 +2506,7 @@ function handleDetermineGlxxszDialogCheckBox(){
} }
// //
watch(()=>controlData.value.control,(newVal) => { watch(()=>controlData.value.control,(newVal) => {
// console.log("",typeof(newVal))
if(typeof(newVal)!="undefined"){ if(typeof(newVal)!="undefined"){
if(typeof(newVal.glxxszSwitch)!="undefined"){ if(typeof(newVal.glxxszSwitch)!="undefined"){
if(typeof(controlData.value.control.activeValue)!="undefined"){ if(typeof(controlData.value.control.activeValue)!="undefined"){
@ -2514,6 +2519,7 @@ watch(()=>controlData.value.control,(newVal) => {
} }
} }
} }
console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
},{ deep: true }) },{ deep: true })
@ -2745,6 +2751,20 @@ const disabledIstrue = (val:string) => {
return false; return false;
} }
} }
watch(()=>controlData.value.customRules,(val:any) => {
console.log("啊啊啊啊啊",val,typeof(val));
if(typeof(val)=="object"){
if(Array.isArray(val)){
val.forEach((item:any)=>{
})
}
}
},{
deep: true
})
</script> </script>
<template> <template>
<div class="sidebar-tools"> <div class="sidebar-tools">
@ -2753,6 +2773,7 @@ const disabledIstrue = (val:string) => {
<el-form size="small" class="form"> <el-form size="small" class="form">
<!-- <div class=""><h3>通用属性</h3></div> --> <!-- <div class=""><h3>通用属性</h3></div> -->
<el-divider content-position="left">通用属性</el-divider> <el-divider content-position="left">通用属性</el-divider>
<template v-for="(item, index) in attrList" :key="index"> <template v-for="(item, index) in attrList" :key="index">
@ -3393,12 +3414,12 @@ const disabledIstrue = (val:string) => {
<div v-if="showHide(['input', 'password', 'component'], true)"> <div v-if="showHide(['input', 'password', 'component'], true)">
{{controlData.customRules}} {{controlData.customRules}}
<el-form-item class="form_cont"> <el-form-item class="form_cont">
<el-input v-model="message" placeholder="校验提示信息"> <el-input v-model="ValidateText.message" :placeholder="ValidateText.message">
<template #prepend> <template #prepend>
必填 必填
</template> </template>
<template #append> <template #append>
<el-checkbox v-model="checked1" /> <el-checkbox v-model="ValidateText.checkbox" />
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>

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

@ -273,7 +273,7 @@ const groupClick = (item: any, ele?: string) => {
inputStyle:{} inputStyle:{}
} }
} }
// console.log("--->",item) // console.log("--->",getGroupName(item))
store.setActiveKey(getGroupName(item)) store.setActiveKey(getGroupName(item))
store.setControlAttr(item) store.setControlAttr(item)
// grid // grid

Loading…
Cancel
Save