@airpower/web 1.3.6 → 1.4.0

package/dist/components/datetime/DateTime.vue.d.ts

@@ -58,9 +58,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: boolean;
     };
 }>> & Readonly<{}>, {
+    formatter: DateTimeFormatter;
     milliSecond: number;
     date: Date;
-    formatter: DateTimeFormatter;
     isFriendly: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/components/select/Selector.vue.d.ts

@@ -24,7 +24,7 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         /**
          * ### 选择器使用的字段列表
          */
-        columnList?: Array<ITableColumn>;
+        columnList?: Array<ITableColumn<E>>;
         /**
          * ### `Editor`
          * 传入后方可开启选择器快捷添加功能

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

@@ -8,6 +8,7 @@ import { QueryRequest } from '../../model/query/QueryRequest';
 import { RootEntity } from '../../model/RootEntity';
 import { AbstractCurdService } from '../../service/AbstractCurdService';
 import { CurdServiceConstructor } from '../../service/type';
+import { ITableButton } from './TableButton';
 import { QueryRequestPage } from '../../model/query/QueryRequestPage';
 import { QuerySort } from '../../model/query/QuerySort';
 declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>(__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<{
@@ -19,9 +20,10 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         selectList: E[];
         emptyText: string;
         addPermission: string;
-        columnList: ITableColumn[];
+        columnList: ITableColumn<E>[];
         searchParams: ISearchField[];
         hideAdd: boolean;
+        buttons: ITableButton<E>[];
         useHook: ITableResult<E, S>;
         disablePage: boolean;
         editPermission: string;
@@ -81,8 +83,9 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         readonly loading: boolean;
         readonly autoHeight: boolean;
         readonly selectList: E[];
-        readonly columnList: ITableColumn[];
+        readonly columnList: ITableColumn<E>[];
         readonly hideAdd: boolean;
+        readonly buttons: ITableButton<E>[];
         readonly disablePage: boolean;
         readonly dataList: E[];
         readonly hideEdit: boolean;
@@ -144,7 +147,7 @@ declare const _default: <E extends RootEntity, S extends AbstractCurdService<E>>
         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" | "columnList" | "searchParams" | "hideAdd" | "useHook" | "disablePage" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "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" | "columnList" | "searchParams" | "hideAdd" | "useHook" | "disablePage" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "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;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "loading" | "entity" | "onSearch" | "autoHeight" | "selectList" | "emptyText" | "addPermission" | "columnList" | "searchParams" | "hideAdd" | "buttons" | "useHook" | "disablePage" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "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" | "columnList" | "searchParams" | "hideAdd" | "buttons" | "useHook" | "disablePage" | "editPermission" | "disablePermission" | "enablePermission" | "detailPermission" | "deletePermission" | "addRowPermission" | "exportPermission" | "importPermission" | "dataList" | "hideEdit" | "disableEdit" | "disableAddRow" | "disableChangeStatus" | "disableDetail" | "disableDelete" | "disableRow" | "hideDelete" | "selectable" | "showSelect" | "showEnableAndDisable" | "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;

package/dist/components/table/TableButton.d.ts

@@ -0,0 +1,29 @@
+import { RootEntity } from '../../model/RootEntity';
+/**
+ * # 表格按钮
+ * @author Hamm.cn
+ */
+export interface ITableButton<E extends RootEntity> {
+    /**
+     * ### 按钮标题
+     */
+    label: string;
+    /**
+     * ### 按钮点击回调
+     * @param row 行数据
+     */
+    click: (row: E) => void;
+    /**
+     * ### 按钮是否禁用
+     * @param row 行数据
+     */
+    disabled?: (row: E) => boolean;
+    /**
+     * ### 是否是危险按钮
+     */
+    dangerButton?: boolean;
+    /**
+     * ### 是否是警告按钮
+     */
+    warningButton?: boolean;
+}

package/dist/components/table/component/ColumnSelector.vue.d.ts

@@ -5,7 +5,7 @@ declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly onChanged?: ((args_0: string[]) => any) | undefined;
     } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onChanged"> & {
