Commit a242e1ab3ea450358d248d8edfe64a498fb7719d
Merge branch 'fix/DEFECT-1836' into 'main_dev'
fix: 小程序看板里面只去掉三个点那个样式 See merge request yunteng/thingskit-front!1136
Showing
3 changed files
with
8 additions
and
6 deletions
| ... | ... | @@ -19,6 +19,7 @@ |
| 19 | 19 | import { computed } from 'vue'; |
| 20 | 20 | import { useGetComponentConfig } from '../../../packages/hook/useGetComponetConfig'; |
| 21 | 21 | import { isBoolean } from '/@/utils/is'; |
| 22 | + import { useApp } from '../../hooks/useApp'; | |
| 22 | 23 | |
| 23 | 24 | const props = defineProps<{ |
| 24 | 25 | sourceInfo: WidgetDataType; |
| ... | ... | @@ -38,6 +39,8 @@ |
| 38 | 39 | |
| 39 | 40 | const { createMessage } = useMessage(); |
| 40 | 41 | |
| 42 | + const { getIsAppPage } = useApp(); | |
| 43 | + | |
| 41 | 44 | const { boardId } = useBoardId(); |
| 42 | 45 | |
| 43 | 46 | const dropMenuList = ref<AuthDropMenuList[]>([ |
| ... | ... | @@ -171,7 +174,7 @@ |
| 171 | 174 | <AreaChartOutlined v-else class="text-lg" @click="handleOpenTrendModal" /> |
| 172 | 175 | </Tooltip> |
| 173 | 176 | <AuthDropDown |
| 174 | - v-if="!isCustomerUser && dropMenuList.length" | |
| 177 | + v-if="!isCustomerUser && dropMenuList.length && !getIsAppPage" | |
| 175 | 178 | :drop-menu-list="dropMenuList" |
| 176 | 179 | :trigger="['click']" |
| 177 | 180 | > | ... | ... |
| ... | ... | @@ -12,10 +12,10 @@ export const DEFAULT_MIN_HEIGHT = 5; |
| 12 | 12 | export const DEFAULT_MIN_WIDTH = 3; |
| 13 | 13 | export const DEFAULT_ITEM_MARIGN = 20; |
| 14 | 14 | export const PHONE_SIZE = { |
| 15 | - DEFAULT_WIDGET_WIDTH: 12, | |
| 16 | - DEFAULT_WIDGET_HEIGHT: 4, | |
| 17 | - DEFAULT_MIN_HEIGHT: 3, | |
| 18 | - DEFAULT_MIN_WIDTH: 8, | |
| 15 | + DEFAULT_WIDGET_WIDTH: 24, | |
| 16 | + DEFAULT_WIDGET_HEIGHT: 5, | |
| 17 | + DEFAULT_MIN_HEIGHT: 5, | |
| 18 | + DEFAULT_MIN_WIDTH: 24, | |
| 19 | 19 | }; |
| 20 | 20 | |
| 21 | 21 | import { ViewTypeEnum } from '/@/views/sys/share/config/config'; | ... | ... |