Merge branch 'master' into permission-control

README-zh.md

@@ -14,11 +14,13 @@
 
 ## 相关项目
 
-[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
 
-[electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
+- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-[vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+
+- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
 
 写了一个系列的教程配套文章，如何从零构建后一个完整的后台项目:
 

README.md

@@ -68,11 +68,13 @@ For `typescript` version, you can use [vue-typescript-admin-template](https://gi
 
 ## Related Project
 
-[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
 
-[electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
+- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-[vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+
+- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
 
 ## Browsers support
 

jsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+        "@/*": ["src/*"]
+    }
+  },
+  "exclude": ["node_modules", "dist"]
+}

src/components/SvgIcon/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
   <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
-    <use :xlink:href="iconName" />
+    <use :href="iconName" />
   </svg>
 </template>
 

src/utils/index.js

@@ -6,7 +6,7 @@
  * Parse the time to string
  * @param {(Object|string|number)} time
  * @param {string} cFormat
- * @returns {string}
+ * @returns {string | null}
  */
 export function parseTime(time, cFormat) {
   if (arguments.length === 0) {
@@ -34,14 +34,11 @@ export function parseTime(time, cFormat) {
     s: date.getSeconds(),
     a: date.getDay()
   }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
-    let value = formatObj[key]
+    const value = formatObj[key]
     // Note: getDay() returns 0 on Sunday
     if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
-    if (result.length > 0 && value < 10) {
+    return value.toString().padStart(2, '0')
-      value = '0' + value
-    }
-    return value || 0
   })
   return time_str
 }