ele-admin-plus 1.0.2 → 1.1.0

package/lib/index.js

@@ -19,49 +19,49 @@ Object.defineProperty(exports, "default", {
   get: () => installer.installer
 });
 Object.keys(components).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => components[k]
     });
 });
 Object.keys(chartThemeDark).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => chartThemeDark[k]
     });
 });
 Object.keys(chartTheme).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => chartTheme[k]
     });
 });
 Object.keys(core).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => core[k]
     });
 });
 Object.keys(menuUtil).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => menuUtil[k]
     });
 });
 Object.keys(message).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => message[k]
     });
 });
 Object.keys(validate).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: () => validate[k]

package/lib/style/index.scss

@@ -5,10 +5,12 @@
 @use '../ele-bottom-bar/style/index.scss' as bottomBar;
 @use '../ele-breadcrumb/style/index.scss' as breadcrumb;
 @use '../ele-card/style/index.scss' as card;
+@use '../ele-check-card/style/index.scss' as checkCard;
 @use '../ele-cropper/style/index.scss' as cropper;
 @use '../ele-dashboard/style/index.scss' as dashboard;
 @use '../ele-dot/style/index.scss' as dot;
 @use '../ele-drawer/style/index.scss' as drawer;
+@use '../ele-dropdown/style/index.scss' as dropdown;
 @use '../ele-edit-tag/style/index.scss' as editTag;
 @use '../ele-ellipsis/style/index.scss' as ellipsis;
 @use '../ele-file-list/style/index.scss' as fileList;
@@ -18,6 +20,8 @@
 @use '../ele-modal/style/index.scss' as modal;
 @use '../ele-page/style/index.scss' as page;
 @use '../ele-pagination/style/index.scss' as pagination;
+@use '../ele-popconfirm/style/index.scss' as popconfirm;
+@use '../ele-popover/style/index.scss' as popover;
 @use '../ele-printer/style/index.scss' as printer;
 @use '../ele-pro-layout/style/index.scss' as proLayout;
 @use '../ele-pro-table/style/index.scss' as proTable;
@@ -30,5 +34,6 @@
 @use '../ele-text/style/index.scss' as text;
 @use '../ele-tool/style/index.scss' as tool;
 @use '../ele-toolbar/style/index.scss' as toolbar;
+@use '../ele-tooltip/style/index.scss' as tooltip;
 @use '../ele-tour/style/index.scss' as tour;
 @use '../ele-upload-list/style/index.scss' as uploadList;

package/lib/style/themes/dark-css-var.scss

@@ -1,42 +1,6 @@
 /** 暗黑主题 css 变量 */
 @use './dark.scss' as *;
-@use '../../ele-alert/style/css-var.scss' as *;
-@use '../../ele-app/style/css-var.scss' as *;
-@use '../../ele-bottom-bar/style/css-var.scss' as *;
-@use '../../ele-card/style/css-var.scss' as *;
-@use '../../ele-drawer/style/css-var.scss' as *;
-@use '../../ele-file-list/style/css-var.scss' as *;
-@use '../../ele-menus/style/css-var.scss' as *;
-@use '../../ele-modal/style/css-var.scss' as *;
-@use '../../ele-page/style/css-var.scss' as *;
-@use '../../ele-pro-layout/style/css-var.scss' as *;
-@use '../../ele-pro-table/style/css-var.scss' as *;
-@use '../../ele-segmented/style/css-var.scss' as *;
-@use '../../ele-table/style/css-var.scss' as *;
-@use '../../ele-tabs/style/css-var.scss' as *;
-@use '../../ele-text/style/css-var.scss' as *;
-@use '../../ele-tool/style/css-var.scss' as *;
-@use '../../ele-toolbar/style/css-var.scss' as *;
+@use './theme-util.scss' as *;
 $dark-selector: 'html.dark' !default;
 
-#{$dark-selector} {
-  @include set-alert-var($eleDark);
-  @include set-common-var($eleDark);
-  @include set-message-var($eleDark);
-  @include set-scrollbar-var($eleDark);
-  @include set-bottom-bar-var($eleDark);
-  @include set-card-var($eleDark);
-  @include set-drawer-var($eleDark);
-  @include set-file-list-var($eleDark);
-  @include set-menus-var($eleDark);
-  @include set-modal-var($eleDark);
-  @include set-page-var($eleDark);
-  @include set-layout-var($eleDark);
-  @include set-pro-table-var($eleDark);
-  @include set-segmented-var($eleDark);
-  @include set-table-var($eleDark);
-  @include set-tab-var($eleDark);
-  @include set-text-var($eleDark);
-  @include set-tool-var($eleDark);
-  @include set-toolbar-var($eleDark);
-}
+@include set-theme-var($dark-selector, $ele-dark);

package/lib/style/themes/dark.scss

@@ -1,61 +1,74 @@
 /** 暗黑主题 */
