From 1df9236a531a354cb8d6c4181bf9963757a43fa9 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Wed, 5 Feb 2025 13:20:30 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E9=94=99=E8=AF=AF=E7=9A=84status=20disabl?= =?UTF-8?q?ed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ .../src/views/system/client/client-drawer.vue | 20 +++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8575978f..95864559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.2.1 + +# BUG FIXES + +- 客户端管理 错误的status disabled + # 1.2.0 **REFACTOR** diff --git a/apps/web-antd/src/views/system/client/client-drawer.vue b/apps/web-antd/src/views/system/client/client-drawer.vue index 6ba88e67..bcbed4ec 100644 --- a/apps/web-antd/src/views/system/client/client-drawer.vue +++ b/apps/web-antd/src/views/system/client/client-drawer.vue @@ -55,6 +55,14 @@ function setupForm(update: boolean) { ]); } +// 提取生成状态字段Schema的函数 +const getStatusSchema = (disabled: boolean) => [ + { + componentProps: { disabled }, + fieldName: 'status', + }, +]; + const [BasicDrawer, drawerApi] = useVbenDrawer({ onCancel: handleCancel, onConfirm: handleConfirm, @@ -70,15 +78,11 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({ if (isUpdate.value && id) { const record = await clientInfo(id); // 不能禁用id为1的记录 - formApi.updateSchema([ - { - componentProps: { - disabled: record.id === 1, - }, - fieldName: 'status', - }, - ]); + formApi.updateSchema(getStatusSchema(record.id === 1)); await formApi.setValues(record); + } else { + // 新增模式: 确保状态字段可用 + formApi.updateSchema(getStatusSchema(false)); } drawerApi.drawerLoading(false); }, From a37dccdec047a8dfba7ec17dbc302a18ff7aae06 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Wed, 5 Feb 2025 15:03:28 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:=20modal/drawer=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=90=8EzIndex(2000)=E4=BC=9A=E9=81=AE=E6=8C=A1Tinymce?= =?UTF-8?q?=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86zIndex(1300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + apps/web-antd/src/components/tinymce/src/editor.vue | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95864559..bc16b411 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # BUG FIXES - 客户端管理 错误的status disabled +- modal/drawer升级后zIndex(2000)会遮挡Tinymce的下拉框zIndex(1300) # 1.2.0 diff --git a/apps/web-antd/src/components/tinymce/src/editor.vue b/apps/web-antd/src/components/tinymce/src/editor.vue index d3511d10..3441e84b 100644 --- a/apps/web-antd/src/components/tinymce/src/editor.vue +++ b/apps/web-antd/src/components/tinymce/src/editor.vue @@ -345,7 +345,7 @@ function handleDone(name: string, url: string) { v-if="!initOptions.inline && init" v-model="modelValue" :init="initOptions" - :style="{ visibility: 'hidden' }" + :style="{ visibility: 'hidden', zIndex: 3000 }" :tinymce-script-src="tinymceScriptSrc" license-key="gpl" /> @@ -353,6 +353,17 @@ function handleDone(name: string, url: string) { + + From a9f9031f493401bef9f379c5fe3a6c2137ffdfe9 Mon Sep 17 00:00:00 2001 From: Netfan Date: Thu, 6 Feb 2025 09:45:28 +0800 Subject: [PATCH 07/13] docs: update form docs (#5485) --- docs/src/components/common-ui/vben-form.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md index 0193e070..ecaae6f8 100644 --- a/docs/src/components/common-ui/vben-form.md +++ b/docs/src/components/common-ui/vben-form.md @@ -347,7 +347,7 @@ export interface ActionButtonOptions { /** 是否显示 */ show?: boolean; /** 按钮文本 */ - text?: string; + content?: string; /** 任意属性 */ [key: string]: any; } From 52dc3e1788510474322deb86c350c17ed98cb904 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 6 Feb 2025 15:35:33 +0800 Subject: [PATCH 08/13] =?UTF-8?q?perf:=20=E5=8A=A0=E5=AF=86=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9content-type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/request.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web-antd/src/api/request.ts b/apps/web-antd/src/api/request.ts index 515cb70d..f7b5cecf 100644 --- a/apps/web-antd/src/api/request.ts +++ b/apps/web-antd/src/api/request.ts @@ -129,6 +129,7 @@ function createRequestClient(baseURL: string) { typeof config.data === 'object' ? encryptWithAes(JSON.stringify(config.data), aesKey) : encryptWithAes(config.data, aesKey); + config.headers['Content-Type'] = 'text/plain;charset=utf-8'; } return config; }, From 526223331289f2e29e5ef8a99858ecabaf28d8a4 Mon Sep 17 00:00:00 2001 From: Netfan Date: Thu, 6 Feb 2025 19:33:10 +0800 Subject: [PATCH 09/13] feat: tabbar support max count limit (#5490) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 标签栏支持限制打开的最大数量 --- .../__snapshots__/config.test.ts.snap | 1 + packages/@core/preferences/src/config.ts | 1 + packages/@core/preferences/src/types.ts | 2 ++ .../preferences/blocks/layout/tabbar.vue | 12 ++++++++++ .../preferences/blocks/number-field-item.vue | 12 ++++++++-- .../preferences/preferences-drawer.vue | 2 ++ .../locales/src/langs/en-US/preferences.json | 2 ++ .../locales/src/langs/zh-CN/preferences.json | 2 ++ packages/stores/package.json | 1 + packages/stores/src/modules/tabbar.ts | 10 +++++++- pnpm-lock.yaml | 23 +++++++++++++++++++ 11 files changed, 65 insertions(+), 3 deletions(-) diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap index 486bf048..d537d22e 100644 --- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap +++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap @@ -80,6 +80,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj "enable": true, "height": 38, "keepAlive": true, + "maxCount": 0, "middleClickToClose": false, "persist": true, "showIcon": true, diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index 8f82e4fc..2c3f6586 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -80,6 +80,7 @@ const defaultPreferences: Preferences = { enable: true, height: 38, keepAlive: true, + maxCount: 0, middleClickToClose: false, persist: true, showIcon: true, diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts index b554b219..9c7e87bc 100644 --- a/packages/@core/preferences/src/types.ts +++ b/packages/@core/preferences/src/types.ts @@ -168,6 +168,8 @@ interface TabbarPreferences { height: number; /** 开启标签页缓存功能 */ keepAlive: boolean; + /** 限制最大数量 */ + maxCount: number; /** 是否点击中键时关闭标签 */ middleClickToClose: boolean; /** 是否持久化标签 */ diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue b/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue index 4c116e5a..ea533dad 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue @@ -5,6 +5,7 @@ import { computed } from 'vue'; import { $t } from '@vben/locales'; +import NumberFieldItem from '../number-field-item.vue'; import SelectItem from '../select-item.vue'; import SwitchItem from '../switch-item.vue'; @@ -22,6 +23,7 @@ const tabbarWheelable = defineModel('tabbarWheelable'); const tabbarStyleType = defineModel('tabbarStyleType'); const tabbarShowMore = defineModel('tabbarShowMore'); const tabbarShowMaximize = defineModel('tabbarShowMaximize'); +const tabbarMaxCount = defineModel('tabbarMaxCount'); const tabbarMiddleClickToClose = defineModel( 'tabbarMiddleClickToClose', ); @@ -54,6 +56,16 @@ const styleItems = computed((): SelectOption[] => [ {{ $t('preferences.tabbar.persist') }} + + {{ $t('preferences.tabbar.maxCount') }} + {{ $t('preferences.tabbar.draggable') }} diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue b/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue index aeb099bc..3878f812 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue @@ -23,10 +23,12 @@ withDefaults( disabled?: boolean; items?: SelectOption[]; placeholder?: string; + tip?: string; }>(), { disabled: false, placeholder: '', + tip: '', items: () => [], }, ); @@ -47,11 +49,17 @@ const slots = useSlots(); - + - + + + diff --git a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue index 6761e8a3..88e83815 100644 --- a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue +++ b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue @@ -116,6 +116,7 @@ const tabbarPersist = defineModel('tabbarPersist'); const tabbarDraggable = defineModel('tabbarDraggable'); const tabbarWheelable = defineModel('tabbarWheelable'); const tabbarStyleType = defineModel('tabbarStyleType'); +const tabbarMaxCount = defineModel('tabbarMaxCount'); const tabbarMiddleClickToClose = defineModel( 'tabbarMiddleClickToClose', ); @@ -365,6 +366,7 @@ async function handleReset() { v-model:tabbar-show-more="tabbarShowMore" v-model:tabbar-style-type="tabbarStyleType" v-model:tabbar-wheelable="tabbarWheelable" + v-model:tabbar-max-count="tabbarMaxCount" v-model:tabbar-middle-click-to-close="tabbarMiddleClickToClose" /> diff --git a/packages/locales/src/langs/en-US/preferences.json b/packages/locales/src/langs/en-US/preferences.json index c115d94a..029a9a54 100644 --- a/packages/locales/src/langs/en-US/preferences.json +++ b/packages/locales/src/langs/en-US/preferences.json @@ -62,6 +62,8 @@ "showMore": "Show More Button", "showMaximize": "Show Maximize Button", "persist": "Persist Tabs", + "maxCount": "Max Count of Tabs", + "maxCountTip": "When the number of tabs exceeds the maximum,\nthe oldest tab will be closed.\n Set to 0 to disable count checking.", "draggable": "Enable Draggable Sort", "wheelable": "Support Mouse Wheel", "middleClickClose": "Close Tab when Mouse Middle Button Click", diff --git a/packages/locales/src/langs/zh-CN/preferences.json b/packages/locales/src/langs/zh-CN/preferences.json index 7e90a1da..fde3368a 100644 --- a/packages/locales/src/langs/zh-CN/preferences.json +++ b/packages/locales/src/langs/zh-CN/preferences.json @@ -62,6 +62,8 @@ "showMore": "显示更多按钮", "showMaximize": "显示最大化按钮", "persist": "持久化标签页", + "maxCount": "最大标签数", + "maxCountTip": "每次打开新的标签时如果超过最大标签数，\n会自动关闭一个最先打开的标签\n设置为 0 则不限制", "draggable": "启动拖拽排序", "wheelable": "启用纵向滚轮响应", "middleClickClose": "点击鼠标中键关闭标签页", diff --git a/packages/stores/package.json b/packages/stores/package.json index 83f8a100..fe79f8e5 100644 --- a/packages/stores/package.json +++ b/packages/stores/package.json @@ -20,6 +20,7 @@ } }, "dependencies": { + "@vben-core/preferences": "workspace:*", "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", "pinia": "catalog:", diff --git a/packages/stores/src/modules/tabbar.ts b/packages/stores/src/modules/tabbar.ts index 3c5dbfe0..05554377 100644 --- a/packages/stores/src/modules/tabbar.ts +++ b/packages/stores/src/modules/tabbar.ts @@ -4,6 +4,7 @@ import type { TabDefinition } from '@vben-core/typings'; import { toRaw } from 'vue'; +import { preferences } from '@vben-core/preferences'; import { openRouteInNewWindow, startProgress, @@ -107,6 +108,7 @@ export const useTabbarStore = defineStore('core-tabbar', { }); if (tabIndex === -1) { + const maxCount = preferences.tabbar.maxCount; // 获取动态路由打开数，超过 0 即代表需要控制打开数 const maxNumOfOpenTab = (routeTab?.meta?.maxNumOfOpenTab ?? -1) as number; @@ -122,8 +124,14 @@ export const useTabbarStore = defineStore('core-tabbar', { (item) => item.name === routeTab.name, ); index !== -1 && this.tabs.splice(index, 1); + } else if (maxCount > 0 && this.tabs.length >= maxCount) { + // 关闭第一个 + const index = this.tabs.findIndex( + (item) => + !Reflect.has(item.meta, 'affixTab') || !item.meta.affixTab, + ); + index !== -1 && this.tabs.splice(index, 1); } - this.tabs.push(tab); } else { // 页面已经存在，不重复添加选项卡，只更新选项卡参数 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 561df83c..527ae0c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1727,6 +1727,9 @@ importers: packages/stores: dependencies: + '@vben-core/preferences': + specifier: workspace:* + version: link:../@core/preferences '@vben-core/shared': specifier: workspace:* version: link:../@core/base/shared @@ -1997,24 +2000,28 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@ast-grep/napi-linux-arm64-musl@0.32.3': resolution: {integrity: sha512-7+u7F5rzaV0/N5WdP2q+kGl3v+l8iGFRx4p7NUcbNumYqGDS2mkfRkaesRDSd7BH94ZulGtJnpmu3imX7spolQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@ast-grep/napi-linux-x64-gnu@0.32.3': resolution: {integrity: sha512-XwUjw+W1QWDAPjx+Hsa8ZwONN3MDPINdRkRM6Q1vV3pl0p9YrMpwL72xrWQA1G7r7ej9BI1fLiXWB4YEOeYzJw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@ast-grep/napi-linux-x64-musl@0.32.3': resolution: {integrity: sha512-894fQNqBDUfCP/qYbrPcK6+tMTEskc+vV2IKOKqgCfDryeptaiJJTJL9+Vbj38rO1LWhY8MIZ8W5ZyjxuhDRBA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@ast-grep/napi-win32-arm64-msvc@0.32.3': resolution: {integrity: sha512-T8nrZm3E+h2VgHuQ3THQLvqhou4MkSbNcyIOgLZ0l2NatHIckeHuly5fmnkd6KQsGP/AqAEGxZBoOVYvoDl7DA==} @@ -3713,36 +3720,42 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm-musl@2.5.1': resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [musl] '@parcel/watcher-linux-arm64-glibc@2.5.1': resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.5.1': resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [musl] '@parcel/watcher-linux-x64-glibc@2.5.1': resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-x64-musl@2.5.1': resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [musl] '@parcel/watcher-wasm@2.5.1': resolution: {integrity: sha512-RJxlQQLkaMMIuWRozy+z2vEqbaQlCuaCgVZIUCzQLYggY22LZbP5Y1+ia+FD724Ids9e+XIyOLXLrLgQSHIthw==} @@ -3966,51 +3979,61 @@ packages: resolution: {integrity: sha512-lfqTpWjSvbgQP1vqGTXdv+/kxIznKXZlI109WkIFPbud41bjigjNmOAAKoazmRGx+k9e3rtIdbq2pQZPV1pMig==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.34.2': resolution: {integrity: sha512-RGjqULqIurqqv+NJTyuPgdZhka8ImMLB32YwUle2BPTDqDoXNgwFjdjQC59FbSk08z0IqlRJjrJ0AvDQ5W5lpw==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.34.2': resolution: {integrity: sha512-ZvkPiheyXtXlFqHpsdgscx+tZ7hoR59vOettvArinEspq5fxSDSgfF+L5wqqJ9R4t+n53nyn0sKxeXlik7AY9Q==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.34.2': resolution: {integrity: sha512-UlFk+E46TZEoxD9ufLKDBzfSG7Ki03fo6hsNRRRHF+KuvNZ5vd1RRVQm8YZlGsjcJG8R252XFK0xNPay+4WV7w==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loongarch64-gnu@4.34.2': resolution: {integrity: sha512-hJhfsD9ykx59jZuuoQgYT1GEcNNi3RCoEmbo5OGfG8RlHOiVS7iVNev9rhLKh7UBYq409f4uEw0cclTXx8nh8Q==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-powerpc64le-gnu@4.34.2': resolution: {integrity: sha512-g/O5IpgtrQqPegvqopvmdCF9vneLE7eqYfdPWW8yjPS8f63DNam3U4ARL1PNNB64XHZDHKpvO2Giftf43puB8Q==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.34.2': resolution: {integrity: sha512-bSQijDC96M6PuooOuXHpvXUYiIwsnDmqGU8+br2U7iPoykNi9JtMUpN7K6xml29e0evK0/g0D1qbAUzWZFHY5Q==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.34.2': resolution: {integrity: sha512-49TtdeVAsdRuiUHXPrFVucaP4SivazetGUVH8CIxVsNsaPHV4PFkpLmH9LeqU/R4Nbgky9lzX5Xe1NrzLyraVA==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.34.2': resolution: {integrity: sha512-j+jFdfOycLIQ7FWKka9Zd3qvsIyugg5LeZuHF6kFlXo6MSOc6R1w37YUVy8VpAKd81LMWGi5g9J25P09M0SSIw==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.34.2': resolution: {integrity: sha512-aDPHyM/D2SpXfSNCVWCxyHmOqN9qb7SWkY1+vaXqMNMXslZYnwh9V/UCudl6psyG0v6Ukj7pXanIpfZwCOEMUg==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.34.2': resolution: {integrity: sha512-LQRkCyUBnAo7r8dbEdtNU08EKLCJMgAk2oP5H3R7BnUlKLqgR3dUjrLBVirmc1RK6U6qhtDw29Dimeer8d5hzQ==} From 0be1a0825db44a0de2c86a3ffa99dbaeac387cde Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 6 Feb 2025 22:44:05 +0800 Subject: [PATCH 10/13] =?UTF-8?q?perf:=20=E5=8E=BB=E9=99=A4=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/workflow/leave/leave-form.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/web-antd/src/views/workflow/leave/leave-form.vue b/apps/web-antd/src/views/workflow/leave/leave-form.vue index 206a0aff..0e4d7751 100644 --- a/apps/web-antd/src/views/workflow/leave/leave-form.vue +++ b/apps/web-antd/src/views/workflow/leave/leave-form.vue @@ -179,3 +179,14 @@ const cardSize = computed(() => { + + From cd77063f68389641c8722e6c15c438a6b318cd4c Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 7 Feb 2025 11:45:57 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20=E5=8A=A0=E5=AF=86=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=A4=B4=E4=BC=9A=E9=80=A0?= =?UTF-8?q?=E6=88=90=E6=8A=A5=E9=94=99HttpMediaTypeNotSupportedException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/request.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web-antd/src/api/request.ts b/apps/web-antd/src/api/request.ts index f7b5cecf..515cb70d 100644 --- a/apps/web-antd/src/api/request.ts +++ b/apps/web-antd/src/api/request.ts @@ -129,7 +129,6 @@ function createRequestClient(baseURL: string) { typeof config.data === 'object' ? encryptWithAes(JSON.stringify(config.data), aesKey) : encryptWithAes(config.data, aesKey); - config.headers['Content-Type'] = 'text/plain;charset=utf-8'; } return config; }, From f78bc4e4f7b27c8d56227499a6bdaa27cd99bbc0 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 7 Feb 2025 14:42:47 +0800 Subject: [PATCH 12/13] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/monitor/admin/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/views/monitor/admin/index.vue b/apps/web-antd/src/views/monitor/admin/index.vue index a8d542db..2c385793 100644 --- a/apps/web-antd/src/views/monitor/admin/index.vue +++ b/apps/web-antd/src/views/monitor/admin/index.vue @@ -1,3 +1,6 @@ From bc6818f5317a9b900951e327360e93af30f6fa1b Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 7 Feb 2025 14:43:46 +0800 Subject: [PATCH 13/13] docs: version update --- apps/web-antd/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index b759ba10..5264b7e3 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-antd", - "version": "1.2.0", + "version": "1.2.1", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": {