From 9f755a230803712656568ce1971386c2263d1c43 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sun, 25 Sep 2022 09:55:29 +0800 Subject: [PATCH] =?UTF-8?q?form=E8=A1=A8=E5=8D=95label=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E8=A1=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=AE=BE=E7=BD=AE=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/BasicForm.vue | 8 +++++++- .../Form/src/jeecg/components/modal/RoleSelectModal.vue | 2 +- .../src/jeecg/components/modal/UserSelectByDepModal.vue | 2 +- .../Form/src/jeecg/components/modal/UserSelectModal.vue | 1 - src/hooks/system/useListPage.ts | 2 +- src/views/system/address/index.vue | 1 - .../system/departUser/components/DepartRoleInfoTab.vue | 1 + src/views/system/examples/demo/DemoModal.vue | 2 +- src/views/system/examples/demo/index.vue | 5 ++++- src/views/system/position/PositionModal.vue | 2 +- src/views/system/user/index.vue | 4 ++-- 11 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index 2e7eef3..c4cf1ea 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -81,7 +81,13 @@ // Get the basic configuration of the form const getProps = computed((): FormProps => { - return { ...props, ...unref(propsRef) } as FormProps; + let mergeProps = { ...props, ...unref(propsRef) } as FormProps; + //update-begin-author:sunjianlei date:20220923 for: 如果用户设置了labelWidth，则使labelCol失效，解决labelWidth设置无效的问题 + if (mergeProps.labelWidth) { + mergeProps.labelCol = undefined; + } + //update-end-author:sunjianlei date:20220923 for: 如果用户设置了labelWidth，则使labelCol失效，解决labelWidth设置无效的问题 + return mergeProps; }); const getFormClass = computed(() => { diff --git a/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue b/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue index 258d8ca..c5a1024 100644 --- a/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue +++ b/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue @@ -58,7 +58,7 @@ const searchInfo = ref(props.params); //查询form const formConfig = { - labelWidth: 220, + //labelWidth: 220, baseColProps: { xs: 24, sm: 24, diff --git a/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue b/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue index 41cb9e7..5ce39fc 100644 --- a/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue +++ b/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue @@ -101,7 +101,7 @@ bordered: true, size: 'small', formConfig: { - labelWidth: 200, + //labelWidth: 200, baseColProps: { xs: 24, sm: 8, diff --git a/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue b/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue index fd12478..673e312 100644 --- a/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue +++ b/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue @@ -109,7 +109,6 @@ const searchInfo = ref(props.params); //查询form const formConfig = { - labelWidth: 200, baseColProps: { xs: 24, sm: 8, diff --git a/src/hooks/system/useListPage.ts b/src/hooks/system/useListPage.ts index 90b4ea1..6d09d6c 100644 --- a/src/hooks/system/useListPage.ts +++ b/src/hooks/system/useListPage.ts @@ -206,7 +206,7 @@ export function useListTable(tableProps: TableProps): [ // 紧凑模式 compact: true, // label默认宽度 - labelWidth: 120, + // labelWidth: 120, // 按下回车后自动提交 autoSubmitOnEnter: true, // 默认 row 配置 diff --git a/src/views/system/address/index.vue b/src/views/system/address/index.vue index 0b9cf64..02e2bc6 100644 --- a/src/views/system/address/index.vue +++ b/src/views/system/address/index.vue @@ -50,7 +50,6 @@ //update-end---author:wangshuai ---date:20220629 for：[VUEN-1485]进入系统管理--通讯录页面后，网页命令行报错-------------- showIndexColumn: true, formConfig: { - labelWidth: 200, schemas: searchFormSchema, }, canResize: false, diff --git a/src/views/system/departUser/components/DepartRoleInfoTab.vue b/src/views/system/departUser/components/DepartRoleInfoTab.vue index 7722534..625ddc7 100644 --- a/src/views/system/departUser/components/DepartRoleInfoTab.vue +++ b/src/views/system/departUser/components/DepartRoleInfoTab.vue @@ -70,6 +70,7 @@ columns: departRoleColumns, canResize: false, formConfig: { + labelWidth: 100, schemas: departRoleSearchFormSchema, baseColProps: adaptiveColProps, labelAlign: 'left', diff --git a/src/views/system/examples/demo/DemoModal.vue b/src/views/system/examples/demo/DemoModal.vue index 66bdf56..232ada7 100644 --- a/src/views/system/examples/demo/DemoModal.vue +++ b/src/views/system/examples/demo/DemoModal.vue @@ -14,7 +14,7 @@ const isUpdate = ref(true); //表单配置 const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ - labelWidth: 150, + //labelWidth: 150, schemas: formSchema, showActionButtonGroup: false, }); diff --git a/src/views/system/examples/demo/index.vue b/src/views/system/examples/demo/index.vue index c88276b..565aaae 100644 --- a/src/views/system/examples/demo/index.vue +++ b/src/views/system/examples/demo/index.vue @@ -60,6 +60,8 @@ }} 弹窗导入 + +