Merge remote-tracking branch 'dva-origin/v2.x' into to_merge

backend/application/settings.py

@@ -30,6 +30,8 @@ from conf.env import *
 SECRET_KEY = 'django-insecure--z8%exyzt7e_%i@1+#1mm=%lb5=^fx_57=1@a+_y7bg5-w%)sm'
 # 初始化plugins插件路径到环境变量中
 PLUGINS_PATH = os.path.join(BASE_DIR, 'plugins')
+sys.path.insert(0, os.path.join(PLUGINS_PATH))
+
 [sys.path.insert(0, os.path.join(PLUGINS_PATH, ele)) for ele in os.listdir(PLUGINS_PATH) if
  os.path.isdir(os.path.join(PLUGINS_PATH, ele)) and not ele.startswith('__')]
 

backend/dvadmin/system/views/file_list.py

@@ -1,11 +1,3 @@
-# -*- coding: utf-8 -*-
-
-"""
-@author: 猿小天
-@contact: QQ:1638245306
-@Created on: 2021/8/9 009 20:48
-@Remark:
-"""
 from rest_framework import serializers
 
 from dvadmin.system.models import FileList
@@ -17,7 +9,7 @@ class FileSerializer(CustomModelSerializer):
     url = serializers.SerializerMethodField(read_only=True)
 
     def get_url(self, instance):
-        return  'media/'+str(instance.url)
+        return 'media/' + str(instance.url)
 
     class Meta:
         model = FileList

web/src/config/d2p-extends/types.js

