From 1c9f7caeaf2df848e05cb3dec62cfcd7f38f5267 Mon Sep 17 00:00:00 2001 From: icssoa <2570063477@qq.com> Date: Sun, 28 Mar 2021 03:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20upload=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=93=8D=E5=BA=94=E5=BC=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/cool/modules/base/store/process.js | 2 +- src/cool/modules/base/views/user.vue | 23 +- src/cool/modules/chat/components/chat.vue | 5 +- src/cool/modules/upload/components/index.js | 2 +- src/cool/modules/upload/components/space.vue | 721 ------------------ .../upload/components/space/category.vue | 275 +++++++ .../upload/components/space/file-item.vue | 167 ++++ .../modules/upload/components/space/index.vue | 462 +++++++++++ 9 files changed, 916 insertions(+), 743 deletions(-) delete mode 100644 src/cool/modules/upload/components/space.vue create mode 100644 src/cool/modules/upload/components/space/category.vue create mode 100644 src/cool/modules/upload/components/space/file-item.vue create mode 100644 src/cool/modules/upload/components/space/index.vue diff --git a/package.json b/package.json index 5072911..2147e3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cool-admin-vue", - "version": "3.1.7", + "version": "3.2.0", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", diff --git a/src/cool/modules/base/store/process.js b/src/cool/modules/base/store/process.js index c9c973e..23ff06a 100644 --- a/src/cool/modules/base/store/process.js +++ b/src/cool/modules/base/store/process.js @@ -9,7 +9,7 @@ export default { list: [fMenu] }, getters: { - // 窗口列表 + // 页面进程列表 processList: state => state.list }, mutations: { diff --git a/src/cool/modules/base/views/user.vue b/src/cool/modules/base/views/user.vue index d072105..62b99d2 100644 --- a/src/cool/modules/base/views/user.vue +++ b/src/cool/modules/base/views/user.vue @@ -22,7 +22,7 @@
- + @@ -123,36 +123,30 @@ export default { columns: [ { type: "selection", - align: "center", - width: "60" + width: 60 }, { prop: "headImg", - label: "头像", - align: "center" + label: "头像" }, { prop: "name", label: "姓名", - align: "center", "min-width": 150 }, { prop: "username", label: "用户名", - align: "center", "min-width": 150 }, { prop: "nickName", label: "昵称", - align: "center", "min-width": 150 }, { prop: "departmentName", label: "部门名称", - align: "center", "min-width": 150 }, { @@ -164,19 +158,16 @@ export default { { prop: "phone", label: "手机号码", - align: "center", "min-width": 150 }, { prop: "remark", label: "备注", - align: "center", "min-width": 150 }, { prop: "status", label: "状态", - align: "center", "min-width": 120, dict: [ { @@ -194,15 +185,13 @@ export default { { prop: "createTime", label: "创建时间", - align: "center", sortable: "custom", "min-width": 150 }, { - align: "center", type: "op", buttons: ["slot-move-btn", "edit", "delete"], - width: "160px" + width: 160 } ] }, @@ -271,7 +260,7 @@ export default { prop: "password", label: "密码", span: 12, - hidden: ":isEdit", + hidden: ":isAdd", component: { name: "el-input", attrs: { @@ -362,7 +351,7 @@ export default { }, { prop: "tips", - hidden: ":isAdd", + hidden: ":isEdit", component: (
diff --git a/src/cool/modules/chat/components/chat.vue b/src/cool/modules/chat/components/chat.vue index a14d18d..3e2f542 100644 --- a/src/cool/modules/chat/components/chat.vue +++ b/src/cool/modules/chat/components/chat.vue @@ -12,7 +12,7 @@ 'append-to-body': true, 'close-on-click-modal': false }" - :controls="['slot-session', 'cl-flex1', 'fullscreen', 'close']" + :controls="['slot-expand', 'cl-flex1', 'fullscreen', 'close']" >
@@ -29,7 +29,8 @@
-