From 71d5a0ec8665956c6ecb9ef11b162aedad5b2a86 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: Sun, 27 Mar 2022 13:27:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20date-picker=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20name=20=E5=B1=9E=E6=80=A7,=20type=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=20date=20=E4=B8=8E=20datetime=20=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/docs/zh-CN/guide/changelog.md |  4 ++
 package.json                          |  5 +-
 src/component/datePicker/index.vue    | 68 +++++++++++++++------------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/example/docs/zh-CN/guide/changelog.md b/example/docs/zh-CN/guide/changelog.md
index 87d12988..f329f237 100644
--- a/example/docs/zh-CN/guide/changelog.md
+++ b/example/docs/zh-CN/guide/changelog.md
@@ -16,9 +16,13 @@
       <li> 
         <h3>0.4.3 <span class="layui-badge-rim">2022-03-27</span></h3> 
         <ul>
+          <li>[新增] date-picker 组件 name 属性, 等同原生 name 属性。</li>
+          <li>[新增] date-picker 组件 type 属性 date 值, 支持日期选择。 </li>
+          <li>[新增] date-picker 组件 type 属性 datetime 值, 支持日期时间选择。</li>
           <li>[修复] menu 组件 level 属性的语义与实际功能相悖。</li>
           <li>[修复] input 组件 height 高度固定 38 px。</li>
           <li>[修复] step 组件 line 样式。</li>
+          <li>[依赖] monent 日期 js 框架。</li>
         </ul> 
       </li>
     </ul>
diff --git a/package.json b/package.json
index f95c3e15..1280cb79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@layui/layui-vue",
-  "version": "0.4.2",
+  "version": "0.4.3-alpha.1",
   "author": "就眠儀式",
   "license": "MIT",
   "description": "a component library for Vue 3 base on layui-vue",
@@ -41,10 +41,11 @@
     "@vueuse/core": "^7.6.2",
     "async-validator": "^4.0.7",
     "evtd": "^0.2.3",
+    "moment": "^2.29.1",
+    "uuid": "^8.3.2",
     "vue": "^3.2.31",
     "vue-i18n": "^9.2.0-beta.33",
     "vue-router": "^4.0.12",
-    "uuid": "^8.3.2",
     "xlsx": "^0.18.4"
   },
   "devDependencies": {
diff --git a/src/component/datePicker/index.vue b/src/component/datePicker/index.vue
index fd4944bd..7d0658cf 100644
--- a/src/component/datePicker/index.vue
+++ b/src/component/datePicker/index.vue
@@ -1,10 +1,14 @@
 <template>
   <div>
     <lay-dropdown>
-      <lay-input :value="dateValue || modelValue" readonly />
+      <lay-input :name="name" :value="dateValue || modelValue" readonly >
+        <template #prefix>
+           <lay-icon type="layui-icon-date"></lay-icon>
+        </template>
+      </lay-input>
       <template #content>
         <!-- 日期选择 -->
-        <div class="layui-laydate" v-show="showPanel === 'date'">
+        <div class="layui-laydate" v-show="showPane === 'date'">
           <div class="layui-laydate-main laydate-main-list-0">
             <div class="layui-laydate-header">
               <i
@@ -18,7 +22,7 @@
               >
               <div class="laydate-set-ym">
                 <span @click="showYearPanel">{{ currentYear }} 年</span
-                ><span @click="showPanel = 'month'"
+                ><span @click="showPane = 'month'"
                   >{{ currentMonth + 1 }} 月</span
                 >
               </div>
@@ -56,7 +60,7 @@
                         :data-unix="item.value"
                         :class="{
                           'laydate-day-prev': item.type !== 'current',
-                          'layui-this': item.value === selectedDay,
+                          'layui-this': item.value === currentDay,
                         }"
                         @click="handleDayClick(item)"
                       >
@@ -71,7 +75,7 @@
           <div class="layui-laydate-footer">
             <span
               v-if="type === 'datetime'"
-              @click="showPanel = 'time'"
+              @click="showPane = 'time'"
               class="layui-laydate-preview"
               style="color: rgb(102, 102, 102)"
             >
@@ -87,7 +91,7 @@
         </div>
 
         <!-- 年份选择器 -->
-        <div class="layui-laydate" v-show="showPanel === 'year'">
+        <div class="layui-laydate" v-show="showPane === 'year'">
           <div class="layui-laydate-main laydate-main-list-0 laydate-ym-show">
             <div class="layui-laydate-header">
               <div class="laydate-set-ym">
@@ -105,7 +109,7 @@
                   :class="[{ 'layui-this': currentYear === item }]"
                   @click="
                     currentYear = item;
-                    showPanel = 'date';
+                    showPane = 'date';
                   "
                 >
                   {{ item }}
@@ -129,7 +133,7 @@
         </div>
 
         <!-- 月份选择器 -->
