@airpower/web 0.2.28 → 0.2.30

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

@@ -1,5 +1,5 @@
 import { EnumKey } from '@airpower/enum/dist/enum/type';
-import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
+import { ITransformerConstructor, TransformerField } from '@airpower/transformer';
 import { WebEnumConstructor } from '../../enum/type';
 import { RootModel } from '../../model/RootModel';
 import { IFieldConfig } from './IFieldConfig';
@@ -8,23 +8,23 @@ import { FieldConfigOptionalKey } from './type';
  * ### 为属性标记配置
  * @param config 配置项
  */
-export declare function Field<K extends EnumKey = EnumKey>(config?: FieldConfigOptionalKey<IFieldConfig<K>>): (target: DecoratorTarget, key: string) => void;
+export declare function Field<M extends RootModel, K extends EnumKey = EnumKey>(config?: FieldConfigOptionalKey<IFieldConfig<K>>): (instance: M, field: keyof M) => void;
 /**
  * ### 获取属性的配置
  * @returns 配置对象
- * @param TargetClass 目标类
- * @param key 属性名
+ * @param Class 目标类
+ * @param field 属性名
  */
-export declare function getFieldConfig<M extends RootModel, K extends EnumKey = EnumKey>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): IFieldConfig<K>;
+export declare function getFieldConfig<M extends RootModel, K extends EnumKey = EnumKey>(Class: ITransformerConstructor<M>, field: TransformerField<M>): IFieldConfig<K>;
 /**
  * ### 获取属性的枚举字典
- * @param TargetClass 目标类
- * @param key 属性名
+ * @param Class 目标类
+ * @param field 属性名
  */
-export declare function getDictionary<M extends RootModel, K extends EnumKey = EnumKey>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): WebEnumConstructor<K> | undefined;
+export declare function getDictionary<M extends RootModel, K extends EnumKey = EnumKey>(Class: ITransformerConstructor<M>, field: TransformerField<M>): WebEnumConstructor<K> | undefined;
 /**
  * ### 获取属性的标题
- * @param TargetClass 目标类
- * @param key string 属性名
+ * @param Class 目标类
+ * @param field string 属性名
  */
-export declare function getFieldLabel<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): string;
+export declare function getFieldLabel<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): string;

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

@@ -1,4 +1,4 @@
-import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
+import { ITransformerConstructor, TransformerField } from '@airpower/transformer';
 import { RootModel } from '../../model/RootModel';
 import { FieldConfigOptionalKey } from '../@Field/type';
 import { IFormField } from './IFormField';
@@ -6,21 +6,15 @@ import { IFormField } from './IFormField';
  * ### 标记该字段可用于表单配置
  * @param config 配置项
  */
-export declare function Form(config?: FieldConfigOptionalKey<IFormField>): (target: DecoratorTarget, key: string) => void;
+export declare function Form<M extends RootModel>(config?: FieldConfigOptionalKey<IFormField>): (instance: M, key: keyof M) => void;
 /**
  * ### 获取对象某个字段标记的表单配置项
- * @param TargetClass 目标类
- * @param key 属性名
+ * @param Class 目标类
+ * @param field 属性名
  */
-export declare function getFormConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): IFormField;
-/**
- * ### 获取标记了表单配置的字段列表
- * @param TargetClass 目标类
- */
-export declare function getFormFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): Array<keyof M | string>;
+export declare function getFormConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): IFormField;
 /**
  * ### 获取指定类的表单字段配置项列表
- * @param TargetClass 目标类
- * @param keyList 选择字段列表
+ * @param Class 目标类
  */
-export declare function getFormConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: Array<keyof M | string>): IFormField[];
+export declare function getFormConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): IFormField[];

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

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

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

@@ -1,4 +1,4 @@
-import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
+import { ITransformerConstructor, TransformerField } from '@airpower/transformer';
 import { RootModel } from '../../model/RootModel';
 import { FieldConfigOptionalKey } from '../@Field/type';
 import { ISearchField } from './ISearchField';
@@ -6,21 +6,15 @@ import { ISearchField } from './ISearchField';
  * ### 标记该字段可用于表单配置
  * @param config 配置项
  */
