@tmagic/form 1.1.5 → 1.2.0-beta.1

package/dist/style.css

@@ -155,6 +155,10 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-table .el-form-item {
   margin-bottom: 0;
 }
+.m-fields-table .m-table-delete-icon {
+  color: #f56c6c;
+  cursor: pointer;
+}
 
 .m-select {
   width: 100%;

package/dist/tmagic-form.mjs

@@ -1,5 +1,5 @@
 import { toRaw, defineComponent, inject, ref, computed, resolveComponent, watchEffect, openBlock, createElementBlock, normalizeStyle, normalizeClass, createBlock, resolveDynamicComponent, Fragment, createVNode, withCtx, createElementVNode, createCommentVNode, renderList, createTextVNode, toDisplayString, watch, unref, withDirectives, vShow, renderSlot, onMounted, toRefs, getCurrentInstance, reactive, onBeforeUnmount, vModelText, onBeforeMount, resolveDirective, createSlots, withModifiers, provide, Teleport } from 'vue';
-import { WarningFilled, CaretBottom, CaretRight, CaretTop, Delete, ArrowDown, ArrowUp, FullScreen, Grid } from '@element-plus/icons-vue';
+import { WarningFilled, CaretBottom, CaretRight, CaretTop, Delete, Grid, ArrowDown, ArrowUp, FullScreen } from '@element-plus/icons-vue';
 import { cloneDeep, isEqual } from 'lodash-es';
 import { ElMessage } from 'element-plus';
 import Sortable from 'sortablejs';
@@ -848,6 +848,7 @@ const _sfc_main$r = defineComponent({
       }));
     };
     return {
+      Grid,
       addable,
       toggleMode,
       removeHandler,
@@ -906,7 +907,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["onClick"])) : createCommentVNode("", true),
     _ctx.config.enableToggleMode ? (openBlock(), createBlock(_component_el_button, {
       key: 4,
-      icon: "el-icon-s-grid",
+      icon: _ctx.Grid,
       size: "small",
       onClick: _ctx.toggleMode
     }, {
@@ -914,7 +915,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         _hoisted_7$1
       ]),
       _: 1
-    }, 8, ["onClick"])) : createCommentVNode("", true)
+    }, 8, ["icon", "onClick"])) : createCommentVNode("", true)
   ]);
 }
 const GroupList = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_render$m]]);
@@ -1217,10 +1218,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
 }
 const MStep = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$i]]);
 
