@airpower/web 0.2.29 → 0.2.31

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

@@ -13,14 +13,8 @@ export declare function Form<M extends RootModel>(config?: FieldConfigOptionalKe
  * @param field 属性名
  */
 export declare function getFormConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): IFormField;
-/**
- * ### 获取标记了表单配置的字段列表
- * @param Class 目标类
- */
-export declare function getFormFieldList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<TransformerField<M>>;
 /**
  * ### 获取指定类的表单字段配置项列表
  * @param Class 目标类
- * @param fieldList 选择字段列表
  */
-export declare function getFormConfigList<M extends RootModel>(Class: ITransformerConstructor<M>, fieldList?: Array<TransformerField<M>>): IFormField[];
+export declare function getFormConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): IFormField[];

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

@@ -13,14 +13,8 @@ export declare function Search<M extends RootModel>(config?: FieldConfigOptional
  * @param field 属性名
  */
 export declare function getSearchConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): ISearchField;
-/**
- * ### 获取标记了搜索配置的字段列表
- * @param Class 目标类
- */
-export declare function getSearchFieldList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<TransformerField<M>>;
 /**
  * ### 获取指定类的搜索字段配置项列表
  * @param Class 目标类
- * @param fieldList 选择字段列表
  */
-export declare function getSearchConfigList<M extends RootModel>(Class: ITransformerConstructor<M>, fieldList?: Array<TransformerField<M>>): ISearchField[];
+export declare function getSearchConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): ISearchField[];

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

@@ -13,14 +13,8 @@ export declare function Table<M extends RootModel>(config?: FieldConfigOptionalK
  * @param field 属性名
  */
 export declare function getTableConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): ITableColumn;
-/**
- * ### 获取标记了表格配置的字段列表
- * @param Class 目标类
- */
-export declare function getTableFieldList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<TransformerField<M>>;
 /**
  * ### 获取字段标记的表格字段配置列表
  * @param Class 目标类
- * @param fieldList 字段列表
  */
-export declare function getTableConfigList<M extends RootModel>(Class: ITransformerConstructor<M>, fieldList?: Array<TransformerField<M>>): Array<ITableColumn>;
+export declare function getTableConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<ITableColumn>;

package/dist/main.js

@@ -685,128 +685,6 @@ __publicField(WebConfig, "treeProps", {
   children: "children",
   label: "name"
 });
