@airpower/web 0.2.14 → 0.2.16

package/dist/components/table/component/ColumnSelector.vue.d.ts

@@ -1,3 +1,4 @@
+import { ITransformerConstructor } from '@airpower/transformer';
 import { RootEntity } from '../../../base';
 import { ITableColumn } from '../../../curd';
 declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
@@ -5,7 +6,7 @@ declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<
         readonly onChanged?: ((args_0: string[]) => any) | undefined;
     } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onChanged"> & {
         columnList: Array<ITableColumn>;
-        entityInstance: E;
+        entityClass: ITransformerConstructor<E>;
     } & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
     attrs: any;

package/dist/components/table/useTableColumn.d.ts

@@ -1,3 +1,4 @@
+import { ITransformerConstructor } from '@airpower/transformer';
 import { Ref } from 'vue';
 import { RootEntity } from '../../base';
 import { IModelConfig, ITableColumn } from '../../curd';
@@ -8,9 +9,9 @@ import { IModelConfig, ITableColumn } from '../../curd';
  */
 export declare function useTableColumn<E extends RootEntity>(params: {
     /**
-     * ### 实体实例
+     * ### 实体类
      */
-    entityInstance: E;
+    entityClass: ITransformerConstructor<E>;
     /**
      * ### 自定义字段
      */

package/dist/curd/decorator/@Field/Field.d.ts

@@ -1,5 +1,5 @@
 import { EnumKey } from '@airpower/enum/dist/enum/type';
-import { DecoratorTarget } from '@airpower/transformer';
+import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
 import { RootModel } from '../../../base';
 import { WebEnumConstructor } from '../../../util';
 import { IFieldConfig } from './IFieldConfig';
@@ -12,19 +12,19 @@ export declare function Field<K extends EnumKey = EnumKey>(config?: FieldConfigO
 /**
  * ### 获取属性的配置
  * @returns 配置对象
- * @param target 目标类
+ * @param TargetClass 目标类
  * @param key 属性名
  */
-export declare function getFieldConfig<M extends RootModel, K extends EnumKey = EnumKey>(target: M, key: string): IFieldConfig<K>;
+export declare function getFieldConfig<M extends RootModel, K extends EnumKey = EnumKey>(TargetClass: ITransformerConstructor<M>, key: string): IFieldConfig<K>;
 /**
  * ### 获取属性的枚举字典
- * @param target 目标类
+ * @param TargetClass 目标类
  * @param key 属性名
  */
-export declare function getDictionary<M extends RootModel, K extends EnumKey = EnumKey>(target: M, key: string): WebEnumConstructor<K> | undefined;
+export declare function getDictionary<M extends RootModel, K extends EnumKey = EnumKey>(TargetClass: ITransformerConstructor<M>, key: string): WebEnumConstructor<K> | undefined;
 /**
  * ### 获取属性的标题
- * @param target 目标类
+ * @param TargetClass 目标类
  * @param key string 属性名
  */
-export declare function getFieldLabel<M extends RootModel>(target: M, key: string): string;
+export declare function getFieldLabel<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: string): string;

package/dist/curd/decorator/@Form/Form.d.ts

@@ -1,4 +1,4 @@
-import { DecoratorTarget } from '@airpower/transformer';
+import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
 import { RootModel } from '../../../base';
 import { FieldConfigOptionalKey } from '../@Field';
 import { IFormField } from './IFormField';
@@ -9,18 +9,18 @@ import { IFormField } from './IFormField';
 export declare function Form(config?: FieldConfigOptionalKey<IFormField>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象某个字段标记的表单配置项
- * @param target 目标类或对象
+ * @param TargetClass 目标类
  * @param key 属性名
  */
-export declare function getFormConfig<M extends RootModel>(target: M, key: string): IFormField;
+export declare function getFormConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: string): IFormField;
 /**
  * ### 获取标记了表单配置的字段列表
- * @param target 目标对象
+ * @param TargetClass 目标类
  */
-export declare function getFormFieldList<M extends RootModel>(target: M): string[];
+export declare function getFormFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): string[];
 /**
  * ### 获取指定类的表单字段配置项列表
- * @param target 目标类或对象
+ * @param TargetClass 目标类
  * @param keyList 选择字段列表
  */
-export declare function getFormConfigList<M extends RootModel>(target: M, keyList?: string[]): IFormField[];
+export declare function getFormConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: string[]): IFormField[];

