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 @@
-