-class DecoratorUtil {
-  /**
-   * ### 设置一个类配置项
-   * @param Class 目标类
-   * @param classConfigKey 配置项索引键值
-   * @param classConfig 配置的参数
-   */
-  static setClassConfig(Class, classConfigKey, classConfig) {
-    this.setProperty(Class.prototype, classConfigKey, classConfig);
-  }
-  /**
-   * ### 递归获取指定类的配置项
-   * @param Class 目标类
-   * @param classConfigKey 配置项的Key
-   * @param defaultValue `可选` 类装饰器请传入配置项实例
-   * @param isObject `可选` 是否是对象配置
-   */
-  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(Class);
-      if (!SuperClass2 || SuperClass2.prototype.constructor.name === Transformer.name) {
-        return void 0;
-      }
-      return this.getClassConfig(SuperClass2, classConfigKey);
-    }
-    classConfig = classConfig || {};
-    const SuperClass = Reflect.getPrototypeOf(Class);
-    if (!SuperClass || SuperClass.constructor.name === Transformer.name) {
-      return defaultValue;
-    }
-    return {
-      ...this.getClassConfig(SuperClass, classConfigKey, defaultValue, isObject),
-      ...classConfig
-    };
-  }
-  /**
-   * ### 设置一个属性配置项
-   * @param instance 目标实例
-   * @param field 属性
-   * @param fieldConfigKey 配置项索引键值
-   * @param fieldConfig 配置的参数
-   * @param fieldListKey `可选` 类配置项列表索引值
-   */
-  static setFieldConfig(instance, field, fieldConfigKey, fieldConfig, fieldListKey) {
-    if (fieldListKey) {
-      this.addFieldDecoratorKey(instance, field, fieldListKey);
-    }
-    this.setProperty(instance, `${fieldConfigKey}[${field.toString()}]`, fieldConfig);
-  }
-  /**
-   * ### 获取类指定属性的指定类型的配置
-   * @param Class 目标类
-   * @param field 属性
-   * @param fieldConfigKey FieldConfigKey
-   * @param isObject `可选` 是否对象配置
-   */
-  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;
-      }
-      if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
-        return void 0;
-      }
-      return this.getFieldConfig(SuperClass, field, fieldConfigKey);
-    }
-    fieldConfig = fieldConfig || {};
-    if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
-      return {};
-    }
-    return {
-      ...this.getFieldConfig(SuperClass, field, fieldConfigKey, true),
-      ...fieldConfig
-    };
-  }
-  /**
-   * ### 获取类标记了装饰器的属性列表
-   * @param Class 目标类
-   * @param fieldConfigKey FieldConfigKey
-   * @param list `递归参数` 无需传入
-   */
-  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(Class);
-    if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
-      return list;
-    }
-    return this.getFieldList(SuperClass, fieldConfigKey, list);
-  }
-  /**
-   * ### 反射添加属性
-   * @param instance 目标属性
-   * @param propertyKey 配置key
-   * @param value 配置值
-   */
-  static setProperty(instance, propertyKey, value) {
-    Reflect.defineProperty(instance, propertyKey, {
-      enumerable: false,
-      value,
-      writable: false,
-      configurable: true
-    });
-  }
-  /**
-   * ### 设置一个属性的包含装饰器索引
-   * @param instance 目标类
-   * @param field 属性
-   * @param propertyKey 类配置项列表索引值
-   */
-  static addFieldDecoratorKey(instance, field, propertyKey) {
-    const list = Reflect.get(instance, propertyKey) || [];
-    list.push(field);
-    this.setProperty(instance, propertyKey, list);
-  }
-}
 class Transformer {
   /**
    * ### 从 `JSON` 转换到当前类的对象
@@ -1014,6 +892,97 @@ class Transformer {
     return json;
   }
 }
+class DecoratorUtil {
+  /**
+   * ### 设置一个类配置项
+   * @param Class 目标类
+   * @param classConfigKey 配置项索引键值
+   * @param classConfig 配置的参数
+   */
+  static setClassConfig(Class, classConfigKey, classConfig) {
+    this.setProperty(Class.prototype, classConfigKey, classConfig);
+  }
+  /**
+   * ### 递归获取指定类的配置项
+   * @param Class 目标类
+   * @param classConfigKey 配置项的Key
+   * @param isObject `可选` 是否是对象配置
+   */
+  static getClassConfig(Class, classConfigKey, isObject = false) {
+    let classConfig = Reflect.get(Class, classConfigKey);
+    if (!isObject) {
+      if (classConfig) {
+        return classConfig;
+      }
+      const SuperClass2 = Reflect.getPrototypeOf(Class);
+      if (!SuperClass2 || SuperClass2.prototype.constructor.name === Transformer.name) {
+        return void 0;
+      }
+      return this.getClassConfig(SuperClass2, classConfigKey);
+    }
+    classConfig = classConfig || {};
+    const SuperClass = Reflect.getPrototypeOf(Class);
+    if (!SuperClass || SuperClass.constructor.name === Transformer.name) {
+      return classConfig;
+    }
+    return {
+      ...this.getClassConfig(SuperClass, classConfigKey, isObject),
+      ...classConfig
+    };
+  }
+  /**
+   * ### 设置一个属性配置项
+   * @param instance 目标实例
+   * @param field 属性
+   * @param fieldConfigKey 配置项索引键值
+   * @param fieldConfig 配置的参数
+   */
+  static setFieldConfig(instance, field, fieldConfigKey, fieldConfig) {
+    this.setProperty(instance, `${fieldConfigKey}[${field.toString()}]`, fieldConfig);
+  }
+  /**
+   * ### 获取类指定属性的指定类型的配置
+   * @param Class 目标类
+   * @param field 属性
+   * @param fieldConfigKey FieldConfigKey
+   * @param isObject `可选` 是否对象配置
+   */
+  static getFieldConfig(Class, field, fieldConfigKey, isObject = false) {
+    let fieldConfig = Reflect.get(new Class(), `${fieldConfigKey}[${field.toString()}]`);
+    const SuperClass = Reflect.getPrototypeOf(Class);
+    if (!isObject) {
+      if (fieldConfig !== void 0) {
+        return fieldConfig;
+      }
+      if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
+        return void 0;
+      }
+      return this.getFieldConfig(SuperClass, field, fieldConfigKey);
+    }
+    fieldConfig = fieldConfig || {};
+    if (!SuperClass || SuperClass.prototype.constructor.name === Transformer.name) {
+      return fieldConfig;
+    }
+    return {
+      ...this.getFieldConfig(SuperClass, field, fieldConfigKey, true),
+      ...fieldConfig
+    };
+  }
+  /**
+   * ### 反射添加属性
+   * @param instance 目标属性
+   * @param propertyKey 配置key
+   * @param value 配置值
+   */
+  static setProperty(instance, propertyKey, value) {
+    Reflect.defineProperty(instance, propertyKey, {
+      enumerable: false,
+      value,
+      writable: false,
+      configurable: true
+    });
+  }
+}
 const KEY$5 = "[Alias]";
 function Alias(alias) {
   return (instance, field) => {
@@ -1035,7 +1004,7 @@ function Prefix(prefix) {
   return (Class) => DecoratorUtil.setClassConfig(Class, KEY$3$1, prefix);
 }
 function getPrefix(Class) {
-  return DecoratorUtil.getClassConfig(Class, KEY$3$1, "");
+  return DecoratorUtil.getClassConfig(Class, KEY$3$1) || "";
 }
 const KEY$2$1 = "[ToClass]";
 function ToClass(func) {
@@ -1072,7 +1041,7 @@ function Model(config = {}) {
   return (Class) => DecoratorUtil.setClassConfig(Class, KEY$4, config);
 }
 function getModelConfig(Class) {
-  return DecoratorUtil.getClassConfig(Class, KEY$4, {}, true);
+  return DecoratorUtil.getClassConfig(Class, KEY$4, true) || {};
 }
 function getModelName(Class) {
   return getModelConfig(Class).label || Class.name;
@@ -13633,34 +13602,18 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
   }
 });
 const KEY$2 = "[Form]";
-const LIST_KEY$2 = "[FormList]";
 function Form(config = {}) {
   return (instance, key) => {
     config.key = key.toString();
-    DecoratorUtil.setFieldConfig(instance, key, KEY$2, config, LIST_KEY$2);
+    DecoratorUtil.setFieldConfig(instance, key, KEY$2, config);
   };
 }
 function getFormConfig(Class, field) {
-  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$2, true);
-  if (!formConfig) {
-    return { key: field.toString() };
-  }
-  if (!formConfig.dictionary) {
-    const props = getFieldConfig(Class, field);
-    if (props && props.dictionary) {
-      formConfig.dictionary = props.dictionary;
-    }
-  }
-  return formConfig;
-}
-function getFormFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY$2);
+  return DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$2, true) || {};
 }