-export declare function Search(config?: FieldConfigOptionalKey<ISearchField>): (target: DecoratorTarget, key: string) => void;
+export declare function Search<M extends RootModel>(config?: FieldConfigOptionalKey<ISearchField>): (instance: M, field: keyof M) => void;
 /**
  * ### 获取对象某个字段标记的搜索配置项
- * @param TargetClass 目标类
- * @param key 属性名
+ * @param Class 目标类
+ * @param field 属性名
  */
-export declare function getSearchConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): ISearchField;
-/**
- * ### 获取标记了搜索配置的字段列表
- * @param TargetClass 目标类
- */
-export declare function getSearchFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): Array<keyof M | string>;
+export declare function getSearchConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): ISearchField;
 /**
  * ### 获取指定类的搜索字段配置项列表
- * @param TargetClass 目标类
- * @param keyList 选择字段列表
+ * @param Class 目标类
  */
-export declare function getSearchConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: Array<keyof M | string>): ISearchField[];
+export declare function getSearchConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): ISearchField[];

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

@@ -1,4 +1,4 @@
-import { DecoratorTarget, ITransformerConstructor } from '@airpower/transformer';
+import { ITransformerConstructor, TransformerField } from '@airpower/transformer';
 import { RootModel } from '../../model/RootModel';
 import { FieldConfigOptionalKey } from '../@Field/type';
 import { ITableColumn } from './ITableColumn';
@@ -6,21 +6,15 @@ import { ITableColumn } from './ITableColumn';
  * ### 为属性标记是表格字段
  * @param config 表格列的配置
  */
-export declare function Table(config?: FieldConfigOptionalKey<ITableColumn>): (target: DecoratorTarget, key: string) => void;
+export declare function Table<M extends RootModel>(config?: FieldConfigOptionalKey<ITableColumn>): (instance: M, field: keyof M) => void;
 /**
  * ### 获取对象的属性表格的配置
- * @param TargetClass 目标类
- * @param key 属性名
+ * @param Class 目标类
+ * @param field 属性名
  */
-export declare function getTableConfig<M extends RootModel>(TargetClass: ITransformerConstructor<M>, key: keyof M | string): ITableColumn;
-/**
- * ### 获取标记了表格配置的字段列表
- * @param TargetClass 目标类
- */
-export declare function getTableFieldList<M extends RootModel>(TargetClass: ITransformerConstructor<M>): Array<keyof M | string>;
+export declare function getTableConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): ITableColumn;
 /**
  * ### 获取字段标记的表格字段配置列表
- * @param TargetClass 目标类
- * @param keyList 字段列表
+ * @param Class 目标类
  */
-export declare function getTableConfigList<M extends RootModel>(TargetClass: ITransformerConstructor<M>, keyList?: Array<keyof M | string>): Array<ITableColumn>;
+export declare function getTableConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<ITableColumn>;

package/dist/main.js

@@ -685,148 +685,113 @@ __publicField(WebConfig, "treeProps", {
   children: "children",
   label: "name"
 });
