@tmagic/form 1.4.0 → 1.4.2

package/src/fields/Select.vue

@@ -19,25 +19,63 @@
     @change="changeHandler"
     @visible-change="visibleHandler"
   >
-    <template v-if="config.group"><SelectOptionGroups :options="groupOptions"></SelectOptionGroups></template>
-    <template v-else><SelectOptions :options="itemOptions"></SelectOptions></template>
+    <template v-if="config.group">
+      <component
+        v-for="(group, index) in (options as SelectGroupOption[])"
+        :key="index"
+        :is="optionGroupComponent?.component"
+        v-bind="
+          optionGroupComponent?.props({
+            label: group.label,
+            disabled: group.disabled,
+          })
+        "
+      >
+        <component
+          v-for="(item, index) in group.options"
+          :is="optionComponent?.component"
+          :key="index"
+          v-bind="
+            optionComponent?.props({
+              label: item.label || item.text,
+              value: item.value,
+              disabled: item.disabled,
+            })
+          "
+        >
+        </component>
+      </component>
+    </template>
+    <template v-else>
+      <component
+        v-for="option in (options as SelectOption[])"
+        class="tmagic-design-option"
+        :key="config.valueKey ? option.value[config.valueKey] : option.value"
+        :is="optionComponent?.component"
+        v-bind="
+          optionComponent?.props({
+            label: option.text,
+            value: option.value,
+            disabled: option.disabled,
+          })
+        "
+      >
+      </component>
+    </template>
     <div v-loading="true" v-if="moreLoadingVisible"></div>
   </TMagicSelect>
 </template>
 
 <script lang="ts" setup>
-import { inject, nextTick, onBeforeMount, Ref, ref, watch, watchEffect } from 'vue';
+import { inject, nextTick, onBeforeMount, ref, watch, watchEffect } from 'vue';
 
-import { TMagicSelect } from '@tmagic/design';
+import { getConfig as getDesignConfig, TMagicSelect } from '@tmagic/design';
 import { getValueByKeyPath } from '@tmagic/utils';
 
 import type { FieldProps, FormState, SelectConfig, SelectGroupOption, SelectOption } from '../schema';
 import { getConfig } from '../utils/config';
 import { useAddField } from '../utils/useAddField';
 
-import SelectOptionGroups from './SelectOptionGroups.vue';
-import SelectOptions from './SelectOptions.vue';
-
 defineOptions({
   name: 'MFormSelect',
 });
@@ -46,6 +84,9 @@ const props = defineProps<FieldProps<SelectConfig>>();
 
 const emit = defineEmits(['change']);
 
+const optionComponent = getDesignConfig('components')?.option;
+const optionGroupComponent = getDesignConfig('components')?.optionGroup;
+
 if (!props.model) throw new Error('不能没有model');
 useAddField(props.prop);
 
@@ -394,7 +435,4 @@ const remoteMethod = async (q: string) => {
       }, 0);
   }
 };
-
-const itemOptions = options as Ref<SelectOption[]>;
-const groupOptions = options as Ref<SelectGroupOption[]>;
 </script>

package/src/index.ts

@@ -89,9 +89,7 @@ export { default as MSelect } from './fields/Select.vue';
 export { default as MCascader } from './fields/Cascader.vue';
 export { default as MDynamicField } from './fields/DynamicField.vue';
 
-export const createForm = function (config: FormConfig) {
-  return config;
-};
+export const createForm = <T extends [] = []>(config: FormConfig | T) => config;
 
 export interface InstallOptions {
   [key: string]: any;

package/src/schema.ts

@@ -122,6 +122,7 @@ export interface Rule {
   type?: string;
   /** 是否必填 */
   required?: boolean;
+  trigger?: string;
   /** 自定义验证器 */
   validator?: (
     options: {

package/types/index.d.ts

@@ -35,7 +35,7 @@ export { default as MLink } from './fields/Link.vue';
 export { default as MSelect } from './fields/Select.vue';
 export { default as MCascader } from './fields/Cascader.vue';
 export { default as MDynamicField } from './fields/DynamicField.vue';
-export declare const createForm: (config: FormConfig) => FormConfig;
+export declare const createForm: <T extends [] = []>(config: FormConfig | T) => FormConfig | T;
 export interface InstallOptions {
     [key: string]: any;
 }

package/types/schema.d.ts

@@ -94,6 +94,7 @@ export interface Rule {
     type?: string;
     /** 是否必填 */
     required?: boolean;
+    trigger?: string;
     /** 自定义验证器 */
     validator?: (options: {
         rule: string;

package/src/fields/SelectOptionGroups.vue

@@ -1,29 +0,0 @@
-<template>
-  <TMagicOptionGroup v-for="(group, index) in options" :key="index" :label="group.label" :disabled="group.disabled">
-    <component
-      v-for="(item, index) in group.options"
-      :is="uiComponent"
-      :key="index"
-      :label="item.label || item.text"
-      :value="item.value"
-      :disabled="item.disabled"
-    >
-    </component>
-  </TMagicOptionGroup>
-</template>
-
-<script lang="ts" setup>
-import { getConfig, TMagicOptionGroup } from '@tmagic/design';
-
-import { SelectGroupOption } from '../schema';
-
-defineOptions({
-  name: 'MFormSelectOptionGroups',
-});
-
-defineProps<{
-  options: SelectGroupOption[];
-}>();
-
-const uiComponent = getConfig('components')?.option.component || 'el-option';
-</script>

package/src/fields/SelectOptions.vue

@@ -1,24 +0,0 @@
-<template>
-  <TMagicOption
-    v-for="option in options"
-    :label="option.text"
-    :value="option.value"
-    :key="valueKey ? option.value[valueKey] : option.value"
-    :disabled="option.disabled"
-  ></TMagicOption>
-</template>
-
-<script lang="ts" setup>
-import { TMagicOption } from '@tmagic/design';
-
-import { SelectOption } from '../schema';
-
-defineOptions({
-  name: 'MFormSelectOptions',
-});
-
-defineProps<{
-  options: SelectOption[];
-  valueKey?: string;
-}>();
-</script>

package/types/fields/SelectOptionGroups.vue.d.ts

@@ -1,16 +0,0 @@
-import { SelectGroupOption } from '../schema';
-declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
-    options: SelectGroupOption[];
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<{
-    options: SelectGroupOption[];
-}>>>, {}, {}>;
-export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};

package/types/fields/SelectOptions.vue.d.ts

@@ -1,18 +0,0 @@
-import { SelectOption } from '../schema';
-declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
-    options: SelectOption[];
-    valueKey?: string | undefined;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<{
-    options: SelectOption[];
-    valueKey?: string | undefined;
-}>>>, {}, {}>;
-export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};