From e770524f3a23b3c0f1d1e966de2e9d929dcc42a6 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Tue, 24 Sep 2024 22:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/7203=E3=80=91=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=80=E5=AF=B9=E5=A4=9A=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=EF=BC=8C=E7=9C=81=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/JVxeTable/src/hooks/useJVxeComponent.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts index d2326c1e..d086c365 100644 --- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts +++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts @@ -7,6 +7,7 @@ import { JVxeRenderType } from '../types/JVxeTypes'; import { isBoolean, isFunction, isObject, isPromise } from '/@/utils/is'; import { JVxeComponent } from '../types/JVxeComponent'; import { filterDictText } from '/@/utils/dict/JDictSelectUtil'; +import { getAreaTextByCode } from "@/components/Form/src/utils/Area"; export function useJVxeCompProps() { return { @@ -160,6 +161,14 @@ export function useJVxeComponent(props: JVxeComponent.Props) { return; } // update-end--author:liaozhiyang---date:20240509---for:【QQYUN-9205】一对多(jVxetable组件date)支持年,年月,年度度,年周 + + //update-begin---author:wangshuai---date:2024-09-18---for:【issues/7203】自动生成一对多表单代码中,省市区回显问题--- + if (props.type === 'pca' && props.renderType === JVxeRenderType.spaner) { + innerValue.value = getAreaTextByCode(newValue); + return; + } + //update-end---author:wangshuai---date:2024-09-18---for:【issues/7203】自动生成一对多表单代码中,省市区回显问题--- + // 判断是否启用翻译 if (props.renderType === JVxeRenderType.spaner && enhanced.translate.enabled === true) { if (isFunction(enhanced.translate.handler)) {