Merge branch 'master' of https://github.com/baidu/amis

__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"

__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();
 });

__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"

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;
     }