From 8ea3ae78b075a5cd01b149bb993011114db5e34b Mon Sep 17 00:00:00 2001
From: sight <1453017105@qq.com>
Date: Mon, 29 Aug 2022 16:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F(component):=20[space}=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=87=B3=20tsx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 package/component/script/build.all.ts         |   3 +-
 package/component/script/build.es.ts          |   5 +-
 package/component/script/build.umd.ts         |   3 +-
 .../component/src/component/space/index.vue   | 249 +++++++++---------
 .../src/plugin/all-plugins.ts                 |   2 +
 6 files changed, 142 insertions(+), 121 deletions(-)

diff --git a/package.json b/package.json
index d4340be0..bf44a22c 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "@types/node": "^16.11.9",
     "@types/uuid": "^8.3.4",
     "@vitejs/plugin-vue": "^2.3.3",
+    "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/compiler-sfc": "^3.2.37",
     "@vue/server-renderer": "^3.2.37",
     "less": "^4.1.3",
diff --git a/package/component/script/build.all.ts b/package/component/script/build.all.ts
index 28443e52..90574be7 100644
--- a/package/component/script/build.all.ts
+++ b/package/component/script/build.all.ts
@@ -1,5 +1,6 @@
 import { UserConfigExport } from "vite";
 import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
 import { resolve } from "path";
 
 export default (): UserConfigExport => {
@@ -13,7 +14,7 @@ export default (): UserConfigExport => {
         },
       ],
     },
