✨ feat: 新增 default Props

arvinxx · Nov 28, 2021 · e674058 · e674058 · vercel · Nov 28, 2021
1 parent cca4137
commit e674058
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 4 deletions.
diff --git a/packages/asset-gallery/src/demos/Demo.tsx → packages/asset-gallery/demos/Demo.tsx b/packages/asset-gallery/src/demos/Demo.tsx → packages/asset-gallery/demos/Demo.tsx
diff --git a/packages/asset-gallery/src/demos/PngDemo.tsx → packages/asset-gallery/demos/PngDemo.tsx b/packages/asset-gallery/src/demos/PngDemo.tsx → packages/asset-gallery/demos/PngDemo.tsx
diff --git a/...es/asset-gallery/src/demos/SketchDemo.tsx → packages/asset-gallery/demos/SketchDemo.tsx b/...es/asset-gallery/src/demos/SketchDemo.tsx → packages/asset-gallery/demos/SketchDemo.tsx
diff --git a/...ages/asset-gallery/src/demos/YAMLDemo.tsx → packages/asset-gallery/demos/YAMLDemo.tsx b/...ages/asset-gallery/src/demos/YAMLDemo.tsx → packages/asset-gallery/demos/YAMLDemo.tsx
diff --git a/packages/asset-gallery/src/demos/data.ts → packages/asset-gallery/demos/data.ts b/packages/asset-gallery/src/demos/data.ts → packages/asset-gallery/demos/data.ts
diff --git a/packages/asset-gallery/src/demos/png.ts → packages/asset-gallery/demos/png.ts b/packages/asset-gallery/src/demos/png.ts → packages/asset-gallery/demos/png.ts
diff --git a/packages/asset-gallery/src/demos/sketch.ts → packages/asset-gallery/demos/sketch.ts b/packages/asset-gallery/src/demos/sketch.ts → packages/asset-gallery/demos/sketch.ts
diff --git a/packages/asset-gallery/src/demos/yml.ts → packages/asset-gallery/demos/yml.ts b/packages/asset-gallery/src/demos/yml.ts → packages/asset-gallery/demos/yml.ts
diff --git a/packages/asset-gallery/src/AssetGallery.tsx b/packages/asset-gallery/src/AssetGallery.tsx
@@ -15,19 +15,23 @@ const AssetGallery: FC<AssetGalleryProps> = ({
   data,
   darkBackground,
   layout: layoutProps,
+  defaultLayout,
   logo,
   showSlider = true,
   onLayoutChange,
   columns: columnsProps,
+  defaultColumns,
   onColumnsChange,
   style,
 }) => {
   const [columns, setColumn] = useMergeValue(4, {
     value: columnsProps,
+    defaultValue: defaultColumns,
     onChange: onColumnsChange,
   });
   const [layout, setLayout] = useMergeValue('masonry', {
     value: layoutProps,
+    defaultValue: defaultLayout,
     onChange: onLayoutChange,
   });
 

diff --git a/packages/asset-gallery/src/asset-gallery.md b/packages/asset-gallery/src/asset-gallery.md
@@ -30,24 +30,25 @@ nav:
 ### 使用 JSON
 
 组件库的 Logo 物料
-<code src='./demos/Demo.tsx' />
+
+<code src='../demos/Demo.tsx' />
 
 ### 使用 YML
 
 `v2.0.0` 开始支持使用 YAML 语法
 
-<code src='./demos/YAMLDemo.tsx' />
+<code src='../demos/YAMLDemo.tsx' />
 
 ### Png 图片
 
 图片源为 Png
 
-<code src='./demos/PngDemo.tsx' />
+<code src='../demos/PngDemo.tsx' />
 
 ## Sketch 素材
 
 复制 Sketch 文件, 使用 [sketch-json](https://github.com/arvinxx/sketch-json) 粘贴到 sketch 中
 
-<code src='./demos/SketchDemo.tsx' />
+<code src='../demos/SketchDemo.tsx' />
 
 <API src='./index.tsx'></API>
diff --git a/packages/asset-gallery/src/types.ts b/packages/asset-gallery/src/types.ts
@@ -73,6 +73,13 @@ export interface AssetGalleryProps {
    * @default grid
    */
   layout?: LayoutType;
+  /**
+   * @title 布局方式
+   * @enum ['grid','masonry']
+   * @enumOptions  [{ label: '网格', value: 'grid' }, { label: '瀑布流', value: 'masonry' }]
+   * @default grid
+   */
+  defaultLayout?: LayoutType;
   /**
    * 布局切换时的回调
    * @ignore
@@ -87,6 +94,11 @@ export interface AssetGalleryProps {
    * @default 1
    */
   columns?: number;
+  /**
+   * @title 初始列数
+   * @default 1
+   */
+  defaultColumns?: number;
   /**
    * 列数改变时的回调
    * @param columns