diff --git a/package.json b/package.json index 6cf98ab..1fb35ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "dev": "vite", "build": "vue-tsc --noEmit --skipLibCheck && vite build", @@ -17,6 +17,7 @@ "core-js": "^3.6.5", "echarts": "^5.0.2", "element-plus": "1.0.2-beta.35", + "glob": "^7.1.6", "js-beautify": "^1.13.5", "lodash": "^4.17.21", "merge": "^2.1.1", @@ -27,7 +28,7 @@ "socket.io-client": "^4.0.0", "store": "^2.0.12", "uuid": "^8.3.2", - "vue": "^3.0.9", + "vue": "^3.0.11", "vue-echarts": "^6.0.0-rc.3", "vue-router": "^4.0.5", "vuedraggable": "^4.0.1", @@ -39,7 +40,7 @@ "@typescript-eslint/eslint-plugin": "^4.20.0", "@typescript-eslint/parser": "^4.20.0", "@vitejs/plugin-vue": "^1.1.5", - "@vitejs/plugin-vue-jsx": "^1.1.2", + "@vitejs/plugin-vue-jsx": "^1.1.3", "@vue/compiler-sfc": "^3.0.5", "eslint": "^7.23.0", "eslint-config-prettier": "^8.1.0", @@ -50,7 +51,8 @@ "sass-loader": "^11.0.1", "svg-sprite-loader": "^6.0.2", "typescript": "^4.1.3", - "vite": "^2.1.3", + "vite": "^2.1.5", + "vite-plugin-style-import": "^0.9.1", "vite-svg-loader": "^1.5.1", "vue-tsc": "^0.0.8" } diff --git a/src/cool/index.ts b/src/cool/index.ts index fa1936d..6025894 100644 --- a/src/cool/index.ts +++ b/src/cool/index.ts @@ -1,5 +1,3 @@ -import Crud from "../crud"; - export default { modules: [ // 基础模块 @@ -14,7 +12,6 @@ export default { }, { name: "crud", - value: Crud, options: { crud: { dict: { diff --git a/src/cool/modules/base/components/dept/check.vue b/src/cool/modules/base/components/dept/check.vue index 77e0504..68b869e 100644 --- a/src/cool/modules/base/components/dept/check.vue +++ b/src/cool/modules/base/components/dept/check.vue @@ -52,7 +52,7 @@ export default defineComponent({ setup(props, { emit }) { // 请求服务 - const $service = inject("service"); + const service = inject("service"); // 表单值 const form = inject("form"); @@ -81,7 +81,7 @@ export default defineComponent({ // 刷新树形列表 function refresh() { - $service.system.dept + service.system.dept .list() .then((res: any[]) => { list.value = deepTree(res); diff --git a/src/cool/modules/base/components/dept/move.tsx b/src/cool/modules/base/components/dept/move.tsx index 47e320d..12eb54e 100644 --- a/src/cool/modules/base/components/dept/move.tsx +++ b/src/cool/modules/base/components/dept/move.tsx @@ -9,7 +9,7 @@ export default defineComponent({ emits: ["success", "error"], setup(_: any, { emit }) { - const $service = inject("service"); + const service = inject("service"); const { refs, setRefs }: any = useRefs(); // 树形列表 @@ -17,7 +17,7 @@ export default defineComponent({ // 刷新列表 async function refresh() { - return await $service.system.dept.list().then(deepTree); + return await service.system.dept.list().then(deepTree); } // 转移 @@ -52,7 +52,7 @@ export default defineComponent({ type: "warning" }) .then(() => { - $service.system.user + service.system.user .move({ departmentId: id, userIds: ids diff --git a/src/cool/modules/base/components/dept/tree.vue b/src/cool/modules/base/components/dept/tree.vue index d43307d..9caad45 100644 --- a/src/cool/modules/base/components/dept/tree.vue +++ b/src/cool/modules/base/components/dept/tree.vue @@ -63,7 +63,7 @@