@aplus-frontend/ui 0.0.1-beta.36 → 0.0.1-beta.38

package/es/src/ap-form/interface.d.ts

@@ -40,6 +40,7 @@ export type ApFormSearchFormProps = ApFormProps & {
     resetText?: string;
     onSubmit?: (values: any) => void;
     onReset?: () => void;
+    customReset?: boolean;
     extraInAction?: boolean;
     forceExpand?: boolean;
     countPerRow?: number;

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -14,6 +14,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     forceExpand: boolean;
     countPerRow: number;
     collapse: undefined;
+    customReset: boolean;
 }>, {
     apForm: ComputedRef<ApFormExpose<any> | undefined>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -30,6 +31,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     forceExpand: boolean;
     countPerRow: number;
     collapse: undefined;
+    customReset: boolean;
 }>>> & {
     "onUpdate:collapse"?: ((...args: any[]) => any) | undefined;
 }, {
@@ -42,6 +44,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     validateOnRuleChange: boolean;
     countPerRow: number;
     defaultCollapse: boolean;
+    customReset: boolean;
     extraInAction: boolean;
     forceExpand: boolean;
 }, {}>, Readonly<{

package/es/src/ap-form/search-form/index.vue.mjs

@@ -13,12 +13,12 @@ import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs
 import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
 import V from "../ap-form-item.vue.mjs";
-import pe from "../ap-form.vue2.mjs";
-import ce from "../ap-form-item-group/index.vue.mjs";
-function ie(c) {
-  return typeof c == "function" || Object.prototype.toString.call(c) === "[object Object]" && !J(c);
+import ce from "../ap-form.vue2.mjs";
+import pe from "../ap-form-item-group/index.vue.mjs";
+function ie(p) {
+  return typeof p == "function" || Object.prototype.toString.call(p) === "[object Object]" && !J(p);
 }
-const p = 24, Pe = /* @__PURE__ */ K({
+const c = 24, Pe = /* @__PURE__ */ K({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -77,6 +77,10 @@ const p = 24, Pe = /* @__PURE__ */ K({
     searchText: {},
     resetText: {},
     onReset: {},
+    customReset: {
+      type: Boolean,
+      default: !1
+    },
     extraInAction: {
       type: Boolean,
       default: !1
@@ -90,12 +94,12 @@ const p = 24, Pe = /* @__PURE__ */ K({
     }
   },
   emits: ["update:collapse"],
-  setup(c, {
+  setup(p, {
     expose: I,
     emit: j
   }) {
     var S;
-    const l = Q(), t = c, M = j, {
+    const l = Q(), t = p, M = j, {
       value: d,
       updateValue: O
     } = ne(t, M, {
@@ -104,7 +108,7 @@ const p = 24, Pe = /* @__PURE__ */ K({
     }), {
       b: $
     } = re("ap-form-search-form"), {
-      t: F
+      t: R
     } = se(), f = X();
     function D() {
       O(!o(d));
@@ -115,11 +119,11 @@ const p = 24, Pe = /* @__PURE__ */ K({
     }
     function z() {
       var e, i, u;
-      (i = (e = f.value) == null ? void 0 : e.resetFields) == null || i.call(e), (u = t.onReset) == null || u.call(t);
+      t.customReset || (i = (e = f.value) == null ? void 0 : e.resetFields) == null || i.call(e), (u = t.onReset) == null || u.call(t);
     }
-    const g = v(T(l.default())), m = v((S = l.extra) == null ? void 0 : S.call(l)), R = C(() => Math.floor(p / t.countPerRow));
+    const F = v(T(l.default())), m = v((S = l.extra) == null ? void 0 : S.call(l)), g = C(() => Math.floor(c / t.countPerRow));
     P(() => l.default(), (e) => {
-      g.value = T(e);
+      F.value = T(e);
     }), P(() => {
       var e;
       return (e = l.extra) == null ? void 0 : e.call(l);
@@ -128,24 +132,24 @@ const p = 24, Pe = /* @__PURE__ */ K({
     });
     const U = C(() => {
       let e;
-      const i = [...o(g)], u = [], b = [], n = o(R);
+      const i = [...o(F)], u = [], b = [], n = o(g);
       let h = 0;
       i.forEach((r) => {
         const s = r.props;
         s != null && s.hidden ? u.push(r) : (h += s.span || n, b.push(r));
       });
-      const w = p - (h + n) % p, W = w < n ? p : w, x = p - n * (o(m) && !t.extraInAction ? 2 : 1), L = !t.forceExpand && h > x;
+      const B = c - (h + n) % c, W = B < n ? c : B, x = c - n * (o(m) && !t.extraInAction ? 2 : 1), L = !t.forceExpand && h > x;
       let _ = 0;
       const G = b.map((r, s) => {
-        const B = r.props;
-        return _ += B.span || n, Y(r, {
-          span: B.span || n,
+        const w = r.props;
+        return _ += w.span || n, Y(r, {
+          span: w.span || n,
           key: `ApFormSearchFormItem-${s}`,
           hidden: !t.forceExpand && o(d) && _ > x
         });
-      }), H = p - Math.min(x, _) - n;
+      }), H = c - Math.min(x, _) - n;
       return a(Z, null, [G, u, a(V, {
-        span: o(R)
+        span: o(g)
       }, {
         default: () => [a(N, {
           justify: "space-between"
@@ -155,11 +159,11 @@ const p = 24, Pe = /* @__PURE__ */ K({
               type: "primary",
               onClick: q
             }, {
-              default: () => [t.searchText || F("ap.apForm.search.search")]
+              default: () => [t.searchText || R("ap.apForm.search.search")]
             }), a(y, {
               onClick: z
             }, {
-              default: () => [t.resetText || F("ap.apForm.search.reset")]
+              default: () => [t.resetText || R("ap.apForm.search.reset")]
             }), L ? a(y, {
               onClick: D,
               icon: a(ae, {
@@ -181,12 +185,12 @@ const p = 24, Pe = /* @__PURE__ */ K({
     });
     return I({
       apForm: C(() => o(f))
-    }), (e, i) => (k(), A(pe, ee({
+    }), (e, i) => (k(), A(ce, ee({
       class: o($)(),
       ref_key: "apForm",
       ref: f
     }, o(le)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: E(() => [a(ce, {
+      default: E(() => [a(pe, {
         "count-per-row": t.countPerRow
       }, {
         default: E(() => [(k(), A(te(U.value)))]),

package/es/src/ap-table/hooks/use-table-paging.d.ts

@@ -1,7 +1,7 @@
-import { Ref } from 'vue';
+import { Ref, ComputedRef } from 'vue';
 import { RequestData } from '../interface';
-import { ApFormExpose } from '../../ap-form';
-import { TablePaginationConfig } from 'ant-design-vue';
+import { ApFormSearchFormExpose } from '../../ap-form';
+import { TablePaginationConfig, FilterValue, SorterResult, TableCurrentDataSource } from 'ant-design-vue/es/table/interface';
 
 export type UseTablePagingParams<DataType, ParamsType> = {
     request: (params: any) => Promise<RequestData<DataType>>;
@@ -39,9 +39,17 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * 重设表单需要忽略的字段
      */
     resetFieldsIgnores?: string[];
+    /**
+     * 需要后端筛选的字段列表
+     */
+    filterFields?: string[];
+    /**
+     * 需要后端筛选的排序字段列表
+     */
+    sortFields?: string[];
 };
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, formatParams, paramsValueTypeMap, resetFieldsIgnores }: UseTablePagingParams<DataType, ParamsType>) => {
-    formRef: Ref<ApFormExpose<any> | undefined>;
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields }: UseTablePagingParams<DataType, ParamsType>) => {
+    formRef: Ref<ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
     refresh: () => void;
@@ -53,5 +61,18 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     current: Ref<number>;
     pageSize: Ref<number>;
-    onChange: (p: TablePaginationConfig) => void;
+    handleTableChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+    tableProps: ComputedRef<{
+        loading: boolean;
+        pagination: {
+            current: number;
+            pageSize: number;
+            total: number;
+            showSizeChanger: boolean;
+            showQuickJumper: boolean;
+            showTotal: (total: number) => string;
+        };
+        onChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+        dataSource: DataType[];
+    }>;
 };

package/es/src/ap-table/interface.d.ts

@@ -1,5 +1,5 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
-import { CompareFn, SortOrder } from 'ant-design-vue/es/table/interface';
+import { CompareFn } from 'ant-design-vue/es/table/interface';
 import { ApFormSearchFormProps } from '../ap-form';
 import { ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextProps } from 'src/ap-form/items/interface';
 import { CSSProperties } from 'vue';
@@ -80,7 +80,7 @@ export type ApColumnType<ValueType extends keyof ApTableFormFields = 'text'> = E
 };
 export type RequestData<T> = {
     data: T[] | undefined;
-    total?: number;
+    total: number;
 } & Record<string, any>;
 export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends keyof ApTableFormFields = 'text'> = Omit<TableProps<RecordType>, 'columns' | 'pagination'> & {
     /**
@@ -105,14 +105,12 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     /**
      * 请求获取dataSource
      * @param params
-     * @param sort
-     * @param filter
      * @returns
      */
     request?: (params: ParamsType & {
         pageSize?: number;
         current?: number;
-    }, sort: Record<string, SortOrder>, filter: Record<string, (string | number)[] | null>) => Promise<Partial<RequestData<RecordType>>>;
+    }) => Promise<Partial<RequestData<RecordType>>>;
     /**
      * 数据加载完成后触发
      * @param data

package/es/src/ap-table/style/ap-table.css

@@ -8,7 +8,13 @@
   background-color: #fff;
   margin-bottom: 16px;
 }
-.aplus-ap-table__form-wrapper {
+.aplus-ap-table__table-wrapper {
   padding: 16px;
   background-color: #fff;
 }
+.aplus-ap-table-table .ant-pagination {
+  margin-bottom: 0 !important;
+}
+.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+  flex: 1;
+}

package/es/src/ap-table/utils.d.ts

@@ -6,3 +6,9 @@ export declare const formatParamsValueType: (type: FieldValueType | Record<strin
  * @param value 值
  */
 export declare const parseFieldValue: (t: FieldValueType, value: any) => any;
+/**
+ * 对表格的dataIndex进行拼接处理
+ * @param dataIndex
+ * @returns
+ */
+export declare function dataIndexToStr(dataIndex: string | number | (string | number)[]): string | number;

package/es/src/theme/antd-global-overwrite/admin/index.css

@@ -301,7 +301,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -312,14 +312,14 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next {
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .ant-pagination-disabled {
@@ -507,8 +507,9 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
 .ant-table-wrapper .ant-table-footer td {
   padding: 12px 8px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-form-container'] {

package/es/src/theme/antd-global-overwrite/admin/pagination.css

@@ -17,7 +17,7 @@
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -28,14 +28,14 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next {
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .ant-pagination-disabled {

package/es/src/theme/antd-global-overwrite/admin/table.css

@@ -52,8 +52,9 @@
 .ant-table-wrapper .ant-table-footer td {
   padding: 12px 8px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-form-container'] {

package/es/src/theme/antd-global-overwrite/aplus/index.css

@@ -320,7 +320,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -331,7 +331,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-prev .anticon.anticon-left {
@@ -351,7 +351,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .anticon.anticon-right {
@@ -555,8 +555,9 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   padding: 10.5px 16px;
   line-height: 18px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-row__striped'] td {

package/es/src/theme/antd-global-overwrite/aplus/pagination.css

@@ -17,7 +17,7 @@
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -28,7 +28,7 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-prev .anticon.anticon-left {
@@ -48,7 +48,7 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .anticon.anticon-right {

package/es/src/theme/antd-global-overwrite/aplus/table.css

@@ -68,8 +68,9 @@
   padding: 10.5px 16px;
   line-height: 18px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-row__striped'] td {

package/es/src/theme/ap-table/ap-table.css

@@ -8,7 +8,13 @@
   background-color: #fff;
   margin-bottom: 16px;
 }
-.aplus-ap-table__form-wrapper {
+.aplus-ap-table__table-wrapper {
   padding: 16px;
   background-color: #fff;
 }
+.aplus-ap-table-table .ant-pagination {
+  margin-bottom: 0 !important;
+}
+.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+  flex: 1;
+}

package/es/src/work-order-modal/help-message.vue2.mjs

@@ -21,7 +21,7 @@ const c = /* @__PURE__ */ e("div", { class: "title" }, [
         r(t(s), { style: {
           color: "#1890FF",
           fontSize: "16px",
-          transform: "translateX(6px)"
+          transform: "translateX(-6px)"
         } })
       ]),
       _: 1

package/lib/src/ap-form/interface.d.ts

@@ -40,6 +40,7 @@ export type ApFormSearchFormProps = ApFormProps & {
     resetText?: string;
     onSubmit?: (values: any) => void;
     onReset?: () => void;
+    customReset?: boolean;
     extraInAction?: boolean;
     forceExpand?: boolean;
     countPerRow?: number;

package/lib/src/ap-form/search-form/index.vue.d.ts

@@ -14,6 +14,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     forceExpand: boolean;
     countPerRow: number;
     collapse: undefined;
+    customReset: boolean;
 }>, {
     apForm: ComputedRef<ApFormExpose<any> | undefined>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -30,6 +31,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     forceExpand: boolean;
     countPerRow: number;
     collapse: undefined;
+    customReset: boolean;
 }>>> & {
     "onUpdate:collapse"?: ((...args: any[]) => any) | undefined;
 }, {
@@ -42,6 +44,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     validateOnRuleChange: boolean;
     countPerRow: number;
     defaultCollapse: boolean;
+    customReset: boolean;
     extraInAction: boolean;
     forceExpand: boolean;
 }, {}>, Readonly<{

package/lib/src/ap-form/search-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("ant-design-vue");require("../ap-form.vue.js");require("../ap-form-item-group/index.vue2.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const q=require("../ap-form-item-group/helper.js"),D=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const U=require("lodash-unified"),z=require("../../hooks/useControllableValue.js"),L=require("../../config-provider/hooks/use-namespace.js"),W=require("../../config-provider/hooks/use-locale.js"),R=require("../ap-form-item.vue.js"),$=require("../ap-form.vue2.js"),G=require("../ap-form-item-group/index.vue.js");function H(c){return typeof c=="function"||Object.prototype.toString.call(c)==="[object Object]"&&!e.isVNode(c)}const s=24,J=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{initialValues:{},layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4}},emits:["update:collapse"],setup(c,{expose:S,emit:b}){var v;const o=e.useSlots(),a=c,B=b,{value:d,updateValue:w}=z.useControllableValue(a,B,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:P}=L.useNamespace("ap-form-search-form"),{t:C}=W.useLocale(),f=e.ref();function k(){w(!e.unref(d))}function T(){var t;(t=f.value)==null||t.validateFields().then(a.onSubmit)}function A(){var t,i,p;(i=(t=f.value)==null?void 0:t.resetFields)==null||i.call(t),(p=a.onReset)==null||p.call(a)}const g=e.shallowRef(q.genRealChildren(o.default())),h=e.shallowRef((v=o.extra)==null?void 0:v.call(o)),y=e.computed(()=>Math.floor(s/a.countPerRow));e.watch(()=>o.default(),t=>{g.value=q.genRealChildren(t)}),e.watch(()=>{var t;return(t=o.extra)==null?void 0:t.call(o)},t=>{h.value=t});const E=e.computed(()=>{let t;const i=[...e.unref(g)],p=[],F=[],n=e.unref(y);let m=0;i.forEach(l=>{const r=l.props;r!=null&&r.hidden?p.push(l):(m+=r.span||n,F.push(l))});const V=s-(m+n)%s,I=V<n?s:V,_=s-n*(e.unref(h)&&!a.extraInAction?2:1),M=!a.forceExpand&&m>_;let x=0;const j=F.map((l,r)=>{const N=l.props;return x+=N.span||n,e.cloneVNode(l,{span:N.span||n,key:`ApFormSearchFormItem-${r}`,hidden:!a.forceExpand&&e.unref(d)&&x>_})}),O=s-Math.min(_,x)-n;return e.createVNode(e.Fragment,null,[j,p,e.createVNode(R.default,{span:e.unref(y)},{default:()=>[e.createVNode(u.Flex,{justify:"space-between"},{default:()=>[e.createVNode(u.Space,null,{default:()=>[e.createVNode(u.Button,{type:"primary",onClick:T},{default:()=>[a.searchText||C("ap.apForm.search.search")]}),e.createVNode(u.Button,{onClick:A},{default:()=>[a.resetText||C("ap.apForm.search.reset")]}),M?e.createVNode(u.Button,{onClick:k,icon:e.createVNode(D.DoubleRightOutlined,{style:"color:#B8C3D1",rotate:e.unref(d)?90:-90},null)},null):null]}),a.extraInAction?e.unref(h):null]})]}),a.extraInAction?null:e.createVNode(R.default,{span:e.unref(d)?O:I},{default:()=>[e.createVNode(u.Flex,{justify:"end"},H(t=e.unref(h))?t:{default:()=>[t]})]})])});return S({apForm:e.computed(()=>e.unref(f))}),(t,i)=>(e.openBlock(),e.createBlock($.default,e.mergeProps({class:e.unref(P)(),ref_key:"apForm",ref:f},e.unref(U.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[e.createVNode(G.default,{"count-per-row":a.countPerRow},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(E.value)))]),_:1},8,["count-per-row"])]),_:1},16,["class"]))}});exports.default=J;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("ant-design-vue");require("../ap-form.vue.js");require("../ap-form-item-group/index.vue2.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const N=require("../ap-form-item-group/helper.js"),D=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const U=require("lodash-unified"),z=require("../../hooks/useControllableValue.js"),L=require("../../config-provider/hooks/use-namespace.js"),W=require("../../config-provider/hooks/use-locale.js"),q=require("../ap-form-item.vue.js"),$=require("../ap-form.vue2.js"),G=require("../ap-form-item-group/index.vue.js");function H(c){return typeof c=="function"||Object.prototype.toString.call(c)==="[object Object]"&&!e.isVNode(c)}const s=24,J=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{initialValues:{},layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4}},emits:["update:collapse"],setup(c,{expose:S,emit:B}){var v;const o=e.useSlots(),a=c,b=B,{value:d,updateValue:w}=z.useControllableValue(a,b,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:P}=L.useNamespace("ap-form-search-form"),{t:C}=W.useLocale(),f=e.ref();function k(){w(!e.unref(d))}function T(){var t;(t=f.value)==null||t.validateFields().then(a.onSubmit)}function A(){var t,i,p;a.customReset||(i=(t=f.value)==null?void 0:t.resetFields)==null||i.call(t),(p=a.onReset)==null||p.call(a)}const y=e.shallowRef(N.genRealChildren(o.default())),h=e.shallowRef((v=o.extra)==null?void 0:v.call(o)),g=e.computed(()=>Math.floor(s/a.countPerRow));e.watch(()=>o.default(),t=>{y.value=N.genRealChildren(t)}),e.watch(()=>{var t;return(t=o.extra)==null?void 0:t.call(o)},t=>{h.value=t});const E=e.computed(()=>{let t;const i=[...e.unref(y)],p=[],F=[],n=e.unref(g);let m=0;i.forEach(l=>{const r=l.props;r!=null&&r.hidden?p.push(l):(m+=r.span||n,F.push(l))});const R=s-(m+n)%s,I=R<n?s:R,_=s-n*(e.unref(h)&&!a.extraInAction?2:1),M=!a.forceExpand&&m>_;let x=0;const j=F.map((l,r)=>{const V=l.props;return x+=V.span||n,e.cloneVNode(l,{span:V.span||n,key:`ApFormSearchFormItem-${r}`,hidden:!a.forceExpand&&e.unref(d)&&x>_})}),O=s-Math.min(_,x)-n;return e.createVNode(e.Fragment,null,[j,p,e.createVNode(q.default,{span:e.unref(g)},{default:()=>[e.createVNode(u.Flex,{justify:"space-between"},{default:()=>[e.createVNode(u.Space,null,{default:()=>[e.createVNode(u.Button,{type:"primary",onClick:T},{default:()=>[a.searchText||C("ap.apForm.search.search")]}),e.createVNode(u.Button,{onClick:A},{default:()=>[a.resetText||C("ap.apForm.search.reset")]}),M?e.createVNode(u.Button,{onClick:k,icon:e.createVNode(D.DoubleRightOutlined,{style:"color:#B8C3D1",rotate:e.unref(d)?90:-90},null)},null):null]}),a.extraInAction?e.unref(h):null]})]}),a.extraInAction?null:e.createVNode(q.default,{span:e.unref(d)?O:I},{default:()=>[e.createVNode(u.Flex,{justify:"end"},H(t=e.unref(h))?t:{default:()=>[t]})]})])});return S({apForm:e.computed(()=>e.unref(f))}),(t,i)=>(e.openBlock(),e.createBlock($.default,e.mergeProps({class:e.unref(P)(),ref_key:"apForm",ref:f},e.unref(U.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[e.createVNode(G.default,{"count-per-row":a.countPerRow},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(E.value)))]),_:1},8,["count-per-row"])]),_:1},16,["class"]))}});exports.default=J;

package/lib/src/ap-table/hooks/use-table-paging.d.ts

@@ -1,7 +1,7 @@
-import { Ref } from 'vue';
+import { Ref, ComputedRef } from 'vue';
 import { RequestData } from '../interface';
-import { ApFormExpose } from '../../ap-form';
-import { TablePaginationConfig } from 'ant-design-vue';
+import { ApFormSearchFormExpose } from '../../ap-form';
+import { TablePaginationConfig, FilterValue, SorterResult, TableCurrentDataSource } from 'ant-design-vue/es/table/interface';
 
 export type UseTablePagingParams<DataType, ParamsType> = {
     request: (params: any) => Promise<RequestData<DataType>>;
@@ -39,9 +39,17 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * 重设表单需要忽略的字段
      */
     resetFieldsIgnores?: string[];
+    /**
+     * 需要后端筛选的字段列表
+     */
+    filterFields?: string[];
+    /**
+     * 需要后端筛选的排序字段列表
+     */
+    sortFields?: string[];
 };
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, formatParams, paramsValueTypeMap, resetFieldsIgnores }: UseTablePagingParams<DataType, ParamsType>) => {
-    formRef: Ref<ApFormExpose<any> | undefined>;
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields }: UseTablePagingParams<DataType, ParamsType>) => {
+    formRef: Ref<ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
     refresh: () => void;
@@ -53,5 +61,18 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     current: Ref<number>;
     pageSize: Ref<number>;
-    onChange: (p: TablePaginationConfig) => void;
+    handleTableChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+    tableProps: ComputedRef<{
+        loading: boolean;
+        pagination: {
+            current: number;
+            pageSize: number;
+            total: number;
+            showSizeChanger: boolean;
+            showQuickJumper: boolean;
+            showTotal: (total: number) => string;
+        };
+        onChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+        dataSource: DataType[];
+    }>;
 };

package/lib/src/ap-table/interface.d.ts

@@ -1,5 +1,5 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
-import { CompareFn, SortOrder } from 'ant-design-vue/es/table/interface';
+import { CompareFn } from 'ant-design-vue/es/table/interface';
 import { ApFormSearchFormProps } from '../ap-form';
 import { ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextProps } from 'src/ap-form/items/interface';
 import { CSSProperties } from 'vue';
@@ -80,7 +80,7 @@ export type ApColumnType<ValueType extends keyof ApTableFormFields = 'text'> = E
 };
 export type RequestData<T> = {
     data: T[] | undefined;
-    total?: number;
+    total: number;
 } & Record<string, any>;
 export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends keyof ApTableFormFields = 'text'> = Omit<TableProps<RecordType>, 'columns' | 'pagination'> & {
     /**
@@ -105,14 +105,12 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     /**
      * 请求获取dataSource
      * @param params
-     * @param sort
-     * @param filter
      * @returns
      */
     request?: (params: ParamsType & {
         pageSize?: number;
         current?: number;
-    }, sort: Record<string, SortOrder>, filter: Record<string, (string | number)[] | null>) => Promise<Partial<RequestData<RecordType>>>;
+    }) => Promise<Partial<RequestData<RecordType>>>;
     /**
      * 数据加载完成后触发
      * @param data

package/lib/src/ap-table/style/ap-table.css

@@ -8,7 +8,13 @@
   background-color: #fff;
   margin-bottom: 16px;
 }
-.aplus-ap-table__form-wrapper {
+.aplus-ap-table__table-wrapper {
   padding: 16px;
   background-color: #fff;
 }
+.aplus-ap-table-table .ant-pagination {
+  margin-bottom: 0 !important;
+}
+.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+  flex: 1;
+}

package/lib/src/ap-table/utils.d.ts

@@ -6,3 +6,9 @@ export declare const formatParamsValueType: (type: FieldValueType | Record<strin
  * @param value 值
  */
 export declare const parseFieldValue: (t: FieldValueType, value: any) => any;
+/**
+ * 对表格的dataIndex进行拼接处理
+ * @param dataIndex
+ * @returns
+ */
+export declare function dataIndexToStr(dataIndex: string | number | (string | number)[]): string | number;

package/lib/src/theme/antd-global-overwrite/admin/index.css

@@ -301,7 +301,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -312,14 +312,14 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next {
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .ant-pagination-disabled {
@@ -507,8 +507,9 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
 .ant-table-wrapper .ant-table-footer td {
   padding: 12px 8px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-form-container'] {

package/lib/src/theme/antd-global-overwrite/admin/pagination.css

@@ -17,7 +17,7 @@
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -28,14 +28,14 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next {
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .ant-pagination-disabled {

package/lib/src/theme/antd-global-overwrite/admin/table.css

@@ -52,8 +52,9 @@
 .ant-table-wrapper .ant-table-footer td {
   padding: 12px 8px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-form-container'] {

package/lib/src/theme/antd-global-overwrite/aplus/index.css

@@ -320,7 +320,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -331,7 +331,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-prev .anticon.anticon-left {
@@ -351,7 +351,7 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .anticon.anticon-right {
@@ -555,8 +555,9 @@ div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] di
   padding: 10.5px 16px;
   line-height: 18px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-row__striped'] td {

package/lib/src/theme/antd-global-overwrite/aplus/pagination.css

@@ -17,7 +17,7 @@
   margin: 0 4px;
   font-weight: 400;
   font-size: 14px;
-  line-height: 29px;
+  line-height: 28px;
   text-align: center;
   border-radius: 4px;
 }
@@ -28,7 +28,7 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-prev .anticon.anticon-left {
@@ -48,7 +48,7 @@
   width: 30px;
   height: 30px;
   margin: 0 4px;
-  line-height: 30px;
+  line-height: 28px;
   border: 1px solid #d9d9d9;
 }
 .ant-table-wrapper .ant-pagination .ant-pagination-next .anticon.anticon-right {

package/lib/src/theme/antd-global-overwrite/aplus/table.css

@@ -68,8 +68,9 @@
   padding: 10.5px 16px;
   line-height: 18px;
 }
-[class$='-basic-table'] {
-  max-width: 100%;
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
   height: 100%;
 }
 [class$='-basic-table-row__striped'] td {

package/lib/src/theme/ap-table/ap-table.css

@@ -8,7 +8,13 @@
   background-color: #fff;
   margin-bottom: 16px;
 }
-.aplus-ap-table__form-wrapper {
+.aplus-ap-table__table-wrapper {
   padding: 16px;
   background-color: #fff;
 }
+.aplus-ap-table-table .ant-pagination {
+  margin-bottom: 0 !important;
+}
+.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+  flex: 1;
+}

package/lib/src/work-order-modal/help-message.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@ant-design/icons-vue"),l=require("ant-design-vue"),n=e.createElementVNode("div",{class:"title"},[e.createElementVNode("div",{class:"flex"},[e.createElementVNode("div",null,"1."),e.createElementVNode("div",null,"单个文件大小限制：50MB")]),e.createElementVNode("div",{class:"flex"},[e.createElementVNode("div",null,"2."),e.createElementVNode("div",null,"单次数量限制：10个")])],-1),o=e.defineComponent({__name:"help-message",setup(r){return(c,i)=>(e.openBlock(),e.createBlock(e.unref(l.Tooltip),{placement:"right"},{title:e.withCtx(()=>[n]),default:e.withCtx(()=>[e.createVNode(e.unref(t.QuestionCircleOutlined),{style:{color:"#1890FF",fontSize:"16px",transform:"translateX(6px)"}})]),_:1}))}});exports.default=o;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@ant-design/icons-vue"),l=require("ant-design-vue"),n=e.createElementVNode("div",{class:"title"},[e.createElementVNode("div",{class:"flex"},[e.createElementVNode("div",null,"1."),e.createElementVNode("div",null,"单个文件大小限制：50MB")]),e.createElementVNode("div",{class:"flex"},[e.createElementVNode("div",null,"2."),e.createElementVNode("div",null,"单次数量限制：10个")])],-1),o=e.defineComponent({__name:"help-message",setup(r){return(c,i)=>(e.openBlock(),e.createBlock(e.unref(l.Tooltip),{placement:"right"},{title:e.withCtx(()=>[n]),default:e.withCtx(()=>[e.createVNode(e.unref(t.QuestionCircleOutlined),{style:{color:"#1890FF",fontSize:"16px",transform:"translateX(-6px)"}})]),_:1}))}});exports.default=o;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.0.1-beta.36",
+  "version": "0.0.1-beta.38",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [