From bddf53430060d8725e841ae6ba8f7a9053700490 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 11 Apr 2019 10:40:10 +0800
Subject: [PATCH] refine
---
src/filters/index.js | 5 ++--
src/layout/components/index.js | 4 +--
src/layout/index.vue | 2 +-
src/utils/index.js | 44 ----------------------------
src/views/components-demo/sticky.vue | 2 +-
5 files changed, 7 insertions(+), 50 deletions(-)
diff --git a/src/filters/index.js b/src/filters/index.js
index 4ef06454..86e768d8 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -3,7 +3,6 @@ export { parseTime, formatTime } from '@/utils'
/**
* Show plural label if time is plural number
- *
* @param {number} time
* @param {string} label
* @return {string}
@@ -30,7 +29,8 @@ export function timeAgo(time) {
}
/**
- * 数字 格式化
+ * Number formatting
+ * like 10000 => 10k
* @param {number} num
* @param {number} digits
*/
@@ -52,6 +52,7 @@ export function numberFormatter(num, digits) {
}
/**
+ * 10000 => "10,000"
* @param {number} num
*/
export function toThousandFilter(num) {
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index e9f79ddd..104bd3ac 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -1,5 +1,5 @@
+export { default as AppMain } from './AppMain'
export { default as Navbar } from './Navbar'
+export { default as Settings } from './Settings'
export { default as Sidebar } from './Sidebar/index.vue'
export { default as TagsView } from './TagsView/index.vue'
-export { default as AppMain } from './AppMain'
-export { default as Settings } from './Settings'
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 133fdfcd..965bcd1b 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -17,7 +17,7 @@
<script>
import RightPanel from '@/components/RightPanel'
-import { Navbar, Sidebar, AppMain, TagsView, Settings } from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
import ResizeMixin from './mixin/ResizeHandler'
import { mapState } from 'vuex'
diff --git a/src/utils/index.js b/src/utils/index.js
index 8735aa99..c0ee5026 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -90,7 +90,6 @@ export function formatTime(time, option) {
}
/**
- * 格式化时间
* @param {string} url
* @returns {Object}
*/
@@ -185,7 +184,6 @@ export function html2Text(val) {
/**
* Merges two objects, giving the last one precedence
- *
* @param {Object} target
* @param {(Object|Array)} source
* @returns {Object}
@@ -228,45 +226,6 @@ export function toggleClass(element, className) {
element.className = classString
}
-export const pickerOptions = [
- {
- text: '今天',
- onClick(picker) {
- const end = new Date()
- const start = new Date(new Date().toDateString())
- end.setTime(start.getTime())
- picker.$emit('pick', [start, end])
- }
- },
- {
- text: '最近一周',
- onClick(picker) {
- const end = new Date(new Date().toDateString())
- const start = new Date()
- start.setTime(end.getTime() - 3600 * 1000 * 24 * 7)
- picker.$emit('pick', [start, end])
- }
- },
- {
- text: '最近一个月',
- onClick(picker) {
- const end = new Date(new Date().toDateString())
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
- picker.$emit('pick', [start, end])
- }
- },
- {
- text: '最近三个月',
- onClick(picker) {
- const end = new Date(new Date().toDateString())
- const start = new Date()
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
- picker.$emit('pick', [start, end])
- }
- }
-]
-
/**
* @param {string} type
* @returns {Date}
@@ -361,7 +320,6 @@ export function createUniqueString() {
/**
* Check if an element has a class
- *
* @param {HTMLElement} elm
* @param {string} cls
* @returns {boolean}
@@ -372,7 +330,6 @@ export function hasClass(ele, cls) {
/**
* Add class to element
- *
* @param {HTMLElement} elm
* @param {string} cls
*/
@@ -382,7 +339,6 @@ export function addClass(ele, cls) {
/**
* Remove class from element
- *
* @param {HTMLElement} elm
* @param {string} cls
*/
diff --git a/src/views/components-demo/sticky.vue b/src/views/components-demo/sticky.vue
index b1e6c89e..db86cb2d 100644
--- a/src/views/components-demo/sticky.vue
+++ b/src/views/components-demo/sticky.vue
@@ -28,7 +28,7 @@
</el-dropdown>
<div class="time-container">
- <el-date-picker v-model="time" :picker-options="pickerOptions" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="Release time" />
+ <el-date-picker v-model="time" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="Release time" />
</div>
<el-button style="margin-left: 10px;" type="success">