From e82bafa43ea98f538004830b86f0eb9a8624330b Mon Sep 17 00:00:00 2001 From: wentmac Date: Tue, 18 Jan 2022 21:47:47 +0800 Subject: [PATCH 01/32] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DEditCellTable=20?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=E5=8D=95=E5=85=83=E6=A0=BC=E5=BD=93?= =?UTF-8?q?columns.ellipsis=3Dtrue=E6=97=B6=EF=BC=8C=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=B8=AD=E5=8F=96=E4=B8=8D=E5=88=B0key=E7=9A=84=E5=80=BC?= =?UTF-8?q?=E3=80=82=20(#1598)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/components/editable/EditableCell.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index 4ea4e93a..6c2b31c7 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -265,7 +265,7 @@ result = await beforeEditSubmit({ record: pick(record, keys), index, - key: key as string, + key: dataKey as string, value, }); } catch (e) { @@ -281,7 +281,7 @@ set(record, dataKey, value); //const record = await table.updateTableData(index, dataKey, value); - needEmit && table.emit?.('edit-end', { record, index, key, value }); + needEmit && table.emit?.('edit-end', { record, index, key: dataKey, value }); isEdit.value = false; } From 929141be968721e87eb032c2719bdc34afa40d44 Mon Sep 17 00:00:00 2001 From: lqxlearn <979252490@qq.com> Date: Tue, 18 Jan 2022 21:48:05 +0800 Subject: [PATCH 02/32] fix:fetch-success total 0 (#1597) Co-authored-by: qiuxiang --- src/components/Table/src/hooks/useDataSource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts index 698b199a..7d6c00af 100644 --- a/src/components/Table/src/hooks/useDataSource.ts +++ b/src/components/Table/src/hooks/useDataSource.ts @@ -292,7 +292,7 @@ export function useDataSource( const isArrayResult = Array.isArray(res); let resultItems: Recordable[] = isArrayResult ? res : get(res, listField); - const resultTotal: number = isArrayResult ? 0 : get(res, totalField); + const resultTotal: number = isArrayResult ? res.length : get(res, totalField); // 假如数据变少,导致总页数变少并小于当前选中页码,通过getPaginationRef获取到的页码是不正确的,需获取正确的页码再次执行 if (resultTotal) { From 67d514ad0e27083328c853e010a8eee9ed7f0408 Mon Sep 17 00:00:00 2001 From: ToQuery Date: Tue, 18 Jan 2022 21:48:58 +0800 Subject: [PATCH 03/32] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20api=20tree=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20(#1582)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tsconfig 增加 types , 解决webstorm提示错误 * api-tree --- src/components/Form/index.ts | 1 + src/components/Form/src/componentMap.ts | 2 + .../Form/src/components/ApiTree.vue | 86 +++++++++++++++++++ src/components/Form/src/types/index.ts | 1 + 4 files changed, 90 insertions(+) create mode 100644 src/components/Form/src/components/ApiTree.vue diff --git a/src/components/Form/index.ts b/src/components/Form/index.ts index 8bca8a36..3144dae8 100644 --- a/src/components/Form/index.ts +++ b/src/components/Form/index.ts @@ -9,6 +9,7 @@ export { useForm } from './src/hooks/useForm'; export { default as ApiSelect } from './src/components/ApiSelect.vue'; export { default as RadioButtonGroup } from './src/components/RadioButtonGroup.vue'; export { default as ApiTreeSelect } from './src/components/ApiTreeSelect.vue'; +export { default as ApiTree } from './src/components/ApiTree.vue'; export { default as ApiRadioGroup } from './src/components/ApiRadioGroup.vue'; export { default as ApiCascader } from './src/components/ApiCascader.vue'; diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts index 2f9003d5..52739a6f 100644 --- a/src/components/Form/src/componentMap.ts +++ b/src/components/Form/src/componentMap.ts @@ -24,6 +24,7 @@ import { import ApiRadioGroup from './components/ApiRadioGroup.vue'; import RadioButtonGroup from './components/RadioButtonGroup.vue'; import ApiSelect from './components/ApiSelect.vue'; +import ApiTree from './components/ApiTree.vue'; import ApiTreeSelect from './components/ApiTreeSelect.vue'; import ApiCascader from './components/ApiCascader.vue'; import { BasicUpload } from '/@/components/Upload'; @@ -43,6 +44,7 @@ componentMap.set('AutoComplete', AutoComplete); componentMap.set('Select', Select); componentMap.set('ApiSelect', ApiSelect); +componentMap.set('ApiTree', ApiTree); componentMap.set('TreeSelect', TreeSelect); componentMap.set('ApiTreeSelect', ApiTreeSelect); componentMap.set('ApiRadioGroup', ApiRadioGroup); diff --git a/src/components/Form/src/components/ApiTree.vue b/src/components/Form/src/components/ApiTree.vue new file mode 100644 index 00000000..b81d76b5 --- /dev/null +++ b/src/components/Form/src/components/ApiTree.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts index a3e968e8..3da7e4ae 100644 --- a/src/components/Form/src/types/index.ts +++ b/src/components/Form/src/types/index.ts @@ -91,6 +91,7 @@ export type ComponentType = | 'Select' | 'ApiSelect' | 'TreeSelect' + | 'ApiTree' | 'ApiTreeSelect' | 'ApiRadioGroup' | 'RadioButtonGroup' From b63f7d17dee2c0332e753ee445d61db63bd28236 Mon Sep 17 00:00:00 2001 From: lzdjack <51448229+lzdjack@users.noreply.github.com> Date: Tue, 18 Jan 2022 21:49:24 +0800 Subject: [PATCH 04/32] =?UTF-8?q?feat:=20=E5=A2=9E=E5=BC=BA=E5=8F=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E5=85=83=E6=A0=BC=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20(#1576)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 增加可编辑单元格非编辑状态下可自定义样式 2. 扩展editComponentProps,可接受方法 --- .../src/components/editable/EditableCell.vue | 126 ++++++++++-------- src/components/Table/src/types/table.ts | 16 ++- src/views/demo/table/EditCellTable.vue | 12 +- 3 files changed, 100 insertions(+), 54 deletions(-) diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index 6c2b31c7..0efe83f1 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -1,40 +1,4 @@ - - diff --git a/types/axios.d.ts b/types/axios.d.ts index e60187f9..b18af05a 100644 --- a/types/axios.d.ts +++ b/types/axios.d.ts @@ -23,8 +23,15 @@ export interface RequestOptions { ignoreCancelToken?: boolean; // Whether to send token in header withToken?: boolean; + // 请求重试机制 + retryRequest?: RetryRequest; } +export interface RetryRequest { + isOpenRetry: boolean; + count: number; + waitTime: number; +} export interface Result { code: number; type: 'success' | 'error' | 'warning'; From 5db1250a8d6b97a1683a4eea83dd982ef8f3f0f5 Mon Sep 17 00:00:00 2001 From: vben Date: Sat, 19 Mar 2022 06:49:33 +0800 Subject: [PATCH 23/32] fix: stylelint config, close #1658 --- .vscode/settings.json | 5 +++-- package.json | 2 -- pnpm-lock.yaml | 11 ----------- .../SimpleMenu/src/components/menu.less | 12 ++++++------ stylelint.config.js | 16 +++++++++------- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fc4be84f..d3c7c825 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -55,7 +55,7 @@ "**/yarn.lock": true }, "stylelint.enable": true, - "stylelint.packageManager": "yarn", + "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"], "path-intellisense.mappings": { "/@/": "${workspaceRoot}/src" }, @@ -88,7 +88,8 @@ }, "[vue]": { "editor.codeActionsOnSave": { - "source.fixAll.eslint": false + "source.fixAll.eslint": true, + "source.fixAll.stylelint": true } }, "i18n-ally.localesPaths": ["src/locales/lang"], diff --git a/package.json b/package.json index 7952665f..44ee5a6f 100644 --- a/package.json +++ b/package.json @@ -120,13 +120,11 @@ "rollup": "^2.70.1", "rollup-plugin-visualizer": "^5.6.0", "stylelint": "^14.6.0", - "stylelint-config-html": "^1.0.0", "stylelint-config-prettier": "^9.0.3", "stylelint-config-recommended": "^7.0.0", "stylelint-config-recommended-vue": "^1.3.0", "stylelint-config-standard": "^25.0.0", "stylelint-order": "^5.0.0", - "stylelint-processor-html": "^1.0.0", "ts-node": "^10.7.0", "typescript": "^4.6.2", "vite": "^2.9.0-beta.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9a3ffaea..61a3f87f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,13 +84,11 @@ specifiers: showdown: ^2.0.3 sortablejs: ^1.14.0 stylelint: ^14.6.0 - stylelint-config-html: ^1.0.0 stylelint-config-prettier: ^9.0.3 stylelint-config-recommended: ^7.0.0 stylelint-config-recommended-vue: ^1.3.0 stylelint-config-standard: ^25.0.0 stylelint-order: ^5.0.0 - stylelint-processor-html: ^1.0.0 tinymce: ^5.10.3 ts-node: ^10.7.0 typescript: ^4.6.2 @@ -206,13 +204,11 @@ devDependencies: rollup: 2.70.1 rollup-plugin-visualizer: 5.6.0_rollup@2.70.1 stylelint: 14.6.0 - stylelint-config-html: 1.0.0_f552817e5b8b1b7dca381d844218922e stylelint-config-prettier: 9.0.3_stylelint@14.6.0 stylelint-config-recommended: 7.0.0_stylelint@14.6.0 stylelint-config-recommended-vue: 1.3.0_f552817e5b8b1b7dca381d844218922e stylelint-config-standard: 25.0.0_stylelint@14.6.0 stylelint-order: 5.0.0_stylelint@14.6.0 - stylelint-processor-html: 1.0.0 ts-node: 10.7.0_e79e62fe450383fd2d418267dc75e645 typescript: 4.6.2 vite: 2.9.0-beta.3_less@4.1.2 @@ -9133,13 +9129,6 @@ packages: stylelint: 14.6.0 dev: true - /stylelint-processor-html/1.0.0: - resolution: {integrity: sha1-aJK2soVaRfApHNhFGR1pCBMKKRg=} - deprecated: 'Please use stylelint-processor-arbitrary-tags https://github.com/mapbox/stylelint-processor-arbitrary-tags ' - dependencies: - htmlparser2: 3.10.1 - dev: true - /stylelint/14.6.0: resolution: {integrity: sha512-Xk2sqXYPi9nXgq70nBiZkbQm/QOOKd83NBTaBE1fXEWAEeRlgHnKC/E7kJFlT6K0SaNDOK5yIvR7GFPGsNLuOg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} diff --git a/src/components/SimpleMenu/src/components/menu.less b/src/components/SimpleMenu/src/components/menu.less index b9ef388e..0c4c5ca5 100644 --- a/src/components/SimpleMenu/src/components/menu.less +++ b/src/components/SimpleMenu/src/components/menu.less @@ -13,8 +13,8 @@ bottom: 0; display: block; width: 2px; - background-color: @primary-color; content: ''; + background-color: @primary-color; } } @@ -45,8 +45,8 @@ position: absolute; top: 50%; right: 18px; - transform: translateY(-50%) rotate(-90deg); transition: transform @transition-time @ease-in-out; + transform: translateY(-50%) rotate(-90deg); } } @@ -128,12 +128,12 @@ position: relative; z-index: 1; display: flex; + align-items: center; font-size: @font-size-base; color: inherit; list-style: none; cursor: pointer; outline: none; - align-items: center; &:hover, &:active { @@ -178,8 +178,8 @@ &-vertical &-submenu-collapse { .@{submenu-popup-prefix-cls} { display: flex; - justify-content: center; align-items: center; + justify-content: center; } .@{menu-prefix-cls}-submenu-collapsed-show-tit { flex-direction: column; @@ -244,8 +244,8 @@ left: 0; width: 3px; height: 100%; - background-color: @primary-color; content: ''; + background-color: @primary-color; } } } @@ -276,8 +276,8 @@ left: 0; width: 3px; height: 100%; - background-color: @primary-color; content: ''; + background-color: @primary-color; } .@{menu-prefix-cls}-submenu-collapse { diff --git a/stylelint.config.js b/stylelint.config.js index d7fc57b4..1ec1619e 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -1,14 +1,10 @@ module.exports = { root: true, plugins: ['stylelint-order'], - processors: ['stylelint-processor-html'], - extends: [ - 'stylelint-config-standard', - 'stylelint-config-prettier', - 'stylelint-config-recommended-vue/less', - ], + extends: ['stylelint-config-standard', 'stylelint-config-prettier'], rules: { + 'function-no-unknown': null, 'selector-class-pattern': null, 'selector-pseudo-class-no-unknown': [ true, @@ -40,6 +36,7 @@ module.exports = { }, ], 'no-empty-source': null, + 'string-quotes': null, 'named-grid-areas-no-invalid': null, 'unicode-bom': 'never', 'no-descending-specificity': null, @@ -77,7 +74,7 @@ module.exports = { overrides: [ { files: ['*.vue', '**/*.vue', '*.html', '**/*.html'], - extends: ['stylelint-config-recommended', 'stylelint-config-html'], + extends: ['stylelint-config-recommended'], rules: { 'keyframes-name-pattern': null, 'selector-pseudo-class-no-unknown': [ @@ -94,5 +91,10 @@ module.exports = { ], }, }, + { + files: ['*.less', '**/*.less'], + customSyntax: 'postcss-less', + extends: ['stylelint-config-standard', 'stylelint-config-recommended-vue'], + }, ], }; From 1dca636521e16ab5f0a75ec6372b2008f3737469 Mon Sep 17 00:00:00 2001 From: vben Date: Sat, 19 Mar 2022 07:47:49 +0800 Subject: [PATCH 24/32] fix: lint --- stylelint.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylelint.config.js b/stylelint.config.js index 1ec1619e..b82715ea 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -2,9 +2,9 @@ module.exports = { root: true, plugins: ['stylelint-order'], extends: ['stylelint-config-standard', 'stylelint-config-prettier'], - + customSyntax: 'postcss-html', rules: { - 'function-no-unknown': null, + 'selector-class-pattern': null, 'selector-class-pattern': null, 'selector-pseudo-class-no-unknown': [ true, From 10b59395b2ef1498e2bca765ffd4a26b4a04b388 Mon Sep 17 00:00:00 2001 From: Micah Date: Wed, 23 Mar 2022 22:31:01 +0800 Subject: [PATCH 25/32] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E8=BF=90?= =?UTF-8?q?=E8=A1=8Cnpm=20run=20lint:stylelint=E5=91=BD=E4=BB=A4=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=ABless=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E5=87=BD=E6=95=B0=20(#1736)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除 stylelint.config.js文件 rules中重复的selector-class-pattern Co-authored-by: Micah --- stylelint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylelint.config.js b/stylelint.config.js index b82715ea..4b3501d8 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -4,7 +4,7 @@ module.exports = { extends: ['stylelint-config-standard', 'stylelint-config-prettier'], customSyntax: 'postcss-html', rules: { - 'selector-class-pattern': null, + 'function-no-unknown': null, 'selector-class-pattern': null, 'selector-pseudo-class-no-unknown': [ true, From e4305daf98e30cfd0e87ffa3ae932c90c95af1f3 Mon Sep 17 00:00:00 2001 From: chenls Date: Wed, 23 Mar 2022 22:31:28 +0800 Subject: [PATCH 26/32] perf: remove ant-design-vue@3.0.0-beta.11 .ant-col fix (#1734) --- src/design/ant/index.less | 5 ----- src/views/demo/form/index.vue | 18 ++++++++++++++++++ src/views/demo/page/form/high/index.vue | 2 ++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/design/ant/index.less b/src/design/ant/index.less index 73672f01..f9334bb6 100644 --- a/src/design/ant/index.less +++ b/src/design/ant/index.less @@ -2,11 +2,6 @@ @import './input.less'; @import './btn.less'; -// TODO beta.11 fix -.ant-col { - width: 100%; -} - .ant-image-preview-root { img { display: unset; diff --git a/src/views/demo/form/index.vue b/src/views/demo/form/index.vue index 675b51b6..6d6799d6 100644 --- a/src/views/demo/form/index.vue +++ b/src/views/demo/form/index.vue @@ -142,6 +142,9 @@ field: 'divider-basic', component: 'Divider', label: '基础字段', + colProps: { + span: 24, + }, }, { field: 'field1', @@ -340,6 +343,9 @@ field: 'divider-api-select', component: 'Divider', label: '远程下拉演示', + colProps: { + span: 24, + }, }, { field: 'field30', @@ -458,6 +464,9 @@ field: 'divider-linked', component: 'Divider', label: '字段联动', + colProps: { + span: 24, + }, }, { field: 'province', @@ -509,6 +518,9 @@ component: 'Divider', label: '互斥多选', helpMessage: ['两个Select共用数据源', '但不可选择对方已选中的项目'], + colProps: { + span: 24, + }, }, { field: 'selectA', @@ -535,6 +547,9 @@ component: 'Divider', label: '字段解构', helpMessage: ['如果组件的值是 array 或者 object', '可以根据 ES6 的解构语法分别取值'], + colProps: { + span: 24, + }, }, { field: '[startTime, endTime]', @@ -550,6 +565,9 @@ field: 'divider-others', component: 'Divider', label: '其它', + colProps: { + span: 24, + }, }, { field: 'field20', diff --git a/src/views/demo/page/form/high/index.vue b/src/views/demo/page/form/high/index.vue index 824953e2..f73d3d13 100644 --- a/src/views/demo/page/form/high/index.vue +++ b/src/views/demo/page/form/high/index.vue @@ -34,6 +34,7 @@ const tableRef = ref<{ getDataSource: () => any } | null>(null); const [register, { validate }] = useForm({ + layout: 'vertical', baseColProps: { span: 6, }, @@ -42,6 +43,7 @@ }); const [registerTask, { validate: validateTaskForm }] = useForm({ + layout: 'vertical', baseColProps: { span: 6, }, From a542317dc3a6b9124292a32db5e5ad8b2f7d5cff Mon Sep 17 00:00:00 2001 From: jianjianxu Date: Wed, 23 Mar 2022 22:31:50 +0800 Subject: [PATCH 27/32] fix: wrong item.time without the "expires" (#1740) --- src/utils/cache/memory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/cache/memory.ts b/src/utils/cache/memory.ts index 76e30a92..2188ed01 100644 --- a/src/utils/cache/memory.ts +++ b/src/utils/cache/memory.ts @@ -58,7 +58,7 @@ export class Memory { return value; } const now = new Date().getTime(); - item.time = now + this.alive; + item.time = now + expires; item.timeoutId = setTimeout( () => { this.remove(key); From d31cb904dbbe48612eda1c6c1abefc227d7e9684 Mon Sep 17 00:00:00 2001 From: wangxiaoer5200 <38752239+wangxiaoer5200@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:39:49 +0800 Subject: [PATCH 28/32] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E4=B8=80=E4=BA=9B=E5=B8=B8=E8=A7=81=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=92=8C=E8=AD=A6=E5=91=8A=20(#1750)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: wangbin <18695686631@163.com> --- .../Application/src/AppLocalePicker.vue | 2 +- .../src/components/settings/SizeSetting.vue | 2 +- .../header/components/lock/LockModal.vue | 3 + .../default/tabs/components/TabContent.vue | 8 ++- src/layouts/default/tabs/index.less | 6 ++ .../analysis/components/VisitRadar.vue | 18 ++---- .../workbench/components/SaleRadar.vue | 18 ++---- src/views/demo/charts/SaleRadar.vue | 18 ++---- src/views/demo/feat/request-demo/index.vue | 2 +- src/views/demo/page/form/basic/data.ts | 63 ++++++++++++------- src/views/demo/page/form/basic/index.vue | 4 +- 11 files changed, 80 insertions(+), 64 deletions(-) diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue index 75f1caa7..f71b8128 100644 --- a/src/components/Application/src/AppLocalePicker.vue +++ b/src/components/Application/src/AppLocalePicker.vue @@ -4,7 +4,7 @@ --> - +