@airpower/web 0.0.43 → 0.1.2

package/README.md

@@ -6,7 +6,7 @@
   <img src="https://svg.hamm.cn?key=Lang&value=TypeScript&bg=green"/>
   <img src="https://svg.hamm.cn?key=Build&value=Vite"/>
   <img src="https://svg.hamm.cn?key=Base&value=Vue3"/>
-  <img src="https://svg.hamm.cn?key=UI&value=Element Plus"/>
+  <img src="https://svg.hamm.cn?key=UI&value=ElementPlus"/>
 </p>
 
 <p align="center">

package/dist/airpower.web.js

@@ -2,36 +2,43 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { defineComponent, computed, createBlock, openBlock, unref, mergeProps, toHandlers, withCtx, createElementBlock, Fragment, renderList, ref } from "vue";
-import { AirDecorator, getFieldConfig, AirClassTransformer, AirI18n, QueryPageResponse, QueryPageRequest, Page, HttpConfig, AbstractHttp, HttpResponse, HttpStatus, AbstractEntityService } from "@airpower/core";
+import { DecoratorUtil, getFieldConfig, ClassTransformer, I18n, QueryPageResponse, QueryPageRequest, Page, HttpConfig, AbstractHttp, HttpResponse, HttpStatus, AbstractEntityService } from "@airpower/core";
 export * from "@airpower/core";
 import { ElTable, ElTableColumn, ElMessageBox, ElMessage } from "element-plus";
 import axios from "axios";
 const FIELD_CONFIG_KEY = "Table";
 const FIELD_LIST_KEY = "TableList";
 function Table(config = {}) {
-  config.dictionary = AirDecorator.getDictionary(config.dictionary);
   return (target, key) => {
     config.key = key;
-    return AirDecorator.setFieldConfig(target, key, FIELD_CONFIG_KEY, config, FIELD_LIST_KEY);
+    return DecoratorUtil.setFieldConfig(target, key, FIELD_CONFIG_KEY, config, FIELD_LIST_KEY);
   };
 }
 function getTableConfig(target, key) {
-  const formConfig = AirDecorator.getFieldConfig(target, key, FIELD_CONFIG_KEY, true);
-  if (!formConfig.dictionary) {
+  const formConfig = DecoratorUtil.getFieldConfig(target, key, FIELD_CONFIG_KEY, true);
+  if (!formConfig) {
+    return null;
+  }
+  if (!formConfig.enums) {
     const props = getFieldConfig(target, key);
-    formConfig.dictionary = AirDecorator.getDictionary(props.dictionary);
+    if (props && props.enums) {
+      formConfig.enums = props.enums;
+    }
   }
   return formConfig;
 }
 function getTableFieldList(target) {
-  return AirDecorator.getFieldList(target, FIELD_LIST_KEY);
+  return DecoratorUtil.getFieldList(target, FIELD_LIST_KEY);
 }
 function getTableConfigList(target, keyList) {
-  return AirDecorator.getFieldConfigList(target, FIELD_LIST_KEY, FIELD_CONFIG_KEY, keyList).sort((a, b) => (b.orderNumber || 0) - (a.orderNumber || 0)).map((item) => {
+  return DecoratorUtil.getFieldConfigList(target, FIELD_LIST_KEY, FIELD_CONFIG_KEY, keyList).sort((a, b) => (b.orderNumber || 0) - (a.orderNumber || 0)).map((item) => {
     const props = getFieldConfig(target, item.key);
     item.label = item.label || props.label || item.key;
-    if (!item.dictionary) {
-      item.dictionary = AirDecorator.getDictionary(props.dictionary);
+    if (!item.enums) {
+      const fieldConfig = getFieldConfig(target, item.key);
+      if (fieldConfig && fieldConfig.enums) {
+        item.enums = fieldConfig.enums;
+      }
     }
     return item;
   });
@@ -74,7 +81,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.columns && props.columns.length > 0) {
         return props.columns;
       }
-      const instance = AirClassTransformer.newInstance(props.clazz);
+      const instance = ClassTransformer.newInstance(props.clazz);
       return getTableConfigList(instance, []);
     });
     return (_ctx, _cache) => {
@@ -96,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-class WebI18n extends AirI18n {
+class WebI18n extends I18n {
   constructor() {
     super(...arguments);
     __publicField(this, "Detail", "详情");
@@ -129,10 +136,10 @@ class DetailController {
     __publicField(this, "title", ref(WebI18n.get().Detail));
     __publicField(this, "service");
     __publicField(this, "option", {});
-    this.service = AirClassTransformer.newInstance(ServiceClass);
+    this.service = ClassTransformer.newInstance(ServiceClass);
     this.service.setLoading(this.isLoading);
     this.option = option;
-    this.formData = ref(props.param ? props.param.copy() : AirClassTransformer.newInstance(this.service.entityClass));
+    this.formData = ref(props.param ? props.param.copy() : ClassTransformer.newInstance(this.service.entityClass));
     this.getDetail();
   }
   /**
@@ -169,7 +176,7 @@ class BaseTableController {
     __publicField(this, "isLoading", ref(false));
     __publicField(this, "service");
     __publicField(this, "option", {});
-    this.service = AirClassTransformer.newInstance(ServiceClass);
+    this.service = ClassTransformer.newInstance(ServiceClass);
     this.request = ref(new QueryPageRequest(this.service.entityClass));
     this.service.setLoading(this.isLoading);
     this.getList();
@@ -347,7 +354,7 @@ class TableTreeController extends TableController {
       return;
     }
     try {
-      let param = AirClassTransformer.newInstance(this.service.entityClass);
+      let param = ClassTransformer.newInstance(this.service.entityClass);
       param.parentId = row.id;
       if (this.option.beforeAddRow) {
         const result = this.option.beforeAddRow(param, row);
@@ -361,7 +368,7 @@ class TableTreeController extends TableController {
     }
   }
 }
-class WebAccessToken {
+class WebAccessTokenUtil {
   /**
    * ### 获取AccessToken
    */
@@ -422,7 +429,7 @@ class WebHttp extends AbstractHttp {
    * # 获取AccessToken
    */
   getAccessToken() {
-    return WebAccessToken.getAccessToken();
+    return WebAccessTokenUtil.getAccessToken();
   }
   startLoading() {
     this.loading.value = true;
@@ -473,7 +480,7 @@ export {
   Table,
   TableController,
   TableTreeController,
-  WebAccessToken,
+  WebAccessTokenUtil,
   WebHttp,
   WebI18n,
   _sfc_main as WebTable,

package/dist/components/WebTable.vue.d.ts

@@ -1,6 +1,6 @@
-import { AirEntity, ClassConstructor } from '@airpower/core';
+import { ClassConstructor, Entity } from '@airpower/core';
 import { ITableFieldConfig } from '../decorator';
-declare const _default: <E extends AirEntity>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const _default: <E extends Entity>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{
         tableId: string;
     }> & Omit<{

package/dist/controller/DetailController.d.ts

@@ -1,4 +1,4 @@
-import { AirEntity, IJson } from '@airpower/core';
+import { Entity, IJson } from '@airpower/core';
 import { Ref } from 'vue';
 import { AbstractWebService } from '../service';
 import { IDetailControllerOption } from './interface';
@@ -7,7 +7,7 @@ import { IDetailControllerOption } from './interface';
  *
  * @author Hamm.cn
  */
-export declare class DetailController<E extends AirEntity, S extends AbstractWebService<E>, O extends IDetailControllerOption<E> = IDetailControllerOption<E>> {
+export declare class DetailController<E extends Entity, S extends AbstractWebService<E>, O extends IDetailControllerOption<E> = IDetailControllerOption<E>> {
     isLoading: Ref<boolean, boolean>;
     formData: Ref<E>;
     title: Ref<string, string>;

package/dist/controller/EditorController.d.ts

@@ -1,4 +1,4 @@
-import { AirEntity } from '@airpower/core';
+import { Entity } from '@airpower/core';
 import { AbstractWebService } from '../service';
 import { DetailController } from './DetailController';
 /**
@@ -6,6 +6,6 @@ import { DetailController } from './DetailController';
  *
  * @author Hamm.cn
  */
-export declare class EditorController<E extends AirEntity, S extends AbstractWebService<E>> extends DetailController<E, S> {
+export declare class EditorController<E extends Entity, S extends AbstractWebService<E>> extends DetailController<E, S> {
     getDetail(): Promise<void>;
 }

package/dist/controller/interface/IDetailControllerOption.d.ts

@@ -1,10 +1,10 @@
-import { AirEntity } from '@airpower/core';
+import { Entity } from '@airpower/core';
 /**
  * # 详情控制器配置项
  *
  * @author Hamm.cn
  */
-export interface IDetailControllerOption<E extends AirEntity> {
+export interface IDetailControllerOption<E extends Entity> {
     /**
      * ### 查到详情后的事件
      * 参数为响应的数据,请处理后返回

package/dist/controller/interface/ITableControllerOption.d.ts

@@ -1,11 +1,11 @@
-import { AirEntity, QueryPageRequest } from '@airpower/core';
+import { Entity, QueryPageRequest } from '@airpower/core';
 import { Component } from 'vue';
 /**
  * # 表格控制器配置项
  *
  * @author Hamm.cn
  */
-export interface ITableControllerOption<E extends AirEntity> {
+export interface ITableControllerOption<E extends Entity> {
     /**
      * ### 不分页
      * 默认请求分页接口 如配置了 `treeList` 则此项自动失效

package/dist/controller/interface/ITableTreeControllerOption.d.ts

@@ -1,11 +1,11 @@
-import { AirEntity, ITree } from '@airpower/core';
+import { Entity, ITree } from '@airpower/core';
 import { ITableControllerOption } from './ITableControllerOption';
 /**
  * # 表格树控制器配置项
  *
  * @author Hamm.cn
  */
-export interface ITableTreeControllerOption<T extends ITree & AirEntity> extends ITableControllerOption<T> {
+export interface ITableTreeControllerOption<T extends ITree & Entity> extends ITableControllerOption<T> {
     /**
      * ### 添加行的子项的前置拦截方法
      * 参数为发起请求的数据,请处理后返回 `param`

package/dist/controller/interface/IUseEditorOption.d.ts

@@ -1,11 +1,11 @@
-import { AirEntity } from '@airpower/core';
+import { Entity } from '@airpower/core';
 import { IDetailControllerOption } from './IDetailControllerOption';
 /**
  * # 编辑控制器的可选配置
  *
  * @author Hamm.cn
  */
-export interface IUseEditorOption<E extends AirEntity> extends IDetailControllerOption<E> {
+export interface IUseEditorOption<E extends Entity> extends IDetailControllerOption<E> {
     /**
      * ### 编辑成功的提示消息
      */

package/dist/controller/table/BaseTableController.d.ts

@@ -1,4 +1,4 @@
-import { AirEntity, QuerySort, Page, QueryPageRequest, QueryPageResponse } from '@airpower/core';
+import { Entity, QuerySort, Page, QueryPageRequest, QueryPageResponse } from '@airpower/core';
 import { Ref } from 'vue';
 import { AbstractWebService } from '../../service';
 import { ITableControllerOption } from '../interface';
@@ -7,7 +7,7 @@ import { ITableControllerOption } from '../interface';
  *
  * @author Hamm.cn
  */
-export declare class BaseTableController<E extends AirEntity, S extends AbstractWebService<E>, O extends ITableControllerOption<E> = ITableControllerOption<E>> {
+export declare class BaseTableController<E extends Entity, S extends AbstractWebService<E>, O extends ITableControllerOption<E> = ITableControllerOption<E>> {
     request: Ref<QueryPageRequest<E>>;
     response: Ref<QueryPageResponse<E>>;
     list: Ref<E[]>;

package/dist/controller/table/TableController.d.ts

@@ -1,4 +1,4 @@
-import { AirEntity } from '@airpower/core';
+import { Entity } from '@airpower/core';
 import { AbstractWebService } from '../../service';
 import { ITableControllerOption } from '../interface';
 import { BaseTableController } from './BaseTableController';
@@ -7,7 +7,7 @@ import { BaseTableController } from './BaseTableController';
  *
  * @author Hamm.cn
  */
-export declare class TableController<E extends AirEntity, S extends AbstractWebService<E>, O extends ITableControllerOption<E> = ITableControllerOption<E>> extends BaseTableController<E, S, O> {
+export declare class TableController<E extends Entity, S extends AbstractWebService<E>, O extends ITableControllerOption<E> = ITableControllerOption<E>> extends BaseTableController<E, S, O> {
     /**
      * ### 表格行编辑事件
      * @param row 行数据

package/dist/controller/table/TableTreeController.d.ts

@@ -1,4 +1,4 @@
-import { AirEntity, ITree } from '@airpower/core';
+import { Entity, ITree } from '@airpower/core';
 import { AbstractWebService } from '../../service';
 import { ITableTreeControllerOption } from '../interface';
 import { TableController } from './TableController';
@@ -7,7 +7,7 @@ import { TableController } from './TableController';
  *
  * @author Hamm.cn
  */
-export declare class TableTreeController<E extends ITree & AirEntity, S extends AbstractWebService<E>> extends TableController<E, S, ITableTreeControllerOption<E>> {
+export declare class TableTreeController<E extends ITree & Entity, S extends AbstractWebService<E>> extends TableController<E, S, ITableTreeControllerOption<E>> {
     /**
      * ### 树表格添加子项事件
      * @param row 行数据

package/dist/decorator/@table/ITableFieldConfig.d.ts

@@ -1,4 +1,4 @@
-import { AirDictionaryArray, AirEnum, ClassConstructor, IField } from '@airpower/core';
+import { EnumConstructor, IField } from '@airpower/core';
 import { IElementTableColumn } from './IElementTableColumn';
 /**
  * # 表格的字段配置接口
@@ -9,7 +9,7 @@ export interface ITableFieldConfig extends IField, IElementTableColumn {
     /**
      * ### 字典
      */
-    dictionary?: ClassConstructor<AirEnum> | AirDictionaryArray;
+    enums?: EnumConstructor;
     key?: string;
     /**
      * ### 列排序

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

@@ -1,24 +1,24 @@
-import { AirDecoratorTarget } from '@airpower/core';
+import { DecoratorTarget } from '@airpower/core';
 import { ITableFieldConfig } from './ITableFieldConfig';
 /**
  * ### 为属性标记是表格字段
  * @param config 表格列的配置
  */
-export declare function Table(config?: ITableFieldConfig): (target: AirDecoratorTarget, key: string) => void;
+export declare function Table(config?: ITableFieldConfig): (target: DecoratorTarget, key: string) => void;
 /**
  * ### 获取对象的属性表格的配置
  * @param target 目标对象
  * @param key 属性名
  */
-export declare function getTableConfig(target: AirDecoratorTarget, key: string): ITableFieldConfig | null;
+export declare function getTableConfig(target: DecoratorTarget, key: string): ITableFieldConfig | null;
 /**
  * ### 获取标记了表格配置的字段列表
  * @param target 目标对象
  */
-export declare function getTableFieldList(target: AirDecoratorTarget): string[];
+export declare function getTableFieldList(target: DecoratorTarget): string[];
 /**
  * ### 获取字段标记的表格字段配置列表
  * @param target 目标实体类
  * @param keyList 字段列表
  */
-export declare function getTableConfigList(target: AirDecoratorTarget, keyList: string[]): ITableFieldConfig[];
+export declare function getTableConfigList(target: DecoratorTarget, keyList: string[]): ITableFieldConfig[];

package/dist/i18n/WebI18n.d.ts

@@ -1,10 +1,10 @@
-import { AirI18n } from '@airpower/core';
+import { I18n } from '@airpower/core';
 /**
  * # Web端默认语言包
  *
  * @author Hamm.cn
  */
-export declare class WebI18n extends AirI18n {
+export declare class WebI18n extends I18n {
     Detail: string;
     Edit: string;
     Add: string;

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 export * from './components';
 export * from './controller';
 export * from './decorator';
-export * from './helper';
 export * from './http';
 export * from './i18n';
 export * from './service';
 export * from './shared';
-export * from './type';
+export * from './util';

package/dist/service/AbstractWebService.d.ts

@@ -1,4 +1,4 @@
-import { AbstractHttp, AirEntity, AbstractEntityService } from '@airpower/core';
+import { AbstractHttp, Entity, AbstractEntityService } from '@airpower/core';
 import { Ref } from 'vue';
 /**
  * # 实体 `API` 服务超类
@@ -7,7 +7,7 @@ import { Ref } from 'vue';
  * @param E 泛型实体类
  * @author Hamm.cn
  */
-export declare abstract class AbstractWebService<E extends AirEntity> extends AbstractEntityService<E> {
+export declare abstract class AbstractWebService<E extends Entity> extends AbstractEntityService<E> {
     /**
      * ### 是否正在加载中
      */

package/dist/{helper/WebAccessToken.d.ts → util/WebAccessTokenUtil.d.ts}

@@ -3,7 +3,7 @@
  *
  * @author Hamm.cn
  */
-export declare class WebAccessToken {
+export declare class WebAccessTokenUtil {
     /**
      * ### 获取AccessToken
      */

package/dist/util/index.d.ts

@@ -0,0 +1 @@
+export * from './WebAccessTokenUtil';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.0.43",
+  "version": "0.1.2",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",
@@ -44,7 +44,7 @@
     "vue": "^3.5.13"
   },
   "dependencies": {
-    "@airpower/core": "^0.1.17",
+    "@airpower/core": "^1.0.1",
     "axios": "^1.8.4",
     "element-plus": "^2.9.7",
     "vue": "^3.5.13"

package/dist/helper/index.d.ts

@@ -1 +0,0 @@
-export * from './WebAccessToken';

package/dist/type/WebType.d.ts

@@ -1 +0,0 @@
-export type MoneyDirection = 'up' | 'down';

package/dist/type/index.d.ts

@@ -1 +0,0 @@
-export * from './WebType';