-
+
+
}
@case ('badge') {
-
+
}
@case ('cell') {
- |
+ |
}
@case ('widget') {
}
@default {
@if (c.safeType === 'text') {
-
+
} @else {
-
+
}
}
}
- @for (btn of i._values[cIdx].buttons; track $index) {
+ @for (btn of col.buttons; track $index) {
@if (btn.children!.length > 0) {
diff --git a/packages/abc/st/st.component.html b/packages/abc/st/st.component.html
index 1f0b3f7fa5..e943156b70 100644
--- a/packages/abc/st/st.component.html
+++ b/packages/abc/st/st.component.html
@@ -61,8 +61,8 @@
|
}
@for (h of row; track h; let index = $index; let last = $last) {
+ @let _c = h.column;
}
@for (c of _columns; track cIdx; let cIdx = $index) {
- @if (i._values[cIdx].props?.colSpan > 0 && i._values[cIdx].props?.rowSpan > 0) {
+ @let props = i._values[cIdx].props;
+ @if (props?.colSpan > 0 && props?.rowSpan > 0) {
|
@if (responsive) {
diff --git a/packages/abc/st/st.module.ts b/packages/abc/st/st.module.ts
index f74d37cc4f..d7cc671683 100644
--- a/packages/abc/st/st.module.ts
+++ b/packages/abc/st/st.module.ts
@@ -3,7 +3,6 @@ import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { CellModule } from '@delon/abc/cell';
-import { LetModule } from '@delon/abc/let';
import { DelonACLModule } from '@delon/acl';
import { NzBadgeModule } from 'ng-zorro-antd/badge';
import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
@@ -33,7 +32,6 @@ const COMPONENTS = [STComponent, STRowDirective, STWidgetHostDirective];
CommonModule,
FormsModule,
DelonACLModule,
- LetModule,
CellModule,
NzPopconfirmModule,
NzTableModule,
diff --git a/packages/form/src/sf.component.html b/packages/form/src/sf.component.html
index b69d1457ce..876618ae3d 100644
--- a/packages/form/src/sf.component.html
+++ b/packages/form/src/sf.component.html
@@ -3,8 +3,9 @@
@if (button !== 'none') {
- @if (_btn && _btn.render) {
-
+ @let btnRender = _btn.render;
+ @if (btnRender) {
+
@@ -46,17 +47,18 @@
nz-button
data-type="reset"
[nzType]="_btn.reset_type!"
- [nzSize]="_btn.render!.size!"
+ [nzSize]="btnRender.size!"
[disabled]="loading"
(click)="reset(true)"
>
- @if (_btn.reset_icon) {
+ @let resetIcon = _btn.reset_icon;
+ @if (resetIcon) {
}
{{ _btn.reset }}
|