From f0307844107517798e668f73c566bc8e70790f21 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: Sat, 18 Jun 2022 15:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(layer):=20typescript=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新文档
---
 .../src/component/checkbox/index.vue          |  8 ++-
 package/layer/src/component/Iframe.vue        |  8 ++-
 package/layer/src/component/Shade.vue         | 12 ++--
 package/layer/src/component/Title.vue         |  2 +-
 package/layer/src/component/index.vue         | 64 +++++--------------
 package/layer/src/tokens/index.ts             |  2 +-
 package/layer/src/types/index.ts              |  2 +-
 7 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/package/component/src/component/checkbox/index.vue b/package/component/src/component/checkbox/index.vue
index 93369282..ba7de506 100644
--- a/package/component/src/component/checkbox/index.vue
+++ b/package/component/src/component/checkbox/index.vue
@@ -108,7 +108,13 @@ const handleClick = function () {
       :lay-skin="skin"
     >
       <span v-if="$slots?.default"><slot></slot></span>
-      <lay-icon :type="props.isIndeterminate && isChecked ? 'layui-icon-subtraction' : 'layui-icon-ok'"></lay-icon>
+      <lay-icon
+        :type="
+          props.isIndeterminate && isChecked
+            ? 'layui-icon-subtraction'
+            : 'layui-icon-ok'
+        "
+      ></lay-icon>
     </div>
   </span>
 </template>
diff --git a/package/layer/src/component/Iframe.vue b/package/layer/src/component/Iframe.vue
index 14c5caa0..10dc3421 100644
--- a/package/layer/src/component/Iframe.vue
+++ b/package/layer/src/component/Iframe.vue
@@ -1,4 +1,5 @@
 <script lang="ts">
+import { computed, VNodeTypes } from 'vue';
 export default {
   name: "Iframe",
 };
@@ -6,10 +7,15 @@ export default {
 
 <script lang="ts" setup>
 export interface IframeProps {
-  src: string;
+  src?: string | Function | object | VNodeTypes;
 }
 
 const props = defineProps<IframeProps>();
+
+const src = computed(() => {
+  return props.src as string
+})
+
 </script>
 
 <template>
diff --git a/package/layer/src/component/Shade.vue b/package/layer/src/component/Shade.vue
index 20c416db..ad0c5a3c 100644
--- a/package/layer/src/component/Shade.vue
+++ b/package/layer/src/component/Shade.vue
@@ -5,19 +5,19 @@ export default {
 </script>
 
 <script lang="ts" setup>
-import { computed, defineEmits } from "vue";
-
-const emit = defineEmits(["shadeClick"]);
+import { computed, defineEmits, StyleValue } from "vue";
 
 export interface ShadeProps {
-  index: number;
   opacity: string;
-  visible: boolean;
+  index: number | Function;
+  visible: boolean | string;
 }
 
 const props = defineProps<ShadeProps>();
 
-const styles = computed(() => {
+const emit = defineEmits(["shadeClick"]);
+
+const styles = computed<any>(() => {
   return {
     opacity: props.opacity,
     zIndex: props.index,
diff --git a/package/layer/src/component/Title.vue b/package/layer/src/component/Title.vue
index 4ac1e44b..c4857ba4 100644
--- a/package/layer/src/component/Title.vue
+++ b/package/layer/src/component/Title.vue
@@ -6,7 +6,7 @@ export default {
 
 <script lang="ts" setup>
 export interface HeaderProps {
-  title: string;
+  title: string | boolean | Function;
 }
 
 const renderContent = function (content: any) {
diff --git a/package/layer/src/component/index.vue b/package/layer/src/component/index.vue
index b3f840ea..36b74c14 100644
--- a/package/layer/src/component/index.vue
+++ b/package/layer/src/component/index.vue
@@ -10,40 +10,14 @@ import Iframe from "./Iframe.vue";
 import Title from "./Title.vue";
 import CloseBtn from "./CloseBtn.vue";
 import Resize from "./Resize.vue";
-import {
-  Ref,
-  ref,
-  watch,
-  computed,
-  useSlots,
-  VNodeTypes,
-  nextTick,
-  inject,
-} from "vue";
-import {
-  nextId,
-  maxArea,
-  maxOffset,
-  getArea,
-  calculateArea,
-  calculateOffset,
-  calculateContent,
-  calculateType,
-  minArea,
-  minOffset,
-  updateMinArrays,
-  getDrawerAnimationClass,
-  calculateDrawerArea,
-} from "../utils";
+import { Ref, ref, watch, computed, useSlots, VNodeTypes, nextTick, inject } from "vue";
+import { nextId, maxArea, maxOffset, getArea, calculateArea, calculateOffset, calculateContent, calculateType, minArea, minOffset, updateMinArrays, getDrawerAnimationClass, calculateDrawerArea } from "../utils";
 import useMove from "../composable/useMove";
 import useResize from "../composable/useResize";
 import { zIndexKey } from "../tokens";
 
-const slots = useSlots();
-const layero = ref<HTMLElement | null>(null);
-const emit = defineEmits(["close", "update:modelValue"]);
-
 export interface LayModalProps {
+  domId?: string;
   title?: string | boolean | Function;
   icon?: string | number;
   skin?: string;
@@ -53,7 +27,7 @@ export interface LayModalProps {
   area?: string[] | "auto";
   modelValue?: boolean;
   maxmin?: boolean | string;
-  btn?: Record<string, unknown>[] | false;
+  btn?: Record<string, Function>[] | false;
   move?: boolean | string;
   resize?: boolean | string;
   type?: 0 | 1 | 2 | 3 | "dialog" | "page" | "iframe" | "loading" | "drawer";
@@ -79,7 +53,8 @@ export interface LayModalProps {
 }
 
 const props = withDefaults(defineProps<LayModalProps>(), {
-  title: "信息",
+  domId: '',
+  title: "标题",
   setTop: false,
   offset: () => ["50%", "50%"],
   area: "auto",
@@ -106,22 +81,18 @@ const props = withDefaults(defineProps<LayModalProps>(), {
   isMessage: false,
 });
 
-const id: Ref<string> = ref(nextId());
+const emit = defineEmits(["close", "update:modelValue"]);
+
+const slots = useSlots();
 const max: Ref<boolean> = ref(false);
 const min: Ref<boolean> = ref(false);
+const id: Ref<string> = ref(nextId());
+const layero = ref<HTMLElement | null>(null);
 const type: number = calculateType(props.type);
-const area: Ref<string[]> = ref(
-  calculateArea(props.type, props.area, props.offset)
-);
-const offset: Ref<string[]> = ref(
-  calculateOffset(props.offset, area.value, props.type)
-);
-const contentHeight = ref(
-  calculateContent(area.value[1], props.btn, type, props.isMessage)
-);
-const index: Ref<number | Function> = ref(
-  props.zIndex ?? inject(zIndexKey, 99999)
-);
+const area: Ref<string[]> = ref(calculateArea(props.type, props.area, props.offset));
+const offset: Ref<string[]> = ref(calculateOffset(props.offset, area.value, props.type));
+const contentHeight = ref(calculateContent(area.value[1], props.btn, type, props.isMessage));
+const index: Ref<number | Function> = ref(props.zIndex ?? inject(zIndexKey, 99999));
 const visible: Ref<boolean> = ref(false);
 const first: Ref<boolean> = ref(true);
 
@@ -146,17 +117,14 @@ const firstOpenDelayCalculation = function () {
       area.value = calculateDrawerArea(props.offset, props.area);
     }
     offset.value = calculateOffset(props.offset, area.value, props.type);
-
     w.value = area.value[0];
     h.value = area.value[1];
     t.value = offset.value[0];
     l.value = offset.value[1];
-
     _w.value = area.value[0];
     _l.value = area.value[1];
     _t.value = offset.value[0];
     _l.value = offset.value[1];
-
     supportMove();
   });
 };
@@ -367,7 +335,7 @@ const supportMove = function () {
  * 弹层样式
  * <p>
  */
-const styles = computed(() => {
+const styles = computed<any>(() => {
   return {
     top: t.value,
     left: l.value,
diff --git a/package/layer/src/tokens/index.ts b/package/layer/src/tokens/index.ts
index 9f87886d..6990b21a 100644
--- a/package/layer/src/tokens/index.ts
+++ b/package/layer/src/tokens/index.ts
@@ -1 +1 @@
-export const zIndexKey = Symbol("zIndex");
+export const zIndexKey = Symbol("zIndex");
\ No newline at end of file
diff --git a/package/layer/src/types/index.ts b/package/layer/src/types/index.ts
index bbf0b36f..45bda30a 100644
--- a/package/layer/src/types/index.ts
+++ b/package/layer/src/types/index.ts
@@ -1,3 +1,3 @@
 export type StringObject = Record<string, unknown>;
 
-export interface InstallOptions extends StringObject {}
+export interface InstallOptions extends StringObject {}
\ No newline at end of file