@tmagic/form 1.8.0-beta.7 → 1.8.0-manmanyu.10

package/dist/es/fields/Switch.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import { useAddField } from "../utils/useAddField.js";
 import { computed, createBlock, defineComponent, openBlock, unref } from "vue";
 import { TMagicSwitch } from "@tmagic/design";
 //#region packages/form/src/fields/Switch.vue?vue&type=script&setup=true&lang.ts
-var Switch_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Switch_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormSwitch",
 	__name: "Switch",
 	props: {
@@ -15,7 +15,10 @@ var Switch_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/fields/Text.vue_vue_type_script_setup_true_lang.js

@@ -1,17 +1,25 @@
 import { useAddField } from "../utils/useAddField.js";
-import { Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, inject, openBlock, readonly, ref, shallowRef, toDisplayString, unref, watch, withCtx, withModifiers } from "vue";
+import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, inject, normalizeClass, openBlock, readonly, ref, shallowRef, toDisplayString, unref, watch, withCtx, withModifiers } from "vue";
 import { debounce } from "lodash-es";
 import { TMagicButton, TMagicInput } from "@tmagic/design";
 import { isNumber } from "@tmagic/utils";
 import { createPopper } from "@popperjs/core";
 //#region packages/form/src/fields/Text.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = { class: "m-fields-text" };