-        columnList: Array<ITableColumn>;
+        columnList: Array<ITableColumn<E>>;
         entityClass: ITransformerConstructor<E>;
     } & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;

package/dist/components/table/component/CopyColumn.vue.d.ts

@@ -2,7 +2,7 @@ import { ITableColumn } from '../../../decorator/@Table/ITableColumn';
 import { RootEntity } from '../../../model/RootEntity';
 declare const _default: <E extends RootEntity>(__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<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & {
-        column: ITableColumn;
+        column: ITableColumn<E>;
         data: E;
     } & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;

package/dist/components/table/component/EnumColumn.vue.d.ts

@@ -3,7 +3,7 @@ import { WebEnumConstructor } from '../../../enum/type';
 import { RootEntity } from '../../../model/RootEntity';
 declare const _default: <E extends RootEntity>(__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<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & {
-        column: ITableColumn;
+        column: ITableColumn<E>;
         data: E;
         dictionary: WebEnumConstructor;
     } & Partial<{}>> & import('vue').PublicProps;

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

@@ -1,2 +1,3 @@
+import { ITableButton } from './TableButton';
 import { default as ATable } from './Table.vue';
-export { ATable, };
+export { ATable, ITableButton, };

package/dist/components/table/useTableColumn.d.ts

@@ -16,7 +16,7 @@ export declare function useTableColumn<E extends RootEntity>(params: {
     /**
      * ### 自定义字段
      */
-    customColumns: Array<ITableColumn>;
+    customColumns: Array<ITableColumn<E>>;
     /**
      * ### 字段缓存key
      */
@@ -31,8 +31,8 @@ export declare function useTableColumn<E extends RootEntity>(params: {
     modelConfig: IModelConfig;
 }): {
     updateSelectKeys: (list?: string[]) => void;
-    allColumnList: Ref<ITableColumn[], ITableColumn[]>;
+    allColumnList: Ref<ITableColumn<E>[], ITableColumn<E>[]>;
     selectKeys: Ref<string[], string[]>;
-    showColumnList: Ref<ITableColumn[], ITableColumn[]>;
+    showColumnList: Ref<ITableColumn<E>[], ITableColumn<E>[]>;
     isColumnSelectorEnabled: Ref<boolean, boolean>;
 };

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

@@ -1,4 +1,5 @@
 import { DateTimeFormatter, DesensitizeType } from '@airpower/util';
+import { RootEntity } from '../../model/RootEntity';
 import { IBaseField } from '../common/IBaseField';
 import { IElementTableColumn } from './IElementTableColumn';
 /**
@@ -6,7 +7,7 @@ import { IElementTableColumn } from './IElementTableColumn';
  *
  * @author Hamm.cn
  */
-export interface ITableColumn extends IBaseField, IElementTableColumn {
+export interface ITableColumn<E extends RootEntity> extends IBaseField, IElementTableColumn {
     /**
      * ### 是否是金额
      */
@@ -85,4 +86,9 @@ export interface ITableColumn extends IBaseField, IElementTableColumn {
      * ### 是否是日期时间
      */
     datetime?: boolean | DateTimeFormatter;
+    /**
+     * ### 格式化
+     * @param row 行数据
+     */
+    formatter?: (row: E) => string;
 }

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

@@ -1,20 +1,20 @@
 import { ITransformerConstructor, TransformerField } from '@airpower/transformer';
-import { RootModel } from '../../model/RootModel';
+import { RootEntity } from '../../model/RootEntity';
 import { FieldConfigOptionalKey } from '../@Field/type';
 import { ITableColumn } from './ITableColumn';
 /**
  * ### 为属性标记是表格字段
  * @param config 表格列的配置
  */
-export declare function Table<M extends RootModel>(config?: FieldConfigOptionalKey<ITableColumn>): (instance: M, field: keyof M) => void;
+export declare function Table<E extends RootEntity>(config?: FieldConfigOptionalKey<ITableColumn<E>>): (instance: E, field: keyof E) => void;
 /**
  * ### 获取对象的属性表格的配置
  * @param Class 目标类
  * @param field 属性名
  */
-export declare function getTableConfig<M extends RootModel>(Class: ITransformerConstructor<M>, field: TransformerField<M>): ITableColumn;
+export declare function getTableConfig<E extends RootEntity>(Class: ITransformerConstructor<E>, field: TransformerField<E>): ITableColumn<E>;
 /**
  * ### 获取字段标记的表格字段配置列表
  * @param Class 目标类
  */
-export declare function getTableConfigList<M extends RootModel>(Class: ITransformerConstructor<M>): Array<ITableColumn>;
+export declare function getTableConfigList<E extends RootEntity>(Class: ITransformerConstructor<E>): Array<ITableColumn<E>>;

package/dist/main.js

@@ -17394,7 +17394,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnSelector = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-520a2ab9"]]);
+const ColumnSelector = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-ed37e00b"]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "CopyColumn",
   props: {
@@ -17441,7 +17441,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EnumColumn = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-c27bd252"]]);
+const EnumColumn = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-49ebb298"]]);
 function useTableButton(params) {
   const {
     entityClass,
@@ -17569,7 +17569,7 @@ const _hoisted_5$1 = {
   style: { "color": "#aaa", "margin-right": "3px" }
 };
 const _hoisted_6 = {
-  key: 10,
+  key: 11,
   style: { "color": "#aaa" }
 };
 const _hoisted_7 = { class: "ctrlRow" };
@@ -17579,6 +17579,13 @@ const _hoisted_10 = { class: "right" };
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "Table",
   props: {
+    /**
+     * ### 按钮
+     */
+    buttons: {
+      type: Array,
+      default: () => []
+    },
     /**
      * ### 直接使用表格Hook
      * 请注意，将不会再触发一些事件，请使用 Hook 的前后置等拦截方法处理
@@ -18529,28 +18536,30 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     index: scope.$index
                   }, () => [
                     item.prefixText ? (openBlock(), createElementBlock("span", _hoisted_5$1, toDisplayString(item.prefixText), 1)) : createCommentVNode("", true),
-                    unref(getDictionary)(unref(EntityClass), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
-                      key: 1,
+                    item.formatter ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                      createTextVNode(toDisplayString(item.formatter(getValue(scope, item.key))), 1)
+                    ], 64)) : unref(getDictionary)(unref(EntityClass), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
+                      key: 2,
                       column: item,
                       data: scope.row,
                       dictionary: unref(getDictionary)(unref(EntityClass), item.key)
                     }, null, 8, ["column", "data", "dictionary"])) : item.image ? (openBlock(), createBlock(unref(_sfc_main$k), {
-                      key: 2,
-                      src: getValue(scope, item.key),
-                      width: item.imageWidth || 40,
-                      height: item.imageHeight || 40
-                    }, null, 8, ["src", "width", "height"])) : item.phone ? (openBlock(), createBlock(unref(APhone), {
                       key: 3,
+                      height: item.imageHeight || 40,
+                      src: getValue(scope, item.key),
+                      width: item.imageWidth || 40
+                    }, null, 8, ["height", "src", "width"])) : item.phone ? (openBlock(), createBlock(unref(APhone), {
+                      key: 4,
                       desensitize: item.desensitize,
                       phone: getValue(scope, item.key)
                     }, null, 8, ["desensitize", "phone"])) : item.datetime ? (openBlock(), createBlock(unref(ADateTime), {
-                      key: 4,
+                      key: 5,
                       formatter: item.datetime === true ? unref(DateTimeFormatter).FULL_DATE_TIME : item.datetime,
                       "milli-second": getValue(scope, item.key)
                     }, null, 8, ["formatter", "milli-second"])) : item.money ? (openBlock(), createBlock(unref(AMoney), {
-                      key: 5,
+                      key: 6,
                       money: getValue(scope, item.key)
-                    }, null, 8, ["money"])) : item.payload ? (openBlock(), createElementBlock(Fragment, { key: 6 }, [
+                    }, null, 8, ["money"])) : item.payload ? (openBlock(), createElementBlock(Fragment, { key: 7 }, [
                       item.array ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                         createTextVNode(toDisplayString(getPayloadArray(scope, item.key).map((payload) => payload.getPayloadLabel()).join(",")), 1)
                       ], 64)) : (openBlock(), createBlock(unref(APayload), {
@@ -18558,15 +18567,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         payload: getValue(scope, item.key)
                       }, null, 8, ["payload"]))
                     ], 64)) : item.desensitize ? (openBlock(), createBlock(unref(ADesensitize), {
-                      key: 7,
+                      key: 8,
                       content: getValue(scope, item.key),
                       type: item.desensitize
                     }, null, 8, ["content", "type"])) : item.copy ? (openBlock(), createBlock(unref(_sfc_main$4), {
-                      key: 8,
+                      key: 9,
                       column: item,
                       data: scope.row
                     }, null, 8, ["column", "data"])) : (openBlock(), createElementBlock("div", {
-                      key: 9,
+                      key: 10,
                       class: normalizeClass([item.wrap ? "" : "nowrap", "a-table-column"])
                     }, toDisplayString(getStringValue(getValue(scope, item.key)) ?? item.emptyValue), 3)),
                     item.suffixText ? (openBlock(), createElementBlock("span", _hoisted_6, toDisplayString(item.suffixText), 1)) : createCommentVNode("", true)
@@ -18591,6 +18600,20 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     data: getRowEntity(scope),
                     index: scope.$index
                   }) : createCommentVNode("", true),
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(__props.buttons, (button, index) => {
+                    return openBlock(), createBlock(unref(ElLink), {
+                      key: index,
+                      disabled: button.disabled ? button.disabled(getRowEntity(scope)) : false,
+                      type: button.dangerButton ? "danger" : button.warningButton ? "warning" : "default",
+                      underline: "never",
+                      onClick: ($event) => handleDelete(getRowEntity(scope))
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(button.label), 1)
+                      ]),
+                      _: 2
+                    }, 1032, ["disabled", "type", "onClick"]);
+                  }), 128)),
                   __props.showAddRow ? (openBlock(), createBlock(unref(ElLink), {
                     key: 1,
                     disabled: unref(isAddRowDisabled)(getRowEntity(scope)),

package/dist/web.css

@@ -1216,7 +1216,7 @@ textarea {
   height: 0;
   overflow: hidden;
   overflow-y: auto;
-}.el-check-tag[data-v-520a2ab9] {
+}.el-check-tag[data-v-ed37e00b] {
   font-weight: normal !important;
   user-select: none;
   font-size: 13px;
@@ -1224,7 +1224,7 @@ textarea {
   margin-bottom: 5px;
   padding: 4px 10px;
 }
-.a-field-selector-bg[data-v-520a2ab9] {
+.a-field-selector-bg[data-v-ed37e00b] {
   position: fixed;
   left: 0;
   right: 0;
@@ -1233,7 +1233,7 @@ textarea {
   background-color: rgba(0, 0, 0, 0.1);
   z-index: 9999999;
 }
-.a-field-selector-dialog[data-v-520a2ab9] {
+.a-field-selector-dialog[data-v-ed37e00b] {
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
   position: absolute;
   right: 0;
@@ -1246,13 +1246,13 @@ textarea {
   overflow: hidden;
   z-index: 99999991;
 }
-.a-field-selector-dialog .a-field-selector-title[data-v-520a2ab9] {
+.a-field-selector-dialog .a-field-selector-title[data-v-ed37e00b] {
   margin-bottom: 10px;
   border-bottom: 1px solid var(--el-color-primary-light-9);
   padding: 8px 16px;
   font-size: 15px;
 }
-.a-field-selector-dialog .a-field-selector-list[data-v-520a2ab9] {
+.a-field-selector-dialog .a-field-selector-list[data-v-ed37e00b] {
   padding: 5px 15px 10px 15px;
   display: flex;
   flex-wrap: wrap;
@@ -1261,13 +1261,13 @@ textarea {
   flex: 1;
   height: 0;
   align-content: flex-start;
-}.a-enum-column[data-v-c27bd252] {
+}.a-enum-column[data-v-49ebb298] {
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
   align-items: center;
 }
-.a-enum-column .light[data-v-c27bd252] {
+.a-enum-column .light[data-v-49ebb298] {
   width: 8px;
   height: 8px;
   border-radius: 100%;

package/package.json

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