@tmagic/form 1.5.0-beta.1 → 1.5.0-beta.10

package/dist/tmagic-form.js

@@ -1,9 +1,11 @@
 import { toRaw, defineComponent, inject, ref, computed, watchEffect, watch, resolveComponent, openBlock, createElementBlock, normalizeStyle, normalizeClass, createBlock, resolveDynamicComponent, Fragment, createVNode, unref, withCtx, createElementVNode, createCommentVNode, renderList, createTextVNode, toDisplayString, withDirectives, vShow, renderSlot, onMounted, Teleport, toRefs, mergeProps, getCurrentInstance, reactive, onBeforeUnmount, vModelText, provide, onBeforeMount, nextTick, resolveDirective, createSlots, withModifiers } from 'vue';
 import { WarningFilled, CaretBottom, CaretRight, Delete, CaretTop, Grid, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
 import { cloneDeep, isEqual, isEmpty } from 'lodash-es';
-import { TMagicFormItem, TMagicTooltip, TMagicIcon, TMagicButton, TMagicCheckbox, TMagicCard, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, useZIndex, TMagicTable, TMagicTableColumn, TMagicUpload, TMagicPagination, tMagicMessage, getConfig as getConfig$1, TMagicBadge, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, TMagicDialog, TMagicInputNumber, TMagicRadioGroup, TMagicRadio, TMagicSelect, TMagicSwitch, TMagicPopover, TMagicTimePicker, TMagicDrawer, TMagicScrollbar } from '@tmagic/design';
+import { TMagicFormItem, TMagicTooltip, TMagicIcon, TMagicButton, TMagicCheckbox, TMagicCard, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, useZIndex, TMagicTable, TMagicTableColumn, TMagicUpload, TMagicPagination, tMagicMessage, getDesignConfig, TMagicBadge, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, TMagicDialog, TMagicInputNumber, TMagicRadioGroup, TMagicRadio, TMagicSelect, TMagicSwitch, TMagicPopover, TMagicTimePicker, TMagicDrawer, TMagicScrollbar } from '@tmagic/design';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
 import Sortable from 'sortablejs';
-import { sleep, asyncLoadJs, datetimeFormatter, getValueByKeyPath, isNumber } from '@tmagic/utils';
+import { sleep, asyncLoadJs, getValueByKeyPath, isNumber } from '@tmagic/utils';
 
 const isTableSelect = (type) => typeof type === "string" && ["table-select", "tableSelect"].includes(type);
 const asyncLoadConfig = (value, initValue2, { asyncLoad, name, type }) => {
@@ -164,12 +166,30 @@ const initValue = async (mForm, { initValues, config }) => {
   }
   return valuesTmp || {};
 };
+const datetimeFormatter = (v, defaultValue = "-", format = "YYYY-MM-DD HH:mm:ss") => {
+  if (v) {
+    let time;
+    if (["x", "timestamp"].includes(format)) {
+      time = dayjs(v).valueOf();
+    } else if (typeof v === "string" && v.includes("Z") || v.constructor === Date) {
+      dayjs.extend(utc);
+      time = dayjs(v).utcOffset(8).format(format);
+    } else {
+      time = dayjs(v).format(format);
+    }
+    if (time !== "Invalid Date") {
+      return time;
+    }
+    return defaultValue;
+  }
+  return defaultValue;
+};
 
-const _hoisted_1$d = ["id", "data-magic-id"];
-const _hoisted_2$8 = ["innerHTML", "title"];
-const _hoisted_3$5 = ["innerHTML"];
-const _hoisted_4$4 = ["innerHTML"];
-const _hoisted_5$4 = ["innerHTML"];
+const _hoisted_1$d = ["data-tmagic-id", "data-tmagic-form-item-prop"];
+const _hoisted_2$7 = ["innerHTML", "title"];
+const _hoisted_3$4 = ["innerHTML"];
+const _hoisted_4$3 = ["innerHTML"];
+const _hoisted_5$3 = ["innerHTML"];
 const _hoisted_6$2 = ["innerHTML", "title"];
 const _hoisted_7$1 = ["innerHTML"];
 const _hoisted_8$1 = ["innerHTML"];
@@ -319,8 +339,8 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
       const _component_Container = resolveComponent("Container", true);
       return _ctx.config ? (openBlock(), createElementBlock("div", {
         key: 0,
-        id: _ctx.config.id,
-        "data-magic-id": _ctx.config.id,
+        "data-tmagic-id": _ctx.config.id,
+        "data-tmagic-form-item-prop": itemProp.value,
         style: normalizeStyle(_ctx.config.tip ? "display: flex;align-items: baseline;" : ""),
         class: normalizeClass(`m-form-container m-container-${type.value || ""} ${_ctx.config.className || ""}`)
       }, [
@@ -349,7 +369,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         }, null, 40, ["size", "model", "last-values", "is-compare", "config", "disabled", "name", "prop", "step-active", "expand-more", "label-width"])) : type.value && display$1.value && !showDiff.value ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
           createVNode(unref(TMagicFormItem), {
             style: normalizeStyle(_ctx.config.tip ? "flex: 1" : ""),
-            class: normalizeClass({ hidden: `${itemLabelWidth.value}` === "0" || !text.value }),
+            class: normalizeClass({ "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value }),
             prop: itemProp.value,
             "label-width": itemLabelWidth.value,
             rules: rule.value
@@ -358,12 +378,12 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
               createElementVNode("span", {
                 innerHTML: type.value === "checkbox" ? "" : text.value,
                 title: _ctx.config.labelTitle
-              }, null, 8, _hoisted_2$8)
+              }, null, 8, _hoisted_2$7)
             ]),
             default: withCtx(() => [
               tooltip.value ? (openBlock(), createBlock(unref(TMagicTooltip), { key: 0 }, {
                 content: withCtx(() => [
-                  createElementVNode("div", { innerHTML: tooltip.value }, null, 8, _hoisted_3$5)
+                  createElementVNode("div", { innerHTML: tooltip.value }, null, 8, _hoisted_3$4)
                 ]),
                 default: withCtx(() => [
                   (openBlock(), createBlock(resolveDynamicComponent(tagName.value), {
@@ -396,7 +416,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                 key: 2,
                 innerHTML: extra.value,
                 class: "m-form-tip"
-              }, null, 8, _hoisted_4$4)) : createCommentVNode("", true)
+              }, null, 8, _hoisted_4$3)) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["style", "class", "prop", "label-width", "rules"]),
@@ -407,7 +427,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
             content: withCtx(() => [
               createElementVNode("div", {
                 innerHTML: _ctx.config.tip
-              }, null, 8, _hoisted_5$4)
+              }, null, 8, _hoisted_5$3)
             ]),
             default: withCtx(() => [
               createVNode(unref(TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -422,7 +442,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         ], 64)) : type.value && display$1.value && showDiff.value ? (openBlock(), createElementBlock(Fragment, { key: 3 }, [
           createVNode(unref(TMagicFormItem), {
             style: normalizeStyle([_ctx.config.tip ? "flex: 1" : "", { "background": "#f7dadd" }]),
-            class: normalizeClass({ hidden: `${itemLabelWidth.value}` === "0" || !text.value }),
+            class: normalizeClass({ "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value }),
             prop: itemProp.value,
             "label-width": itemLabelWidth.value,
             rules: rule.value
@@ -490,7 +510,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
           })) : createCommentVNode("", true),
           createVNode(unref(TMagicFormItem), {
             style: normalizeStyle([_ctx.config.tip ? "flex: 1" : "", { "background": "#def7da" }]),
-            class: normalizeClass({ hidden: `${itemLabelWidth.value}` === "0" || !text.value }),
+            class: normalizeClass({ "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value }),
             prop: itemProp.value,
             "label-width": itemLabelWidth.value,
             rules: rule.value
@@ -595,10 +615,10 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$c = ["innerHTML"];
-const _hoisted_2$7 = ["innerHTML"];
-const _hoisted_3$4 = { key: 1 };
-const _hoisted_4$3 = ["innerHTML"];
-const _hoisted_5$3 = ["innerHTML"];
+const _hoisted_2$6 = ["innerHTML"];
+const _hoisted_3$3 = { key: 1 };
+const _hoisted_4$2 = ["innerHTML"];
+const _hoisted_5$2 = ["innerHTML"];
 const _hoisted_6$1 = {
   key: 2,
   style: { "display": "flex" }
@@ -670,21 +690,21 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
                   key: 0,
                   innerHTML: _ctx.config.extra,
                   class: "m-form-tip"
-                }, null, 8, _hoisted_2$7)) : createCommentVNode("", true)
+                }, null, 8, _hoisted_2$6)) : createCommentVNode("", true)
               ]),
               _: 1
             }, 8, ["modelValue", "prop"])
           ]),
           _: 1
