@airpower/web 0.2.30 → 0.2.31

package/dist/main.js

@@ -685,113 +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 配置的参数
-   */
-  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(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
-    });
-  }
-}
 class Transformer {
   /**
    * ### 从 `JSON` 转换到当前类的对象
@@ -999,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) => {
@@ -1020,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) {
@@ -1057,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;
@@ -13625,17 +13609,7 @@ function Form(config = {}) {
   };
 }
 function getFormConfig(Class, field) {
-  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$2, true);
-  if (!formConfig) {
-    return { key: "" };
-  }
-  if (!formConfig.dictionary) {
-    const props = getFieldConfig(Class, field);
-    if (props && props.dictionary) {
-      formConfig.dictionary = props.dictionary;
-    }
-  }
-  return formConfig;
+  return DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$2, true) || {};
 }
 function getFormConfigList(Class) {
   const fieldList = Object.keys(Class.prototype);
@@ -16743,15 +16717,11 @@ function Search(config = {}) {
   };
 }
 function getSearchConfig(Class, field) {
-  const formConfig = DecoratorUtil.getFieldConfig(Class, field.toString(), KEY$1, true);
-  if (!formConfig) {
-    return { key: "" };
-  }
-  return formConfig;
+  return DecoratorUtil.getFieldConfig(Class, field, KEY$1, true) || {};
 }
 function getSearchConfigList(Class) {
-  const fieldList = Object.keys(Class.prototype);
-  const list = fieldList.map((field) => getSearchConfig(Class, field));
+  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]";
@@ -16762,11 +16732,7 @@ function Table(config = {}) {
   };
 }
 function getTableConfig(Class, field) {
-  const tableConfig = DecoratorUtil.getFieldConfig(Class, field, KEY, true);
-  if (!tableConfig) {
-    return { key: "" };
-  }
-  return tableConfig;
+  return DecoratorUtil.getFieldConfig(Class, field, KEY, true) || {};
 }
 function getTableConfigList(Class) {
   const fieldList = Object.keys(Class.prototype);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.2.30",
+  "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.7",
+    "@airpower/transformer": "^0.1.10",
     "@airpower/util": "^0.1.3",
     "@element-plus/icons-vue": "^2.3.1",
     "axios": "^1.8.4",