@airpower/web 0.3.2 → 0.3.4

package/dist/components/table/Table.vue.d.ts

@@ -14,6 +14,7 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
     props: __VLS_PrettifyLocal<Pick<Partial<{
         loading: boolean;
         entity: ITransformerConstructor<E>;
+        onSearch: (request: QueryRequestPage<E>) => void;
         autoHeight: boolean;
         selectList: E[];
         emptyText: string;
@@ -67,6 +68,16 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         importUrl: string;
         importTemplateUrl: string;
         fileEntity: ITransformerConstructor<IFile & RootEntity>;
+        onAdd: () => void;
+        onDetail: (row: E) => void;
+        onDelete: (row: E) => void;
+        onEdit: (row: E) => void;
+        onSelected: (list: E[]) => void;
+        onAddRow: (row: E) => void;
+        onSortChange: (sort?: QuerySort) => void;
+        onDisable: (row: E) => void;
+        onEnable: (row: E) => void;
+        isTree: boolean;
     }> & Omit<{
         readonly loading: boolean;
         readonly autoHeight: boolean;
@@ -96,7 +107,9 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         readonly deleteContent: string;
         readonly showImport: boolean;
         readonly showExport: boolean;
+        readonly isTree: boolean;
         readonly entity?: ITransformerConstructor<E> | undefined;
+        readonly onSearch?: ((request: QueryRequestPage<E>) => void) | undefined;
         readonly emptyText?: string | undefined;
         readonly service?: CurdServiceConstructor<E, S> | undefined;
         readonly addPermission?: string | undefined;
@@ -124,17 +137,16 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         readonly importUrl?: string | undefined;
         readonly importTemplateUrl?: string | undefined;
         readonly fileEntity?: ITransformerConstructor<IFile & RootEntity> | undefined;
-        readonly onAdd?: (() => any) | undefined;
-        readonly onDelete?: ((row: E) => any) | undefined;
-        readonly onDisable?: ((row: E) => any) | undefined;
-        readonly onEnable?: ((row: E) => any) | undefined;
-        readonly onSearch?: ((request: QueryRequestPage<E>) => any) | undefined;
-        readonly onDetail?: ((row: E) => any) | undefined;
-        readonly onEdit?: ((row: E) => any) | undefined;
-        readonly onSelectChanged?: ((list: E[]) => any) | undefined;
-        readonly onAddRow?: ((row: E) => any) | undefined;
-        readonly onSortChanged?: ((sort?: QuerySort | undefined) => any) | undefined;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "loading" | "entity" | "autoHeight" | "selectList" | "emptyText" | "addPermission" | "searchParams" | "useHook" | "disablePage" | "hideAdd" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "columnList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "hideIndex" | "fieldCacheKey" | "hideColumnSelector" | "ctrlWidth" | "hideCtrl" | "showDetail" | "showAddRow" | "customDelete" | "deleteTitle" | "deleteContent" | "showImport" | "importTitle" | "exportParam" | "showExport" | "defaultFilter" | "importUrl" | "importTemplateUrl" | "fileEntity">, "onSearch" | "service" | "onAdd" | "onDelete" | "onDisable" | "onEnable" | "onDetail" | "onEdit" | "onSelectChanged" | "onAddRow" | "onSortChanged" | ("loading" | "entity" | "autoHeight" | "selectList" | "emptyText" | "addPermission" | "searchParams" | "useHook" | "disablePage" | "hideAdd" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "columnList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "hideIndex" | "fieldCacheKey" | "hideColumnSelector" | "ctrlWidth" | "hideCtrl" | "showDetail" | "showAddRow" | "customDelete" | "deleteTitle" | "deleteContent" | "showImport" | "importTitle" | "exportParam" | "showExport" | "defaultFilter" | "importUrl" | "importTemplateUrl" | "fileEntity")> & {} & Partial<{}>> & import('vue').PublicProps;
+        readonly onAdd?: (() => void) | undefined;
+        readonly onDetail?: ((row: E) => void) | undefined;
+        readonly onDelete?: ((row: E) => void) | undefined;
+        readonly onEdit?: ((row: E) => void) | undefined;
+        readonly onSelected?: ((list: E[]) => void) | undefined;
+        readonly onAddRow?: ((row: E) => void) | undefined;
+        readonly onSortChange?: ((sort?: QuerySort) => void) | undefined;
+        readonly onDisable?: ((row: E) => void) | undefined;
+        readonly onEnable?: ((row: E) => void) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "loading" | "entity" | "onSearch" | "autoHeight" | "selectList" | "emptyText" | "addPermission" | "searchParams" | "useHook" | "disablePage" | "hideAdd" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "columnList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "hideIndex" | "fieldCacheKey" | "hideColumnSelector" | "ctrlWidth" | "hideCtrl" | "showDetail" | "showAddRow" | "customDelete" | "deleteTitle" | "deleteContent" | "showImport" | "importTitle" | "exportParam" | "showExport" | "defaultFilter" | "importUrl" | "importTemplateUrl" | "fileEntity" | "onAdd" | "onDetail" | "onDelete" | "onEdit" | "onSelected" | "onAddRow" | "onSortChange" | "onDisable" | "onEnable" | "isTree">, "service" | ("loading" | "entity" | "onSearch" | "autoHeight" | "selectList" | "emptyText" | "addPermission" | "searchParams" | "useHook" | "disablePage" | "hideAdd" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "columnList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "hideIndex" | "fieldCacheKey" | "hideColumnSelector" | "ctrlWidth" | "hideCtrl" | "showDetail" | "showAddRow" | "customDelete" | "deleteTitle" | "deleteContent" | "showImport" | "importTitle" | "exportParam" | "showExport" | "defaultFilter" | "importUrl" | "importTemplateUrl" | "fileEntity" | "onAdd" | "onDetail" | "onDelete" | "onEdit" | "onSelected" | "onAddRow" | "onSortChange" | "onDisable" | "onEnable" | "isTree")> & {} & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
         resetSearch: () => void;
         search: () => void;
