@tmagic/form 1.8.0-manmanyu.8 → 1.8.0

package/src/theme/group-list.scss

@@ -1,8 +1,23 @@
 .m-fields-group-list {
+  // footer 高度由这三项派生，改 padding / 按钮尺寸时嵌套吸底按钮的偏移会跟着走；
+  // TableGroupList 计算 scroll-margin 时量的是同一个 footer 的实际高度，两边不会漂移
+  --m-group-list-footer-padding-top: 12px;
+  --m-group-list-footer-padding-bottom: 16px;
+  --m-group-list-footer-button-height: 32px;
+  --m-group-list-footer-height: calc(
+    var(--m-group-list-footer-padding-top) +
+      var(--m-group-list-footer-button-height) +
+      var(--m-group-list-footer-padding-bottom)
+  );
+  --m-group-list-footer-bg: var(--el-bg-color, #fff);
+  --m-group-list-header-height: 65px;
+  --m-group-list-header-bg: #fff;
+  width: 100%;
+  min-width: 0;
+
   .m-fields-group-list-item.tmagic-design-card--flat:last-child {
     border: 0;
   }
-
   .el-button--text {
     padding: 0;
     margin-bottom: 7px;
@@ -17,6 +32,7 @@
   }
 
   .m-fields-group-list-item {
+    overflow: visible;
     border-bottom: 1px solid #ebeef5;
     margin-bottom: 7px;
 
@@ -24,16 +40,141 @@
       border-bottom: 0;
     }
 
+    .el-card__body,
+    .t-card__body {
+      overflow: visible;
+
+      > .m-container-row {
+        overflow: visible;
+      }
+
+      .tmagic-design-form-item {
+        margin-bottom: 16px;
+      }
+    }
+
     .m-fields-group-list-item-header {
       display: flex;
       align-items: center;
       gap: 8px;
     }
+
+    .m-fields-group-list-item-title {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .m-fields-group-list-item-actions {
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+      gap: 8px;
+    }
+  }
+
+  // 嵌套吸底按钮叠在外层 footer 之上（如「新增条件」叠在「新增条件组」上面）。
+  // 每穿过一层「自己渲染了吸底 footer」的列表才多让出一个 footer 高度，外层没有吸底按钮时
+  // 内层不能凭空抬高。自定义属性不能自增，所以用 item / list 两个变量交替接力。
+  > .m-fields-group-list-item {
+    --m-group-list-item-footer-bottom: var(
+      --m-group-list-nested-footer-bottom,
+      0px
+    );
+  }
+
+  &.is-footer-sticky > .m-fields-group-list-item {
+    --m-group-list-item-footer-bottom: calc(
+      var(--m-group-list-nested-footer-bottom, 0px) +
+        var(--m-group-list-footer-height)
+    );
+  }
+
+  .m-fields-group-list-item .m-fields-group-list {
+    --m-group-list-nested-footer-bottom: var(
+      --m-group-list-item-footer-bottom,
+      0px
+    );
+  }
+
+  // 仅 header.sticky 时标题吸顶；直接子 item，避免外层吸顶带动未开启的内层
+  &.is-header-sticky {
+    // 从外层 item 接过已累加的偏移；最外层没有该变量时走 fallback
+    --m-group-list-nested-sticky-top: var(--m-group-list-child-list-sticky-top);
+    --m-group-list-nested-header-z: var(--m-group-list-child-list-header-z);
+
+    > .m-fields-group-list-item {
+      --m-group-list-item-sticky-top: var(
+        --m-group-list-nested-sticky-top,
+        var(--m-group-list-header-sticky-top, 0px)
+      );
+      --m-group-list-item-header-z: var(--m-group-list-nested-header-z, 7);
+      --m-group-list-child-list-sticky-top: calc(
+        var(--m-group-list-item-sticky-top) + var(--m-group-list-header-height)
+      );
+      --m-group-list-child-list-header-z: calc(
+        var(--m-group-list-item-header-z) - 1
+      );
+
+      // 卡片标题吸顶；补不透明背景，避免滚动时正文透出。
+      // z-index 必须低于吸底 footer，否则标题会盖住「新增」按钮。
+      > .el-card__header,
+      > .t-card__header {
+        position: sticky;
+        top: var(--m-group-list-item-sticky-top);
+        z-index: var(--m-group-list-item-header-z);
+        background-color: var(--m-group-list-header-bg, #fff);
+      }
+    }
   }
 
-  .m-fields-group-list-footer {
+  .el-table__empty-block {
+    width: 100%;
+    min-height: 0;
+  }
+
+  .el-table__empty-text {
+    display: block;
+    box-sizing: border-box;
+    width: 100%;
+  }
+
+  > .m-fields-group-list-footer {
     display: flex;
     justify-content: space-between;
     margin-top: 10px;
+    margin-bottom: 16px;
+  }
+
+  // 吸底全宽主按钮（event-select / code-select / display-conds 外层列表）
+  // z-index 高于 item header，避免吸顶标题挡住新增按钮；多层时 bottom 由内层 list 累加
+  > .m-fields-group-list-footer.is-sticky-full {
+    position: sticky;
+    bottom: var(--m-group-list-nested-footer-bottom, 0px);
+    z-index: 7;
+    margin-bottom: 0;
+    padding: var(--m-group-list-footer-padding-top) 0
+      var(--m-group-list-footer-padding-bottom);
+    background-color: var(--m-group-list-footer-bg);
+
+    > div {
+      justify-content: stretch;
+    }
+
+    .el-button,
+    .tmagic-design-button {
+      width: 100%;
+      height: var(--m-group-list-footer-button-height);
+    }
+  }
+}
+
+/** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
+.m-container-group-list {
+  &.outer-gorup_list {
+    > .m-fields-group-list {
+      > .m-fields-group-list-item {
+        margin-bottom: 10px;
+      }
+    }
   }
 }

package/src/theme/table.scss

@@ -26,6 +26,16 @@
   }
 }
 
+.el-form-item {
+  .m-fields-table {
+    .el-form-item {
+      &.is-error {
+        margin-bottom: 18px;
+      }
+    }
+  }
+}
+
 .m-fields-table {
   width: 100%;
 
@@ -62,7 +72,7 @@
     }
   }
 
-  .el-form-item {
+  .el-form-item:not(.is-error) {
     margin-bottom: 0;
   }
 

package/src/theme/themes/magic-admin/index.scss

@@ -1,21 +1,29 @@
 // magic-admin 主题：所有规则均以 `.m-form.m-form--magic-admin` 为前缀，
 // 仅在 `<MForm theme="magic-admin" />` 时生效，避免污染默认样式。
+@use "../../index.scss";
+
 .m-form.m-form--magic-admin {
+  // 精确匹配"只挂 `m-form-container` + `m-container-fieldset` 这两个 class"的元素：
+  // `.a.b` 只能保证"包含"这两个 class，多余的 class 也会命中；
+  // 用 `[class="..."]` 做全量字符串等值匹配即可排除第三个 class 的情况。
+  // 由于 Vue/框架不保证 class 拼接顺序，两种顺序都列出以覆盖到位。
+  [class="m-form-container m-container-fieldset"],
+  [class="m-container-fieldset m-form-container"] {
+    margin-top: 15px;
+  }
+
   .m-container-tab:not(.magic-right-panel-tabs-top):not(
       .magic-form-dynamic-tab
     ) {
     > .tmagic-design-tabs:not(.el-tabs--border-card) {
-      > .el-tabs__content {
+      > .el-tabs__content,
+      > .t-tabs__content {
         background-color: #fff;
         padding: 16px 16px 0 16px;
         border-radius: 4px;
       }
     }
   }
-
-  .m-container-tab.magic-form-dynamic-tab {
-  }
-
   .m-form-tip {
     color: rgba(0, 0, 0, 0.55);
   }
@@ -37,18 +45,13 @@
   .el-form-item__content {
     .tmagic-design-radio-group {
       .tmagic-design-radio-button {
-        margin-right: 8px;
         height: 32px;
         .el-radio-button__inner {
-          outline: none !important;
-          border: 0 !important;
           height: 32px;
-          height: 32px;
-          border-radius: 16px;
-          padding: 0 16px;
-          display: inline-flex;
+          display: flex;
+          padding-top: 0;
+          padding-bottom: 0;
           align-items: center;
-          justify-content: center;
         }
       }
     }
@@ -73,10 +76,7 @@
       }
     }
     .m-fields-group-list-item-header {
-      position: relative;
       .delete-button {
-        position: absolute;
-        right: 0;
         color: #0f1113;
       }
     }
@@ -86,4 +86,15 @@
       text-align: left;
     }
   }
+
+  .m-fields-group-list {
+    .el-table__empty-block {
+      .el-table__empty-text {
+        width: 100%;
+        background-color: rgba(0, 0, 0, 0.03);
+        margin-top: 8px;
+        border-radius: 4px;
+      }
+    }
+  }
 }

package/src/utils/builtInFields.ts

@@ -0,0 +1,69 @@
+/*
+ * Tencent is pleased to support the open source community by making TMagicEditor available.
+ *
+ * Copyright (C) 2025 Tencent.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { effect as checkboxGroupEffect } from '../fields/CheckboxGroup/effect';
+import { effect as dateEffect } from '../fields/Date/effect';
+import { effect as dateTimeEffect } from '../fields/DateTime/effect';
+import { effect as displayEffect } from '../fields/Display/effect';
+import { effect as dynamicFieldEffect } from '../fields/DynamicField/effect';
+import { effect as numberRangeEffect } from '../fields/NumberRange/effect';
+
+import { expandFieldset, expandPanel, expandRow, expandStep, expandTab, expandTableGroupList } from './collectFields';
+import { type HeadlessFieldOptions } from './registerField';
+
+/**
+ * 内置字段的无渲染登记表（不含 Vue 组件）。
+ *
+ * 本模块只导出数据，不登记。调用方自行 `registerBuiltInFields(builtInFields)`，
+ * 或 `app.use(MagicForm)`（install 里会登记叠上 Vue 组件后的表）。
+ */
+export const builtInFields: Record<string, HeadlessFieldOptions> = {
+  text: {},
+  'img-upload': {},
+  number: {},
+  'number-range': { effect: numberRangeEffect },
+  textarea: {},
+  hidden: {},
+  date: { effect: dateEffect },
+  datetime: { effect: dateTimeEffect },
+  daterange: {},
+  timerange: {},
+  time: {},
+  checkbox: {},
+  switch: {},
+  'color-picker': {},
+  'checkbox-group': { effect: checkboxGroupEffect },
+  'radio-group': {},
+  display: { effect: displayEffect },
+  link: {},
+  select: {},
+  cascader: {},
+  'dynamic-field': { effect: dynamicFieldEffect },
+  // Container 对 `type: 'component'` 直接渲染 `config.component`，没有独立的 m-fields-component
+  component: {},
+  // `type: 'container'` 不登记为叶子：未登记且带 items 时 dispatch 会按普通容器下钻
+  tab: { walk: expandTab },
+  row: { walk: expandRow },
+  'flex-layout': { walk: expandRow },
+  fieldset: { walk: expandFieldset },
+  panel: { walk: expandPanel },
+  step: { walk: expandStep },
+  table: { walk: expandTableGroupList },
+  'group-list': { walk: expandTableGroupList },
+  'table-group-list': { walk: expandTableGroupList },
+};