@@ -0,0 +1,103 @@
+export default {
+  'image-uploader': {
+    form: { component: { name: 'd2p-file-uploader', props: { elProps: { listType: 'picture-card', accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif' } } } },
+    component: { name: 'd2p-images-format' },
+    view: {
+      component: { props: { height: 100, width: 100 } }
+    },
+    align: 'center',
+    // 提交时,处理数据
+    valueResolve (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        if (value.length >= 0) {
+          if (value instanceof Array) {
+            row[col.key] = value.toString()
+          } else {
+            row[col.key] = value[0]
+          }
+        } else {
+          row[col.key] = null
+        }
+      }
+    },
+    // 接收时,处理数据
+    valueBuilder (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        row[col.key] = value.split(',')
+      }
+    }
+  },
+  'avatar-uploader': {
+    form: { component: { name: 'd2p-file-uploader', props: { elProps: { limit: 1, listType: 'avatar', accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif', showFileList: false } } } },
+    component: { name: 'd2p-images-format' },
+    view: {
+      component: { props: { height: 100, width: 100 } }
+    },
+    align: 'center',
+    // 提交时,处理数据
+    valueResolve (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        if (value.length >= 0) {
+          if (value instanceof Array) {
+            row[col.key] = value.toString()
+          } else {
+            row[col.key] = value[0]
+          }
+        } else {
+          row[col.key] = null
+        }
+      }
+    },
+    // 接收时,处理数据
+    valueBuilder (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        row[col.key] = value.split(',')
+      }
+    }
+  },
+  'file-uploader': {
+    form: { component: { name: 'd2p-file-uploader', props: { elProps: { listType: 'text' } } } },
+    component: { name: 'd2p-files-format' },
+    // 提交时,处理数据
+    valueResolve (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        if (value.length >= 0) {
+          if (value instanceof Array) {
+            row[col.key] = value.toString()
+          } else {
+            row[col.key] = value[0]
+          }
+        } else {
+          row[col.key] = null
+        }
+      }
+    },
+    // 接收时,处理数据
+    valueBuilder (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        row[col.key] = value.split(',')
+      }
+    }
+  },
+  'avatar-cropper': {
+    form: { component: { name: 'd2p-cropper-uploader', props: { accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif', cropper: { viewMode: 1 } } } },
+    component: { name: 'd2p-images-format' },
+    align: 'center',
+    view: {
+      component: { props: { height: 100, width: 100 } }
+    },
+    // 接收时,处理数据
+    valueBuilder (row, col) {
+      const value = row[col.key]
+      if (value != null) {
+        row[col.key] = value.split(',')
+      }
+    }
+  }
+}

web/src/install.js

@@ -16,6 +16,8 @@ import { request } from '@/api/service'
 import util from '@/libs/util'
 import XEUtils from 'xe-utils'
 import { urlPrefix as deptPrefix } from '@/views/system/dept/api'
+import types from '@/config/d2p-extends/types'
+const uploadUrl = util.baseURL() + 'api/system/file/'
 
 /**
  // vxe0
@@ -105,7 +107,7 @@ Vue.use(D2pFullEditor, {
 Vue.use(D2pDemoExtend)
 Vue.use(D2pFileUploader)
 Vue.use(D2pUploader, {
-  defaultType: 'cos',
+  defaultType: 'form',
   cos: {
     domain: 'https://d2p-demo-1251260344.cos.ap-guangzhou.myqcloud.com',
     bucket: 'd2p-demo-1251260344',
@@ -159,11 +161,25 @@ Vue.use(D2pUploader, {
     domain: 'http://d2p.file.veryreader.com'
   },
   form: {
-    action: util.baseURL() + 'upload/form/upload',
+    action: uploadUrl,
-    name: 'file'
+    name: 'file',
+    data: {}, // 上传附加参数
+    headers () {
+      return {
+        Authorization: 'JWT ' + util.cookies.get('token')
+      }
+    },
+    type: 'form',
+    successHandle (ret, option) {
+      if (ret.data === null || ret.data === '') {
+        throw new Error('上传失败')
+      }
+      return { url: util.baseURL() + ret.data.url, key: option.data.key }
+    },
+    withCredentials: false // 是否带cookie
   }
 })
-
+d2CrudPlus.util.columnResolve.addTypes(types)
 // 修改官方字段类型
 const selectType = d2CrudPlus.util.columnResolve.getType('select')
 selectType.component.props.color = 'auto' // 修改官方的字段类型，设置为支持自动染色
@@ -257,7 +273,7 @@ Vue.prototype.commonEndColumns = function (param = {}) {
       type: 'table-selector',
       dict: {
         cache: true,
-        url: '/api/system/dept/?limit=999&status=1',
+        url: deptPrefix + '?limit=999&status=1',
         isTree: true,
         value: 'id', // 数据字典中value字段的属性名
         label: 'name', // 数据字典中label字段的属性名
@@ -267,7 +283,7 @@ Vue.prototype.commonEndColumns = function (param = {}) {
           component
         }) => {
           return request({
-            url: url,
+            url: url
           }).then(ret => {
             return ret.data.data
           })

web/src/layout/header-aside/components/header-user/userinfo.vue

@@ -149,7 +149,7 @@ export default {
       headers: {
         Authorization: 'JWT ' + util.cookies.get('token')
       },
-      fileList:[],
+      fileList: [],
       userInfo: {
         name: '',
         gender: '',
@@ -197,7 +197,7 @@ export default {
         params: {}
       }).then((res) => {
         _self.userInfo = res.data
-        _self.fileList = [{name:'avatar.png',url:res.data.avatar}]
+        _self.fileList = [{ name: 'avatar.png', url: res.data.avatar }]
       })
     },
     /**
@@ -278,10 +278,10 @@ export default {
      * @param res
      * @param file
      */
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
-      console.log(11,res)
+      console.log(11, res)
-      this.fileList =[{ url: util.baseURL() + res.data.url, name:file.name }]
+      this.fileList = [{ url: util.baseURL() + res.data.url, name: file.name }]
-      this.userInfo.avatar = util.baseURL() + res.data.url;
+      this.userInfo.avatar = util.baseURL() + res.data.url
     }
   }
 }

web/src/store/modules/d2admin/modules/account.js

@@ -42,7 +42,7 @@ export default {
       util.cookies.set('token', res.access)
       util.cookies.set('refresh', res.refresh)
       // 设置 vuex 用户信息
-      await dispatch('d2admin/user/set', { name: res.name, user_id: res.userId,avatar:res.avatar }, { root: true })
+      await dispatch('d2admin/user/set', { name: res.name, user_id: res.userId, avatar: res.avatar }, { root: true })
       // 用户登录后从持久化数据加载一系列的设置
       await dispatch('load')
     },

web/src/views/demo/page1/crud.js

@@ -1,6 +1,4 @@
 import { request } from '@/api/service'
-import util from '@/libs/util'
-const uploadUrl = process.env.VUE_APP_API + '/api/system/img/'
 export const crudOptions = (vm) => {
   return {
     pageOptions: {
@@ -85,20 +83,6 @@ export const crudOptions = (vm) => {
         form: {
           component: {
             props: {
-              uploader: {
-                action: uploadUrl,
-                name: 'file',
-                headers: {
-                  Authorization: 'JWT ' + util.cookies.get('token')
-                },
-                type: 'form',
-                successHandle (ret, option) {
-                  if (ret.data == null || ret.data === '') {
-                    throw new Error('上传失败')
-                  }
-                  return { url: ret.data.data.url, key: option.data.key }
-                }
-              },
               elProps: { // 与el-uploader 配置一致
                 multiple: false,
                 limit: 5 // 限制5个文件
@@ -108,26 +92,6 @@ export const crudOptions = (vm) => {
             span: 24
           },
           helper: '限制文件大小不能超过50k'
-        },
-        valueResolve (row, col) {
-          const value = row[col.key]
-          if (value != null && value instanceof Array) {
-            if (value.length >= 0) {
-              row[col.key] = value[0]
-            } else {
-              row[col.key] = null
-            }
-          }
-        },
-        component: {
-          props: {
-            buildUrl (value, item) {
-              if (value && value.indexOf('http') !== 0) {
-                return '/api/upload/form/download?key=' + value
-              }
-              return value
-            }
-          }
         }
       },
       {
@@ -139,20 +103,6 @@ export const crudOptions = (vm) => {
         form: {
           component: {
             props: {
-              uploader: {
-                action: uploadUrl,
-                name: 'file',
-                headers: {
-                  Authorization: 'JWT ' + util.cookies.get('token')
-                },
-                type: 'form',
-                successHandle (ret, option) {
-                  if (ret.data == null || ret.data === '') {
-                    throw new Error('上传失败')
-                  }
-                  return { url: ret.data.data.url, key: option.data.key }
-                }
-              },
               elProps: { // 与el-uploader 配置一致
                 multiple: false,
                 limit: 5 // 限制5个文件
@@ -162,26 +112,6 @@ export const crudOptions = (vm) => {
             span: 24
           },
           helper: '限制文件大小不能超过50k'
-        },
-        valueResolve (row, col) {
-          const value = row[col.key]
-          if (value != null && value instanceof Array) {
-            if (value.length >= 0) {
-              row[col.key] = value[0]
-            } else {
-              row[col.key] = null
-            }
-          }
-        },
-        component: {
-          props: {
-            buildUrl (value, item) {
-              if (value && value.indexOf('http') !== 0) {
-                return '/api/upload/form/download?key=' + value
-              }
-              return value
-            }
-          }
         }
       },
       {

web/src/views/system/fileList/crud.js

@@ -1,5 +1,3 @@
-import util from '@/libs/util'
-
 export const crudOptions = (vm) => {
   return {
     pageOptions: {
@@ -92,11 +90,7 @@ export const crudOptions = (vm) => {
         search: {
           disabled: true
         },
-        width: 220,
+        width: 220
-        valueBuilder (row, key) {
-          console.log(row, key)
-          row.url = `${util.baseURL()}media/${row.url}`
-        }
       },
       {
         title: '文件MD5',
@@ -107,18 +101,7 @@ export const crudOptions = (vm) => {
         },
         form: {
           disabled: false
-        },
-        valueResolve (row, col) {
-          const value = row[col.key]
-          if (value != null && value instanceof Array) {
-            if (value.length >= 0) {
-              row[col.key] = value[0]
-            } else {
-              row[col.key] = null
-            }
-          }
         }
-
       },
       {
         title: '备注',

web/src/views/system/user/crud.js

@@ -1,9 +1,7 @@
 import { request } from '@/api/service'
 import { BUTTON_STATUS_BOOL } from '@/config/button'
 import { urlPrefix as deptPrefix } from '../dept/api'
-import util from '@/libs/util'
 
-const uploadUrl = util.baseURL() + 'api/system/file/'
 export const crudOptions = (vm) => {
   return {
     pageOptions: {
@@ -42,7 +40,7 @@ export const crudOptions = (vm) => {
           text: '',
           size: 'small',
           type: 'warning',
-          icon: 'el-icon-refresh-left',
+          icon: 'el-icon-key',
           show () {
             return vm.hasPermissions('ResetPwd')
           },
@@ -258,54 +256,21 @@ export const crudOptions = (vm) => {
       {
         title: '头像',
         key: 'avatar',
-        type: 'avatar-uploader',
+        type: 'avatar-cropper',
         width: 100,
         align: 'left',
         form: {
           component: {
             props: {
-              uploader: {
-                action: uploadUrl,
-                headers: {
-                  Authorization: 'JWT ' + util.cookies.get('token')
-                },
-                type: 'form',
-                successHandle (ret, option) {
-                  if (ret.data === null || ret.data === '') {
-                    throw new Error('上传失败')
-                  }
-                  return { url: util.baseURL() + ret.data.url, key: option.data.key }
-                }
-              },
               elProps: { // 与el-uploader 配置一致
-                multiple: true,
+                multiple: false,
-                limit: 5 // 限制5个文件
+                limit: 1 // 限制5个文件
               },
-              sizeLimit: 100 * 1024 // 不能超过限制
+              sizeLimit: 500 * 1024 // 不能超过限制
             },
             span: 24
           },
-          helper: '限制文件大小不能超过50k'
+          helper: '限制文件大小不能超过500k'
-        },
-        valueResolve (row, col) {
-          const value = row[col.key]
-          if (value != null && value instanceof Array) {
-            if (value.length >= 0) {
-              row[col.key] = value[0]
-            } else {
-              row[col.key] = null
-            }
-          }
-        },
-        component: {
-          props: {
-            buildUrl (value, item) {
-              if (value && value.indexOf('http') !== 0) {
-                return util.baseURL() + value
-              }
-              return value
-            }
-          }
         }
       },
       {