From 117ef911446f59d6bfba069c63a32f01764b5da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com>
Date: Tue, 16 Nov 2021 22:32:45 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=20=E4=BC=98=E5=8C=96=20lay?=
 =?UTF-8?q?out=20=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module/body/index.less   |  8 ++++
 src/module/body/index.vue    | 25 ++++-------
 src/module/button/index.vue  | 36 +++++++--------
 src/module/col/index.vue     | 16 +++----
 src/module/footer/index.less |  3 ++
 src/module/footer/index.vue  | 20 ++++-----
 src/module/layout/index.less | 12 +++++
 src/module/layout/index.vue  | 87 +++++++++++++++---------------------
 src/module/row/index.vue     |  8 ++--
 src/module/side/index.less   |  5 +++
 src/module/side/index.vue    | 46 ++++++++-----------
 11 files changed, 131 insertions(+), 135 deletions(-)
 create mode 100644 src/module/body/index.less
 create mode 100644 src/module/footer/index.less
 create mode 100644 src/module/layout/index.less
 create mode 100644 src/module/side/index.less

diff --git a/src/module/body/index.less b/src/module/body/index.less
new file mode 100644
index 00000000..65a297f9
--- /dev/null
+++ b/src/module/body/index.less
@@ -0,0 +1,8 @@
+.layui-body {
+    display: block;
+    flex: 1;
+    overflow: auto;
+    height: 100%;
+    box-sizing: border-box;
+    min-height: 300px;
+}
\ No newline at end of file
diff --git a/src/module/body/index.vue b/src/module/body/index.vue
index 3a125842..47c30467 100644
--- a/src/module/body/index.vue
+++ b/src/module/body/index.vue
@@ -1,24 +1,15 @@
-<template>
-  <div class="layui-body">
-    <slot />
-  </div>
-</template>
-
 <script lang="ts">
 export default {
   name: 'LayBody',
 }
 </script>
 
-<script setup name="LayBody" lang="ts"></script>
+<script setup name="LayBody" lang="ts">
+import "./index.less"
+</script>
 