-var _hoisted_2 = { key: 1 };
-var _hoisted_3 = { style: {
+var _hoisted_1 = { key: 0 };
+var _hoisted_2 = {
+	key: 0,
+	class: "m-fields-text__prepend"
+};
+var _hoisted_3 = { class: "m-fields-text__value" };
+var _hoisted_4 = ["src"];
+var _hoisted_5 = { key: 2 };
+var _hoisted_6 = ["src"];
+var _hoisted_7 = { key: 2 };
+var _hoisted_8 = { style: {
 	"display": "flex",
 	"justify-content": "flex-end"
 } };
-var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Text_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormText",
 	__name: "Text",
 	props: {
@@ -24,7 +32,10 @@ var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change", "input"],
 	setup(__props, { emit: __emit }) {
@@ -37,21 +48,15 @@ var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			value.value = v;
 		}, { immediate: true });
 		const appendConfig = computed(() => {
-			if (typeof props.config.append === "string") return {
+			const { append } = props.config;
+			if (typeof append === "string") return {
 				type: "text",
-				text: props.config.append,
+				text: append,
 				handler: void 0
 			};
-			if (typeof props.config.append === "object") {
-				if (typeof props.config.append?.handler === "function") return {
-					type: "button",
-					text: props.config.append.text,
-					handler: props.config.append.handler
-				};
-				if (props.config.append) {
-					if (props.config.append.value === 0) return false;
-					return props.config.append;
-				}
+			if (typeof append === "object" && append) {
+				if (append.value === 0) return false;
+				return append;
 			}
 			return false;
 		});
@@ -147,67 +152,97 @@ var Text_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			instanceRef.value = void 0;
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(TMagicInput), {
-				modelValue: value.value,
-				"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
-				ref_key: "input",
-				ref: input,
-				clearable: __props.config.clearable ?? true,
-				size: __props.size,
-				placeholder: __props.config.placeholder,
-				disabled: __props.disabled,
-				onChange: changeHandler,
-				onInput: inputHandler,
-				onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
-			}, createSlots({ _: 2 }, [__props.config.prepend ? {
-				name: "prepend",
-				fn: withCtx(() => [createElementVNode("span", null, toDisplayString(__props.config.prepend), 1)]),
-				key: "0"
-			} : void 0, appendConfig.value ? {
-				name: "append",
-				fn: withCtx(() => [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
-					key: 0,
-					style: { "color": "#409eff" },
+			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-text", { "m-fields-text--static": __props.config.static }]) }, [
+				__props.config.disabled ? (openBlock(), createElementBlock("div", _hoisted_1)) : createCommentVNode("v-if", true),
+				createCommentVNode(" 新增静态展示文本样式 "),
+				__props.config.static ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+					__props.config.prepend ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(__props.config.prepend), 1)) : createCommentVNode("v-if", true),
+					createElementVNode("span", _hoisted_3, toDisplayString(value.value), 1),
+					appendConfig.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
+						key: 0,
+						style: { "color": "#0056ea" },
+						size: __props.size,
+						onClick: withModifiers(buttonClickHandler, ["prevent"])
+					}, {
+						default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
+						_: 1
+					}, 8, ["size"])) : appendConfig.value.type === "icon" ? (openBlock(), createElementBlock("img", {
+						key: 1,
+						class: "m-fields-text__icon",
+						src: appendConfig.value.text,
+						onClick: buttonClickHandler
+					}, null, 8, _hoisted_4)) : (openBlock(), createElementBlock("span", _hoisted_5, toDisplayString(appendConfig.value.text), 1))], 64)) : createCommentVNode("v-if", true)
+				], 64)) : (openBlock(), createBlock(unref(TMagicInput), {
+					key: 2,
+					modelValue: value.value,
+					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
+					ref_key: "input",
+					ref: input,
+					clearable: __props.config.clearable ?? true,
 					size: __props.size,
-					onClick: withModifiers(buttonClickHandler, ["prevent"])
-				}, {
-					default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
-					_: 1
-				}, 8, ["size"])) : (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(appendConfig.value.text), 1))]),
-				key: "1"
-			} : void 0]), 1032, [
-				"modelValue",
-				"clearable",
-				"size",
-				"placeholder",
-				"disabled"
-			]), (openBlock(), createBlock(Teleport, { to: "body" }, [popoverVisible.value ? (openBlock(), createElementBlock("div", {
-				key: 0,
-				class: "tmagic-form-text-popper m-form-item__content",
-				ref_key: "popoverEl",
-				ref: popoverEl
-			}, [
-				_cache[5] || (_cache[5] = createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
-				createElementVNode("div", _hoisted_3, [createVNode(unref(TMagicButton), {
-					link: "",
-					size: "small",
-					onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
-				}, {
-					default: withCtx(() => [..._cache[3] || (_cache[3] = [createTextVNode("保持原样", -1)])]),
-					_: 1
-				}), createVNode(unref(TMagicButton), {
-					type: "primary",
-					size: "small",
-					onClick: confirmTrimHandler
-				}, {
-					default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("移除空格", -1)])]),
-					_: 1
-				})]),
-				_cache[6] || (_cache[6] = createElementVNode("span", {
-					class: "tmagic-form-text-popper-arrow",
-					"data-popper-arrow": ""
-				}, null, -1))
-			], 512)) : createCommentVNode("v-if", true)]))]);
+					placeholder: __props.config.placeholder,
+					disabled: __props.disabled,
+					onChange: changeHandler,
+					onInput: inputHandler,
+					onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
+				}, createSlots({ _: 2 }, [__props.config.prepend ? {
+					name: "prepend",
+					fn: withCtx(() => [createElementVNode("span", null, toDisplayString(__props.config.prepend), 1)]),
+					key: "0"
+				} : void 0, appendConfig.value ? {
+					name: "append",
+					fn: withCtx(() => [appendConfig.value.type === "button" ? (openBlock(), createBlock(unref(TMagicButton), {
+						key: 0,
+						style: { "color": "#0056ea" },
+						size: __props.size,
+						onClick: withModifiers(buttonClickHandler, ["prevent"])
+					}, {
+						default: withCtx(() => [createTextVNode(toDisplayString(appendConfig.value.text), 1)]),
+						_: 1
+					}, 8, ["size"])) : appendConfig.value.type === "icon" ? (openBlock(), createElementBlock("img", {
+						key: 1,
+						src: appendConfig.value.text,
+						onClick: buttonClickHandler
+					}, null, 8, _hoisted_6)) : (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(appendConfig.value.text), 1))]),
+					key: "1"
+				} : void 0]), 1032, [
+					"modelValue",
+					"clearable",
+					"size",
+					"placeholder",
+					"disabled"
+				])),
+				!__props.config.static ? (openBlock(), createBlock(Teleport, {
+					key: 3,
+					to: "body"
+				}, [popoverVisible.value ? (openBlock(), createElementBlock("div", {
+					key: 0,
+					class: "tmagic-form-text-popper m-form-item__content",
+					ref_key: "popoverEl",
+					ref: popoverEl
+				}, [
+					_cache[5] || (_cache[5] = createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
+					createElementVNode("div", _hoisted_8, [createVNode(unref(TMagicButton), {
+						link: "",
+						size: "small",
+						onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
+					}, {
+						default: withCtx(() => [..._cache[3] || (_cache[3] = [createTextVNode("保持原样", -1)])]),
+						_: 1
+					}), createVNode(unref(TMagicButton), {
+						type: "primary",
+						size: "small",
+						onClick: confirmTrimHandler
+					}, {
+						default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("移除空格", -1)])]),
+						_: 1
+					})]),
+					_cache[6] || (_cache[6] = createElementVNode("span", {
+						class: "tmagic-form-text-popper-arrow",
+						"data-popper-arrow": ""
+					}, null, -1))
+				], 512)) : createCommentVNode("v-if", true)])) : createCommentVNode("v-if", true)
+			], 2);
 		};
 	}
 });