-$eleDark: (
-  'scrollbar': (
-    'color': #484848,
-    'hover-color': #5b5b5b
-  ),
-  'header': (
-    'shadow': 0 1px 4px rgba(0, 0, 0, 0.6)
-  ),
-  'header-dark': (
-    'bg': #1f1f1f,
-    'shadow': 0 1px 4px rgba(0, 0, 0, 0.6)
-  ),
-  'logo': (
-    'shadow': 0 3px 4px rgba(0, 0, 0, 0.6),
-    'dark-shadow': 0 3px 4px rgba(0, 0, 0, 0.6)
-  ),
-  'sidebar': (
-    'dark-bg': #1f1f1f,
-    'shadow': 0 4px 4px rgba(0, 0, 0, 0.6),
-    'dark-shadow': 0 4px 4px rgba(0, 0, 0, 0.6),
-    'tool-hover-bg': rgba(255, 255, 255, 0.05),
-    'dark-tool-hover-bg': rgba(255, 255, 255, 0.05)
-  ),
-  'menu': (
-    'child-bg': rgba(255, 255, 255, 0.04)
-  ),
-  'menu-popup': (
-    'shadow': (
-      0 3px 6px -4px rgba(0, 0, 0, 0.48),
-      0 6px 16px 0 rgba(0, 0, 0, 0.32),
-      0 9px 28px 8px rgba(0, 0, 0, 0.2)
-    ),
-    'dark-shadow': (
-      0 3px 6px -4px rgba(0, 0, 0, 0.48),
-      0 6px 16px 0 rgba(0, 0, 0, 0.32),
-      0 9px 28px 8px rgba(0, 0, 0, 0.2)
+@use 'sass:map';
+@use '../util.scss' as *;
+
+$ele-dark: () !default;
+$ele-dark: map.deep-merge(
+  (
+    'scrollbar': (
+      'color': #484848,
+      'hover-color': #5b5b5b
+    ),
+    'header': (
+      'shadow': 0 1px 4px rgba(0, 0, 0, 0.6),
+      'tool-hover-bg': rgba(255, 255, 255, 0.05),
+      'dark-tool-hover-bg': rgba(255, 255, 255, 0.05)
+    ),
+    'header-dark': (
+      'bg': #1f1f1f,
+      'shadow': 0 1px 4px rgba(0, 0, 0, 0.6)
+    ),
+    'logo': (
+      'shadow': 0 3px 4px rgba(0, 0, 0, 0.6),
+      'dark-shadow': 0 3px 4px rgba(0, 0, 0, 0.6)
+    ),
+    'sidebar': (
+      'dark-bg': #1f1f1f,
+      'shadow': 0 4px 4px rgba(0, 0, 0, 0.6),
+      'dark-shadow': 0 4px 4px rgba(0, 0, 0, 0.6)
+    ),
+    'menu-thumb': (
+      'color': #484848,
+      'hover-color': #5b5b5b
+    ),
+    'menu-dark-thumb': (
+      'color': #626262,
+      'hover-color': #5b5b5b
+    ),
+    'menu': (
+      'child-bg': rgba(255, 255, 255, 0.04)
+    ),
+    'menu-dark': (
+      'bg': #1f1f1f,
+      'child-bg': #141414
+    ),
+    'menu-colorful': (
+      'dot-color': rgba(255, 255, 255, 0.4)
+    ),
+    'segmented': (
+      'bg': elVar('bg-color', 'page'),
+      'hover-bg': rgba(255, 255, 255, 0.05)
+    ),
+    'tab-simple': (
+      'hover': rgba(255, 255, 255, 0.05)
+    ),
+    'tab-indicator': (
+      'color': #434343
+    ),
+    'table': (
+      'filter-hover-bg': rgba(255, 255, 255, 0.12)
+    ),
+    'tool': (
+      'hover-bg': rgba(255, 255, 255, 0.05)
+    ),
+    'popper': (
+      'arrow-shadow': 0 0 8px 0 rgba(0, 0, 0, 0.28)
+    ),
+    'tooltip': (
+      'bg': '#383838',
+      'shadow': 0 0 8px 0 rgba(0, 0, 0, 0.28),
+      'arrow-shadow': 0 0 8px 0 rgba(0, 0, 0, 0.28)
     )
   ),
-  'menu-dark': (
-    'bg': #1f1f1f,
-    'child-bg': #141414
-  ),
-  'menu-scrollbar': (
-    'color': #484848,
-    'hover-color': #5b5b5b
-  ),
-  'menu-dark-scrollbar': (
-    'color': #626262,
-    'hover-color': #5b5b5b
-  ),
-  'tab-indicator': (
-    'color': #434343
-  ),
-  'tooltip': (
-    'bg': '#424242'
-  ),
-  'image-viewer': (
-    'tool-bg': '#505255'
-  )
-) !default;
+  $ele-dark
+);