-    plugins: [vue()],
+    plugins: [vue(), vueJsx],
     build: {
       cssCodeSplit: false,
       outDir: "lib",
diff --git a/package/component/script/build.es.ts b/package/component/script/build.es.ts
index 27c16da6..0e516373 100644
--- a/package/component/script/build.es.ts
+++ b/package/component/script/build.es.ts
@@ -1,5 +1,6 @@
 import { UserConfigExport } from "vite";
 import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
 import { resolve } from "path";
 import * as fs from "fs";
 
@@ -39,6 +40,8 @@ const matchModule: string[] = [
   "scroll",
   "radio",
   "empty",
+  "dropdownMenu",
+  "dropdownMenuItem",
 ];
 
 export default (): UserConfigExport => {
@@ -60,7 +63,7 @@ export default (): UserConfigExport => {
       },
       postcss: {},
     },
-    plugins: [vue()],
+    plugins: [vue(), vueJsx()],
     build: {
       cssCodeSplit: true,
       emptyOutDir: true,
diff --git a/package/component/script/build.umd.ts b/package/component/script/build.umd.ts
index d7831622..cb334fe9 100644
--- a/package/component/script/build.umd.ts
+++ b/package/component/script/build.umd.ts
@@ -1,5 +1,6 @@
 import { UserConfigExport } from "vite";
 import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
 import { resolve } from "path";
 
 export default (): UserConfigExport => {
@@ -13,7 +14,7 @@ export default (): UserConfigExport => {
         },
       ],
     },
-    plugins: [vue()],
+    plugins: [vue(), vueJsx],
     build: {
       cssCodeSplit: false,
       outDir: "umd",
diff --git a/package/component/src/component/space/index.vue b/package/component/src/component/space/index.vue
index afd7df79..48d64372 100644
--- a/package/component/src/component/space/index.vue
+++ b/package/component/src/component/space/index.vue
@@ -1,135 +1,148 @@
-<script lang="ts">
-export default {
-  name: "LaySpace",
-};
-</script>
-<script lang="ts" setup>
+<script lang="tsx">
 import "./index.less";
 import {
   computed,
-  h,
-  useSlots,
   Comment,
   VNode,
   Fragment,
   isVNode,
   createTextVNode,
-  VNodeArrayChildren,
   StyleValue,
+  defineComponent,
+  PropType,
+  VNodeNormalizedChildren,
 } from "vue";
-import RenderFunction from "../_components/renderFunction";
 
 export type SpaceSize = "lg" | "md" | "sm" | "xs" | number | string;
 
-export interface LaySpaceProps {
-  /* 对齐方式 */
-  align?: "start" | "end" | "center" | "baseline";
-  /* 间距方向 */
-  direction?: "horizontal" | "vertical";
-  /* 子元素是否填充父容器 */
-  fill?: boolean;
-  /* 间距大小 */
-  size?: SpaceSize | [SpaceSize, SpaceSize];
-  /* 是否自动折行 */
-  wrap?: boolean;
-}
-
-const props = withDefaults(defineProps<LaySpaceProps>(), {
-  direction: "horizontal",
-  size: "sm",
-});
-
-const slots = useSlots();
-
-const computAlign = computed(
-  () => props.align ?? (props.direction === "horizontal" ? "center" : "")
-);
-
-const extractChildren = () => {
-  const result: VNode[] = [];
-  const children = slots.default && (slots?.default() as VNodeArrayChildren);
-  const elementData = Array.isArray(children) ? [...children] : [];
-
-  while (elementData.length) {
-    const vnode = elementData.shift();
-
-    if (vnode === null) continue;
-
-    if (Array.isArray(vnode)) {
-      elementData.unshift(...vnode);
-    }
-
-    if (!isVNode(vnode) || vnode.type === Comment) continue;
-
-    if (vnode.type === Fragment && Array.isArray(vnode.children)) {
-      elementData.unshift(vnode.children);
-    } else if (typeof vnode === "string" || typeof vnode === "number") {
-      result.push(createTextVNode(vnode));
-    } else {
-      result.push(vnode);
-    }
-  }
-
-  return result;
-};
-
-const spaceClass = computed(() => [
-  "layui-space",
-  {
-    [`layui-space-align-${props.align}`]: computAlign.value,
-    [`layui-space-${props.direction}`]: props.direction,
-    [`layui-space-wrap`]: props.wrap,
-    [`layui-space-fill`]: props.fill,
+export default defineComponent({
+  name: "LaySpace",
+  props: {
+    /* 对齐方式 */
+    align: {
+      type: String as PropType<"start" | "end" | "center" | "baseline">,
+    },
+    /* 间距方向 */
+    direction: {
+      type: String as PropType<"horizontal" | "vertical">,
+      default: "horizontal",
+    },
+    /* 子元素是否填充父容器 */
+    fill: {
+      type: Boolean,
+      default: false,
+    },
+    /* 间距大小 */
+    size: {
+      type: [Number, String, Array] as PropType<
+        SpaceSize | [SpaceSize, SpaceSize]
+      >,
+      default: "sm",
+    },
+    /* 是否自动折行 */
+    wrap: {
+      type: Boolean,
+      default: false,
+    },
   },
-]);
 
-const spaceStyle = computed(() => {
-  const sizeMap = { xs: "4px", sm: "8px", md: "16px", lg: "24px" };
-  let gap = "";
-
-  if (Array.isArray(props.size)) {
-    gap = props.size
-      .map((size) => {
-        if (typeof size === "number") {
-          return `${size}px`;
-        }
-        if (typeof size === "string") {
-          return sizeMap[props.size as keyof Omit<SpaceSize, number>] || size;
-        }
-        return size;
-      })
-      .join(" ");
-  } else if (typeof props.size === "string") {
-    gap = sizeMap[props.size as keyof Omit<SpaceSize, string>] || props.size;
-  } else if (typeof props.size === "number") {
-    gap = `${props.size}px`;
-  }
-
-  return {
-    gap,
-  };
-});
-
-const itemStyle = computed<StyleValue>(() => [
-  props.fill ? { flexGrow: 1, minWidth: "100%" } : {},
-]);
-
-const children = extractChildren();
-
-const renderSpaceItems = () =>
-  children.map((child, index) => {
-    return h(
-      "div",
-      {
-        class: "layui-space-item",
-        style: itemStyle.value,
-      },
-      h(child)
+  setup(props, { slots }) {
+    const computAlign = computed(
+      () => props.align ?? (props.direction === "horizontal" ? "center" : "")
     );
-  });
+
+    const extractChildren = () => {
+      const result: VNode[] = [];
+      const children =
+        slots.default && (slots?.default() as VNodeNormalizedChildren);
+      const elementData = Array.isArray(children) ? [...children] : [];
+
+      while (elementData.length) {
+        const vnode = elementData.shift();
+
+        if (vnode === null) continue;
+
+        if (Array.isArray(vnode)) {
+          elementData.unshift(...vnode);
+        }
+
+        if (!isVNode(vnode) || vnode.type === Comment) continue;
+
+        if (vnode.type === Fragment && Array.isArray(vnode.children)) {
+          elementData.unshift(vnode.children);
+        } else if (typeof vnode === "string" || typeof vnode === "number") {
+          result.push(createTextVNode(vnode));
+        } else {
+          result.push(vnode);
+        }
+      }
+
+      return result;
+    };
+
+    const spaceClass = computed(() => [
+      "layui-space",
+      {
+        [`layui-space-align-${computAlign.value}`]: computAlign.value,
+        [`layui-space-${props.direction}`]: props.direction,
+        [`layui-space-wrap`]: props.wrap,
+        [`layui-space-fill`]: props.fill,
+      },
+    ]);
+
+    const spaceStyle = computed<StyleValue>(() => {
+      const sizeMap = { xs: "4px", sm: "8px", md: "16px", lg: "24px" };
+      let gap = "";
+
+      if (Array.isArray(props.size)) {
+        gap = props.size
+          .map((size) => {
+            if (typeof size === "number") {
+              return `${size}px`;
+            }
+            if (typeof size === "string") {
+              return (
+                sizeMap[props.size as keyof Omit<SpaceSize, number>] || size
+              );
+            }
+            return size;
+          })
+          .join(" ");
+      } else if (typeof props.size === "string") {
+        gap =
+          sizeMap[props.size as keyof Omit<SpaceSize, string>] || props.size;
+      } else if (typeof props.size === "number") {
+        gap = `${props.size}px`;
+      }
+
+      return {
+        gap,
+      };
+    });
+
+    const itemStyle = computed<StyleValue>(() => [
+      props.fill ? { flexGrow: 1, minWidth: "100%" } : {},
+    ]);
+
+    return () => {
+      const children = extractChildren();
+
+      return (
+        <div class={spaceClass.value} style={spaceStyle.value}>
+          {children.map((child, index) => {
+            return (
+              <div
+                key={`item-${index}`}
+                class="layui-space-item"
+                style={itemStyle.value}
+              >
+                {child}
+              </div>
+            );
+          })}
+        </div>
+      );
+    };
+  },
+});
 </script>
-<template>
-  <div :class="spaceClass" :style="spaceStyle">
-    <RenderFunction :renderFunc="renderSpaceItems" />
-  </div>
-</template>
diff --git a/package/document-component/src/plugin/all-plugins.ts b/package/document-component/src/plugin/all-plugins.ts
index e195c53d..f0298640 100644
--- a/package/document-component/src/plugin/all-plugins.ts
+++ b/package/document-component/src/plugin/all-plugins.ts
@@ -1,4 +1,5 @@
 import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
 import Markdown from "vite-plugin-md";
 import container from "markdown-it-container";
 import preWrapper from "./pre-wrapper";
@@ -17,6 +18,7 @@ const plugins = [
   vue({
     include: [/\.vue$/, /\.md$/],
   }),
+  vueJsx(),
   Markdown({
     markdownItOptions: {
       html: true,