@airpower/web 0.0.36 → 0.0.38

package/README.md

@@ -10,8 +10,8 @@
 </p>
 
 <p align="center">
-<a href="https://github.com/AirPowerTeam/AirPower-Web">Github</a> / 
-<a href="https://gitee.com/air-power/AirPower-Web">Gitee</a> / 
+<a href="https://github.com/AirPowerTeam/AirPower-Web">Github</a> /
+<a href="https://gitee.com/air-power/AirPower-Web">Gitee</a> /
 <a href="https://www.npmjs.com/package/@airpower/web">NPM</a>
 </p>
 

package/dist/airpower.web.js

@@ -2,7 +2,7 @@ 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, HttpConfig, AirI18n, QueryPageRequest, QueryPageResponse, Page, AbstractHttp, HttpResponse, HttpStatus, AbstractEntityService } from "@airpower/core";
+import { AirDecorator, getFieldConfig, AirClassTransformer, HttpConfig, AirI18n, QueryPageResponse, QueryPageRequest, Page, AbstractHttp, HttpResponse, HttpStatus, AbstractEntityService } from "@airpower/core";
 export * from "@airpower/core";
 import { ElTable, ElTableColumn, ElMessageBox, ElMessage } from "element-plus";
 import axios from "axios";
@@ -111,194 +111,220 @@ class WebAccessToken {
   }
 }
 class WebI18n extends AirI18n {
-  static get() {
-    return AirI18n.get();
+  constructor() {
+    super(...arguments);
+    __publicField(this, "Detail", "详情");
+    __publicField(this, "Edit", "编辑");
+    __publicField(this, "Add", "添加");
+    __publicField(this, "EditSuccess", "编辑成功");
+    __publicField(this, "AddSuccess", "添加成功");
+    __publicField(this, "DeleteSuccess", "删除成功");
+    __publicField(this, "SelectPlease", "请选择");
+    __publicField(this, "DisableSuccess", "禁用成功");
+    __publicField(this, "EnableSuccess", "启用成功");
+  }
+}
+class DetailController {
+  constructor() {
+    __publicField(this, "isLoading", ref(false));
+    __publicField(this, "formData");
+    __publicField(this, "title", ref(WebI18n.get().Detail));
+    __publicField(this, "service");
+    __publicField(this, "option", {});
+  }
+  /**
+   * ### 创建详情控制器
+   * @param props `defineProps` 的返回值
+   * @param entityClass 详情使用的实体类
+   * @param serviceClass 详情使用的 `Service`
+   * @param option `可选` 更多的配置
+   */
+  static create(props, entityClass, serviceClass, option = {}) {
+    const instance = new this();
+    instance.service = AirClassTransformer.newInstance(serviceClass);
+    instance.option = option;
+    instance.service.setLoading(instance.isLoading);
+    instance.formData = ref(props.param ? props.param.copy() : AirClassTransformer.newInstance(entityClass));
+    instance.getDetail();
+    return instance;
+  }
+  /**
+   * ### 查询详情方法
+   */
+  async getDetail() {
+    if (this.formData.value.id) {
+      this.formData.value = await this.service.getDetail(this.formData.value.id, this.option.apiUrl);
+      if (this.option.afterGetDetail) {
+        const result = this.option.afterGetDetail(this.formData.value);
+        if (result !== void 0) {
+          this.formData.value = result;
+        }
+      }
+    }
   }
 }
-function useBaseTable(entityClass, serviceClass, option = {}) {
-  const isLoading = ref(false);
-  const request = ref(new QueryPageRequest(entityClass));
-  if (option.defaultFilter) {
-    request.value.filter = option.defaultFilter;
-  }
-  const response = ref(new QueryPageResponse());
-  const list = ref([]);
-  const entity = AirClassTransformer.newInstance(entityClass);
-  const service = AirClassTransformer.newInstance(serviceClass);
-  service.loading = isLoading;
-  const selectList = ref([]);
-  async function onGetList() {
-    let req = request.value;
-    if (option.beforeSearch) {
-      const result = option.beforeSearch(req);
-      if (result !== void 0) {
+class EditorController extends DetailController {
+  async getDetail() {
+    this.title.value = this.formData.value.id ? WebI18n.get().Edit : WebI18n.get().Add;
+    return super.getDetail();
+  }
+}
+class BaseTableController {
+  /**
+   * ### 创建表格控制器
+   * @param ServiceClass 服务类
+   */
+  constructor(ServiceClass) {
+    __publicField(this, "request");
+    __publicField(this, "response", ref(new QueryPageResponse()));
+    __publicField(this, "list", ref([]));
+    __publicField(this, "selectList", ref([]));
+    __publicField(this, "isLoading", ref(false));
+    __publicField(this, "service");
+    __publicField(this, "option", {});
+    this.service = AirClassTransformer.newInstance(ServiceClass);
+    this.request = ref(new QueryPageRequest(this.service.entityClass));
+    this.init();
+  }
+  /**
+   * ### 设置配置
+   * @param option 更多配置
+   */
+  setOption(option) {
+    this.option = option;
+    if (option.defaultFilter) {
+      this.request.value.filter = option.defaultFilter;
+    }
+    return this;
+  }
+  /**
+   * ### 查询列表事件
+   */
+  async getList() {
+    let req = this.request.value;
+    if (this.option.beforeSearch) {
+      const result = this.option.beforeSearch(req);
+      if (result) {
         req = result;
       }
     }
-    if (option.treeList) {
-      list.value = await service.getTreeList(req, option.apiUrl);
-    } else if (!option.unPaginate) {
-      response.value = await service.getPage(req, option.apiUrl);
-      list.value = response.value.list;
+    if (this.option.treeList) {
+      this.list.value = await this.service.getTreeList(req, this.option.apiUrl);
+    } else if (!this.option.unPaginate) {
+      this.response.value = await this.service.getPage(req, this.option.apiUrl);
+      this.list.value = this.response.value.list;
     } else {
-      list.value = await service.getList(req, option.apiUrl);
+      this.list.value = await this.service.getList(req, this.option.apiUrl);
     }
   }
-  async function onSearch(req) {
-    request.value = req;
-    onGetList();
+  /**
+   * ### 搜索
+   * @param req 请求对象
+   */
+  async search(req) {
+    this.request.value = req;
+    this.getList();
   }
-  async function onReloadData() {
-    if (!request.value.page) {
-      request.value.page = new Page();
+  /**
+   * ### 重新加载数据
+   * 会自动返回第一页
+   */
+  async reload() {
+    if (!this.request.value.page) {
+      this.request.value.page = new Page();
     }
-    request.value.page.pageNum = 1;
-    onSearch(request.value);
+    this.request.value.page.pageNum = 1;
+    this.search(this.request.value);
   }
-  async function onAdd() {
-    if (!option.editView) {
+  /**
+   * ### 添加事件
+   */
+  async add() {
+    if (!this.option.editView) {
       console.error("请为 useAirTableList 的 option 传入 editView");
       return;
     }
     try {
-      console.warn("需要弹出并携带数据", entity, option.editView);
     } finally {
-      onGetList();
+      this.getList();
     }
   }
-  async function onDetail(row) {
-    if (!option.detailView) {
+  /**
+   * ### 点击表格行详情事件
+   * @param row 行数据
+   */
+  async detail(row) {
+    if (!this.option.detailView) {
       console.error("请为 useAirTableList 的 option 传入 detailView");
       return;
     }
     try {
-      console.warn("需要弹出并携带数据", row, option.detailView);
+      console.warn("需要弹出并携带数据", row, this.option.detailView);
     } finally {
-      onReloadData();
+      this.reload();
     }
   }
-  async function onSortChanged(sort) {
-    request.value.sort = sort;
-    request.value.page = new Page();
-    onGetList();
-  }
-  async function onSelected(list2) {
-    selectList.value = list2;
-  }
-  async function onPageChanged(page) {
-    request.value.page = page;
-    onGetList();
-  }
-  onGetList();
-  return {
-    entity,
-    service,
-    isLoading,
-    response,
-    request,
-    list,
-    selectList,
-    onSearch,
-    onPageChanged,
-    onAdd,
-    onSortChanged,
-    onSelected,
-    onGetList,
-    onDetail,
-    onReloadData
-  };
-}
-function useDetail(props, entityClass, serviceClass, option = {}) {
-  const isLoading = ref(false);
-  const service = AirClassTransformer.newInstance(serviceClass);
-  service.loading = isLoading;
-  const formData = ref(props.param ? props.param.copy() : AirClassTransformer.newInstance(entityClass));
-  const title = ref(WebI18n.get().Detail || "详情");
-  async function getDetail() {
-    if (formData.value.id) {
-      formData.value = await service.getDetail(formData.value.id, option.apiUrl);
-      if (option.afterGetDetail) {
-        const result = option.afterGetDetail(formData.value);
-        if (result !== void 0) {
-          formData.value = result;
-        }
-      }
-    }
+  /**
+   * ### 排序变更事件
+   * @param sort 排序对象
+   */
+  async sortChanged(sort) {
+    this.request.value.sort = sort;
+    this.request.value.page = new Page();
+    this.getList();
   }
-  getDetail();
-  return {
-    title,
-    formData,
-    isLoading,
-    service,
-    getDetail
-  };
-}
-function useEditor(props, entityClass, serviceClass, option = {}) {
-  const result = useDetail(props, entityClass, serviceClass, option);
-  const title = computed(() => result.formData.value.id ? WebI18n.get().Edit || "编辑" : WebI18n.get().Add || "添加");
-  async function onSubmit() {
-    let postData = AirClassTransformer.copy(result.formData.value, entityClass);
-    if (option.beforeSubmit) {
-      const result2 = option.beforeSubmit(postData);
-      if (result2 === null) {
-        return;
-      }
-      postData = result2;
-    }
-    try {
-      if (postData.id) {
-        const id2 = await result.service.update(
-          postData,
-          option.successMessage || WebI18n.get().EditSuccess || "编辑成功",
-          option.apiUrlUpdate
-        );
-        props.onConfirm(id2);
-        return;
-      }
-      const id = await result.service.add(
-        postData,
-        option.successMessage || WebI18n.get().AddSuccess || "添加成功",
-        option.apiUrlAdd
-      );
-      props.onConfirm(id);
-    } catch (e) {
-      console.warn(e);
-    }
+  /**
+   * ### 选择变更事件
+   * @param list 选择列表
+   */
+  async selectChanged(list) {
+    this.selectList.value = list;
+  }
+  /**
+   * ### 分页变更事件
+   * @param page 分页对象
+   */
+  async pageChanged(page) {
+    this.request.value.page = page;
+    this.getList();
+  }
+  /**
+   * ### 初始化
+   */
+  init() {
+    this.service.setLoading(this.isLoading);
+    this.getList();
   }
-  return Object.assign(result, {
-    title,
-    onSubmit
-  });
-}
-function useSelector(props, entityClass, serviceClass, option = {}) {
-  const result = useBaseTable(entityClass, serviceClass, option);
-  const title = ref(WebI18n.get().SelectPlease || "请选择");
-  result.selectList.value = props.selectList;
-  const disableConfirm = computed(() => props.isMultiple && result.selectList.value.length === 0);
-  return Object.assign(result, {
-    title,
-    disableConfirm
-  });
 }
-function useTable(entityClass, serviceClass, option = {}) {
-  const result = useBaseTable(entityClass, serviceClass, option);
-  async function onEdit(row) {
-    if (!option.editView) {
+class TableController extends BaseTableController {
+  /**
+   * ### 表格行编辑事件
+   * @param row 行数据
+   */
+  async edit(row) {
+    if (!this.option.editView) {
       console.error("请为 useAirTableList 的 option 传入 editor");
       return;
     }
     try {
-      console.warn("需要弹出并携带数据", row, option.editView);
+      console.warn("需要弹出并携带数据", row, this.option.editView);
     } finally {
-      result.onGetList();
+      this.getList();
     }
   }
-  async function onDelete(row) {
-    await result.service.delete(row.id, WebI18n.get().DeleteSuccess || "删除成功");
-    result.onGetList();
+  /**
+   * ### 表格行删除事件
+   * @param row 行数据
+   */
+  async delete(row) {
+    await this.service.delete(row.id, WebI18n.get().DeleteSuccess);
+    this.getList();
   }
-  async function onDisable(row) {
+  /**
+   * ### 表格行禁用事件
+   * @param row 行数据
+   */
+  async disable(row) {
     await ElMessageBox.confirm(
       "是否确认禁用当前选择的数据?",
       "禁用提醒",
@@ -308,10 +334,14 @@ function useTable(entityClass, serviceClass, option = {}) {
         type: "warning"
       }
     );
-    await result.service.disable(row.id, WebI18n.get().DisableSuccess || "禁用成功");
-    result.onGetList();
+    await this.service.disable(row.id, WebI18n.get().DisableSuccess);
+    this.getList();
   }
-  async function onEnable(row) {
+  /**
+   * ### 表格行启用事件
+   * @param row 行数据
+   */
+  async enable(row) {
     await ElMessageBox.confirm(
       "是否确认启用当前选择的数据?",
       "启用提醒",
@@ -321,43 +351,34 @@ function useTable(entityClass, serviceClass, option = {}) {
         type: "warning"
       }
     );
-    await result.service.enable(row.id, WebI18n.get().EnableSuccess || "启用成功");
-    result.onGetList();
-  }
-  return Object.assign(result, {
-    onEdit,
-    onDelete,
-    onDisable,
-    onEnable
-  });
-}
-function useTableTree(entityClass, serviceClass, option = {}) {
-  if (option.unPaginate === void 0) {
-    option.unPaginate = true;
+    await this.service.enable(row.id, WebI18n.get().EnableSuccess);
+    this.getList();
   }
-  const result = useTable(entityClass, serviceClass, option);
-  async function onAddRow(row) {
-    if (!option.editView) {
+}
+class TableTreeController extends TableController {
+  /**
+   * ### 树表格添加子项事件
+   * @param row 行数据
+   */
+  async onAddRow(row) {
+    if (!this.option.editView) {
       console.error("请为 useAirTableList 的 option 传入 editor");
       return;
     }
     try {
-      let param = AirClassTransformer.newInstance(entityClass);
+      let param = AirClassTransformer.newInstance(this.service.entityClass);
       param.parentId = row.id;
-      if (option.beforeAddRow) {
-        const result2 = option.beforeAddRow(param, row);
-        if (result2 !== void 0) {
-          param = result2;
+      if (this.option.beforeAddRow) {
+        const result = this.option.beforeAddRow(param, row);
+        if (result !== void 0) {
+          param = result;
         }
       }
-      console.warn("需要弹出并携带数据", param, option.editView);
+      console.warn("需要弹出并携带数据", param, this.option.editView);
     } finally {
-      result.onReloadData();
+      this.reload();
     }
   }
-  return Object.assign(result, {
-    onAddRow
-  });
 }
 class WebHttp extends AbstractHttp {
   constructor() {
@@ -416,14 +437,17 @@ class AbstractWebService extends AbstractEntityService {
     __publicField(this, "loading", ref(false));
   }
   /**
-   * ### 创建一个 `Service` 对象
+   * ### 设置加载状态
    * @param loading 加载状态
    */
-  static createWithLoading(loading) {
-    const service = super.create();
-    service.loading = loading;
-    return service;
+  setLoading(loading) {
+    this.loading = loading;
+    return this;
   }
+  /**
+   * ### 创建一个 `Http` 对象
+   * @param url 请求的 `URL`
+   */
   createHttp(url) {
     const http = WebHttp.create(url, (error) => {
       ElMessage.error(error.message);
@@ -440,18 +464,17 @@ class AbstractWebService extends AbstractEntityService {
 }
 export {
   AbstractWebService,
+  BaseTableController,
+  DetailController,
+  EditorController,
   Table,
+  TableController,
+  TableTreeController,
   WebAccessToken,
   WebHttp,
   WebI18n,
   _sfc_main as WebTable,
   getTableConfig,
   getTableConfigList,
-  getTableFieldList,
-  useBaseTable,
-  useDetail,
-  useEditor,
-  useSelector,
-  useTable,
-  useTableTree
+  getTableFieldList
 };

package/dist/controller/DetailController.d.ts

@@ -0,0 +1,28 @@
+import { AirEntity, ClassConstructor, IJson } from '@airpower/core';
+import { Ref } from 'vue';
+import { AbstractWebService } from '../service';
+import { IDetailControllerOption } from './interface';
+/**
+ * # 详情控制器
+ *
+ * @author Hamm.cn
+ */
+export declare class DetailController<E extends AirEntity, S extends AbstractWebService<E>, O extends IDetailControllerOption<E> = IDetailControllerOption<E>> {
+    isLoading: Ref<boolean, boolean>;
+    formData: Ref<E>;
+    title: Ref<string, string>;
+    protected service: S;
+    protected option: O;
+    /**
+     * ### 创建详情控制器
+     * @param props `defineProps` 的返回值
+     * @param entityClass 详情使用的实体类
+     * @param serviceClass 详情使用的 `Service`
+     * @param option `可选` 更多的配置
+     */
+    static create<T extends DetailController<E, S>, E extends AirEntity, S extends AbstractWebService<E>>(this: ClassConstructor<T>, props: IJson, entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IDetailControllerOption<E>): T;
+    /**
+     * ### 查询详情方法
+     */
+    getDetail(): Promise<void>;
+}

package/dist/controller/EditorController.d.ts

@@ -0,0 +1,11 @@
+import { AirEntity } from '@airpower/core';
+import { AbstractWebService } from '../service';
+import { DetailController } from './DetailController';
+/**
+ * # 编辑器控制器
+ *
+ * @author Hamm.cn
+ */
+export declare class EditorController<E extends AirEntity, S extends AbstractWebService<E>> extends DetailController<E, S> {
+    getDetail(): Promise<void>;
+}

package/dist/controller/index.d.ts

@@ -0,0 +1,4 @@
+export * from './DetailController';
+export * from './EditorController';
+export * from './interface';
+export * from './table';

package/dist/{hooks/interface/IUseDetailOption.d.ts → controller/interface/IDetailControllerOption.d.ts}

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

package/dist/{hooks/interface/ITableHookOption.d.ts → controller/interface/ITableControllerOption.d.ts}

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

package/dist/{hooks/interface/IUseTableTreeOption.d.ts → controller/interface/ITableTreeControllerOption.d.ts}

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

package/dist/{hooks → controller}/interface/IUseEditorOption.d.ts

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

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

@@ -0,0 +1,4 @@
+export * from './IDetailControllerOption';
+export * from './ITableControllerOption';
+export * from './ITableTreeControllerOption';
+export * from './IUseEditorOption';

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

@@ -0,0 +1,72 @@
+import { AirEntity, QuerySort, Page, QueryPageRequest, QueryPageResponse } from '@airpower/core';
+import { Ref } from 'vue';
+import { AbstractWebService } from '../../service';
+import { ITableControllerOption } from '../interface';
+/**
+ * # 表格控制器基类
+ *
+ * @author Hamm.cn
+ */
+export declare class BaseTableController<E extends AirEntity, S extends AbstractWebService<E>, O extends ITableControllerOption<E> = ITableControllerOption<E>> {
+    request: Ref<QueryPageRequest<E>>;
+    response: Ref<QueryPageResponse<E>>;
+    list: Ref<E[]>;
+    selectList: Ref<E[]>;
+    isLoading: Ref<boolean, boolean>;
+    protected service: S;
+    protected option: O;
+    /**
+     * ### 创建表格控制器
+     * @param ServiceClass 服务类
+     */
+    constructor(ServiceClass: new () => S & {
+        entityClass: new () => E;
+    });
+    /**
+     * ### 设置配置
+     * @param option 更多配置
+     */
+    setOption(option: O): this;
+    /**
+     * ### 查询列表事件
+     */
+    getList(): Promise<void>;
+    /**
+     * ### 搜索
+     * @param req 请求对象
+     */
+    search(req: QueryPageRequest<E>): Promise<void>;
+    /**
+     * ### 重新加载数据
+     * 会自动返回第一页
+     */
+    reload(): Promise<void>;
+    /**
+     * ### 添加事件
+     */
+    add(): Promise<void>;
+    /**
+     * ### 点击表格行详情事件
+     * @param row 行数据
+     */
+    detail(row: E): Promise<void>;
+    /**
+     * ### 排序变更事件
+     * @param sort 排序对象
+     */
+    sortChanged(sort?: QuerySort): Promise<void>;
+    /**
+     * ### 选择变更事件
+     * @param list 选择列表
+     */
+    selectChanged(list: E[]): Promise<void>;
+    /**
+     * ### 分页变更事件
+     * @param page 分页对象
+     */
+    pageChanged(page: Page): Promise<void>;
+    /**
+     * ### 初始化
+     */
+    private init;
+}

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

@@ -0,0 +1,31 @@
+import { AirEntity } from '@airpower/core';
+import { AbstractWebService } from '../../service';
+import { ITableControllerOption } from '../interface';
+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> {
+    /**
+     * ### 表格行编辑事件
+     * @param row 行数据
+     */
+    edit(row: E): Promise<void>;
+    /**
+     * ### 表格行删除事件
+     * @param row 行数据
+     */
+    delete(row: E): Promise<void>;
+    /**
+     * ### 表格行禁用事件
+     * @param row 行数据
+     */
+    disable(row: E): Promise<void>;
+    /**
+     * ### 表格行启用事件
+     * @param row 行数据
+     */
+    enable(row: E): Promise<void>;
+}

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

@@ -0,0 +1,16 @@
+import { AirEntity, ITree } from '@airpower/core';
+import { AbstractWebService } from '../../service';
+import { ITableTreeControllerOption } from '../interface';
+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>> {
+    /**
+     * ### 树表格添加子项事件
+     * @param row 行数据
+     */
+    onAddRow(row: E): Promise<void>;
+}

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

@@ -0,0 +1,3 @@
+export * from './BaseTableController';
+export * from './TableController';
+export * from './TableTreeController';

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

@@ -1,6 +1,7 @@
 import { TableAlign, TableFixed, TableSortable } from './TableType';
 /**
  * # ElementPlus支持的列配置项
+ *
  * @autho Hamm.cn
  */
 export interface IElementTableColumn {

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

@@ -2,6 +2,7 @@ import { AirDictionaryArray, AirEnum, ClassConstructor, IField } from '@airpower
 import { IElementTableColumn } from './IElementTableColumn';
 /**
  * # 表格的字段配置接口
+ *
  * @author Hamm.cn
  */
 export interface ITableFieldConfig extends IField, IElementTableColumn {

package/dist/helper/WebAccessToken.d.ts

@@ -1,5 +1,6 @@
 /**
  * # 身份令牌工具类
+ *
  * @author Hamm.cn
  */
 export declare class WebAccessToken {

package/dist/helper/WebI18n.d.ts

@@ -1,13 +1,17 @@
 import { AirI18n } from '@airpower/core';
-export declare abstract class WebI18n extends AirI18n {
-    abstract Detail: string;
-    abstract Edit: string;
-    abstract Add: string;
-    abstract EditSuccess: string;
-    abstract AddSuccess: string;
-    abstract DeleteSuccess: string;
-    abstract SelectPlease: string;
-    abstract DisableSuccess: string;
-    abstract EnableSuccess: string;
-    static get(): WebI18n;
+/**
+ * # Web端默认语言包
+ *
+ * @author Hamm.cn
+ */
+export declare class WebI18n extends AirI18n {
+    Detail: string;
+    Edit: string;
+    Add: string;
+    EditSuccess: string;
+    AddSuccess: string;
+    DeleteSuccess: string;
+    SelectPlease: string;
+    DisableSuccess: string;
+    EnableSuccess: string;
 }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export * from './components';
+export * from './controller';
 export * from './decorator';
 export * from './helper';
-export * from './hooks';
 export * from './http';
 export * from './service';
 export * from './shared';

package/dist/service/AbstractWebService.d.ts

@@ -1,5 +1,4 @@
 import { AbstractHttp, AirEntity, AbstractEntityService } from '@airpower/core';
-import { ClassConstructor } from 'airpower';
 import { Ref } from 'vue';
 /**
  * # 实体 `API` 服务超类
@@ -12,12 +11,16 @@ export declare abstract class AbstractWebService<E extends AirEntity> extends Ab
     /**
      * ### 是否正在加载中
      */
-    loading: Ref<boolean, boolean>;
+    private loading;
     /**
-     * ### 创建一个 `Service` 对象
+     * ### 设置加载状态
      * @param loading 加载状态
      */
-    static createWithLoading<S extends AbstractWebService<E>, E extends AirEntity>(this: ClassConstructor<S>, loading: Ref<boolean>): S;
+    setLoading(loading: Ref<boolean>): this;
+    /**
+     * ### 创建一个 `Http` 对象
+     * @param url 请求的 `URL`
+     */
     protected createHttp(url: string): AbstractHttp;
     protected showSuccess(successMessage: string): void;
     protected showError(errorMessage: string): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",
@@ -38,13 +38,13 @@
     "lint": "eslint src --ext .ts",
     "preview": "vite preview"
   },
-  "dependencies": {
-    "@airpower/core": "^0.1.13",
+  "peerDependencies": {
     "axios": "^1.8.4",
     "element-plus": "^2.9.7",
     "vue": "^3.5.13"
   },
-  "peerDependencies": {
+  "dependencies": {
+    "@airpower/core": "^0.1.15",
     "axios": "^1.8.4",
     "element-plus": "^2.9.7",
     "vue": "^3.5.13"

package/dist/hooks/index.d.ts

@@ -1,7 +0,0 @@
-export * from './interface';
-export * from './useBaseTable';
-export * from './useDetail';
-export * from './useEditor';
-export * from './useSelector';
-export * from './useTable';
-export * from './useTableTree';

package/dist/hooks/interface/ITableHookResult.d.ts

@@ -1,80 +0,0 @@
-import { AirEntity, Page, QueryPageRequest, QueryPageResponse, QuerySort } from '@airpower/core';
-import { Ref } from 'vue';
-import { AbstractWebService } from '../../service';
-/**
- * # `TableHook` 的基础返回结构
- * @author Hamm.cn
- */
-export interface ITableHookResult<E extends AirEntity, S extends AbstractWebService<E>> {
-    /**
-     * ### 当前绑定的 `Loading` 状态
-     * 请随意 `v-loading` 到你需要的地方
-     */
-    isLoading: Ref<boolean>;
-    /**
-     * ### 响应数据
-     */
-    response: Ref<QueryPageResponse<E>>;
-    /**
-     * ### 请求数据
-     */
-    request: Ref<QueryPageRequest<E>>;
-    /**
-     * ### 返回的单页数据列表
-     */
-    list: Ref<E[]>;
-    /**
-     * ### 选中的数据列表
-     */
-    selectList: Ref<E[]>;
-    /**
-     * ### 实体的实例
-     */
-    entity: E;
-    /**
-     * ### `Service`的实例
-     */
-    service: S;
-    /**
-     * ### 刷新数据 返回第一页
-     */
-    onReloadData: () => void;
-    /**
-     * ### 搜索事件
-     *
-     * @param request 请求对象
-     */
-    onSearch: (request: QueryPageRequest<E>) => void;
-    /**
-     * ### 分页变更事件
-     *
-     * @param page 分页对象
-     */
-    onPageChanged: (page: Page) => void;
-    /**
-     * ### 详情事件
-     *
-     * @param row 选择的行
-     */
-    onDetail: (row: E) => void;
-    /**
-     * ### 添加事件
-     */
-    onAdd: () => void;
-    /**
-     * ### 排序变更事件
-     *
-     * @param sort 排序对象
-     */
-    onSortChanged: (sort?: QuerySort) => void | Promise<void>;
-    /**
-     * ### 多选事件
-     *
-     * @param list 选择的行列表
-     */
-    onSelected: (list: E[]) => void;
-    /**
-     * ### 刷新数据 保持留在当页
-     */
-    onGetList: () => void;
-}

package/dist/hooks/interface/IUseDetailResult.d.ts

@@ -1,30 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { Ref } from 'vue';
-import { AbstractWebService } from '../../service';
-/**
- * # 详情的 `Hook` 标准返回
- * @author Hamm.cn
- */
-export interface IUseDetailResult<E extends AirEntity, S extends AbstractWebService<E>> {
-    /**
-     * ### 对话框显示的标题
-     */
-    title: Ref<string>;
-    /**
-     * ### 表单或详情数据
-     */
-    formData: Ref<E>;
-    /**
-     * ### 当前绑定的 `Loading` 状态
-     * 请随意 `v-loading` 到你需要的地方
-     */
-    isLoading: Ref<boolean>;
-    /**
-     * ### 当前 `Hook` 使用的 `Service` 实例
-     */
-    service: S;
-    /**
-     * ### 查询详情
-     */
-    getDetail: () => void;
-}

package/dist/hooks/interface/IUseEditorResult.d.ts

@@ -1,14 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { AbstractWebService } from '../../service';
-import { IUseDetailResult } from './IUseDetailResult';
-/**
- * # `Editor` 的 `Hook` 标准返回
- * @author Hamm.cn
- */
-export interface IUseEditorResult<E extends AirEntity, S extends AbstractWebService<E>> extends IUseDetailResult<E, S> {
-    /**
-     * ### 表单提交的方法
-     * 你可以使用 `beforeSubmit` 方法来拦截请求的数据
-     */
-    onSubmit: () => void;
-}

package/dist/hooks/interface/IUseSelectorOption.d.ts

@@ -1,8 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { ITableHookOption } from './ITableHookOption';
-/**
- * # `Selector` 的 `Hook` 可选配置
- * @author Hamm.cn
- */
-export interface IUseSelectorOption<E extends AirEntity> extends ITableHookOption<E> {
-}

package/dist/hooks/interface/IUseSelectorResult.d.ts

@@ -1,19 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { Ref } from 'vue';
-import { AbstractWebService } from '../../service';
-import { ITableHookResult } from './ITableHookResult';
-/**
- * # 选择器 `Hook` 的标准返回
- * @author Hamm.cn
- */
-export interface IUseSelectorResult<E extends AirEntity, S extends AbstractWebService<E>> extends ITableHookResult<E, S> {
-    /**
-     * ### `Selector` 的标题
-     */
-    title: Ref<string>;
-    /**
-     * ### 是否禁用确认按钮
-     * 多选时当没有选择任何数据时将禁用确认按钮
-     */
-    disableConfirm: Ref<boolean>;
-}

package/dist/hooks/interface/IUseTableOption.d.ts

@@ -1,8 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { ITableHookOption } from './ITableHookOption';
-/**
- * # `TableList` 的 `Hook` 可选配置
- * @author Hamm.cn
- */
-export interface IUseTableOption<E extends AirEntity> extends ITableHookOption<E> {
-}

package/dist/hooks/interface/IUseTableResult.d.ts

@@ -1,33 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { AbstractWebService } from '../../service';
-import { ITableHookResult } from './ITableHookResult';
-/**
- * # 表格的 `Hook` 标准返回
- * @author Hamm.cn
- */
-export interface IUseTableResult<E extends AirEntity, S extends AbstractWebService<E>> extends ITableHookResult<E, S> {
-    /**
-     * ### 编辑事件
-     *
-     * @param row 选择的行
-     */
-    onEdit: (row: E) => void;
-    /**
-     * ### 删除事件
-     *
-     * @param row 选择的行
-     */
-    onDelete: (row: E) => void;
-    /**
-     * ### 禁用事件
-     *
-     * @param row 选择的行
-     */
-    onDisable: (row: E) => void;
-    /**
-     * ### 启用事件
-     *
-     * @param row 选择的行
-     */
-    onEnable: (row: E) => void;
-}

package/dist/hooks/interface/IUseTableTreeResult.d.ts

@@ -1,13 +0,0 @@
-import { AirEntity } from '@airpower/core';
-import { AbstractWebService } from '../../service';
-import { IUseTableResult } from './IUseTableResult';
-/**
- * # 树表格的 `Hook` 标准返回
- * @author Hamm.cn
- */
-export interface IUseTableTreeResult<E extends AirEntity, S extends AbstractWebService<E>> extends IUseTableResult<E, S> {
-    /**
-     * ### 表格行的添加按钮点击事件
-     */
-    onAddRow: (row: E) => void;
-}

package/dist/hooks/interface/index.d.ts

@@ -1,12 +0,0 @@
-export * from './ITableHookOption';
-export * from './ITableHookResult';
-export * from './IUseDetailOption';
-export * from './IUseDetailResult';
-export * from './IUseEditorOption';
-export * from './IUseEditorResult';
-export * from './IUseSelectorOption';
-export * from './IUseSelectorResult';
-export * from './IUseTableOption';
-export * from './IUseTableResult';
-export * from './IUseTableTreeOption';
-export * from './IUseTableTreeResult';

package/dist/hooks/useBaseTable.d.ts

@@ -1,11 +0,0 @@
-import { AirEntity, ClassConstructor } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { ITableHookOption, ITableHookResult } from './interface';
-/**
- * # 表格基础`Hook`
- * @param entityClass 实体类
- * @param serviceClass 表格使用的 `Service` 类
- * @param option `可选` 更多配置
- * @author Hamm.cn
- */
-export declare function useBaseTable<E extends AirEntity, S extends AbstractWebService<E>>(entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: ITableHookOption<E>): ITableHookResult<E, S>;

package/dist/hooks/useDetail.d.ts

@@ -1,12 +0,0 @@
-import { AirEntity, ClassConstructor, IJson } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { IUseDetailOption, IUseDetailResult } from './interface';
-/**
- * # 引入详情的`Hook`
- * @param props `defineProps` 的返回值
- * @param entityClass 详情使用的实体类
- * @param serviceClass 详情使用的 `Service`
- * @param option `可选` 更多的配置
- * @author Hamm.cn
- */
-export declare function useDetail<E extends AirEntity, S extends AbstractWebService<E>>(props: IJson, entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IUseDetailOption<E>): IUseDetailResult<E, S>;

package/dist/hooks/useEditor.d.ts

@@ -1,12 +0,0 @@
-import { AirEntity, ClassConstructor, IJson } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { IUseEditorOption, IUseEditorResult } from './interface';
-/**
- * # 引入`Editor`的`Hook`
- * @param props `defineProps`的返回值
- * @param entityClass `Editor`使用的实体类
- * @param serviceClass `Editor`使用的`Service`
- * @param option `可选` 更多的配置
- * @author Hamm.cn
- */
-export declare function useEditor<E extends AirEntity, S extends AbstractWebService<E>>(props: IJson, entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IUseEditorOption<E>): IUseEditorResult<E, S>;

package/dist/hooks/useSelector.d.ts

@@ -1,12 +0,0 @@
-import { AirEntity, ClassConstructor, IJson } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { IUseSelectorOption, IUseSelectorResult } from './interface';
-/**
- * # 引入`Selector`使用的`Hook`
- * @param props `defineProps`的返回值
- * @param entityClass 实体类
- * @param serviceClass `Selector`使用的`Service`类
- * @param option `可选` 更多配置
- * @author Hamm.cn
- */
-export declare function useSelector<E extends AirEntity, S extends AbstractWebService<E>>(props: IJson, entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IUseSelectorOption<E>): IUseSelectorResult<E, S>;

package/dist/hooks/useTable.d.ts

@@ -1,11 +0,0 @@
-import { AirEntity, ClassConstructor } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { IUseTableOption, IUseTableResult } from './interface';
-/**
- * # 引入表格使用的`Hook`
- * @param entityClass 实体类
- * @param serviceClass 表格使用的`Service`类
- * @param option `可选` 更多配置
- * @author Hamm.cn
- */
-export declare function useTable<E extends AirEntity, S extends AbstractWebService<E>>(entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IUseTableOption<E>): IUseTableResult<E, S>;

package/dist/hooks/useTableTree.d.ts

@@ -1,11 +0,0 @@
-import { AirEntity, ClassConstructor, ITree } from '@airpower/core';
-import { AbstractWebService } from '../service';
-import { IUseTableTreeOption, IUseTableTreeResult } from './interface';
-/**
- * # 引入表格树使用的`Hook`
- * @param entityClass 实体类
- * @param serviceClass 表格使用的`Service`类
- * @param option `可选` 更多配置
- * @author Hamm.cn
- */
-export declare function useTableTree<E extends ITree & AirEntity, S extends AbstractWebService<E>>(entityClass: ClassConstructor<E>, serviceClass: ClassConstructor<S>, option?: IUseTableTreeOption<E>): IUseTableTreeResult<E, S>;