@airpower/web 0.2.29 → 0.2.30

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

@@ -730,12 +730,8 @@ class DecoratorUtil {
    * @param field 属性
    * @param fieldConfigKey 配置项索引键值
    * @param fieldConfig 配置的参数
-   * @param fieldListKey `可选` 类配置项列表索引值
    */
-  static setFieldConfig(instance, field, fieldConfigKey, fieldConfig, fieldListKey) {
-    if (fieldListKey) {
-      this.addFieldDecoratorKey(instance, field, fieldListKey);
-    }
+  static setFieldConfig(instance, field, fieldConfigKey, fieldConfig) {
     this.setProperty(instance, `${fieldConfigKey}[${field.toString()}]`, fieldConfig);
   }
   /**
@@ -795,17 +791,6 @@ class DecoratorUtil {
       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 {
   /**
@@ -13633,17 +13618,16 @@ 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() };
+    return { key: "" };
   }
   if (!formConfig.dictionary) {
     const props = getFieldConfig(Class, field);
@@ -13653,14 +13637,9 @@ function getFormConfig(Class, field) {
   }
   return formConfig;
 }
-function getFormFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY$2);
-}
-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 +16736,41 @@ 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 { key: "" };
   }
   return formConfig;
 }
-function getSearchFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY$1);
-}
-function getSearchConfigList(Class, fieldList = []) {
-  if (fieldList.length === 0) {
-    fieldList = getSearchFieldList(Class);
-  }
+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 = "[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 { key: "" };
   }
   return tableConfig;
 }
-function getTableFieldList(Class) {
-  return DecoratorUtil.getFieldList(Class, LIST_KEY);
-}
-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 +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;
@@ -19780,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.29",
+  "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.6",
+    "@airpower/transformer": "^0.1.7",
     "@airpower/util": "^0.1.3",
     "@element-plus/icons-vue": "^2.3.1",
     "axios": "^1.8.4",