diff --git a/packages/abc/st/test/st.spec.ts b/packages/abc/st/test/st.spec.ts index 20860f5e0f..f08936a232 100644 --- a/packages/abc/st/test/st.spec.ts +++ b/packages/abc/st/test/st.spec.ts @@ -750,31 +750,6 @@ describe('abc: st', () => { .asyncEnd(); })); }); - // TODO: 当前版本自动设置,无须参与计算 - xdescribe('[fixed]', () => { - it('should be fixed left column', fakeAsync(() => { - page.updateColumn([ - { title: '1', index: 'id', fixed: 'left', width: '100px' }, - { title: '2', index: 'id', fixed: 'left', width: '100px' }, - { title: '3', index: 'id', fixed: 'left', width: '100px' } - ]); - expect(page.getCell(1, 1).style.left).toBe('0px'); - expect(page.getCell(1, 2).style.left).toBe('100px'); - expect(page.getCell(1, 3).style.left).toBe('200px'); - page.asyncEnd(); - })); - it('should be fixed right column', fakeAsync(() => { - page.updateColumn([ - { title: '1', index: 'id', fixed: 'right', width: '100px' }, - { title: '2', index: 'id', fixed: 'right', width: '100px' }, - { title: '3', index: 'id', fixed: 'right', width: '100px' } - ]); - expect(page.getCell(1, 1).style.right).toBe('200px'); - expect(page.getCell(1, 2).style.right).toBe('100px'); - expect(page.getCell(1, 3).style.right).toBe('0px'); - page.asyncEnd(); - })); - }); describe('[Mulit Headers]', () => { it('should be working', fakeAsync(() => { page.updateColumn([ diff --git a/scripts/build/generate-css.js b/scripts/build/generate-css.js index af69a54388..a41374f218 100755 --- a/scripts/build/generate-css.js +++ b/scripts/build/generate-css.js @@ -21,8 +21,7 @@ async function genCss(name, min) { less.render .call(less, content, { plugins, - paths: ['node_modules/'], - javascriptEnabled: true, + paths: [path.join(__dirname, '../../node_modules/')] }) .then(({ css }) => { const savePath = path.join(ROOT_DIR, `theme/${name}${min ? '.min' : ''}.css`); diff --git a/scripts/ci/build-artifacts-site.sh b/scripts/ci/build-artifacts-site.sh index 009de17a65..d73c607921 100755 --- a/scripts/ci/build-artifacts-site.sh +++ b/scripts/ci/build-artifacts-site.sh @@ -102,7 +102,10 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then echo "removed tag because tag is already published" + git tag -d ${buildTagName} + git push --delete origin ${buildTagName} git push origin :refs/tags/${buildTagName} + sleep 2 fi echo "Git configuration has been updated to match the last commit author. Publishing now.." diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index a25c34026a..c639bcbfeb 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -92,9 +92,10 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then echo "removed tag because tag is already published" + git tag -d ${buildTagName} git push --delete origin ${buildTagName} git push origin :refs/tags/${buildTagName} - sleep 5 + sleep 2 fi echo "Git configuration has been updated to match the last commit author. Publishing now.." diff --git a/scripts/ci/build-delon.sh b/scripts/ci/build-delon.sh index e776766322..6b0d6b94a8 100755 --- a/scripts/ci/build-delon.sh +++ b/scripts/ci/build-delon.sh @@ -42,9 +42,8 @@ buildLess() { node ./scripts/build/copy-less.js echo 'fix zorro path...' node ./scripts/build/fix-zorro-path.js - # TODO: https://github.com/NG-ZORRO/ng-zorro-antd/issues/8618 - # echo 'build full css...' - # node ./scripts/build/generate-css.js + echo 'build full css...' + node ./scripts/build/generate-css.js } addBanners() {