-var __defProp$7 = Object.defineProperty;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, key + "", value);
 class DecoratorUtil {
   /**
    * ### 设置一个类配置项
-   * @param target 目标实体类
+   * @param Class 目标类
    * @param classConfigKey 配置项索引键值
    * @param classConfig 配置的参数
    */
-  static setClassConfig(target, classConfigKey, classConfig) {
-    this.setProperty(target.prototype, classConfigKey, classConfig);
+  static setClassConfig(Class, classConfigKey, classConfig) {
+    this.setProperty(Class.prototype, classConfigKey, classConfig);
   }
   /**
    * ### 递归获取指定类的配置项
-   * @param target 目标类
+   * @param Class 目标类
    * @param classConfigKey 配置项的Key
    * @param defaultValue `可选` 类装饰器请传入配置项实例
    * @param isObject `可选` 是否是对象配置
    */
-  static getClassConfig(target, classConfigKey, defaultValue = void 0, isObject = false) {
-    if (typeof target !== "object") {
-      target = target.prototype;
-    }
-    let classConfig = Reflect.get(target, classConfigKey);
+  static getClassConfig(Class, classConfigKey, defaultValue = void 0, isObject = false) {
+    let classConfig = Reflect.get(Class, classConfigKey);
     if (!isObject) {
       if (classConfig) {
         return classConfig;
       }
-      const superClass2 = Reflect.getPrototypeOf(target);
-      if (!superClass2 || superClass2.constructor.name === Transformer.name) {
+      const SuperClass2 = Reflect.getPrototypeOf(Class);
+      if (!SuperClass2 || SuperClass2.prototype.constructor.name === Transformer.name) {
         return void 0;
       }
-      return this.getClassConfig(superClass2, classConfigKey);
+      return this.getClassConfig(SuperClass2, classConfigKey);
     }
     classConfig = classConfig || {};
-    const superClass = Reflect.getPrototypeOf(target);
-    if (!superClass || superClass.constructor.name === Transformer.name) {
+    const SuperClass = Reflect.getPrototypeOf(Class);
+    if (!SuperClass || SuperClass.constructor.name === Transformer.name) {
       return defaultValue;
     }
     return {
-      ...this.getClassConfig(superClass, classConfigKey, defaultValue, isObject),
+      ...this.getClassConfig(SuperClass, classConfigKey, defaultValue, isObject),
       ...classConfig
     };
   }
   /**
    * ### 设置一个属性配置项
-   * @param target 目标类
-   * @param key 属性
+   * @param instance 目标实例
+   * @param field 属性
    * @param fieldConfigKey 配置项索引键值
    * @param fieldConfig 配置的参数
-   * @param fieldListKey `可选` 类配置项列表索引值
    */
-  static setFieldConfig(target, key, fieldConfigKey, fieldConfig, fieldListKey) {
-    if (fieldListKey) {
-      this.addFieldDecoratorKey(target, key, fieldListKey);
-    }
-    this.setProperty(target, `${fieldConfigKey}[${key}]`, fieldConfig);
+  static setFieldConfig(instance, field, fieldConfigKey, fieldConfig) {
+    this.setProperty(instance, `${fieldConfigKey}[${field.toString()}]`, fieldConfig);
   }
   /**
    * ### 获取类指定属性的指定类型的配置
-   * @param target 目标类
-   * @param key 属性
+   * @param Class 目标类
+   * @param field 属性
    * @param fieldConfigKey FieldConfigKey
    * @param isObject `可选` 是否对象配置
    */
-  static getFieldConfig(target, key, fieldConfigKey, isObject = false) {
-    if (typeof target !== "object") {
-      target = target.prototype;
-    }
-    let fieldConfig = Reflect.get(target, `${fieldConfigKey}[${key}]`);
+  static getFieldConfig(Class, field, fieldConfigKey, isObject = false) {
+    let fieldConfig = Reflect.get(Class.prototype, `${fieldConfigKey}[${field.toString()}]`);
+    const SuperClass = Reflect.getPrototypeOf(Class);
     if (!isObject) {
       if (fieldConfig !== void 0) {
         return fieldConfig;
       }
-      const superClass2 = Reflect.getPrototypeOf(target);
-      if (!superClass2 || superClass2.constructor.name === Transformer.name) {
+      if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
         return void 0;
       }
-      return this.getFieldConfig(superClass2, key, fieldConfigKey);
+      return this.getFieldConfig(SuperClass, field, fieldConfigKey);
     }
     fieldConfig = fieldConfig || {};
-    const superClass = Reflect.getPrototypeOf(target);
-    if (!superClass || superClass.constructor.name === Transformer.name) {
+    if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
       return {};
     }
     return {
-      ...this.getFieldConfig(superClass, key, fieldConfigKey, true),
+      ...this.getFieldConfig(SuperClass, field, fieldConfigKey, true),
       ...fieldConfig
     };
   }
   /**
    * ### 获取类标记了装饰器的属性列表
-   * @param target 目标类
+   * @param Class 目标类
    * @param fieldConfigKey FieldConfigKey
    * @param list `递归参数` 无需传入
    */
-  static getFieldList(target, fieldConfigKey, list = []) {
-    if (typeof target !== "object") {
-      target = target.prototype;
-    }
-    const fieldList = Reflect.get(target, fieldConfigKey) || [];
+  static getFieldList(Class, fieldConfigKey, list = []) {
+    const fieldList = Reflect.get(Class.prototype, fieldConfigKey) || [];
     fieldList.forEach((item) => list.includes(item) || list.push(item));
-    const superClass = Reflect.getPrototypeOf(target);
-    if (!superClass || superClass.constructor.name === Transformer.name) {
+    const SuperClass = Reflect.getPrototypeOf(Class);
+    if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
       return list;
     }
-    return this.getFieldList(superClass, fieldConfigKey, list);
+    return this.getFieldList(SuperClass, fieldConfigKey, list);
   }
   /**
    * ### 反射添加属性
-   * @param target 目标类
-   * @param key 配置key
+   * @param instance 目标属性
+   * @param propertyKey 配置key
    * @param value 配置值
    */
-  static setProperty(target, key, value) {
-    if (typeof target !== "object") {
-      target = target.prototype;
-    }
-    Reflect.defineProperty(target, key, {
+  static setProperty(instance, propertyKey, value) {
+    Reflect.defineProperty(instance, propertyKey, {
       enumerable: false,
       value,
       writable: false,
       configurable: true
     });
   }
-  /**
-   * ### 设置一个属性的包含装饰器索引
-   * @param target 目标类
-   * @param key 属性
-   * @param fieldListKey 类配置项列表索引值
-   */
-  static addFieldDecoratorKey(target, key, fieldListKey) {
-    if (typeof target !== "object") {
-      target = target.prototype;
-    }
-    const list = Reflect.get(target, fieldListKey) || [];
-    list.push(key);
-    this.setProperty(target, fieldListKey, list);
-  }
 }
-__publicField$3(DecoratorUtil, "DecoratorKeyPrefix", "[AirPower]");
 class Transformer {
   /**
    * ### 从 `JSON` 转换到当前类的对象
@@ -874,10 +839,10 @@ class Transformer {
     const instance = new Class();
     const fieldList = Object.keys(instance);
     for (const field of fieldList) {
-      const jsonKey = this.getJsonKey(instance, field);
+      const jsonKey = this.getJsonKey(Class, field);
       const fieldData = json[jsonKey];
       instance[field] = fieldData;
-      const toClass = getToClass(instance, field);
+      const toClass = getToClass(Class, field);
       if (toClass !== void 0) {
         try {
           ;
@@ -887,8 +852,8 @@ class Transformer {
           continue;
         }
       }
-      const FieldTypeClass = getType(instance, field);
-      const isArray2 = getArray(instance, field);
+      const FieldTypeClass = getType(Class, field);
+      const isArray2 = getArray(Class, field);
       if (isArray2) {
         const fieldValueList = [];
         if (typeof fieldData === "object" && Array.isArray(fieldData)) {
@@ -922,7 +887,7 @@ class Transformer {
       }
     }
     for (const fieldKey of fieldList) {
-      const alias = getAlias(instance, fieldKey) || fieldKey;
+      const alias = getAlias(Class, fieldKey) || fieldKey;
       if (alias === fieldKey) {
         continue;
       }
@@ -932,19 +897,19 @@ class Transformer {
   }
   /**
    * ### 获取 JSON 的 key
-   * @param instance 目标实例
+   * @param Class 目标实例
    * @param field 属性 key
    */
-  static getJsonKey(instance, field) {
-    const alias = getAlias(instance, field);
+  static getJsonKey(Class, field) {
+    const alias = getAlias(Class, field);
     if (alias) {
       return alias;
     }
-    const prefix = getPrefix(instance);
+    const prefix = getPrefix(Class);
     if (!prefix) {
       return field;
     }
-    const ignorePrefix = getIgnorePrefix(instance, field);
+    const ignorePrefix = getIgnorePrefix(Class, field);
     if (!ignorePrefix) {
       return prefix + field;
     }
@@ -996,6 +961,7 @@ class Transformer {
    * 会自动进行数据别名转换
    */
   toJson() {
+    const Class = this.constructor;
     const fieldList = Object.keys(this);
     const json = {};
     for (const field of fieldList) {
@@ -1003,9 +969,9 @@ class Transformer {
       if (data === null || data === void 0) {
         continue;
       }
-      const jsonKey = Transformer.getJsonKey(this, field);
+      const jsonKey = Transformer.getJsonKey(Class, field);
       json[jsonKey] = data;
-      const toJson = getToJson(this, field);
+      const toJson = getToJson(Class, field);
       if (toJson !== void 0) {
         try {
           json[jsonKey] = toJson(this);
@@ -1033,66 +999,68 @@ class Transformer {
     return json;
   }
 }
-const KEY$5 = `${DecoratorUtil.DecoratorKeyPrefix}[Alias]`;
+const KEY$5 = "[Alias]";
 function Alias(alias) {
-  return (target, key) => DecoratorUtil.setFieldConfig(target, key, KEY$5, alias);
+  return (instance, field) => {
+    DecoratorUtil.setFieldConfig(instance, field, KEY$5, alias);
+  };
 }
-function getAlias(target, key) {
-  return (DecoratorUtil.getFieldConfig(target, key.toString(), KEY$5) || "").toString();
+function getAlias(Class, field) {
+  return (DecoratorUtil.getFieldConfig(Class, field, KEY$5) || "").toString();
 }
-const KEY$4$1 = `${DecoratorUtil.DecoratorKeyPrefix}[IgnorePrefix]`;
+const KEY$4$1 = "[IgnorePrefix]";
 function IgnorePrefix() {
-  return (target, key) => DecoratorUtil.setFieldConfig(target, key, KEY$4$1, true);
+  return (instance, field) => DecoratorUtil.setFieldConfig(instance, field, KEY$4$1, true);
 }
-function getIgnorePrefix(target, key) {
-  return !!DecoratorUtil.getFieldConfig(target, key.toString(), KEY$4$1);
+function getIgnorePrefix(Class, field) {
+  return !!DecoratorUtil.getFieldConfig(Class, field, KEY$4$1);
 }
-const KEY$3$1 = `${DecoratorUtil.DecoratorKeyPrefix}[Prefix]`;
+const KEY$3$1 = "[Prefix]";
 function Prefix(prefix) {
-  return (target) => DecoratorUtil.setClassConfig(target, KEY$3$1, prefix);
+  return (Class) => DecoratorUtil.setClassConfig(Class, KEY$3$1, prefix);
 }
-function getPrefix(target) {
-  return DecoratorUtil.getClassConfig(target, KEY$3$1, "");
+function getPrefix(Class) {
+  return DecoratorUtil.getClassConfig(Class, KEY$3$1, "");
 }
-const KEY$2$1 = `${DecoratorUtil.DecoratorKeyPrefix}[ToClass]`;
+const KEY$2$1 = "[ToClass]";
 function ToClass(func) {
-  return (target, key) => DecoratorUtil.setFieldConfig(target, key, KEY$2$1, func);
+  return (instance, field) => DecoratorUtil.setFieldConfig(instance, field, KEY$2$1, func);
 }
-function getToClass(target, key) {
-  return DecoratorUtil.getFieldConfig(target, key.toString(), KEY$2$1);
+function getToClass(target, field) {
+  return DecoratorUtil.getFieldConfig(target, field, KEY$2$1);
 }
-const KEY$1$1 = `${DecoratorUtil.DecoratorKeyPrefix}[ToJson]`;
+const KEY$1$1 = "[ToJson]";
 function ToJson(func) {
-  return (target, key) => DecoratorUtil.setFieldConfig(target, key, KEY$1$1, func);
+  return (instance, key) => DecoratorUtil.setFieldConfig(instance, key, KEY$1$1, func);
 }
-function getToJson(target, key) {
-  return DecoratorUtil.getFieldConfig(target, key.toString(), KEY$1$1);
+function getToJson(Class, field) {
+  return DecoratorUtil.getFieldConfig(Class, field, KEY$1$1);
 }
-const KEY$6 = `${DecoratorUtil.DecoratorKeyPrefix}[Type]`;
-const KEY_ARRAY = `${DecoratorUtil.DecoratorKeyPrefix}[Array]`;
+const KEY$6 = "[Type]";
+const KEY_ARRAY = "[Array]";
 function Type(type, array = false) {
-  return (target, key) => {
-    DecoratorUtil.setFieldConfig(target, key, KEY$6, type);
+  return (instance, field) => {
+    DecoratorUtil.setFieldConfig(instance, field, KEY$6, type);
     if (array) {
-      DecoratorUtil.setFieldConfig(target, key, KEY_ARRAY, array);
+      DecoratorUtil.setFieldConfig(instance, field, KEY_ARRAY, array);
     }
   };
 }
-function getType(target, key) {
-  return DecoratorUtil.getFieldConfig(target, key.toString(), KEY$6) || void 0;
+function getType(Class, field) {
+  return DecoratorUtil.getFieldConfig(Class, field, KEY$6) || void 0;
 }
-function getArray(target, key) {
-  return !!DecoratorUtil.getFieldConfig(target, key.toString(), KEY_ARRAY);
+function getArray(Class, field) {
+  return !!DecoratorUtil.getFieldConfig(Class, field, KEY_ARRAY);
 }
-const KEY$4 = `${DecoratorUtil.DecoratorKeyPrefix}[MODEL]`;
+const KEY$4 = "[MODEL]";
 function Model(config = {}) {
-  return (target) => DecoratorUtil.setClassConfig(target, KEY$4, config);
+  return (Class) => DecoratorUtil.setClassConfig(Class, KEY$4, config);
 }
-function getModelConfig(TargetClass) {
-  return DecoratorUtil.getClassConfig(TargetClass, KEY$4, {}, true);
+function getModelConfig(Class) {
+  return DecoratorUtil.getClassConfig(Class, KEY$4, {}, true);
 }
-function getModelName(TargetClass) {
-  return getModelConfig(TargetClass).label || TargetClass.name;
+function getModelName(Class) {
+  return getModelConfig(Class).label || Class.name;
 }
 var PermissionAction = /* @__PURE__ */ ((PermissionAction2) => {
   PermissionAction2["ADD"] = "add";
@@ -10206,23 +10174,23 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
   }
 });
 const Empty = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-f633fb7c"]]);
-const KEY$3 = `${DecoratorUtil.DecoratorKeyPrefix}[Field]`;
+const KEY$3 = "[Field]";
 function Field(config = {}) {
-  return (target, key) => {
-    config.key = key;
-    DecoratorUtil.setFieldConfig(target, key, KEY$3, config);
+  return (instance, field) => {
+    config.key = field.toString();
+    DecoratorUtil.setFieldConfig(instance, field, KEY$3, config);
   };
 }
-function getFieldConfig(TargetClass, key) {
-  return DecoratorUtil.getFieldConfig(TargetClass, key.toString(), KEY$3, true) || {};
+function getFieldConfig(Class, field) {
+  return DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$3, true) || {};
 }
-function getDictionary(TargetClass, key) {
+function getDictionary(Class, field) {
   var _a;
-  return (_a = getFieldConfig(TargetClass, key)) == null ? void 0 : _a.dictionary;
+  return (_a = getFieldConfig(Class, field)) == null ? void 0 : _a.dictionary;
 }
-function getFieldLabel(TargetClass, key) {
+function getFieldLabel(Class, field) {
   var _a;
-  return ((_a = getFieldConfig(TargetClass, key)) == null ? void 0 : _a.label) || key.toString();
+  return ((_a = getFieldConfig(Class, field)) == null ? void 0 : _a.label) || field.toString();
 }
 const _sfc_main$p = /* @__PURE__ */ defineComponent({
   __name: "FormField",
@@ -13649,35 +13617,29 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const KEY$2 = `${DecoratorUtil.DecoratorKeyPrefix}[Form]`;
-const LIST_KEY$2 = `${DecoratorUtil.DecoratorKeyPrefix}[FormList]`;
+const KEY$2 = "[Form]";
 function Form(config = {}) {
-  return (target, key) => {
-    config.key = key;
-    DecoratorUtil.setFieldConfig(target, key, KEY$2, config, LIST_KEY$2);
+  return (instance, key) => {
+    config.key = key.toString();
+    DecoratorUtil.setFieldConfig(instance, key, KEY$2, config);
   };
 }
-function getFormConfig(TargetClass, key) {
-  const formConfig = DecoratorUtil.getFieldConfig(TargetClass, key.toString(), KEY$2, true);
+function getFormConfig(Class, field) {
+  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$2, true);
   if (!formConfig) {
-    return { key: key.toString() };
+    return { key: "" };
   }
   if (!formConfig.dictionary) {
-    const props = getFieldConfig(TargetClass, key);
+    const props = getFieldConfig(Class, field);
     if (props && props.dictionary) {
       formConfig.dictionary = props.dictionary;
     }
   }
   return formConfig;
 }
-function getFormFieldList(TargetClass) {
-  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY$2);
-}
-function getFormConfigList(TargetClass, keyList = []) {
-  if (keyList.length === 0) {
-    keyList = getFormFieldList(TargetClass);
-  }
-  const list = keyList.map((key) => getFormConfig(TargetClass, key));
+function getFormConfigList(Class) {
+  const fieldList = Object.keys(Class.prototype);
+  const list = fieldList.map((field) => getFormConfig(Class, field)).filter((item) => !!item.key);
   return list.filter((item) => !item.hide).sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 var FormTrim = /* @__PURE__ */ ((FormTrim2) => {
@@ -16773,56 +16735,42 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const KEY$1 = `${DecoratorUtil.DecoratorKeyPrefix}[Search]`;
-const LIST_KEY$1 = `${DecoratorUtil.DecoratorKeyPrefix}[SearchList]`;
+const KEY$1 = "[Search]";
 function Search(config = {}) {
-  return (target, key) => {
-    config.key = key;
-    DecoratorUtil.setFieldConfig(target, key, KEY$1, config, LIST_KEY$1);
+  return (instance, field) => {
+    config.key = field.toString();
+    DecoratorUtil.setFieldConfig(instance, field, KEY$1, config);
   };
 }
-function getSearchConfig(TargetClass, key) {
-  const instance = new TargetClass();
-  const formConfig = DecoratorUtil.getFieldConfig(instance, key.toString(), KEY$1, true);
+function getSearchConfig(Class, field) {
+  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$1, true);
   if (!formConfig) {
-    return { key: key.toString() };
+    return { key: "" };
   }
   return formConfig;
 }
-function getSearchFieldList(TargetClass) {
-  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY$1);
-}
-function getSearchConfigList(TargetClass, keyList = []) {
-  if (keyList.length === 0) {
-    keyList = getSearchFieldList(TargetClass);
-  }
-  const list = keyList.map((key) => getSearchConfig(TargetClass, key));
+function getSearchConfigList(Class) {
+  const fieldList = Object.keys(Class.prototype);
+  const list = fieldList.map((field) => getSearchConfig(Class, field));
   return list.filter((item) => !item.hide).sort((a, b) => (b.order || 0) - (a.order || 0));
 }
-const KEY = `${DecoratorUtil.DecoratorKeyPrefix}[Table]`;
-const LIST_KEY = `${DecoratorUtil.DecoratorKeyPrefix}[TableList]`;
+const KEY = "[Table]";
 function Table(config = {}) {
-  return (target, key) => {
-    config.key = key;
-    DecoratorUtil.setFieldConfig(target, key, KEY, config, LIST_KEY);
+  return (instance, field) => {
+    config.key = field.toString();
+    DecoratorUtil.setFieldConfig(instance, field, KEY, config);
   };
 }
-function getTableConfig(TargetClass, key) {
-  const instance = new TargetClass();
-  const tableConfig = DecoratorUtil.getFieldConfig(instance, key.toString(), KEY, true);
+function getTableConfig(Class, field) {
+  const tableConfig = DecoratorUtil.getFieldConfig(Class, field, KEY, true);
   if (!tableConfig) {
-    return { key: key.toString() };
+    return { key: "" };
   }
   return tableConfig;
 }
-function getTableFieldList(TargetClass) {
-  return DecoratorUtil.getFieldList(TargetClass, LIST_KEY);
-}
-function getTableConfigList(TargetClass, keyList = []) {
-  if (keyList.length === 0) {
-    keyList = getTableFieldList(TargetClass);
-  }
-  const list = keyList.map((key) => getTableConfig(TargetClass, key));
+function getTableConfigList(Class) {
+  const fieldList = Object.keys(Class.prototype);
+  const list = fieldList.map((field) => getTableConfig(Class, field)).filter((item) => !!item.key);
   return list.sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 var __defProp$2 = Object.defineProperty;
@@ -18746,7 +18694,7 @@ class WebValidator {
    */
   static createRules(service, rules = {}) {
     const formRules = rules;
-    const formFieldList = getFormFieldList(service.entityClass).map((key) => getFormConfig(service.entityClass, key));
+    const formFieldList = getFormConfigList(service.entityClass);
     for (let i = 0; i < formFieldList.length; i += 1) {
       const config = formFieldList[i];
       const fieldKey = config.key;
@@ -19799,17 +19747,14 @@ export {
   getFieldLabel,
   getFormConfig,
   getFormConfigList,
-  getFormFieldList,
   getIgnorePrefix,
   getModelConfig,
   getModelName,
   getPrefix,
   getSearchConfig,
   getSearchConfigList,
-  getSearchFieldList,
   getTableConfig,
   getTableConfigList,
-  getTableFieldList,
   getToClass,
   getToJson,
   getType,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@airpower/enum": "^0.0.10",
     "@airpower/i18n": "^0.0.4",
-    "@airpower/transformer": "^0.1.3",
+    "@airpower/transformer": "^0.1.7",
     "@airpower/util": "^0.1.3",
     "@element-plus/icons-vue": "^2.3.1",
     "axios": "^1.8.4",