-function getFormConfigList(Class, fieldList = []) {
-  if (fieldList.length === 0) {
-    fieldList = getFormFieldList(Class);
-  }
-  const list = fieldList.map((field) => getFormConfig(Class, field));
+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) => {
@@ -16757,53 +16710,33 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   }
 });
 const KEY$1 = "[Search]";
-const LIST_KEY$1 = "[SearchList]";
 function Search(config = {}) {
   return (instance, field) => {
     config.key = field.toString();
-    DecoratorUtil.setFieldConfig(instance, field, KEY$1, config, LIST_KEY$1);
+    DecoratorUtil.setFieldConfig(instance, field, KEY$1, config);
   };
 }
 function getSearchConfig(Class, field) {
-  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$1, true);
-  if (!formConfig) {
-    return { key: field.toString() };
-  }
-  return formConfig;
-}
-function getSearchFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY$1);
+  return DecoratorUtil.getFieldConfig(Class, field, KEY$1, true) || {};
 }
-function getSearchConfigList(Class, fieldList = []) {
-  if (fieldList.length === 0) {
-    fieldList = getSearchFieldList(Class);
-  }
-  const list = fieldList.map((field) => getSearchConfig(Class, field));
+function getSearchConfigList(Class) {
+  const fieldList = Object.keys(new Class());
+  const list = fieldList.map((field) => getSearchConfig(Class, field)).filter((item) => !!item.key);
   return list.filter((item) => !item.hide).sort((a, b) => (b.order || 0) - (a.order || 0));
 }
 const KEY = "[Table]";
-const LIST_KEY = "[TableList]";
 function Table(config = {}) {
   return (instance, field) => {
     config.key = field.toString();
-    DecoratorUtil.setFieldConfig(instance, field, KEY, config, LIST_KEY);
+    DecoratorUtil.setFieldConfig(instance, field, KEY, config);
   };
 }
 function getTableConfig(Class, field) {
-  const tableConfig = DecoratorUtil.getFieldConfig(Class, field, KEY, true);
-  if (!tableConfig) {
-    return { key: field.toString() };
-  }
-  return tableConfig;
-}
-function getTableFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY);
+  return DecoratorUtil.getFieldConfig(Class, field, KEY, true) || {};
 }
-function getTableConfigList(Class, fieldList = []) {
-  if (fieldList.length === 0) {
-    fieldList = getTableFieldList(Class);
-  }
-  const list = fieldList.map((field) => getTableConfig(Class, field));
+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;
@@ -18727,7 +18660,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;
@@ -19780,17 +19713,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.29",
+  "version": "0.2.31",
   "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.6",
+    "@airpower/transformer": "^0.1.10",
     "@airpower/util": "^0.1.3",
     "@element-plus/icons-vue": "^2.3.1",
     "axios": "^1.8.4",