Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/system/quick-start/components/NeInfoSoftwareInstall.vue

@@ -284,7 +284,7 @@ onMounted(() => {
           "
         >
           <template #icon><UploadOutlined /></template>
-          {{ t('views.ne.neSoftware.uploadBatch') }}
+          {{ t('views.ne.neSoftware.upload') }}
           {{ state.selectedRowOne.neType }}
         </a-button>
 

src/views/system/quick-start/components/NeInfoSoftwareLicense.vue

@@ -296,7 +296,7 @@ onMounted(() => {
           @click.prevent="fnModalOpen"
         >
           <template #icon><UploadOutlined /></template>
-          {{ t('views.ne.neLicense.uploadBatch') }}
+          {{ t('views.ne.neLicense.uploadFile') }}
         </a-button>
 
         <a-button

src/views/system/role/auth-user.vue

@@ -184,7 +184,7 @@ type ModalStateType = {
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   visibleBySelectUser: false,
-  title: t('views.system.role.selectUser'),
+  title: t('views.system.role.distributeUser'),
 });
 
 /**

src/views/system/role/components/auth-user-select.vue

@@ -237,7 +237,6 @@ watch(
 <template>
   <ProModal
     :drag="true"
-    :width="800"
     :destroyOnClose="true"
     :forceFullscreen="true"
     :title="props.title"
@@ -302,7 +301,7 @@ watch(
       :loading="tableState.loading"
       :data-source="tableState.data"
       :size="tableState.size"
-      :scroll="{ scrollToFirstRowOnChange: true, y: 400, x: 600 }"
+      :scroll="{ scrollToFirstRowOnChange: true }"
       :pagination="tablePagination"
       :row-selection="{
         type: 'checkbox',