title

szuprefix · Jul 16, 2020 · 1401413 · 1401413
1 parent 9c3aa82
commit 1401413
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-django",
-  "version": "0.7.13",
+  "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/Table.vue b/src/components/model/Table.vue
@@ -358,13 +358,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,