Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

src/components/custom/post-select.vue

@@ -21,27 +21,27 @@ const attrs: SelectProps = useAttrs();
 
 const { loading: postLoading, startLoading: startPostLoading, endLoading: endPostLoading } = useLoading();
 
-/** the enabled role options */
+/** the enabled post options */
-const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
+const postOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
 
 watch(
   () => props.deptId,
   () => {
     if (!props.deptId) {
-      roleOptions.value = [];
+      postOptions.value = [];
       return;
     }
-    getRoleOptions();
+    getPostOptions();
   },
   { immediate: true }
 );
 
-async function getRoleOptions() {
+async function getPostOptions() {
   startPostLoading();
   const { error, data } = await fetchGetPostSelect(props.deptId!);
 
   if (!error) {
-    roleOptions.value = data.map(item => ({
+    postOptions.value = data.map(item => ({
       label: item.postName,
       value: item.postId
     }));
@@ -54,7 +54,7 @@ async function getRoleOptions() {
   <NSelect
     v-model:value="value"
     :loading="postLoading"
-    :options="roleOptions"
+    :options="postOptions"
     v-bind="attrs"
     placeholder="请选择岗位"
   />

src/service/request/index.ts

@@ -77,7 +77,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // when the backend response code is in `modalLogoutCodes`, it means the user will be logged out by displaying a modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
       if (modalLogoutCodes.includes(responseCode) && isLogin) {
-        const isExist = request.state.errMsgStack && request.state.errMsgStack.includes(response.data.msg);
+        const isExist = request.state.errMsgStack?.includes(response.data.msg);
         if (isExist) {
           return null;
         }
@@ -85,23 +85,24 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
           logoutAndCleanup();
           return null;
         }
+
         request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.msg];
-        // prevent the user from refreshing the page
-        window.addEventListener('beforeunload', handleLogout);
 
         window.$dialog?.warning({
           title: '系统提示',
-          content: '登录状态已过期，您可以继续留在该页面，或者重新登录',
+          content: '登录状态已过期，请重新登录',
           positiveText: '重新登录',
-          negativeText: '取消',
           maskClosable: false,
           closeOnEsc: false,
+          onAfterEnter() {
+            // prevent the user from refreshing the page
+            window.addEventListener('beforeunload', handleLogout);
+          },
           onPositiveClick() {
             logoutAndCleanup();
           },
           onClose() {
-            window.removeEventListener('beforeunload', handleLogout);
+            logoutAndCleanup();
-            request.state.errMsgStack = request.state.errMsgStack.filter(msg => msg !== response.data.msg);
           }
         });
         request.cancelAllRequest();

src/typings/api/system.api.d.ts

@@ -164,6 +164,8 @@ declare namespace Api {
       postIds: string[];
       /** user role ids */
       roleIds: string[];
+      /** roles */
+      roles: Role[];
     };
 
     /** user list */

src/views/system/config/modules/config-search.vue

@@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
+  const params = model.value.params!;
-    model.value.params!.beginTime = value[0];
+  if (value && value.length === 2) {
-    model.value.params!.endTime = value[1];
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/oss/modules/oss-search.vue

@@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
+  const params = model.value.params!;
-    model.value.params!.beginCreateTime = value[0];
+  if (value && value.length === 2) {
-    model.value.params!.endCreateTime = value[1];
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

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

@@ -168,9 +168,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
+  const params = searchParams.params!;
-    searchParams.params!.beginTime = value[0];
+  if (value && value.length === 2) {
-    searchParams.params!.endTime = value[1];
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/role/modules/role-search.vue

@@ -24,9 +24,12 @@ const model = defineModel<Api.System.RoleSearchParams>('model', { required: true
 const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
+  const params = model.value.params!;
-    model.value.params!.beginTime = `${value[0]} 00:00:00`;
+  if (value && value.length === 2) {
-    model.value.params!.endTime = `${value[1]} 23:59:59`;
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/user/modules/user-import-modal.vue

@@ -48,6 +48,7 @@ function closeDrawer() {
 }
 
 async function handleSubmit() {
+  console.log(data.value);
   fileList.value.forEach(item => {
     item.status = 'pending';
   });
@@ -91,6 +92,7 @@ function handleDownloadTemplate() {
 
 watch(visible, () => {
   if (visible.value) {
+    data.value.updateSupport = false;
     fileList.value = [];
     success.value = false;
     message.value = '';
@@ -140,7 +142,7 @@ watch(visible, () => {
       </NUploadDragger>
     </NUpload>
     <div class="flex-center">
-      <NCheckbox v-model="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
+      <NCheckbox v-model:checked="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
     </div>
 
     <NAlert v-if="message" :title="$t('common.importResult')" :type="success ? 'success' : 'error'" :bordered="false">

src/views/system/user/modules/user-operate-drawer.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, reactive, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { useLoading } from '@sa/hooks';
 import { fetchCreateUser, fetchGetUserInfo, fetchUpdateUser } from '@/service/api/system';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
@@ -49,6 +49,8 @@ type Model = Api.System.UserOperateParams;
 
 const model: Model = reactive(createDefaultModel());
 
+const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
+
 function createDefaultModel(): Model {
   return {
     deptId: null,
@@ -82,6 +84,10 @@ async function getUserInfo() {
   if (!error) {
     model.roleIds = data.roleIds;
     model.postIds = data.postIds;
+    roleOptions.value = data.roles.map(role => ({
+      label: role.roleName,
+      value: role.roleId
+    }));
   }
   endLoading();
 }
@@ -209,7 +215,14 @@ watch(visible, () => {
             <PostSelect v-model:value="model.postIds" :dept-id="model.deptId" multiple clearable />
           </NFormItem>
           <NFormItem :label="$t('page.system.user.roleIds')" path="roleIds">
-            <RoleSelect v-model:value="model.roleIds" multiple clearable />
+            <NSelect
+              v-model:value="model.roleIds"
+              :loading="loading"
+              :options="roleOptions"
+              multiple
+              clearable
+              placeholder="请选择角色"
+            />
           </NFormItem>
           <NFormItem :label="$t('page.system.user.status')" path="status">
             <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />

src/views/system/user/modules/user-search.vue

@@ -24,9 +24,12 @@ const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
 const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
+  const params = model.value.params!;
-    model.value.params!.beginTime = value[0];
+  if (value && value.length === 2) {
-    model.value.params!.endTime = value[1];
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }