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

szuprefix · Apr 2, 2020 · 69f26c6 · 69f26c6
2 parents 8e25ff8 + 1738718
commit 69f26c6
Show file tree

Hide file tree

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

diff --git a/src/components/generic/ForeignKey.vue b/src/components/generic/ForeignKey.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :href="`#${url}`" v-if="hasLink">
+  <a :href="`#${url}`"  title="点击跳转" class="foreignkey-link" v-if="hasLink">
     {{label}}
   </a>
   <span v-else>

diff --git a/src/components/layout/BatchActions.vue b/src/components/layout/BatchActions.vue
@@ -8,12 +8,12 @@
                :key="a.name">{{a.label}}
     </el-button>
     <el-dialog :title="dialog.title" v-if="dialog" :visible.sync="showDialog">
-      <component :is="dialog.component" v-bind="[dialog]"></component>
+      <component :is="dialog.component" v-bind="[dialog]" :submit="function() {runCommand(dialog.action)}"></component>
     </el-dialog>
   </span>
 </template>
 <script>
-//  import _import from '../../router/_import_production'
+    //  import _import from '../../router/_import_production'
     export default{
         props: {
             items: Array,
@@ -29,11 +29,10 @@
         components: {},
         methods: {
             onCommand(action){
-                if(action.dialog) {
-//                    let component = _import(action.dialog.component)
-                    this.dialog = {title:action.label, ...action.dialog}
+                if (action.dialog) {
+                    this.dialog = {title: action.label, ...action.dialog, action}
                     this.showDialog = true
-                }else {
+                } else {
                     this.runCommand(action)
                 }
 

diff --git a/src/components/media/qcloud/Avatar.vue b/src/components/media/qcloud/Avatar.vue
@@ -0,0 +1,21 @@
+<template>
+    <el-image style="max-width:100px;" fit="fill" :src="`${url}?imageMogr2/thumbnail/360x360/quality/100`" :key="url" v-bind="[field, $attrs,$props]" lazy v-if="url"></el-image>
+</template>
+<script>
+    export default{
+        props: {
+            value: Object,
+            field: Object
+        },
+        data () {
+            return {}
+        },
+        components: {},
+        methods: {},
+        computed: {
+            url () {
+                return this.value[this.field.name]
+            }
+        }
+    }
+</script>
diff --git a/src/components/model/Relations.vue b/src/components/model/Relations.vue
@@ -30,8 +30,8 @@
                 let items = this.items || this.parent.viewsConfig.relations || []
                 this.modelItems = array_normalize(items, {}, (a) => {
                     let m = a.model = Model(a.name)
-                    a.icon = m.config.icon
-                    a.label = m.config.verbose_name
+                    a.icon = a.icon || m.config.icon
+                    a.label = a.label || m.config.verbose_name
                     return a
                 })
             }

diff --git a/src/components/table/Column.vue b/src/components/table/Column.vue
@@ -11,7 +11,7 @@
     </el-table-column>
     <el-table-column :type="f.type" v-else-if="f.type === 'selection'"></el-table-column>
     <el-table-column :prop="f.name" :column-key="f.name" :label="f.label || f.name"
-                     v-bind="f" :class-name="f.type" :key="f.name" :sortable="f.sortable"
+                     v-bind="f" :class-name="f.type" :key="f.name"
                      v-else>
 
         <template slot="header" slot-scope="scope">

diff --git a/src/components/table/Widget.vue b/src/components/table/Widget.vue
@@ -4,7 +4,7 @@
                v-else-if="field.widget && typeof field.widget == 'object'"></component>
     <span v-else-if="field.widget && typeof field.widget == 'function'"
           v-html="field.widget(value, field)"></span>
-    <span v-else>{{value[field.name]}}</span>
+    <span v-else>{{field.formatter && field.formatter(value, field.name, value[field.name]) || value[field.name]}}</span>
 </template>
 <script>
     import FormWidget from '../form/Widget.vue'

diff --git a/src/components/widgets/ForeignKey.vue b/src/components/widgets/ForeignKey.vue
@@ -1,5 +1,5 @@
 <template>
-    <a :href="`#/${field.model.replace('.','/')}/${value[field.name]}/`" v-if="hasLink">
+    <a :href="`#/${field.model.replace('.','/')}/${value[field.name]}`" title="点击跳转" class="foreignkey-link" v-if="hasLink">
         {{theValue}}
     </a>
     <span v-else>
@@ -25,3 +25,8 @@
         }
     }
 </script>
+<style>
+    a.foreignkey-link:hover{
+        text-decoration: underline;
+    }
+</style>
diff --git a/src/views/model/edit.vue b/src/views/model/edit.vue
@@ -1,6 +1,15 @@
 <template>
-    <model-form :appModel="appModel" v-model="data"  ref="form">
+    <model-form :appModel="appModel" v-model="data" ref="form">
         <template v-slot:bottom="{model}">
+            <template v-if="model.viewsConfig">
+                <el-collapse v-model="activePanels" v-if="model.viewsConfig.pannels">
+                    <el-collapse-item :title="p.label" :name="i" v-for="p, i in model.viewsConfig.pannels"
+                                      :key="p.name">
+                        <component :is="p.component" :parent="model"></component>
+                    </el-collapse-item>
+                </el-collapse>
+
+            </template>
             <model-relations v-if="model.data.id && model.viewsConfig"
                              :parent="model"></model-relations>
 
@@ -13,7 +22,8 @@
         mixins: [edit_mixin],
         data () {
             return {
-                appModel: ''
+                appModel: '',
+                activePanels: [0]
             }
         },
         created () {