-        })) : (openBlock(), createElementBlock("legend", _hoisted_3$4, [
+        })) : (openBlock(), createElementBlock("legend", _hoisted_3$3, [
           createElementVNode("span", {
             innerHTML: _ctx.config.legend
-          }, null, 8, _hoisted_4$3),
+          }, null, 8, _hoisted_4$2),
           _ctx.config.extra ? (openBlock(), createElementBlock("span", {
             key: 0,
             innerHTML: _ctx.config.extra,
             class: "m-form-tip"
-          }, null, 8, _hoisted_5$3)) : createCommentVNode("", true)
+          }, null, 8, _hoisted_5$2)) : createCommentVNode("", true)
         ])),
         _ctx.config.schematic && show.value ? (openBlock(), createElementBlock("div", _hoisted_6$1, [
           createElementVNode("div", _hoisted_7, [
@@ -731,7 +751,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$b = { class: "m-fields-group-list-item" };
-const _hoisted_2$6 = ["innerHTML"];
+const _hoisted_2$5 = ["innerHTML"];
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFormGroupListItem"
@@ -832,7 +852,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
               onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
             }, {
               default: withCtx(() => [
-                createTextVNode("上移"),
+                _cache[3] || (_cache[3] = createTextVNode("上移")),
                 createVNode(unref(TMagicIcon), null, {
                   default: withCtx(() => [
                     createVNode(unref(CaretTop))
@@ -851,7 +871,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
               onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
             }, {
               default: withCtx(() => [
-                createTextVNode("下移"),
+                _cache[4] || (_cache[4] = createTextVNode("下移")),
                 createVNode(unref(TMagicIcon), null, {
                   default: withCtx(() => [
                     createVNode(unref(CaretBottom))
@@ -868,7 +888,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
             key: 1,
             innerHTML: itemExtra.value,
             class: "m-form-tip"
-          }, null, 8, _hoisted_2$6)) : createCommentVNode("", true)
+          }, null, 8, _hoisted_2$5)) : createCommentVNode("", true)
         ]),
         expand.value ? (openBlock(), createBlock(_sfc_main$x, {
           key: 0,
@@ -889,15 +909,11 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$a = { class: "m-fields-group-list" };
-const _hoisted_2$5 = ["innerHTML"];
-const _hoisted_3$3 = {
+const _hoisted_2$4 = ["innerHTML"];
+const _hoisted_3$2 = {
   key: 1,
   class: "el-table__empty-block"
 };
-const _hoisted_4$2 = /* @__PURE__ */ createElementVNode("span", { class: "el-table__empty-text" }, "暂无数据", -1);
-const _hoisted_5$2 = [
-  _hoisted_4$2
-];
 const _sfc_main$u = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFormGroupList"
@@ -983,8 +999,10 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
           key: 0,
           innerHTML: _ctx.config.extra,
           style: { "color": "rgba(0, 0, 0, 0.45)" }
-        }, null, 8, _hoisted_2$5)) : createCommentVNode("", true),
-        !_ctx.model[_ctx.name] || !_ctx.model[_ctx.name].length ? (openBlock(), createElementBlock("div", _hoisted_3$3, _hoisted_5$2)) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(_ctx.model[_ctx.name], (item, index) => {
+        }, null, 8, _hoisted_2$4)) : createCommentVNode("", true),
+        !_ctx.model[_ctx.name] || !_ctx.model[_ctx.name].length ? (openBlock(), createElementBlock("div", _hoisted_3$2, _cache[1] || (_cache[1] = [
+          createElementVNode("span", { class: "el-table__empty-text" }, "暂无数据", -1)
+        ]))) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(_ctx.model[_ctx.name], (item, index) => {
           return openBlock(), createBlock(_sfc_main$v, {
             key: index,
             model: item,
@@ -1009,9 +1027,9 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
           size: "small",
           disabled: _ctx.disabled
         }, {
-          default: withCtx(() => [
+          default: withCtx(() => _cache[2] || (_cache[2] = [
             createTextVNode("新增")
-          ]),
+          ])),
           _: 1
         }, 8, ["disabled"])) : createCommentVNode("", true),
         _ctx.config.enableToggleMode ? (openBlock(), createBlock(unref(TMagicButton), {
@@ -1020,9 +1038,9 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
           size: "small",
           onClick: toggleMode
         }, {
-          default: withCtx(() => [
+          default: withCtx(() => _cache[3] || (_cache[3] = [
             createTextVNode("切换为表格")
-          ]),
+          ])),
           _: 1
         }, 8, ["icon"])) : createCommentVNode("", true)
       ]);
@@ -1031,8 +1049,8 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$9 = { style: { "width": "100%", "display": "flex", "align-items": "center" } };
-const _hoisted_2$4 = ["innerHTML"];
-const _hoisted_3$2 = {
+const _hoisted_2$3 = ["innerHTML"];
+const _hoisted_3$1 = {
   key: 0,
   style: { "display": "flex" }
 };
@@ -1082,7 +1100,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
               key: 0,
               innerHTML: _ctx.config.extra,
               class: "m-form-tip"
-            }, null, 8, _hoisted_2$4)) : createCommentVNode("", true),
+            }, null, 8, _hoisted_2$3)) : createCommentVNode("", true),
             renderSlot(_ctx.$slots, "header", {}, () => [
               createTextVNode(toDisplayString(filter(_ctx.config.title)), 1)
             ])
@@ -1091,7 +1109,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createElementVNode("div", null, [
             renderSlot(_ctx.$slots, "default"),
-            _ctx.config.schematic ? (openBlock(), createElementBlock("div", _hoisted_3$2, [
+            _ctx.config.schematic ? (openBlock(), createElementBlock("div", _hoisted_3$1, [
               createElementVNode("div", _hoisted_4$1, [
                 (openBlock(true), createElementBlock(Fragment, null, renderList(items.value, (item, index) => {
                   return openBlock(), createBlock(_sfc_main$x, {
@@ -1317,8 +1335,8 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$8 = { class: "m-fields-table-wrap" };
-const _hoisted_2$3 = ["innerHTML"];
-const _hoisted_3$1 = ["innerHTML"];
+const _hoisted_2$2 = ["innerHTML"];
+const _hoisted_3 = ["innerHTML"];
 const _hoisted_4 = { style: { "display": "flex", "justify-content": "space-between", "margin": "10px 0" } };
 const _hoisted_5 = { style: { "display": "flex" } };
 const _hoisted_6 = {
@@ -1565,6 +1583,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       timer = setTimeout(() => {
         swapArray(index, index - 1);
+        timer = void 0;
       }, 300);
     };
     const topHandler = (index) => {
@@ -1583,6 +1602,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       timer = setTimeout(() => {
         swapArray(index, index + 1);
+        timer = void 0;
       }, 300);
     };
     const bottomHandler = (index) => {
@@ -1694,7 +1714,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
               key: 0,
               style: { "color": "rgba(0, 0, 0, 0.45)" },
               innerHTML: _ctx.config.extra
-            }, null, 8, _hoisted_2$3)) : createCommentVNode("", true),
+            }, null, 8, _hoisted_2$2)) : createCommentVNode("", true),
             createVNode(unref(TMagicTooltip), {
               content: "拖拽可排序",
               placement: "left-start",
@@ -1726,7 +1746,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                         createElementVNode("span", {
                           innerHTML: itemExtra(_ctx.config.itemExtra, scope.$index),
                           class: "m-form-tip"
-                        }, null, 8, _hoisted_3$1)
+                        }, null, 8, _hoisted_3)
                       ]),
                       _: 1
                     })) : createCommentVNode("", true),
@@ -1863,9 +1883,9 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                 plain: "",
                 onClick: _cache[2] || (_cache[2] = ($event) => newHandler())
               }, {
-                default: withCtx(() => [
+                default: withCtx(() => _cache[4] || (_cache[4] = [
                   createTextVNode("新增一行")
-                ]),
+                ])),
                 _: 1
               }, 8, ["disabled"])) : createCommentVNode("", true),
               createElementVNode("div", _hoisted_5, [
@@ -1876,9 +1896,9 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                   type: "primary",
                   onClick: toggleMode
                 }, {
-                  default: withCtx(() => [
+                  default: withCtx(() => _cache[5] || (_cache[5] = [
                     createTextVNode("展开配置")
-                  ]),
+                  ])),
                   _: 1
                 }, 8, ["icon"])) : createCommentVNode("", true),
                 _ctx.config.enableFullscreen !== false ? (openBlock(), createBlock(unref(TMagicButton), {
@@ -1910,9 +1930,9 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                       disabled: _ctx.disabled,
                       plain: ""
                     }, {
-                      default: withCtx(() => [
+                      default: withCtx(() => _cache[6] || (_cache[6] = [
                         createTextVNode("导入EXCEL")
-                      ]),
+                      ])),
                       _: 1
                     }, 8, ["disabled"])
                   ]),
@@ -1926,9 +1946,9 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                   plain: "",
                   onClick: _cache[3] || (_cache[3] = ($event) => clearHandler())
                 }, {
-                  default: withCtx(() => [
+                  default: withCtx(() => _cache[7] || (_cache[7] = [
                     createTextVNode("清空")
-                  ]),
+                  ])),
                   _: 1
                 }, 8, ["disabled"])) : createCommentVNode("", true)
               ])
