@tmagic/form 1.0.0-rc.4 → 1.0.0-rc.7

package/dist/types/src/fields/DynamicField.vue.d.ts

@@ -34,10 +34,10 @@ declare const _default: DefineComponent<{
 }, {
     request: Function;
     fieldMap: {
-        [x: string]: any;
+        [key: string]: any;
     };
     fieldLabelMap: {
-        [x: string]: any;
+        [key: string]: any;
     };
     unwatch: WatchStopHandle;
     changeFieldMap: () => Promise<void>;

package/dist/types/src/index.d.ts

@@ -31,6 +31,6 @@ export { default as MSelect } from './fields/Select.vue';
 export { default as MCascader } from './fields/Cascader.vue';
 export { default as MDynamicField } from './fields/DynamicField.vue';
 declare const _default: {
-    install: (app: App<any>, opt: any) => void;
+    install: (app: App, opt: any) => void;
 };
 export default _default;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.7",
   "name": "@tmagic/form",
   "sideEffects": [
     "dist/*",
@@ -22,9 +22,7 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "build": "vite build",
-    "test": "jest --maxWorkers=8",
-    "test:coverage": "jest --maxWorkers=16 --coverage"
+    "build": "vite build"
   },
   "engines": {
     "node": ">=14"
@@ -35,7 +33,7 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-rc.4",
+    "@tmagic/utils": "1.0.0-rc.7",
     "element-plus": "^2.2.0",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.2",
@@ -48,25 +46,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.18.0",
-    "@types/jest": "^27.5.1",
     "@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.20",
-    "@vue/vue3-jest": "^27.0.0-alpha.4",
-    "babel-jest": "^27.0.6",
-    "jest": "^27.5.1",
-    "jest-serializer-vue": "^2.0.2",
-    "jest-transform-stub": "^2.0.0",
+    "@vue/test-utils": "^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": "28d5ad4573a27fa240f5e7d0902d3368e8d936b6"
+  }
 }

package/src/containers/Container.vue

@@ -32,7 +32,7 @@
     <template v-else-if="type && display">
       <el-form-item
         :style="config.tip ? 'flex: 1' : ''"
-        :class="{ hidden: itemLabelWidth === 0 || !config.text }"
+        :class="{ hidden: `${itemLabelWidth}` === '0' || !config.text }"
         :prop="itemProp"
         :label-width="itemLabelWidth"
         :rules="rule"
@@ -154,7 +154,18 @@ export default defineComponent({
 
     const items = computed(() => (props.config as ContainerCommonConfig).items);
 
-    const itemProp = computed(() => (name.value ? `${props.prop}${props.prop ? '.' : ''}${name.value}` : props.prop));
+    const itemProp = computed(() => {
+      let n: string | number = '';
+      const { names } = props.config as any;
+      if (names?.[0]) {
+        [n] = names;
+      } else if (name.value) {
+        n = name.value;
+      } else {
+        return props.prop;
+      }
+      return `${props.prop}${props.prop ? '.' : ''}${n}`;
+    });
 
     const tagName = computed(() => {
       const component = resolveComponent(`m-${items.value ? 'form' : 'fields'}-${type.value}`);

package/src/fields/Daterange.vue

@@ -60,6 +60,14 @@ export default defineComponent({
         });
       } else if (props.model && props.name && v instanceof Date) {
         props.model[props.name] = datetimeFormatter(v.toString(), '');
+      } else if (names?.length) {
+        names.forEach((item) => {
+          if (props.model) {
+            props.model[item] = undefined;
+          }
+        });
+      } else if (props.name) {
+        props.model[props.name] = undefined;
       }
     };