diff --git a/package.json b/package.json index 41b3bba..69d9acf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "0.4.0", + "version": "0.4.1", "scripts": { "dev": "vite", "build": "vue-tsc --noEmit --skipLibCheck && vite build", @@ -11,7 +11,7 @@ "dependencies": { "array.prototype.flat": "^1.2.4", "axios": "^0.21.1", - "cl-admin-crud-vue3": "^0.1.7", + "cl-admin-crud-vue3": "^0.2.1", "clipboard": "^2.0.8", "clone-deep": "^4.0.1", "codemirror": "^5.60.0", diff --git a/src/cool/modules/base/components/dept/tree.vue b/src/cool/modules/base/components/dept/tree.vue index 634482a..062985d 100644 --- a/src/cool/modules/base/components/dept/tree.vue +++ b/src/cool/modules/base/components/dept/tree.vue @@ -298,7 +298,9 @@ export default defineComponent({ { label: "新增", "suffix-icon": "el-icon-plus", - hidden: n && n.level >= props.level, + hidden: + (n && n.level >= props.level) || + !service.base.system.dept._permission.add, callback: (_: any, done: Function) => { rowEdit({ name: "", @@ -311,6 +313,7 @@ export default defineComponent({ { label: "编辑", "suffix-icon": "el-icon-edit", + hidden: !service.base.system.dept._permission.update, callback: (_: any, done: Function) => { rowEdit(d); done(); @@ -319,7 +322,7 @@ export default defineComponent({ { label: "删除", "suffix-icon": "el-icon-delete", - hidden: !d.parentId, + hidden: !d.parentId || !service.base.system.dept._permission.delete, callback: (_: any, done: Function) => { rowDel(d); done(); @@ -328,6 +331,7 @@ export default defineComponent({ { label: "新增成员", "suffix-icon": "el-icon-user", + hidden: !service.base.system.user._permission.add, callback: (_: any, done: Function) => { emit("user-add", d); done(); diff --git a/src/cool/modules/base/directives/permission.ts b/src/cool/modules/base/directives/permission.ts index d447c68..12cafc0 100644 --- a/src/cool/modules/base/directives/permission.ts +++ b/src/cool/modules/base/directives/permission.ts @@ -33,9 +33,8 @@ function change(el: any, binding: any) { } export default { - mounted(el: any, binding: any) { + beforeMount(el: any, binding: any) { el.setAttribute("_display", el.style.display || ""); - change(el, binding); }, updated: change diff --git a/src/cool/modules/base/store/app.ts b/src/cool/modules/base/store/app.ts index 73c6ccc..7bbdba1 100644 --- a/src/cool/modules/base/store/app.ts +++ b/src/cool/modules/base/store/app.ts @@ -1,6 +1,7 @@ import store from "store"; import { deepMerge, getBrowser } from "/@/core/utils"; import { app } from "/@/config/env"; +import { ElLoading } from "element-plus"; const browser = getBrowser(); @@ -9,10 +10,13 @@ const state = { ...app }, browser, - collapse: browser.isMini ? true : false + collapse: browser.isMini ? true : false, + loading: false }; const getters = { + // 程序加载 + appLoading: (state: any) => state.loading, // 应用配置 app: (state: any) => state.info, // 浏览器信息 @@ -22,17 +26,34 @@ const getters = { }; const actions = { - appLoad({ getters, dispatch }: any) { + async appLoad({ getters, dispatch, commit }: any) { if (getters.token) { + const loader = ElLoading.service({ + text: "加载配置中" + }); + + commit("SHOW_LOADING"); + // 读取菜单权限 - dispatch("permMenu"); + await dispatch("permMenu"); // 获取用户信息 dispatch("userInfo"); + + commit("HIDE_LOADING"); + loader.close(); } } }; const mutations = { + SHOW_LOADING(state: any) { + state.loading = true; + }, + + HIDE_LOADING(state: any) { + state.loading = false; + }, + // 设置浏览器信息 SET_BROWSER(state: any) { state.browser = getBrowser(); diff --git a/src/cool/modules/base/store/menu.ts b/src/cool/modules/base/store/menu.ts index b93ba42..6d83c78 100644 --- a/src/cool/modules/base/store/menu.ts +++ b/src/cool/modules/base/store/menu.ts @@ -6,6 +6,7 @@ import { deepTree, revDeepTree, isArray, isEmpty } from "/@/core/utils"; import { menuList } from "/@/config/env"; import { revisePath } from "../utils"; import { MenuItem } from "../types"; +import { usePermission } from "/@/core"; const state = { // 视图路由，type=1 @@ -141,6 +142,7 @@ const mutations = { SET_PERMIESSION(state: any, list: Array) { state.permission = list; storage.set("permission", list); + usePermission(list); } }; diff --git a/src/cool/modules/base/views/user.vue b/src/cool/modules/base/views/user.vue index 421118e..733285c 100644 --- a/src/cool/modules/base/views/user.vue +++ b/src/cool/modules/base/views/user.vue @@ -90,14 +90,7 @@ :ref="setRefs('upsert')" :items="upsert.items" :on-submit="onUpsertSubmit" - > - - + /> @@ -236,7 +229,7 @@ export default defineComponent({ { prop: "name", label: "姓名", - span: 24, + span: 12, component: { name: "el-input", props: { @@ -284,7 +277,6 @@ export default defineComponent({ prop: "password", label: "密码", span: 12, - hidden: ":isAdd", component: { name: "el-input", props: { @@ -370,13 +362,6 @@ export default defineComponent({ } ] } - }, - { - prop: "tips", - hidden: ":isEdit", - component: { - name: "slot-tips" - } } ] }); diff --git a/src/cool/modules/chat/components/index.ts b/src/cool/modules/chat/components/index.ts deleted file mode 100644 index c577fc3..0000000 --- a/src/cool/modules/chat/components/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import Notice from "./notice.vue"; -import Chat from "./chat.vue"; - -export default { Notice, Chat }; diff --git a/src/core/index.ts b/src/core/index.ts index dd54a91..f68bd13 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -18,4 +18,24 @@ async function bootstrap(app: any) { router.$plugin?.addViews(store.getters.routes || []); } -export { Service, Permission, BaseService, services, bootstrap, useRefs }; +function usePermission(list: any[]) { + function deep(d: any) { + if (d.permission) { + d._permission = {}; + for (const i in d.permission) { + d._permission[i] = + list.findIndex((e: string) => + e.replace(/:/g, "/").includes(`${d.namespace}/${i}`) + ) >= 0; + } + } else { + for (const i in d) { + deep(d[i]); + } + } + } + + deep(services); +} + +export { Service, Permission, BaseService, services, bootstrap, useRefs, usePermission }; diff --git a/src/pages/layout/index.vue b/src/pages/layout/index.vue index bf66802..6b3283d 100644 --- a/src/pages/layout/index.vue +++ b/src/pages/layout/index.vue @@ -16,7 +16,7 @@
-
+
@@ -49,6 +49,9 @@ export default defineComponent({ // 应用信息 const app = computed(() => store.getters.app); + // 应用加载 + const appLoading = computed(() => store.getters.appLoading); + // 缓存列表 const caches = computed(() => { return store.getters.processList @@ -66,6 +69,7 @@ export default defineComponent({ return { menuCollapse, app, + appLoading, collapseMenu, caches }; diff --git a/yarn-error.log b/yarn-error.log index 9525ec4..2eb6ac6 100644 --- a/yarn-error.log +++ b/yarn-error.log @@ -1,35 +1,26 @@ Arguments: - D:\node\node.exe C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js add 1.0.2-beta.35 + /usr/local/bin/node /usr/local/bin/yarn add cl-admin-crud-vue3 PATH: - C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\intel64\compiler;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0\;C:\windows\System32\OpenSSH\;D:\Tortoise\bin;C:\Program Files\Git\cmd;C:\Program Files\python;C:\Program Files\python\Scripts;;D:\BtSoft\panel\script;D:\node\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;;D:\cool\Microsoft VS Code\bin;C:\Users\Administrator\AppData\Roaming\npm + /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin Yarn version: - 1.22.5 + 1.22.10 Node version: 14.16.0 Platform: - win32 x64 + darwin x64 Trace: - Error: https://registry.yarnpkg.com/1.0.2-beta.35: Not found - at Request.params.callback [as _callback] (C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:66988:18) - at Request.self.callback (C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:140662:22) - at Request.emit (events.js:315:20) - at Request. (C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:141634:10) - at Request.emit (events.js:315:20) - at IncomingMessage. (C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:141556:12) - at Object.onceWrapper (events.js:421:28) - at IncomingMessage.emit (events.js:327:22) - at endReadableNT (internal/streams/readable.js:1327:12) - at processTicksAndRejections (internal/process/task_queues.js:80:21) + Error: read ECONNRESET + at TLSWrap.onStreamRead (internal/stream_base_commons.js:209:20) npm manifest: { "name": "front-next", - "version": "0.2.3", + "version": "0.4.0", "scripts": { "dev": "vite", "build": "vue-tsc --noEmit --skipLibCheck && vite build", @@ -40,15 +31,16 @@ npm manifest: "dependencies": { "array.prototype.flat": "^1.2.4", "axios": "^0.21.1", + "cl-admin-crud-vue3": "^0.2.1", "clipboard": "^2.0.8", "clone-deep": "^4.0.1", "codemirror": "^5.60.0", "core-js": "^3.6.5", "echarts": "^5.0.2", - "element-plus": "^1.0.2-beta.36", + "element-plus": "^1.0.2-beta.48", + "file-saver": "^2.0.5", "glob": "^7.1.6", "js-beautify": "^1.13.5", - "lodash": "^4.17.21", "merge": "^2.1.1", "mitt": "^2.1.0", "mockjs": "^1.1.0", @@ -61,7 +53,8 @@ npm manifest: "vue-echarts": "^6.0.0-rc.3", "vue-router": "^4.0.5", "vuedraggable": "^4.0.1", - "vuex": "^4.0.0-0" + "vuex": "^4.0.0-0", + "xlsx": "^0.16.9" }, "devDependencies": { "@types/lodash": "^4.14.168", @@ -77,11 +70,11 @@ npm manifest: "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.8.0", "prettier": "^2.2.1", - "sass": "^1.32.8", - "sass-loader": "^11.0.1", + "sass": "^1.34.0", + "sass-loader": "^11.1.1", "svg-sprite-loader": "^6.0.2", "typescript": "^4.1.3", - "vite": "^2.1.5", + "vite": "^2.3.5", "vite-plugin-style-import": "^0.9.1", "vite-svg-loader": "^1.5.1", "vue-tsc": "^0.0.8" @@ -401,7 +394,7 @@ Lockfile: resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== - "@types/lodash@^4.14.168": + "@types/lodash@^4.14.161", "@types/lodash@^4.14.168": version "4.14.168" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== @@ -641,6 +634,14 @@ Lockfile: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + adler-32@~1.2.0: + version "1.2.0" + resolved "https://registry.nlark.com/adler-32/download/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25" + integrity sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU= + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -939,6 +940,15 @@ Lockfile: tslib "^2.0.3" upper-case-first "^2.0.2" + cfb@^1.1.4: + version "1.2.0" + resolved "https://registry.npm.taobao.org/cfb/download/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8" + integrity sha1-ak0IcrUl7WA0nh71H7Swv3Psqag= + dependencies: + adler-32 "~1.2.0" + crc-32 "~1.2.0" + printj "~1.1.2" + chainsaw@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" @@ -992,10 +1002,10 @@ Lockfile: snake-case "^3.0.4" tslib "^2.0.3" - "chokidar@>=2.0.0 <4.0.0": + "chokidar@>=3.0.0 <4.0.0": version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-3.5.1.tgz?cache=0&sync_timestamp=1610719440699&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha1-7pznu+vSt59J8wR5nVRo4x4U5oo= dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -1007,6 +1017,18 @@ Lockfile: optionalDependencies: fsevents "~2.3.1" + cl-admin-crud-vue3@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cl-admin-crud-vue3/-/cl-admin-crud-vue3-0.2.1.tgz#5d9e37efb4caf8d084ae759d6b097bc54b708999" + integrity sha512-UPEEMCiPo5xFcLYDBqrKwR/jk7QK9MN7uOz3HAbrxl728L3g4T/Ogh01kfSrbASXv3YwZ+PkqcixAvtnh7WAPA== + dependencies: + array.prototype.flat "^1.2.4" + core-js "^3.6.5" + element-plus "^1.0.2-beta.40" + merge "^2.1.1" + mitt "^2.1.0" + vue "^3.0.0" + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -1045,6 +1067,14 @@ Lockfile: resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.60.0.tgz#00a8cfd287d5d8737ceb73987f04aee2fe5860da" integrity sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA== + codepage@~1.14.0: + version "1.14.0" + resolved "https://registry.npm.taobao.org/codepage/download/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99" + integrity sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k= + dependencies: + commander "~2.14.1" + exit-on-epipe "~1.0.1" + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -1092,6 +1122,16 @@ Lockfile: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commander@~2.14.1: + version "2.14.1" + resolved "https://registry.nlark.com/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1618847060379&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" + integrity sha1-IjUSPjevjKPGXfRbAm29NXsBuao= + + commander@~2.17.1: + version "2.17.1" + resolved "https://registry.nlark.com/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1618847060379&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + integrity sha1-vXerfebelCBc6sxy8XFtKfIKd78= + component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -1148,6 +1188,14 @@ Lockfile: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + crc-32@~1.2.0: + version "1.2.0" + resolved "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha1-yy224puIUI4y2d0OwWk+e0Ghggg= + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -1344,12 +1392,27 @@ Lockfile: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.701.tgz#5e796ed7ce88cd77bc7bf831cf311ef6b067c389" integrity sha512-Zd9ofdIMYHYhG1gvnejQDvC/kqSeXQvtXF0yRURGxgwGqDZm9F9Fm3dYFnm5gyuA7xpXfBlzVLN1sz0FjxpKfw== - element-plus@^1.0.2-beta.36: - version "1.0.2-beta.36" - resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-1.0.2-beta.36.tgz#78a7e1be10b9622c4fc342fdce0801650f30bb01" - integrity sha512-5Qc54rH0GGtFRXpfA4ilpcOzdAw6t2m4mBXMXYjs9c5RSYP+EV+gJyfhyolXqZoOtYZ35ovBcqljlIJJD6Nz7g== + element-plus@^1.0.2-beta.40: + version "1.0.2-beta.40" + resolved "https://registry.npm.taobao.org/element-plus/download/element-plus-1.0.2-beta.40.tgz#30fc9b161496ae587fab86235c80b728ea43d909" + integrity sha1-MPybFhSWrlh/q4YjXIC3KOpD2Qk= dependencies: "@popperjs/core" "^2.4.4" + "@types/lodash" "^4.14.161" + async-validator "^3.4.0" + dayjs "1.x" + lodash "^4.17.20" + mitt "^2.1.0" + normalize-wheel "^1.0.1" + resize-observer-polyfill "^1.5.1" + + element-plus@^1.0.2-beta.48: + version "1.0.2-beta.48" + resolved "https://registry.nlark.com/element-plus/download/element-plus-1.0.2-beta.48.tgz#8da99decd397b9975cd894d389096d2ed58c699e" + integrity sha1-jamd7NOXuZdc2JTTiQltLtWMaZ4= + dependencies: + "@popperjs/core" "^2.4.4" + "@types/lodash" "^4.14.161" async-validator "^3.4.0" dayjs "1.x" lodash "^4.17.20" @@ -1442,10 +1505,10 @@ Lockfile: is-date-object "^1.0.1" is-symbol "^1.0.2" - esbuild@^0.9.3: - version "0.9.7" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b" - integrity sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg== + esbuild@^0.12.5: + version "0.12.5" + resolved "https://registry.nlark.com/esbuild/download/esbuild-0.12.5.tgz#36076a6bc1966ba2741981d30512e95e8aaff495" + integrity sha1-Ngdqa8GWa6J0GYHTBRLpXoqv9JU= escalade@^3.1.1: version "3.1.1" @@ -1609,6 +1672,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba" integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo= + exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI= + expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -1700,6 +1768,11 @@ Lockfile: dependencies: reusify "^1.0.4" + fflate@^0.3.8: + version "0.3.11" + resolved "https://registry.nlark.com/fflate/download/fflate-0.3.11.tgz#2c440d7180fdeb819e64898d8858af327b042a5d" + integrity sha1-LEQNcYD964GeZImNiFivMnsEKl0= + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -1707,6 +1780,11 @@ Lockfile: dependencies: flat-cache "^3.0.4" + file-saver@^2.0.5: + version "2.0.5" + resolved "https://registry.npm.taobao.org/file-saver/download/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" + integrity sha1-1hz+LOBZ9BTYmendbUEH7iVnDDg= + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -1747,6 +1825,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + frac@~1.1.2: + version "1.1.2" + resolved "https://registry.nlark.com/frac/download/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b" + integrity sha1-PXT39keMiKG1AgMG10fcYxPHTQs= + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -2549,6 +2632,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== + nanoid@^3.1.23: + version "3.1.23" + resolved "https://registry.nlark.com/nanoid/download/nanoid-3.1.23.tgz?cache=0&sync_timestamp=1620673983269&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnanoid%2Fdownload%2Fnanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha1-90QIbOfCvEfuCoRyV01ceOQYOoE= + nanomatch@^1.2.1: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -2850,7 +2938,7 @@ Lockfile: source-map "^0.6.1" supports-color "^6.1.0" - postcss@^8.1.10, postcss@^8.2.1: + postcss@^8.1.10: version "8.2.8" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.8.tgz#0b90f9382efda424c4f0f69a2ead6f6830d08ece" integrity sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw== @@ -2859,6 +2947,15 @@ Lockfile: nanoid "^3.1.20" source-map "^0.6.1" + postcss@^8.2.10: + version "8.3.0" + resolved "https://registry.nlark.com/postcss/download/postcss-8.3.0.tgz#b1a713f6172ca427e3f05ef1303de8b65683325f" + integrity sha1-sacT9hcspCfj8F7xMD3otlaDMl8= + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" + posthtml-parser@^0.2.0, posthtml-parser@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd" @@ -2914,6 +3011,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + printj@~1.1.0, printj@~1.1.2: + version "1.1.2" + resolved "https://registry.nlark.com/printj/download/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI= + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -3121,20 +3223,20 @@ Lockfile: dependencies: ret "~0.1.10" - sass-loader@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.1.tgz#8672f896593466573b904f47693e0695368e38c9" - integrity sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw== + sass-loader@^11.1.1: + version "11.1.1" + resolved "https://registry.nlark.com/sass-loader/download/sass-loader-11.1.1.tgz?cache=0&sync_timestamp=1620926321113&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsass-loader%2Fdownload%2Fsass-loader-11.1.1.tgz#0db441bbbe197b2af96125bebb7f4be6476b13a7" + integrity sha1-DbRBu74Zeyr5YSW+u39L5kdrE6c= dependencies: klona "^2.0.4" neo-async "^2.6.2" - sass@^1.32.8: - version "1.32.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" - integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== + sass@^1.34.0: + version "1.34.0" + resolved "https://registry.nlark.com/sass/download/sass-1.34.0.tgz#e46d5932d8b0ecc4feb846d861f26a578f7f7172" + integrity sha1-5G1ZMtiw7MT+uEbYYfJqV49/cXI= dependencies: - chokidar ">=2.0.0 <4.0.0" + chokidar ">=3.0.0 <4.0.0" select@^1.1.2: version "1.1.2" @@ -3285,6 +3387,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290" integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A== + source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.npm.taobao.org/source-map-js/download/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha1-C7XeYxtBz72mz7qL0FqA79/SOF4= + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -3328,6 +3435,13 @@ Lockfile: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + ssf@~0.11.2: + version "0.11.2" + resolved "https://registry.npm.taobao.org/ssf/download/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c" + integrity sha1-C5lpiyN1SNCI/EPN8rcMGnUSwGw= + dependencies: + frac "~1.1.2" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -3730,13 +3844,13 @@ Lockfile: dependencies: "@vue/compiler-sfc" "^3.0.5" - vite@^2.1.5: - version "2.1.5" - resolved "https://registry.npmjs.org/vite/-/vite-2.1.5.tgz#4857da441c62f7982c83cbd5f42a00330f20c9c1" - integrity sha512-tYU5iaYeUgQYvK/CNNz3tiJ8vYqPWfCE9IQ7K0iuzYovWw7lzty7KRYGWwV3CQPh0NKxWjOczAqiJsCL0Xb+Og== + vite@^2.3.5: + version "2.3.5" + resolved "https://registry.nlark.com/vite/download/vite-2.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvite%2Fdownload%2Fvite-2.3.5.tgz#0f5e750317e6f00e5343dd8272f64c2261f026b3" + integrity sha1-D151Axfm8A5TQ92CcvZMImHwJrM= dependencies: - esbuild "^0.9.3" - postcss "^8.2.1" + esbuild "^0.12.5" + postcss "^8.2.10" resolve "^1.19.0" rollup "^2.38.5" optionalDependencies: @@ -3779,7 +3893,7 @@ Lockfile: dependencies: unzipper latest - vue@^3.0.11: + vue@^3.0.0, vue@^3.0.11: version "3.0.11" resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f" integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw== @@ -3818,11 +3932,21 @@ Lockfile: dependencies: isexe "^2.0.0" + wmf@~1.0.1: + version "1.0.2" + resolved "https://registry.nlark.com/wmf/download/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da" + integrity sha1-fRnWIQcaCMK9xrfmiKnENSmMwto= + word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + word@~0.3.0: + version "0.3.0" + resolved "https://registry.nlark.com/word/download/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961" + integrity sha1-hUIVfk+OhJ9KNjooiZLUdhLbmWE= + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -3833,6 +3957,22 @@ Lockfile: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59" integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw== + xlsx@^0.16.9: + version "0.16.9" + resolved "https://registry.nlark.com/xlsx/download/xlsx-0.16.9.tgz#dacd5bb46bda6dd3743940c9c3dc1e2171826256" + integrity sha1-2s1btGvabdN0OUDJw9weIXGCYlY= + dependencies: + adler-32 "~1.2.0" + cfb "^1.1.4" + codepage "~1.14.0" + commander "~2.17.1" + crc-32 "~1.2.0" + exit-on-epipe "~1.0.1" + fflate "^0.3.8" + ssf "~0.11.2" + wmf "~1.0.1" + word "~0.3.0" + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" diff --git a/yarn.lock b/yarn.lock index 6cc781a..f7ab9c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -930,10 +930,10 @@ change-case@^4.1.2: optionalDependencies: fsevents "~2.3.1" -cl-admin-crud-vue3@^0.1.7: - version "0.1.7" - resolved "https://registry.nlark.com/cl-admin-crud-vue3/download/cl-admin-crud-vue3-0.1.7.tgz#a90711127900f35873556a30673c62242ab1bd51" - integrity sha1-qQcREnkA81hzVWowZzxiJCqxvVE= +cl-admin-crud-vue3@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cl-admin-crud-vue3/-/cl-admin-crud-vue3-0.2.1.tgz#5d9e37efb4caf8d084ae759d6b097bc54b708999" + integrity sha512-UPEEMCiPo5xFcLYDBqrKwR/jk7QK9MN7uOz3HAbrxl728L3g4T/Ogh01kfSrbASXv3YwZ+PkqcixAvtnh7WAPA== dependencies: array.prototype.flat "^1.2.4" core-js "^3.6.5"