@@ -1971,8 +1991,8 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
   },
   emits: ["change", "addDiffCount"],
   setup(__props, { emit: __emit }) {
-    const tabPaneComponent = getConfig$1("components")?.tabPane;
-    const tabsComponent = getConfig$1("components")?.tabs;
+    const tabPaneComponent = getDesignConfig("components")?.tabPane;
+    const tabsComponent = getDesignConfig("components")?.tabs;
     const getActive = (mForm2, props2, activeTabName2) => {
       const { config, model, prop } = props2;
       const { active } = config;
@@ -2455,7 +2475,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     useAddField(props.prop);
-    props.model[props.name] = datetimeFormatter(props.model[props.name], "");
+    props.model[props.name] = datetimeFormatter(props.model[props.name], "", props.config.valueFormat || "YYYY/MM/DD");
     const changeHandler = (v) => {
       emit("change", v);
     };
@@ -2467,8 +2487,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
         size: _ctx.size,
         placeholder: _ctx.config.placeholder,
         disabled: _ctx.disabled,
-        format: _ctx.config.format,
-        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+        format: _ctx.config.format || "YYYY/MM/DD",
+        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD",
         onChange: changeHandler
       }, null, 8, ["modelValue", "size", "placeholder", "disabled", "format", "value-format"]);
     };
