@done-coding/admin-core 0.27.0 → 0.27.1-alpha.0

package/es/components/table/TableMain.vue2.mjs

@@ -1,9 +1,10 @@
-import { defineComponent, useCssVars, unref, useModel, useAttrs, ref, computed, markRaw, shallowRef, watch, onMounted, onActivated, openBlock, createElementBlock, normalizeClass, createBlock, withCtx, createVNode, mergeProps, createCommentVNode, resolveDynamicComponent, Fragment, renderList, createSlots, renderSlot, createTextVNode, toDisplayString, normalizeProps, guardReactiveProps, withDirectives, createElementVNode, vShow, mergeModels } from "vue";
+import { defineComponent, useCssVars, unref, useModel, useAttrs, ref, computed, markRaw, shallowRef, watch, onMounted, onActivated, openBlock, createElementBlock, normalizeClass, createBlock, withCtx, createVNode, mergeProps, createCommentVNode, resolveDynamicComponent, Fragment, renderList, createSlots, renderSlot, createTextVNode, toDisplayString, normalizeProps, guardReactiveProps, withDirectives, vShow, mergeModels } from "vue";
 import { useActiveRecord, activeRecordValueOf } from "../../hooks/use-active-record.mjs";
 import _cloneDeep from "lodash/cloneDeep";
 import _omit from "lodash/omit";
 import _set from "lodash/set";
 import _get from "lodash/get";
+import { useSurface } from "../../hooks/use-surface.mjs";
 import TableToolbar from "./TableToolbar.vue.mjs";
 import TableSkeleton from "./TableSkeleton.vue.mjs";
 import { useTableSkeleton } from "./use-table-skeleton.mjs";
@@ -15,10 +16,11 @@ import _sfc_main$2 from "./TableEmpty.vue.mjs";
 import { pickExportColumns } from "../../utils/export.mjs";
 import { useChannelViewportHeight } from "../../hooks/use-channel-viewport-height.mjs";
 import { APP_API_LIST_MODEL_KEY_CONFIG } from "../../config/list-model.mjs";
-const _hoisted_1 = { class: "dc-table-main__pagination table-main-pagination" };
+const PAGER_MARGIN_TOP = 10;
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "TableMain",
   props: /* @__PURE__ */ mergeModels({
+    surface: { type: Boolean, default: void 0 },
     showPager: { type: Boolean, default: true },
     initialSearch: { type: Boolean, default: true },
     showSwitchView: { type: Boolean },
@@ -59,12 +61,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: /* @__PURE__ */ mergeModels(["pageChange", "pageSizeChange", "dataChange", "loadingChange", "pageInfoChange"], ["update:activeId", "update:activeData", "update:isAutoRefresh", "update:refreshInterval", "update:customView"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "v4d2ea4ab": unref(fillMinHeightCss)
+      "v02eff1c8": unref(surfacePadCss),
+      "v75a7164e": unref(fillMinHeightCss)
     }));
     const props = __props;
     const emits = __emit;
     const activeId = useModel(__props, "activeId");
     const activeData = useModel(__props, "activeData");
+    const { surfaceActive, surfacePad, surfacePadCss } = useSurface(() => props);
     const isAutoRefresh = useModel(__props, "isAutoRefresh");
     const refreshInterval = useModel(__props, "refreshInterval");
     const customView = useModel(__props, "customView");
@@ -99,29 +103,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => props.columns.some((c) => c.type === "selection")
     );
     const { viewportHeightFinal } = useChannelViewportHeight(props);
+    const pagerHeight = ref(0);
+    const onPagerHeightChange = (height) => {
+      pagerHeight.value = height;
+    };
     const pagerHeightAdjust = computed(() => {
-      if (props.showPager) {
-        return 35;
-      } else {
-        return 0;
-      }
+      if (!props.showPager) return 0;
+      return (pagerHeight.value || 24) + PAGER_MARGIN_TOP;
     });
     const toolbarHeightAdjust = computed(
       () => props.showToolbar ? toolbarHeight.value : 0
     );
     const rawAvailableHeight = computed(() => {
       const { maxHeight, refine } = props;
+      const pad = surfacePad.value * 2;
       if (maxHeight) {
-        return maxHeight - pagerHeightAdjust.value - toolbarHeightAdjust.value;
+        return maxHeight - pad - pagerHeightAdjust.value - toolbarHeightAdjust.value;
       }
       if (refine) {
-        return viewportHeightFinal.value - pagerHeightAdjust.value - toolbarHeightAdjust.value - props.refineReduceHeight;
+        return viewportHeightFinal.value - pad - pagerHeightAdjust.value - toolbarHeightAdjust.value - props.refineReduceHeight;
       }
       return void 0;
     });
