Merge pull request #84 from Jon-Millent/master

修改因为dayjs 版本导致的日期选择报错、本地化显示问题
Merge pull request #86 from BeeThor/patch-1
2025-09-02 02:44:58 +00:00 · 2025-08-24 20:38:37 +08:00 · 2025-08-24 20:37:52 +08:00 · 2025-08-24 20:32:54 +08:00 · 2025-08-23 00:45:19 +08:00 · 2025-08-19 19:54:13 +08:00
3 changed files with 28 additions and 6 deletions
--- a/smart-admin-web-javascript/src/store/modules/system/spin.js
+++ b/smart-admin-web-javascript/src/store/modules/system/spin.js
@@ -18,13 +18,27 @@ export const useSpinStore = defineStore({
  actions: {
    hide() {
      this.loading = false;
-      let spins = document.querySelector('.ant-spin-nested-loading');
-      spins.style.zIndex = 999;
+      // 安全的DOM操作，避免null引用错误
+      try {
+        const spins = document.querySelector('.ant-spin-nested-loading');
+        if (spins) {
+          spins.style.zIndex = '999';
+        }
+      } catch (error) {
+        console.warn('Spin hide操作失败:', error);
+      }
    },
    show() {
      this.loading = true;
-      let spins = document.querySelector('.ant-spin-nested-loading');
-      spins.style.zIndex = 1001;
+      // 安全的DOM操作，避免null引用错误
+      try {
+        const spins = document.querySelector('.ant-spin-nested-loading');
+        if (spins) {
+          spins.style.zIndex = '1001';
+        }
+      } catch (error) {
+        console.warn('Spin show操作失败:', error);
+      }
    },
  },
 });
--- 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
@@ -233,13 +233,21 @@
  });
 </script>
 <style lang="less" scoped>
-  .center-container {
+.center-container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    
    .header-title {
      font-size: 20px;
+      flex-shrink: 0;
    }

    .center-form-area {
      margin-top: 20px;
+      flex: 1;
+      overflow-y: auto;
+      min-height: 0;

      .avatar-container {
        position: relative;
--- a/smart-admin-web-typescript/package.json
+++ b/smart-admin-web-typescript/package.json
@@ -24,7 +24,7 @@
    "axios": "1.6.8",
    "clipboard": "2.0.11",
    "crypto-js": "4.1.1",
-    "dayjs": "1.10.5",
+    "dayjs": "1.11.13",
    "decimal.js": "10.3.1",
    "default-passive-events": "^2.0.0",
    "diff": "5.2.0",
Author	SHA1	Message	Date
1024创新实验室	ad65db0198	Merge pull request #84 from Jon-Millent/master 修改因为dayjs 版本导致的日期选择报错、本地化显示问题	2025-08-24 20:38:37 +08:00
1024创新实验室	57454d095f	Merge pull request #86 from BeeThor/patch-1 修复前端个人中心表单超出背景的问题	2025-08-24 20:37:52 +08:00
1024创新实验室	4e9c4828a8	Merge pull request #87 from BeeThor/master Update spin.js	2025-08-24 20:32:54 +08:00
SuperHahaStar	76a24e2381	Update spin.js 修复菜单切换卡死问题;	2025-08-23 00:45:19 +08:00
SuperHahaStar	4cc930bc6d	修复前端个人中心表单超出背景的问题修复方案：在 /views/system/account/components/center/index.vue 中：设置容器高度为100%并使用flex布局标题区域使用 flex-shrink: 0 防止压缩表单区域使用 flex: 1 占据剩余空间添加 overflow-y: auto 支持垂直滚动设置 min-height: 0 确保正确的高度计算	2025-08-19 19:54:13 +08:00
吃鱼的帆	7cb03092d6	修改因为dayjs 版本导致的日期选择报错、本地化显示问题	2025-07-31 11:22:07 +08:00