Merge remote-tracking branch 'origin/dev' into dev

2022-08-25 16:50:37 +08:00 · 2022-08-25 16:50:37 +08:00 · ca133ccc64
commit ca133ccc64
parent 864c6e42fd ade4bf7c2d
1 changed files with 7 additions and 0 deletions
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@ -15,6 +15,7 @@
    :size="size"
    :editable="false"
    :picker-options="pickerOptions"
+    :default-time="defaultRangeTime"
    @change="dateChange"
    @focus="toFocus"
    @blur="onBlur"
@ -119,6 +120,12 @@ export default {
        }
      }
      return null
+    },
+    defaultRangeTime() {
+      if (this.element.options.attrs.type === 'daterange' && this.element.options.attrs.showTime) {
+        return ['00:00:00', '23:59:59']
+      }
+      return null
    }

  },