@tmagic/form 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/tmagic-form.es.js

@@ -1,7 +1,7 @@
 import { toRaw, defineComponent, inject, ref, computed, resolveComponent, watchEffect, openBlock, createElementBlock, normalizeStyle, normalizeClass, createBlock, resolveDynamicComponent, Fragment, createVNode, withCtx, createElementVNode, createCommentVNode, renderList, createTextVNode, toDisplayString, withDirectives, vShow, renderSlot, onMounted, toRefs, getCurrentInstance, watch, unref, reactive, onBeforeUnmount, vModelText, onBeforeMount, resolveDirective, createSlots, provide } from 'vue';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isEqual } from 'lodash-es';
 import { CaretRight, CaretBottom, Delete, ArrowDown, ArrowUp } from '@element-plus/icons';
-import { ElMessage, ElForm } from 'element-plus';
+import { ElMessage } from 'element-plus';
 import Sortable from 'sortablejs';
 import { asyncLoadJs, sleep, datetimeFormatter } from '@tmagic/utils';
 
@@ -1815,6 +1815,7 @@ const getActive = (mForm, props, activeTabName) => {
 };
 const tabClickHandler = (mForm, tab, props) => {
   const { config, model, prop } = props;
+  tab.name = tab.paneName;
   if (typeof config.onTabClick === "function") {
     config.onTabClick(mForm, tab, { model, formValue: mForm?.values, prop });
   }
@@ -3355,7 +3356,6 @@ var Time = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2]])
 
 const _sfc_main$1 = defineComponent({
   name: "m-form",
-  components: { ElForm, MContainer: Container },
   props: {
     initValues: {
       type: Object,
@@ -3388,8 +3388,7 @@ const _sfc_main$1 = defineComponent({
       default: () => 1
     },
     size: {
-      type: String,
-      default: "small"
+      type: String
     },
     inline: {
       type: Boolean,
@@ -3432,8 +3431,10 @@ const _sfc_main$1 = defineComponent({
       }
     });
     provide("mForm", formState);
-    watchEffect(() => {
-      initialized.value = false;
+    watch([() => props.config, () => props.initValues], ([config], [preConfig]) => {
+      if (!isEqual(toRaw(config), toRaw(preConfig))) {
+        initialized.value = false;
+      }
       initValue(formState, {
         initValues: props.initValues,
         config: props.config
@@ -3441,7 +3442,7 @@ const _sfc_main$1 = defineComponent({
         values.value = value;
         initialized.value = true;
       });
-    });
+    }, { immediate: true });
     return {
       initialized,
       values,
@@ -3474,10 +3475,9 @@ const _sfc_main$1 = defineComponent({
   }
 });
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_MContainer = resolveComponent("MContainer");
-  const _component_ElForm = resolveComponent("ElForm");
-  return _ctx.initialized && Array.isArray(_ctx.config) ? (openBlock(), createBlock(_component_ElForm, {
-    key: 0,
+  const _component_m_form_container = resolveComponent("m-form-container");
+  const _component_el_form = resolveComponent("el-form");
+  return openBlock(), createBlock(_component_el_form, {
     class: "m-form",
     ref: "elForm",
     model: _ctx.values,
@@ -3488,8 +3488,8 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     "label-position": _ctx.labelPosition
   }, {
     default: withCtx(() => [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.config, (item, index) => {
-        return openBlock(), createBlock(_component_MContainer, {
+      _ctx.initialized && Array.isArray(_ctx.config) ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(_ctx.config, (item, index) => {
+        return openBlock(), createBlock(_component_m_form_container, {
           key: item[_ctx.keyProp] ?? index,
           config: item,
           model: _ctx.values,
@@ -3498,10 +3498,10 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
           size: _ctx.size,
           onChange: _ctx.changeHandler
         }, null, 8, ["config", "model", "label-width", "step-active", "size", "onChange"]);
-      }), 128))
+      }), 128)) : createCommentVNode("", true)
     ]),
     _: 1
-  }, 8, ["model", "label-width", "disabled", "style", "inline", "label-position"])) : createCommentVNode("", true);
+  }, 8, ["model", "label-width", "disabled", "style", "inline", "label-position"]);
 }
 var Form = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
 
@@ -3521,6 +3521,7 @@ const _sfc_main = defineComponent({
       default: () => []
     },
     labelWidth: [Number, String],
+    size: String,
     confirmText: {
       type: String,
       default: "\u786E\u5B9A"
@@ -3691,11 +3692,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             modelValue: _ctx.stepActive,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.stepActive = $event),
             ref: "form",
+            size: _ctx.size,
             config: _ctx.config,
             "init-values": _ctx.values,
             "label-width": _ctx.labelWidth,
             onChange: _ctx.changeHandler
-          }, null, 8, ["modelValue", "config", "init-values", "label-width", "onChange"]),
+          }, null, 8, ["modelValue", "size", "config", "init-values", "label-width", "onChange"]),
           renderSlot(_ctx.$slots, "default")
         ], 4)
       ]),