@@ -164,7 +176,7 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         afterPage?(_: {}): any;
         footerRight?(_: {}): any;
     };
-    emit: ((evt: "add") => void) & ((evt: "delete", row: E) => void) & ((evt: "disable", row: E) => void) & ((evt: "enable", row: E) => void) & ((evt: "search", request: QueryRequestPage<E>) => void) & ((evt: "detail", row: E) => void) & ((evt: "edit", row: E) => void) & ((evt: "selectChanged", list: E[]) => void) & ((evt: "addRow", row: E) => void) & ((evt: "sortChanged", sort?: QuerySort | undefined) => void);
+    emit: {};
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };

package/dist/main.js

@@ -17827,12 +17827,87 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     fileEntity: {
       type: Function,
       default: void 0
+    },
+    /**
+     * # 自定义添加事件
+     */
+    onAdd: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 自定义详情事件
+     */
+    onDetail: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 自定义删除事件
+     */
+    onDelete: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 自定义编辑事件
+     */
+    onEdit: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 选择变更事件
+     */
+    onSelected: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 行添加事件
+     */
+    onAddRow: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 排序变更事件
+     */
+    onSortChange: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 禁用事件
+     */
+    onDisable: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 启用事件
+     */
+    onEnable: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 搜索事件
+     */
+    onSearch: {
+      type: Function,
+      default: void 0
+    },
+    /**
+     * # 是否树形
+     */
+    isTree: {
+      type: Boolean,
+      default: false
     }
   },
-  emits: ["add", "detail", "delete", "edit", "selectChanged", "addRow", "sortChanged", "disable", "enable", "search"],
-  setup(__props, { expose: __expose, emit: __emit }) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
-    const emits = __emit;
     __expose({
       resetSearch: onReset,
       search: onSearch
@@ -17853,7 +17928,16 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const entityInstance = Transformer.newInstance(EntityClass);
     const modelConfig = getModelConfig(EntityClass);
     const dataListRef = computed(() => {
-      return hook ? hook.response.value.list : props.dataList;
+      if (props.dataList) {
+        return props.dataList;
+      }
+      if (hook) {
+        if (props.isTree) {
+          return hook.list.value;
+        }
+        return hook.response.value.list;
+      }
+      return [];
     });
     const selectListRef = computed(() => {
       return hook ? hook.selectList.value : props.selectList;
@@ -17934,7 +18018,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     }
     async function handleDelete(item) {
       if (props.customDelete) {
-        hook ? hook.onDelete(item) : emits("delete", item);
+        if (props.onDelete) {
+          props.onDelete(item);
+        } else if (hook) {
+          hook.onDelete(item);
+        }
         return;
       }
       try {
@@ -17954,7 +18042,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           cancelButtonText: WebI18n.get().Cancel,
           type: "warning"
         });
-        hook ? hook.onDelete(item) : emits("delete", item);
+        if (props.onDelete) {
+          props.onDelete(item);
+        } else if (hook) {
+          hook.onDelete(item);
+        }
       } catch (e) {
         console.error(e);
       }
@@ -17983,16 +18075,24 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           selectAll.push(find);
         }
       });
-      hook ? hook.onSelected(selectAll) : emits("selectChanged", selectAll);
+      if (props.onSelected) {
+        props.onSelected(selectAll);
+      } else if (hook) {
+        hook.onSelected(selectAll);
+      }
     }
     function handleSortChanged(data) {
+      let callback;
       if (data.prop && data.order) {
         const sort = new QuerySort();
         sort.field = data.prop;
         sort.direction = data.order === "descending" ? "desc" : "asc";
-        hook ? hook.onSortChanged(sort) : emits("sortChanged", sort);
-      } else {
-        hook ? hook.onSortChanged(void 0) : emits("sortChanged", void 0);
+        callback = sort;
+      }
+      if (props.onSortChange) {
+        props.onSortChange(callback);
+      } else if (hook) {
+        hook.onSortChanged(callback);
       }
     }
     function getRowEntity(scope) {
@@ -18039,6 +18139,48 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       }
       return WebConfig.apiUrl + url;
     }
