diff --git a/.eslintrc.js b/.eslintrc.js index bfd145f34bbecb8fdcc9e8c2eaaeedec436389e4..5487446c84f200a2cb9301ad966de634347a8e5b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,6 @@ module.exports = { sourceType: 'module', ecmaFeatures: { jsx: true, - jsx: true, }, }, diff --git a/build/script/preview.ts b/build/script/preview.ts index ff52143d31074aed1da581525134e095d63d94cf..97101d5d605dd4e38d9814d0f5b065ae2275f2be 100644 --- a/build/script/preview.ts +++ b/build/script/preview.ts @@ -53,7 +53,7 @@ export const runPreview = async () => { }); const { type } = await prompt; if (type === BUILD) { - runBuild(); + await runBuild(); } startApp(); }; diff --git a/package.json b/package.json index 5a8db3fd7d26acf68b48f43383ddf5471d206627..eb73123d0b4b9a1a576ed5dcfba60fb8b8a289d4 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,10 @@ "serve": "cross-env ts-node --files -P ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite", "build": "node ./build/jsc.ts build", "build:site": "cross-env SITE=true npm run build ", - "build:no-cache": "yarn clean:cache && npm run build", + "build:no-cache": "yarn clean:cache && node ./build/jsc.ts build", "report": "cross-env REPORT=true npm run build ", "preview": "node ./build/jsc.ts preview", "log": "node ./build/jsc.ts log", - "gen:gz": "node ./build/jsc.ts gzip", "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite_opt_cache", "clean:lib": "npx rimraf node_modules", "ls-lint": "npx ls-lint", diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue index dfb5a271ecd54e77bd821cab0f2dc64fa7affc91..b7fa4fe140fd537e89e8597fee1c943fd72468bb 100644 --- a/src/components/Container/src/collapse/CollapseContainer.vue +++ b/src/components/Container/src/collapse/CollapseContainer.vue @@ -4,12 +4,12 @@
- +
@@ -24,13 +24,18 @@ import CollapseHeader from './CollapseHeader.vue'; import { Skeleton } from 'ant-design-vue'; - import LazyContainer from '../LazyContainer'; + // import LazyContainer from '../LazyContainer'; import { triggerWindowResize } from '/@/utils/event/triggerWindowResizeEvent'; // hook import { useTimeout } from '/@/hooks/core/useTimeout'; export default defineComponent({ - components: { Skeleton, LazyContainer, CollapseHeader, CollapseTransition }, + components: { + Skeleton, + // LazyContainer, + CollapseHeader, + CollapseTransition, + }, name: 'CollapseContainer', props: { // 标题 diff --git a/src/components/Transition/src/ExpandTransition.ts b/src/components/Transition/src/ExpandTransition.ts index 6b7e8126ec51e2a06ba4dee4494279436bb60974..fec4caa845c3294a1dc3736bbb85b244e57280b2 100644 --- a/src/components/Transition/src/ExpandTransition.ts +++ b/src/components/Transition/src/ExpandTransition.ts @@ -9,7 +9,6 @@ interface HTMLExpandElement extends HTMLElement { _parent?: (Node & ParentNode & HTMLElement) | null; _initialStyle: { transition: string; - visibility: string | null; overflow: string | null; height?: string | null; width?: string | null; @@ -25,7 +24,6 @@ export default function (expandedParentClass = '', x = false) { el._parent = el.parentNode as (Node & ParentNode & HTMLElement) | null; el._initialStyle = { transition: el.style.transition, - visibility: el.style.visibility, overflow: el.style.overflow, [sizeProperty]: el.style[sizeProperty], }; @@ -35,7 +33,6 @@ export default function (expandedParentClass = '', x = false) { const initialStyle = el._initialStyle; el.style.setProperty('transition', 'none', 'important'); - // Hide overflow to account for collapsed margins in the calculated height el.style.overflow = 'hidden'; const offset = `${el[offsetProperty]}px`; @@ -60,7 +57,6 @@ export default function (expandedParentClass = '', x = false) { leave(el: HTMLExpandElement) { el._initialStyle = { transition: '', - visibility: '', overflow: el.style.overflow, [sizeProperty]: el.style[sizeProperty], }; @@ -88,6 +84,6 @@ export default function (expandedParentClass = '', x = false) { const size = el._initialStyle[sizeProperty]; el.style.overflow = el._initialStyle.overflow!; if (size != null) el.style[sizeProperty] = size; - Reflect.deleteProperty(el, '_initialStyle'); + delete (el as any)._initialStyle; } } diff --git a/src/views/demo/form/AdvancedForm.vue b/src/views/demo/form/AdvancedForm.vue index c6b0f8a753be988444c539355c2a42b5f9778ed5..e02ea3ac49300e7d0602687a77f56dcb7ee370df 100644 --- a/src/views/demo/form/AdvancedForm.vue +++ b/src/views/demo/form/AdvancedForm.vue @@ -1,6 +1,5 @@