diff --git a/package.json b/package.json index 965b9a8465a..92372fbf3d3 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "stylelint-order": "^4.1.0", "ts-node": "^9.1.0", "typescript": "^4.1.3", - "vite": "^2.0.0-beta.22", + "vite": "^2.0.0-beta.23", "vite-plugin-html": "^2.0.0-beta.5", "vite-plugin-mock": "^2.0.0-beta.3", "vite-plugin-purge-icons": "^0.5.0", diff --git a/src/components/Application/src/search/AppSearch.vue b/src/components/Application/src/search/AppSearch.vue index 179f12e9d26..43cca7f8f73 100644 --- a/src/components/Application/src/search/AppSearch.vue +++ b/src/components/Application/src/search/AppSearch.vue @@ -1,7 +1,7 @@ diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue index d530f61ea04..7f5998bc25d 100644 --- a/src/components/Modal/src/BasicModal.vue +++ b/src/components/Modal/src/BasicModal.vue @@ -127,6 +127,7 @@ watchEffect(() => { visibleRef.value = !!props.visible; + fullScreenRef.value = !!props.defaultFullscreen; }); watch( diff --git a/src/components/Modal/src/props.ts b/src/components/Modal/src/props.ts index 794d5081f7b..1afa4ac6091 100644 --- a/src/components/Modal/src/props.ts +++ b/src/components/Modal/src/props.ts @@ -13,13 +13,14 @@ export const modalProps = { // open drag draggable: propTypes.bool.def(true), centered: propTypes.bool, - cancelText: propTypes.string.def(t('component.modal.cancelText')), - okText: propTypes.string.def(t('component.modal.okText')), + cancelText: propTypes.string.def(t('common.cancelText')), + okText: propTypes.string.def(t('common.okText')), closeFunc: Function as PropType<() => Promise>, }; export const basicProps = Object.assign({}, modalProps, { + defaultFullscreen: propTypes.bool, // Can it be full screen canFullscreen: propTypes.bool.def(true), // After enabling the wrapper, the bottom can be increased in height diff --git a/src/components/Preview/src/index.vue b/src/components/Preview/src/index.vue index ba6210085e7..ce933508e43 100644 --- a/src/components/Preview/src/index.vue +++ b/src/components/Preview/src/index.vue @@ -21,9 +21,26 @@ import { Image } from 'ant-design-vue'; import { useDesign } from '/@/hooks/web/useDesign'; import { propTypes } from '/@/utils/propTypes'; - import { ImageItem } from './types'; import { isString } from '/@/utils/is'; + interface ImageProps { + alt?: string; + fallback?: string; + src: string; + width: string | number; + height?: string | number; + placeholder?: string | boolean; + preview?: + | boolean + | { + visible?: boolean; + onVisibleChange?: (visible: boolean, prevVisible: boolean) => void; + getContainer: string | HTMLElement | (() => HTMLElement); + }; + } + + type ImageItem = string | ImageProps; + export default defineComponent({ name: 'ImagePreview', components: { diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue index 2a0ffe3be45..004885db054 100644 --- a/src/components/Table/src/components/settings/ColumnSetting.vue +++ b/src/components/Table/src/components/settings/ColumnSetting.vue @@ -33,7 +33,7 @@ - {{ t('component.table.settingReset') }} + {{ t('common.resetText') }} diff --git a/src/components/Table/src/components/settings/RedoSetting.vue b/src/components/Table/src/components/settings/RedoSetting.vue index fa754427a71..dfcff61b29b 100644 --- a/src/components/Table/src/components/settings/RedoSetting.vue +++ b/src/components/Table/src/components/settings/RedoSetting.vue @@ -1,7 +1,7 @@