-let loadedAMapJS = false;
-let firstLoadingAMapJS = true;
 const _sfc_main$m = defineComponent({
-  name: "m-form-table",
   props: {
     name: {
       type: String,
@@ -1257,9 +1255,14 @@ const _sfc_main$m = defineComponent({
     enableToggleMode: {
       type: Boolean,
       default: true
+    },
+    showIndex: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["change", "select"],
+  components: { Delete },
   setup(props, { emit }) {
     let timer = null;
     const mForm = inject("mForm");
@@ -1374,17 +1377,14 @@ const _sfc_main$m = defineComponent({
       props.model[modelName.value].push(inputs);
       emit("change", props.model[modelName.value]);
     };
-    if (!loadedAMapJS && firstLoadingAMapJS && !globalThis.XLSX) {
-      firstLoadingAMapJS = false;
-      asyncLoadJs("https://cdn.bootcdn.net/ajax/libs/xlsx/0.17.0/xlsx.full.min.js").then(() => {
-        loadedAMapJS = true;
-      }).catch(() => {
-        firstLoadingAMapJS = true;
-      });
+    if (!globalThis.XLSX) {
+      asyncLoadJs("https://cdn.bootcdn.net/ajax/libs/xlsx/0.17.0/xlsx.full.min.js");
     }
     onMounted(() => {
       if (props.config.defautSort) {
         sortChange(props.config.defautSort);
+      } else if (props.config.defaultSort) {
+        sortChange(props.config.defaultSort);
       }
       if (props.sort && props.sortKey) {
         props.model[modelName.value].sort((a, b) => b[props.sortKey] - a[props.sortKey]);
@@ -1612,6 +1612,8 @@ const _hoisted_10 = {
 };
 function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_table_column = resolveComponent("el-table-column");
+  const _component_Delete = resolveComponent("Delete");
+  const _component_el_icon = resolveComponent("el-icon");
   const _component_el_button = resolveComponent("el-button");
   const _component_el_tooltip = resolveComponent("el-tooltip");
   const _component_m_form_container = resolveComponent("m-form-container");
@@ -1662,16 +1664,20 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
               })) : createCommentVNode("", true),
               createVNode(_component_el_table_column, {
                 label: "\u64CD\u4F5C",
-                width: "60",
+                width: "55",
+                align: "center",
                 fixed: _ctx.config.fixed === false ? void 0 : "left"
               }, {
                 default: withCtx((scope) => [
-                  withDirectives(createVNode(_component_el_button, {
-                    type: "danger",
-                    text: "",
-                    icon: _ctx.Delete,
+                  withDirectives(createVNode(_component_el_icon, {
+                    class: "m-table-delete-icon",
                     onClick: ($event) => _ctx.removeHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1)
-                  }, null, 8, ["icon", "onClick"]), [
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(_component_Delete)
+                    ]),
+                    _: 2
+                  }, 1032, ["onClick"]), [
                     [vShow, _ctx.showDelete(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1)]
                   ])
                 ]),
@@ -1729,7 +1735,8 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
                 type: "selection",
                 width: "45"
               })) : createCommentVNode("", true),
-              createVNode(_component_el_table_column, {
+              _ctx.showIndex && _ctx.config.showIndex ? (openBlock(), createBlock(_component_el_table_column, {
+                key: 3,
                 width: "60",
                 label: "\u5E8F\u53F7"
               }, {
@@ -1737,7 +1744,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
                   createTextVNode(toDisplayString(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize), 1)
                 ]),
                 _: 1
-              }),
+              })) : createCommentVNode("", true),
               (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.config.items, (column, index) => {
                 return openBlock(), createElementBlock(Fragment, null, [
                   column.type !== "hidden" && _ctx.display(column.display) ? (openBlock(), createBlock(_component_el_table_column, {
@@ -3106,34 +3113,23 @@ const _sfc_main$6 = defineComponent({
       return options2;
     };
     if (typeof props.config.options === "function") {
-      watch(
-        () => mForm?.values,
-        () => {
-          typeof props.config.options === "function" && Promise.resolve(
-            props.config.options(mForm, {
-              model: props.model,
-              prop: props.prop,
-              formValues: mForm?.values,
-              formValue: mForm?.values,
-              config: props.config
-            })
-          ).then((data) => {
-            options.value = data;
-          });
-        },
-        {
-          deep: true,
-          immediate: true
-        }
-      );
+      watchEffect(() => {
+        typeof props.config.options === "function" && Promise.resolve(
+          props.config.options(mForm, {
+            model: props.model,
+            prop: props.prop,
+            formValues: mForm?.values,
+            formValue: mForm?.values,
+            config: props.config
+          })
+        ).then((data) => {
+          options.value = data;
+        });
+      });
     } else if (Array.isArray(props.config.options)) {
-      watch(
-        () => props.config.options,
-        () => {
-          options.value = props.config.options;
-        },
-        { immediate: true }
-      );
+      watchEffect(() => {
+        options.value = props.config.options;
+      });
     } else if (props.config.option) {
       onBeforeMount(() => {
         if (!props.model)
@@ -3904,7 +3900,7 @@ const install = (app, opt) => {
   app.component(Panel.name, Panel);
   app.component(Row.name, Row);
   app.component(MStep.name, MStep);
-  app.component(Table.name, Table);
+  app.component("m-form-table", Table);
   app.component(Tabs.name, Tabs);
   app.component(Text.name, Text);
   app.component(Number$1.name, Number$1);