@airpower/web 0.2.13 → 0.2.14

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

@@ -3,11 +3,12 @@ import { DecoratorTarget } from '@airpower/transformer';
 import { RootModel } from '../../../base';
 import { WebEnumConstructor } from '../../../util';
 import { IFieldConfig } from './IFieldConfig';
+import { FieldConfigOptionalKey } from './type';
 /**
  * ### 为属性标记配置
  * @param config 配置项
  */
-export declare function Field<K extends EnumKey = EnumKey>(config?: IFieldConfig<K>): (target: DecoratorTarget, key: string) => void;
+export declare function Field<K extends EnumKey = EnumKey>(config?: FieldConfigOptionalKey<IFieldConfig<K>>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取属性的配置
  * @returns 配置对象

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

@@ -1,2 +1,3 @@
 export * from './Field';
 export * from './IFieldConfig';
+export * from './type';

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

@@ -0,0 +1,10 @@
+import { IFieldConfig } from './IFieldConfig';
+/**
+ * # 字段配置 `Key` 变为可选
+ */
+export type FieldConfigOptionalKey<T extends IFieldConfig> = Omit<T, 'key'> & {
+    /**
+     * ### 这个属性名你不用传入，你传了我也不认
+     */
+    key?: string;
+};

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

@@ -1,11 +1,12 @@
 import { DecoratorTarget } from '@airpower/transformer';
 import { RootModel } from '../../../base';
+import { FieldConfigOptionalKey } from '../@Field';
 import { IFormField } from './IFormField';
 /**
  * ### 标记该字段可用于表单配置
  * @param config 配置项
  */
-export declare function Form(config?: IFormField): (target: DecoratorTarget, key: string) => void;
+export declare function Form(config?: FieldConfigOptionalKey<IFormField>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象某个字段标记的表单配置项
  * @param target 目标类或对象

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

@@ -1,11 +1,12 @@
 import { DecoratorTarget } from '@airpower/transformer';
 import { RootModel } from '../../../base';
+import { FieldConfigOptionalKey } from '../@Field';
 import { ISearchField } from './ISearchField';
 /**
  * ### 标记该字段可用于表单配置
  * @param config 配置项
  */
-export declare function Search(config?: ISearchField): (target: DecoratorTarget, key: string) => void;
+export declare function Search(config?: FieldConfigOptionalKey<ISearchField>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象某个字段标记的搜索配置项
  * @param target 目标类或对象

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

@@ -1,11 +1,12 @@
 import { DecoratorTarget } from '@airpower/transformer';
 import { RootModel } from '../../../base';
+import { FieldConfigOptionalKey } from '../@Field';
 import { ITableColumn } from './ITableColumn';
 /**
  * ### 为属性标记是表格字段
  * @param config 表格列的配置
  */
-export declare function Table(config?: ITableColumn): (target: DecoratorTarget, key: string) => void;
+export declare function Table(config?: FieldConfigOptionalKey<ITableColumn>): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象的属性表格的配置
  * @param target 目标对象

package/dist/curd/decorator/common/IBaseField.d.ts

@@ -5,8 +5,7 @@
  */
 export interface IBaseField {
     /**
-     * ### 字段标题
-     * 此字段无需传入, 将自动从被标记类的属性上读取
+     * ### 字段名称
      */
-    key?: string;
+    key: string;
 }

package/dist/main.js

@@ -1147,6 +1147,7 @@ class AbstractCurdService extends AbstractService {
 const KEY$4 = `${DecoratorUtil.DecoratorKeyPrefix}[Field]`;
 function Field(config = {}) {
   return (target, key) => {
+    config.key = key;
     DecoratorUtil.setFieldConfig(target, key, KEY$4, config);
   };
 }
@@ -1166,13 +1167,13 @@ const LIST_KEY$2 = `${DecoratorUtil.DecoratorKeyPrefix}[FormList]`;
 function Form(config = {}) {
   return (target, key) => {
     config.key = key;
-    return DecoratorUtil.setFieldConfig(target, key, KEY$3, config, LIST_KEY$2);
+    DecoratorUtil.setFieldConfig(target, key, KEY$3, config);
   };
 }
 function getFormConfig(target, key) {
   const formConfig = DecoratorUtil.getFieldConfig(target, key, KEY$3, true);
   if (!formConfig) {
-    return {};
+    return { key };
   }
   if (!formConfig.dictionary) {
     const props = getFieldConfig(target, key);
@@ -1213,13 +1214,13 @@ const LIST_KEY$1 = `${DecoratorUtil.DecoratorKeyPrefix}[SearchList]`;
 function Search(config = {}) {
   return (target, key) => {
     config.key = key;
-    return DecoratorUtil.setFieldConfig(target, key, KEY$1, config, LIST_KEY$1);
+    DecoratorUtil.setFieldConfig(target, key, KEY$1, config);
   };
 }
 function getSearchConfig(target, key) {
   const formConfig = DecoratorUtil.getFieldConfig(target, key, KEY$1, true);
   if (!formConfig) {
-    return {};
+    return { key };
   }
   return formConfig;
 }
@@ -1238,13 +1239,13 @@ const LIST_KEY = `${DecoratorUtil.DecoratorKeyPrefix}[TableList]`;
 function Table(config = {}) {
   return (target, key) => {
     config.key = key;
-    return DecoratorUtil.setFieldConfig(target, key, KEY, config, LIST_KEY);
+    DecoratorUtil.setFieldConfig(target, key, KEY, config);
   };
 }
 function getTableConfig(target, key) {
   const tableConfig = DecoratorUtil.getFieldConfig(target, key, KEY, true);
   if (!tableConfig) {
-    return {};
+    return { key };
   }
   return tableConfig;
 }

package/package.json

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