Browse Source

Merge branch 'qin_v3' into lwx_v5

lwx_v5
超级管理员 1 year ago
parent
commit
5a384ab4d5
  1. 93
      src/components/DesignForm/formControlPropertiNew.vue
  2. 2
      src/components/DesignForm/public/form/formGroup.vue
  3. 18
      src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
  4. 17
      src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

93
src/components/DesignForm/formControlPropertiNew.vue

@ -72,8 +72,9 @@ const emits = defineEmits<{
const { formConfig, formData } = toRefs(props)
const store = useDesignFormStore() as any
const controlData = computed(() => {
// console.log("----------------->",props.formInfo)
// console.log("--------1--------->",store.controlAttr)
console.log("注册自定义事件----------------->",props.formInfo)
console.log("注册自定义事件--------1--------->",store.controlAttr)
// console.log("---------3-------->",controlData.value.customRules)
return store.controlAttr
})
//Demo
@ -134,8 +135,12 @@ const state = reactive({
@ 时间: 2024-08-14 08:41:02
@ 功能: 必填
*/
const ValidateTextTypes = reactive({
const ValidateText = reactive<ValidateTextTypes>({
type: 'required',
label: '必填',
regExp: /^\s*$/,
message: '必填项',
checkbox: false
})
const formAttr = computed(() => {
@ -214,31 +219,31 @@ const formAttr = computed(() => {
]
})
const attrList = computed(() => {
// console.log("controlData.value-1-->",controlData.value)
if (Object.keys(controlData.value).length) {
// console.log("controlData.value-1-->",controlData.value)
if (Object.keys(controlData.value).length) {
const {
control = {},
type,
name,
config = {},
item = {},
attr = {},
selectvalue = "default",
mathFormula = {},
unitName
}: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any,unitName:any } = controlData.value
// console.log("controlData.value--->",controlData.value)
// console.log("controlData.value-1-->",unitName)
let columnIndex = false //
if (type === 'table') {
//
control = {},
type,
name,
config = {},
item = {},
attr = {},
selectvalue = "default",
mathFormula = {},
unitName
}: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any,unitName:any } = controlData.value
// console.log("controlData.value--->",controlData.value)
// console.log("controlData.value-1-->",unitName)
let columnIndex = false //
if (type === 'table') {
//
const list = controlData.value && controlData.value.list
if (list && list.length > 0) {
columnIndex = list[0].type === 'index'
}
if (list && list.length > 0) {
columnIndex = list[0].type === 'index'
}
}
const temp =reactive<PublicAtrr[]>([
const temp =reactive<PublicAtrr[]>([
{
label: '标签名称',
value: item.label,
@ -816,8 +821,6 @@ const attrList = computed(() => {
vIf: state.isSearch,
vShow: ['videoUpAndPlay']
},
{
label: '上传地址',
value: control.action,
@ -988,9 +991,9 @@ const attrList = computed(() => {
vShow: ['digitpage'],
control:control
}
])
])
//
return temp.filter((item: any) => {
return temp.filter((item: any) => {
let hasFilter = true
if (item.vShow) {
hasFilter = item.vShow.includes(type)
@ -1003,11 +1006,11 @@ const attrList = computed(() => {
hasFilter = false
}
return hasFilter
})
} else {
return []
}
})
})
} else {
return []
}
})
watch(
() => store.activeKey,
@ -2421,6 +2424,7 @@ function handleDetermineFillRoles(){
watch(()=>store.activeKey, () => {
// console.log("activeKey",store.activeKey);
if(controlData.value.type==='associatedForms'){
setTimeout(() => {
formidChanged()
@ -2502,6 +2506,7 @@ function handleDetermineGlxxszDialogCheckBox(){
}
//
watch(()=>controlData.value.control,(newVal) => {
// console.log("",typeof(newVal))
if(typeof(newVal)!="undefined"){
if(typeof(newVal.glxxszSwitch)!="undefined"){
if(typeof(controlData.value.control.activeValue)!="undefined"){
@ -2514,6 +2519,7 @@ watch(()=>controlData.value.control,(newVal) => {
}
}
}
console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
},{ deep: true })
@ -2745,6 +2751,20 @@ const disabledIstrue = (val:string) => {
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>
<template>
<div class="sidebar-tools">
@ -2753,6 +2773,7 @@ const disabledIstrue = (val:string) => {
<el-form size="small" class="form">
<!-- <div class=""><h3>通用属性</h3></div> -->
<el-divider content-position="left">通用属性</el-divider>
<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)">
{{controlData.customRules}}
<el-form-item class="form_cont">
<el-input v-model="message" placeholder="校验提示信息">
<el-input v-model="ValidateText.message" :placeholder="ValidateText.message">
<template #prepend>
必填
</template>
<template #append>
<el-checkbox v-model="checked1" />
<el-checkbox v-model="ValidateText.checkbox" />
</template>
</el-input>
</el-form-item>

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

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

18
src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

@ -493,7 +493,23 @@ function optionsValue3Get3(data: any,fieldName: string){
</script>
<template>
<el-drawer v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
<AppFormPage
<!-- <AppFormPage
ref="formEl"
:number="props.pickAppMenu.id"
:isWorkFlow="isFlow"
:form-data="stateForm.formData"
:type="1"
:mastesformjson="mastesformjson"
:flowkey="appInitData.flowkey"
:groupid="appInitData.groupid"
:sign-code="appInitData.signCode"
:version-id="versionid"
:after-submit="afterSubmit"
add-url="addData"
@optionsValue3Get3="optionsValue3Get3"
/> -->
<ak-form
ref="formEl"
:number="props.pickAppMenu.id"

17
src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

@ -330,7 +330,22 @@ function optionsValue3Get3(data: any,fieldName: string){
:pickAppMenu="props.pickAppMenu"
:viewPage="stateList.view"
/>
<AppFormPage
<!-- <AppFormPage
v-else
ref="formEl"
:number="props.pickAppMenu.id"
:isWorkFlow="isFlow"
:form-data="stateForm.formData"
:type="1"
:mastesformjson="mastesformjson"
:flowkey="appInitData.flowkey"
:groupid="appInitData.groupid"
:sign-code="appInitData.signCode"
:version-id="appInitData.versionId"
add-url="addData"
@optionsValue3Get3="optionsValue3Get3"
/> -->
<ak-form
v-else
ref="formEl"
:number="props.pickAppMenu.id"

Loading…
Cancel
Save