diff --git a/cool/modules/base/components/dept/tree.vue b/cool/modules/base/components/dept/tree.vue index 574f597..f39acda 100644 --- a/cool/modules/base/components/dept/tree.vue +++ b/cool/modules/base/components/dept/tree.vue @@ -96,7 +96,7 @@ export default { label: "新增", "suffix-icon": "el-icon-plus", hidden: n && n.level >= this.level, - callback: (item, done) => { + callback: (_, done) => { this.rowEdit({ name: "", parentName: d.name, @@ -108,7 +108,7 @@ export default { { label: "编辑", "suffix-icon": "el-icon-edit", - callback: (item, done) => { + callback: (_, done) => { this.rowEdit(d); done(); } @@ -123,7 +123,7 @@ export default { list.push({ label: "删除", "suffix-icon": "el-icon-delete", - callback: (item, done) => { + callback: (_, done) => { this.rowDel(d); done(); } @@ -133,7 +133,7 @@ export default { list.push({ label: "新增成员", "suffix-icon": "el-icon-user", - callback: (item, done) => { + callback: (_, done) => { this.$emit("user-add", d); done(); } diff --git a/cool/modules/base/views/menu.vue b/cool/modules/base/views/menu.vue index d643ac4..868f91c 100644 --- a/cool/modules/base/views/menu.vue +++ b/cool/modules/base/views/menu.vue @@ -86,7 +86,7 @@ export default { return { label: "新增", hidden: row.type == 2, - callback: (item, done) => { + callback: (_, done) => { this.upsertAppend(row); done(); } @@ -98,7 +98,7 @@ export default { return { label: "权限", hidden: row.type != 1, - callback: (item, done) => { + callback: (_, done) => { this.setPermission(row); done(); } diff --git a/cool/modules/base/views/plugin.vue b/cool/modules/base/views/plugin.vue index 61025f1..ab9c4e0 100644 --- a/cool/modules/base/views/plugin.vue +++ b/cool/modules/base/views/plugin.vue @@ -65,7 +65,7 @@ export default { return { label: "配置", hidden: !perms.edit, - callback: (item, done) => { + callback: (_, done) => { this.openConf(scope); done(); } diff --git a/cool/modules/chat/components/box.vue b/cool/modules/chat/components/box.vue index 62f7eb4..472c255 100644 --- a/cool/modules/chat/components/box.vue +++ b/cool/modules/chat/components/box.vue @@ -314,7 +314,7 @@ export default { { label: "删除", icon: "el-icon-delete", - callback: (item, done) => { + callback: (_, done) => { this.$service.im.session.delete({ ids: id }); diff --git a/cool/modules/demo/views/components/b-cl-context-menu.vue b/cool/modules/demo/views/components/b-cl-context-menu.vue index d5e031c..a4bae2a 100644 --- a/cool/modules/demo/views/components/b-cl-context-menu.vue +++ b/cool/modules/demo/views/components/b-cl-context-menu.vue @@ -22,14 +22,15 @@ export default { { label: "新增", "suffix-icon": "el-icon-plus", - callback: () => { + callback: (_, done) => { this.$message.info("点击了新增"); + done(); } }, { label: "编辑", "suffix-icon": "el-icon-edit", - callback: (item, done) => { + callback: (_, done) => { this.$message.info("点击了编辑"); done(); } @@ -52,7 +53,7 @@ export default { }, { label: "更多", - callback: (item, done) => { + callback: (_, done) => { this.$message.warning("开发中"); done(); } diff --git a/cool/modules/upload/components/space.vue b/cool/modules/upload/components/space.vue index a87eacb..b56e954 100644 --- a/cool/modules/upload/components/space.vue +++ b/cool/modules/upload/components/space.vue @@ -467,7 +467,7 @@ export default { { label: "编辑", "suffix-icon": "el-icon-edit", - callback: (item, done) => { + callback: (_, done) => { done(); this.editCategory({ id, name }); } @@ -475,7 +475,7 @@ export default { { label: "删除", "suffix-icon": "el-icon-delete", - callback: (item, done) => { + callback: (_, done) => { done(); this.$confirm(`此操作将删除【${name}】下的文件, 是否继续?`, "提示", { @@ -515,7 +515,7 @@ export default { { label: data.selected ? "取消选中" : "选中", "suffix-icon": data.selected ? "el-icon-close" : "el-icon-check", - callback: (item, done) => { + callback: (_, done) => { this.selectFile(data); done(); } @@ -523,7 +523,7 @@ export default { { label: "删除", "suffix-icon": "el-icon-delete", - callback: (item, done) => { + callback: (_, done) => { this.deleteFile(data); done(); } diff --git a/package.json b/package.json index 675da9f..e5a9e00 100644 --- a/package.json +++ b/package.json @@ -13,16 +13,24 @@ "cl-admin": "^1.2.0", "cl-admin-crud": "^1.3.4", "cl-admin-export": "^1.0.5", + "clipboard": "^2.0.7", + "codemirror": "^5.59.4", "core-js": "^3.9.0", - "dayjs": "^1.10.3", + "dayjs": "^1.10.4", "echarts": "^4.5.0", "element-ui": "^2.15.1", + "js-beautify": "^1.13.5", "nprogress": "^0.2.0", "qs": "^6.9.1", + "quill": "^1.3.7", + "socket.io-client": "^3.1.2", "store": "^2.0.12", + "uuid": "^8.3.2", "vue": "^2.6.10", + "vue-codemirror": "^4.0.6", "vue-echarts": "^5.0.0-beta.0", "vue-router": "^3.5.1", + "vuedraggable": "^2.24.3", "vuex": "^3.6.2" }, "devDependencies": { diff --git a/vue.config.js b/vue.config.js index fe4264e..c70d5dc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,6 +40,22 @@ module.exports = { } }, + "/ap": { + target: "https://admin.cn.utools.club", + changeOrigin: true, + pathRewrite: { + "^/ap": "" + } + }, + + "/fz": { + target: "http://xfz520231.utools.club", + changeOrigin: true, + pathRewrite: { + "^/fz": "" + } + }, + "/oss-upload": { target: "https://cool-admin-pro.oss-cn-shanghai.aliyuncs.com", changeOrigin: true,