From d37419071e128d3e2e64f51ee7091659ba00ea76 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Sat, 26 Feb 2022 17:38:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(settings):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E4=BA=8E=E7=B1=BB=E5=9E=8B=E4=B8=BADate=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9A=84=E6=94=AF=E6=8C=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettingManagement/src/SettingForm.vue     | 22 ++++++++++++++++---
 .../LINGYUN.MicroService.TaskManagement.sln   |  4 ++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/vue/src/components/SettingManagement/src/SettingForm.vue b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
index 615f40ae4..3d8740c92 100644
--- a/apps/vue/src/components/SettingManagement/src/SettingForm.vue
+++ b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
@@ -21,7 +21,7 @@
                     :detail="detail"
                     :change="detail.valueType === 2 ? handleCheckChange : handleValueChange"
                   />
-                  <FormItem v-else :label="detail.displayName">
+                  <FormItem v-else :label="detail.displayName" :extra="detail.description">
                     <!-- <Input type="text" v-model="detail.value" /> -->
                     <Password
                       v-if="detail.valueType === 0 && detail.isEncrypted"
@@ -43,6 +43,13 @@
                       type="number"
                       @input="handleValueChange(detail)"
                     />
+                    <DatePicker
+                      v-if="detail.valueType === 3"
+                      :value="detail.value ? moment(detail.value, 'YYYY-MM-DD') : ''"
+                      :placeholder="detail.description"
+                      style="width: 100%;"
+                      @change="handleDateChange($event, detail)"
+                    />
                     <Select
                       v-if="detail.valueType === 5"
                       v-model:value="detail.value"
@@ -91,12 +98,13 @@
 </template>
 
 <script lang="ts">
+  import moment from 'moment';
   import { computed, defineComponent, ref, toRaw } from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useLocalization } from '/@/hooks/abp/useLocalization';
-  import { Checkbox, Tabs, Collapse, Form, Input, Select, Row, Col } from 'ant-design-vue';
+  import { Checkbox, Tabs, Collapse, Form, Input, Select, Row, Col, DatePicker } from 'ant-design-vue';
   import { Input as BInput } from '/@/components/Input';
-
+  import { formatToDate } from '/@/utils/dateUtil';
   import { SettingGroup, SettingsUpdate } from '/@/api/settings/model/settingModel';
 
   const props = {
@@ -119,6 +127,7 @@
       Checkbox,
       Collapse: Collapse,
       CollapsePanel: Collapse.Panel,
+      DatePicker,
       Form: Form,
       FormItem: Form.Item,
       BInput,
@@ -164,6 +173,11 @@
         handleValueChange(setting);
       }
 
+      function handleDateChange(e, setting) {
+        setting.value = moment.isMoment(e) ? formatToDate(e) : '';
+        handleValueChange(setting);
+      }
+
       function handleValueChange(setting) {
         const index = updateSetting.value.settings.findIndex((s) => s.name === setting.name);
         if (index >= 0) {
@@ -191,12 +205,14 @@
 
       return {
         L,
+        moment,
         saving,
         activeTabKey,
         updateSetting,
         sumbitButtonTitle,
         expandedCollapseKeys,
         handleCheckChange,
+        handleDateChange,
         handleValueChange,
         handleSubmit,
       };
diff --git a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln
index 6809b5989..3f5395379 100644
--- a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln
+++ b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln
@@ -40,9 +40,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks.ExceptionHandling", "modules\task-management\LINGYUN.Abp.BackgroundTasks.ExceptionHandling\LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj", "{8507BBFA-FE56-4426-BBFA-C92906CB8407}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.TaskManagement.HttpApi.Client", "modules\task-management\LINGYUN.Abp.TaskManagement.HttpApi.Client\LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj", "{56C759D1-6FE6-4111-A2DB-CD65DCE82061}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.TaskManagement.HttpApi.Client", "modules\task-management\LINGYUN.Abp.TaskManagement.HttpApi.Client\LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj", "{56C759D1-6FE6-4111-A2DB-CD65DCE82061}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.BackgroundTasks.TaskManagement", "modules\task-management\LINGYUN.Abp.BackgroundTasks.TaskManagement\LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj", "{7937785C-0D28-46B3-A7E7-0B592821A1F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks.TaskManagement", "modules\task-management\LINGYUN.Abp.BackgroundTasks.TaskManagement\LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj", "{7937785C-0D28-46B3-A7E7-0B592821A1F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution