From 8146fff5bc7112d518cc8550dde8cc2c642dddde Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Sun, 27 Oct 2019 12:53:12 +0800
Subject: [PATCH] =?UTF-8?q?[feature]{datetimepicker}:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8C=83=E5=9B=B4=E5=8A=9F=E8=83=BD,?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E5=A4=A7=E4=BA=8E=E7=AD=89?=
 =?UTF-8?q?=E4=BA=8E=E3=80=81=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormDesigner/GenerateFormItem.vue         | 21 +++++++++++++++++--
 src/components/FormDesigner/WidgetConfig.vue  |  8 +++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/FormDesigner/GenerateFormItem.vue b/src/components/FormDesigner/GenerateFormItem.vue
index 507d6f9..29779c9 100644
--- a/src/components/FormDesigner/GenerateFormItem.vue
+++ b/src/components/FormDesigner/GenerateFormItem.vue
@@ -100,7 +100,8 @@
                       :clearable="widget.options.clearable"
                       :value-format="widget.options.timestamp ? 'timestamp' : widget.options.format"
                       :format="widget.options.format"
-                      :style="{width: widget.options.width}" />
+                      :style="{width: widget.options.width}"
+                      :picker-options="pickerOptions"/>
     </template>
 
     <template v-if="widget.type =='rate'">
@@ -186,7 +187,23 @@ export default {
       dataModel: this.models[this.widget.model],
     };
   },
-
+  computed: {
+    // 日期选择器pickOptions
+    pickerOptions() {
+      const { range } = this.widget.options;
+      if (range != null && range !== '') {
+        return {
+          disabledDate(time) {
+            if (range === 'smaller') {
+              return time.getTime() <= Date.now();
+            }
+            return time.getTime() >= Date.now();
+          },
+        };
+      }
+      return {};
+    },
+  },
   watch: {
     dataModel: {
       deep: true,
diff --git a/src/components/FormDesigner/WidgetConfig.vue b/src/components/FormDesigner/WidgetConfig.vue
index 3ae79f7..4caaaa6 100644
--- a/src/components/FormDesigner/WidgetConfig.vue
+++ b/src/components/FormDesigner/WidgetConfig.vue
@@ -307,6 +307,14 @@
           <el-switch
             v-model="data.options.isRange"
           />
+        </el-form-item>
+           <!-- 日期选择器选择范围 暂时只提供大于当前时间 小于当前时间 -->
+           <el-form-item label="选择范围"
+                      v-if="data.type == 'date'">
+          <el-select v-model="data.options.range" clearable placeholder="暂时只支持跟当前时间比对">
+            <el-option label="小于等于当前日期" value="smaller"></el-option>
+            <el-option label="大于等于当前日期" value="greater"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item
           v-if="data.type == 'date'"