package/dist/es/fields/Textarea.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import { useAddField } from "../utils/useAddField.js";
 import { createBlock, defineComponent, inject, openBlock, ref, unref, watch } from "vue";
 import { TMagicInput } from "@tmagic/design";
 //#region packages/form/src/fields/Textarea.vue?vue&type=script&setup=true&lang.ts
-var Textarea_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Textarea_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTextarea",
 	__name: "Textarea",
 	props: {
@@ -15,7 +15,10 @@ var Textarea_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change", "input"],
 	setup(__props, { emit: __emit }) {

package/dist/es/fields/Time.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import { useAddField } from "../utils/useAddField.js";
 import { createBlock, defineComponent, openBlock, unref } from "vue";
 import { TMagicTimePicker } from "@tmagic/design";
 //#region packages/form/src/fields/Time.vue?vue&type=script&setup=true&lang.ts
-var Time_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Time_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTime",
 	__name: "Time",
 	props: {
@@ -15,7 +15,10 @@ var Time_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/fields/Timerange.vue_vue_type_script_setup_true_lang.js

@@ -4,7 +4,7 @@ import { createBlock, defineComponent, onUnmounted, openBlock, ref, unref, watch
 import { TMagicTimePicker } from "@tmagic/design";
 import dayjs from "dayjs";
 //#region packages/form/src/fields/Timerange.vue?vue&type=script&setup=true&lang.ts
-var Timerange_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Timerange_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTimeRange",
 	__name: "Timerange",
 	props: {
@@ -17,7 +17,10 @@ var Timerange_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/plugin.js

@@ -3,6 +3,7 @@ import { setConfig } from "./utils/config.js";
 import Container_default from "./containers/Container.js";
 import Form_default from "./Form.js";
 import FormDialog_default from "./FormDialog.js";
+import FormDrawer_default from "./FormDrawer.js";
 import Fieldset_default from "./containers/Fieldset.js";
 import FlexLayout_default from "./containers/FlexLayout.js";
 import Panel_default from "./containers/Panel.js";
@@ -38,6 +39,7 @@ var plugin_default = { install(app, opt = {}) {
 	setConfig(option);
 	app.component("m-form", Form_default);
 	app.component("m-form-dialog", FormDialog_default);
+	app.component("m-form-drawer", FormDrawer_default);
 	app.component("m-form-container", Container_default);
 	app.component("m-form-fieldset", Fieldset_default);
 	app.component("m-form-group-list", TableGroupList_default);

package/dist/es/style.css

@@ -16,6 +16,9 @@
 .m-form-container .tmagic-design-form-item.show-before-diff {
   background: #f7dadd;
 }
+.m-form-container .m-form-title-extra {
+  margin-left: 8px;
+}
 
 .m-form-dialog .el-dialog__body {
   padding: 0 !important;
@@ -76,6 +79,10 @@
   margin-bottom: var(--td-comp-margin-xxl);
 }
 
+.m-form-container .m-form-container-expand {
+  text-align: center;
+}
+
 .magic-datetime-picker-popper .el-picker-panel__footer button:first-child {
   display: none;
 }
@@ -85,6 +92,24 @@
   align-items: center;
   width: 100%;
 }
+.m-fields-text--static {
+  gap: 6px;
+  min-height: 32px;
+}
+.m-fields-text--static .m-fields-text__prepend {
+  color: var(--el-text-color-secondary, #909399);
+}
+.m-fields-text--static .m-fields-text__value {
+  color: var(--el-text-color-regular, #606266);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-fields-text--static .m-fields-text__icon {
+  width: 16px;
+  height: 16px;
+  cursor: pointer;
+}
 
 .m-form-validate__warning {
   color: var(--el-color-warning);
@@ -110,6 +135,16 @@
   outline: none;
 }
 
+.m-container-text.m-fields-title-container .tmagic-design-form-item .el-form-item__label {
+  color: #0f1113;
+  font-weight: 500;
+  font-size: 16px;
+}
+.m-container-text.m-fields-title-container .tmagic-design-form-item {
+  line-height: 24px;
+  margin-bottom: 16px;
+}
+
 .tmagic-form-text-popper[data-popper-placement^=top] > .tmagic-form-text-popper-arrow {
   bottom: -4px;
 }
@@ -148,6 +183,65 @@ div.m-fields-link {
   width: fit-content;
 }
 
+a.magic-admin-link {
+  width: 100%;
+  box-sizing: border-box;
+  border-radius: 4px;
+  border: 1px solid #e6e6e6;
+  background-color: #fafafa;
+  padding: 0 8px;
+  height: 28px;
+  display: inline-flex;
+  gap: 4px;
+  align-items: center;
+  text-decoration: none;
+}
+a.magic-admin-link i {
+  margin-right: 4px;
+}
+
+.m-container-fieldset.no-border-fieldset.fieldset-in-row > fieldset.m-fieldset legend {
+  left: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset {
+  border: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset legend {
+  position: relative;
+  left: -5px;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 24px;
+  padding: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit {
+  border-bottom: 1px solid #e6e6e6;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset {
+  padding: 16px 0 16px 0 !important;
+  border: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset legend {
+  position: relative;
+  top: 10px;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-last {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-first {
+  padding-top: 0 !important;
+}
+.m-container-fieldset.fieldset-in-card-fit:last-child {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit:first {
+  padding-top: 0 !important;
+}
+
 fieldset.m-fieldset {
   position: relative;
   border: 1px solid rgb(229, 229, 229);
@@ -174,6 +268,9 @@ fieldset.m-fieldset .m-form-tip {
   margin-left: 5px;
 }
 
+.m-fields-group-list .m-fields-group-list-item.tmagic-design-card--flat:last-child {
+  border: 0;
+}
 .m-fields-group-list .el-button--text {
   padding: 0;
   margin-bottom: 7px;
@@ -192,11 +289,10 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-group-list .m-fields-group-list-item:last-of-type {
   border-bottom: 0;
 }
-.m-fields-group-list .tmagic-design-card .el-card__header {
-  padding: 5px 20px;
-}
-.m-fields-group-list .tmagic-design-card .t-card__header {
-  padding: 5px 0;
+.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 {
   display: flex;
@@ -208,7 +304,7 @@ fieldset.m-fieldset .m-form-tip {
   background: #f2f6fc;
 }
 .m-form-panel .el-card__header a {
-  color: #409eff;
+  color: var(--el-color-primary, #409eff);
 }
 .m-form-panel .el-card__body {
   padding: 10px;
@@ -287,8 +383,8 @@ fieldset.m-fieldset .m-form-tip {
   margin-right: auto;
   min-width: 50px;
   outline: none;
-  border-color: #409eff;
-  color: #409eff;
+  border-color: var(--el-color-primary, #409eff);
+  color: var(--el-color-primary, #409eff);
   width: 10px;
 }
 .magic-form-dynamic-tab .el-tabs__header.is-top .el-tabs__new-tab::before {
@@ -325,4 +421,20 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+
+.m-fields-radio-group__option {
+  display: flex;
+  align-items: center;
+}
+
+.m-fields-radio-group__text {
+  display: inline-block;
+  vertical-align: middle;
+  white-space: pre-line;
+  line-height: 20px;
+}
+
+.m-fields-radio-group__icon_with_text {
+  margin-right: 8px;
 }/*$vite$:1*/

package/dist/es/utils/form.js

@@ -4,7 +4,7 @@ import { getValueByKeyPath } from "@tmagic/utils";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 //#region packages/form/src/utils/form.ts
-var TABLE_SELECT_TYPES = new Set(["table-select", "tableSelect"]);
+var TABLE_SELECT_TYPES = /* @__PURE__ */ new Set(["table-select", "tableSelect"]);
 var isTableSelect = (type) => typeof type === "string" && TABLE_SELECT_TYPES.has(type);
 var asyncLoadConfig = (value, initValue, { asyncLoad, name, type }) => {
 	if (type === "html" && typeof asyncLoad === "object" && typeof name !== "undefined") {
@@ -12,7 +12,7 @@ var asyncLoadConfig = (value, initValue, { asyncLoad, name, type }) => {
 		value.asyncLoad = typeof initValue.asyncLoad === "object" ? initValue.asyncLoad : asyncLoad;
 	}
 };
-var MULTIPLE_VALUE_TYPES = new Set([
+var MULTIPLE_VALUE_TYPES = /* @__PURE__ */ new Set([
 	"checkbox-group",
 	"checkboxGroup",
 	"table",