package/dist/curd/decorator/@Model/Model.d.ts

@@ -1,4 +1,4 @@
-import { DecoratorTarget, Transformer } from '@airpower/transformer';
+import { DecoratorTarget, ITransformerConstructor, Transformer } from '@airpower/transformer';
 import { IModelConfig } from './IModelConfig';
 /**
  * ### 为模型类标记配置项
@@ -7,11 +7,11 @@ import { IModelConfig } from './IModelConfig';
 export declare function Model<T extends IModelConfig = IModelConfig>(config?: T): (target: DecoratorTarget) => void;
 /**
  * ### 获取模型类配置项
- * @param target 实例
+ * @param TargetClass 目标类
  */
-export declare function getModelConfig<E extends Transformer, T extends IModelConfig = IModelConfig>(target: E): T;
+export declare function getModelConfig<E extends Transformer, T extends IModelConfig = IModelConfig>(TargetClass: ITransformerConstructor<E>): T;
 /**
  * ### 获取模型类名称
- * @param target 实例
+ * @param TargetClass 目标类
  */
-export declare function getModelName<E extends Transformer>(target: E): string;
+export declare function getModelName<E extends Transformer>(TargetClass: ITransformerConstructor<E>): string;

package/dist/curd/decorator/@Search/Search.d.ts

@@ -1,4 +1,4 @@
-import { DecoratorTarget } from '@airpower/transformer';
+import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
 import { RootModel } from '../../../base';
 import { FieldConfigOptionalKey } from '../@Field';
 import { ISearchField } from './ISearchField';
@@ -9,18 +9,18 @@ import { ISearchField } from './ISearchField';
 export declare function Search(config?: FieldConfigOptionalKey<ISearchField>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象某个字段标记的搜索配置项
- * @param target 目标类或对象
+ * @param TargetClass 目标类
  * @param key 属性名
  */
-export declare function getSearchConfig<M extends RootModel>(target: M, key: string): ISearchField;
+export declare function getSearchConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: string): ISearchField;
 /**
  * ### 获取标记了搜索配置的字段列表
- * @param target 目标对象
+ * @param TargetClass 目标类
  */
-export declare function getSearchFieldList<M extends RootModel>(target: M): string[];
+export declare function getSearchFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): string[];
 /**
  * ### 获取指定类的搜索字段配置项列表
- * @param target 目标类或对象
+ * @param TargetClass 目标类
  * @param keyList 选择字段列表
  */
-export declare function getSearchConfigList<M extends RootModel>(target: M, keyList?: string[]): ISearchField[];
+export declare function getSearchConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: string[]): ISearchField[];

package/dist/curd/decorator/@Table/Table.d.ts

@@ -1,4 +1,4 @@
-import { DecoratorTarget } from '@airpower/transformer';
+import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
 import { RootModel } from '../../../base';
 import { FieldConfigOptionalKey } from '../@Field';
 import { ITableColumn } from './ITableColumn';
@@ -9,18 +9,18 @@ import { ITableColumn } from './ITableColumn';
 export declare function Table(config?: FieldConfigOptionalKey<ITableColumn>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象的属性表格的配置
- * @param target 目标对象
+ * @param TargetClass 目标类
  * @param key 属性名
  */
-export declare function getTableConfig<M extends RootModel>(target: M, key: string): ITableColumn;
+export declare function getTableConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: string): ITableColumn;
 /**
  * ### 获取标记了表格配置的字段列表
- * @param target 目标对象
+ * @param TargetClass 目标类
  */
