@king-one/antdv 1.2.21 → 1.2.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @king-one/antdv
 
+## 1.2.23
+
+### Patch Changes
+
+- 选择器增加确认与取消事件
+
+## 1.2.22
+
+### Patch Changes
+
+- 将 FormItemRest 放到最外层
+
 ## 1.2.21
 
 ### Patch Changes

package/dist/es/components/dept-selector/src/dept.mjs

@@ -5,20 +5,20 @@ import { message as W, FormItemRest as X, InputSearch as Y, Tree as Z, Empty as
 import { GET_DEPT_TREE_URL as le, deptSelectorEmits as te, deptSelectorProps as ae } from "./types.mjs";
 import { KProModal as ne } from "../../pro-modal/index.mjs";
 import { KIcon as P } from "../../icon/index.mjs";
-const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
+const f = Q("dept-selector"), ve = /* @__PURE__ */ H({
   name: "KDeptSelector",
   props: ae,
   emits: te,
   setup(t, {
-    emit: m,
+    emit: h,
     attrs: V,
-    slots: E
+    slots: g
   }) {
-    const x = s(!0), w = s(!0), y = s([]), f = s([]), d = s([]), A = s(!1), u = s(t.isBuiltInRequest ? {
+    const x = s(!0), w = s(!0), y = s([]), m = s([]), r = s([]), A = s(!1), u = s(t.isBuiltInRequest ? {
       children: "children",
       title: "deptName",
       key: "id"
-    } : t.fieldNames), b = s(""), o = s([]), v = s(t.treeData), g = s(!1), p = s("");
+    } : t.fieldNames), b = s(""), d = s([]), v = s(t.treeData), E = s(!1), p = s("");
     if (t.isBuiltInRequest) {
       if (!t.http)
         throw new Error("请传入http实例");
@@ -30,19 +30,19 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       if (t.type === "checkbox") {
         if (!Array.isArray(t.modelValue)) return;
         const e = t.modelValue.map((l) => l[u.value.key]);
-        x.value ? d.value = {
+        x.value ? r.value = {
           checked: e,
           halfChecked: []
-        } : d.value = e, y.value = e;
+        } : r.value = e, y.value = e;
       } else {
         if (Array.isArray(t.modelValue)) return;
         const e = t.modelValue[u.value.key];
-        f.value = [e], y.value = [e];
+        m.value = [e], y.value = [e];
       }
     }, I = (e) => {
-      if (g.value)
-        return g.value = !1;
-      t.type === "radio" ? o.value.length > 0 && (b.value = o.value[0][u.value.title] || "") : b.value = o.value.map((l) => l[u.value.title]).join(",");
+      if (E.value)
+        return E.value = !1;
+      t.type === "radio" ? d.value.length > 0 && (b.value = d.value[0][u.value.title] || "") : b.value = d.value.map((l) => l[u.value.title]).join(",");
     };
     k(() => t.visible, () => {
       t.visible && N();
@@ -60,12 +60,12 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       deep: !0
     });
     function R(e) {
-      const l = (i, r) => {
+      const l = (i, o) => {
         for (const a of i) {
-          if (a[u.value.key] === r)
+          if (a[u.value.key] === o)
             return a;
           if (a.children && a.children.length) {
-            const c = l(a.children, r);
+            const c = l(a.children, o);
             if (c) return c;
           }
         }
@@ -76,13 +76,13 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
     function D(e) {
       return e ? e.map((l) => R(l)).filter(Boolean) : [];
     }
-    k(d, () => {
-      t.type === "checkbox" && (x.value ? o.value = D(d.value.checked) : o.value = D(d.value), I("watch checkedKeys..."));
+    k(r, () => {
+      t.type === "checkbox" && (x.value ? d.value = D(r.value.checked) : d.value = D(r.value), I("watch checkedKeys..."));
     }, {
       immediate: !0,
       deep: !0
-    }), k(f, () => {
-      t.type === "radio" && (o.value = D(f.value), I("watch selectedKeys..."));
+    }), k(m, () => {
+      t.type === "radio" && (d.value = D(m.value), I("watch selectedKeys..."));
     }, {
       immediate: !0,
       deep: !0
@@ -90,38 +90,38 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       t.isBuiltInRequest || (v.value = t.treeData);
     });
     const _ = () => {
-      g.value = !0;
-    }, O = () => {
-      g.value = !0;
+      E.value = !0;
     }, B = () => {
-      m("update:visible", !1);
-    }, M = () => {
-      if (!o.value.length) {
+      E.value = !0;
+    }, O = () => {
+      h("update:visible", !1), h("cancel");
+    }, F = () => {
+      if (!d.value.length) {
         W.warn("请选择部门");
         return;
       }
-      t.type === "radio" ? m("update:modelValue", {
-        [u.value.key]: f.value[0],
-        [u.value.title]: o.value[0][u.value.title]
-      }) : m("update:modelValue", o.value.map((e) => ({
+      t.type === "radio" ? h("update:modelValue", {
+        [u.value.key]: m.value[0],
+        [u.value.title]: d.value[0][u.value.title]
+      }) : h("update:modelValue", d.value.map((e) => ({
         [u.value.key]: e[u.value.key],
         [u.value.title]: e[u.value.title]
-      }))), m("update:visible", !1), I("handleConfirm ...");
-    }, F = (e) => {
-      if (g.value = !0, t.type === "radio")
-        return o.value = [], f.value = [], !1;
+      }))), h("update:visible", !1), h("confirm", d.value), I("handleConfirm ...");
+    }, M = (e) => {
+      if (E.value = !0, t.type === "radio")
+        return d.value = [], m.value = [], !1;
       if (x.value)
-        d.value.checked = d.value.checked.filter((l) => l !== e[u.value.key]);
+        r.value.checked = r.value.checked.filter((l) => l !== e[u.value.key]);
       else {
-        const l = e.parentId, i = d.value.indexOf(l);
-        i !== -1 && d.value.splice(i, 1), d.value = d.value.filter((a) => a !== e[u.value.key]), L(e.children).forEach((a) => {
-          const c = d.value.indexOf(a);
-          c !== -1 && d.value.splice(c, 1);
+        const l = e.parentId, i = r.value.indexOf(l);
+        i !== -1 && r.value.splice(i, 1), r.value = r.value.filter((a) => a !== e[u.value.key]), L(e.children).forEach((a) => {
+          const c = r.value.indexOf(a);
+          c !== -1 && r.value.splice(c, 1);
         });
       }
     }, L = (e) => {
-      const l = [], i = (r) => {
-        for (const a of r)
+      const l = [], i = (o) => {
+        for (const a of o)
           l.push(a[u.value.key]), a.children && a.children.length && i(a.children);
       };
       return i(e), l;
@@ -134,16 +134,16 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
         ...V
       },
       title: "选择部门",
-      onOnCancel: B,
-      onOnConfirm: M
+      onOnCancel: O,
+      onOnConfirm: F
     }, {
       default: () => [n("div", {
-        class: h.e("modal-content")
+        class: f.e("modal-content")
       }, [$(), j()], 2)]
     }, 8, ["modelValue", "modalProps", "onOnCancel", "onOnConfirm"])]), K = (e, l) => {
       let i;
-      for (let r = 0; r < l.length; r++) {
-        const a = l[r];
+      for (let o = 0; o < l.length; o++) {
+        const a = l[o];
         if (a.children)
           if (a.children.some((c) => c[u.value.key] === e)) {
             i = a[u.value.key];
@@ -156,8 +156,8 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
         y.value = [], p.value = "", w.value = !0;
         return;
       }
-      const l = /* @__PURE__ */ new Set(), i = (r, a) => {
-        r.forEach((c) => {
+      const l = /* @__PURE__ */ new Set(), i = (o, a) => {
+        o.forEach((c) => {
           var U;
           if ((U = c[u.value.title]) != null && U.includes(a)) {
             let S = K(c[u.value.key], v.value);
@@ -176,12 +176,12 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       const i = l.indexOf(p.value);
       if (i === -1)
         return n("span", null, [l]);
-      const r = l.substring(0, i), a = l.substring(i, i + p.value.length), c = l.substring(i + p.value.length);
-      return n("span", null, [r, n("span", {
+      const o = l.substring(0, i), a = l.substring(i, i + p.value.length), c = l.substring(i + p.value.length);
+      return n("span", null, [o, n("span", {
         style: "color: #f50; font-weight: bold"
       }, [a]), c]);
     }, $ = () => n("div", {
-      class: h.e("modal-content-left")
+      class: f.e("modal-content-left")
     }, [n(X, null, {
       default: () => [n(Y, {
         placeholder: "请输入部门名称",
@@ -194,10 +194,10 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
     }), v.value.length > 0 ? n(Z, {
       expandedKeys: y.value,
       "onUpdate:expandedKeys": (e) => y.value = e,
-      selectedKeys: f.value,
-      "onUpdate:selectedKeys": (e) => f.value = e,
-      checkedKeys: d.value,
-      "onUpdate:checkedKeys": (e) => d.value = e,
+      selectedKeys: m.value,
+      "onUpdate:selectedKeys": (e) => m.value = e,
+      checkedKeys: r.value,
+      "onUpdate:checkedKeys": (e) => r.value = e,
       checkable: t.type === "checkbox",
       checkStrictly: x.value,
       "show-icon": !0,
@@ -208,8 +208,8 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       "show-line": A.value,
       "tree-data": v.value,
       onCheck: _,
-      onSelect: O,
-      class: h.e("modal-content-left-tree")
+      onSelect: B,
+      class: f.e("modal-content-left-tree")
     }, {
       icon: (e) => T(e),
       title: G,
@@ -221,14 +221,14 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
       name: e.parentId === "0" ? "qiye" : "bumen",
       size: 16
     }, null, 8, ["name"]), j = () => n("div", {
-      class: h.e("modal-content-right")
-    }, [o.value.length > 0 ? o.value.map((e) => n("div", {
-      class: h.e("modal-content-right-item")
+      class: f.e("modal-content-right")
+    }, [d.value.length > 0 ? d.value.map((e) => n("div", {
+      class: f.e("modal-content-right-item")
     }, [n("div", {
-      class: h.e("modal-content-right-item-label")
+      class: f.e("modal-content-right-item-label")
     }, [T(e), n("span", null, [e[u.value.title]])], 2), n("div", {
-      class: h.e("modal-content-right-item-del"),
-      onClick: () => F(e)
+      class: f.e("modal-content-right-item-del"),
+      onClick: () => M(e)
     }, [n(P, {
       name: "shanchu",
       size: 16
@@ -239,16 +239,17 @@ const h = Q("dept-selector"), ve = /* @__PURE__ */ H({
     return () => {
       var e;
       return n("div", {
-        class: h.b()
-      }, [(e = E.default) != null && e.call(E) ? E.default() : n("div", null, [n(ee, {
+        class: f.b()
+      }, [(e = g.default) != null && e.call(g) ? g.default() : n("div", null, [n(ee, {
         style: "width: 100%;",
         readonly: !0,
         value: b.value,
         "onUpdate:value": (l) => b.value = l,
-        onClick: () => m("update:visible", !0)
+        onClick: () => h("update:visible", !0),
+        placeholder: "请选择部门"
       }, {
         suffix: () => n("div", {
-          onClick: () => m("update:visible", !0)
+          onClick: () => h("update:visible", !0)
         }, [n(P, {
           style: {
             cursor: "pointer"

package/dist/es/components/dept-selector/src/types.mjs

@@ -42,7 +42,9 @@ const t = {
   prefix: String
 }, l = "/security/dept/company/tree", a = {
   "update:visible": (e) => !0,
-  "update:modelValue": (e) => !0
+  "update:modelValue": (e) => !0,
+  confirm: (e) => !0,
+  cancel: () => !0
 };
 export {
   l as GET_DEPT_TREE_URL,

package/dist/es/components/pro-selector/index.mjs

@@ -1,14 +1,15 @@
 import { withInstall as r } from "../utils/install.mjs";
 import e from "./src/pro-user.mjs";
 import "./style/index.mjs";
-import { GTE_ORGTREE_URL as l, UserSelectorProps as E, selectUserContextKey as R } from "./src/types.mjs";
+import { GTE_ORGTREE_URL as l, UserSelectorProps as E, selectUserContextKey as R, userSelectorEmits as U } from "./src/types.mjs";
 import "./src/hooks/index.mjs";
 e.GTE_ORGTREE_URL = "/security/dept/user/tree";
-const m = r(e);
+const p = r(e);
 export {
   l as GTE_ORGTREE_URL,
-  m as KUserSelector,
+  p as KUserSelector,
   e as ProUserSelector,
   E as UserSelectorProps,
-  R as selectUserContextKey
+  R as selectUserContextKey,
+  U as userSelectorEmits
 };

package/dist/es/components/pro-selector/src/pro-user.mjs

@@ -1,91 +1,85 @@
-import { defineComponent as O, ref as n, provide as S, reactive as T, watch as U, nextTick as g, createVNode as l, createTextVNode as v } from "vue";
+import { defineComponent as L, ref as n, provide as O, reactive as T, watch as U, nextTick as g, createVNode as l, createTextVNode as v } from "vue";
 import "../../index.mjs";
 import { useNamespace as D } from "../../../hooks/use-namespace/index.mjs";
-import { message as w, FormItemRest as R, Input as B, Empty as x } from "ant-design-vue";
-import { selectUserContextKey as M, UserSelectorProps as z } from "./types.mjs";
-import A from "./components/org-tree.mjs";
-import K from "./components/user.mjs";
-import { KProModal as F } from "../../pro-modal/index.mjs";
+import { message as w, Input as R, Empty as x, FormItemRest as B } from "ant-design-vue";
+import { selectUserContextKey as M, userSelectorEmits as z, UserSelectorProps as A } from "./types.mjs";
+import K from "./components/org-tree.mjs";
+import F from "./components/user.mjs";
+import { KProModal as _ } from "../../pro-modal/index.mjs";
 import { KIcon as f } from "../../icon/index.mjs";
-import { KUserAvatar as _ } from "../../pro-user-avatar/index.mjs";
+import { KUserAvatar as q } from "../../pro-user-avatar/index.mjs";
 const {
   b: u
-} = D("pro-user-selector"), i = D("user-selector-extermal"), $ = /* @__PURE__ */ O({
+} = D("pro-user-selector"), i = D("user-selector-extermal"), ee = /* @__PURE__ */ L({
   name: "ProUserSelector",
-  props: z,
-  emits: {
-    "update:visible": (a) => !0,
-    "update:modelValue": (a) => !0,
-    "delete-user": (a) => !0,
-    confirm: (a) => !0,
-    cancel: () => !0
-  },
-  setup(a, {
+  props: A,
+  emits: z,
+  setup(t, {
     emit: s,
     slots: p,
-    expose: V,
-    attrs: b
+    expose: E,
+    attrs: V
   }) {
     const d = n(""), r = n([]), o = n(), c = n(null);
-    S(M, T({
-      maxCount: a.maxCount,
-      http: a.http,
-      isBuiltInRequest: a.isBuiltInRequest,
-      prefix: a.prefix,
-      initData: a.initData
+    O(M, T({
+      maxCount: t.maxCount,
+      http: t.http,
+      isBuiltInRequest: t.isBuiltInRequest,
+      prefix: t.prefix,
+      initData: t.initData
     }));
-    const h = n(a.modelValue || []), m = n(!1);
-    U(() => a.modelValue, (e) => {
+    const h = n(t.modelValue || []), m = n(!1);
+    U(() => t.modelValue, (e) => {
       m.value ? m.value = !1 : (h.value = JSON.parse(JSON.stringify(e)), g(() => {
-        E(h.value);
+        k(h.value);
       }));
     }, {
       deep: !0,
       immediate: !0
-    }), U(r, (e, t) => {
-      e.length > t.length && g(() => {
+    }), U(r, (e, a) => {
+      e.length > a.length && g(() => {
         c.value && (c.value.scrollTop = c.value.scrollHeight);
       });
     }, {
       deep: !0
     });
-    async function E(e) {
+    async function k(e) {
       if (o.value) {
-        const t = await o.value.dataLoadPromise;
-        o.value.getInitData(e, t);
+        const a = await o.value.dataLoadPromise;
+        o.value.getInitData(e, a);
       }
     }
-    const k = (e) => {
-      var t;
-      r.value = r.value.filter((L) => L.id !== e), (t = o.value) == null || t.deleteDeptUser(e);
-    }, I = () => {
+    const I = (e) => {
+      var a;
+      r.value = r.value.filter((y) => y.id !== e), (a = o.value) == null || a.deleteDeptUser(e);
+    }, b = () => {
       s("update:visible", !1), s("cancel");
     }, C = (e) => {
-      s("update:modelValue", a.modelValue.filter((t) => t.id !== e));
+      s("update:modelValue", t.modelValue.filter((a) => a.id !== e));
     }, N = () => {
       if (r.value.length === 0) {
         w.warn("请选择用户");
         return;
       }
-      const e = r.value.map((t) => ({
-        id: t.id,
-        realName: t.realName || "",
-        avatar: t.avatar
+      const e = r.value.map((a) => ({
+        id: a.id,
+        realName: a.realName || "",
+        avatar: a.avatar
       }));
       s("update:visible", !1), m.value = !0, s("update:modelValue", e), s("confirm", e);
     };
-    V({
+    E({
       deleteCheckedUser: C
     });
-    const P = () => l(F, {
-      modelValue: a.visible,
+    const P = () => l(_, {
+      modelValue: t.visible,
       title: "选择联系人",
       modalProps: {
         cancelText: "取消",
         okText: "确定",
-        ...b
+        ...V
       },
-      onOnCancel: () => I(),
+      onOnCancel: () => b(),
       onOnConfirm: () => N()
     }, {
       default: () => [l("div", {
@@ -94,20 +88,18 @@ const {
         class: u("content-left")
       }, [l("div", {
         style: "padding: 16px 16px 0 16px"
-      }, [l(R, null, {
-        default: () => [l(B, {
-          value: d.value,
-          "onUpdate:value": (e) => d.value = e,
-          size: "small",
-          placeholder: "搜索",
-          allowClear: !0
-        }, {
-          prefix: () => l(f, {
-            name: "search"
-          }, null),
-          _: 1
-        }, 8, ["value", "onUpdate:value", "allowClear"])]
-      })]), l(A, {
+      }, [l(R, {
+        value: d.value,
+        "onUpdate:value": (e) => d.value = e,
+        size: "small",
+        placeholder: "搜索",
+        allowClear: !0
+      }, {
+        prefix: () => l(f, {
+          name: "search"
+        }, null),
+        _: 1
+      }, 8, ["value", "onUpdate:value", "allowClear"])]), l(K, {
         ref: o,
         selectUserList: r.value,
         "onUpdate:selectUserList": (e) => r.value = e,
@@ -116,50 +108,52 @@ const {
         class: u("content-right")
       }, [l("div", {
         class: u("content-right-title")
-      }, [v("已选:"), r.value.length, v("/"), a.maxCount, v("人")], 2), l("div", {
+      }, [v("已选:"), r.value.length, v("/"), t.maxCount, v("人")], 2), l("div", {
         class: "select-user-list",
         ref: c
       }, [l("div", {
         class: u("user-list")
-      }, [r.value.length > 0 ? r.value.map((e) => l(K, {
+      }, [r.value.length > 0 ? r.value.map((e) => l(F, {
         key: e.id,
         userInfo: e,
         isChecked: !1,
         isDelete: !0,
-        "onDelete-user": k
+        "onDelete-user": I
       }, null, 8, ["userInfo", "isDelete", "onDelete-user"])) : l(x, {
         image: x.PRESENTED_IMAGE_SIMPLE,
         description: "暂无数据"
       }, null, 8, ["image"])], 2)], 512)], 2)], 2)]
-    }, 8, ["modelValue", "modalProps", "onOnCancel", "onOnConfirm"]), y = () => l("div", {
-      class: i.b()
-    }, [p.default ? p.default() : l("div", {
-      class: i.b("list")
-    }, [l("div", {
-      class: i.b("icon"),
-      onClick: () => s("update:visible", !0)
-    }, [l(f, {
-      name: "plus",
-      size: 20,
-      color: "#409eff"
-    }, null)], 10, ["onClick"]), a.modelValue.map((e) => l("div", {
-      class: i.b("item")
-    }, [l(_, {
-      name: e.realName,
-      avatar: e.avatar,
-      size: "small"
-    }, null, 8, ["name", "avatar"]), l("span", {
-      class: i.be("item", "name")
-    }, [e.realName], 2), l("div", {
-      onClick: () => C(e.id)
-    }, [l(f, {
-      name: "shanchu",
-      size: 18,
-      color: "#646a73"
-    }, null)], 8, ["onClick"])], 2))], 2), P()], 2);
-    return () => y();
+    }, 8, ["modelValue", "modalProps", "onOnCancel", "onOnConfirm"]), S = () => l(B, null, {
+      default: () => [l("div", {
+        class: i.b()
+      }, [p.default ? p.default() : l("div", {
+        class: i.b("list")
+      }, [l("div", {
+        class: i.b("icon"),
+        onClick: () => s("update:visible", !0)
+      }, [l(f, {
+        name: "plus",
+        size: 20,
+        color: "#409eff"
+      }, null)], 10, ["onClick"]), t.modelValue.map((e) => l("div", {
+        class: i.b("item")
+      }, [l(q, {
+        name: e.realName,
+        avatar: e.avatar,
+        size: "small"
+      }, null, 8, ["name", "avatar"]), l("span", {
+        class: i.be("item", "name")
+      }, [e.realName], 2), l("div", {
+        onClick: () => C(e.id)
+      }, [l(f, {
+        name: "shanchu",
+        size: 18,
+        color: "#646a73"
+      }, null)], 8, ["onClick"])], 2))], 2), P()], 2)]
+    });
+    return () => S();
   }
 });
 export {
-  $ as default
+  ee as default
 };

package/dist/es/components/pro-selector/src/types.mjs

@@ -1,4 +1,4 @@
-const e = Symbol("selectUserContextKey"), t = {
+const t = Symbol("selectUserContextKey"), l = {
   visible: {
     type: Boolean,
     default: !1
@@ -34,9 +34,16 @@ const e = Symbol("selectUserContextKey"), t = {
     default: !1
   },
   prefix: String
-}, l = "/security/dept/user/tree";
+}, u = "/security/dept/user/tree", r = {
+  "update:visible": (e) => !0,
+  "update:modelValue": (e) => !0,
+  "delete-user": (e) => !0,
+  confirm: (e) => !0,
+  cancel: () => !0
+};
 export {
-  l as GTE_ORGTREE_URL,
-  t as UserSelectorProps,
-  e as selectUserContextKey
+  u as GTE_ORGTREE_URL,
+  l as UserSelectorProps,
+  t as selectUserContextKey,
+  r as userSelectorEmits
 };