From b914103920ee4453fda238c5e610c67cf8449ca3 Mon Sep 17 00:00:00 2001
From: castleiMac <castle@tansuyun.cn>
Date: Mon, 4 Apr 2022 10:05:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20dropdown=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0disabled=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/docs/zh-CN/components/dropdown.md | 32 +++++++++++++++++++++++
 src/component/dropdown/index.vue          |  8 ++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/example/docs/zh-CN/components/dropdown.md b/example/docs/zh-CN/components/dropdown.md
index c6841457..173d9129 100644
--- a/example/docs/zh-CN/components/dropdown.md
+++ b/example/docs/zh-CN/components/dropdown.md
@@ -80,6 +80,37 @@ export default {
 }
 </script>
 
+
+::: title 禁用弹出
+:::
+
+::: demo
+
+<template>
+  <lay-dropdown>
+    <lay-button type="primary" disabled>点击无效</lay-button>
+    <template #content>
+        <lay-dropdown-menu>
+          <lay-dropdown-menu-item>选项一</lay-dropdown-menu-item>
+          <lay-dropdown-menu-item>选项二</lay-dropdown-menu-item>
+          <lay-dropdown-menu-item>选项三</lay-dropdown-menu-item>
+        </lay-dropdown-menu>
+    </template>
+  </lay-dropdown>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+
+    return {
+    }
+  }
+}
+</script>
+
 :::
 
 ::: title Dropdown 属性
