diff --git a/src/components/Waterfall/src/Waterfall.vue b/src/components/Waterfall/src/Waterfall.vue
index 63d4374..01c8d5b 100644
--- a/src/components/Waterfall/src/Waterfall.vue
+++ b/src/components/Waterfall/src/Waterfall.vue
@@ -1,20 +1,67 @@
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
+import { ref, nextTick, unref } from 'vue'
 
 const { getPrefixCls } = useDesign()
 
 const prefixCls = getPrefixCls('waterfall')
 
-defineProps({
-  data: propTypes.array.def([]),
+const prop = defineProps({
+  data: propTypes.arrayOf(propTypes.any),
   reset: propTypes.bool.def(false),
   width: propTypes.number.def(200),
   gap: propTypes.number.def(20),
-  getContainer: propTypes.func.def(() => document.body)
+  getContainer: propTypes.func.def(() => document.body),
+  props: propTypes.objectOf(propTypes.string).def({
+    src: 'src',
+    height: 'height'
+  })
 })
+
+const wrapEl = ref<HTMLDivElement>()
+
+const heights = ref<number[]>([])
+
+// 首先确定列数 = 页面宽度 / 图片宽度
+const cols = ref(0)
+
+const filterWaterfall = async () => {
+  const { props, width, gap, getContainer } = prop
+  const data = prop.data as any[]
+  await nextTick()
+
+  const container = (getContainer?.() || unref(wrapEl)) as HTMLElement
+  if (!container) return
+  cols.value = Math.floor(container.clientWidth / (width + gap))
+
+  const length = data.length
+  for (let i = 0; i < length; i++) {
+    if (i + 1 < unref(cols)) {
+      // 说明在第一列
+      const height = data[i][props.height as string]
+      if (height) {
+        heights.value.push(height)
+      } else {
+        await nextTick()
+        const itemEl = container.querySelector(`.${prefixCls}-item__${i}`)
+        const rectObject = itemEl?.clientHeight
+        console.log(rectObject)
+      }
+    }
+  }
+}
+filterWaterfall()
 </script>
 
 <template>
-  <div :class="prefixCls"></div>
+  <div :class="prefixCls" ref="wrapEl">
+    <div
+      v-for="(item, $index) in data"
+      :class="`${prefixCls}-item__${$index}`"
+      :key="`water-${$index}`"
+    >
+      <img :src="item[props.src as string]" alt="" srcset="" />
+    </div>
+  </div>
 </template>
diff --git a/src/utils/propTypes.ts b/src/utils/propTypes.ts
index e211c09..863f55c 100644
--- a/src/utils/propTypes.ts
+++ b/src/utils/propTypes.ts
@@ -1,11 +1,22 @@
-import VueTypes, { toType } from 'vue-types'
-import { CSSProperties, PropType } from 'vue'
+import { VueTypeValidableDef, VueTypesInterface, createTypes, toValidableType } from 'vue-types'
+import { CSSProperties } from 'vue'
 
-class propTypes extends VueTypes {
+type PropTypes = VueTypesInterface & {
+  readonly style: VueTypeValidableDef<CSSProperties>
+}
+const newPropTypes = createTypes({
+  func: undefined,
+  bool: undefined,
+  string: undefined,
+  number: undefined,
+  object: undefined,
+  integer: undefined
+}) as PropTypes
+
+class propTypes extends newPropTypes {
   static get style() {
-    return toType('style', {
-      type: [String, Object] as PropType<[string | CSSProperties]>,
-      default: undefined
+    return toValidableType('style', {
+      type: [String, Object]
     })
   }
 }
diff --git a/src/views/Components/Waterfall.vue b/src/views/Components/Waterfall.vue
index ac0a6b5..60fc3ad 100644
--- a/src/views/Components/Waterfall.vue
+++ b/src/views/Components/Waterfall.vue
@@ -28,6 +28,12 @@ const { t } = useI18n()
 
 <template>
   <ContentWrap :title="t('router.waterfall')">
-    <Waterfall :data="data" />
+    <Waterfall
+      :data="data"
+      :props="{
+        src: 'image_uri',
+        height: 'height'
+      }"
+    />
   </ContentWrap>
 </template>
diff --git a/vite.config.ts b/vite.config.ts
index fac26c1..60c5363 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -151,7 +151,8 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
         '@wangeditor/editor-for-vue',
         'vue-json-pretty',
         '@zxcvbn-ts/core',
-        'dayjs'
+        'dayjs',
+        'mockjs'
       ]
     }
   }