@aplus-frontend/ui 7.15.8 → 7.17.0

package/es/src/ap-field/hooks/use-default-placeholder.mjs

@@ -1,22 +1,27 @@
-import { computed as r } from "vue";
+import { computed as o } from "vue";
 import "../../config-provider/index.mjs";
 import "../../utils/index.mjs";
 import { useLocale as n } from "../../config-provider/hooks/use-locale.mjs";
-import { isDef as i } from "../../utils/is.mjs";
-const c = ["Select", "Date"], a = [
+import { isDef as c } from "../../utils/is.mjs";
+const i = [
+  "Select",
+  "Date",
+  "Cascader",
+  "TreeSelect"
+], a = [
   "Text",
   "TextArea",
   "Number",
   "TextPassword",
   "Second"
-], m = (t, o) => {
+], m = (t, r) => {
   const { t: e } = n();
-  return r(() => {
-    if (i(o.placeholder))
-      return o.placeholder;
+  return o(() => {
+    if (c(r.placeholder))
+      return r.placeholder;
     if (t === "DateRange")
       return [e("ap.field.startDateText"), e("ap.field.endDateText")];
-    if (c.includes(t))
+    if (i.includes(t))
       return e("ap.common.chooseText");
     if (a.includes(t))
       return e("ap.common.inputText");

package/es/src/ap-field/index.d.ts

@@ -1,3 +1,4 @@
+import { default as ApFieldCascader } from './cascader/index.vue';
 import { default as ApFieldCheckbox } from './checkbox/index.vue';
 import { default as ApFieldDate } from './date/index.vue';
 import { default as ApFieldDateRange } from './date-range/index.vue';
@@ -13,7 +14,7 @@ import { ApFieldText, ApFieldPassword } from './text';
 import { default as ApFieldTextArea } from './text-area/index.vue';
 import { default as ApFieldTreeSelect } from './tree-select/index.vue';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, GlobalComponents, GlobalDirectives, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps } from 'vue';
-import { ApFieldTextProps, FieldMode, ApFieldTextAreaProps, ApFieldNumberProps, ApFieldDateProps, ApFieldDateRangeProps, ApFieldRadioProps, ApFieldCheckboxProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldTreeSelectProps, ApFieldTextPasswordProps, ApFieldSecondProps } from './interface';
+import { ApFieldTextProps, FieldMode, ApFieldTextAreaProps, ApFieldNumberProps, ApFieldDateProps, ApFieldDateRangeProps, ApFieldRadioProps, ApFieldCheckboxProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldTreeSelectProps, ApFieldTextPasswordProps, ApFieldSecondProps, ApFieldCascaderProps } from './interface';
 import { LiteralUnion } from '../type';
 import { ApFormatPresetType } from './date/interface';
 import { CheckboxOptionType } from '@aplus-frontend/antdv';
@@ -32,6 +33,7 @@ export type FieldType = {
     Rate: typeof ApFieldRate;
     TreeSelect: typeof ApFieldTreeSelect;
     Second: typeof ApFieldSecond;
+    Cascader: typeof ApFieldCascader;
 };
 export declare const ApFieldRead: {
     readonly Text: DefineComponent<ApFieldTextProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ApFieldTextProps> & Readonly<{}>, {
@@ -132,7 +134,11 @@ export declare const ApFieldRead: {
     readonly Second: DefineComponent<ApFieldSecondProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ApFieldSecondProps> & Readonly<{}>, {
         emptyText: string;
     }, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLSpanElement>;
+    readonly Cascader: DefineComponent<ApFieldCascaderProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ApFieldCascaderProps> & Readonly<{}>, {
+        mode: FieldMode;
+        emptyText: string;
+    }, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 };
 export declare const ApField: FieldType;
 export * from './interface';
-export { ApFieldText, ApFieldCheckbox, ApFieldDate, ApFieldNumber, ApFieldRadio, ApFieldSwitch, ApFieldTextArea, ApFieldDateRange, ApFieldSelect, ApFieldPassword, ApFieldSlider, ApFieldSegmented, ApFieldRate, ApFieldTreeSelect, ApFieldSecond };
+export { ApFieldText, ApFieldCheckbox, ApFieldDate, ApFieldNumber, ApFieldRadio, ApFieldSwitch, ApFieldTextArea, ApFieldDateRange, ApFieldSelect, ApFieldPassword, ApFieldSlider, ApFieldSegmented, ApFieldRate, ApFieldTreeSelect, ApFieldSecond, ApFieldCascader };

package/es/src/ap-field/index.mjs

@@ -1,3 +1,5 @@
+import "./cascader/index.vue2.mjs";
+import "./cascader/read.vue.mjs";
 import "./checkbox/index.vue2.mjs";
 import "./checkbox/read.vue.mjs";
 import "./date/index.vue2.mjs";
@@ -25,75 +27,80 @@ import "./text-area/read.vue.mjs";
 import "./tree-select/index.vue2.mjs";
 import "./tree-select/read.vue.mjs";
 import "./interface.mjs";
-import i from "./second/read.vue2.mjs";
+import i from "./cascader/read.vue2.mjs";
+import r from "./second/read.vue2.mjs";
 import o from "./text/read-password.vue2.mjs";
-import r from "./tree-select/read.vue2.mjs";
-import t from "./switch/read.vue2.mjs";
-import e from "./select/read.vue2.mjs";
-import p from "./checkbox/read.vue2.mjs";
-import a from "./radio/read.vue2.mjs";
-import f from "./date-range/read.vue2.mjs";
-import _ from "./date/read.vue2.mjs";
-import c from "./number/read.vue2.mjs";
-import s from "./text-area/read.vue2.mjs";
-import n from "./text/read.vue2.mjs";
-import d from "./second/index.vue.mjs";
-import l from "./tree-select/index.vue.mjs";
-import $ from "./rate/index.vue.mjs";
-import A from "./segmented/index.vue.mjs";
-import F from "./slider/index.vue.mjs";
-import S from "./switch/index.vue.mjs";
-import x from "./select/index.vue.mjs";
-import R from "./checkbox/index.vue.mjs";
-import T from "./radio/index.vue.mjs";
-import b from "./date-range/index.vue.mjs";
-import h from "./date/index.vue.mjs";
-import g from "./number/index.vue.mjs";
-import D from "./text-area/index.vue.mjs";
-const gm = {
-  Text: n,
-  TextArea: s,
-  Number: c,
-  Date: _,
-  DateRange: f,
-  Radio: a,
-  Checkbox: p,
-  Select: e,
-  Switch: t,
-  TreeSelect: r,
+import t from "./tree-select/read.vue2.mjs";
+import e from "./switch/read.vue2.mjs";
+import p from "./select/read.vue2.mjs";
+import a from "./checkbox/read.vue2.mjs";
+import f from "./radio/read.vue2.mjs";
+import _ from "./date-range/read.vue2.mjs";
+import c from "./date/read.vue2.mjs";
+import s from "./number/read.vue2.mjs";
+import n from "./text-area/read.vue2.mjs";
+import d from "./text/read.vue2.mjs";
+import l from "./cascader/index.vue.mjs";
+import $ from "./second/index.vue.mjs";
+import A from "./tree-select/index.vue.mjs";
+import F from "./rate/index.vue.mjs";
+import S from "./segmented/index.vue.mjs";
+import x from "./slider/index.vue.mjs";
+import R from "./switch/index.vue.mjs";
+import T from "./select/index.vue.mjs";
+import b from "./checkbox/index.vue.mjs";
+import h from "./radio/index.vue.mjs";
+import g from "./date-range/index.vue.mjs";
+import C from "./date/index.vue.mjs";
+import D from "./number/index.vue.mjs";
+import k from "./text-area/index.vue.mjs";
+const Nm = {
+  Text: d,
+  TextArea: n,
+  Number: s,
+  Date: c,
+  DateRange: _,
+  Radio: f,
+  Checkbox: a,
+  Select: p,
+  Switch: e,
+  TreeSelect: t,
   Password: o,
-  Second: i
-}, Dm = {
+  Second: r,
+  Cascader: i
+}, jm = {
   Text: m,
-  TextArea: D,
-  Number: g,
-  Date: h,
-  DateRange: b,
-  Radio: T,
-  Checkbox: R,
-  Select: x,
-  Switch: S,
-  Slider: F,
-  Segmented: A,
-  Rate: $,
-  TreeSelect: l,
-  Second: d
+  TextArea: k,
+  Number: D,
+  Date: C,
+  DateRange: g,
+  Radio: h,
+  Checkbox: b,
+  Select: T,
+  Switch: R,
+  Slider: x,
+  Segmented: S,
+  Rate: F,
+  TreeSelect: A,
+  Second: $,
+  Cascader: l
 };
 export {
-  Dm as ApField,
-  R as ApFieldCheckbox,
-  h as ApFieldDate,
-  b as ApFieldDateRange,
-  g as ApFieldNumber,
-  T as ApFieldRadio,
-  $ as ApFieldRate,
-  gm as ApFieldRead,
-  d as ApFieldSecond,
-  A as ApFieldSegmented,
-  x as ApFieldSelect,
-  F as ApFieldSlider,
-  S as ApFieldSwitch,
+  jm as ApField,
+  l as ApFieldCascader,
+  b as ApFieldCheckbox,
+  C as ApFieldDate,
+  g as ApFieldDateRange,
+  D as ApFieldNumber,
+  h as ApFieldRadio,
+  F as ApFieldRate,
+  Nm as ApFieldRead,
+  $ as ApFieldSecond,
+  S as ApFieldSegmented,
+  T as ApFieldSelect,
+  x as ApFieldSlider,
+  R as ApFieldSwitch,
   m as ApFieldText,
-  D as ApFieldTextArea,
-  l as ApFieldTreeSelect
+  k as ApFieldTextArea,
+  A as ApFieldTreeSelect
 };

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

@@ -1,5 +1,6 @@
-import { InputProps, CheckboxGroupProps, DatePickerProps, InputNumberProps, RadioGroupProps, SwitchProps, TextAreaProps, SelectProps, PopconfirmProps, SliderProps, SegmentedProps, RateProps, TreeSelectProps } from '@aplus-frontend/antdv';
+import { InputProps, CheckboxGroupProps, DatePickerProps, InputNumberProps, RadioGroupProps, SwitchProps, TextAreaProps, SelectProps, PopconfirmProps, SliderProps, SegmentedProps, RateProps, TreeSelectProps, CascaderProps } from '@aplus-frontend/antdv';
 import { RangePickerProps } from '@aplus-frontend/antdv/es/date-picker/dayjs';
+import { DefaultOptionType } from '@aplus-frontend/antdv/es/select';
 import { InputFocusOptions } from '@aplus-frontend/antdv/es/vc-input/utils/commonUtils';
 import { RangeValue } from '@aplus-frontend/antdv/es/vc-picker/interface';
 import { SharedTimeProps } from '@aplus-frontend/antdv/es/vc-picker/panels/TimePanel';
@@ -287,4 +288,29 @@ export type ApFieldSecondProps = BasicApFieldProps<Omit<InputNumberProps, 'mode'
     emptyText?: string;
 };
 export type ApFieldSecondExpose = ApiFieldNumberExpose;
+export type ApFieldCascaderProps = BasicApFieldProps<Omit<CascaderProps, 'loadData'>> & {
+    emptyText?: string;
+    /**
+     * 手动请求节点数据
+     * @param currentNode 当前选中项
+     * @param clear 请求数据时是否清空数据
+     * @returns
+     */
+    request?: (selectOptions?: DefaultOptionType[], extraParams?: Recordable) => Promise<CascaderProps['options']>;
+    /**
+     * 是否跳过首次加载数据
+     */
+    lazy?: boolean;
+    /**
+     * 发起request额外的请求，变更后会自动重新发器请求
+     */
+    params?: Recordable;
+    /**
+     * 是否动态加载选项
+     */
+    loadData?: boolean;
+};
+export type ApFieldCascaderExpose = Omit<CommonApFieldExpose, 'request'> & {
+    request: (selectOptions?: DefaultOptionType[] | undefined, clear?: boolean) => Promise<void>;
+};
 export {};

package/es/src/ap-field/tree-select/index.vue.mjs

@@ -1,13 +1,14 @@
-import { isVNode as R, defineComponent as A, useSlots as F, shallowRef as _, computed as E, unref as e, createVNode as d, Fragment as g, createBlock as v, openBlock as S, resolveDynamicComponent as K, mergeProps as U, createSlots as z, renderList as M, withCtx as w, renderSlot as j, normalizeProps as q, guardReactiveProps as O } from "vue";
-import { Space as $, Tag as H, TreeSelect as W, Spin as G } from "@aplus-frontend/antdv";
-import { isArray as J, omit as Q } from "lodash-unified";
+import { isVNode as A, defineComponent as F, useSlots as _, shallowRef as E, computed as K, unref as e, createVNode as r, Fragment as g, createBlock as S, openBlock as v, resolveDynamicComponent as U, mergeProps as z, createSlots as M, renderList as j, withCtx as w, renderSlot as q, normalizeProps as O, guardReactiveProps as $ } from "vue";
+import { Space as H, Tag as W, TreeSelect as G, Spin as J } from "@aplus-frontend/antdv";
+import { isArray as Q, omit as X } from "lodash-unified";
 import "../../hooks/index.mjs";
-import { useRequest as X } from "./use-request.mjs";
-import { useControllableValue as Y } from "../../hooks/useControllableValue.mjs";
-function B(r) {
-  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !R(r);
+import { useDefaultPlaceholder as Y } from "../hooks/use-default-placeholder.mjs";
+import { useRequest as Z } from "./use-request.mjs";
+import { useControllableValue as ee } from "../../hooks/useControllableValue.mjs";
+function B(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !A(d);
 }
-const de = /* @__PURE__ */ A({
+const ie = /* @__PURE__ */ F({
   name: "ApFieldTreeSelect",
   __name: "index",
   props: {
@@ -173,80 +174,83 @@ const de = /* @__PURE__ */ A({
     }
   },
   emits: ["update:value"],
-  setup(r, {
-    expose: x,
-    emit: C
+  setup(d, {
+    expose: C,
+    emit: x
   }) {
-    const o = r, N = F(), T = C, p = _(), {
+    const n = d, N = _(), T = x, p = E(), {
       value: f,
       updateValue: b
-    } = Y(o, T), {
+    } = ee(n, T), D = Y("TreeSelect", n), {
       treeData: c,
       loading: m,
       request: y
-    } = X(o), D = E(() => {
+    } = Z(n), V = K(() => {
       let t;
-      const u = e(f), i = J(u) ? u : [u].filter(Boolean);
+      const u = e(f), i = Q(u) ? u : [u].filter(Boolean);
       if (!i.length)
-        return d(g, null, [o.emptyText]);
-      const n = [], s = o.fieldNames?.label || "label", L = o.fieldNames?.value || "value";
+        return r(g, null, [n.emptyText]);
+      const o = [], s = n.fieldNames?.label || "label", R = n.fieldNames?.value || "value";
       function h(a) {
         for (const l of a) {
-          if (i.find((P) => P === l[L]) && n.push(l[s]), n.length === i.length)
+          if (i.find((L) => L === l[R]) && o.push(l[s]), o.length === i.length)
             return;
           l.children?.length && h(l.children);
         }
       }
-      return h(e(c)), n.length ? n.length === 1 ? d("span", null, [n[0]]) : d($, {
+      return h(e(c)), o.length ? o.length === 1 ? r("span", null, [o[0]]) : r(H, {
         size: 4
-      }, B(t = n.map((a, l) => d(H, {
-        style: "margin-right: 0px",
+      }, B(t = o.map((a, l) => r(W, {
+        style: {
+          marginRight: 0
+        },
         key: `${a}-${l}`
       }, B(a) ? a : {
         default: () => [a]
       }))) ? t : {
         default: () => [t]
-      }) : d(g, null, [o.emptyText]);
+      }) : r(g, null, [n.emptyText]);
     });
-    function V() {
+    function k() {
       p.value?.focus?.();
     }
-    function k() {
+    function I() {
       p.value?.blur?.();
     }
-    function I(t) {
+    function P(t) {
       return y(t);
     }
-    return x({
+    return C({
       request: y,
-      focus: V,
-      blur: k
-    }), (t, u) => t.mode === "read" ? (S(), v(K(D.value), {
+      focus: k,
+      blur: I
+    }), (t, u) => t.mode === "read" ? (v(), S(U(V.value), {
       key: 0
-    })) : (S(), v(e(W), U({
+    })) : (v(), S(e(G), z({
       key: 1
-    }, e(Q)(o, ["onUpdate:value", "value", "treeData", "loadData"]), {
+    }, e(X)(n, ["onUpdate:value", "value", "treeData", "loadData"]), {
       ref_key: "treeSelectRef",
       ref: p,
       value: e(f),
       "tree-data": e(c),
       loading: e(m),
-      "load-data": t.loadData ? I : void 0,
+      placeholder: e(D),
+      "load-data": t.loadData ? P : void 0,
       "onUpdate:value": e(b)
-    }), z({
+    }), M({
       _: 2
-    }, [M(N, (i, n) => ({
-      name: n,
-      fn: w((s) => [j(t.$slots, n, q(O(s || {})))])
+    }, [j(N, (i, o) => ({
+      name: o,
+      fn: w((s) => [q(t.$slots, o, O($(s || {})))])
     })), e(m) ? {
       name: "notFoundContent",
-      fn: w(() => [d(e(G), {
+      fn: w(() => [r(e(J), {
         size: "small"
       })]),
       key: "0"
-    } : void 0]), 1040, ["value", "tree-data", "loading", "load-data", "onUpdate:value"]));
+    } : void 0]), 1040, ["value", "tree-data", "loading", "placeholder", "load-data", "onUpdate:value"]));
   }
 });
 export {
-  de as default
+  ie as default
 };

package/es/src/ap-field/tree-select/use-request.mjs

@@ -1,10 +1,10 @@
 import { isFunction as d } from "lodash-unified";
 import { ref as o, watch as v, onMounted as h } from "vue";
 const y = (e) => {
-  let l = 0;
+  let f = 0;
   const a = o(
     e.treeData || []
-  ), f = o(!1);
+  ), i = o(!1);
   v(
     () => e.treeData,
     (t) => {
@@ -14,50 +14,53 @@ const y = (e) => {
       deep: !0
     }
   );
-  function c(t, r) {
+  function s(t, u) {
     if (!t?.length)
       return;
-    const u = e.fieldNames?.value || "value";
+    const l = e.fieldNames?.value || "value";
     for (const n of t) {
-      if (n[u] === r[u])
+      if (n[l] === u[l])
         return n;
-      if (n.children?.length)
-        return c(n.children, r);
+      if (n.children?.length) {
+        const r = s(n.children, u);
+        if (r)
+          return r;
+      }
     }
   }
-  async function i(t, r = !1) {
+  async function c(t, u = !1) {
     if (!d(e.request))
       return;
-    f.value = !0, l += 1;
-    const u = l;
+    i.value = !0, f += 1;
+    const l = f;
     try {
-      r && (a.value = []);
+      u && (a.value = []);
       const n = await e.request(t, e.params);
-      if (u !== l)
+      if (l !== f)
         return;
       if (t) {
-        const s = c(a.value, t);
-        s && (s.children = n);
+        const r = s(a.value, t);
+        r && (r.children = n);
       } else
         a.value = n;
     } finally {
-      f.value = !1;
+      i.value = !1;
     }
   }
   return h(() => {
-    e.lazy || i();
+    e.lazy || c();
   }), v(
     () => e.params,
     () => {
-      i();
+      c();
     },
     {
       deep: !0
     }
   ), {
     treeData: a,
-    request: i,
-    loading: f
+    request: c,
+    loading: i
   };
 };
 export {