Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

apps/web-ele/src/views/system/user/data.ts

@@ -317,7 +317,7 @@ export function useGridColumns<T = SystemUserApi.User>(
     {
       field: 'operation',
       title: '操作',
-      minWidth: 250,
+      minWidth: 130,
       fixed: 'right',
       align: 'center',
       cellRender: {

apps/web-ele/src/views/system/user/index.vue

@@ -221,7 +221,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               @click="onCreate"
               v-access:code="['system:user:create']"
             >
-              <Plus class="size-5" />
+              <Plus class="mr-2 size-5" />
               {{ $t('ui.actionTitle.create', ['用户']) }}
             </ElButton>
             <ElButton
@@ -230,7 +230,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               @click="onExport"
               v-access:code="['system:user:export']"
             >
-              <Download class="size-5" />
+              <Download class="mr-2 size-5" />
               {{ $t('ui.actionTitle.export') }}
             </ElButton>
             <ElButton
@@ -239,7 +239,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               @click="onImport"
               v-access:code="['system:user:import']"
             >
-              <Upload class="size-5" />
+              <Upload class="mr-2 size-5" />
               {{ $t('ui.actionTitle.import', ['用户']) }}
             </ElButton>
           </template>

apps/web-ele/src/views/system/user/modules/reset-password-form.vue

@@ -57,6 +57,7 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.setValues(data);
   },
 });
+// TODO @puhui999：重置密码展示不对；
 </script>
 
 <template>