-<style>
-.layui-body {
-  display: block;
-  flex: 1;
-  overflow: auto;
-  height: 100%;
-  box-sizing: border-box;
-  min-height: 300px;
-}
-</style>
+<template>
+  <div class="layui-body">
+    <slot />
+  </div>
+</template>
\ No newline at end of file
diff --git a/src/module/button/index.vue b/src/module/button/index.vue
index 186d82de..d91e8fa5 100644
--- a/src/module/button/index.vue
+++ b/src/module/button/index.vue
@@ -6,17 +6,17 @@ export default {
 
 <script setup lang="ts">
 import "./index.less";
-import { computed } from 'vue';
+import { computed } from "vue";
 
 export interface LayButtonProps {
-    type?: 'primary' | 'normal' | 'warm' | 'danger'
-    size?: 'lg' | 'sm' | 'xs'
-    fluid?: boolean
-    radius?: boolean
-    border?: 'green' | 'blue' | 'orange' | 'red' | 'black'
-    disabled?: boolean
-    loading?: boolean
-    nativeType?: 'button' | 'submit' | 'reset'
+  type?: "primary" | "normal" | "warm" | "danger";
+  size?: "lg" | "sm" | "xs";
+  fluid?: boolean;
+  radius?: boolean;
+  border?: "green" | "blue" | "orange" | "red" | "black";
+  disabled?: boolean;
+  loading?: boolean;
+  nativeType?: "button" | "submit" | "reset";
 }
 
 const props = withDefaults(defineProps<LayButtonProps>(), {
@@ -29,11 +29,11 @@ const props = withDefaults(defineProps<LayButtonProps>(), {
 
 const classes = computed(() => {
   return [
-      props.type ? 'layui-btn-' + props.type : '',
-      props.size ? 'layui-btn-' + props.size : '',
-      props.border ? 'layui-border-' + props.border : '',
-  ]
-})
+    props.type ? `layui-btn-${props.type}` : "",
+    props.size ? `layui-btn-${props.size}` : "",
+    props.border ? `layui-border-${props.border}` : "",
+  ];
+});
 </script>
 
 <template>
@@ -41,11 +41,11 @@ const classes = computed(() => {
     class="layui-btn"
     :class="[
       {
-       'layui-btn-fluid' : fluid,
-       'layui-btn-radius' : radius,
-       'layui-btn-disabled' : disabled
+        'layui-btn-fluid': fluid,
+        'layui-btn-radius': radius,
+        'layui-btn-disabled': disabled
       },
-      classes
+      classes,
     ]"
     :type="nativeType"
   >
diff --git a/src/module/col/index.vue b/src/module/col/index.vue
index 1b44dcbf..a9c2709e 100644
--- a/src/module/col/index.vue
+++ b/src/module/col/index.vue
@@ -20,14 +20,14 @@ const props = defineProps<{
 
 const classes = computed(() => {
   return [
-    props.md ? "layui-col-md" + props.md : "",
-    props.xs ? "layui-col-xs" + props.xs : "",
-    props.sm ? "layui-col-sm" + props.sm : "",
-    props.lg ? "layui-col-lg" + props.lg : "",
-    props.mdOffset ? "layui-col-md-offset" + props.mdOffset : "",
-    props.xsOffset ? "layui-col-xs-offset" + props.xsOffset : "",
-    props.smOffset ? "layui-col-sm-offset" + props.smOffset : "",
-    props.lgOffset ? "layui-col-lg-offset" + props.lgOffset : "",
+    props.md ? `layui-col-md${props.md}` : "",
+    props.xs ? `layui-col-xs${props.xs}` : "",
+    props.sm ? `layui-col-sm${props.sm}` : "", 
+    props.lg ? `layui-col-lg${props.lg}` : "",
+    props.mdOffset ? `layui-col-md-offset${props.mdOffset}` : "",
+    props.xsOffset ? `layui-col-xs-offset${props.xsOffset}` : "",
+    props.smOffset ? `layui-col-sm-offset${props.smOffset}` : "",
+    props.lgOffset ? `layui-col-lg-offset${props.lgOffset}` : "",
   ];
 });
 </script>
diff --git a/src/module/footer/index.less b/src/module/footer/index.less
new file mode 100644
index 00000000..e1ad3d98
--- /dev/null
+++ b/src/module/footer/index.less
@@ -0,0 +1,3 @@
+.layui-footer {
+    box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/src/module/footer/index.vue b/src/module/footer/index.vue
index c042ef0d..b00c79e5 100644
--- a/src/module/footer/index.vue
+++ b/src/module/footer/index.vue
@@ -1,19 +1,15 @@
-<template>
-  <div class="layui-footer">
-    <slot />
-  </div>
-</template>
-
 <script lang="ts">
 export default {
   name: 'LayFooter',
 }
 </script>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import "./index.less"
+</script>
 
-<style>
-.layui-footer {
-  box-sizing: border-box;
-}
-</style>
+<template>
+  <div class="layui-footer">
+    <slot />
+  </div>
+</template>
\ No newline at end of file
diff --git a/src/module/layout/index.less b/src/module/layout/index.less
new file mode 100644
index 00000000..b8c46ecd
--- /dev/null
+++ b/src/module/layout/index.less
@@ -0,0 +1,12 @@
+.layui-layout {
+    display: flex;
+    flex: 1;
+    flex-basis: auto;
+    height: 100%;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.layui-layout-vertical {
+    flex-direction: column;
+}
\ No newline at end of file
diff --git a/src/module/layout/index.vue b/src/module/layout/index.vue
index d04e54fb..e529bf4e 100644
--- a/src/module/layout/index.vue
+++ b/src/module/layout/index.vue
@@ -1,54 +1,41 @@
+<script lang="ts">
+export default {
+  name: "LayLayout",
+};
+</script>
+
+<script setup lang="ts">
+import { Component, computed, useSlots } from "vue";
+import Header from "../header/index.vue";
+import "./index.less";
+
+export interface LayLayoutProps {
+  isVertical?: boolean;
+}
+
+const slots = useSlots();
+
+const props = withDefaults(defineProps<LayLayoutProps>(), {
+  isVertical: false,
+});
+
+const isVertical = computed(() => {
+  if (!slots.default) return false;
+  const vNodes = slots.default();
+  return vNodes.some((vNode) => {
+    const componentName = (vNode.type as Component).name;
+    if (!componentName) return false;
+    return [Header.name].includes(componentName);
+  });
+});
+
+const classes = computed(() => {
+  return ["layui-layout", { "layui-layout-vertical": isVertical.value }];
+});
+</script>
+
 <template>
   <section :class="classes">
     <slot />
   </section>
-</template>
-<script lang="ts">
-export default {
-  name: 'LayLayout',
-}
-</script>
-<script setup lang="ts">
-import { Component, computed, useSlots } from 'vue'
-import Header from '../header/index.vue'
-
-const props = withDefaults(
-  defineProps<{
-    isVertical?: boolean
-  }>(),
-  {
-    isVertical: false,
-  }
-)
-
-const slots = useSlots()
-
-const isVertical = computed(() => {
-  if (!slots.default) return false
-  const vNodes = slots.default()
-  return vNodes.some((vNode) => {
-    const componentName = (vNode.type as Component).name
-    if (!componentName) return false
-    return [Header.name].includes(componentName)
-  })
-})
-
-const classes = computed(() => {
-  return ['layui-layout', { 'layui-layout-vertical': isVertical.value }]
-})
-</script>
-
-<style>
-.layui-layout {
-  display: flex;
-  flex: 1;
-  flex-basis: auto;
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.layui-layout-vertical {
-  flex-direction: column;
-}
-</style>
+</template>
\ No newline at end of file
diff --git a/src/module/row/index.vue b/src/module/row/index.vue
index 465eb792..fea3f629 100644
--- a/src/module/row/index.vue
+++ b/src/module/row/index.vue
@@ -8,12 +8,14 @@ export default {
 import { computed, defineProps } from "vue";
 import "./index.less";
 
-const props = defineProps<{
+export interface LayRowProps {
   space?: string;
-}>();
+}
+
+const props = defineProps<LayRowProps>();
 
 const classes = computed(() => {
-  return [props.space ? "layui-col-space" + props.space : ""];
+  return [props.space ? `layui-col-space${props.space}` : ""];
 });
 </script>
 
diff --git a/src/module/side/index.less b/src/module/side/index.less
new file mode 100644
index 00000000..71723238
--- /dev/null
+++ b/src/module/side/index.less
@@ -0,0 +1,5 @@
+.layui-side {
+    overflow: auto;
+    box-sizing: border-box;
+    min-height: 300px;
+}
\ No newline at end of file
diff --git a/src/module/side/index.vue b/src/module/side/index.vue
index 77530ac7..53de5e81 100644
--- a/src/module/side/index.vue
+++ b/src/module/side/index.vue
@@ -1,38 +1,30 @@
-<template>
-  <div class="layui-side" :style="style">
-    <slot />
-  </div>
-</template>
-
 <script lang="ts">
 export default {
-  name: 'LaySide',
-}
+  name: "LaySide",
+};
 </script>
 
 <script setup lang="ts">
-import { computed, CSSProperties, defineProps } from 'vue'
+import { computed, defineProps, CSSProperties } from "vue";
+import "./index.less";
 
-const props = withDefaults(
-  defineProps<{
-    width?: string | number
-  }>(),
-  {
-    width: '200',
-  }
-)
+export interface LaySideProps {
+  width?: string | number;
+}
 
-const style = computed<CSSProperties>(() => {
+const props = withDefaults(defineProps<LaySideProps>(), {
+  width: "200",
+});
+
+const styles = computed<CSSProperties>(() => {
   return {
     width: `${props.width}px`,
-  }
-})
+  };
+});
 </script>
 
-<style>
-.layui-side {
-  overflow: auto;
-  box-sizing: border-box;
-  min-height: 300px;
-}
-</style>
+<template>
+  <div class="layui-side" :style="styles">
+    <slot />
+  </div>
+</template>
\ No newline at end of file