fix(docs): Fix merge conflict and S3UploadButton examples

2025-02-17 14:30:34 +08:00 · 2021-01-29 17:23:03 +02:00 · 2021-01-29 17:23:03 +02:00 · e496d8c8de
commit e496d8c8de
parent 0b06af3c33
2 changed files with 12 additions and 7 deletions
--- a/packages/blocks/blocksAntd/demo/examples/S3UploadButton.yaml
+++ b/packages/blocks/blocksAntd/demo/examples/S3UploadButton.yaml
@ -1,23 +1,30 @@
 - id: default
  type: S3UploadButton
+  properties:
+    s3PostPolicyRequestId: s3PostPolicyRequestId
 - id: properties.accept
  type: S3UploadButton
  properties:
    accept: '.png,.jpg'
+    s3PostPolicyRequestId: s3PostPolicyRequestId
 - id: properties.button
  type: S3UploadButton
  properties:
    button:
      type: primary
+    s3PostPolicyRequestId: s3PostPolicyRequestId
 - id: properties.disabled
  type: S3UploadButton
  properties:
    disabled: true
+    s3PostPolicyRequestId: s3PostPolicyRequestId
 - id: properties.showUploadList
  type: S3UploadButton
  properties:
+    s3PostPolicyRequestId: s3PostPolicyRequestId
    showUploadList: true
 - id: properties.singleFile
  type: S3UploadButton
  properties:
-    singleFile: true
+    s3PostPolicyRequestId: s3PostPolicyRequestId
+    singleFile: true
--- a/packages/docs/lowdefy.yaml
+++ b/packages/docs/lowdefy.yaml
@ -178,15 +178,12 @@ menus:
          - id: RadioSelector
            type: MenuLink
            pageId: RadioSelector
-<<<<<<< HEAD
-          - id: S3UploadButton
-            type: MenuLink
-            pageId: S3UploadButton
-=======
          - id: RatingSlider
            type: MenuLink
            pageId: RatingSlider
->>>>>>> origin/develop
+          - id: S3UploadButton
+            type: MenuLink
+            pageId: S3UploadButton
          - id: Selector
            type: MenuLink
            pageId: Selector
@ -490,3 +487,4 @@ pages:
  - _ref: operators/_yaml.yaml

  - _ref: 404.yaml
+  - id: test