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

2026-04-05 13:14:27 +08:00 · 2025-03-12 20:17:39 +08:00
parent 5553aac514
commit eeb9c569de
147 changed files with 7035 additions and 1565 deletions
--- a/smart-admin-web-javascript/src/views/system/account/components/center/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/center/index.vue
@@ -51,7 +51,7 @@
                list-type="picture-card"
                class="avatar-uploader"
                :show-upload-list="false"
-                :headers="{ 'x-access-token': useUserStore().getToken }"
+                :headers="{ Authorization: 'Bearer ' + useUserStore().getToken }"
                :customRequest="customRequest"
                :before-upload="beforeUpload"
              >
--- a/smart-admin-web-javascript/src/views/system/account/components/password/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/password/index.vue
@@ -4,13 +4,13 @@
    <div class="password-form-area">
      <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
        <a-form-item label="原密码" name="oldPassword">
-          <a-input-password class="form-item" v-model:value.trim="form.oldPassword" type="password" placeholder="请输入原密码" />
+          <a-input-password class="form-item" v-model:value.trim="form.oldPassword" type="password" placeholder="请输入原密码" autocomplete="off" />
        </a-form-item>
        <a-form-item label="新密码" name="newPassword" :help="tips">
-          <a-input-password class="form-item" v-model:value.trim="form.newPassword" type="password" placeholder="请输入新密码" />
+          <a-input-password class="form-item" v-model:value.trim="form.newPassword" type="password" placeholder="请输入新密码" autocomplete="off" />
        </a-form-item>
        <a-form-item label="确认密码" name="confirmPwd" :help="tips">
-          <a-input-password class="form-item" v-model:value.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" />
+          <a-input-password class="form-item" v-model:value.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" autocomplete="off" />
        </a-form-item>
      </a-form>
      <a-button type="primary" style="margin: 20px 0 0 250px" @click="onSubmit">修改密码</a-button>
--- a/smart-admin-web-javascript/src/views/system/account/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/index.vue
@@ -31,9 +31,13 @@
  });
  // 选中的菜单
  let selectedMenu = ref({ menuId: 0 });
-  let selectedKeys = computed(() => {
-    return _.isEmpty(selectedMenu.value) ? [] : [selectedMenu.value.menuId];
-  });
+  let selectedKeys = ref([]);
+  watch(
+    () => selectedMenu.value,
+    (newQuery, oldQuery) => {
+      selectedKeys.value = _.isEmpty(selectedMenu.value) ? [] : [selectedMenu.value.menuId];
+    }
+  );

  function selectMenu(menuId) {
    selectedMenu.value = menuList.value.find((e) => e.menuId === menuId);
--- a/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
+++ b/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>
--- a/smart-admin-web-javascript/src/views/system/position/position-form.vue
+++ b/smart-admin-web-javascript/src/views/system/position/position-form.vue
@@ -17,16 +17,16 @@
  >
    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 6 }">
      <a-form-item label="职务名称" name="positionName">
-        <a-input style="width: 100%" v-model:value="form.positionName" placeholder="职务名称"/>
+        <a-input style="width: 100%" v-model:value="form.positionName" placeholder="职务名称" />
      </a-form-item>
      <a-form-item label="职级" name="level">
-        <a-input style="width: 100%" v-model:value="form.level" placeholder="职级"/>
+        <a-input style="width: 100%" v-model:value="form.level" placeholder="职级" />
      </a-form-item>
      <a-form-item label="排序" name="sort">
-        <a-input-number :min="0" :step="1" :precision="0" style="width: 100%" v-model:value="form.sort" placeholder="排序"/>
+        <a-input-number :min="0" :step="1" :precision="0" style="width: 100%" v-model:value="form.sort" placeholder="排序" />
      </a-form-item>
      <a-form-item label="备注" name="remark">
-        <a-input style="width: 100%" v-model:value="form.remark" placeholder="备注"/>
+        <a-input style="width: 100%" v-model:value="form.remark" placeholder="备注" />
      </a-form-item>
    </a-form>

