Merge branch 'main' of https://gitee.com/dapppp/ruoyi-plus-vben5 into dev

apps/web-antd/src/views/system/client/client-drawer.vue

@@ -21,6 +21,9 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     formItemClass: 'col-span-2',
+    componentProps: {
+      class: 'w-full',
+    },
   },
   layout: 'vertical',
   schema: drawerSchema(),

apps/web-antd/src/views/system/client/data.tsx

@@ -134,7 +134,6 @@ export const drawerSchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     componentProps: {
-      class: 'w-full',
       getPopupContainer,
       mode: 'multiple',
       optionFilterProp: 'label',
@@ -148,7 +147,6 @@ export const drawerSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       allowClear: false,
-      class: 'w-full',
       getPopupContainer,
       options: getDictOptions(DictEnum.SYS_DEVICE_TYPE),
     },

apps/web-antd/src/views/system/oss-config/data.tsx

@@ -99,7 +99,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider1',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '基本信息',
     }),
@@ -134,7 +134,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider2',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '认证信息',
     }),
@@ -157,7 +157,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider3',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '其他信息',
     }),

apps/web-antd/src/views/system/post/data.ts

@@ -82,7 +82,6 @@ export const drawerSchema: FormSchemaGetter = () => [
   {
     component: 'TreeSelect',
     componentProps: {
-      class: 'w-full',
       getPopupContainer,
     },
     fieldName: 'deptId',

apps/web-antd/src/views/system/role/data.tsx

@@ -154,12 +154,13 @@ export const drawerSchema: FormSchemaGetter = () => [
     defaultValue: [],
     fieldName: 'menuIds',
     label: '菜单权限',
+    formItemClass: 'col-span-2',
   },
   {
     component: 'Textarea',
     defaultValue: '',
     fieldName: 'remark',
-    formItemClass: 'items-baseline',
+    formItemClass: 'items-baseline col-span-2',
     label: '备注',
   },
 ];

apps/web-antd/src/views/system/role/role-drawer.vue

@@ -24,12 +24,12 @@ const [BasicForm, formApi] = useVbenForm({
     componentProps: {
       class: 'w-full',
     },
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
   },
   layout: 'vertical',
   schema: drawerSchema(),
   showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
+  wrapperClass: 'grid-cols-2 gap-x-4',
 });
 
 const menuTree = ref<any[]>([]);

apps/web-antd/src/views/system/tenant/data.tsx

@@ -101,7 +101,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider1',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '基本信息',
     }),
@@ -132,7 +132,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider2',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '管理员信息',
     }),
@@ -167,7 +167,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider3',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '租户设置',
     }),
@@ -175,7 +175,6 @@ export const drawerSchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     componentProps: {
-      class: 'w-full',
       getPopupContainer,
     },
     fieldName: 'packageId',
@@ -237,7 +236,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       orientation: 'center',
     },
     fieldName: 'divider4',
-    labelClass: 'w-0',
+    hideLabel: true,
     renderComponentContent: () => ({
       default: () => '企业信息',
     }),

apps/web-antd/src/views/system/tenant/tenant-drawer.vue

@@ -23,6 +23,9 @@ const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     formItemClass: 'col-span-2',
     labelWidth: 100,
+    componentProps: {
+      class: 'w-full',
+    },
   },
   schema: drawerSchema(),
   showDefaultActions: false,

apps/web-antd/src/views/system/user/dept-tree.vue

@@ -71,7 +71,7 @@ onMounted(loadTree);
         <div class="bg-background z-100 sticky left-0 top-0 p-[8px]">
           <InputSearch
             v-model:value="searchValue"
-            placeholder="Search"
+            :placeholder="$t('pages.common.search')"
             size="small"
           >
             <template #enterButton>