+    const hasHeightSource = computed(
+      () => props.maxHeight !== void 0 || viewportHeightFinal.value > 0
+    );
     const tableMaxHeight = computed(() => {
       const raw = rawAvailableHeight.value;
       if (raw === void 0) return void 0;
+      if (hasHeightSource.value) return Math.max(raw, 0);
       return Math.max(raw, props.dataViewMaxHeightMinValue);
     });
     const { fillActive, fillMinHeight, fillMinHeightCss } = useFillHeight({
@@ -359,7 +369,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(["dc-table-main table-main", { "table-main_fill": unref(fillActive) }])
+        class: normalizeClass(["dc-table-main table-main", {
+          "table-main_fill": unref(fillActive),
+          "table-main_surface": unref(surfaceActive)
+        }])
       }, [
         __props.showToolbar ? (openBlock(), createBlock(unref(_sfc_main$1), {
           key: 0,
@@ -454,20 +467,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 16, ["maxHeight", "data", "rowKey"])),
-        withDirectives(createElementVNode("div", _hoisted_1, [
-          createVNode(unref(ElPagination), {
-            "current-page": currentPage.value,
-            "onUpdate:currentPage": _cache[3] || (_cache[3] = ($event) => currentPage.value = $event),
-            "page-size": pageSize.value,
-            "onUpdate:pageSize": _cache[4] || (_cache[4] = ($event) => pageSize.value = $event),
-            "page-sizes": __props.pageSizeOptions,
-            size: "small",
-            background: __props.paginationBackground,
-            layout: __props.pageLayout,
-            total: total.value,
-            onSizeChange
-          }, null, 8, ["current-page", "page-size", "page-sizes", "background", "layout", "total"])
-        ], 512), [
+        withDirectives(createVNode(unref(_sfc_main$1), {
+          mode: "height",
+          class: "dc-table-main__pagination table-main-pagination",
+          onHeightChange: onPagerHeightChange
+        }, {
+          default: withCtx(() => [
+            createVNode(unref(ElPagination), {
+              "current-page": currentPage.value,
+              "onUpdate:currentPage": _cache[3] || (_cache[3] = ($event) => currentPage.value = $event),
+              "page-size": pageSize.value,
+              "onUpdate:pageSize": _cache[4] || (_cache[4] = ($event) => pageSize.value = $event),
+              "page-sizes": __props.pageSizeOptions,
+              size: "small",
+              background: __props.paginationBackground,
+              layout: __props.pageLayout,
+              total: total.value,
+              onSizeChange
+            }, null, 8, ["current-page", "page-size", "page-sizes", "background", "layout", "total"])
+          ]),
+          _: 1
+        }, 512), [
           [vShow, __props.showPager]
         ])
       ], 2);

package/es/components/view-layout/ViewLayout.vue.mjs

@@ -1,7 +1,7 @@
 import _sfc_main from "./ViewLayout.vue2.mjs";
 /* empty css                 */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.mjs";
-const ViewLayout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8eb550ba"]]);
+const ViewLayout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0507f728"]]);
 export {
   ViewLayout as default
 };

package/es/components/view-layout/ViewLayout.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, shallowRef, ref, useModel, computed, inject, watch, provide, withDirectives, openBlock, createElementBlock, unref, createBlock, withCtx, createElementVNode, normalizeStyle, renderSlot, createVNode, createCommentVNode, vShow, Fragment, mergeModels } from "vue";
+import { defineComponent, shallowRef, ref, useModel, computed, inject, watch, provide, useSlots, withDirectives, openBlock, createElementBlock, unref, createBlock, withCtx, createElementVNode, normalizeStyle, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createVNode, vShow, Fragment, mergeModels } from "vue";
 import { vLoading } from "element-plus";
 import AutoRefreshGroup from "../misc/AutoRefreshGroup.vue.mjs";
 import _sfc_main$1 from "../display/HeightProvider.vue.mjs";
@@ -12,11 +12,19 @@ import { SlotRegion } from "../../config/slot-region.mjs";
 const _hoisted_1 = { class: "dc-view-layout view-layout" };
 const _hoisted_2 = { class: "view-layout-toolbar" };
 const _hoisted_3 = { class: "view-layout-toolbar__left" };
-const _hoisted_4 = { class: "view-layout-toolbar__right" };
-const _hoisted_5 = { class: "view-layout-toolbar" };
-const _hoisted_6 = { class: "view-layout-toolbar__left" };
-const _hoisted_7 = { class: "view-layout-toolbar__right" };
-const _hoisted_8 = { class: "view-layout-content" };
+const _hoisted_4 = {
+  key: 0,
+  class: "dc-view-layout__header view-layout-header"
+};
+const _hoisted_5 = { class: "view-layout-toolbar__right" };
+const _hoisted_6 = { class: "view-layout-toolbar" };
+const _hoisted_7 = { class: "view-layout-toolbar__left" };
+const _hoisted_8 = {
+  key: 0,
+  class: "dc-view-layout__header view-layout-header"
+};
+const _hoisted_9 = { class: "view-layout-toolbar__right" };
+const _hoisted_10 = { class: "view-layout-content" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "ViewLayout",
   props: /* @__PURE__ */ mergeModels({
@@ -30,6 +38,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     minHeight: { default: 100 },
     showAutoRefresh: { type: Boolean, default: true },
     showRefresh: { type: Boolean, default: true },
+    title: {},
     showNavigation: { type: Boolean, default: true },
     leftExtraButtons: { default: () => [] },
     rightExtraButtons: { default: () => [] }
@@ -49,11 +58,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { viewportHeightFinal, nearestScope } = useChannelViewportHeight(props);
     const data = shallowRef(void 0);
     const loading = ref(false);
+    const fetchSeq = ref(0);
     const isAutoRefresh = useModel(__props, "isAutoRefresh");
     const fetch = async () => {
       loading.value = true;
       try {
         data.value = await props.api(props.params);
+        fetchSeq.value += 1;
       } finally {
         loading.value = false;
       }
@@ -76,6 +87,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       goNext: listDetailCtx == null ? void 0 : listDetailCtx.goNext,
       refreshList: listDetailCtx == null ? void 0 : listDetailCtx.refreshList
     }));
+    const hasHeader = computed(() => !!slots.header || !!props.title);
     const hasToolbarContent = computed(
       () => {
         var _a, _b;
@@ -112,6 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => props.channel,
       () => console.error("[ViewLayout] channel 不支持响应式变更,当前值已忽略。")
     );
+    const slots = useSlots();
     return (_ctx, _cache) => {
       return withDirectives((openBlock(), createElementBlock("div", _hoisted_1, [
         unref(ctxRefine) ? (openBlock(), createBlock(unref(_sfc_main$1), {
@@ -123,13 +136,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           header: withCtx(() => [
             withDirectives(createElementVNode("div", _hoisted_2, [
               createElementVNode("div", _hoisted_3, [
+                hasHeader.value ? (openBlock(), createElementBlock("div", _hoisted_4, [
+                  renderSlot(_ctx.$slots, "header", {
+                    data: data.value,
+                    loading: loading.value
+                  }, () => [
+                    createTextVNode(toDisplayString(__props.title), 1)
+                  ], true)
+                ])) : createCommentVNode("", true),
                 createVNode(unref(_sfc_main$2), {
                   configs: __props.leftExtraButtons,
                   ctx: toolbarCtx.value,
                   "default-size": "small"
                 }, null, 8, ["configs", "ctx"])
               ]),
-              createElementVNode("div", _hoisted_4, [
+              createElementVNode("div", _hoisted_5, [
                 showNavigationFinal.value ? (openBlock(), createBlock(ViewLayoutNavigation, {
                   key: 0,
                   ctx: unref(listDetailCtx)
@@ -149,7 +170,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["isAutoRefresh", "loading", "showAutoRefresh", "showRefresh"])
               ])
             ], 512), [
-              [vShow, hasToolbarContent.value]
+              [vShow, hasToolbarContent.value || hasHeader.value]
             ])
           ]),
           default: withCtx(({ viewportHeight }) => [
@@ -161,21 +182,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 data: data.value,
                 loading: loading.value,
                 refresh: unref(refresh),
-                viewportHeight
+                viewportHeight,
+                fetchSeq: fetchSeq.value
               }, void 0, true)
             ], 4)
           ]),
           _: 3
         }, 8, ["viewportHeight", "minHeight"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-          withDirectives(createElementVNode("div", _hoisted_5, [
-            createElementVNode("div", _hoisted_6, [
+          withDirectives(createElementVNode("div", _hoisted_6, [
+            createElementVNode("div", _hoisted_7, [
+              hasHeader.value ? (openBlock(), createElementBlock("div", _hoisted_8, [
+                renderSlot(_ctx.$slots, "header", {
+                  data: data.value,
+                  loading: loading.value
+                }, () => [
+                  createTextVNode(toDisplayString(__props.title), 1)
+                ], true)
+              ])) : createCommentVNode("", true),
               createVNode(unref(_sfc_main$2), {
                 configs: __props.leftExtraButtons,
                 ctx: toolbarCtx.value,
                 "default-size": "small"
               }, null, 8, ["configs", "ctx"])
             ]),
-            createElementVNode("div", _hoisted_7, [
+            createElementVNode("div", _hoisted_9, [
               showNavigationFinal.value ? (openBlock(), createBlock(ViewLayoutNavigation, {
                 key: 0,
                 ctx: unref(listDetailCtx)
@@ -195,14 +225,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["isAutoRefresh", "loading", "showAutoRefresh", "showRefresh"])
             ])
           ], 512), [
-            [vShow, hasToolbarContent.value]
+            [vShow, hasToolbarContent.value || hasHeader.value]
           ]),
-          createElementVNode("div", _hoisted_8, [
+          createElementVNode("div", _hoisted_10, [
             renderSlot(_ctx.$slots, "default", {
               data: data.value,
               loading: loading.value,
               refresh: unref(refresh),
-              viewportHeight: void 0
+              viewportHeight: void 0,
+              fetchSeq: fetchSeq.value
             }, void 0, true)
           ])
         ], 64))

package/es/config/slot-region.mjs

@@ -6,6 +6,7 @@ var SlotRegion = /* @__PURE__ */ ((SlotRegion2) => {
   SlotRegion2[SlotRegion2["AppPage_Bottom"] = 4] = "AppPage_Bottom";
   SlotRegion2[SlotRegion2["AppPage_Left"] = 5] = "AppPage_Left";
   SlotRegion2[SlotRegion2["TabsMain_Item"] = 6] = "TabsMain_Item";
+  SlotRegion2[SlotRegion2["ModalConfirm_Body"] = 7] = "ModalConfirm_Body";
   return SlotRegion2;
 })(SlotRegion || {});
 const parseSlotRegion = (raw) => {

package/es/hooks/use-active-record.mjs

@@ -70,6 +70,7 @@ function useActiveRecord(options) {
   });
   useActivated((info) => {
     if (!info.isActivated || !enabled()) return;
+    if (data().length === 0) return;
     if (activeId.value !== void 0) applyId(activeId.value);
     else if (activeData.value !== void 0) applyData(activeData.value);
   });
@@ -78,7 +79,10 @@ function useActiveRecord(options) {
     () => {
       if (!enabled()) return;
       const id = activeId.value;
-      if (id === void 0) return;
+      if (id === void 0) {
+        if (activeData.value !== void 0) applyData(activeData.value);
+        return;
+      }
       const row = findRow(id);
       if (row) {
         lastValidData = row;

package/es/hooks/use-surface.mjs

@@ -0,0 +1,27 @@
+import { inject, computed } from "vue";
+import { useContextDefaults } from "./use-context-defaults.mjs";
+import { SlotRegion } from "../config/slot-region.mjs";
+import { APP_LAYOUT_BRIDGE_KEY } from "../inject/key.mjs";
+import { gapScaleValue } from "../utils/gap-scale.mjs";
+const useSurface = (getProps) => {
+  const { ctxSurface } = useContextDefaults({
+    getProps,
+    defaults: {
+      surface: ({ parentInfo, props: rawProps }) => rawProps.surface ?? parentInfo !== SlotRegion.ModalConfirm_Body
+    }
+  });
+  const layoutBridge = inject(APP_LAYOUT_BRIDGE_KEY, void 0);
+  const surfaceActive = computed(() => !!ctxSurface.value);
+  const surfacePad = computed(
+    () => surfaceActive.value ? gapScaleValue(
+      (layoutBridge == null ? void 0 : layoutBridge.APP_LAYOUT_GAP_CONFIG.size) ?? 8,
+      "breath",
+      layoutBridge == null ? void 0 : layoutBridge.themeDensity.value
+    ) : 0
+  );
+  const surfacePadCss = computed(() => `${surfacePad.value}px`);
+  return { surfaceActive, surfacePad, surfacePadCss };
+};
+export {
+  useSurface
+};

package/es/hooks/use-theme-apply.mjs

@@ -1,5 +1,5 @@
 import { watch, onScopeDispose } from "vue";
-import { themeScaleDerive, themeScaleParseHex, themeScaleMix, themeScaleToRgba } from "../utils/theme-scale.mjs";
+import { themeScaleDerive, themeScaleParseHex, themeScaleIsNearBlack, themeScaleSurfaceColor, themeScalePageColor, themeScaleMix, themeScaleToRgba } from "../utils/theme-scale.mjs";
 const STYLE_EL_ID = "dc-core-theme";
 const randomStyleSuffix = () => Math.random().toString(36).slice(2, 9);
 const THEME_FIELD_SPECS = [
@@ -9,7 +9,9 @@ const THEME_FIELD_SPECS = [
   ["dangerColor", { scale: true, el: "--el-color-danger" }],
   ["errorColor", { scale: true, el: "--el-color-error" }],
   ["infoColor", { scale: true, el: "--el-color-info" }],
-  ["bodyColor", { el: ["--el-bg-color-page", "--el-bg-color"] }],
+  // bodyColor = 面（默认背景色），只挂 --el-bg-color；底 --el-bg-color-page 由
+  // buildElevationDecls 派生（[MUST NOT] 再拉平三档，见 elevation 注释）。
+  ["bodyColor", { el: "--el-bg-color" }],
   ["baseColor", { el: "--el-text-color-primary" }],
   ["radius", { el: "--el-border-radius-base" }],
   ["borderColor", { el: "--el-border-color" }],
@@ -19,7 +21,11 @@ const THEME_FIELD_SPECS = [
   ["glow", {}],
   ["blur", {}],
   ["focusRing", {}],
-  ["surface", {}]
+  // surface = 抬升面（overlay 档）：preset 显式给值时双挂（与派生兜底同口径）
+  ["surface", { el: "--el-bg-color-overlay" }],
+  // ground = 底（page 档）：同 surface 的「显式优先」范式——preset 给了就双挂，
+  // 没给才由 buildElevationDecls 派生。⚠️ 与 bodyColor（面）是两档，[MUST NOT] 混。
+  ["ground", { el: "--el-bg-color-page" }]
 ];
 const THEME_SCALE_SUFFIXES = [
   "light-3",
@@ -74,19 +80,48 @@ const buildOverlayDecl = (bodyColor, mode) => {
     OVERLAY_ALPHA[mode]
   )};`;
 };
-const MASK_ALPHA = { light: 0.9, dark: 0.8 };
+const MASK_ALPHA = { light: 0.5, dark: 0.6 };
 const buildMaskDecl = (bodyColor, mode) => {
   if (!bodyColor) return "";
   const veil = themeScaleToRgba(bodyColor, MASK_ALPHA[mode]);
   if (veil === bodyColor) return "";
   return `--el-mask-color: ${veil};`;
 };
-const ELEVATE_BODY_WEIGHT = 0.88;
-const buildDialogSurfaceDecl = (bodyColor, mode) => {
-  if (!bodyColor) return "";
-  if (!themeScaleParseHex(bodyColor)) return "";
-  const elevated = themeScaleMix(bodyColor, "#ffffff", ELEVATE_BODY_WEIGHT);
-  return `--dc-core-dialog-surface: ${elevated};`;
+const warnNearBlackFlip = (body, face, mode) => {
+  console.warn(
+    `[dc-theme] ${mode} 档的 bodyColor ${body} 已近黑，向黑派生「底」无余量可压（底会等于面、模块间距的缝不可见）。已自动翻转基准：底取 ${body}、面提亮为 ${face}。建议在该档显式给 ground（底）与 bodyColor（面），[MUST NOT] 依赖本兜底猜出来的面色。`
+  );
+};
+const buildElevationDecls = (color, mode) => {
+  const body = color.bodyColor;
+  if (!body || !themeScaleParseHex(body)) return [];
+  const hasGround = color.ground !== void 0 && color.ground !== "";
+  const lines = [];
+  const flip = !hasGround && themeScaleIsNearBlack(body);
+  const face = flip ? themeScaleSurfaceColor(body, "dark") : body;
+  if (flip) {
+    lines.push(
+      `--el-bg-color-page: ${body};`,
+      `--dc-core-ground: ${body};`,
+      `--el-bg-color: ${face};`,
+      `--dc-core-body-color: ${face};`
+    );
+    warnNearBlackFlip(body, face, mode);
+  } else if (!hasGround) {
+    const ground = themeScalePageColor(body);
+    lines.push(
+      `--el-bg-color-page: ${ground};`,
+      `--dc-core-ground: ${ground};`
+    );
+  }
+  if (color.surface === void 0 || color.surface === "") {
+    const surface = themeScaleSurfaceColor(face, flip ? "dark" : mode);
+    lines.push(
+      `--dc-core-surface: ${surface};`,
+      `--el-bg-color-overlay: ${surface};`
+    );
+  }
+  return lines;
 };
 const buildThemeCss = (config) => {
   const lightColor = config.light;
@@ -94,17 +129,20 @@ const buildThemeCss = (config) => {
   const lightBody = buildThemeBlockBody(lightColor, "light");
   const darkBody = buildThemeBlockBody(darkColor, "dark");
   const rootColorDecl = "color: var(--dc-core-base-color);";
+  const rootBackgroundDecl = "background: var(--el-bg-color-page, #f2f3f5);";
   const lightLines = [
     lightBody,
     rootColorDecl,
+    rootBackgroundDecl,
+    ...buildElevationDecls(lightColor, "light"),
     buildOverlayDecl(lightColor.bodyColor, "light"),
     buildMaskDecl(lightColor.bodyColor, "light")
   ].filter(Boolean);
   const darkLines = [
     darkBody,
+    ...buildElevationDecls(darkColor, "dark"),
     buildOverlayDecl(darkColor.bodyColor, "dark"),
-    buildMaskDecl(darkColor.bodyColor, "dark"),
-    buildDialogSurfaceDecl(darkColor.bodyColor)
+    buildMaskDecl(darkColor.bodyColor, "dark")
   ].filter(Boolean);
   return `:root {
   ${lightLines.join(
@@ -120,15 +158,11 @@ const RHYTHM_STYLE_EL_ID = "dc-core-rhythm";
 const EP_BRIDGE_STYLE_EL_ID = "dc-core-ep-bridge";
 const EP_STRUCTURAL_STYLE_EL_ID = "dc-core-ep-structural";
 const EP_STRUCTURAL_CSS = [
-  // 居中浮层（Dialog / MessageBox）+ 抽屉（Drawer，含 ConfirmModal drawer 形态 + 消费方直接
-  // 用的 ElDrawer）：暗色下面板底 ≈ 页面底 + EP 黑投影不可见 → 边界糊。统一两手保底：
-  // ① elevation 提亮面（--dc-core-dialog-surface，仅暗色派生；亮色退 --el-bg-color 零改动）；
-  // ② 1px 主题描边硬边界（--el-border-color 类明暗自换：亮色浅灰近隐形、暗色中灰清晰）——
-  // 融不融底都有区别度，不再仅靠提亮（抽屉与弹窗保底一致）。
+  // 居中浮层（Dialog / MessageBox）+ 抽屉（Drawer）：1px 主题描边硬边界
+  // （--el-border-color 类明暗自换：亮色浅灰近隐形、暗色中灰清晰）。
   ".el-dialog,",
   ".el-message-box,",
   ".el-drawer {",
-  "  background-color: var(--dc-core-dialog-surface, var(--el-bg-color));",
   "  border: 1px solid var(--dc-core-border-color, var(--el-border-color));",
   "}",
   // 表格固定列分隔阴影：EP 原值 inset ±10px 0 10px -10px rgba(0,0,0,.15) 为黑投影，暗色近黑底