@aplus-frontend/ui 0.6.0-beta.8 → 0.6.0-beta.9

package/es/src/business/ap-export-group/ApExportGroup.vue2.mjs

@@ -2,7 +2,7 @@ import { defineComponent as O, ref as A, computed as s, watch as V, createElemen
 import { DownOutlined as U } from "@ant-design/icons-vue";
 import { message as H, Dropdown as J, Menu as Q, MenuItem as G } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
-import { ApExportGroupActionType as r } from "./interface.mjs";
+import { ApExportGroupActionType as i } from "./interface.mjs";
 import { usePermission as W } from "@aplus-frontend/hooks";
 import { handleExportDownload as X } from "./handleExportDownload.mjs";
 import { useInjectApTable as Y } from "../../ap-table/context.mjs";
@@ -30,10 +30,10 @@ const ge = /* @__PURE__ */ O({
     exportField: { type: [Boolean, Object], default: void 0 }
   },
   setup(K) {
-    const { hasPermission: T } = W(), e = K, { columns: c, dataSource: f } = Y(), { b: D } = ee("ap-export-group"), { t: u } = te(), C = ae("exportField"), i = A(!1), p = A(!1), m = s(
+    const { hasPermission: T } = W(), e = K, { columns: c, dataSource: f } = Y(), { b: D } = ee("ap-export-group"), { t: r } = te(), C = ae("exportField"), u = A(!1), p = A(!1), m = s(
       () => {
         var t;
-        return !!(e != null && e.disabled) || (f !== void 0 ? !((t = f == null ? void 0 : f.value) != null && t.length) : !1) || i.value;
+        return !!(e != null && e.disabled) || (f !== void 0 ? !((t = f == null ? void 0 : f.value) != null && t.length) : !1) || u.value;
       }
     );
     V(
@@ -45,7 +45,7 @@ const ge = /* @__PURE__ */ O({
         immediate: !0
       }
     );
-    const R = s(() => (e == null ? void 0 : e.successMessage) === !0 ? u("ap.apExportGroup.exportSuccess") : e != null && e.successMessage ? e.successMessage : ""), b = s(() => {
+    const R = s(() => (e == null ? void 0 : e.successMessage) === !0 ? r("ap.apExportGroup.exportSuccess") : e != null && e.successMessage ? e.successMessage : ""), b = s(() => {
       const t = "exportFieldList", l = (e == null ? void 0 : e.exportField) ?? (C.value === "" ? !0 : C.value) ?? !1;
       return l === !0 ? {
         key: t
@@ -60,18 +60,18 @@ const ge = /* @__PURE__ */ O({
       return !(e != null && e.ifShow) && (e != null && e.auth) && (t = () => T(e.auth)), (t == null ? void 0 : t()) ?? !0;
     });
     async function I() {
-      k.value.length > 0 ? w({ key: r.SELECT }) : w({ key: r.ALL });
+      k.value.length > 0 ? w({ key: i.SELECT }) : w({ key: i.ALL });
     }
     async function w({ key: t }) {
       var F, S, _;
       const { getRequestParams: l, request: o } = e || {};
       let E = {};
-      t === r.SELECT ? E = {
+      t === i.SELECT ? E = {
         [(e == null ? void 0 : e.idKey) || "ids"]: k.value
-      } : t === r.ALL && (E = (l == null ? void 0 : l()) || {});
+      } : t === i.ALL && (E = (l == null ? void 0 : l()) || {});
       const N = ((F = e == null ? void 0 : e.getInitialParams) == null ? void 0 : F.call(e)) || {};
       try {
-        i.value = !0;
+        u.value = !0;
         let v = Object.assign(
           {
             ...E,
@@ -86,7 +86,7 @@ const ge = /* @__PURE__ */ O({
         );
         v = ((_ = e == null ? void 0 : e.beforeRequest) == null ? void 0 : _.call(e, v)) || v, await X(async () => await (o == null ? void 0 : o(v))), e != null && e.successMessage && H.success(R.value);
       } finally {
-        i.value = !1;
+        u.value = !1;
       }
     }
     return (t, l) => (d(), $(q, null, [
@@ -94,11 +94,12 @@ const ge = /* @__PURE__ */ O({
         ...t.$attrs
       }, {
         disabled: m.value,
-        loading: i.value,
+        loading: u.value,
+        "min-width": "",
         onClick: I
       }), {
         default: n(() => [
-          x(g((e == null ? void 0 : e.text) ?? a(u)("ap.apExportGroup.export")), 1)
+          x(g((e == null ? void 0 : e.text) ?? a(r)("ap.apExportGroup.export")), 1)
         ]),
         _: 1
       }, 16, ["disabled", "loading"])) : M("", !0),
@@ -116,19 +117,19 @@ const ge = /* @__PURE__ */ O({
               var o;
               return [
                 (d(), y(a(G), {
-                  key: a(r).SELECT,
+                  key: a(i).SELECT,
                   disabled: ((o = k.value) == null ? void 0 : o.length) === 0
                 }, {
                   default: n(() => [
-                    x(g(a(u)("ap.apExportGroup.exportSelected")), 1)
+                    x(g(a(r)("ap.apExportGroup.exportSelected")), 1)
                   ]),
                   _: 1
                 }, 8, ["disabled"])),
                 (d(), y(a(G), {
-                  key: a(r).ALL
+                  key: a(i).ALL
                 }, {
                   default: n(() => [
-                    x(g(a(u)("ap.apExportGroup.exportAll")), 1)
+                    x(g(a(r)("ap.apExportGroup.exportAll")), 1)
                   ]),
                   _: 1
                 }))
@@ -140,9 +141,9 @@ const ge = /* @__PURE__ */ O({
         default: n(() => [
           h(a(P), B({
             ...t.$attrs
-          }, { loading: i.value }), {
+          }, { loading: u.value }), {
             default: n(() => [
-              x(g((e == null ? void 0 : e.text) ?? a(u)("ap.apExportGroup.export")) + " ", 1),
+              x(g((e == null ? void 0 : e.text) ?? a(r)("ap.apExportGroup.export")) + " ", 1),
               h(a(U))
             ]),
             _: 1

package/es/src/business/ap-input-radio/ApInputRadio.vue2.mjs

@@ -1,9 +1,10 @@
-import { defineComponent as f, onMounted as g, createElementBlock as R, openBlock as V, normalizeClass as b, unref as t, createVNode as i, mergeProps as h } from "vue";
+import { defineComponent as g, onMounted as R, createElementBlock as V, openBlock as h, normalizeClass as b, unref as t, createVNode as i, mergeProps as I } from "vue";
 import "../../config-provider/index.mjs";
-import { Form as I, InputNumber as B, RadioGroup as k } from "@aplus-frontend/antdv";
+import { Form as B, InputNumber as k, RadioGroup as x } from "@aplus-frontend/antdv";
 import { omit as _ } from "lodash-unified";
-import { useNamespace as x } from "../../config-provider/hooks/use-namespace.mjs";
-const G = /* @__PURE__ */ f({
+import { useLocale as y } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as F } from "../../config-provider/hooks/use-namespace.mjs";
+const S = /* @__PURE__ */ g({
   name: "ApInputRadio",
   __name: "ApInputRadio",
   props: {
@@ -31,36 +32,37 @@ const G = /* @__PURE__ */ f({
   },
   emits: ["update:value", "InputRadioChange"],
   setup(p, { emit: s }) {
-    const d = I.useInjectFormItemContext(), e = p, { b: m, e: c } = x("ap-input-radio"), u = s, n = (a) => {
-      let o = { ...e.value, ...a };
-      u("update:value", o), u("InputRadioChange", o), d.onFieldChange();
-    }, C = (a) => {
-      n({ inputVal: a });
-    }, v = (a) => {
-      const o = a.target.value;
+    const c = B.useInjectFormItemContext(), e = p, { t: d } = y(), { b: m, e: C } = F("ap-input-radio"), u = s, n = (o) => {
+      let a = { ...e.value, ...o };
+      u("update:value", a), u("InputRadioChange", a), c.onFieldChange();
+    }, f = (o) => {
+      n({ inputVal: o });
+    }, v = (o) => {
+      const a = o.target.value;
       if (e.setRadioValCallback) {
-        let l = e.setRadioValCallback(o);
-        n({ inputVal: l, radioVal: o });
+        let l = e.setRadioValCallback(a);
+        n({ inputVal: l, radioVal: a });
       } else
-        n({ radioVal: o });
+        n({ radioVal: a });
     };
-    return g(() => {
+    return R(() => {
       if (e.setRadioValCallback) {
-        let a = e.setRadioValCallback(e.value.radioVal);
-        n({ inputVal: a });
+        let o = e.setRadioValCallback(e.value.radioVal);
+        n({ inputVal: o });
       }
-    }), (a, o) => {
+    }), (o, a) => {
       var l, r;
-      return V(), R("div", {
+      return h(), V("div", {
         class: b([t(m)()])
       }, [
-        i(t(B), h({
-          class: t(c)("input-number")
+        i(t(k), I({
+          class: t(C)("input-number")
         }, t(_)(e, ["value", "options"]), {
           value: e.value ? (l = e.value) == null ? void 0 : l.inputVal : "",
-          onChange: C
-        }), null, 16, ["class", "value"]),
-        i(t(k), {
+          placeholder: t(d)("ap.common.inputText"),
+          onChange: f
+        }), null, 16, ["class", "value", "placeholder"]),
+        i(t(x), {
           value: e.value ? (r = e.value) == null ? void 0 : r.radioVal : "",
           options: e.options,
           onChange: v
@@ -70,5 +72,5 @@ const G = /* @__PURE__ */ f({
   }
 });
 export {
-  G as default
+  S as default
 };

package/es/src/business/ap-label/constans.mjs

@@ -36,7 +36,7 @@ const o = () => ({
   },
   iconSize: {
     type: Number,
-    default: 16
+    default: 14
   },
   show: {
     type: Boolean,

package/es/src/business/ap-view/components/main-button-content.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as T, ref as $, computed as I, watch as Y, createBlock as E, openBlock as K, unref as e, withCtx as t, createElementVNode as c, normalizeClass as r, createVNode as a, createSlots as j, toDisplayString as p, createTextVNode as w } from "vue";
-import { Popover as q, Tooltip as B, Space as x, Checkbox as D } from "@aplus-frontend/antdv";
+import { defineComponent as z, ref as $, computed as I, watch as Y, createBlock as D, openBlock as E, unref as e, withCtx as t, createElementVNode as f, normalizeClass as r, createVNode as a, createSlots as K, toDisplayString as s, createTextVNode as v } from "vue";
+import { Popover as j, Tooltip as q, Space as N, Checkbox as B } from "@aplus-frontend/antdv";
 import "../../../config-provider/index.mjs";
 import L from "../icons/line-eye.vue.mjs";
 import "../../../ap-form/ap-form.vue.mjs";
@@ -11,45 +11,50 @@ import { generateUniqueKey as P } from "../utils/uuid.mjs";
 import { cloneDeep as R } from "lodash-unified";
 import { useLocale as U } from "../../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as G } from "../../../config-provider/hooks/use-namespace.mjs";
-import v from "../../../ap-form/ap-form.vue2.mjs";
-import N from "../../../ap-button/ap-button.vue.mjs";
-const pe = /* @__PURE__ */ T({
+import w from "../../../ap-form/ap-form.vue2.mjs";
+import F from "../../../ap-button/ap-button.vue.mjs";
+const re = /* @__PURE__ */ z({
   __name: "main-button-content",
   props: {
     maxViewNum: {}
   },
   setup(b) {
-    const u = b, { t: o } = U(), { b: l } = G("ap-view"), _ = $(), { tableKey: F, popoverOpen: s, viewList: f, saveDataSource: n, viewListCRUD: V } = A(), h = I({
-      get: () => s.value && f.value.length < u.maxViewNum + 1,
-      set: (m) => {
-        f.value.length < u.maxViewNum + 1 && (s.value = m);
+    const d = b, { t: o } = U(), { b: l } = G("ap-view"), V = $(), { tableKey: k, popoverOpen: c, viewList: u, saveDataSource: n, viewListCRUD: _ } = A(), y = I({
+      get: () => c.value && u.value.length < d.maxViewNum + 1,
+      set: (p) => {
+        u.value.length < d.maxViewNum + 1 && (c.value = p);
       }
     });
-    Y(s, (m) => {
+    Y(c, (p) => {
       var i;
-      m && ((i = _.value) == null || i.resetFields());
+      p && ((i = V.value) == null || i.resetFields(), setTimeout(() => {
+        var m;
+        (m = V.value) == null || m.setFieldsValue({
+          isDefault: !u.value.some((h) => h.isDefault)
+        });
+      }));
     });
-    const k = async (m) => {
-      var y, g;
-      const { viewName: i, isDefault: d } = m, C = P(), z = {
+    const C = async (p) => {
+      var g, x;
+      const { viewName: i, isDefault: m } = p, h = P(), T = {
         searchForm: R(
-          (y = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : y.call(
+          (g = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : g.call(
             n,
             !!(n != null && n.searchFormTransform)
           )
         )
       };
-      await ((g = V.addView) == null ? void 0 : g.call(V, {
-        tableKey: F,
-        viewKey: C,
+      await ((x = _.addView) == null ? void 0 : x.call(_, {
+        tableKey: k,
+        viewKey: h,
         viewName: i,
-        isDefault: d,
-        viewConfig: z
-      })), s.value = !1;
+        isDefault: m,
+        viewConfig: T
+      })), c.value = !1;
     };
-    return (m, i) => (K(), E(e(q), {
-      open: h.value,
-      "onUpdate:open": i[1] || (i[1] = (d) => h.value = d),
+    return (p, i) => (E(), D(e(j), {
+      open: y.value,
+      "onUpdate:open": i[1] || (i[1] = (m) => y.value = m),
       placement: "bottom",
       trigger: "click",
       arrow: !1,
@@ -58,34 +63,33 @@ const pe = /* @__PURE__ */ T({
       }
     }, {
       content: t(() => [
-        c("div", {
+        f("div", {
           class: r([e(l)("main-content-popover")])
         }, [
-          a(v, {
+          a(w, {
             ref_key: "formRef",
-            ref: _,
+            ref: V,
             layout: "vertical",
             "initial-values": {
-              isDefault: !0,
               viewName: `${e(o)("ap.apView.newView")} ${e(O)().format("YYYY-MM-DD").toString()}`
             },
-            onFinish: k
+            onFinish: C
           }, {
             default: t(() => [
-              c("div", {
+              f("div", {
                 class: r([e(l)("main-content-popover-title-content")])
               }, [
-                c("div", {
+                f("div", {
                   class: r([e(l)("main-content-popover-title-content-title")])
-                }, p(e(o)("ap.apView.saveNewView")), 3),
-                a(v.FormItem, {
+                }, s(e(o)("ap.apView.saveNewView")), 3),
+                a(w.FormItem, {
                   name: "isDefault",
                   "value-prop-name": "checked"
                 }, {
                   default: t(() => [
-                    a(e(D), null, {
+                    a(e(B), null, {
                       default: t(() => [
-                        w(p(e(o)("ap.apView.setDefault")), 1)
+                        v(s(e(o)("ap.apView.setDefault")), 1)
                       ]),
                       _: 1
                     })
@@ -93,7 +97,7 @@ const pe = /* @__PURE__ */ T({
                   _: 1
                 })
               ], 2),
-              a(v.FormItem, {
+              a(w.FormItem, {
                 label: e(o)("ap.apView.viewName"),
                 name: "viewName",
                 rules: [{ required: !0, message: e(o)("ap.apView.notEmpty") }]
@@ -107,28 +111,28 @@ const pe = /* @__PURE__ */ T({
                 ]),
                 _: 1
               }, 8, ["label", "rules"]),
-              a(v.FormItem, {
+              a(w.FormItem, {
                 class: r([e(l)("main-content-popover-btn")])
               }, {
                 default: t(() => [
-                  a(e(x), { size: 8 }, {
+                  a(e(N), { size: 8 }, {
                     default: t(() => [
-                      a(e(N), {
+                      a(e(F), {
                         size: "small",
-                        onClick: i[0] || (i[0] = (d) => s.value = !1)
+                        onClick: i[0] || (i[0] = (m) => c.value = !1)
                       }, {
                         default: t(() => [
-                          w(p(e(o)("ap.apView.cancel")), 1)
+                          v(s(e(o)("ap.apView.cancel")), 1)
                         ]),
                         _: 1
                       }),
-                      a(e(N), {
+                      a(e(F), {
                         type: "primary",
                         size: "small",
                         "html-type": "submit"
                       }, {
                         default: t(() => [
-                          w(p(e(o)("ap.apView.save")), 1)
+                          v(s(e(o)("ap.apView.save")), 1)
                         ]),
                         _: 1
                       })
@@ -144,30 +148,30 @@ const pe = /* @__PURE__ */ T({
         ], 2)
       ]),
       default: t(() => [
-        c("div", {
+        f("div", {
           class: r({
             [e(l)("main-content")]: !0,
-            [e(l)("main-content-disabled")]: e(f).length >= u.maxViewNum + 1
+            [e(l)("main-content-disabled")]: e(u).length >= d.maxViewNum + 1
           })
         }, [
-          a(e(B), { placement: "bottom" }, j({
+          a(e(q), { placement: "bottom" }, K({
             default: t(() => [
-              a(e(x), { size: 4 }, {
+              a(e(N), { size: 4 }, {
                 default: t(() => [
                   a(L, {
                     class: r([e(l)("icon")])
                   }, null, 8, ["class"]),
-                  c("div", null, p(e(o)("ap.apView.saveView")), 1)
+                  f("div", null, s(e(o)("ap.apView.saveView")), 1)
                 ]),
                 _: 1
               })
             ]),
             _: 2
           }, [
-            e(f).length >= u.maxViewNum + 1 ? {
+            e(u).length >= d.maxViewNum + 1 ? {
               name: "title",
               fn: t(() => [
-                w(p(e(o)("ap.apView.maxTip")), 1)
+                v(s(e(o)("ap.apView.maxTip")), 1)
               ]),
               key: "0"
             } : void 0
@@ -179,5 +183,5 @@ const pe = /* @__PURE__ */ T({
   }
 });
 export {
-  pe as default
+  re as default
 };

package/es/src/business/hooks/usePageListApGrid.mjs

@@ -45,7 +45,7 @@ function z(s) {
       } : void 0,
       rowSelection: c ? {
         fixed: "left",
-        columnWidth: 50
+        columnWidth: 34
       } : void 0,
       ref(e) {
         o.value = e;

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

@@ -183,6 +183,10 @@ export type ApFormSearchFormPopoverSorterProps = {
      * @returns
      */
     onClickConfirm: (sortedChildren: VNode[]) => void;
+    /**
+     * 当前的children是否已经排序过了
+     */
+    sorted?: boolean;
 };
 export type ApFormSearchFormExpose = {
     apForm: ApFormExpose;

package/lib/src/ap-form/search-form/components/popover-filter.vue.d.ts

@@ -1,4 +1,133 @@
 import { ApFormSearchFormPopoverFilterProps } from '../../interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-declare const _default: DefineComponent<ApFormSearchFormPopoverFilterProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApFormSearchFormPopoverFilterProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, ExtractPropTypes, PropType, GlobalComponents, GlobalDirectives } from 'vue';
+import { ButtonType, ButtonShape, ButtonSize } from '@aplus-frontend/antdv/es/button';
+import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
+import { VueTypeValidableDef } from '../../../../node_modules/vue-types';
+import { MouseEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
+import { VueNode, CustomSlotsType } from '@aplus-frontend/antdv/es/_util/type';
+declare const _default: DefineComponent<ApFormSearchFormPopoverFilterProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApFormSearchFormPopoverFilterProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {
+    triggerBtnRef: CreateComponentPublicInstanceWithMixins<Readonly< ExtractPropTypes<{
+        prefixCls: StringConstructor;
+        type: PropType<ButtonType>;
+        htmlType: {
+            type: PropType<ButtonHTMLType>;
+            default: string;
+        };
+        shape: {
+            type: PropType<ButtonShape>;
+        };
+        size: {
+            type: PropType<ButtonSize>;
+        };
+        loading: {
+            type: PropType<boolean | {
+                delay?: number;
+            }>;
+            default: () => boolean | {
+                delay?: number;
+            };
+        };
+        disabled: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        ghost: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        block: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        danger: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        icon: VueTypeValidableDef<any>;
+        href: StringConstructor;
+        target: StringConstructor;
+        title: StringConstructor;
+        onClick: {
+            type: PropType< MouseEventHandler | MouseEventHandler[]>;
+        };
+        onMousedown: {
+            type: PropType< MouseEventHandler | MouseEventHandler[]>;
+        };
+    }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
+        block: boolean;
+        disabled: boolean;
+        danger: boolean;
+        ghost: boolean;
+        htmlType: ButtonHTMLType;
+        loading: boolean | {
+            delay?: number;
+        };
+    }, true, {}, CustomSlotsType<{
+        icon: any;
+        default: any;
+    }>, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
+        P: {};
+        B: {};
+        D: {};
+        C: {};
+        M: {};
+        Defaults: {};
+    }, Readonly< ExtractPropTypes<{
+        prefixCls: StringConstructor;
+        type: PropType<ButtonType>;
+        htmlType: {
+            type: PropType<ButtonHTMLType>;
+            default: string;
+        };
+        shape: {
+            type: PropType<ButtonShape>;
+        };
+        size: {
+            type: PropType<ButtonSize>;
+        };
+        loading: {
+            type: PropType<boolean | {
+                delay?: number;
+            }>;
+            default: () => boolean | {
+                delay?: number;
+            };
+        };
+        disabled: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        ghost: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        block: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        danger: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        icon: VueTypeValidableDef<any>;
+        href: StringConstructor;
+        target: StringConstructor;
+        title: StringConstructor;
+        onClick: {
+            type: PropType< MouseEventHandler | MouseEventHandler[]>;
+        };
+        onMousedown: {
+            type: PropType< MouseEventHandler | MouseEventHandler[]>;
+        };
+    }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
+        block: boolean;
+        disabled: boolean;
+        danger: boolean;
+        ghost: boolean;
+        htmlType: ButtonHTMLType;
+        loading: boolean | {
+            delay?: number;
+        };
+    }> | null;
+}, any>;
 export default _default;

package/lib/src/ap-form/search-form/components/popover-filter.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@aplus-frontend/antdv"),i=require("@aplus-frontend/icon");require("../../../config-provider/index.js");const s=require("../../../config-provider/hooks/use-namespace.js"),p=require("../../../config-provider/hooks/use-locale.js"),d=e.defineComponent({name:"ApFormSearchFormPopoverFilter",__name:"popover-filter",props:{config:{},onSubmit:{type:Function},submitLoading:{type:Boolean}},setup(f){const{e:r}=s.useNamespace("ap-form-search-form"),{t:l}=p.useLocale(),u=e.ref(!1);function c(o){return o.closest(".ant-form")||document.body}return(o,a)=>(e.openBlock(),e.createBlock(e.unref(t.Popover),{open:u.value,"onUpdate:open":a[1]||(a[1]=n=>u.value=n),"overlay-class-name":e.unref(r)("popover"),trigger:"click",placement:"bottom",mask:"","mask-style":{backgroundColor:"transparent"},"get-popup-container":c},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("popover-content")]),style:{paddingBottom:"4px",width:"825px"}},[e.createVNode(e.unref(t.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(o.config,n=>(e.openBlock(),e.createBlock(e.unref(t.Col),{key:n.key,span:8},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.node)))]),_:2},1024))),128))]),_:1})],2),e.createVNode(e.unref(t.Divider),{style:{margin:"0"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(r)("popover-footer"))},[e.createVNode(e.unref(t.Flex),{justify:"end"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{onClick:a[0]||(a[0]=n=>u.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.common.cancelText")),1)]),_:1}),e.createVNode(e.unref(t.Button),{class:e.normalizeClass(e.unref(r)("popover-footer-confirm-btn")),type:"primary",loading:o.submitLoading,onClick:o.onSubmit},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.apForm.search.search")),1)]),_:1},8,["class","loading","onClick"])]),_:1})],2)]),default:e.withCtx(()=>[e.createVNode(e.unref(t.Tooltip),{title:e.unref(l)("ap.apForm.search.moreFilter"),placement:"top"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),null,{icon:e.withCtx(()=>[e.createVNode(e.unref(i.IconApFilterOutlined))]),_:1})]),_:1},8,["title"])]),_:1},8,["open","overlay-class-name"]))}});exports.default=d;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@aplus-frontend/antdv"),p=require("@aplus-frontend/icon");require("../../../config-provider/index.js");const f=require("../../../config-provider/hooks/use-namespace.js"),d=require("../../../config-provider/hooks/use-locale.js"),m=e.defineComponent({name:"ApFormSearchFormPopoverFilter",__name:"popover-filter",props:{config:{},onSubmit:{type:Function},submitLoading:{type:Boolean}},setup(g){const u=e.ref(),{e:n,b:c}=f.useNamespace("ap-form-search-form"),{t:i}=d.useLocale(),a=e.ref(!1);function s(o){return o.closest(".ant-form")||document.body}return(o,l)=>(e.openBlock(),e.createBlock(e.unref(t.Popover),{open:a.value,"onUpdate:open":l[1]||(l[1]=r=>a.value=r),"overlay-class-name":e.unref(n)("popover"),trigger:"click",placement:"bottom",mask:"","mask-style":{backgroundColor:"transparent"},"get-popup-container":s},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(n)("popover-content")]),style:{paddingBottom:"4px",width:"825px"}},[e.createVNode(e.unref(t.Row),{gutter:8},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(o.config,r=>(e.openBlock(),e.createBlock(e.unref(t.Col),{key:r.key,span:8},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.node)))]),_:2},1024))),128))]),_:1})],2),e.createVNode(e.unref(t.Divider),{style:{margin:"0"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(n)("popover-footer"))},[e.createVNode(e.unref(t.Flex),{justify:"end"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{onClick:l[0]||(l[0]=r=>a.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(i)("ap.common.cancelText")),1)]),_:1}),e.createVNode(e.unref(t.Button),{class:e.normalizeClass(e.unref(n)("popover-footer-confirm-btn")),type:"primary",loading:o.submitLoading,onClick:o.onSubmit},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(i)("ap.apForm.search.search")),1)]),_:1},8,["class","loading","onClick"])]),_:1})],2)]),default:e.withCtx(()=>[e.createVNode(e.unref(t.Tooltip),{title:e.unref(i)("ap.apForm.search.moreFilter"),placement:"top"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{ref_key:"triggerBtnRef",ref:u,class:e.normalizeClass([e.unref(c)("trigger-btn"),{[e.unref(c)("trigger-btn-active")]:a.value}])},{icon:e.withCtx(()=>[e.createVNode(e.unref(p.IconApFilterOutlined),{size:14})]),_:1},8,["class"])]),_:1},8,["title"])]),_:1},8,["open","overlay-class-name"]))}});exports.default=m;

package/lib/src/ap-form/search-form/components/popover-sorter/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@aplus-frontend/antdv"),N=require("@aplus-frontend/icon");require("../../../../config-provider/index.js");const g=require("vuedraggable");require("./sortable-item.vue.js");const y=require("../../../item-group/helper.js"),f=require("../../../../config-provider/hooks/use-namespace.js"),V=require("../../../../config-provider/hooks/use-locale.js"),_=require("./sortable-item.vue2.js"),x=e.defineComponent({name:"ApFormSearchFormPopoverSorter",__name:"index",props:{children:{},onClickConfirm:{type:Function}},setup(m){const s=m,a=e.ref(s.children);let p=[...s.children];e.watch(()=>s.children,n=>{a.value=n,p=n});const{e:l}=f.useNamespace("ap-form-search-form"),{b:r}=f.useNamespace("search-form-sorter"),{t:o}=V.useLocale(),c=e.ref(!1);function d(n){return n.closest(".ant-form")||document.body}function C(){c.value=!1,console.log(e.unref(a)),s.onClickConfirm(e.unref(a))}function h(){a.value=[...p]}function v(n){return y.getStringName(n.props.name)}return(n,i)=>(e.openBlock(),e.createBlock(e.unref(t.Popover),{open:c.value,"onUpdate:open":i[1]||(i[1]=u=>c.value=u),"overlay-class-name":e.unref(l)("popover"),trigger:"click",placement:"bottom",mask:"","mask-style":{backgroundColor:"transparent"},"get-popup-container":d},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(r)("header"))},[e.createElementVNode("span",{class:e.normalizeClass(e.unref(r)("header-title"))},e.toDisplayString(e.unref(o)("ap.apForm.search.sorterTitle")),3),e.createVNode(e.unref(t.Flex),{justify:"space-between"},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(r)("header-desc"))},e.toDisplayString(e.unref(o)("ap.apForm.search.sorterDesc")),3),e.createElementVNode("div",{class:e.normalizeClass(e.unref(r)("header-action-wrapper")),onClick:h},[e.createElementVNode("span",{class:e.normalizeClass(e.unref(r)("header-reset-btn"))},e.toDisplayString(e.unref(o)("ap.apForm.search.sorterReset")),3)],2)]),_:1})],2),e.createElementVNode("div",{class:e.normalizeClass([e.unref(l)("popover-content"),e.unref(r)("content")])},[e.createVNode(e.unref(g),{list:a.value,class:e.normalizeClass(e.unref(r)("sorter-wrapper")),"item-key":v},{item:e.withCtx(({element:u})=>[e.createVNode(_.default,{item:u},null,8,["item"])]),_:1},8,["list","class"])],2),e.createVNode(e.unref(t.Divider),{style:{margin:"0"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("popover-footer"))},[e.createVNode(e.unref(t.Flex),{justify:"end"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{onClick:i[0]||(i[0]=u=>c.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.common.cancelText")),1)]),_:1}),e.createVNode(e.unref(t.Button),{class:e.normalizeClass(e.unref(l)("popover-footer-confirm-btn")),type:"primary",onClick:C},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.apForm.search.sorterConfirmBtn")),1)]),_:1},8,["class"])]),_:1})],2)]),default:e.withCtx(()=>[e.createVNode(e.unref(t.Tooltip),{title:e.unref(o)("ap.apForm.search.sorterTitle"),placement:"top"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),null,{icon:e.withCtx(()=>[e.createVNode(e.unref(N.IconApLayoutOutlined))]),_:1})]),_:1},8,["title"])]),_:1},8,["open","overlay-class-name"]))}});exports.default=x;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=require("@aplus-frontend/antdv"),y=require("@aplus-frontend/icon");require("../../../../config-provider/index.js");const V=require("vuedraggable");require("./sortable-item.vue.js");const _=require("../../../item-group/helper.js"),m=require("../../../../config-provider/hooks/use-namespace.js"),b=require("../../../../config-provider/hooks/use-locale.js"),w=require("./sortable-item.vue2.js"),x=e.defineComponent({name:"ApFormSearchFormPopoverSorter",__name:"index",props:{children:{},onClickConfirm:{type:Function},sorted:{type:Boolean}},setup(v){const a=v,o=e.ref(a.children);let p=[...a.children],f=[...a.children];e.watch(()=>a.children,r=>{a.sorted||(o.value=r,f=r,p=r)});const{e:c,b:d}=m.useNamespace("ap-form-search-form"),{b:n}=m.useNamespace("search-form-sorter"),{t:s}=b.useLocale(),l=e.ref(!1);function C(r){return r.closest(".ant-form")||document.body}function h(){l.value=!1,p=[...e.unref(o)],a.onClickConfirm(e.unref(o))}function g(){o.value=[...f]}function N(r){return _.getStringName(r.props.name)}return e.watch(()=>l.value,r=>{r&&(o.value=[...p])}),(r,i)=>(e.openBlock(),e.createBlock(e.unref(t.Popover),{open:l.value,"onUpdate:open":i[1]||(i[1]=u=>l.value=u),"overlay-class-name":e.unref(c)("popover"),trigger:"click",placement:"bottom",mask:"","mask-style":{backgroundColor:"transparent"},"get-popup-container":C},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(n)("header"))},[e.createElementVNode("span",{class:e.normalizeClass(e.unref(n)("header-title"))},e.toDisplayString(e.unref(s)("ap.apForm.search.sorterTitle")),3),e.createVNode(e.unref(t.Flex),{justify:"space-between"},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(n)("header-desc"))},e.toDisplayString(e.unref(s)("ap.apForm.search.sorterDesc")),3),e.createElementVNode("div",{class:e.normalizeClass(e.unref(n)("header-action-wrapper")),onClick:g},[e.createElementVNode("span",{class:e.normalizeClass(e.unref(n)("header-reset-btn"))},e.toDisplayString(e.unref(s)("ap.apForm.search.sorterReset")),3)],2)]),_:1})],2),e.createElementVNode("div",{class:e.normalizeClass([e.unref(c)("popover-content"),e.unref(n)("content")])},[e.createVNode(e.unref(V),{list:o.value,class:e.normalizeClass(e.unref(n)("sorter-wrapper")),"item-key":N},{item:e.withCtx(({element:u})=>[e.createVNode(w.default,{item:u},null,8,["item"])]),_:1},8,["list","class"])],2),e.createVNode(e.unref(t.Divider),{style:{margin:"0"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(c)("popover-footer"))},[e.createVNode(e.unref(t.Flex),{justify:"end"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{onClick:i[0]||(i[0]=u=>l.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(s)("ap.common.cancelText")),1)]),_:1}),e.createVNode(e.unref(t.Button),{class:e.normalizeClass(e.unref(c)("popover-footer-confirm-btn")),type:"primary",onClick:h},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(s)("ap.apForm.search.sorterConfirmBtn")),1)]),_:1},8,["class"])]),_:1})],2)]),default:e.withCtx(()=>[e.createVNode(e.unref(t.Tooltip),{title:e.unref(s)("ap.apForm.search.sorterTitle"),placement:"top"},{default:e.withCtx(()=>[e.createVNode(e.unref(t.Button),{class:e.normalizeClass([e.unref(d)("trigger-btn"),{[e.unref(d)("trigger-btn-active")]:l.value}])},{icon:e.withCtx(()=>[e.createVNode(e.unref(y.IconApLayoutOutlined),{size:14})]),_:1},8,["class"])]),_:1},8,["title"])]),_:1},8,["open","overlay-class-name"]))}});exports.default=x;

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

@@ -383,7 +383,9 @@ declare function __VLS_template(): {
                             default: string | number | ColSize;
                         };
                         xxl: {
-                            type: PropType<string | number | ColSize>;
+                            type: PropType<string | number | **
+                             * extra区域展开占据的span数(占据剩余所有空间)
+                             */).ColSize>;
                             default: string | number | ColSize;
                         };
                         prefixCls: StringConstructor;
@@ -1218,7 +1220,9 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: PropType<string | number | ColSize>;
+                        type: PropType<string | number | **
+                         * extra区域展开占据的span数(占据剩余所有空间)
+                         */).ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;