diff --git a/src/components/Application/Application.vue b/src/components/Application/Application.vue index f02a24e..9c812a7 100644 --- a/src/components/Application/Application.vue +++ b/src/components/Application/Application.vue @@ -5,7 +5,7 @@ - + diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index 3bfb600..37a3695 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -230,7 +230,6 @@ }); const { handleFormValues, initDefault } = useFormValues({ - getProps, defaultFormModel, getSchema, formModel, diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index b0af3c4..5db0e32 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -1,4 +1,4 @@ -import { ComponentType } from '/types/index'; +import { ComponentType } from './types/index'; /** * @description: 生成placeholder diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts index dad92b5..992a393 100644 --- a/src/components/Form/src/hooks/useFormEvents.ts +++ b/src/components/Form/src/hooks/useFormEvents.ts @@ -46,10 +46,10 @@ export function useFormEvents({ await validate(); loadingSub.value = false; emit('submit', formModel); - return true; + return; } catch (error) { loadingSub.value = false; - return false; + return; } } diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts index 5d55111..e5c12fd 100644 --- a/src/components/Form/src/types/form.ts +++ b/src/components/Form/src/types/form.ts @@ -41,6 +41,7 @@ export interface FormProps { submitFunc?: () => Promise; submitOnReset?: boolean; baseGridStyle?: CSSProperties; + collapsedRows?: number; } export interface FormActionType { diff --git a/src/components/Lockscreen/Recharge.vue b/src/components/Lockscreen/Recharge.vue index b8f7f81..4eef443 100644 --- a/src/components/Lockscreen/Recharge.vue +++ b/src/components/Lockscreen/Recharge.vue @@ -135,22 +135,6 @@ } } - @width: ~`Math.round(Math.random() * 100) ` px; - @left: calc(15px + `Math.round(Math.random(70)) `); - each(range(15), { - .xiaoma-@{value} { - height: (@value * 50px); - } - li:nth-child(@{index}) { - top: 50%; - left: @left; - width: @width; - height: @width; - transform: translate(-50%, -50%); - /*animation: moveToTop (Math.random(6) + 3s) ease-in-out -(Math.random(5000) / 1000s) infinite;*/ - } -}); - @keyframes rotate { 50% { border-radius: 45% / 42% 38% 58% 49%; diff --git a/src/components/Modal/src/basicModal.vue b/src/components/Modal/src/basicModal.vue index 7c581cf..fbff020 100644 --- a/src/components/Modal/src/basicModal.vue +++ b/src/components/Modal/src/basicModal.vue @@ -41,7 +41,7 @@ const props = defineProps({ ...basicProps }); const emit = defineEmits(['on-close', 'on-ok', 'register']); - const propsRef = ref( | null>null); + const propsRef = ref | null>(null); const isModal = ref(false); const subLoading = ref(false); diff --git a/src/components/Modal/src/hooks/useModal.ts b/src/components/Modal/src/hooks/useModal.ts index 0c1c776..0b737d6 100644 --- a/src/components/Modal/src/hooks/useModal.ts +++ b/src/components/Modal/src/hooks/useModal.ts @@ -1,4 +1,4 @@ -import { ref, onUnmounted, unref, getCurrentInstance, watch, nextTick } from 'vue'; +import { ref, unref, getCurrentInstance, watch } from 'vue'; import { isProdMode } from '@/utils/env'; import { ModalMethods, UseModalReturnType } from '../type'; import { getDynamicProps } from '@/utils'; diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue index 7f6871a..6147b5b 100644 --- a/src/components/Table/src/components/TableAction.vue +++ b/src/components/Table/src/components/TableAction.vue @@ -75,7 +75,7 @@ const getDropdownList = computed(() => { return (toRaw(props.dropDownActions) || []) .filter((action) => { - return hasPermission(action.auth) && isIfShow(action); + return hasPermission(action.auth as string[]) && isIfShow(action); }) .map((action) => { const { popConfirm } = action; @@ -108,7 +108,7 @@ const getActions = computed(() => { return (toRaw(props.actions) || []) .filter((action) => { - return hasPermission(action.auth) && isIfShow(action); + return hasPermission(action.auth as string[]) && isIfShow(action); }) .map((action) => { const { popConfirm } = action; diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index ea1b894..e8fdd8e 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -51,7 +51,6 @@ import { EventEnum } from '@/components/Table/src/componentMap'; import { parseISO, format } from 'date-fns'; - import { Fn, LabelValueOptions } from '/#/index'; export default defineComponent({ name: 'EditableCell', diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts index 96e4d68..edbb48f 100644 --- a/src/components/Table/src/types/table.ts +++ b/src/components/Table/src/types/table.ts @@ -34,4 +34,5 @@ export interface BasicTableProps { actionColumn: any[]; canResize: boolean; resizeHeightOffset: number; + loading: boolean; } diff --git a/src/components/Table/src/types/tableAction.ts b/src/components/Table/src/types/tableAction.ts index bc43ee5..6452e02 100644 --- a/src/components/Table/src/types/tableAction.ts +++ b/src/components/Table/src/types/tableAction.ts @@ -1,6 +1,6 @@ import { NButton } from 'naive-ui'; import { PermissionsEnum } from '@/enums/permissionsEnum'; -export interface ActionItem extends NButton.props { +export interface ActionItem extends Partial> { onClick?: Fn; label?: string; color?: 'success' | 'error' | 'warning'; diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue index 64b0b99..1bc62b8 100644 --- a/src/components/Upload/src/BasicUpload.vue +++ b/src/components/Upload/src/BasicUpload.vue @@ -109,7 +109,7 @@ watch( () => props.value, () => { - imgList.value = props.value.map((item) => { + state.imgList = props.value.map((item) => { return getImgUrl(item); }); } diff --git a/src/layout/components/TagsView/components.ts b/src/layout/components/TagsView/components.ts deleted file mode 100644 index 345c963..0000000 --- a/src/layout/components/TagsView/components.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { - DownOutlined, - ReloadOutlined, - CloseOutlined, - VerticalRightOutlined, - VerticalLeftOutlined, - ColumnWidthOutlined, - MinusOutlined, -} from '@ant-design/icons-vue'; -import { Dropdown, Tabs, Card } from 'ant-design-vue'; - -export default { - [Tabs.name]: Tabs, - [Tabs.TabPane.name]: Tabs.TabPane, - [Dropdown.name]: Dropdown, - [Card.name]: Card, - MinusOutlined, - DownOutlined, - ReloadOutlined, - CloseOutlined, - VerticalRightOutlined, - VerticalLeftOutlined, - ColumnWidthOutlined, -}; diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts index d8209de..1adf736 100644 --- a/src/settings/projectSetting.ts +++ b/src/settings/projectSetting.ts @@ -37,6 +37,8 @@ const setting = { mixMenu: false, //触发移动端侧边栏的宽度 mobileWidth: 800, + // 折叠菜单 + collapsed: false, }, //面包屑 crumbsSetting: { diff --git a/src/store/modules/tabsView.ts b/src/store/modules/tabsView.ts index ae2cb92..cb80f74 100644 --- a/src/store/modules/tabsView.ts +++ b/src/store/modules/tabsView.ts @@ -1,6 +1,5 @@ import { defineStore } from 'pinia'; import { RouteLocationNormalized } from 'vue-router'; -import { TABS_ROUTES } from '../mutation-types'; // 不需要出现在标签页中的路由 const whiteList = ['Redirect', 'login']; diff --git a/src/views/about/index.vue b/src/views/about/index.vue index cb3c1de..83ce098 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -11,7 +11,7 @@ title="项目信息" class="mt-4 proCard" size="small" - :segmented="{ content: 'hard' }" + :segmented="{ content: true }" > @@ -56,7 +56,7 @@ title="开发环境依赖" class="mt-4 proCard" size="small" - :segmented="{ content: 'hard' }" + :segmented="{ content: true }" > @@ -70,7 +70,7 @@ title="生产环境依赖" class="mt-4 proCard" size="small" - :segmented="{ content: 'hard' }" + :segmented="{ content: true }" > diff --git a/src/views/comp/drag/index.vue b/src/views/comp/drag/index.vue index fe19b3d..c113ebe 100644 --- a/src/views/comp/drag/index.vue +++ b/src/views/comp/drag/index.vue @@ -18,7 +18,7 @@ @@ -45,7 +45,7 @@ @@ -72,7 +72,7 @@ @@ -98,7 +98,7 @@ diff --git a/src/views/comp/form/useForm.vue b/src/views/comp/form/useForm.vue index 4614741..183dd77 100644 --- a/src/views/comp/form/useForm.vue +++ b/src/views/comp/form/useForm.vue @@ -16,10 +16,10 @@