@tmagic/form 1.7.8-beta.2 → 1.7.8-beta.4

package/dist/es/FormDialog.vue_vue_type_script_setup_true_lang.js

@@ -57,13 +57,13 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const stepActive = ref(1);
 		const bodyHeight = ref(`${document.body.clientHeight - 194}px`);
 		const stepCount = computed(() => {
-			const { length } = props.config;
-			for (let index = 0; index < length; index++) if (props.config[index].type === "step") return props.config[index].items.length;
+			if (!Array.isArray(props.config)) return 0;
+			for (const item of props.config) if ("type" in item && item.type === "step") return item.items.length;
 			return 0;
 		});
 		const hasStep = computed(() => {
-			const { length } = props.config;
-			for (let index = 0; index < length; index++) if (props.config[index].type === "step") return true;
+			if (!Array.isArray(props.config)) return false;
+			for (const item of props.config) if ("type" in item && item.type === "step") return true;
 			return false;
 		});
 		const closeHandler = () => {

package/dist/es/containers/Col.vue_vue_type_script_setup_true_lang.js

@@ -52,7 +52,7 @@ var Col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 					"disabled"
 				])]),
 				_: 1
-			}, 8, ["span"])), [[vShow, display$1.value && __props.config.type !== "hidden"]]);
+			}, 8, ["span"])), [[vShow, display$1.value && "type" in __props.config && __props.config.type !== "hidden"]]);
 		};
 	}
 });

package/dist/es/containers/Container.vue_vue_type_script_setup_true_lang.js