@@ -39,86 +39,100 @@
  </a-modal>
 </template>
 <script setup>
-import { reactive, ref, nextTick } from 'vue';
-import _ from 'lodash';
-import { message } from 'ant-design-vue';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import { positionApi } from '/@/api/system/position-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { reactive, ref, nextTick } from 'vue';
+  import _ from 'lodash';
+  import { message } from 'ant-design-vue';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { positionApi } from '/@/api/system/position-api';
+  import { smartSentry } from '/@/lib/smart-sentry';

-// ------------------------ 事件 ------------------------
+  // ------------------------ 事件 ------------------------

-const emits = defineEmits(['reloadList']);
+  const emits = defineEmits(['reloadList']);

-// ------------------------ 显示与隐藏 ------------------------
-// 是否显示
-const visibleFlag = ref(false);
+  // ------------------------ 显示与隐藏 ------------------------
+  // 是否显示
+  const visibleFlag = ref(false);

-function show (rowData) {
-  Object.assign(form, formDefault);
-  if (rowData && !_.isEmpty(rowData)) {
-    Object.assign(form, rowData);
-  }
-  visibleFlag.value = true;
-  nextTick(() => {
-    formRef.value.clearValidate();
-  });
-}
-
-function onClose () {
-  Object.assign(form, formDefault);
-  visibleFlag.value = false;
-}
-
-// ------------------------ 表单 ------------------------
-
-// 组件ref
-const formRef = ref();
-
-const formDefault = {
-  positionId: undefined,
-  positionName: undefined, //职务名称
-  level: undefined,//职纪
-  sort: 0,
-  remark: undefined, //备注
-};
-
-let form = reactive({ ...formDefault });
-
-const rules = {
-  positionName: [{ required: true, message: '请输入职务名称' }],
-};
-
-// 点击确定，验证表单
-async function onSubmit () {
-  try {
-    await formRef.value.validateFields();
-    save();
-  } catch (err) {
-    message.error('参数验证错误，请仔细填写表单数据!');
-  }
-}
-
-// 新建、编辑API
-async function save () {
-  SmartLoading.show();
-  try {
-    if (form.positionId) {
-      await positionApi.update(form);
-    } else {
-      await positionApi.add(form);
+  function show(rowData) {
+    Object.assign(form, formDefault);
+    if (rowData && !_.isEmpty(rowData)) {
+      Object.assign(form, rowData);
    }
-    message.success('操作成功');
-    emits('reloadList');
-    onClose();
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
-  }
-}
+    visibleFlag.value = true;
+    nextTick(() => {
+      formRef.value.clearValidate();

-defineExpose({
-  show,
-});
+      // 解决弹窗错误信息显示,没有可忽略
+      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 onClose() {
+    Object.assign(form, formDefault);
+    visibleFlag.value = false;
+  }
+
+  // ------------------------ 表单 ------------------------
+
+  // 组件ref
+  const formRef = ref();
+
+  const formDefault = {
+    positionId: undefined,
+    positionName: undefined, //职务名称
+    level: undefined, //职纪
+    sort: 0,
+    remark: undefined, //备注
+  };
+
+  let form = reactive({ ...formDefault });
+
+  const rules = {
+    positionName: [{ required: true, message: '请输入职务名称' }],
+  };
+
+  // 点击确定，验证表单
+  async function onSubmit() {
+    try {
+      await formRef.value.validateFields();
+      save();
+    } catch (err) {
+      message.error('参数验证错误，请仔细填写表单数据!');
+    }
+  }
+
+  // 新建、编辑API
+  async function save() {
+    SmartLoading.show();
+    try {
+      if (form.positionId) {
+        await positionApi.update(form);
+      } else {
+        await positionApi.add(form);
+      }
+      message.success('操作成功');
+      emits('reloadList');
+      onClose();
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  defineExpose({
+    show,
+  });
 </script>