+    function handleAdd() {
+      if (props.onAdd) {
+        props.onAdd();
+      } else if (hook) {
+        hook.onAdd();
+      }
+    }
+    function handleAddRow(row) {
+      if (props.onAddRow) {
+        props.onAddRow(row);
+      } else if (props.isTree) {
+        hook == null ? void 0 : hook.onAddRow(row);
+      }
+    }
+    function handleEdit(row) {
+      if (props.onEdit) {
+        props.onEdit(row);
+      } else if (hook) {
+        hook.onEdit(row);
+      }
+    }
+    function handleDetail(row) {
+      if (props.onDetail) {
+        props.onDetail(row);
+      } else if (hook) {
+        hook.onDetail(row);
+      }
+    }
+    function handleDisable(row) {
+      if (props.onDisable) {
+        props.onDisable(row);
+      } else if (hook) {
+        hook.onDisable(row);
+      }
+    }
+    function handleEnable(row) {
+      if (props.onEnable) {
+        props.onEnable(row);
+      } else if (hook) {
+        hook.onEnable(row);
+      }
+    }
     async function onImport() {
       let url = props.importUrl;
       if (!url) {
@@ -18117,7 +18259,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       if (request.value.page) {
         request.value.page.pageNum = 1;
       }
-      hook ? hook.onSearch(request.value) : emits("search", request.value);
+      if (props.onSearch) {
+        props.onSearch(request.value);
+      } else if (hook) {
+        hook.onSearch(request.value);
+      }
     }
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
@@ -18136,7 +18282,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     permission: __props.addPermission || unref(PermissionUtil).get(unref(EntityClass), unref(PermissionAction).ADD),
                     icon: "ADD",
                     primary: "",
-                    onClick: _cache[0] || (_cache[0] = ($event) => unref(hook) ? unref(hook).onAdd() : emits("add"))
+                    onClick: _cache[0] || (_cache[0] = ($event) => handleAdd())
                   }, {
                     default: withCtx(() => [
                       createTextVNode(toDisplayString(unref(modelConfig).addTitle || unref(WebI18n).get().Add), 1)
@@ -18350,7 +18496,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         key: 0,
                         disabled: unref(isAddRowDisabled)(getRowEntity(scope)),
                         underline: false,
-                        onClick: ($event) => emits("addRow", getRowEntity(scope))
+                        onClick: ($event) => handleAddRow(getRowEntity(scope))
                       }, {
                         default: withCtx(() => [
                           createTextVNode(toDisplayString(unref(WebI18n).get().Add), 1)
@@ -18361,7 +18507,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         key: 1,
                         disabled: unref(isEditDisabled)(getRowEntity(scope)),
                         underline: false,
-                        onClick: ($event) => unref(hook) ? unref(hook).onEdit(getRowEntity(scope)) : emits("edit", getRowEntity(scope))
+                        onClick: ($event) => handleEdit(getRowEntity(scope))
                       }, {
                         default: withCtx(() => [
                           createTextVNode(toDisplayString(unref(WebI18n).get().Update), 1)
@@ -18372,7 +18518,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         key: 2,
                         disabled: unref(isDetailDisabled)(getRowEntity(scope)),
                         underline: false,
-                        onClick: ($event) => unref(hook) ? unref(hook).onDetail(getRowEntity(scope)) : emits("detail", getRowEntity(scope))
+                        onClick: ($event) => handleDetail(getRowEntity(scope))
                       }, {
                         default: withCtx(() => [
                           createTextVNode(toDisplayString(unref(WebI18n).get().Detail), 1)
@@ -18384,7 +18530,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                           key: 0,
                           disabled: unref(isDisableChangeStatus)(getRowEntity(scope)),
                           underline: false,
-                          onClick: ($event) => unref(hook) ? unref(hook).onEnable(getRowEntity(scope)) : emits("enable", getRowEntity(scope))
+                          onClick: ($event) => handleEnable(getRowEntity(scope))
                         }, {
                           default: withCtx(() => [
                             createTextVNode(toDisplayString(unref(WebI18n).get().Enable), 1)
@@ -18395,7 +18541,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                           disabled: unref(isDisableChangeStatus)(getRowEntity(scope)),
                           underline: false,
                           type: "warning",
-                          onClick: ($event) => unref(hook) ? unref(hook).onDisable(getRowEntity(scope)) : emits("disable", getRowEntity(scope))
+                          onClick: ($event) => handleDisable(getRowEntity(scope))
                         }, {
                           default: withCtx(() => [
                             createTextVNode(toDisplayString(unref(WebI18n).get().Disable), 1)

package/package.json

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