@tmagic/form 1.2.9 → 1.2.11

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.9",
+  "version": "1.2.11",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/design": "1.2.9",
-    "@tmagic/utils": "1.2.9",
+    "@tmagic/design": "1.2.11",
+    "@tmagic/utils": "1.2.11",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.14.0",
     "vue": "^3.2.37"

package/src/containers/Container.vue

@@ -48,6 +48,7 @@
             :size="size"
             :is="tagName"
             :model="model"
+            :last-values="lastValues"
             :config="config"
             :name="name"
             :disabled="disabled"
@@ -66,6 +67,7 @@
           :size="size"
           :is="tagName"
           :model="model"
+          :last-values="lastValues"
           :config="config"
           :name="name"
           :disabled="disabled"
@@ -74,7 +76,7 @@
           @addDiffCount="onAddDiffCount"
         ></component>
 
-        <div v-if="extra" v-html="extra" class="m-form-tip"></div>
+        <div v-if="extra && type !== 'table'" v-html="extra" class="m-form-tip"></div>
       </TMagicFormItem>
 
       <TMagicTooltip v-if="config.tip" placement="left">
@@ -193,7 +195,7 @@
           v-for="item in items"
           :key="key(item)"
           :model="name || name === 0 ? model[name] : model"
-          :last-values="name || name === 0 ? lastValues[name] : lastValues"
+          :last-values="name || name === 0 ? lastValues[name] || {} : lastValues"
           :is-compare="isCompare"
           :config="item"
           :size="size"
@@ -258,7 +260,6 @@ const mForm = inject<FormState | undefined>('mForm');
 const expand = ref(false);
 
 const name = computed(() => props.config.name || '');
-
 // 是否展示两个版本的对比内容
 const showDiff = computed(() => {
   if (!props.isCompare) return false;

package/src/containers/GroupListItem.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="m-fields-group-list-item">
     <div>
-      <TMagicIcon style="margin-right: 7px" @click="expandHandler"
-        ><CaretBottom v-if="expand" /><CaretRight v-else
-      /></TMagicIcon>
-
-      <TMagicButton text :disabled="disabled" @click="expandHandler">{{ title }}</TMagicButton>
+      <TMagicButton text :disabled="disabled" :icon="expand ? CaretBottom : CaretRight" @click="expandHandler">{{
+        title
+      }}</TMagicButton>
 
       <TMagicButton
         v-show="showDelete(parseInt(String(index)))"

package/src/containers/Panel.vue

@@ -5,11 +5,11 @@
     :body-style="{ display: expand ? 'block' : 'none' }"
   >
     <template #header>
-      <div class="clearfix">
-        <a href="javascript:" style="width: 100%; display: block" @click="expand = !expand">
-          <TMagicIcon><CaretBottom v-if="expand" /><CaretRight v-else /></TMagicIcon> {{ filter(config.title) }}
-          <span v-if="config && config.extra" v-html="config.extra" class="m-form-tip"></span>
-        </a>
+      <div style="width: 100%; display: flex; align-items: center">
+        <TMagicButton style="padding: 0" text :icon="expand ? CaretBottom : CaretRight" @click="expand = !expand">
+        </TMagicButton>
+        <span v-if="config && config.extra" v-html="config.extra" class="m-form-tip"></span>
+        <slot name="header">{{ filter(config.title) }}</slot>
       </div>
     </template>
 
@@ -61,7 +61,7 @@
 import { computed, inject, ref } from 'vue';
 import { CaretBottom, CaretRight } from '@element-plus/icons-vue';
 
-import { TMagicCard, TMagicIcon } from '@tmagic/design';
+import { TMagicButton, TMagicCard } from '@tmagic/design';
 
 import { FormState, PanelConfig } from '../schema';
 import { filterFunction } from '../utils/form';
@@ -73,7 +73,7 @@ const props = defineProps<{
   lastValues?: any;
   isCompare?: boolean;
   config: PanelConfig;
-  name: string;
+  name?: string;
   labelWidth?: string;
   prop?: string;
   size?: string;

package/src/containers/Table.vue

@@ -272,11 +272,8 @@ const foreUpdate = () => {
 };
 
 const swapArray = (index1: number, index2: number) => {
-  [props.model[modelName.value][index1]] = props.model[modelName.value].splice(
-    index2,
-    1,
-    props.model[modelName.value][index1],
-  );
+  props.model[modelName.value].splice(index1, 0, props.model[modelName.value].splice(index2, 1)[0]);
+
   if (props.sortKey) {
     for (let i = props.model[modelName.value].length - 1, v = 0; i >= 0; i--, v++) {
       props.model[modelName.value][v][props.sortKey] = i;

package/types/containers/Panel.vue.d.ts

@@ -8,7 +8,7 @@ declare const _default: {
             lastValues?: any;
             isCompare?: boolean | undefined;
             config: PanelConfig;
-            name: string;
+            name?: string | undefined;
             labelWidth?: string | undefined;
             prop?: string | undefined;
             size?: string | undefined;
@@ -35,7 +35,7 @@ declare const _default: {
             lastValues?: any;
             isCompare?: boolean | undefined;
             config: PanelConfig;
-            name: string;
+            name?: string | undefined;
             labelWidth?: string | undefined;
             prop?: string | undefined;
             size?: string | undefined;
@@ -68,7 +68,7 @@ declare const _default: {
         lastValues?: any;
         isCompare?: boolean | undefined;
         config: PanelConfig;
-        name: string;
+        name?: string | undefined;
         labelWidth?: string | undefined;
         prop?: string | undefined;
         size?: string | undefined;
@@ -85,7 +85,7 @@ declare const _default: {
     lastValues?: any;
     isCompare?: boolean | undefined;
     config: PanelConfig;
-    name: string;
+    name?: string | undefined;
     labelWidth?: string | undefined;
     prop?: string | undefined;
     size?: string | undefined;
@@ -95,6 +95,7 @@ declare const _default: {
     onAddDiffCount?: ((...args: any[]) => any) | undefined;
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "addDiffCount")[], "change" | "addDiffCount", {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {
+        header: (_: {}) => any;
         default: (_: {}) => any;
     };
 });