v3.14.0 更新；【新增】EasyExcel重磅升级为FastExcel;【新增】使用最强Argon2算法作为密码存储;【新增】大家吐槽的数据字典改为可重复;【新增】前端布局再增加多种样式;【优化】升级SaToken到最新版本;【优化】token使用Sa-Token的Bearer类型；【优化】优化其他

smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue

@@ -28,13 +28,13 @@
   </a-modal>
 </template>
 <script setup>
-import message from 'ant-design-vue/lib/message';
-import { reactive, ref } from 'vue';
-import { departmentApi } from '/@/api/system/department-api';
-import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
-import EmployeeSelect from '/@/components/system/employee-select/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
-import { SmartLoading } from '/@/components/framework/smart-loading';
+  import message from 'ant-design-vue/lib/message';
+  import { nextTick, reactive, ref } from 'vue';
+  import { departmentApi } from '/@/api/system/department-api';
+  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+  import EmployeeSelect from '/@/components/system/employee-select/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
 
 // ----------------------- 对外暴漏 ---------------------
 
@@ -45,27 +45,42 @@ defineExpose({
 // ----------------------- modal 的显示与隐藏 ---------------------
 const emits = defineEmits(['refresh']);
 
-const visible = ref(false);
-function showModal(data) {
-  visible.value = true;
-  updateFormData(data);
-}
-function closeModal() {
-  visible.value = false;
-  resetFormData();
-}
+  const visible = ref(false);
+  function showModal(data) {
+    visible.value = true;
+    updateFormData(data);
+    nextTick(() => {
+      // 解决弹窗错误信息显示,没有可忽略
+      const domArr = document.getElementsByClassName('ant-modal');
+      if (domArr && domArr.length > 0) {
+        Array.from(domArr).forEach((item) => {
+          if (item.childNodes && item.childNodes.length > 0) {
+            Array.from(item.childNodes).forEach((child) => {
+              if (child.setAttribute) {
+                child.setAttribute('aria-hidden', 'false');
+              }
+            });
+          }
+        });
+      }
+    });
+  }
+  function closeModal() {
+    visible.value = false;
+    resetFormData();
+  }
 
-// ----------------------- form 表单操作 ---------------------
-const formRef = ref();
-const departmentTreeSelect = ref();
-const defaultDepartmentForm = {
-  id: undefined,
-  managerId: undefined, //部门负责人
-  name: undefined,
-  parentId: undefined,
-  sort: 0,
-};
-const employeeSelect = ref();
+  // ----------------------- form 表单操作 ---------------------
+  const formRef = ref();
+  const departmentTreeSelect = ref();
+  const defaultDepartmentForm = {
+    id: undefined,
+    managerId: undefined, //部门负责人
+    name: undefined,
+    parentId: undefined,
+    sort: 0,
+  };
+  const employeeSelect = ref();
 
 let formState = reactive({
   ...defaultDepartmentForm,
@@ -91,49 +106,49 @@ function resetFormData() {
   Object.assign(formState, defaultDepartmentForm);
 }
 
-async function handleOk() {
-  try {
-    await formRef.value.validate();
-    if (formState.departmentId) {
-      updateDepartment();
-    } else {
-      addDepartment();
+  async function handleOk() {
+    try {
+      await formRef.value.validate();
+      if (formState.departmentId) {
+        updateDepartment();
+      } else {
+        addDepartment();
+      }
+    } catch (error) {
+      message.error('参数验证错误，请仔细填写表单数据!');
     }
-  } catch (error) {
-    message.error('参数验证错误，请仔细填写表单数据!');
   }
-}
 
-// ----------------------- form 表单  ajax 操作 ---------------------
-//添加部门ajax请求
-async function addDepartment() {
-  SmartLoading.show();
-  try {
-    await departmentApi.addDepartment(formState);
-    emits('refresh');
-    closeModal();
-  } catch (error) {
-    smartSentry.captureError(error);
-  } finally {
-    SmartLoading.hide();
-  }
-}
-
-//更新部门ajax请求
-async function updateDepartment() {
-  SmartLoading.show();
-  try {
-    if (formState.parentId == formState.departmentId) {
-      message.warning('上级部门不能为自己');
-      return;
+  // ----------------------- form 表单  ajax 操作 ---------------------
+  //添加部门ajax请求
+  async function addDepartment() {
+    SmartLoading.show();
+    try {
+      await departmentApi.addDepartment(formState);
+      emits('refresh');
+      closeModal();
+    } catch (error) {
+      smartSentry.captureError(error);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  //更新部门ajax请求
+  async function updateDepartment() {
+    SmartLoading.show();
+    try {
+      if (formState.parentId == formState.departmentId) {
+        message.warning('上级菜单不能为自己');
+        return;
+      }
+      await departmentApi.updateDepartment(formState);
+      emits('refresh');
+      closeModal();
+    } catch (error) {
+      smartSentry.captureError(error);
+    } finally {
+      SmartLoading.hide();
     }
-    await departmentApi.updateDepartment(formState);
-    emits('refresh');
-    closeModal();
-  } catch (error) {
-    smartSentry.captureError(error);
-  } finally {
-    SmartLoading.hide();
   }
-}
 </script>