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

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.13",
   "name": "@tmagic/form",
   "sideEffects": false,
   "main": "dist/tmagic-form.umd.js",
@@ -16,8 +16,11 @@
       "require": "./dist/style.css"
     }
   },
+  "license": "Apache-2.0",
   "scripts": {
-    "build": "vite build"
+    "build": "vite build",
+    "test": "jest --maxWorkers=8",
+    "test:coverage": "jest --maxWorkers=16 --coverage"
   },
   "engines": {
     "node": ">=14"
@@ -28,26 +31,32 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-beta.10",
+    "@tmagic/utils": "^1.0.0-beta.13",
     "element-plus": "^2.1.7",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "sortablejs": "^1.14.0",
     "vue": "^3.2.0"
   },
   "devDependencies": {
+    "@types/jest": "^26.0.23",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^15.12.4",
     "@types/sortablejs": "^1.10.7",
     "@vitejs/plugin-vue": "^1.2.3",
     "@vitejs/plugin-vue-jsx": "^1.1.6",
     "@vue/compiler-sfc": "^3.2.0",
-    "@vue/test-utils": "^2.0.0-rc.12",
+    "@vue/test-utils": "^2.0.0-rc.20",
+    "@vue/vue3-jest": "^27.0.0-alpha.4",
+    "jest": "^27.5.1",
+    "jest-serializer-vue": "^2.0.2",
+    "jest-transform-stub": "^2.0.0",
     "sass": "^1.35.1",
+    "ts-jest": "^27.1.4",
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
   },
-  "gitHead": "fc39ecb4f5b117a4ebbfd115382887983cb8f9de"
+  "gitHead": "ca2b203614cbdaff580e5cb6f35630f50b827451"
 }

package/src/Form.vue

@@ -86,7 +86,7 @@ export default defineComponent({
     },
 
     size: {
-      type: String,
+      type: String as PropType<'small' | 'default' | 'large'>,
     },
 
     inline: {

package/src/FormDialog.vue

@@ -78,7 +78,7 @@ export default defineComponent({
 
     labelWidth: [Number, String],
 
-    size: String as PropType<'mini' | 'small' | 'medium'>,
+    size: String as PropType<'small' | 'default' | 'large'>,
 
     confirmText: {
       type: String,

package/src/fields/Select.vue

@@ -15,7 +15,7 @@
     :value-key="config.valueKey || 'value'"
     :allow-create="config.allowCreate"
     :disabled="disabled"
-    :remote-method="remoteMethod"
+    :remote-method="config.remote && remoteMethod"
     @change="changeHandler"
     @visible-change="visibleHandler"
   >
@@ -354,8 +354,6 @@ export default defineComponent({
         return getConfig('request');
       },
 
-      async getInitOption() {},
-
       changeHandler(value: any) {
         emit('change', value);
       },

package/src/fields/Text.vue

@@ -14,6 +14,7 @@
       <el-button
         v-if="typeof config.append === 'object' && config.append.type === 'button'"
         style="color: #409eff"
+        :size="size"
         @click.prevent="buttonClickHandler"
       >
         {{ config.append.text }}
@@ -43,6 +44,8 @@ export default defineComponent({
   emits: ['change', 'input'],
 
   setup(props, { emit }) {
+    const mForm = inject<FormState | undefined>('mForm');
+
     useAddField(props.prop);
 
     const modelName = computed(() => props.name || props.config.name || '');
@@ -54,14 +57,11 @@ export default defineComponent({
       },
 
       inputHandler(v: string | number) {
-        const mForm = inject<FormState | undefined>('mForm');
         emit('input', v);
         mForm?.$emit('field-input', props.prop, v);
       },
 
       buttonClickHandler() {
-        const mForm = inject<FormState | undefined>('mForm');
-
         if (typeof props.config.append === 'string') return;
 
         if (props.config.append?.handler) {

package/src/utils/form.ts

@@ -122,7 +122,11 @@ const initValueItem = function (
   // 这种情况比较多，提前结束
   if (name && !items && typeof initValue[name] !== 'undefined') {
     if (typeof value[name] === 'undefined') {
-      value[name] = typeof initValue[name] === 'object' ? cloneDeep(initValue[name]) : initValue[name];
+      if (type === 'number') {
+        value[name] = Number(initValue[name]);
+      } else {
+        value[name] = typeof initValue[name] === 'object' ? cloneDeep(initValue[name]) : initValue[name];
+      }
     }
 
     return value;

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "../..",
-  },
-  "exclude": [
-    "**/dist/**/*"
-  ],
-}

package/vite.config.ts

@@ -1,27 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making TMagicEditor available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { defineConfig } from 'vite';
-
-import { getBaseConfig } from '../vite-config';
-
-import pkg from './package.json';
-
-const deps = Object.keys(pkg.dependencies);
-
-export default defineConfig(getBaseConfig(deps, 'TMagicForm'));