chore: Merge feature branch and fix conflicts #2302
dengfupingAnnotations
10 errors and 1 warning
|
src/Area/__tests__/ref.test.tsx:
node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js#L549
Error: Cannot apply @Injectable decorator multiple times.
❯ ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/injectable.ts:8:13
❯ DecorateConstructor ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:549:33
❯ Reflect.decorate ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:143:24
❯ _decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:67:13
❯ Proxy.decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:89:9
❯ ../../node_modules/.pnpm/@AntV[email protected]/node_modules/@antv/l7-core/es/inversify.config.js:91:23
|
|
src/DualAxes/__tests__/ref.test.tsx:
node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js#L549
Error: Cannot apply @Injectable decorator multiple times.
❯ ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/injectable.ts:8:13
❯ DecorateConstructor ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:549:33
❯ Reflect.decorate ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:143:24
❯ _decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:67:13
❯ Proxy.decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:89:9
❯ ../../node_modules/.pnpm/@AntV[email protected]/node_modules/@antv/l7-core/es/inversify.config.js:91:23
|
|
src/Line/__tests__/ref.test.tsx:
node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js#L549
Error: Cannot apply @Injectable decorator multiple times.
❯ ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/injectable.ts:8:13
❯ DecorateConstructor ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:549:33
❯ Reflect.decorate ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:143:24
❯ _decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:67:13
❯ Proxy.decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:89:9
❯ ../../node_modules/.pnpm/@AntV[email protected]/node_modules/@antv/l7-core/es/inversify.config.js:91:23
|
|
src/Pie/__tests__/donut.test.tsx:
node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js#L549
Error: Cannot apply @Injectable decorator multiple times.
❯ ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/injectable.ts:8:13
❯ DecorateConstructor ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:549:33
❯ Reflect.decorate ../../node_modules/.pnpm/[email protected]/node_modules/reflect-metadata/Reflect.js:143:24
❯ _decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:67:13
❯ Proxy.decorate ../../node_modules/.pnpm/[email protected]/node_modules/inversify/src/annotation/decorator_utils.ts:89:9
❯ ../../node_modules/.pnpm/@AntV[email protected]/node_modules/@antv/l7-core/es/inversify.config.js:91:23
|
|
src/PageContainer/__tests__/index.test.tsx > PageContainer > extra and footer:
packages/ui/src/PageContainer/__tests__/index.test.tsx#L14
Error: Snapshot `PageContainer > extra and footer 1` mismatched
- Expected
+ Received
@@ -142,11 +142,11 @@
>
<input
aria-invalid="false"
autocomplete="off"
date-range="start"
- placeholder="Start date"
+ placeholder="开始日期"
size="12"
value=""
/>
</div>
<div
@@ -182,11 +182,11 @@
>
<input
aria-invalid="false"
autocomplete="off"
date-range="end"
- placeholder="End date"
+ placeholder="结束日期"
size="12"
value=""
/>
</div>
<div
❯ src/PageContainer/__tests__/index.test.tsx:14:37
|
|
src/modal/__tests__/progress.test.tsx > Modal.Progress > render with progress.percent:
packages/design/src/modal/__tests__/progress.test.tsx#L49
Error: Snapshot `Modal.Progress > render with progress.percent 1` mismatched
- Expected
+ Received
@@ -21,111 +21,116 @@
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
- class="ant-modal-content"
+ style="outline: none;"
+ tabindex="-1"
>
- <button
- aria-label="Close"
- class="ant-modal-close"
- type="button"
+ <div
+ class="ant-modal-content"
>
- <span
- class="ant-modal-close-x"
+ <button
+ aria-label="Close"
+ class="ant-modal-close"
+ type="button"
>
<span
- aria-label="close"
- class="anticon anticon-close ant-modal-close-icon"
- role="img"
+ class="ant-modal-close-x"
>
- <svg
- aria-hidden="true"
- data-icon="close"
- fill="currentColor"
- fill-rule="evenodd"
- focusable="false"
- height="1em"
- viewBox="64 64 896 896"
- width="1em"
+ <span
+ aria-label="close"
+ class="anticon anticon-close ant-modal-close-icon"
+ role="img"
>
- <path
- d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
- />
- </svg>
+ <svg
+ aria-hidden="true"
+ data-icon="close"
+ fill="currentColor"
+ fill-rule="evenodd"
+ focusable="false"
+ height="1em"
+ viewBox="64 64 896 896"
+ width="1em"
+ >
+ <path
+ d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
+ />
+ </svg>
+ </span>
</span>
- </span>
- </button>
- <div
- class="ant-modal-header"
- >
+ </button>
<div
- class="ant-modal-title"
- id="test-id"
+ class="ant-modal-header"
>
- This is title
+ <div
+ class="ant-modal-title"
+ id="test-id"
+ >
+ This is title
+ </div>
</div>
- </
|
|
src/modal/__tests__/progress.test.tsx > Modal.Progress > render with progress.status:
packages/design/src/modal/__tests__/progress.test.tsx#L62
Error: Snapshot `Modal.Progress > render with progress.status 1` mismatched
- Expected
+ Received
@@ -21,129 +21,134 @@
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
- class="ant-modal-content"
+ style="outline: none;"
+ tabindex="-1"
>
- <button
- aria-label="Close"
- class="ant-modal-close"
- type="button"
+ <div
+ class="ant-modal-content"
>
- <span
- class="ant-modal-close-x"
+ <button
+ aria-label="Close"
+ class="ant-modal-close"
+ type="button"
>
<span
- aria-label="close"
- class="anticon anticon-close ant-modal-close-icon"
- role="img"
+ class="ant-modal-close-x"
>
- <svg
- aria-hidden="true"
- data-icon="close"
- fill="currentColor"
- fill-rule="evenodd"
- focusable="false"
- height="1em"
- viewBox="64 64 896 896"
- width="1em"
+ <span
+ aria-label="close"
+ class="anticon anticon-close ant-modal-close-icon"
+ role="img"
>
- <path
- d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
- />
- </svg>
+ <svg
+ aria-hidden="true"
+ data-icon="close"
+ fill="currentColor"
+ fill-rule="evenodd"
+ focusable="false"
+ height="1em"
+ viewBox="64 64 896 896"
+ width="1em"
+ >
+ <path
+ d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
+ />
+ </svg>
+ </span>
</span>
- </span>
- </button>
- <div
- class="ant-modal-header"
- >
+ </button>
<div
- class="ant-modal-title"
- id="test-id"
+ class="ant-modal-header"
>
- This is title
+ <div
+ class="ant-modal-title"
+ id="test-id"
+ >
+ This is title
+ </div>
</div>
- </d
|
|
src/modal/__tests__/progress.test.tsx > Modal.Progress > render without description:
packages/design/src/modal/__tests__/progress.test.tsx#L69
Error: Snapshot `Modal.Progress > render without description 1` mismatched
- Expected
+ Received
@@ -21,105 +21,110 @@
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
- class="ant-modal-content"
+ style="outline: none;"
+ tabindex="-1"
>
- <button
- aria-label="Close"
- class="ant-modal-close"
- type="button"
+ <div
+ class="ant-modal-content"
>
- <span
- class="ant-modal-close-x"
+ <button
+ aria-label="Close"
+ class="ant-modal-close"
+ type="button"
>
<span
- aria-label="close"
- class="anticon anticon-close ant-modal-close-icon"
- role="img"
+ class="ant-modal-close-x"
>
- <svg
- aria-hidden="true"
- data-icon="close"
- fill="currentColor"
- fill-rule="evenodd"
- focusable="false"
- height="1em"
- viewBox="64 64 896 896"
- width="1em"
+ <span
+ aria-label="close"
+ class="anticon anticon-close ant-modal-close-icon"
+ role="img"
>
- <path
- d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
- />
- </svg>
+ <svg
+ aria-hidden="true"
+ data-icon="close"
+ fill="currentColor"
+ fill-rule="evenodd"
+ focusable="false"
+ height="1em"
+ viewBox="64 64 896 896"
+ width="1em"
+ >
+ <path
+ d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
+ />
+ </svg>
+ </span>
</span>
- </span>
- </button>
- <div
- class="ant-modal-header"
- >
+ </button>
<div
- class="ant-modal-title"
- id="test-id"
+ class="ant-modal-header"
>
- This is title
+ <div
+ class="ant-modal-title"
+ id="test-id"
+ >
+ This is title
+ </div>
</div>
- </di
|
|
src/modal/__tests__/progress.test.tsx > Modal.Progress > render with loading:
packages/design/src/modal/__tests__/progress.test.tsx#L78
Error: Snapshot `Modal.Progress > render with loading 1` mismatched
- Expected
+ Received
@@ -21,78 +21,83 @@
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
- class="ant-modal-content"
+ style="outline: none;"
+ tabindex="-1"
>
- <button
- aria-label="Close"
- class="ant-modal-close"
- type="button"
+ <div
+ class="ant-modal-content"
>
- <span
- class="ant-modal-close-x"
+ <button
+ aria-label="Close"
+ class="ant-modal-close"
+ type="button"
>
<span
- aria-label="close"
- class="anticon anticon-close ant-modal-close-icon"
+ class="ant-modal-close-x"
+ >
+ <span
+ aria-label="close"
+ class="anticon anticon-close ant-modal-close-icon"
+ role="img"
+ >
+ <svg
+ aria-hidden="true"
+ data-icon="close"
+ fill="currentColor"
+ fill-rule="evenodd"
+ focusable="false"
+ height="1em"
+ viewBox="64 64 896 896"
+ width="1em"
+ >
+ <path
+ d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z"
+ />
+ </svg>
+ </span>
+ </span>
+ </button>
+ <div
+ class="ant-modal-header"
+ >
+ <div
+ class="ant-modal-title"
+ id="test-id"
+ >
+ This is title
+ </div>
+ </div>
+ <div
+ class="ant-modal-body"
+ >
+ <span
+ aria-label="loading"
+ class="anticon anticon-loading anticon-spin ant-modal-progress-loading"
role="img"
>
<svg
aria-hidden="true"
- data-icon="close"
+ data-icon="loading"
fill="currentColor"
- fill-rule="evenodd"
focusable="false"
height="1em"
- viewBox="64 64 896 896"
+ viewBox="0 0 1024 1024"
width="1em"
>
<path
- d="M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 4
|
|
build (16.x, ubuntu-latest)
Process completed with exit code 1.
|
|
build (16.x, ubuntu-latest)
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3, actions/setup-node@v3, pnpm/action-setup@v2. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|