@@ -90,6 +121,7 @@ export default {
 | 属性    | 描述     | 可选值          |
 | ------- | -------- | --------------- |
 | trigger | 触发方式 | `click` `hover` |
+| disabled | 是否禁用触发 | `true` `false` |
 
 :::
 
diff --git a/src/component/dropdown/index.vue b/src/component/dropdown/index.vue
index 0dc9dcfc..ccbad16c 100644
--- a/src/component/dropdown/index.vue
+++ b/src/component/dropdown/index.vue
@@ -12,10 +12,12 @@ import { DropdownTrigger } from "./interface";
 
 export interface LayDropdownProps {
   trigger?: DropdownTrigger;
+  disabled?: boolean
 }
 
 const props = withDefaults(defineProps<LayDropdownProps>(), {
   trigger: "click",
+  disabled: false
 });
 
 const openState = ref(false);
@@ -26,7 +28,8 @@ onClickOutside(dropdownRef, (event) => {
 });
 
 const open = function () {
-  openState.value = true;
+  if (props.disabled === false)
+    openState.value = true;
 };
 
 const hide = function () {
@@ -34,7 +37,8 @@ const hide = function () {
 };
 
 const toggle = function () {
-  openState.value = !openState.value;
+  if (props.disabled === false)
+    openState.value = !openState.value;
 };
 
 provide("openState", openState);

From bcb6109246d7e2c7b7cda7ec7723f8145b4196f8 Mon Sep 17 00:00:00 2001
From: castleiMac <castle@tansuyun.cn>
Date: Mon, 4 Apr 2022 10:05:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20datePicker=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0disabled=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/docs/zh-CN/components/datePicker.md | 28 +++++++++++++++++++++
 src/component/datePicker/index.vue          |  6 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/example/docs/zh-CN/components/datePicker.md b/example/docs/zh-CN/components/datePicker.md
index 12419d87..b8a1bacf 100644
--- a/example/docs/zh-CN/components/datePicker.md
+++ b/example/docs/zh-CN/components/datePicker.md
@@ -62,6 +62,33 @@ export default {
 
 :::
 
+::: title 禁止修改
+:::
+
+::: demo
+
+<template>
+  <!-- 选择的时间：{{endTime3}} -->
+  <lay-date-picker disabled type="year" v-model="endTime3"></lay-date-picker>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+
+   const endTime3 = ref("2022-03-04 17:35:00");
+
+    return {
+      endTime3
+    }
+  }
+}
+</script>
+
+:::
+
 ::: title 年份选择
 :::
 
@@ -177,6 +204,7 @@ export default {
 | ------------- | ------------------------------------------------------------ | -------------- | ------ | -------------- |
 | v-model      | 当前时间                                                     | `string`         | --    | —             |
 | type        | 选择类型                                                   | `string`         | `date`    | `date` `datetime` `year` `month` `time` `yearmonth`             |
+| disabled      | 是否禁止修改                                                     | `boolean`         | false    | —             |
 
 :::
 
diff --git a/src/component/datePicker/index.vue b/src/component/datePicker/index.vue
index 749c6be5..f488c960 100644
--- a/src/component/datePicker/index.vue
+++ b/src/component/datePicker/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <lay-dropdown ref="dropdownRef">
+    <lay-dropdown ref="dropdownRef" :disabled="props.disabled">
       <lay-input :name="name" :value="dateValue || modelValue" readonly>
         <template #prefix>
           <lay-icon type="layui-icon-date"></lay-icon>
@@ -217,11 +217,15 @@ export interface LayDatePickerProps {
   modelValue?: string;
   type?: "date" | "datetime" | "year" | "time" | "month" | "yearmonth";
   name?: string;
+  max?: string;
+  min?: string;
+  disabled?: boolean
 }
 
 const props = withDefaults(defineProps<LayDatePickerProps>(), {
   modelValue: "",
   type: "date",
+  disabled: false
 });
 
 const dropdownRef = ref(null);

From 1e055e90b3df49df78dc9d6d90b74242fa018e9d Mon Sep 17 00:00:00 2001
From: castleiMac <castle@tansuyun.cn>
Date: Mon, 4 Apr 2022 10:23:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20Dropdown=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0open=E5=92=8Chide=E4=BA=8B=E4=BB=B6=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/docs/zh-CN/components/dropdown.md | 49 ++++++++++++++++++++++-
 src/component/dropdown/index.vue          | 13 ++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/example/docs/zh-CN/components/dropdown.md b/example/docs/zh-CN/components/dropdown.md
index 173d9129..73b10725 100644
--- a/example/docs/zh-CN/components/dropdown.md
+++ b/example/docs/zh-CN/components/dropdown.md
@@ -81,14 +81,15 @@ export default {
 </script>
 
 
+:::
 ::: title 禁用弹出
 :::
 
 ::: demo
 
 <template>
-  <lay-dropdown>
-    <lay-button type="primary" disabled>点击无效</lay-button>
+  <lay-dropdown disabled>
+    <lay-button type="primary" >禁用弹出</lay-button>
     <template #content>
         <lay-dropdown-menu>
           <lay-dropdown-menu-item>选项一</lay-dropdown-menu-item>
@@ -111,6 +112,39 @@ export default {
 }
 </script>
 
+
+:::
+::: title 事件处理
+:::
+
+::: demo
+
+<template>
+  <lay-dropdown @open="stat='开启'" @hide="stat='关闭'">
+    <lay-button type="primary" >当前状态:{{stat}}</lay-button>
+    <template #content>
+        <lay-dropdown-menu>
+          <lay-dropdown-menu-item>选项一</lay-dropdown-menu-item>
+          <lay-dropdown-menu-item>选项二</lay-dropdown-menu-item>
+          <lay-dropdown-menu-item>选项三</lay-dropdown-menu-item>
+        </lay-dropdown-menu>
+    </template>
+  </lay-dropdown>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+    const stat=ref("关闭")
+    return {
+      stat
+    }
+  }
+}
+</script>
+
 :::
 
 ::: title Dropdown 属性
@@ -137,6 +171,17 @@ export default {
 :::
 
  
+::: title Dropdown 事件
+:::
+
+::: table
+
+| 插槽    | 描述     | 参数 |
+| ------- | -------- | ------ |
+| hide | 隐藏下拉内容后触发 | --     |
+| open | 显示下拉内容后触发 | --     |
+
+:::
 
 ::: previousNext dropdown
 :::
\ No newline at end of file
diff --git a/src/component/dropdown/index.vue b/src/component/dropdown/index.vue
index ccbad16c..3dfc863b 100644
--- a/src/component/dropdown/index.vue
+++ b/src/component/dropdown/index.vue
@@ -19,7 +19,7 @@ const props = withDefaults(defineProps<LayDropdownProps>(), {
   trigger: "click",
   disabled: false
 });
-
+const emit = defineEmits(['open', 'hide'])
 const openState = ref(false);
 const dropdownRef = ref<null | HTMLElement>(null);
 
@@ -28,17 +28,24 @@ onClickOutside(dropdownRef, (event) => {
 });
 
 const open = function () {
-  if (props.disabled === false)
+  if (props.disabled === false) {
     openState.value = true;
+    emit('open')
+  }
 };
 
 const hide = function () {
   openState.value = false;
+  emit('hide')
 };
 
 const toggle = function () {
   if (props.disabled === false)
-    openState.value = !openState.value;
+    if (openState.value) {
+      hide()
+    } else {
+      open()
+    }
 };
 
 provide("openState", openState);

From 015f49ceb05bd28322f4c47a60f32b96818018ed Mon Sep 17 00:00:00 2001
From: castleiMac <castle@tansuyun.cn>
Date: Mon, 4 Apr 2022 10:24:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20datePicker=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0simple=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=BF=AB=E9=80=9F=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/docs/zh-CN/components/datePicker.md | 30 +++++++++++++++++++++
 src/component/datePicker/index.vue          | 14 +++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/example/docs/zh-CN/components/datePicker.md b/example/docs/zh-CN/components/datePicker.md
index b8a1bacf..4de00a5e 100644
--- a/example/docs/zh-CN/components/datePicker.md
+++ b/example/docs/zh-CN/components/datePicker.md
@@ -195,6 +195,35 @@ export default {
 
 :::
 
+::: title 一次性选择
+:::
+
+::: describe 只需要点击一次后自动关闭，无需点击确认按钮
+:::
+
+::: demo
+
+<template>
+  <lay-date-picker v-model="endTime7" simple></lay-date-picker>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+
+   const endTime7 = ref("2022-03-04 17:35:00");
+
+    return {
+      endTime7
+    }
+  }
+}
+</script>
+
+:::
+
 ::: title Date Picker 属性
 :::
 
@@ -205,6 +234,7 @@ export default {
 | v-model      | 当前时间                                                     | `string`         | --    | —             |
 | type        | 选择类型                                                   | `string`         | `date`    | `date` `datetime` `year` `month` `time` `yearmonth`             |
 | disabled      | 是否禁止修改                                                     | `boolean`         | false    | —             |
+| simple      | 一次性选择，无需点击确认按钮                                         | `boolean`         | false    | —             |
 
 :::
 
diff --git a/src/component/datePicker/index.vue b/src/component/datePicker/index.vue
index f488c960..19ae408f 100644
--- a/src/component/datePicker/index.vue
+++ b/src/component/datePicker/index.vue
@@ -219,13 +219,15 @@ export interface LayDatePickerProps {
   name?: string;
   max?: string;
   min?: string;
-  disabled?: boolean
+  disabled?: boolean;
+  simple?: boolean
 }
 
 const props = withDefaults(defineProps<LayDatePickerProps>(), {
   modelValue: "",
   type: "date",
-  disabled: false
+  disabled: false,
+  simple: false,
 });
 
 const dropdownRef = ref(null);
@@ -316,6 +318,9 @@ const dateValue = computed<string>(() => {
       break;
   }
   $emits("update:modelValue", momentVal);
+  if (props.simple) {
+    ok()
+  }
   return momentVal;
 });
 
@@ -372,8 +377,9 @@ watch(
 
 // 确认事件
 const ok = () => {
-  // @ts-ignore
-  dropdownRef.value.hide();
+  if (dropdownRef.value)
+    // @ts-ignore
+    dropdownRef.value.hide();
 };
 
 // 现在时间