@@ -2506,9 +2526,10 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
             if (!value.value) {
               value.value = [];
             }
+            const format = `${props.config.dateFormat || "YYYY/MM/DD"} ${props.config.timeFormat || "HH:mm:ss"}`;
             if (!start || !end) value.value = [];
-            if (start !== preStart) value.value[0] = new Date(start);
-            if (end !== preEnd) value.value[1] = new Date(end);
+            if (start !== preStart) value.value[0] = datetimeFormatter(start, "", format);
+            if (end !== preEnd) value.value[1] = datetimeFormatter(end, "", format);
           },
           {
             immediate: true
@@ -2518,7 +2539,11 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         watch(
           () => props.model[props.name],
           (start, preStart) => {
-            if (start !== preStart) value.value = start.map((item) => item ? new Date(item) : void 0);
+            const format = `${props.config.dateFormat || "YYYY/MM/DD"} ${props.config.timeFormat || "HH:mm:ss"}`;
+            if (start !== preStart)
+              value.value = start.map(
+                (item) => item ? datetimeFormatter(item, "", format) : void 0
+              );
           },
           {
             immediate: true
@@ -2532,7 +2557,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
           return;
         }
         if (Array.isArray(v)) {
-          props.model[item] = datetimeFormatter(v[index]?.toString(), "");
+          props.model[item] = v[index];
         } else {
           props.model[item] = void 0;
         }
@@ -2541,18 +2566,12 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     const changeHandler = (v) => {
       const value2 = v || [];
       if (props.name) {
-        emit(
-          "change",
-          value2.map((item) => {
-            if (item) return datetimeFormatter(item, "");
-            return void 0;
-          })
-        );
+        emit("change", value2);
       } else {
         if (names?.length) {
           setValue(value2);
         }
-        emit("change", value2);
+        emit("change", props.model);
       }
     };
     return (_ctx, _cache) => {
@@ -2567,8 +2586,11 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         "unlink-panels": true,
         disabled: _ctx.disabled,
         "default-time": _ctx.config.defaultTime,
+        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+        "date-format": _ctx.config.dateFormat || "YYYY/MM/DD",
+        "time-format": _ctx.config.timeFormat || "HH:mm:ss",
         onChange: changeHandler
-      }, null, 8, ["modelValue", "size", "disabled", "default-time"]);
+      }, null, 8, ["modelValue", "size", "disabled", "default-time", "value-format", "date-format", "time-format"]);
     };
   }
 });
