coderou
diff --git a/‎package.json
Lines changed: 1 addition & 1 deletion b/‎package.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cool/modules/base/store/process.js
Lines changed: 1 addition & 1 deletion b/‎src/cool/modules/base/store/process.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/cool/modules/base/views/user.vue
Lines changed: 6 additions & 17 deletions b/‎src/cool/modules/base/views/user.vue
Lines changed: 6 additions & 17 deletions
diff --git a/‎src/cool/modules/chat/components/chat.vue
Lines changed: 3 additions & 2 deletions b/‎src/cool/modules/chat/components/chat.vue
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/cool/modules/upload/components/index.js
Lines changed: 1 addition & 1 deletion b/‎src/cool/modules/upload/components/index.js
Lines changed: 1 addition & 1 deletion
@@ -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",
 
@@ -9,7 +9,7 @@ export default {
 		list: [fMenu]
 	},
 	getters: {
-		// 窗口列表
+		// 页面进程列表
 		processList: state => state.list
 	},
 	mutations: {
 
@@ -22,7 +22,7 @@
 				</div>
 
 				<div class="container">
-					<cl-crud ref="crud" @load="onLoad" :on-refresh="onRefresh">
+					<cl-crud ref="crud" :on-refresh="onRefresh" @load="onLoad">
 						<el-row type="flex">
 							<cl-refresh-btn></cl-refresh-btn>
 							<cl-add-btn></cl-add-btn>
@@ -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: (
 							<div>
 								<i class="el-icon-warning"></i>
 
@@ -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']"
 		>
 			<div class="cl-chat">
 				<!-- 会话列表 -->
@@ -29,7 +29,8 @@
 				</div>
 			</div>
 
-			<template #slot-session>
+			<!-- 展开按钮 -->
+			<template #slot-expand>
 				<button v-if="session">
 					<i
 						class="el-icon-notebook-2"
 
@@ -1,5 +1,5 @@
 import Upload from "./index.vue";
-import UploadSpace from "./space.vue";
+import UploadSpace from "./space/index.vue";
 
 export default {
 	Upload,
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cool-admin-vue",`
`3`		`- "version": "3.1.7",`
	`3`	`+ "version": "3.2.0",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"serve": "vue-cli-service serve",`
`6`	`6`	`"build": "vue-cli-service build",`