chore: auto merge branches (#37579)

chore: next merge master
2024-11-24 02:59:58 +08:00 · 2022-09-16 07:41:16 +00:00 · 2022-09-16 07:41:16 +00:00 · 87f9cf362b
commit 87f9cf362b
parent 607ad0dfdd 7da32ce007
7 changed files with 106 additions and 20 deletions
--- a/.github/workflows/ui-upload.yml
+++ b/.github/workflows/ui-upload.yml
@ -0,0 +1,62 @@
+# Upload 📷 UI snapshots to argos server, help visual regression testing.
+name: 📷 UI Upload
+
+on:
+  workflow_run:
+    workflows: ["📷 UI"]
+    types:
+      - completed
+
+permissions:
+  contents: read
+
+jobs:
+  upload-ui:
+    permissions:
+      actions: read  # for dawidd6/action-download-artifact to query and download artifacts
+      pull-requests: read  # for dawidd6/action-download-artifact to query commit hash
+    name: deploy preview
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Download commit artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: ${{ github.event.workflow_run.workflow_id }}
+          name: commit
+
+      - name: Save commit id
+        id: commit
+        run: echo "::set-output name=id::$(<commit.txt)"
+
+      - name: Download branch artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: ${{ github.event.workflow_run.workflow_id }}
+          name: branch
+
+      - name: Save branch id
+        id: branch
+        run: echo "::set-output name=id::$(<branch.txt)"
+
+      - name: Download snapshots artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: ${{ github.event.workflow_run.workflow_id }}
+          workflow_conclusion: success
+          name: snapshots
+          path: imageSnapshots
+
+      - name: Install
+        run: npm i fast-glob lodash @argos-ci/core
+
+      - name: Upload on Argos
+        id: deploy
+        run: npm run argos
+        env:
+          ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
+          ARGOS_PARALLEL_NONCE: ${{ github.run_id }}
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@ -52,12 +52,39 @@ jobs:
      - name: test
        run: npm run test-image

-      - name: Install dependencies to run Argos upload
-        run: npm i fast-glob lodash @argos-ci/core
+      - name: upload snapshots artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: snapshots
+          path: imageSnapshots/
+          retention-days: 3

-      - name: Upload on Argos
-        id: deploy
-        run: npm run argos
-        env:
-          ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
-          ARGOS_PARALLEL_NONCE: ${{ github.run_id }}
+      - name: Save commit
+        if: github.event_name == 'pull_request' && github.base_ref == 'master'
+        run: echo ${{ github.event.pull_request.head.sha }} > ./commit.txt
+
+      - name: Save commit
+        if: github.event_name == 'push'
+        run: echo ${{ github.sha }} > ./commit.txt
+
+      - name: Upload commit
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: commit
+          path: ./commit.txt
+
+      - name: Save branch
+        if: github.event_name == 'pull_request' && github.base_ref == 'master'
+        run: echo pull/${{ github.event.pull_request.number }}/merge > ./branch.txt
+
+      - name: Save branch
+        if: github.event_name == 'push'
+        run: echo ${GITHUB_REF##*/} > ./branch.txt
+
+      - name: Upload branch
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: branch
+          path: ./branch.txt
--- a/.github/workflows/verify-files-modify.yml
+++ b/.github/workflows/verify-files-modify.yml
@ -19,6 +19,7 @@ jobs:
          forbid-paths: '.github/, scripts/'
          forbid-files: 'CHANGELOG.zh-CN.md, CHANGELOG.en-US.md, LICENSE'
          skip-verify-authority: 'write'
+          skip-label: 'skip-verify-files'
          assignees: 'afc163, zombieJ, xrkffgg, MadCcc'
          comment-mark: 'version'
          comment: |
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@ -32,7 +32,7 @@ function isReactFragment(node: React.ReactNode) {
 }

 // Insert one space between two chinese characters automatically.
-function insertSpace(child: React.ReactChild, needInserted: boolean) {
+function insertSpace(child: React.ReactElement | string | number, needInserted: boolean) {
  // Check the child if is undefined or null.
  if (child === null || child === undefined) {
    return;
@ -77,7 +77,7 @@ function spaceChildren(children: React.ReactNode, needInserted: boolean) {

  // Pass to React.Children.map to auto fill key
  return React.Children.map(childList, child =>
-    insertSpace(child as React.ReactChild, needInserted),
+    insertSpace(child as React.ReactElement | string | number, needInserted),
  );
 }

--- a/components/table/tests/snapshots/demo-extend.test.ts.snap
+++ b/components/table/tests/snapshots/demo-extend.test.ts.snap
@ -8614,9 +8614,7 @@ exports[`renders ./components/table/demo/filter-search.md extend context correct
                                    </span>
                                  </label>
                                  <span>
-                                    <span>
-                                      London
-                                    </span>
+                                    London
                                  </span>
                                </span>
                              </li>
@ -8668,9 +8666,7 @@ exports[`renders ./components/table/demo/filter-search.md extend context correct
                                    </span>
                                  </label>
                                  <span>
-                                    <span>
-                                      New York
-                                    </span>
+                                    New York
                                  </span>
                                </span>
                              </li>
--- a/components/table/demo/filter-search.md
+++ b/components/table/demo/filter-search.md
@ -46,7 +46,7 @@ const columns: ColumnsType<DataType> = [
    ],
    filterMode: 'tree',
    filterSearch: true,
-    onFilter: (value: string, record) => record.address.startsWith(value),
+    onFilter: (value: string, record) => record.name.startsWith(value),
    width: '30%',
  },
  {
@ -59,11 +59,11 @@ const columns: ColumnsType<DataType> = [
    dataIndex: 'address',
    filters: [
      {
-        text: <span>London</span>,
+        text: 'London',
        value: 'London',
      },
      {
-        text: <span>New York</span>,
+        text: 'New York',
        value: 'New York',
      },
    ],
--- a/components/upload/index.zh-CN.md
+++ b/components/upload/index.zh-CN.md
@ -43,7 +43,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/QaeBt_ZMg/Upload.svg
 | progress | 自定义进度条样式 | [ProgressProps](/components/progress/#API)（仅支持 `type="line"`） | { strokeWidth: 2, showInfo: false } | 4.3.0 |
 | showUploadList | 是否展示文件列表, 可设为一个对象，用于单独设定 `showPreviewIcon`, `showRemoveIcon`, `showDownloadIcon`, `removeIcon` 和 `downloadIcon` | boolean \| { showPreviewIcon?: boolean, showRemoveIcon?: boolean, showDownloadIcon?: boolean, previewIcon?: ReactNode \| (file: UploadFile) => ReactNode, removeIcon?: ReactNode \| (file: UploadFile) => ReactNode, downloadIcon?: ReactNode \| (file: UploadFile) => ReactNode } | true | function: 4.7.0 |
 | withCredentials | 上传请求时是否携带 cookie | boolean | false |  |
-| onChange | 上传文件改变时的状态，详见 [onChange](#onChange) | function | - |  |
+| onChange | 上传文件改变时的回调，详见 [onChange](#onChange) | function | - |  |
 | onDrop | 当文件被拖入上传区域时执行的回调功能 | (event: React.DragEvent) => void | - | 4.16.0 |
 | onDownload | 点击下载文件时的回调，如果没有指定，则默认跳转到文件 url 对应的标签页 | function(file): void | (跳转新标签页) |  |
 | onPreview | 点击文件链接或预览图标时的回调 | function(file) | - |  |