From 09c427854c920674026aee2f57e5d414ea183d07 Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Fri, 12 Jul 2019 13:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renderers/Form/__snapshots__/datetime.test.tsx.snap   | 2 +-
 __tests__/renderers/Form/datetime.test.tsx                | 2 +-
 __tests__/renderers/__snapshots__/Carousel.test.tsx.snap  | 2 +-
 src/factory.tsx                                           | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/__tests__/renderers/Form/__snapshots__/datetime.test.tsx.snap b/__tests__/renderers/Form/__snapshots__/datetime.test.tsx.snap
index cc190f8dc..e80333fc0 100644
--- a/__tests__/renderers/Form/__snapshots__/datetime.test.tsx.snap
+++ b/__tests__/renderers/Form/__snapshots__/datetime.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`Renderer:date 1`] = `
               <span
                 class="a-DatePicker-value"
               >
-                2019-06-06 21:11
+                2019-06-06 21:11:00
               </span>
               <a
                 class="a-DatePicker-clear"
diff --git a/__tests__/renderers/Form/datetime.test.tsx b/__tests__/renderers/Form/datetime.test.tsx
index 523f12ffe..a1b15521d 100644
--- a/__tests__/renderers/Form/datetime.test.tsx
+++ b/__tests__/renderers/Form/datetime.test.tsx
@@ -30,7 +30,7 @@ test('Renderer:date', async () => {
     })));
 
     const input = container.querySelector('.a-DatePicker-value');
-    expect(input.innerHTML).toEqual('2019-06-06 21:11');
+    expect(input.innerHTML).toEqual('2019-06-06 21:11:00');
 
     expect(container).toMatchSnapshot();
 });
\ No newline at end of file
diff --git a/__tests__/renderers/__snapshots__/Carousel.test.tsx.snap b/__tests__/renderers/__snapshots__/Carousel.test.tsx.snap
index 4c5862886..518120684 100644
--- a/__tests__/renderers/__snapshots__/Carousel.test.tsx.snap
+++ b/__tests__/renderers/__snapshots__/Carousel.test.tsx.snap
@@ -4,10 +4,10 @@ exports[`Renderer:carousel 1`] = `
 <div>
   <div
     class="a-Carousel a-Carousel--light show"
+    style="width: 500px; height: 300px;"
   >
     <div
       class="a-Carousel-container"
-      style="width: 500px; height: 300px;"
     >
       <div
         class="a-Carousel-item fade in"
diff --git a/src/factory.tsx b/src/factory.tsx
index 020c0c43d..5d49a3d4b 100644
--- a/src/factory.tsx
+++ b/src/factory.tsx
@@ -420,6 +420,14 @@ class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
             delete schema.$ref;
             path = path.replace(/(?!.*\/).*/, schema.type);
         }
+        // value 会提前从 control 中获取到，所有需要把control中的属性也补充完整
+        if (schema.control && schema.control.$ref) {
+            schema.control = {
+                ...props.resolveDefinitions(schema.control.$ref),
+                ...schema.control
+            }
+            delete schema.control.$ref;
+        }
         this.renderer = rendererResolver(path, schema, props);
         return schema;
     }