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

szuprefix · Jul 24, 2020 · d8d44a7 · d8d44a7
2 parents d108bd0 + 1401413
commit d8d44a7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-django",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "个人实验项目, 本框架的目标是借鉴并超越django admin的自动化思想, 实现UI前端的极简快速定制开发",
   "main": "index.js",
   "files": [

diff --git a/src/App.vue b/src/App.vue
@@ -6,7 +6,7 @@
             <el-menu class="el-menu-demo" mode="horizontal" router>
                 <el-menu-item index="/" class="brand">
                     <img :src="party.logo" height="32">
-                    <b v-if="user.as_saas_worker">{{party.name}}</b>
+                    <b>{{party.name}}</b>
                     {{system_name}}
                 </el-menu-item>
                 <el-submenu index="2" style="float:right">

diff --git a/src/components/model/Form.vue b/src/components/model/Form.vue
@@ -8,7 +8,7 @@
                 <actions :items="_topActions"></actions>
             </el-col>
         </el-row>
-        <x-form :url="url" :items="formItems" v-model="formValue" ref="form" :options="options.form"
+        <x-form :url="url" :items="formItems" v-model="formValue" ref="form" :options="options.form" :disabled="disabled"
                 :successInfo="successInfo"
                 :method="method" @form-posted="onPosted" :submit="submit">
             <span slot="submit" v-if="!options.inline"></span>
@@ -184,7 +184,8 @@
             },
             checkPermission(p, m){
                 m = m || this
-                return this.$store.state.user.model_permissions[m.appModel].includes(p)
+                let ps = this.$store.state.user.model_permissions[m.appModel]
+                return ps && ps.includes(p)
             }
         },
         computed: {
@@ -197,6 +198,9 @@
             _topActions(){
                 return arrayNormalize(this.topActions, this.avairableActions)
             },
+            disabled () {
+                return !(this.checkPermission('update', this.model) || this.checkPermission('create', this.model))
+            }
         },
         watch: {
             value(val){

diff --git a/src/components/model/Table.vue b/src/components/model/Table.vue
@@ -83,7 +83,7 @@
                         icon: 'plus',
                         title: '创建',
                         do: this.toCreateModel,
-                        show: () => this.checkPermission('create')
+                        show: () => this.parentMultipleRelationField && this.checkPermission('partial_update', this.parent) || this.checkPermission('create')
                     },
                     'add': {
                         icon: 'plus-square',
@@ -95,7 +95,7 @@
                         icon: 'pencil',
                         title: '编辑',
                         do: this.toEditModel,
-                        show: () => this.checkPermission('update')
+                        show: () => this.checkPermission('update') || this.checkPermission('partial_update')
                     },
                     'delete': {
                         icon: 'trash',
@@ -108,7 +108,7 @@
                         icon: 'trash',
                         title: '移除',
                         do: this.removeFromParent,
-                        show: () => this.checkPermission('update', this.parent)
+                        show: () => this.checkPermission('partial_update', this.parent)
                     },
                     'batch': {
                         icon: 'archive',
@@ -222,7 +222,7 @@
                 return ({selection, scope}) => {
                     let ids = selection.map((a) => a.id)
                     let qd = {...this._baseQueries, ...this.search}
-                    return this.$http.post(`${this.model.getListUrl()}${action.api || action.name}/?${Qs.stringify(qd, {arrayFormat: 'comma'})}`, {batch_action_ids: ids, ...action.context, scope})
+                    return this.$http.post(`${this.model.getListUrl()}${action.api || action.name}/?${Qs.stringify(qd, {arrayFormat: 'comma'})}`, {batch_action_ids: ids, ...action.context, scope}).catch(this.onServerResponseError)
                 }
             },
             addToParent ({selection}) {
@@ -238,7 +238,7 @@
                             rows: data[fn].length - oids.length
                         }
                     }
-                })
+                }).catch(this.onServerResponseError)
             },
             removeFromParent({row}) {
                 let fn = this.parentMultipleRelationField.name
@@ -247,7 +247,7 @@
                 return this.$http.patch(this.parent.getDetailUrl(), d).then(({data}) => {
                     this.parent.data[fn] = data[fn]
                     this.parentQueries = Object.assign({}, this.getParentQueries())
-                })
+                }).catch(this.onServerResponseError)
             },
             getConfig () {
                 let config = this.model.viewsConfig.list || {}
@@ -357,13 +357,17 @@
                 let avairableActions = {...this.avairableActions, ...bactions, ...ractions}
                 let topActions = ['refresh', 'create', ['download'].concat(Object.keys(bactions))]
                 let rowActions = ['edit'].concat(Object.keys(ractions)).concat([[this.parentMultipleRelationField ? 'removeFromParent' : 'delete']])
+                let title = this.model.config.verbose_name
+                if (this.parent) {
+                    title = `${this.parent.title()}${title}`
+                }
                 return {
                     topActions,
                     rowActions,
 //                    excelFormat: this.excelFormat,
                     permissionFunction: this.checkPermission,
                     dblClickAction: 'edit',
-                    title: this.model.config.verbose_name,
+                    title,
                     ...this.$attrs,
                     baseQueries: this._baseQueries,
                     avairableActions,

diff --git a/src/components/queue/Task.vue b/src/components/queue/Task.vue
@@ -13,14 +13,14 @@
                         <el-button type="primary" size="small" @click="sumbit">开始</el-button>
                     </div>
 
-                    <x-table v-model="queue" :items="items" :cellWidget="TableCell"></x-table>
+                    <x-table v-model="queue" :items="items" :cellWidget="TableCell" row-key="keyField"></x-table>
                 </div>
             </el-tab-pane>
             <el-tab-pane :label="`${success.length}`">
                 <span slot="label"><i class="fa fa-check"></i> 成功记录<el-badge type="success" :value="success.length"
                                                                              v-if="success.length>0"/></span>
 
-                <x-table v-model="success" :items="items"></x-table>
+                <x-table v-model="success" :items="items" row-key="keyField"></x-table>
             </el-tab-pane>
             <el-tab-pane :label="`${fail.length}`">
                 <span slot="label"><i class="fa fa-close"></i> 失败记录<el-badge :value="fail.length"
@@ -29,7 +29,7 @@
                 <div class="flex-right">
                     <el-button type="primary" size="small" @click="retry">再试一次</el-button>
                 </div>
-                <x-table v-model="fail" :items="items"></x-table>
+                <x-table v-model="fail" :items="items" row-key="keyField"></x-table>
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -43,7 +43,7 @@
         props: {
             items: Array,
             concurrence: {type: Number, default: 1},
-            keyField: String,
+            keyField: {type: String, default: 'id'},
             action: Function,
             onSuccess: Function,
             value: Array
@@ -73,7 +73,13 @@
                         this.fail.push(d)
                     }
                 }).then(() => {
-                    this.queue = this.queue.filter(a => !(a[this.keyField] in this.ids))
+                    for (var i in this.queue) {
+                        if (this.queue[i][this.keyField] === id) {
+                            this.queue.splice(i,1)
+                            console.log('delete', id)
+                            return
+                        }
+                    }
                 })
             },
             sumbit () {

diff --git a/src/components/sheets/ExcelReader.vue b/src/components/sheets/ExcelReader.vue
@@ -26,9 +26,10 @@
         components: {},
         methods: {
             onChange(file, fileList) {
-                console.log(file)
+//                console.log(file)
             },
             readFile(req) {
+                this.$emit('start', req)
                 let file = req.file
                 import('xlsx').then(XLSX => {