From 85d28b9e3336404c63dfa94e17d8fbfd469bba39 Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Thu, 3 Feb 2022 00:03:29 +0800 Subject: [PATCH] fix(component): fix schema-form vIf logic #83 --- README.md | 47 ++++++ package.json | 14 +- .../core/schema-form/schema-form-item.vue | 5 - .../core/schema-form/schema-form.vue | 2 - .../demos/form/basic-form/form-schema.ts | 44 ++++++ yarn.lock | 141 ++++++++++++++---- 6 files changed, 207 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index aa65166e3..b4e392555 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,35 @@ - [gitee 地址](https://gitee.com/buqiyuan/vue3-antd-admin) - 根据 JSON 生成 typescript 的工具：[http://json2ts.com/](http://json2ts.com/) +## 安装使用 + +- 获取项目代码 + +```bash +git clone https://github.com/buqiyuan/vue3-antd-admin +``` + +- 安装依赖 + +```bash +cd vue3-antd-admin + +yarn install + +``` + +- 运行 + +```bash +yarn serve +``` + +- 打包 + +```bash +yarn build +``` + ## vscode 配置 安装项目根目录.vscode 推荐的插件，再安装 Volar，并禁用 Vetur，重启 vscode 即可。 @@ -43,6 +72,24 @@ yarn --frozen-lockfile [CHANGELOG](./CHANGELOG.md) +## Git 贡献提交规范 + +- 参考 [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) 规范 ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular)) + + - `feat` 增加新功能 + - `fix` 修复问题/BUG + - `style` 代码风格相关无影响运行结果的 + - `perf` 优化/性能提升 + - `refactor` 重构 + - `revert` 撤销修改 + - `test` 测试相关 + - `docs` 文档/注释 + - `chore` 依赖更新/脚手架配置修改等 + - `workflow` 工作流改进 + - `ci` 持续集成 + - `types` 类型定义文件更改 + - `wip` 开发中 + ### 赞赏 如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持! diff --git a/package.json b/package.json index d3722d9ac..de10a207a 100644 --- a/package.json +++ b/package.json @@ -30,30 +30,30 @@ "@vueuse/core": "^7.5.5", "ant-design-vue": "3.0.0-beta.9", "axios": "^0.25.0", - "core-js": "^3.20.3", + "core-js": "^3.21.0", "dayjs": "^1.10.7", "file-saver": "^2.0.5", "lodash-es": "^4.17.21", "mitt": "^3.0.0", "mockjs": "^1.1.0", "nprogress": "^1.0.0-1", - "pinia": "2.0.10", + "pinia": "2.0.11", "qs": "^6.10.3", "socket.io-client": "4.4.1", "sortablejs": "^1.14.0", "vue": "^3.2.29", "vue-i18n": "^9.2.0-beta.30", "vue-router": "^4.0.12", - "xlsx": "^0.17.5" + "xlsx": "^0.18.0" }, "devDependencies": { "@commitlint/cli": "^16.1.0", "@commitlint/config-conventional": "^16.0.0", "@types/lodash-es": "^4.17.5", - "@types/node": "^17.0.13", + "@types/node": "^17.0.14", "@types/webpack-env": "^1.16.3", - "@typescript-eslint/eslint-plugin": "^5.10.1", - "@typescript-eslint/parser": "^5.10.1", + "@typescript-eslint/eslint-plugin": "^5.10.2", + "@typescript-eslint/parser": "^5.10.2", "@vue/cli-plugin-babel": "^5.0.0-rc.2", "@vue/cli-plugin-eslint": "^5.0.0-rc.2", "@vue/cli-plugin-router": "^5.0.0-rc.2", @@ -73,7 +73,7 @@ "husky": "^7.0.4", "less": "^4.1.2", "less-loader": "10.2.0", - "lint-staged": "^12.3.2", + "lint-staged": "^12.3.3", "path-browserify": "^1.0.1", "postcss-html": "^1.3.0", "prettier": "^2.5.1", diff --git a/src/components/core/schema-form/schema-form-item.vue b/src/components/core/schema-form/schema-form-item.vue index 96b7f1c04..2ba59f523 100644 --- a/src/components/core/schema-form/schema-form-item.vue +++ b/src/components/core/schema-form/schema-form-item.vue @@ -214,13 +214,8 @@ label, dynamicRules, required, - field, } = props.schemaItem; - if (field == 'field5') { - console.log('rules', props.schemaItem); - } - if (isFunction(dynamicRules)) { return dynamicRules(unref(getValues)) as ValidationRule[]; } diff --git a/src/components/core/schema-form/schema-form.vue b/src/components/core/schema-form/schema-form.vue index 07f570c73..47ba4cec9 100644 --- a/src/components/core/schema-form/schema-form.vue +++ b/src/components/core/schema-form/schema-form.vue @@ -135,8 +135,6 @@ } if (Object.is(show, false) && key === 'vIf') { formModel[formItem.field] = undefined; - } else if (Object.is(show, true) && key === 'vIf') { - formModel[formItem.field] = cacheFormModel[formItem.field]; } return show; } else { diff --git a/src/views/demos/form/basic-form/form-schema.ts b/src/views/demos/form/basic-form/form-schema.ts index e94a99ab5..89a8d7992 100644 --- a/src/views/demos/form/basic-form/form-schema.ts +++ b/src/views/demos/form/basic-form/form-schema.ts @@ -1,6 +1,50 @@ import type { FormItemSchema } from '@/components/core/schema-form/types/form'; export const schemas: FormItemSchema[] = [ + { + field: 'type', + component: 'RadioGroup', + label: '类型', + defaultValue: 1, + colProps: { + span: 8, + }, + componentProps: { + options: [ + { + label: '类型一', + value: 1, + }, + { + label: '类型二', + value: 2, + }, + ], + }, + }, + { + field: 'isExtenal', + component: 'Switch', + label: '是否外链', + colProps: { + span: 8, + }, + componentProps: ({ formModel }) => ({ + onChange(e) { + console.log('哦', formModel, e); + }, + }), + vIf: ({ formModel }) => formModel['type'] === 2, + }, + { + field: 'isEbed', + component: 'Switch', + label: '是否内嵌', + colProps: { + span: 8, + }, + vIf: ({ formModel }) => formModel['type'] === 2 && formModel['isExtenal'], + }, { field: 'field1', component: 'Input', diff --git a/yarn.lock b/yarn.lock index c9787694c..c913e117a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,11 +1429,16 @@ resolved "https://registry.npmmirror.com/@types/minimist/download/@types/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w= -"@types/node@*", "@types/node@^17.0.13": +"@types/node@*": version "17.0.13" resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.13.tgz#5ed7ed7c662948335fcad6c412bb42d99ea754e3" integrity sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw== +"@types/node@^17.0.14": + version "17.0.14" + resolved "https://registry.npmmirror.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20" + integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.npmmirror.com/@types/normalize-package-data/download/@types/normalize-package-data-2.4.1.tgz?cache=0&sync_timestamp=1637269900376&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -1505,7 +1510,7 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.0.0", "@typescript-eslint/eslint-plugin@^5.10.1": +"@typescript-eslint/eslint-plugin@^5.0.0": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-5.10.1.tgz#870195d0f2146b36d11fc71131b75aba52354c69" integrity sha512-xN3CYqFlyE/qOcy978/L0xLR2HlcAGIyIK5sMOasxaaAPfQRj/MmMV6OC3I7NZO84oEUdWCOju34Z9W8E0pFDQ== @@ -1520,7 +1525,22 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.10.1": +"@typescript-eslint/eslint-plugin@^5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz#f8c1d59fc37bd6d9d11c97267fdfe722c4777152" + integrity sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q== + dependencies: + "@typescript-eslint/scope-manager" "5.10.2" + "@typescript-eslint/type-utils" "5.10.2" + "@typescript-eslint/utils" "5.10.2" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/parser@^5.0.0": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/parser/download/@typescript-eslint/parser-5.10.1.tgz#4ce9633cc33fc70bc13786cb793c1a76fe5ad6bd" integrity sha512-GReo3tjNBwR5RnRO0K2wDIDN31cM3MmDtgyQ85oAxAmC5K3j/g85IjP+cDfcqDsDDBf1HNKQAD0WqOYL8jXqUA== @@ -1530,6 +1550,16 @@ "@typescript-eslint/typescript-estree" "5.10.1" debug "^4.3.2" +"@typescript-eslint/parser@^5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.10.2.tgz#b6076d27cc5499ce3f2c625f5ccde946ecb7db9a" + integrity sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg== + dependencies: + "@typescript-eslint/scope-manager" "5.10.2" + "@typescript-eslint/types" "5.10.2" + "@typescript-eslint/typescript-estree" "5.10.2" + debug "^4.3.2" + "@typescript-eslint/scope-manager@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/download/@typescript-eslint/scope-manager-5.10.1.tgz#f0539c73804d2423506db2475352a4dec36cd809" @@ -1538,6 +1568,14 @@ "@typescript-eslint/types" "5.10.1" "@typescript-eslint/visitor-keys" "5.10.1" +"@typescript-eslint/scope-manager@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz#92c0bc935ec00f3d8638cdffb3d0e70c9b879639" + integrity sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw== + dependencies: + "@typescript-eslint/types" "5.10.2" + "@typescript-eslint/visitor-keys" "5.10.2" + "@typescript-eslint/type-utils@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/download/@typescript-eslint/type-utils-5.10.1.tgz#5e526c00142585e40ab1503e83f1ff608c367405" @@ -1547,11 +1585,25 @@ debug "^4.3.2" tsutils "^3.21.0" +"@typescript-eslint/type-utils@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz#ad5acdf98a7d2ab030bea81f17da457519101ceb" + integrity sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw== + dependencies: + "@typescript-eslint/utils" "5.10.2" + debug "^4.3.2" + tsutils "^3.21.0" + "@typescript-eslint/types@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/types/download/@typescript-eslint/types-5.10.1.tgz#dca9bd4cb8c067fc85304a31f38ec4766ba2d1ea" integrity sha512-ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q== +"@typescript-eslint/types@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.10.2.tgz#604d15d795c4601fffba6ecb4587ff9fdec68ce8" + integrity sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w== + "@typescript-eslint/typescript-estree@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-5.10.1.tgz#b268e67be0553f8790ba3fe87113282977adda15" @@ -1565,6 +1617,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz#810906056cd3ddcb35aa333fdbbef3713b0fe4a7" + integrity sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ== + dependencies: + "@typescript-eslint/types" "5.10.2" + "@typescript-eslint/visitor-keys" "5.10.2" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/utils@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/utils/download/@typescript-eslint/utils-5.10.1.tgz#fa682a33af47080ba2c4368ee0ad2128213a1196" @@ -1577,6 +1642,18 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" +"@typescript-eslint/utils@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.10.2.tgz#1fcd37547c32c648ab11aea7173ec30060ee87a8" + integrity sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.10.2" + "@typescript-eslint/types" "5.10.2" + "@typescript-eslint/typescript-estree" "5.10.2" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + "@typescript-eslint/visitor-keys@5.10.1": version "5.10.1" resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/download/@typescript-eslint/visitor-keys-5.10.1.tgz#29102de692f59d7d34ecc457ed59ab5fc558010b" @@ -1585,6 +1662,14 @@ "@typescript-eslint/types" "5.10.1" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.10.2": + version "5.10.2" + resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz#fdbf272d8e61c045d865bd6c8b41bea73d222f3d" + integrity sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q== + dependencies: + "@typescript-eslint/types" "5.10.2" + eslint-visitor-keys "^3.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.nlark.com/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -2195,14 +2280,6 @@ address@^1.1.2: resolved "https://registry.nlark.com/address/download/address-1.1.2.tgz?cache=0&sync_timestamp=1621254913906&other_urls=https%3A%2F%2Fregistry.nlark.com%2Faddress%2Fdownload%2Faddress-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY= -adler-32@~1.2.0: - version "1.2.0" - resolved "https://registry.npmmirror.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" - adler-32@~1.3.0: version "1.3.0" resolved "https://registry.npmmirror.com/adler-32/download/adler-32-1.3.0.tgz#3cad1b71cdfa69f6c8a91f3e3615d31a4fdedc72" @@ -3354,11 +3431,16 @@ core-js-compat@^3.20.0, core-js-compat@^3.20.2, core-js-compat@^3.8.3: browserslist "^4.19.1" semver "7.0.0" -core-js@^3.15.1, core-js@^3.20.3, core-js@^3.8.3: +core-js@^3.15.1, core-js@^3.8.3: version "3.20.3" resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a" integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag== +core-js@^3.21.0: + version "3.21.0" + resolved "https://registry.npmmirror.com/core-js/-/core-js-3.21.0.tgz#f479dbfc3dffb035a0827602dd056839a774aa71" + integrity sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ== + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&sync_timestamp=1630420577662&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -3394,7 +3476,7 @@ cosmiconfig@^7, cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: path-type "^4.0.0" yaml "^1.10.0" -crc-32@~1.2.0: +crc-32@~1.2.0, crc-32@~1.2.1: version "1.2.1" resolved "https://registry.npmmirror.com/crc-32/download/crc-32-1.2.1.tgz#436d2bcaad27bcb6bd073a2587139d3024a16460" integrity sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w== @@ -5756,10 +5838,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.npmmirror.com/lines-and-columns/download/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lint-staged@^12.3.2: - version "12.3.2" - resolved "https://registry.npmmirror.com/lint-staged/download/lint-staged-12.3.2.tgz#c87fe59dca475b7d1cb56863c5faa03c145e1446" - integrity sha512-gtw4Cbj01SuVSfAOXC6ivd/7VKHTj51yj5xV8TgktFmYNMsZzXuSd5/brqJEA93v63wL7R6iDlunMANOechC0A== +lint-staged@^12.3.3: + version "12.3.3" + resolved "https://registry.npmmirror.com/lint-staged/-/lint-staged-12.3.3.tgz#0a465962fe53baa2b4b9da50801ead49a910e03b" + integrity sha512-OqcLsqcPOqzvsfkxjeBpZylgJ3SRG1RYqc9LxC6tkt6tNsq1bNVkAixBwX09f6CobcHswzqVOCBpFR1Fck0+ag== dependencies: cli-truncate "^3.1.0" colorette "^2.0.16" @@ -6841,10 +6923,10 @@ pify@^4.0.1: resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= -pinia@2.0.10: - version "2.0.10" - resolved "https://registry.npmmirror.com/pinia/download/pinia-2.0.10.tgz#66ae65e10d9062d110cb8ce47aedf491b4b131ef" - integrity sha512-Gq8qCjWkz1SZSCrHqGg/k+wbeu35R7y44eDXFHJlBr5gZ8ooAf6bAHLt5zpAVIDptv09h0+XLZpy9dMHbwvXWw== +pinia@2.0.11: + version "2.0.11" + resolved "https://registry.npmmirror.com/pinia/-/pinia-2.0.11.tgz#ff03c714f5e5f16207280a4fc2eab01f3701ee2b" + integrity sha512-JzcmnMqu28PNWOjDgEDK6fTrIzX8eQZKPPKvu/fpHdpXARUj1xeVdFi3YFIMOWswqaBd589cpmAMdSSTryI9iw== dependencies: "@vue/devtools-api" "^6.0.0-beta.21" vue-demi "*" @@ -7240,11 +7322,6 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -printj@~1.1.0: - version "1.1.2" - resolved "https://registry.npmmirror.com/printj/download/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" - integrity sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI= - printj@~1.2.2: version "1.2.3" resolved "https://registry.npmmirror.com/printj/download/printj-1.2.3.tgz#2cfb2b192a1e5385dbbe5b46658ac34aa828508a" @@ -9275,15 +9352,15 @@ ws@~8.2.3: resolved "https://registry.npmmirror.com/ws/download/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== -xlsx@^0.17.5: - version "0.17.5" - resolved "https://registry.npmmirror.com/xlsx/download/xlsx-0.17.5.tgz#78b788fcfc0773d126cdcd7ea069cb7527c1ce81" - integrity sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g== +xlsx@^0.18.0: + version "0.18.0" + resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.0.tgz#b16e5d9bc0ef9a83609ccc9a73bc72ae2174a120" + integrity sha512-zQluErfRAr7ga2me77sIlDoljSrPCXnrNaiKo2+YFLtGkd0aW0Z9zfARVgNn9nytYBhsEjf6A+H5TogTeddscg== dependencies: - adler-32 "~1.2.0" + adler-32 "~1.3.0" cfb "^1.1.4" codepage "~1.15.0" - crc-32 "~1.2.0" + crc-32 "~1.2.1" ssf "~0.11.2" wmf "~1.0.1" word "~0.3.0"