-        <div class="layui-laydate" v-show="showPanel === 'month'">
+        <div class="layui-laydate" v-show="showPane === 'month'">
           <div class="layui-laydate-main laydate-main-list-0 laydate-ym-show">
             <div class="layui-laydate-header">
               <i
@@ -139,7 +143,7 @@
               >
               <div class="laydate-set-ym">
                 <span @click="showYearPanel">{{ currentYear }} 年</span
-                ><span @click="showPanel = 'month'"
+                ><span @click="showPane = 'month'"
                   >{{ currentMonth + 1 }} 月</span
                 >
               </div>
@@ -159,7 +163,7 @@
                   ]"
                   @click="
                     currentMonth = MONTH_NAME.indexOf(item);
-                    showPanel = 'date';
+                    showPane = 'date';
                   "
                 >
                   {{ item.slice(0, 3) }}
@@ -183,7 +187,7 @@
         </div>
 
         <!-- 时间选择器 -->
-        <div class="layui-laydate" v-if="showPanel == 'time'">
+        <div class="layui-laydate" v-if="showPane == 'time'">
           <div class="layui-laydate-main laydate-main-list-0 laydate-time-show">
             <div class="layui-laydate-header">
               <div class="laydate-set-ym">
@@ -215,7 +219,7 @@
             </div>
           </div>
           <div class="layui-laydate-footer">
-            <span @click="showPanel = 'date'" class="layui-laydate-preview"
+            <span @click="showPane = 'date'" class="layui-laydate-preview"
               >返回</span
             >
             <div class="laydate-footer-btns">
@@ -237,9 +241,11 @@ import {
   ref,
   watch,
   defineProps,
-  defineEmits,
-  onMounted,
+  defineEmits
 } from "vue";
+
+import moment from 'moment';
+import LayIcon from "../icon/index";
 import LayInput from "../input/index.vue";
 import LayDropdown from "../dropdown/index.vue";
 import { getDayLength, getYears, getDate, getMonth, getYear } from "./day";
@@ -262,7 +268,7 @@ const MONTH_NAME = [
   "12月",
 ];
 
-const hms = ref({ hh: "00", mm: "00", ss: "00" });
+const hms = ref({ hh: 0, mm: 0, ss: 0 });
 const els = [
   { count: 24, type: "hh" },
   { count: 60, type: "mm" },
@@ -272,6 +278,7 @@ const els = [
 export interface LayDatePickerProps {
   modelValue?: string;
   type: "date" | "datetime" | "year" | "time" | "month";
+  name: string;
 }
 
 const props = withDefaults(defineProps<LayDatePickerProps>(), {
@@ -279,25 +286,25 @@ const props = withDefaults(defineProps<LayDatePickerProps>(), {
   type: "date",
 });
 
-const currentDate = getDate();
 const currentYear = ref(getYear());
 const currentMonth = ref(getMonth());
+const currentDay = ref<number>();
 
 const yearList = ref<number[]>(getYears());
 const dateList = ref<any[]>([]);
-const showPanel = ref("date");
-const selectedDay = ref<number>();
+const showPane = ref("date");
 
-// 最终结果
+// 计算结果日期
 const dateValue = computed<string>(() => {
-  if (!selectedDay.value) return "";
-  const d = new Date(selectedDay.value);
-  const y = d.getFullYear();
-  const m = (d.getMonth() + 1).toString().padStart(2, "0");
-  const day = d.getDate().toString().padStart(2, "0");
-  const currentValue = `${y}-${m}-${day} ${hms.value.hh}:${hms.value.mm}:${hms.value.ss}`;
-  $emits("update:modelValue", currentValue);
-  return currentValue;
+  let momentObj = moment(currentDay.value).hour(hms.value.hh).minute(hms.value.mm).second(hms.value.ss);
+  let momentVal = "";
+  if(props.type === 'datetime') {
+    momentVal = momentObj.format('YYYY-MM-DD hh:mm:ss')
+  } else if(props.type === 'date') {
+    momentVal = momentObj.format('YYYY-MM-DD');
+  }
+  $emits("update:modelValue", momentVal);
+  return momentVal;
 });
 
 // 设置日期列表
@@ -353,10 +360,9 @@ watch(
 
 // 点击日期
 const handleDayClick = (item: any) => {
-  selectedDay.value = item.value;
+  currentDay.value = item.value;
   if (item.type !== "current") {
-    currentMonth.value =
-      item.type === "prev" ? currentMonth.value - 1 : currentMonth.value + 1;
+    currentMonth.value = item.type === "prev" ? currentMonth.value - 1 : currentMonth.value + 1;
   }
 };
 
@@ -382,7 +388,7 @@ const changeYearOrMonth = (type: "year" | "month", num: number) => {
 
 // 显示年列表面板
 const showYearPanel = () => {
-  showPanel.value = "year";
+  showPane.value = "year";
   nextTick(() => {
     (
       document.querySelector(".year-panel-item.active") as HTMLElement