Pre Merge pull request !32 from 李强/dvadmin-dev

dvadmin-backend/application/uwsgi.ini

@@ -1,36 +1,11 @@
-# uwsgi.ini file
-# uwsgi --ini uwsgi.ini
 [uwsgi]
-# Django-related settings
-# the base directory (full path)
 chdir           = /dvadmin-backend
-# Django's wsgi file
 wsgi-file       = /dvadmin-backend/application/wsgi.py
-
-
-# process-related settings
-# master
 master          = true
-# maximum number of worker processes
 processes       = 8
-# the socket (use the full path to be safe
-# for nginx
-# socket          = app.sock
-# socket          = 127.0.0.1:8000
-socket          = 0.0.0.0:8000
-# Django's wsgi file
+http-socket     = 0.0.0.0:8000
 module          = application.wsgi:application
-
-# for http access directly (dev model)
-# http            = 0.0.0.0:8088
 vacuum          = true
 log-maxsize     = 20000000
-;req-logger 	= file:/backend/logs/uwsgi-@(exec://date +%%Y-%%m-%%d)-cart-req.log
-;logger 		= file:/backend/logs/uwsgi-@(exec://date +%%Y-%%m-%%d)-cart-err.log
 log-reopen      = true
-
-
-
-# chmod-socket=664
-# uid=www-data
-# gid=www-data
+buffer-size     = 65536

dvadmin-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dvadmin",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "dvAdmin管理系统",
   "author": "dvAdmin",
   "license": "MIT",

dvadmin-ui/src/components/ModelDisplay/index.vue

@@ -288,6 +288,15 @@
               :value="dict.dictValue"
             />
           </el-select>
+          <model-select
+            v-else-if="value.type==='model_select' && value.select_data"
+            :value.sync="form[value.prop]"
+            :placeholder="value.select_data.placeholder|| '请选择'"
+            :multiple="value.select_data.multiple|| false"
+            :disable_branch_nodes="value.select_data.disable_branch_nodes|| false"
+            :label_name="value.select_data.label_name|| 'name'"
+            :listApi="value.select_data.listApi|| null"
+          />
           <el-input
             v-else
             v-model="form[value.prop]"
@@ -339,9 +348,11 @@
   import moment from 'moment';
   import * as Utils from '@/utils';
   import {getToken} from '@/utils/auth'
+  import ModelSelect from "../ModelSelect/index";
 
   export default {
     name: 'ModelDisplay',
+    components: {ModelSelect},
     props: {
       value: {
         // table的Data

dvadmin-ui/src/components/ModelSelect/index.vue

@@ -0,0 +1,67 @@
+<!-- 通用选择器 -->
+<template>
+  <div>
+    <treeselect v-model="select_value" :options="selectOptions" :multiple="multiple" :show-count="true"
+                :placeholder="placeholder" :disable-branch-nodes="disable_branch_nodes"/>
+  </div>
+</template>
+
+<script>
+  import Treeselect from '@riophae/vue-treeselect'
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+  export default {
+    name: "ModelSelect",
+    props: {
+      /* 选择器的内容 */
+      value: {type: Number | Array,},
+      /* 用于显示选项 */
+      placeholder: {type: String, default: "请选择",},
+      /* 是否多选 */
+      multiple: {type: Boolean, default: false,},
+      /* 是否只能选末级 */
+      disable_branch_nodes: {type: Boolean, default: false,},
+      /* 用于下拉显示名称的字段 */
+      label_name: {type: String, default: 'name',},
+      /* 选择器信息 api 对象 */
+      listApi: {type: Function, default: null},
+    },
+    components: {Treeselect},
+    data() {
+      return {
+        selectOptions: [],
+        select_value: ''
+      }
+    },
+    watch: {
+      select_value(newValue) {
+        this.$emit('update:value', newValue)
+      },
+      value: {
+        handler: function (newValue) {
+          this.select_value = newValue
+        },
+        immediate: true
+      }
+    },
+    created() {
+      this.getData()
+    },
+    methods: {
+      /** 查询所有选择器信息 **/
+      getData() {
+        this.listApi({pageNum: "all", _fields: "id," + this.label_name}).then(response => {
+          response.data.map(val => {
+            val["label"] = val[this.label_name]
+          })
+          this.selectOptions = this.handleTree(response.data, 'id', 'parentId')
+        })
+      },
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

dvadmin-ui/src/views/index.vue

@@ -156,6 +156,17 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="">
+              <template slot="title">
+                v1.1.1 - 2021-05-17&nbsp;&nbsp;&nbsp;
+                <el-badge value="new" class="item" style="padding-top: 10px;padding-left: 10px;"/>
+              </template>
+              <ol>
+                <li>新功能(前端框架): 前端封装快速搭建CRUD</li>
+                <li>新功能(一键创建app命令): 一键创建app，并注册到settings和urls中</li>
+                <li>修复BUG(用户信息): 修复无法管理员更新用户信息BUG</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="">
               <template slot="title">
                 v1.1.0 - 2021-05-05&nbsp;&nbsp;&nbsp;
@@ -213,7 +224,7 @@
     data() {
       return {
         // 版本号
-        version: "1.1.0",
+        version: "1.1.1",
       };
     },
     methods: {