diff --git a/package.json b/package.json index c22a0f9..7df3831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cool-admin-vue", - "version": "3.1.0", + "version": "3.1.1", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", @@ -10,8 +10,8 @@ }, "dependencies": { "axios": "^0.21.1", - "cl-admin": "^1.4.0", - "cl-admin-crud": "^1.6.2", + "cl-admin": "^1.5.0", + "cl-admin-crud": "^1.6.4", "cl-admin-theme": "^0.0.4", "clipboard": "^2.0.7", "codemirror": "^5.59.4", @@ -24,7 +24,7 @@ "nprogress": "^0.2.0", "qs": "^6.9.1", "quill": "^1.3.7", - "socket.io-client": "^3.1.2", + "socket.io-client": "2.3.1", "store": "^2.0.12", "uuid": "^8.3.2", "vue": "^2.6.11", diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 1619837..58b6f4b 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -1,6 +1,7 @@ * { padding: 0; margin: 0; + outline: none; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif; } diff --git a/src/cool/index.js b/src/cool/index.js index 6a6ae83..5f05b88 100644 --- a/src/cool/index.js +++ b/src/cool/index.js @@ -3,7 +3,9 @@ import Theme from "cl-admin-theme"; export default { modules: [ + // 基础模块 "base", + // 文件上传 { name: "upload", options: { @@ -25,11 +27,17 @@ export default { } } }, + // 客服聊天 "chat", + // 任务管理 "task", + // 复制指令 "copy", + // 省市区选择 "distpicker", + // 示例页 "demo", + // 主题切换 { name: "theme", value: Theme diff --git a/src/cool/modules/base/common/index.js b/src/cool/modules/base/common/index.js index ea08a41..02a0f3c 100644 --- a/src/cool/modules/base/common/index.js +++ b/src/cool/modules/base/common/index.js @@ -41,17 +41,11 @@ export const resize = () => { } }); } + store.commit("SET_BROWSER"); }; window.onload = () => { - const observer = new MutationObserver(resize); - - observer.observe(document.getElementById("app"), { - childList: true, - subtree: true - }); - window.addEventListener("resize", resize); resize(); }; diff --git a/src/cool/modules/base/components/dept/tree.vue b/src/cool/modules/base/components/dept/tree.vue index 6202c02..111c760 100644 --- a/src/cool/modules/base/components/dept/tree.vue +++ b/src/cool/modules/base/components/dept/tree.vue @@ -10,7 +10,7 @@ -