fix(@vben/web-ele): the main color tone for switching between dark and light themes has been reset (#6678)

packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue

@@ -104,7 +104,7 @@ function selectColor() {
 
 watch(
   () => [modelValue.value, props.isDark] as [BuiltinThemeType, boolean],
-  ([themeType, isDark]) => {
+  ([themeType, isDark], [_, isDarkPrev]) => {
     const theme = builtinThemePresets.value.find(
       (item) => item.type === themeType,
     );
@@ -113,7 +113,9 @@ watch(
         ? theme.darkPrimaryColor || theme.primaryColor
         : theme.primaryColor;
 
-      themeColorPrimary.value = primaryColor || theme.color;
+      if (!(theme.type === 'custom' && isDark !== isDarkPrev)) {
+        themeColorPrimary.value = primaryColor || theme.color;
+      }
     }
   },
 );

pnpm-lock.yaml

@@ -406,8 +406,8 @@ catalogs:
       specifier: ^16.21.0
       version: 16.21.0
     stylelint-config-recess-order:
-      specifier: ^7.2.0
-      version: 7.2.0
+      specifier: ^6.1.0
+      version: 6.1.0
     stylelint-config-recommended:
       specifier: ^16.0.0
       version: 16.0.0
@@ -1000,7 +1000,7 @@ importers:
         version: 3.1.3(stylelint@16.21.0(typescript@5.8.3))
       stylelint-config-recess-order:
         specifier: 'catalog:'
-        version: 7.2.0(stylelint-order@7.0.0(stylelint@16.21.0(typescript@5.8.3)))(stylelint@16.21.0(typescript@5.8.3))
+        version: 6.1.0(stylelint@16.21.0(typescript@5.8.3))
       stylelint-scss:
         specifier: 'catalog:'
         version: 6.12.1(stylelint@16.21.0(typescript@5.8.3))
@@ -9663,6 +9663,11 @@ packages:
     resolution: {integrity: sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==}
     engines: {node: '>=4'}
 
+  postcss-sorting@8.0.2:
+    resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
+    peerDependencies:
+      postcss: ^8.4.20
+
   postcss-sorting@9.1.0:
     resolution: {integrity: sha512-Mn8KJ45HNNG6JBpBizXcyf6LqY/qyqetGcou/nprDnFwBFBLGj0j/sNKV2lj2KMOVOwdXu14aEzqJv8CIV6e8g==}
     peerDependencies:
@@ -10558,11 +10563,10 @@ packages:
       postcss-html: ^1.0.0
       stylelint: '>=14.0.0'
 
-  stylelint-config-recess-order@7.2.0:
-    resolution: {integrity: sha512-3Y97dhsWkUHFKRLGNLF6LE5JuNB2EVAZKYJ41wBRK4gplYdk7eHhSIwE24hanu0AoNmv5534Djip70pE+y5qkA==}
+  stylelint-config-recess-order@6.1.0:
+    resolution: {integrity: sha512-0rGZgJQjUKqv1PXZnRJxr13f3hb3i2snx2nIL6luDWUf4nD3BAweB8noS7jdfBQ56HQG3RKSF0a+MAHfBGFxgw==}
     peerDependencies:
-      stylelint: '>=16.18'
-      stylelint-order: '>=7'
+      stylelint: '>=16'
 
   stylelint-config-recommended-scss@14.1.0:
     resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
@@ -10599,6 +10603,11 @@ packages:
     peerDependencies:
       stylelint: ^16.18.0
 
+  stylelint-order@6.0.4:
+    resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
+    peerDependencies:
+      stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
+
   stylelint-order@7.0.0:
     resolution: {integrity: sha512-rSWxx0KscYfxU02wEskKXES9lkRzuuONMMNkZ7SUc6uiF3tDKm7e+sE0Ax/SBlG4TUf1sp1R6f3/SlsPGmzthg==}
     engines: {node: '>=20.19.0'}
@@ -20373,6 +20382,10 @@ snapshots:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
+  postcss-sorting@8.0.2(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+
   postcss-sorting@9.1.0(postcss@8.5.6):
     dependencies:
       postcss: 8.5.6
@@ -21331,10 +21344,10 @@ snapshots:
       postcss-html: 1.8.0
       stylelint: 16.21.0(typescript@5.8.3)
 
-  stylelint-config-recess-order@7.2.0(stylelint-order@7.0.0(stylelint@16.21.0(typescript@5.8.3)))(stylelint@16.21.0(typescript@5.8.3)):
+  stylelint-config-recess-order@6.1.0(stylelint@16.21.0(typescript@5.8.3)):
     dependencies:
       stylelint: 16.21.0(typescript@5.8.3)
-      stylelint-order: 7.0.0(stylelint@16.21.0(typescript@5.8.3))
+      stylelint-order: 6.0.4(stylelint@16.21.0(typescript@5.8.3))
 
   stylelint-config-recommended-scss@14.1.0(postcss@8.5.6)(stylelint@16.21.0(typescript@5.8.3)):
     dependencies:
@@ -21366,6 +21379,12 @@ snapshots:
       stylelint: 16.21.0(typescript@5.8.3)
       stylelint-config-recommended: 16.0.0(stylelint@16.21.0(typescript@5.8.3))
 
+  stylelint-order@6.0.4(stylelint@16.21.0(typescript@5.8.3)):
+    dependencies:
+      postcss: 8.5.6
+      postcss-sorting: 8.0.2(postcss@8.5.6)
+      stylelint: 16.21.0(typescript@5.8.3)
+
   stylelint-order@7.0.0(stylelint@16.21.0(typescript@5.8.3)):
     dependencies:
       postcss: 8.5.6

pnpm-workspace.yaml

@@ -152,7 +152,7 @@ catalog:
   secure-ls: ^2.0.0
   sortablejs: ^1.15.6
   stylelint: ^16.21.0
-  stylelint-config-recess-order: ^7.2.0
+  stylelint-config-recess-order: ^6.1.0
   stylelint-config-recommended: ^16.0.0
   stylelint-config-recommended-scss: ^14.1.0
   stylelint-config-recommended-vue: ^1.6.1