@tmagic/editor 1.8.0-beta.24 → 1.8.0-beta.26

package/dist/es/style.css

@@ -414,6 +414,21 @@ fieldset.m-fieldset .m-form-tip {
   margin-left: 5px;
 }
 
+.m-fields-group-list {
+  --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 .m-fields-group-list-item.tmagic-design-card--flat:last-child {
   border: 0;
 }
@@ -429,22 +444,87 @@ fieldset.m-fieldset .m-form-tip {
   transform: rotate(90deg);
 }
 .m-fields-group-list .m-fields-group-list-item {
+  overflow: visible;
   border-bottom: 1px solid #ebeef5;
   margin-bottom: 7px;
 }
 .m-fields-group-list .m-fields-group-list-item:last-of-type {
   border-bottom: 0;
 }
+.m-fields-group-list .m-fields-group-list-item .el-card__body,
+.m-fields-group-list .m-fields-group-list-item .t-card__body {
+  overflow: visible;
+}
+.m-fields-group-list .m-fields-group-list-item .el-card__body > .m-container-row,
+.m-fields-group-list .m-fields-group-list-item .t-card__body > .m-container-row {
+  overflow: visible;
+}
+.m-fields-group-list .m-fields-group-list-item .el-card__body .tmagic-design-form-item,
+.m-fields-group-list .m-fields-group-list-item .t-card__body .tmagic-design-form-item {
+  margin-bottom: 16px;
+}
 .m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item-header {
   display: flex;
   align-items: center;
   gap: 8px;
 }
-.m-fields-group-list .m-fields-group-list-footer {
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item-title {
+  flex: 1;
+  min-width: 0;
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item-actions {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+  gap: 8px;
+}
+.m-fields-group-list .m-fields-group-list-item > .el-card__header,
+.m-fields-group-list .m-fields-group-list-item > .t-card__header {
+  position: sticky;
+  top: var(--m-group-list-header-sticky-top, 0px);
+  z-index: 7;
+  background-color: var(--m-group-list-header-bg, #fff);
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .el-card__header,
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item > .t-card__header {
+  top: calc(var(--m-group-list-header-sticky-top, 0px) + var(--m-group-list-header-height));
+  z-index: 6;
+}
+.m-fields-group-list .el-table__empty-block {
+  width: 100%;
+  min-height: 0;
+}
+.m-fields-group-list .el-table__empty-text {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+}
+.m-fields-group-list > .m-fields-group-list-footer {
+  display: flex;
   justify-content: space-between;
   margin-top: 10px;
   margin-bottom: 16px;
 }
+.m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
+  position: sticky;
+  bottom: 0;
+  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);
+}
+.m-fields-group-list > .m-fields-group-list-footer.is-sticky-full > div {
+  justify-content: stretch;
+}
+.m-fields-group-list > .m-fields-group-list-footer.is-sticky-full .el-button,
+.m-fields-group-list > .m-fields-group-list-footer.is-sticky-full .tmagic-design-button {
+  width: 100%;
+  height: var(--m-group-list-footer-button-height);
+}
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list > .m-fields-group-list-footer.is-sticky-full {
+  bottom: var(--m-group-list-footer-height);
+  z-index: 7;
+}
 
 /** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
 .m-container-group-list.outer-gorup_list > .m-fields-group-list > .m-fields-group-list-item {
@@ -572,7 +652,11 @@ fieldset.m-fieldset .m-form-tip {
 .m-form-box .el-box__header {
   margin: 0;
 }
+.m-form-box .m-box-body {
+  min-height: 0;
+}
 .m-form-box .dialog-footer {
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -1718,12 +1802,25 @@ fieldset.m-fieldset .m-form-tip {
 .m-editor-props-form-panel-form {
   padding-right: 10px;
   padding-left: 10px;
-}
-.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__content {
-  margin-top: var(--el-tabs-header-height);
+  --m-group-list-header-sticky-top: var(
+    --el-tabs-header-height,
+    var(--td-comp-size-xxl, 48px)
+  );
+}
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__content,
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .t-tabs__content {
+  margin-top: var(--el-tabs-header-height, var(--td-comp-size-xxl, 48px));
   padding-top: 15px;
+  overflow: visible;
+}
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__content > .el-tab-pane,
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__content > .t-tab-panel,
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .t-tabs__content > .el-tab-pane,
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .t-tabs__content > .t-tab-panel {
+  overflow: visible;
 }
-.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__header.is-top {
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .el-tabs__header.is-top,
+.m-editor-props-form-panel-form > .m-container-tab > .tmagic-design-tabs > .t-tabs__header {
   position: absolute;
   top: 0;
   width: 100%;
@@ -1921,29 +2018,6 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-code-select {
   width: 100%;
 }
-.m-fields-code-select > .el-card.tmagic-design-card--flat {
-  background-color: transparent;
-  margin-bottom: 10px;
-}
-.m-fields-code-select > .el-card.tmagic-design-card--flat > .el-card__body {
-  padding-left: 0;
-}
-.m-fields-code-select > .el-card.tmagic-design-card--flat > .el-card__body .code-select-content > .m-fields-group-list > .tmagic-design-card--flat.el-card {
-  padding-left: 16px;
-  padding-right: 16px;
-  margin-bottom: 10px;
-  border: 0 !important;
-}
-.m-fields-code-select .el-card__body .tmagic-design-form-item {
-  margin-bottom: 16px;
-}
-.m-fields-code-select .code-select-content > .m-fields-group-list > .tmagic-design-card--flat > .el-card__header {
-  padding: 16px 0;
-}
-.m-fields-code-select .create-button.fullWidth {
-  width: 100%;
-  margin: 0 0 16px 0;
-}
 
 .m-fields-event-select {
   width: 100%;
@@ -1952,37 +2026,34 @@ fieldset.m-fieldset .m-form-tip {
   width: 100%;
   box-sizing: border-box;
 }
-.m-fields-event-select .fullWidth.create-button {
-  width: 100%;
-}
 .m-fields-event-select .fullWidth.m-container-ui-event {
   width: calc(100% - 32px);
 }
 .m-fields-event-select .event-select-container {
   padding: 0 16px;
 }
-.m-fields-event-select .event-select-container > .el-card.tmagic-design-card--flat > .el-card__header {
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__header {
   border-bottom: 1px solid #ebeef5;
 }
-.m-fields-event-select .event-select-container > .el-card.tmagic-design-card--flat > .el-card__body {
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__body,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__body {
   padding-bottom: 16px;
 }
-.m-fields-event-select .event-select-container > .el-card.tmagic-design-card--flat > .el-card__body .m-fields-group-list-footer div {
-  justify-content: flex-start !important;
-}
-.m-fields-event-select .event-select-container > .el-card.tmagic-design-card--flat > .el-card__body .el-card.tmagic-design-card--flat > .el-card__header {
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__body .el-card.tmagic-design-card--flat > .el-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__body .el-card.tmagic-design-card--flat > .t-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__body .t-card.tmagic-design-card--flat > .el-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .el-card__body .t-card.tmagic-design-card--flat > .t-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__body .el-card.tmagic-design-card--flat > .el-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__body .el-card.tmagic-design-card--flat > .t-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__body .t-card.tmagic-design-card--flat > .el-card__header,
+.m-fields-event-select .event-select-container > .m-fields-group-list > .m-fields-group-list-item.tmagic-design-card--flat > .t-card__body .t-card.tmagic-design-card--flat > .t-card__header {
   padding: 16px 0;
 }
 .m-fields-event-select .event-select-code {
   margin-left: 20px;
   width: auto;
 }
-.m-fields-event-select .m-form-panel {
-  margin: 10px 0px;
-}
-.m-fields-event-select .el-card.is-always-shadow {
-  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.12);
-}
 
 .m-fields-code-select-col,
 .m-fields-data-source-method-select {
@@ -2005,10 +2076,6 @@ fieldset.m-fieldset .m-form-tip {
   margin-right: 5px;
 }
 
-.event-select-container {
-  padding: 0 16px;
-}
-
 .event-select-header {
   display: flex;
   align-items: center;
@@ -2023,21 +2090,10 @@ fieldset.m-fieldset .m-form-tip {
 }
 
 .event-item-header {
-  position: relative;
   width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
 }
-.event-item-header .event-item-title {
-  color: #0f1113;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  margin-bottom: 8px;
-}
-.event-item-header .event-item-delete-button {
-  color: #0f1113;
+.event-item-header .tmagic-design-form-item {
+  margin-bottom: 0;
 }
 .event-item-header .el-form-item .el-form-item.is-error {
   margin-bottom: 18px;
@@ -2328,6 +2384,10 @@ fieldset.m-fieldset .m-form-tip {
   padding: 5px 8px;
 }
 
+.m-fields-display-conds {
+  width: 100%;
+}
+
 .m-container-text.display-conds-title .tmagic-design-form-item .el-form-item__label {
   color: #111;
   font-weight: 500;

package/dist/es/utils/data-source/index.js

@@ -28,7 +28,8 @@ var dataSourceFormConfig = {
 			items: [{
 				name: "events",
 				src: "datasource",
-				type: "event-select"
+				type: "event-select",
+				defaultValue: []
 			}]
 		},
 		{

package/dist/es/utils/props.js

@@ -131,6 +131,7 @@ var eventTabConfig = {
 		src: "component",
 		labelWidth: "100px",
 		type: "event-select",
+		defaultValue: [],
 		rules: [{ typeMatch: true }]
 	}]
 };
@@ -141,7 +142,6 @@ var advancedTabConfig = {
 			name: NODE_DISABLE_CODE_BLOCK_KEY,
 			text: "禁用代码块",
 			type: "switch",
-			labelPosition: "left",
 			defaultValue: false,
 			extra: "开启后，配置的代码块将不会被执行"
 		},
@@ -149,7 +149,6 @@ var advancedTabConfig = {
 			name: NODE_DISABLE_DATA_SOURCE_KEY,
 			text: "禁用数据源",
 			type: "switch",
-			labelPosition: "left",
 			defaultValue: false,
 			extra: "开启后，组件内配置的数据源相关配置将不会被编译，显隐条件将失效"
 		},
@@ -224,8 +223,6 @@ var displayTabConfig = {
 			type: "display-conds",
 			name: NODE_CONDS_KEY,
 			titlePrefix: "条件组",
-			fixed: "right",
-			operateColWidth: 112,
 			defaultValue: [],
 			rules: [{ typeMatch: true }]
 		}

package/dist/es/utils/type-match-rules.js

@@ -3,10 +3,10 @@ import editor_default from "../services/editor.js";
 import { getFieldType, resolveFieldByPath } from "./data-source/index.js";
 import codeBlock_default from "../services/codeBlock.js";
 import dataSource_default from "../services/dataSource.js";
-import { MAX_SUGGESTION_OPTIONS, optionSuggestion, stringifyExampleValue, validateTypeMatch } from "@tmagic/form";
-import { appendValidateSuggestion } from "@tmagic/design";
 import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, dataSourceTemplateRegExp, getKeysArray, removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { NodeType } from "@tmagic/core";
+import { appendValidateSuggestion } from "@tmagic/design/headless";
+import { MAX_SUGGESTION_OPTIONS, optionSuggestion, stringifyExampleValue, validateTypeMatch } from "@tmagic/form/headless";
 //#region packages/editor/src/utils/type-match-rules.ts
 /** 复用 form 的可选项建议文案；额外过滤 null / 空串，避免业务侧无效枚举污染提示。 */
 var listSuggestion = (values) => optionSuggestion(values.filter((item) => item !== null && item !== ""));
@@ -152,24 +152,20 @@ var displayCondSuggestion = () => {
 };
 var validateDataSourceFieldPath = (path, options = {}) => {
 	if (!getDataSources().length) return;
-	let dsId = options.dataSourceId;
-	let fieldNames = path;
-	if (!dsId) {
-		if (!path.length) return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
-		const rawDsId = path[0];
-		dsId = options.valueMode === "key" || !`${rawDsId}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX) ? `${rawDsId}` : removeDataSourceFieldPrefix(`${rawDsId}`);
-		fieldNames = path.slice(1);
-	}
+	const dsId = options.dataSourceId;
+	if (!dsId) return defaultMessage(options.message, "数据源不存在", dataSourceIdSuggestion());
 	const ds = findDataSource(`${dsId}`);
 	if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
-	if (!fieldNames.length) return;
-	const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
+	if (!path.length) return;
+	const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, path);
 	if (!ok) return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
 	const allowedTypes = options.dataSourceFieldType || ["any"];
 	if (!allowedTypes.length || allowedTypes.includes("any")) return;
 	const leafType = field?.type || "any";
-	if (leafType === "any" || allowedTypes.includes(leafType)) return;
-	return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
+	if (leafType !== "any" && !allowedTypes.includes(leafType)) {
+		const fieldName = field?.name || path[path.length - 1];
+		return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+	}
 };
 var validateDataSourceMethodTuple = (value, message) => {
 	if (!Array.isArray(value) || value.length !== 2 || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为长度为 2 的字符串数组`, methodTupleSuggestion());
@@ -215,7 +211,7 @@ var validateCondOpSelect = (value, { message, props }) => {
 	const parentFields = props.config?.parentFields || [];
 	const fieldPath = Array.isArray(props.model?.field) ? props.model.field : [];
 	const [id, ...fieldNames] = [...parentFields, ...fieldPath];
-	const ds = id ? findDataSource(`${id}`) : void 0;
+	const ds = id ? findDataSource(removeDataSourceFieldPrefix(`${id}`)) : void 0;
 	const allowed = getCondOpsByFieldType(getFieldType(ds, fieldNames));
 	if (!allowed.has(value)) return defaultMessage(message, `${value} 不在可选项中`, listSuggestion([...allowed]));
 };
@@ -251,7 +247,7 @@ var isDataSourceFieldPathValue = (value, config) => {
 /**
 * data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
 */
-var validateDataSourceFieldSelectValue = (value, context, options) => {
+var validateDataSourceFieldSelect = (value, context, options) => {
 	const { mForm, message, props } = context;
 	const config = props.config || {};
 	if (!isDataSourceFieldPathValue(value, config)) {
@@ -265,14 +261,18 @@ var validateDataSourceFieldSelectValue = (value, context, options) => {
 		}, message);
 	}
 	if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
-	return validateDataSourceFieldPath(value, {
-		dataSourceId: config.dataSourceId,
-		valueMode: config.value,
+	let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
+	let fieldNames = value;
+	if (!dataSourceId) {
+		dataSourceId = value.length ? removeDataSourceFieldPrefix(value[0]) : void 0;
+		fieldNames = value.slice(1);
+	}
+	return validateDataSourceFieldPath(fieldNames, {
+		dataSourceId,
 		dataSourceFieldType: config.dataSourceFieldType,
 		message
 	});
 };
-var validateDataSourceFieldSelect = (value, context) => validateDataSourceFieldSelectValue(value, context);
 var validateDataSourceSelect = (value, { message, props }) => {
 	const config = props.config || {};
 	const dataSources = getDataSources();
@@ -342,7 +342,8 @@ var editorTypeMatchRules = {
 	"ui-select": validateUiSelect,
 	"data-source-input": validateDataSourceInput,
 	"data-source-method-select": validateDataSourceMethodSelect,
-	"data-source-field-select": validateDataSourceFieldSelect,
+	/** 注册进 typeMatch 规则表的入口，收窄为 TypeMatchValidator，避免调用方误传第三个参数 */
+	"data-source-field-select": (value, context) => validateDataSourceFieldSelect(value, context),
 	"data-source-select": validateDataSourceSelect,
 	"code-select": validateCodeSelect,
 	"data-source-fields": validateDataSourceFields,
@@ -352,4 +353,4 @@ var editorTypeMatchRules = {
 	"display-conds": validateDisplayConds
 };
 //#endregion
-export { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelectValue };
+export { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelect };