@tmagic/form 1.0.0-beta.13 → 1.0.0-beta.14

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "name": "@tmagic/form",
   "sideEffects": false,
   "main": "dist/tmagic-form.umd.js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-beta.13",
+    "@tmagic/utils": "^1.0.0-beta.14",
     "element-plus": "^2.1.7",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.2",
@@ -58,5 +58,5 @@
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
   },
-  "gitHead": "ca2b203614cbdaff580e5cb6f35630f50b827451"
+  "gitHead": "02dd9fa31c856c6a4812af156bed0e1839c46599"
 }

package/src/Form.vue

@@ -177,7 +177,7 @@ export default defineComponent({
       submitForm: async (native?: boolean): Promise<any> => {
         try {
           await elForm.value?.validate();
-          return native ? values.value : cloneDeep(values.value);
+          return native ? values.value : cloneDeep(toRaw(values.value));
         } catch (invalidFields: any) {
           const error: string[] = [];
 

package/src/containers/Col.vue

@@ -0,0 +1,56 @@
+<template>
+  <el-col v-show="display && config.type !== 'hidden'" :span="span">
+    <m-form-container
+      :model="model"
+      :config="config"
+      :prop="prop"
+      :label-width="config.labelWidth || labelWidth"
+      :expand-more="expandMore"
+      :size="size"
+      @change="changeHandler"
+    ></m-form-container>
+  </el-col>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, inject, PropType } from 'vue';
+
+import { ChildConfig, FormState } from '../schema';
+import { display as displayFunction } from '../utils/form';
+
+export default defineComponent({
+  props: {
+    labelWidth: String,
+    expandMore: Boolean,
+    span: Number,
+
+    model: {
+      type: Object,
+      default: () => ({}),
+    },
+
+    config: {
+      type: Object as PropType<ChildConfig>,
+      default: () => ({}),
+    },
+
+    prop: String,
+
+    size: String,
+  },
+
+  emits: ['change'],
+
+  setup(props, { emit }) {
+    const mForm = inject<FormState | undefined>('mForm');
+
+    const changeHandler = () => emit('change', props.model);
+
+    return {
+      mForm,
+      display: computed(() => displayFunction(mForm, props.config.display, props)),
+      changeHandler,
+    };
+  },
+});
+</script>

package/src/containers/Row.vue

@@ -1,21 +1,17 @@
 <template>
   <el-row :gutter="10">
-    <el-col
+    <Col
       v-for="(col, index) in config.items"
-      :style="!display(col) || col.type === 'hidden' ? 'display: none' : ''"
       :key="col[mForm?.keyProp || '__key'] ?? index"
-      :span="col.span || config.span || 24 / config.items.length"
-    >
-      <m-form-container
-        :model="name ? model[name] : model"
-        :config="col"
-        :prop="prop"
-        :label-width="config.labelWidth || labelWidth"
-        :expand-more="expandMore"
-        :size="size"
-        @change="changeHandler"
-      ></m-form-container>
-    </el-col>
+      :span="config.span || config.span || 24 / config.items.length"
+      :config="col"
+      :labelWidth="config.labelWidth || labelWidth"
+      :expandMore="expandMore"
+      :model="name ? model[name] : model"
+      :prop="prop"
+      :size="size"
+      @change="changeHandler"
+    />
   </el-row>
 </template>
 
@@ -23,11 +19,14 @@
 import { defineComponent, inject, PropType } from 'vue';
 
 import { FormState, RowConfig } from '../schema';
-import { display as displayFunction } from '../utils/form';
+
+import Col from './Col.vue';
 
 export default defineComponent({
   name: 'm-form-row',
 
+  components: { Col },
+
   props: {
     labelWidth: String,
     expandMore: Boolean,
@@ -58,9 +57,6 @@ export default defineComponent({
 
     return {
       mForm,
-      display(config: any) {
-        return displayFunction(mForm, config.display, props);
-      },
       changeHandler,
     };
   },

package/src/fields/Checkbox.vue

@@ -43,7 +43,7 @@ export default defineComponent({
           return props.config.activeValue;
         }
 
-        return 'true';
+        return undefined;
       }),
 
       inactiveValue: computed(() => {
@@ -55,7 +55,7 @@ export default defineComponent({
           return props.config.inactiveValue;
         }
 
-        return 'false';
+        return undefined;
       }),
 
       changeHandler(value: number | boolean) {

package/src/fields/Textarea.vue

@@ -1,17 +1,15 @@
 <template>
-  <div v-if="model">
-    <el-input
-      v-model="model[name]"
-      type="textarea"
-      :size="size"
-      clearable
-      :placeholder="config.placeholder"
-      :disabled="disabled"
-      @change="changeHandler"
-      @input="inputHandler"
-    >
-    </el-input>
-  </div>
+  <el-input
+    v-model="model[name]"
+    type="textarea"
+    :size="size"
+    clearable
+    :placeholder="config.placeholder"
+    :disabled="disabled"
+    @change="changeHandler"
+    @input="inputHandler"
+  >
+  </el-input>
 </template>
 
 <script lang="ts">