upload, store modules, excel

src/App.vue

@@ -5,8 +5,8 @@
         <template v-else>
             <el-menu class="el-menu-demo" mode="horizontal" router>
                 <el-menu-item index="/" class="brand">
-                    <img :src="logo" height="32">
-                    <b v-if="user.as_saas_worker">{{user.as_saas_worker.party}}</b>
+                    <img :src="party.logo" height="32">
+                    <b v-if="user.as_saas_worker">{{party.name}}</b>
                     {{system_name}}
                 </el-menu-item>
                 <el-submenu index="2" style="float:right">
@@ -51,7 +51,7 @@
             layout (){
                 return this.$route.meta.layout
             },
-            ...mapState(['user', 'system_name', 'logo'])
+            ...mapState(['user', 'system_name', 'party'])
         },
         methods: {
             logout(){

src/components/media/VideoInput.vue

@@ -1,5 +1,5 @@
 <template>
-    <q-video :width="field.width" :height="field.height" :appID="$store.state.qcloud.vod.appId" :fileID="fileId">
+    <q-video :width="field.width" :height="field.height" :appID="$store.state.party.settings.media.qcloud.vod.appid" :fileID="fileId">
     </q-video>
 </template>
 <script>

src/components/media/VideoWidget.vue

@@ -1,5 +1,5 @@
 <template>
-    <q-video :width="field.width" :height="field.height" :appID="$store.state.qcloud.vod.appId"
+    <q-video :width="field.width" :height="field.height" :appID="$store.state.party.settings.media.qcloud.vod.appid"
              :fileID="fileId" ref="video">
     </q-video>
 </template>

src/components/media/qcloud/ImageUpload.vue

@@ -4,7 +4,7 @@
                    class="image-uploader"
                    ref="upload"
                    action="noaction"
-                   accept=".jpg,.png,.jpeg"
+                   accept=".jpg,.png,.jpeg,.gif"
                    list-type="picture-card"
                    :file-list="fileList"
                    v-bind="[$attrs, $props]"
@@ -78,14 +78,14 @@
                 this.dialogVisible = true
             },
             onProgress(event, file, fileList){
-                console.log(['progress', event, file, fileList])
+//                console.log(['progress', event, file, fileList])
             },
             onError(err, file, fileList){
                 console.log(['error', err, file, fileList])
             },
 
             onSuccess(response, file, fileList){
-                let sf = fileList.find(f => f.uid = file.uid)
+                let sf = fileList.find(f => f.uid === file.uid)
                 if (!sf) {
                     console.error('file not found:', file.uid)
                     return
@@ -98,12 +98,12 @@
                 this.$emit('remove', {file, fileList})
             },
             onChange (file, fileList) {
-                console.log('change')
+//                console.log('change')
                 this.fileList = fileList
             },
             toggleAdd () {
                 if (this.$attrs.limit === 1) {
-                    console.debug(this.$attrs.limit, this.fileList.length)
+//                    console.debug(this.$attrs.limit, this.fileList.length)
                     if (this.fileList.length>0) {
                         this.elUploader.classList.add('hidden')
                     } else {
@@ -119,6 +119,13 @@
                 let url = URL.createObjectURL(file)
                 return url
             },
+            getFileNumber(fn) {
+                let re = /(\d+)\./g
+                let m =re.exec(fn)
+                if(m) {
+                    return m[1]
+                }
+            },
             getFileNameContext (fn) {
                 let ps = fn.split('.')
                 let extName = undefined
@@ -134,14 +141,16 @@
                     extName,
                     fileName,
                     baseName,
-                    dateTime
+                    dateTime,
+                    number: this.getFileNumber(fn)
                 }
             },
             uploadFile (req) {
                 let file = req.file
                 let fn = file.name
                 let ctx = {...this.context, ...this.getFileNameContext(fn)}
-                console.log(ctx)
+                file.uploadContext = ctx
+//                console.log(ctx)
                 let fileName = template(this.fileName || '${dateTime}.${extName}')(ctx)
 //                console.log(fileName)
 //                return
@@ -153,6 +162,7 @@
                         Key: fileName,
                         Body: req.file,
                         onProgress: function (info) {
+                            console.log('tcCos.onProgress', info, req)
                             req.onProgress(info)
                         }
                     }, function (err, data) {

src/components/mobile/model/Relations.vue

@@ -16,7 +16,7 @@
         },
         data () {
             return {
-                cache: this.$store.state.storage.newCache(`${this.owner.appModel}.n${this.owner.id}.relations.tab`),
+                cache: this.$store.state.user.storage.newCache(`${this.owner.appModel}.n${this.owner.id}.relations.tab`),
                 tab: undefined,
                 modelListComponents: [],
                 relationComponent: undefined

src/components/model/Search.vue

@@ -75,7 +75,6 @@
                     return {multiple: false, ...a, label, widget: this.defaultWidget(a)}
                 })
                 this.filterFields = this.reorder(ffields)
-                console.log(search.filter_fields, ffields, this.filterFields)
                 this.filters = Object.assign({}, this.getFilters())
             },
             defaultWidget (item) {

src/components/sheets/ExcelReader.vue

@@ -0,0 +1,45 @@
+<template>
+    <div>
+        <el-upload :http-request="readFile" ref="uploader" accept=".xls,.xlsx"
+                   :show-file-list="false"
+                   :on-change="onChange">
+            <el-button size="small" type="primary">打开文件</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传excel文件，且不超过5MB</div>
+        </el-upload>
+    </div>
+</template>
+<script>
+    function readWorkbookFromLocalFile(XLSX, file, callback) {
+        var reader = new FileReader()
+        reader.onload = function (e) {
+            var data = e.target.result
+            var workbook = XLSX.read(data, {type: 'binary'})
+            if (callback) callback(workbook)
+        }
+        reader.readAsBinaryString(file)
+    }
+
+    export default{
+        data () {
+            return {}
+        },
+        components: {},
+        methods: {
+            onChange(file, fileList) {
+                console.log(file)
+            },
+            readFile(req) {
+                let file = req.file
+                import('xlsx').then(XLSX => {
+
+                    readWorkbookFromLocalFile(XLSX, file, (wb) => {
+                        let data = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+                        this.$emit('read', {file, data, wb})
+                    })
+
+                })
+            }
+        },
+        computed: {}
+    }
+</script>

src/components/table/widgets/Html.vue

@@ -0,0 +1,21 @@
+<template>
+    <div v-html="value[field.name]">
+        html
+    </div>
+</template>
+<script>
+    export default{
+        props: {
+            value: String,
+            field: Object,
+            context: Object
+        },
+        data () {
+            return {}
+        },
+        components: {},
+        methods: {},
+        computed: {}
+    }
+</script>
+

src/store/index.js

@@ -5,46 +5,24 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import apps from '@/configs/apps'
 import {logout} from '../utils/auth'
+import user from './modules/user'
+import party from './modules/party'
 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')
 }
 
 var store = new Vuex.Store({
     state: state,
-    mutations: {
-        setUser (state, payload) {
-            // console.log(payload)
-            state.user = payload
-            state.storage = UserStorage(payload.id)
-            state.bus.$emit('get-user-info', payload)
-        },
-        clearUser (state) {
-            state.user = {}
-            state.bus.$emit('user-logout')
-        }
-    },
-    actions: {
-        getUserInfo (context) {
-            return Vue.http.get('/auth/user/current/').then(({data}) => {
-                context.commit('setUser', data)
-                return data
-            })
-        },
-        logout (context) {
-            return logout().then((data) => {
-                context.commit('clearUser')
-                return data
-            })
-        }
+    modules: {
+        user,
+        party
     },
     plugins: []
 })

src/store/modules/party.js

@@ -0,0 +1,24 @@
+import Vue from 'vue'
+
+const party = {
+    state: {
+        name: null,
+        logo: null
+    },
+
+    mutations: {
+        setParty(state, payload){
+            Object.assign(state, payload)
+        }
+    },
+    actions: {
+        getPartyInfo ({commit, rootState}){
+            return Vue.http.get("/saas/party/current/").then(({data}) => {
+                commit("setParty", data)
+                return data
+            })
+        }
+    }
+}
+
+export default party

src/store/modules/user.js

@@ -0,0 +1,35 @@
+/**
+ * Created by denishuang on 2020/5/15.
+ */
+import UserStorage from '../../utils/user_storage'
+import {logout} from '../../utils/auth'
+export default {
+    state: {
+        storage: UserStorage()
+    },
+    mutations: {
+        setUser (state, payload) {
+            Object.assign(state, payload)
+            state.storage = UserStorage(payload.id)
+        },
+        clearUser (state) {
+            state.user = {}
+        }
+    },
+    actions: {
+        getUserInfo ({commit, rootState}) {
+            return Vue.http.get('/auth/user/current/').then(({data}) => {
+                commit('setUser', data)
+                rootState.bus.$emit('get-user-info', data)
+                return data
+            })
+        },
+        logout ({commit, rootState}) {
+            return logout().then((data) => {
+                commit('clearUser')
+                rootState.bus.$emit('user-logout')
+                return data
+            })
+        }
+    }
+}

src/utils/blob.js

@@ -0,0 +1,27 @@
+/**
+ * Created by denishuang on 2020/4/29.
+ */
+
+export function img2canvas(img) {
+    let canvas = document.createElement('canvas')
+    canvas.width = img.width
+    canvas.height = img.height
+    canvas.getContext('2d').drawImage(img, 0, 0)
+    return canvas
+}
+
+export function dataurl2blob(durl) {
+    let arr = durl.split(','),
+        mime = arr[0].match(/:(.*?);/)[1],
+        bstr = atob(arr[1]),
+        n = bstr.length,
+        u8arr = new Uint8Array(n)
+    while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+    }
+    return new Blob([u8arr], {type:mime})
+}
+
+export function img2blob(img) {
+    return dataurl2blob(img2canvas(img).toDataURL('image/png'))
+}