diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index c9af1b1..2809f57 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -1906,6 +1906,7 @@ const editFormSendFlow = (val: any) => { const viewType = ref(1); const viewLayout = ref(); const resetViewClickStates = (excludeView?: string) => { + console.log("切换视图展示方式-----------resetViewClickStates------>",excludeView) if (!props.viewPage || typeof props.viewPage !== 'object') return; const views = ['list', 'date', 'time', 'gantt', 'map', 'card', 'chart']; views.forEach(view => { @@ -1925,7 +1926,7 @@ const tabsView = (val: any, types: number) => { viewType.value = types; val.isClick = true; viewLayout.value = val; - // console.log("切换视图展示方式",val) + console.log("切换视图展示方式",val,"-----",types) switch (types) { case 2: resetViewClickStates('date'); @@ -2695,10 +2696,8 @@ const getNonValue = () => { /> - - diff --git a/src/components/DesignForm/public/expand/datePicker.vue b/src/components/DesignForm/public/expand/datePicker.vue index 5a9b566..edcbdf3 100644 --- a/src/components/DesignForm/public/expand/datePicker.vue +++ b/src/components/DesignForm/public/expand/datePicker.vue @@ -8,6 +8,7 @@ const props = withDefaults( defineProps<{ modelValue?: string; disabled?: boolean; + isEdit?: boolean; data?: any; }>(), {} @@ -133,6 +134,7 @@ const shichang = computed(() => { :value-format="valueFormat" :format="props.data.control.format" clearable + :disabled="props.isEdit" /> diff --git a/src/components/DesignForm/public/expand/digitpage.vue b/src/components/DesignForm/public/expand/digitpage.vue index 668fd69..60f5730 100644 --- a/src/components/DesignForm/public/expand/digitpage.vue +++ b/src/components/DesignForm/public/expand/digitpage.vue @@ -24,6 +24,7 @@ const props = withDefaults( modelValue?: string; disabled?: boolean; rowIndex:number; + isEdit?: boolean; }>(), {} ); @@ -143,6 +144,7 @@ const judgeIsDisabled = (key: string) => { oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')" placeholder="请输入" clearable + :disabled="props.isEdit" >