-export declare function getTableFieldList<M extends RootModel>(target: M): string[];
+export declare function getTableFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): string[];
 /**
  * ### 获取字段标记的表格字段配置列表
- * @param target 目标实体类
+ * @param TargetClass 目标类
  * @param keyList 字段列表
  */
-export declare function getTableConfigList<M extends RootModel>(target: M, keyList?: string[]): Array<ITableColumn>;
+export declare function getTableConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: string[]): Array<ITableColumn>;

package/dist/main.js

@@ -1151,16 +1151,16 @@ function Field(config = {}) {
     DecoratorUtil.setFieldConfig(target, key, KEY$4, config);
   };
 }
-function getFieldConfig(target, key) {
-  return DecoratorUtil.getFieldConfig(target, key, KEY$4, true) || {};
+function getFieldConfig(TargetClass, key) {
+  return DecoratorUtil.getFieldConfig(TargetClass, key, KEY$4, true) || {};
 }
-function getDictionary(target, key) {
+function getDictionary(TargetClass, key) {
   var _a;
-  return (_a = getFieldConfig(target, key)) == null ? void 0 : _a.dictionary;
+  return (_a = getFieldConfig(TargetClass, key)) == null ? void 0 : _a.dictionary;
 }
-function getFieldLabel(target, key) {
+function getFieldLabel(TargetClass, key) {
   var _a;
-  return ((_a = getFieldConfig(target, key)) == null ? void 0 : _a.label) || key;
+  return ((_a = getFieldConfig(TargetClass, key)) == null ? void 0 : _a.label) || key;
 }
 const KEY$3 = `${DecoratorUtil.DecoratorKeyPrefix}[Form]`;
 const LIST_KEY$2 = `${DecoratorUtil.DecoratorKeyPrefix}[FormList]`;
@@ -1170,27 +1170,27 @@ function Form(config = {}) {
     DecoratorUtil.setFieldConfig(target, key, KEY$3, config);
   };
 }
-function getFormConfig(target, key) {
-  const formConfig = DecoratorUtil.getFieldConfig(target, key, KEY$3, true);
+function getFormConfig(TargetClass, key) {
+  const formConfig = DecoratorUtil.getFieldConfig(TargetClass, key, KEY$3, true);
   if (!formConfig) {
     return { key };
   }
   if (!formConfig.dictionary) {
-    const props = getFieldConfig(target, key);
+    const props = getFieldConfig(TargetClass, key);
     if (props && props.dictionary) {
       formConfig.dictionary = props.dictionary;
     }
   }
   return formConfig;
 }
-function getFormFieldList(target) {
-  return DecoratorUtil.getFieldList(target, LIST_KEY$2);
+function getFormFieldList(TargetClass) {
+  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY$2);
 }
-function getFormConfigList(target, keyList = []) {
+function getFormConfigList(TargetClass, keyList = []) {
   if (keyList.length === 0) {
-    keyList = getFormFieldList(target);
+    keyList = getFormFieldList(TargetClass);
   }
-  const list = keyList.map((key) => getFormConfig(target, key));
+  const list = keyList.map((key) => getFormConfig(TargetClass, key));
   return list.filter((item) => !item.hide).sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 var FormTrim = /* @__PURE__ */ ((FormTrim2) => {
@@ -1203,11 +1203,11 @@ const KEY$2 = `${DecoratorUtil.DecoratorKeyPrefix}[MODEL]`;
 function Model(config = {}) {
   return (target) => DecoratorUtil.setClassConfig(target, KEY$2, config);
 }
-function getModelConfig(target) {
-  return DecoratorUtil.getClassConfig(target, KEY$2, {}, true);
+function getModelConfig(TargetClass) {
+  return DecoratorUtil.getClassConfig(TargetClass, KEY$2, {}, true);
 }
-function getModelName(target) {
-  return getModelConfig(target).label || target.constructor.name;
+function getModelName(TargetClass) {
+  return getModelConfig(TargetClass).label || TargetClass.name;
 }
 const KEY$1 = `${DecoratorUtil.DecoratorKeyPrefix}[Search]`;
 const LIST_KEY$1 = `${DecoratorUtil.DecoratorKeyPrefix}[SearchList]`;
@@ -1217,21 +1217,22 @@ function Search(config = {}) {
     DecoratorUtil.setFieldConfig(target, key, KEY$1, config);
   };
 }
-function getSearchConfig(target, key) {
-  const formConfig = DecoratorUtil.getFieldConfig(target, key, KEY$1, true);
+function getSearchConfig(TargetClass, key) {
+  const instance = new TargetClass();
+  const formConfig = DecoratorUtil.getFieldConfig(instance, key, KEY$1, true);
   if (!formConfig) {
     return { key };
   }
   return formConfig;
 }
-function getSearchFieldList(target) {
-  return DecoratorUtil.getFieldList(target, LIST_KEY$1);
+function getSearchFieldList(TargetClass) {
+  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY$1);
 }
-function getSearchConfigList(target, keyList = []) {
+function getSearchConfigList(TargetClass, keyList = []) {
   if (keyList.length === 0) {
-    keyList = getSearchFieldList(target);
+    keyList = getSearchFieldList(TargetClass);
   }
-  const list = keyList.map((key) => getSearchConfig(target, key));
+  const list = keyList.map((key) => getSearchConfig(TargetClass, key));
   return list.filter((item) => !item.hide).sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 const KEY = `${DecoratorUtil.DecoratorKeyPrefix}[Table]`;
@@ -1242,21 +1243,22 @@ function Table(config = {}) {
     DecoratorUtil.setFieldConfig(target, key, KEY, config);
   };
 }
-function getTableConfig(target, key) {
-  const tableConfig = DecoratorUtil.getFieldConfig(target, key, KEY, true);
+function getTableConfig(TargetClass, key) {
+  const instance = new TargetClass();
+  const tableConfig = DecoratorUtil.getFieldConfig(instance, key, KEY, true);
   if (!tableConfig) {
     return { key };
   }
   return tableConfig;
 }
-function getTableFieldList(target) {
-  return DecoratorUtil.getFieldList(target, LIST_KEY);
+function getTableFieldList(TargetClass) {
+  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY);
 }
-function getTableConfigList(target, keyList = []) {
+function getTableConfigList(TargetClass, keyList = []) {
   if (keyList.length === 0) {
-    keyList = getTableFieldList(target);
+    keyList = getTableFieldList(TargetClass);
   }
-  const list = keyList.map((key) => getTableConfig(target, key));
+  const list = keyList.map((key) => getTableConfig(TargetClass, key));
   return list.sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 function useDetail(props, ServiceClass, option = {}) {
@@ -3638,11 +3640,10 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
     if (!formData) {
       throw new Error("请手动为AFormField绑定v-model或使用 useEditor 创建表单对象(推荐)！！！");
     }
-    const entityClass = inject("entityClass") || props.entity;
-    if (!entityClass) {
+    const EntityClass = inject("entityClass") || props.entity;
+    if (!EntityClass) {
       throw new Error("请手动传入到AFormField的entity属性或使用 useEditor 创建表单对象(推荐)！！！");
     }
-    const entityInstance = computed(() => Transformer.newInstance(entityClass));
     function onChange(val) {
       formData.value[props.field] = val;
       emits("update:modelValue", formData.value);
@@ -3653,7 +3654,7 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElFormItem), {
-        label: unref(getFieldLabel)(entityInstance.value, __props.field),
+        label: unref(getFieldLabel)(unref(EntityClass), __props.field),
         prop: __props.field
       }, {
         default: withCtx(() => [
@@ -3663,7 +3664,7 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(formData)[__props.field] = $event),
               disabled: __props.disabled,
               "disabled-value": __props.disabledValue,
-              entity: unref(entityClass),
+              entity: unref(EntityClass),
               list: __props.list,
               "model-modifiers": { field: __props.field },
               modifier: __props.field,
@@ -7084,7 +7085,6 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const entityInstance = ref(props.entity ? Transformer.parse({}, props.entity) : void 0);
     const value = ref(props.modelValue);
     function emitChange() {
       emits("change", value.value);
@@ -7229,12 +7229,11 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     function init() {
       var _a, _b;
       initFieldName();
-      console.warn(props.entity, fieldName.value, entityInstance.value);
-      if (props.entity && fieldName.value && entityInstance.value) {
-        formConfig.value = getFormConfig(entityInstance.value, fieldName.value);
-        fieldConfig.value = getFieldConfig(entityInstance.value, fieldName.value);
+      if (props.entity && fieldName.value) {
+        formConfig.value = getFormConfig(props.entity, fieldName.value);
+        fieldConfig.value = getFieldConfig(props.entity, fieldName.value);
         if (!placeholderRef.value) {
-          const field = fieldConfig.value.label || getFieldConfig(entityInstance.value, fieldName.value).label || fieldName;
+          const field = fieldConfig.value.label || getFieldConfig(props.entity, fieldName.value).label || fieldName;
           placeholderRef.value = `请输入${field}...`;
           if (formConfig.value) {
             if (dictionary.value || fieldConfig.value.dictionary || props.list || props.tree || formConfig.value.dateType !== void 0) {
@@ -9231,7 +9230,6 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       onSelected,
       onReloadData
     } = useSelector(props.props, service, hookOptions);
-    const entityInstance = Transformer.parse({}, props.entity);
     const dialogTitle = computed(() => {
       if (props.title) {
         return props.title;
@@ -9242,10 +9240,10 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       if (props.fieldList) {
         return props.fieldList;
       }
-      return getTableConfigList(entityInstance);
+      return getTableConfigList(props.entity);
     });
     const searchParamList = computed(() => {
-      let list2 = getSearchConfigList(entityInstance);
+      let list2 = getSearchConfigList(props.entity);
       if (props.searchParams) {
         list2 = props.searchParams;
       }
@@ -9382,7 +9380,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "ColumnSelector",
   props: {
     columnList: {},
-    entityInstance: {}
+    entityClass: { type: Function }
   },
   emits: ["changed"],
   setup(__props, { emit: __emit }) {
@@ -9439,7 +9437,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                     onChange: ($event) => changed($event, item)
                   }, {
                     default: withCtx(() => [
-                      createTextVNode(toDisplayString(unref(getFieldLabel)(_ctx.entityInstance, item.key)), 1)
+                      createTextVNode(toDisplayString(unref(getFieldLabel)(_ctx.entityClass, item.key)), 1)
                     ]),
                     _: 2
                   }, 1032, ["checked", "class", "disabled", "onChange"]);
@@ -9453,7 +9451,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnSelector = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-cd8bfac9"]]);
+const ColumnSelector = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-476fd094"]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "CopyColumn",
   props: {
@@ -9574,10 +9572,10 @@ function useTableButton(params) {
 }
 function useTableColumn(params) {
   const {
-    entityInstance,
+    entityClass,
     customColumns = [],
     hideColumnSelector = false,
-    modelConfig = getModelConfig(entityInstance)
+    modelConfig = getModelConfig(entityClass)
   } = params;
   const selectKeys = ref([]);
   const allColumnList = ref([]);
@@ -9589,7 +9587,7 @@ function useTableColumn(params) {
       return item;
     });
   } else {
-    allColumnList.value = getTableConfigList(entityInstance).filter((item) => !item.removed).map((item) => {
+    allColumnList.value = getTableConfigList(entityClass).filter((item) => !item.removed).map((item) => {
       if (item.money && !item.align) {
         item.align = "right";
       }
@@ -10015,14 +10013,14 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const airTableRef = ref();
     const tableId = `table_${Math.random()}`;
     const entityInstance = Transformer.newInstance(props.entity);
-    const modelConfig = getModelConfig(entityInstance);
+    const modelConfig = getModelConfig(props.entity);
     const {
       allColumnList,
       isColumnSelectorEnabled,
       updateSelectKeys,
       showColumnList
     } = useTableColumn({
-      entityInstance,
+      entityClass: props.entity,
       customColumns: props.columnList,
       hideColumnSelector: props.hideColumnSelector,
       modelConfig
@@ -10056,7 +10054,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       selectable: props.selectable,
       isAddDisabled: props.disableAddRow
     });
-    const searchFieldList = computed(() => props.searchParams || getSearchConfigList(entityInstance));
+    const searchFieldList = computed(() => props.searchParams || getSearchConfigList(props.entity));
     function getStringValue(data) {
       if (data === void 0 || data === null) {
         return "";
@@ -10306,20 +10304,20 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   class: "a-table-toolbar-search-item"
                 }, [
                   renderSlot(_ctx.$slots, item.key, { data: searchFilter.value }, () => [
-                    unref(getDictionary)(unref(entityInstance), item.key) ? (openBlock(), createBlock(unref(ElSelect), {
+                    unref(getDictionary)(__props.entity, item.key) ? (openBlock(), createBlock(unref(ElSelect), {
                       key: 0,
                       modelValue: searchFilter.value[item.key],
                       "onUpdate:modelValue": ($event) => searchFilter.value[item.key] = $event,
                       clearable: item.clearable !== false,
                       filterable: item.filterable,
-                      placeholder: `${unref(getFieldLabel)(unref(entityInstance), item.key)}...`,
+                      placeholder: `${unref(getFieldLabel)(__props.entity, item.key)}...`,
                       onChange: _cache[2] || (_cache[2] = ($event) => onSearch()),
                       onClear: ($event) => searchFilter.value[item.key] = void 0
                     }, {
                       default: withCtx(() => {
                         var _a;
                         return [
-                          (openBlock(true), createElementBlock(Fragment, null, renderList((_a = unref(getDictionary)(unref(entityInstance), item.key)) == null ? void 0 : _a.toArray(), (enumItem) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList((_a = unref(getDictionary)(__props.entity, item.key)) == null ? void 0 : _a.toArray(), (enumItem) => {
                             return openBlock(), createElementBlock(Fragment, null, [
                               !enumItem.disabled ? (openBlock(), createBlock(unref(ElOption), {
                                 key: enumItem.key.toString(),
@@ -10336,7 +10334,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                       modelValue: searchFilter.value[item.key],
                       "onUpdate:modelValue": ($event) => searchFilter.value[item.key] = $event,
                       clearable: item.clearable !== false,
-                      placeholder: `${unref(getFieldLabel)(unref(entityInstance), item.key)}...`,
+                      placeholder: `${unref(getFieldLabel)(__props.entity, item.key)}...`,
                       onBlur: _cache[3] || (_cache[3] = ($event) => onSearch()),
                       onClear: onSearch,
                       onKeydown: withKeys(onSearch, ["enter"])
@@ -10360,9 +10358,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             unref(isColumnSelectorEnabled) ? (openBlock(), createBlock(unref(ColumnSelector), {
               key: 1,
               "column-list": unref(allColumnList),
-              "entity-instance": unref(entityInstance),
+              "entity-class": __props.entity,
               onChanged: _cache[5] || (_cache[5] = ($event) => unref(updateSelectKeys)($event))
-            }, null, 8, ["column-list", "entity-instance"])) : createCommentVNode("", true)
+            }, null, 8, ["column-list", "entity-class"])) : createCommentVNode("", true)
           ])
         ]),
         unref(allColumnList) ? (openBlock(), createBlock(unref(ElTable), {
@@ -10409,7 +10407,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 key: item.key,
                 align: item.align,
                 fixed: item.fixed,
-                label: unref(getFieldLabel)(unref(entityInstance), item.key),
+                label: unref(getFieldLabel)(__props.entity, item.key),
                 "min-width": item.minWidth || "auto",
                 prop: item.key,
                 sortable: item.sortable,
@@ -10422,11 +10420,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     index: scope.$index
                   }, () => [
                     item.prefixText ? (openBlock(), createElementBlock("span", _hoisted_4$1, toDisplayString(item.prefixText), 1)) : createCommentVNode("", true),
-                    unref(getDictionary)(unref(entityInstance), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
+                    unref(getDictionary)(__props.entity, item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
                       key: 1,
                       column: item,
                       data: scope.row,
-                      dictionary: unref(getDictionary)(unref(entityInstance), item.key)
+                      dictionary: unref(getDictionary)(__props.entity, item.key)
                     }, null, 8, ["column", "data", "dictionary"])) : item.desensitize ? (openBlock(), createBlock(unref(ADesensitize), {
                       key: 2,
                       content: getValue(scope, item.key),
@@ -11037,7 +11035,7 @@ class PermissionUtil {
    */
   static get(EntityClass, action) {
     let permission;
-    const modelConfig = getModelConfig(new EntityClass());
+    const modelConfig = getModelConfig(EntityClass);
     const actionRecord = {
       [PermissionAction.ADD]: modelConfig == null ? void 0 : modelConfig.addPermission,
       [PermissionAction.DELETE]: modelConfig == null ? void 0 : modelConfig.deletePermission,
@@ -11274,8 +11272,7 @@ class WebValidator {
    */
   static createRules(service, rules = {}) {
     const formRules = rules;
-    const entity = Transformer.newInstance(service.entityClass);
-    const formFieldList = getFormFieldList(entity).map((key) => getFormConfig(entity, key));
+    const formFieldList = getFormFieldList(service.entityClass).map((key) => getFormConfig(service.entityClass, key));
     for (let i = 0; i < formFieldList.length; i += 1) {
       const config = formFieldList[i];
       const fieldKey = config.key;

package/dist/web.css

@@ -1233,10 +1233,10 @@ textarea {
   height: 0;
   overflow: hidden;
   overflow-y: auto;
-}.a-field-selector[data-v-cd8bfac9] {
+}.a-field-selector[data-v-476fd094] {
   position: relative;
 }
-.el-check-tag[data-v-cd8bfac9] {
+.el-check-tag[data-v-476fd094] {
   font-weight: normal !important;
   user-select: none;
   font-size: 13px;
@@ -1244,7 +1244,7 @@ textarea {
   margin-bottom: 5px;
   padding: 4px 10px;
 }
-.a-field-selector-bg[data-v-cd8bfac9] {
+.a-field-selector-bg[data-v-476fd094] {
   position: fixed;
   left: 0;
   right: 0;
@@ -1253,7 +1253,7 @@ textarea {
   background-color: rgba(0, 0, 0, 0.1);
   z-index: 9999999;
 }
-.a-field-selector-dialog[data-v-cd8bfac9] {
+.a-field-selector-dialog[data-v-476fd094] {
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
   position: absolute;
   right: 0;
@@ -1266,13 +1266,13 @@ textarea {
   overflow: hidden;
   z-index: 99999991;
 }
-.a-field-selector-dialog .a-field-selector-title[data-v-cd8bfac9] {
+.a-field-selector-dialog .a-field-selector-title[data-v-476fd094] {
   margin-bottom: 10px;
   border-bottom: 1px solid var(--el-color-primary-light-9);
   padding: 8px 16px;
   font-size: 15px;
 }
-.a-field-selector-dialog .a-field-selector-list[data-v-cd8bfac9] {
+.a-field-selector-dialog .a-field-selector-list[data-v-476fd094] {
   padding: 5px 15px 10px 15px;
   display: flex;
   flex-wrap: wrap;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",