Merge branch 'master' of github.com:szuprefix/vue-django

src/components/media/qcloud/Controls.vue

@@ -14,8 +14,7 @@
 </template>
 <script>
     import {Popup, Radio, Group} from 'vux'
-    import {get, throttle} from 'lodash'
-    import Cache from 'vue-django/src/utils/user_storage'
+    import {get} from 'lodash'
     import {duration} from 'vue-django/src/utils/filters'
     export default{
         props: {
@@ -71,12 +70,7 @@
                     this.getEl().currentTime = ct
                     this.$vux.toast.text(`从上次断点${duration(ct)}继续播放.`)
                 }
-//                this.currentTime = ct
-//                this.saveCurrentTime()
             },
-//            saveCurrentTime: throttle(function () {
-//                this.cache.save(this.currentTime)
-//            }, 2000),
             setCurrentTime (ct) {
                 setTimeout(() => {
                     this.getEl().currentTime = ct

src/components/mobile/model/List.vue

@@ -7,7 +7,9 @@
                 <slot name="icon" v-bind="scope"></slot>
             </template>
         </cells>
+
         <load-more :tip="tip" :show-loading="loading" v-if="pageSize < count"></load-more>
+        <div v-if="!loading && count<=0" style="text-align: center;margin: 2rem 0;">暂无数据</div>
     </div>
 </template>
 <script>

src/components/mobile/model/Relations.vue

@@ -9,15 +9,14 @@
 </template>
 <script>
     import {Tab, TabItem} from 'vux'
-    import Cache from '../../../utils/user_storage'
     export default{
         props: {
             items: Array,
             owner: Object
         },
         data () {
             return {
-                cache: Cache(`${this.owner.appModel}.n${this.owner.id}.relations.tab`, this.$store.state.user.id),
+                cache: this.$store.state.storage.newCache(`${this.owner.appModel}.n${this.owner.id}.relations.tab`),
                 tab: undefined,
                 modelListComponents: [],
                 relationComponent: undefined

src/mixins/form_view.js

@@ -110,8 +110,6 @@ export default{
                         valid = false
                     }
                     procedure(valid)
-                }).catch(e => {
-                    console.log(e)
                 })
             }
 

src/router/permission.js

@@ -1,12 +1,11 @@
 import router from './index'
-import {asyncRouterMap} from './index'
 import store from '../store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css'// progress bar style
-import {getToken, setToken, getLoginMode, removeToken} from '../utils/auth' // getToken from cookie
+import {getToken, setToken} from '../utils/auth' // getToken from cookie
 
 NProgress.configure({showSpinner: false})// NProgress Configuration
-const loginUrl = '/auth/login/'
+const loginUrl = '/auth/login'
 
 router.beforeEach((to, from, next) => {
         NProgress.start() // start progress bar
@@ -28,7 +27,7 @@ router.beforeEach((to, from, next) => {
                     // router.addRoutes(asyncRouterMap) //todo: make dynamics routers
                     next({...to, replace: true}) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
                 }).catch((error) => {
-                    Vue.prototype.$message({message:'身份认证失败, 请重新登录', type:'error'})
+                    Vue.$message({message:'身份认证失败, 请重新登录', type:'error'})
                     next({path: loginUrl, query: {redirect: to.fullPath}})
                 })
             } else {
@@ -39,7 +38,7 @@ router.beforeEach((to, from, next) => {
                 if (isAllowed) {
                     next()
                 } else {
-                    next({path: '/notallow/'})
+                    next({path: '/notallow'})
                 }
             }
         }
@@ -53,5 +52,5 @@ router.afterEach(() => {
 router.onError((err) => {
     NProgress.done()
     console.error(err)
-    Vue.prototype.$message({message:`发生异常:${err}`, type:'error'})
+    Vue.$message({message:`发生异常:${err}`, type:'error'})
 })

src/store/index.js

@@ -5,12 +5,14 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import apps from '@/configs/apps'
 import {logout} from '../utils/auth'
-import dailyLog from 'vue-django/src/utils/dailylog'
+import dailyLog from '../utils/dailylog'
+import {UserStorage} from '../utils/user_storage'
 Vue.use(Vuex)
 const state = {
     bus: new Vue(),
     user: {},
     dailyLog,
+    storage: UserStorage(),
     apps,
     system_name: '',
     logo: require('../assets/logo.png')
@@ -22,6 +24,7 @@ var store = new Vuex.Store({
         setUser (state, payload) {
             // console.log(payload)
             state.user = payload
+            state.storage = UserStorage(payload.id)
             state.bus.$emit('get-user-info', payload)
         },
         clearUser (state) {

src/utils/timer.js

@@ -2,36 +2,39 @@
  * Created by denishuang on 2020/1/7.
  */
 
-export default function (options) {
+import {duration} from './filters'
+import {throttle} from 'lodash'
+export default function (cache) {
     let t = {
         value: 0,
-        ...options,
+        cache,
         init () {
-            if (this.key) {
-                this.value = Number.parseInt(localStorage.getItem(this.key) || 0)
+            if (this.cache) {
+                this.value = this.cache.read() || 0
             }
         },
         run () {
             this.handler = setInterval(() => {
                 this.value++
-                if (this.key && this.value % 10 === 0) {
-                    localStorage.setItem(this.key, this.value)
+                if (this.cache) {
+                    this.saveCache()
                 }
             }, 1000)
         },
+        saveCache: throttle(function () {
+            this.cache.save(this.value)
+        }, 10000),
         stop () {
             clearInterval(this.handler)
         },
         clear () {
             this.value = 0
-            if (this.key) {
-                localStorage.removeItem(this.key)
+            if (this.cache) {
+                this.cache.destroy()
             }
         },
         toString () {
-            let m = Math.floor(this.value / 60)
-            let s = this.value % 60
-            return `${m}'${s}''`
+            return duration(this.value)
         }
     }
     t.init()

src/utils/user_storage.js

@@ -6,24 +6,24 @@ import low from 'lowdb'
 import LocalStorage from 'lowdb/adapters/LocalStorage'
 
 export function Cache (key, db) {
-    if (Number.isInteger(db) || db === undefined) {
-        db = `userStore${db}`
-    }
-    if (typeof db === 'string') {
-        let adapter = new LocalStorage(db)
-        db = low(adapter)
-        db.read()
-    }
     return {
         db,
         save (v) {
-            db.set(key, v).write()
+            try {
+                db.set(key, v).write()
+            } catch (e) {
+                alert(e.toString())
+            }
         },
         read (k) {
             return db.get(k || key).value()
         },
         destroy () {
-            db.unset(key).write()
+            try {
+                db.unset(key).write()
+            } catch (e) {
+                alert(e.toString())
+            }
         }
     }
 }
@@ -34,6 +34,7 @@ export function BCache (key, db) {
         ps[2] = ps[2].replace(/^n/, '')
         return ps.join('.')
     }
+
     let cache = Cache(key, db)
     return {
         ...cache,
@@ -44,3 +45,20 @@ export function BCache (key, db) {
 }
 
 export default BCache
+
+export function UserStorage (key) {
+    if (key === undefined) {
+        key = 'userStore'
+    }
+    if (Number.isInteger(key)) {
+        key = `userStore${key}`
+    }
+    let adapter = new LocalStorage(key)
+    let db = low(adapter)
+    return {
+        db,
+        newCache: function (key) {
+            return BCache(key, db)
+        }
+    }
+}