@@ -60,7 +60,7 @@ var Container_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 			return `${n}`;
 		});
 		const type = computed(() => {
-			let { type } = props.config;
+			let type = "type" in props.config ? props.config.type : "";
 			type = type && filterFunction(mForm, type, props);
 			if (type === "form") return "";
 			if (type === "container") return "";

package/dist/es/utils/form.js

@@ -42,7 +42,8 @@ var setValue = (mForm, value, initValue, item) => {
 var initValueItem = function(mForm, item, initValue, value) {
 	const { items } = item;
 	const { names } = item;
-	const { type, name } = item;
+	const type = "type" in item ? item.type : "";
+	const { name } = item;
 	if (isTableSelect(type) && name) {
 		value[name] = initValue[name] ?? "";
 		return value;

package/dist/tmagic-form.umd.cjs

@@ -2655,7 +2655,8 @@
 	var initValueItem = function(mForm, item, initValue, value) {
 		const { items } = item;
 		const { names } = item;
-		const { type, name } = item;
+		const type = "type" in item ? item.type : "";
+		const { name } = item;
 		if (isTableSelect(type) && name) {
 			value[name] = initValue[name] ?? "";
 			return value;
@@ -2934,7 +2935,7 @@
 				return `${n}`;
 			});
 			const type = (0, vue.computed)(() => {
-				let { type } = props.config;
+				let type = "type" in props.config ? props.config.type : "";
 				type = type && filterFunction(mForm, type, props);
 				if (type === "form") return "";
 				if (type === "container") return "";
@@ -3593,13 +3594,13 @@
 			const stepActive = (0, vue.ref)(1);
 			const bodyHeight = (0, vue.ref)(`${document.body.clientHeight - 194}px`);
 			const stepCount = (0, vue.computed)(() => {
-				const { length } = props.config;
-				for (let index = 0; index < length; index++) if (props.config[index].type === "step") return props.config[index].items.length;
+				if (!Array.isArray(props.config)) return 0;
+				for (const item of props.config) if ("type" in item && item.type === "step") return item.items.length;
 				return 0;
 			});
 			const hasStep = (0, vue.computed)(() => {
-				const { length } = props.config;
-				for (let index = 0; index < length; index++) if (props.config[index].type === "step") return true;
+				if (!Array.isArray(props.config)) return false;
+				for (const item of props.config) if ("type" in item && item.type === "step") return true;
 				return false;
 			});
 			const closeHandler = () => {
@@ -4432,7 +4433,7 @@
 						"disabled"
 					])]),
 					_: 1
-				}, 8, ["span"])), [[vue.vShow, display$2.value && __props.config.type !== "hidden"]]);
+				}, 8, ["span"])), [[vue.vShow, display$2.value && "type" in __props.config && __props.config.type !== "hidden"]]);
 			};
 		}
 	});

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.8-beta.2",
+  "version": "1.7.8-beta.4",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -52,9 +52,9 @@
   "peerDependencies": {
     "vue": "^3.5.24",
     "typescript": "^5.9.3",
-    "@tmagic/design": "1.7.8-beta.2",
-    "@tmagic/utils": "1.7.8-beta.2",
-    "@tmagic/form-schema": "1.7.8-beta.2"
+    "@tmagic/utils": "1.7.8-beta.4",
+    "@tmagic/design": "1.7.8-beta.4",
+    "@tmagic/form-schema": "1.7.8-beta.4"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/FormDialog.vue

@@ -117,19 +117,25 @@ const stepActive = ref(1);
 const bodyHeight = ref(`${document.body.clientHeight - 194}px`);
 
 const stepCount = computed(() => {
-  const { length } = props.config;
-  for (let index = 0; index < length; index++) {
-    if (props.config[index].type === 'step') {
-      return (props.config[index] as StepConfig).items.length;
+  if (!Array.isArray(props.config)) {
+    return 0;
+  }
+
+  for (const item of props.config) {
+    if ('type' in item && item.type === 'step') {
+      return (item as StepConfig).items.length;
     }
   }
   return 0;
 });
 
 const hasStep = computed(() => {
-  const { length } = props.config;
-  for (let index = 0; index < length; index++) {
-    if (props.config[index].type === 'step') {
+  if (!Array.isArray(props.config)) {
+    return false;
+  }
+
+  for (const item of props.config) {
+    if ('type' in item && item.type === 'step') {
       return true;
     }
   }

package/src/containers/Col.vue

@@ -1,5 +1,5 @@
 <template>
-  <TMagicCol v-show="display && config.type !== 'hidden'" :span="span">
+  <TMagicCol v-show="display && 'type' in config && config.type !== 'hidden'" :span="span">
     <Container
       :model="model"
       :lastValues="lastValues"
@@ -21,7 +21,7 @@ import { computed, inject } from 'vue';
 
 import { TMagicCol } from '@tmagic/design';
 
-import type { ChildConfig, ContainerChangeEventData, FormState } from '../schema';
+import type { ContainerChangeEventData, FormItemConfig, FormState } from '../schema';
 import { display as displayFunction } from '../utils/form';
 
 import Container from './Container.vue';
@@ -34,8 +34,8 @@ const props = defineProps<{
   model: any;
   lastValues?: any;
   isCompare?: boolean;
-  config: ChildConfig;
-  labelWidth?: string;
+  config: FormItemConfig;
+  labelWidth?: string | number;
   expandMore?: boolean;
   span?: number;
   size?: string;

package/src/containers/Container.vue

@@ -175,10 +175,10 @@ import { getValueByKeyPath } from '@tmagic/utils';
 import MHidden from '../fields/Hidden.vue';
 import type {
   CheckboxConfig,
-  ChildConfig,
   ComponentConfig,
   ContainerChangeEventData,
   ContainerCommonConfig,
+  FormItemConfig,
   FormState,
   FormValue,
   ToolTipConfigType,
@@ -198,10 +198,10 @@ const props = withDefaults(
     model: FormValue;
     /** 需对比的值（开启对比模式时传入） */
     lastValues?: FormValue;
-    config: ChildConfig;
+    config: FormItemConfig;
     prop?: string;
     disabled?: boolean;
-    labelWidth?: string;
+    labelWidth?: string | number;
     expandMore?: boolean;
     stepActive?: string | number;
     size?: string;
@@ -253,7 +253,7 @@ const itemProp = computed(() => {
 });
 
 const type = computed((): string => {
-  let { type } = props.config;
+  let type = 'type' in props.config ? props.config.type : '';
   type = type && filterFunction<string>(mForm, type, props);
   if (type === 'form') return '';
   if (type === 'container') return '';

package/src/table/useAdd.ts

@@ -1,7 +1,7 @@
 import { computed, inject } from 'vue';
 
 import { tMagicMessage } from '@tmagic/design';
-import type { FormState } from '@tmagic/form-schema';
+import type { FormConfig, FormState } from '@tmagic/form-schema';
 
 import { initValue } from '../utils/form';
 
@@ -86,7 +86,7 @@ export const useAdd = (
       }
 
       inputs = await initValue(mForm, {
-        config: columns,
+        config: columns as FormConfig,
         initValues: inputs,
       });
     }

package/src/table/useTableColumns.ts

@@ -3,7 +3,7 @@ import { WarningFilled } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
 import { type TableColumnOptions, TMagicIcon, TMagicTooltip } from '@tmagic/design';
-import type { FormState, TableColumnConfig } from '@tmagic/form-schema';
+import type { FormItemConfig, FormState, TableColumnConfig } from '@tmagic/form-schema';
 
 import Container from '../containers/Container.vue';
 import type { ContainerChangeEventData } from '../schema';
@@ -68,7 +68,7 @@ export const useTableColumns = (
     return `${props.prop}${props.prop ? '.' : ''}${index + 1 + currentPage.value * pageSize.value - 1}`;
   };
 
-  const makeConfig = (config: TableColumnConfig, row: any) => {
+  const makeConfig = (config: TableColumnConfig, row: any): TableColumnConfig => {
     const newConfig = cloneDeep(config);
     if (typeof config.itemsFunction === 'function') {
       newConfig.items = config.itemsFunction(row);
@@ -199,7 +199,7 @@ export const useTableColumns = (
               disabled: props.disabled,
               prop: getProp($index),
               rules: column.rules,
-              config: makeConfig(column, row),
+              config: makeConfig(column, row) as FormItemConfig,
               model: row,
               lastValues: lastData.value[$index],
               isCompare: props.isCompare,

package/src/utils/form.ts

@@ -23,13 +23,12 @@ import { cloneDeep } from 'lodash-es';
 
 import { getValueByKeyPath } from '@tmagic/utils';
 
-import {
+import type {
   ChildConfig,
   ContainerCommonConfig,
   DaterangeConfig,
   FilterFunction,
   FormConfig,
-  FormItem,
   FormState,
   FormValue,
   HtmlField,
@@ -120,7 +119,8 @@ const initValueItem = function (
 ) {
   const { items } = item as ContainerCommonConfig;
   const { names } = item as DaterangeConfig;
-  const { type, name } = item as FormItem;
+  const type = 'type' in item ? item.type : '';
+  const { name } = item;
 
   if (isTableSelect(type) && name) {
     value[name] = initValue[name] ?? '';
@@ -172,8 +172,8 @@ export const createValues = function (
   value: FormValue = {},
 ) {
   if (Array.isArray(config)) {
-    config.forEach((item: ChildConfig | TabPaneConfig) => {
-      initValueItem(mForm, item, initValue, value);
+    config.forEach((item) => {
+      initValueItem(mForm, item as ChildConfig | TabPaneConfig, initValue, value);
     });
   }
 

package/types/index.d.ts

@@ -95,13 +95,13 @@ declare const __VLS_export$31: _vue_runtime_core0.DefineComponent<__VLS_Props$30
   inline: boolean;
   labelPosition: string;
   config: schema_d_exports.FormConfig;
+  height: string;
   initValues: Record<string, any>;
   lastValues: Record<string, any>;
   isCompare: boolean;
   keyProp: string;
   parentValues: Record<string, any>;
   stepActive: string | number;
-  height: string;
 }, {}, {}, {}, string, _vue_runtime_core0.ComponentProvideOptions, false, {}, any>;
 declare const _default$12: typeof __VLS_export$31;
 //#endregion
@@ -181,13 +181,13 @@ declare const __VLS_base$4: _vue_runtime_core0.DefineComponent<__VLS_Props$29, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -234,13 +234,13 @@ declare const __VLS_base$4: _vue_runtime_core0.DefineComponent<__VLS_Props$29, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined, _vue_runtime_core0.CreateComponentPublicInstanceWithMixins<Readonly<{
     config: schema_d_exports.FormConfig;
     initValues: Record<string, any>;
@@ -286,13 +286,13 @@ declare const __VLS_base$4: _vue_runtime_core0.DefineComponent<__VLS_Props$29, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -339,13 +339,13 @@ declare const __VLS_base$4: _vue_runtime_core0.DefineComponent<__VLS_Props$29, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined>;
   saveFetch: _vue_reactivity0.Ref<boolean, boolean>;
   dialogVisible: _vue_reactivity0.Ref<boolean, boolean>;
@@ -453,13 +453,13 @@ declare const __VLS_base$3: _vue_runtime_core0.DefineComponent<__VLS_Props$28, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -506,13 +506,13 @@ declare const __VLS_base$3: _vue_runtime_core0.DefineComponent<__VLS_Props$28, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined, _vue_runtime_core0.CreateComponentPublicInstanceWithMixins<Readonly<{
     config: schema_d_exports.FormConfig;
     initValues: Record<string, any>;
@@ -558,13 +558,13 @@ declare const __VLS_base$3: _vue_runtime_core0.DefineComponent<__VLS_Props$28, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -611,13 +611,13 @@ declare const __VLS_base$3: _vue_runtime_core0.DefineComponent<__VLS_Props$28, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined>;
   saveFetch: _vue_reactivity0.Ref<boolean, boolean>;
   bodyHeight: _vue_reactivity0.Ref<number, number>;
@@ -723,13 +723,13 @@ declare const __VLS_base$2: _vue_runtime_core0.DefineComponent<__VLS_Props$27, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -776,13 +776,13 @@ declare const __VLS_base$2: _vue_runtime_core0.DefineComponent<__VLS_Props$27, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined, _vue_runtime_core0.CreateComponentPublicInstanceWithMixins<Readonly<{
     config: schema_d_exports.FormConfig;
     initValues: Record<string, any>;
@@ -828,13 +828,13 @@ declare const __VLS_base$2: _vue_runtime_core0.DefineComponent<__VLS_Props$27, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -881,13 +881,13 @@ declare const __VLS_base$2: _vue_runtime_core0.DefineComponent<__VLS_Props$27, {
     inline: boolean;
     labelPosition: string;
     config: schema_d_exports.FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | undefined>;
   saveFetch: _vue_reactivity0.Ref<boolean, boolean>;
   show: () => void;
@@ -917,10 +917,10 @@ type __VLS_WithSlots$2<T, S> = T & {
 type __VLS_Props$26 = {
   /** 表单值 */model: schema_d_exports.FormValue; /** 需对比的值（开启对比模式时传入） */
   lastValues?: schema_d_exports.FormValue;
-  config: schema_d_exports.ChildConfig;
+  config: schema_d_exports.FormItemConfig;
   prop?: string;
   disabled?: boolean;
-  labelWidth?: string;
+  labelWidth?: string | number;
   expandMore?: boolean;
   stepActive?: string | number;
   size?: string; /** 是否开启对比模式 */