[feature]{el-data-pick}: 加入时间选择器默认值,默认为当前日期

BoBoooooo · May 26, 2019 · cffdf4e · cffdf4e
1 parent 53959e5
commit cffdf4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/components/FormDesigner/GenerateForm.vue b/src/components/FormDesigner/GenerateForm.vue
@@ -68,6 +68,7 @@
 // 常规组件
 
 import GenerateFormItem from './GenerateFormItem';
+import { DateTimeNowSplit } from '@/utils/index';
 
 export default {
   name: 'FmGenerateForm',
@@ -201,7 +202,11 @@ export default {
               ...genList[i].rules,
             ];
           } else {
-            this.rules[genList[i].model] = [...genList[i].rules];
+            const config = genList[i];
+            // 如果时间选择器需要默认值,默认回填当前日期
+            if (config.type === 'date' && config.options.defaultValue) {
+              this.models[genList[i].model] = DateTimeNowSplit();
+            } else { this.models[genList[i].model] = genList[i].options.defaultValue; }
           }
         }
       }

diff --git a/src/components/FormDesigner/WidgetConfig.vue b/src/components/FormDesigner/WidgetConfig.vue
@@ -276,9 +276,8 @@
           v-model="data.options.defaultValue"
           :show-alpha="data.options.showAlpha"
         />
-        <el-switch
-          v-if="data.type=='switch'"
-          v-model="data.options.defaultValue"/>
+        <el-switch v-if="data.type=='switch' || data.type == 'date'"
+                   v-model="data.options.defaultValue"></el-switch>
       </el-form-item>
 
       <template v-if="data.type == 'time' || data.type == 'date'">

diff --git a/src/components/FormDesigner/componentsConfig.js b/src/components/FormDesigner/componentsConfig.js
@@ -134,7 +134,7 @@ export const basicComponents = [
     icon: 'regular/calendar-alt',
     hidden: false,
     options: {
-      defaultValue: '',
+      defaultValue: false,
       readonly: false,
       disabled: false,
       editable: true,