@@ -2599,7 +2621,11 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
       if (value === "Invalid Date") {
         props.model[props.name] = "";
       } else {
-        props.model[props.name] = datetimeFormatter(props.model[props.name], "", props.config.valueFormat);
+        props.model[props.name] = datetimeFormatter(
+          props.model[props.name],
+          "",
+          props.config.valueFormat || "YYYY/MM/DD HH:mm:ss"
+        );
       }
     }
     const changeHandler = (v) => {
@@ -3055,9 +3081,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                       onClick: cancel,
                       size: "small"
                     }, {
-                      default: withCtx(() => [
+                      default: withCtx(() => _cache[2] || (_cache[2] = [
                         createTextVNode("取 消")
-                      ]),
+                      ])),
                       _: 1
                     }),
                     hasStep.value && stepActive.value > 1 ? (openBlock(), createBlock(unref(TMagicButton), {
@@ -3066,9 +3092,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                       size: "small",
                       onClick: preStep
                     }, {
-                      default: withCtx(() => [
+                      default: withCtx(() => _cache[3] || (_cache[3] = [
                         createTextVNode("上一步")
-                      ]),
+                      ])),
                       _: 1
                     })) : createCommentVNode("", true),
                     hasStep.value && stepCount.value > stepActive.value ? (openBlock(), createBlock(unref(TMagicButton), {
@@ -3077,9 +3103,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                       size: "small",
                       onClick: nextStep
                     }, {
-                      default: withCtx(() => [
+                      default: withCtx(() => _cache[4] || (_cache[4] = [
                         createTextVNode("下一步")
-                      ]),
+                      ])),
                       _: 1
                     })) : (openBlock(), createBlock(unref(TMagicButton), {
                       key: 2,
@@ -3133,7 +3159,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$4 = ["href"];
-const _hoisted_2$2 = {
+const _hoisted_2$1 = {
   key: 2,
   class: "m-fields-link"
 };
@@ -3209,15 +3235,15 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       }, toDisplayString(displayText.value), 13, _hoisted_1$4)) : _ctx.config.href && _ctx.disabled ? (openBlock(), createElementBlock("span", {
         key: 1,
         style: normalizeStyle(_ctx.config.disabledCss || {})
-      }, toDisplayString(displayText.value), 5)) : (openBlock(), createElementBlock("div", _hoisted_2$2, [
+      }, toDisplayString(displayText.value), 5)) : (openBlock(), createElementBlock("div", _hoisted_2$1, [
         createVNode(unref(TMagicButton), {
           link: "",
           type: "primary",
           onClick: editHandler
         }, {
-          default: withCtx(() => [
+          default: withCtx(() => _cache[0] || (_cache[0] = [
             createTextVNode("点击编辑")
-          ]),
+          ])),
           _: 1
         }),
         createVNode(_sfc_main$c, {
@@ -3286,7 +3312,6 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$3 = { class: "m-fields-number-range" };
-const _hoisted_2$1 = /* @__PURE__ */ createElementVNode("span", { class: "split-tag" }, "-", -1);
 const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFormNumberRange"
@@ -3327,7 +3352,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
           disabled: _ctx.disabled,
           onChange: minChangeHandler
         }, null, 8, ["modelValue", "size", "disabled"]),
-        _hoisted_2$1,
+        _cache[2] || (_cache[2] = createElementVNode("span", { class: "split-tag" }, "-", -1)),
         createVNode(unref(TMagicInput), {
           modelValue: _ctx.model[_ctx.name][1],
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.model[_ctx.name][1] = $event),
@@ -3414,8 +3439,8 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const optionComponent = getConfig$1("components")?.option;
-    const optionGroupComponent = getConfig$1("components")?.optionGroup;
+    const optionComponent = getDesignConfig("components")?.option;
+    const optionGroupComponent = getDesignConfig("components")?.optionGroup;
     if (!props.model) throw new Error("不能没有model");
     useAddField(props.prop);
     const tMagicSelect = ref();
@@ -3850,8 +3875,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$1 = { class: "m-form-item__content" };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1);
-const _hoisted_3 = { style: { "display": "flex", "justify-content": "flex-end" } };
+const _hoisted_2 = { style: { "display": "flex", "justify-content": "flex-end" } };
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFormText"
@@ -3968,8 +3992,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(TMagicPopover), {
+        width: "220px",
         visible: popoverVisible.value,
-        width: "220px"
+        "destroy-on-close": true
       }, {
         reference: withCtx(() => [
           createVNode(unref(TMagicInput), {
@@ -4004,16 +4029,16 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1$1, [
-            _hoisted_2,
-            createElementVNode("div", _hoisted_3, [
+            _cache[5] || (_cache[5] = createElementVNode("div", { class: "m-form-validate__warning" }, "输入内容前后有空格，是否移除空格？", -1)),
+            createElementVNode("div", _hoisted_2, [
               createVNode(unref(TMagicButton), {
                 link: "",
                 size: "small",
                 onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
               }, {
-                default: withCtx(() => [
+                default: withCtx(() => _cache[3] || (_cache[3] = [
                   createTextVNode("保持原样")
-                ]),
+                ])),
                 _: 1
               }),
               createVNode(unref(TMagicButton), {
@@ -4021,9 +4046,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 size: "small",
                 onClick: confirmTrimHandler
               }, {
-                default: withCtx(() => [
+                default: withCtx(() => _cache[4] || (_cache[4] = [
                   createTextVNode("移除空格")
-                ]),
+                ])),
                 _: 1
               })
             ])
@@ -4164,7 +4189,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           return;
         }
         if (Array.isArray(v)) {
-          props.model[item] = datetimeFormatter(v[index]?.toString(), "");
+          props.model[item] = v[index];
         } else {
           props.model[item] = void 0;
         }
@@ -4309,9 +4334,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   renderSlot(_ctx.$slots, "footer", {}, () => [
                     createVNode(unref(TMagicButton), { onClick: handleClose }, {
-                      default: withCtx(() => [
+                      default: withCtx(() => _cache[1] || (_cache[1] = [
                         createTextVNode("关闭")
-                      ]),
+                      ])),
                       _: 1
                     }),
                     createVNode(unref(TMagicButton), {
@@ -4486,8 +4511,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 const createForm = (config) => config;
 const defaultInstallOpt = {};
 const index = {
-  install(app, opt = {}) {
-    const option = Object.assign(defaultInstallOpt, opt);
+  install(app, opt) {
+    const option = Object.assign(defaultInstallOpt, opt || {});
     app.config.globalProperties.$MAGIC_FORM = option;
     setConfig(option);
     app.component("m-form", _sfc_main$d);
@@ -4523,4 +4548,4 @@ const index = {
   }
 };
 
-export { _sfc_main$n as MCascader, _sfc_main$m as MCheckbox, _sfc_main$l as MCheckboxGroup, _sfc_main$k as MColorPicker, _sfc_main$x as MContainer, _sfc_main$j as MDate, _sfc_main$h as MDateTime, _sfc_main$i as MDaterange, _sfc_main$g as MDisplay, _sfc_main$f as MDynamicField, _sfc_main$w as MFieldset, _sfc_main$d as MForm, _sfc_main as MFormBox, _sfc_main$c as MFormDialog, _sfc_main$1 as MFormDrawer, _sfc_main$u as MGroupList, _sfc_main$e as MHidden, _sfc_main$b as MLink, _sfc_main$a as MNumber, _sfc_main$9 as MNumberRange, _sfc_main$t as MPanel, _sfc_main$8 as MRadioGroup, _sfc_main$r as MRow, _sfc_main$7 as MSelect, _sfc_main$6 as MSwitch, _sfc_main$p as MTable, _sfc_main$o as MTabs, _sfc_main$5 as MText, _sfc_main$4 as MTextarea, _sfc_main$3 as MTime, _sfc_main$2 as MTimerange, createForm, createValues, index as default, display, filterFunction, getRules, initValue, useAddField };
+export { _sfc_main$n as MCascader, _sfc_main$m as MCheckbox, _sfc_main$l as MCheckboxGroup, _sfc_main$k as MColorPicker, _sfc_main$x as MContainer, _sfc_main$j as MDate, _sfc_main$h as MDateTime, _sfc_main$i as MDaterange, _sfc_main$g as MDisplay, _sfc_main$f as MDynamicField, _sfc_main$w as MFieldset, _sfc_main$d as MForm, _sfc_main as MFormBox, _sfc_main$c as MFormDialog, _sfc_main$1 as MFormDrawer, _sfc_main$u as MGroupList, _sfc_main$e as MHidden, _sfc_main$b as MLink, _sfc_main$a as MNumber, _sfc_main$9 as MNumberRange, _sfc_main$t as MPanel, _sfc_main$8 as MRadioGroup, _sfc_main$r as MRow, _sfc_main$7 as MSelect, _sfc_main$6 as MSwitch, _sfc_main$p as MTable, _sfc_main$o as MTabs, _sfc_main$5 as MText, _sfc_main$4 as MTextarea, _sfc_main$3 as MTime, _sfc_main$2 as MTimerange, createForm, createValues, datetimeFormatter, index as default, display, filterFunction, getRules, initValue, useAddField };