@king-one/antdv 1.2.16 → 1.2.18

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @king-one/antdv
 
+## 1.2.18
+
+### Patch Changes
+
+- 修复部门选择器字段取值问题
+
+## 1.2.17
+
+### Patch Changes
+
+- 优化部门,用户,角色选择器,增加内部求情配置
+
 ## 1.2.16
 
 ### Patch Changes

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

@@ -1,11 +1,12 @@
 import { withInstall as t } from "../utils/install.mjs";
 import e from "./src/dept.mjs";
 import "./src/style/index.mjs";
-import { deptSelectorEmits as s, deptSelectorProps as c } from "./src/types.mjs";
+import { GET_DEPT_TREE_URL as s, deptSelectorEmits as E, deptSelectorProps as c } from "./src/types.mjs";
 const m = t(e);
 export {
+  s as GET_DEPT_TREE_URL,
   m as KDeptSelector,
   m as default,
-  s as deptSelectorEmits,
+  E as deptSelectorEmits,
   c as deptSelectorProps
 };

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

@@ -1,238 +1,249 @@
-import { defineComponent as H, ref as r, watch as y, createVNode as a, Fragment as J } from "vue";
+import { defineComponent as H, ref as o, watch as k, createVNode as n, Fragment as J } from "vue";
 import { useNamespace as Q } from "../../../hooks/use-namespace/index.mjs";
 import "../../index.mjs";
-import { InputSearch as W, Tree as X, Empty as K, Input as Y } from "ant-design-vue";
-import { deptSelectorEmits as Z, deptSelectorProps as $ } from "./types.mjs";
-import { KProModal as ee } from "../../pro-modal/index.mjs";
-import { KIcon as I } from "../../icon/index.mjs";
-const v = Q("dept-selector"), de = /* @__PURE__ */ H({
+import { InputSearch as W, Tree as X, Empty as C, Input as Y } from "ant-design-vue";
+import { GET_DEPT_TREE_URL as Z, deptSelectorEmits as ee, deptSelectorProps as le } from "./types.mjs";
+import { KProModal as te } from "../../pro-modal/index.mjs";
+import { KIcon as P } from "../../icon/index.mjs";
+const h = Q("dept-selector"), oe = /* @__PURE__ */ H({
   name: "KDeptSelector",
-  props: $,
-  emits: Z,
-  setup(u, {
-    emit: f,
-    attrs: A,
-    slots: k
+  props: le,
+  emits: ee,
+  setup(t, {
+    emit: m,
+    attrs: V,
+    slots: g
   }) {
-    const g = r(!0), C = r(!0), m = r([]), h = r([]), c = r([]), U = r(!1), O = r({
-      title: "label",
-      key: "id",
-      children: "children"
-    }), E = r(""), o = r([]), s = r(u.treeData), b = r(!1), p = r(""), N = () => {
-      if (u.type === "checkbox") {
-        if (!Array.isArray(u.modelValue)) return;
-        const e = u.modelValue.map((l) => l.value);
-        g.value ? c.value = {
+    const x = o(!0), N = o(!0), y = o([]), f = o([]), d = o([]), A = o(!1), u = o(t.isBuiltInRequest ? {
+      children: "children",
+      title: "deptName",
+      key: "id"
+    } : t.fieldNames), b = o(""), s = o([]), v = o(t.treeData), E = o(!1), p = o("");
+    if (t.isBuiltInRequest) {
+      if (!t.http)
+        throw new Error("请传入http实例");
+      t.http.get(`${t.prefix}${Z}`).then((e) => {
+        e.status === 0 && (v.value = e.data);
+      });
+    }
+    const w = () => {
+      if (t.type === "checkbox") {
+        if (!Array.isArray(t.modelValue)) return;
+        const e = t.modelValue.map((l) => l[u.value.key]);
+        x.value ? d.value = {
           checked: e,
           halfChecked: []
-        } : c.value = e, m.value = e;
+        } : d.value = e, y.value = e;
       } else {
-        if (Array.isArray(u.modelValue)) return;
-        const e = u.modelValue.value;
-        h.value = [e], m.value = [e];
-      }
-    }, w = () => {
-      if (b.value) {
-        b.value = !1;
-        return;
+        if (Array.isArray(t.modelValue)) return;
+        const e = t.modelValue[u.value.key];
+        f.value = [e], y.value = [e];
       }
-      u.type === "radio" ? E.value = o.value[0].label : E.value = o.value.map((e) => e.label).join(",");
+    }, I = (e) => {
+      if (E.value)
+        return E.value = !1;
+      t.type === "radio" ? s.value.length > 0 && (b.value = s.value[0][u.value.title] || "") : b.value = s.value.map((l) => l[u.value.title]).join(",");
     };
-    y(() => u.visible, () => {
-      u.visible && N();
+    k(() => t.visible, () => {
+      t.visible && w();
     }, {
       immediate: !0
-    }), y(() => u.modelValue, () => {
-      s.value.length > 0 && N();
-    }, {
-      immediate: !0,
-      deep: !0
-    }), y(s, () => {
-      s.value.length > 0 && N();
+    }), k(() => t.modelValue, () => {
+      v.value.length > 0 && w();
     }, {
       immediate: !0,
       deep: !0
-    }), y(c, () => {
-      u.type === "checkbox" && (g.value ? o.value = D(c.value.checked) : o.value = D(c.value), w());
+    }), k(v, () => {
+      v.value.length > 0 && w();
     }, {
       immediate: !0,
       deep: !0
-    }), y(h, () => {
-      u.type === "radio" && (o.value = D(h.value), w());
-    }, {
-      immediate: !0,
-      deep: !0
-    }), y(() => u.treeData, () => {
-      s.value = u.treeData;
     });
-    function M(e) {
-      const l = (n, d) => {
-        for (const t of n) {
-          if (t.id === d)
-            return t;
-          if (t.children && t.children.length) {
-            const i = l(t.children, d);
-            if (i) return i;
+    function _(e) {
+      const l = (i, r) => {
+        for (const a of i) {
+          if (a[u.value.key] === r)
+            return a;
+          if (a.children && a.children.length) {
+            const c = l(a.children, r);
+            if (c) return c;
           }
         }
         return null;
       };
-      return l(s.value, e);
+      return l(v.value, e);
     }
     function D(e) {
-      return e.map((l) => M(l)).filter(Boolean);
+      return e ? e.map((l) => _(l)).filter(Boolean) : [];
     }
-    const T = () => {
-      b.value = !0;
-    }, _ = () => {
-      b.value = !0;
-    }, F = () => {
-      f("update:visible", !1);
-    }, L = () => {
-      u.type === "radio" ? f("update:modelValue", {
-        value: h.value[0],
-        label: o.value[0].label
-      }) : f("update:modelValue", o.value.map((e) => ({
-        value: e.id,
-        label: e.label
-      }))), f("update:visible", !1), w();
-    }, z = (e) => {
-      if (b.value = !0, u.type === "radio")
-        return o.value = [], h.value = [], !1;
-      if (g.value)
-        c.value.checked = c.value.checked.filter((l) => l !== e.id);
+    k(d, () => {
+      t.type === "checkbox" && (x.value ? s.value = D(d.value.checked) : s.value = D(d.value), I("watch checkedKeys..."));
+    }, {
+      immediate: !0,
+      deep: !0
+    }), k(f, () => {
+      t.type === "radio" && (s.value = D(f.value), I("watch selectedKeys..."));
+    }, {
+      immediate: !0,
+      deep: !0
+    }), k(() => t.treeData, () => {
+      t.isBuiltInRequest || (v.value = t.treeData);
+    });
+    const R = () => {
+      E.value = !0;
+    }, O = () => {
+      E.value = !0;
+    }, B = () => {
+      m("update:visible", !1);
+    }, M = () => {
+      t.type === "radio" ? m("update:modelValue", {
+        [u.value.key]: f.value[0],
+        [u.value.title]: s.value[0][u.value.title]
+      }) : m("update:modelValue", s.value.map((e) => ({
+        [u.value.key]: e[u.value.key],
+        [u.value.title]: e[u.value.title]
+      }))), m("update:visible", !1), I("handleConfirm ...");
+    }, L = (e) => {
+      if (E.value = !0, t.type === "radio")
+        return s.value = [], f.value = [], !1;
+      if (x.value)
+        d.value.checked = d.value.checked.filter((l) => l !== e[u.value.key]);
       else {
-        const l = e.parentId, n = c.value.indexOf(l);
-        n !== -1 && c.value.splice(n, 1), c.value = c.value.filter((t) => t !== e.id), B(e.children).forEach((t) => {
-          const i = c.value.indexOf(t);
-          i !== -1 && c.value.splice(i, 1);
+        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]), q(e.children).forEach((a) => {
+          const c = d.value.indexOf(a);
+          c !== -1 && d.value.splice(c, 1);
         });
       }
-    }, B = (e) => {
-      const l = [], n = (d) => {
-        for (const t of d)
-          l.push(t.id), t.children && t.children.length && n(t.children);
+    }, q = (e) => {
+      const l = [], i = (r) => {
+        for (const a of r)
+          l.push(a[u.value.key]), a.children && a.children.length && i(a.children);
       };
-      return n(e), l;
-    }, R = () => a(J, null, [a(ee, {
-      modelValue: u.visible,
+      return i(e), l;
+    }, F = () => n(J, null, [n(te, {
+      modelValue: t.visible,
       modalProps: {
         cancelText: "取消",
         okText: "确定",
         width: "700px",
-        ...A
+        ...V
       },
       title: "选择部门",
-      onOnCancel: F,
-      onOnConfirm: L
+      onOnCancel: B,
+      onOnConfirm: M
     }, {
-      default: () => [a("div", {
-        class: v.e("modal-content")
-      }, [j(), q()], 2)]
-    }, 8, ["modelValue", "modalProps", "onOnCancel", "onOnConfirm"])]), x = (e, l) => {
-      let n;
-      for (let d = 0; d < l.length; d++) {
-        const t = l[d];
-        t.children && (t.children.some((i) => i.id === e) ? n = t.id : x(e, t.children) && (n = x(e, t.children)));
+      default: () => [n("div", {
+        class: h.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];
+        if (a.children)
+          if (a.children.some((c) => c[u.value.key] === e)) {
+            i = a[u.value.key];
+            break;
+          } else K(e, a.children) && (i = K(e, a.children));
       }
-      return n;
-    }, G = (e) => {
+      return i;
+    }, z = (e) => {
       if (!e.trim()) {
-        m.value = [], p.value = "", C.value = !0;
+        y.value = [], p.value = "", N.value = !0;
         return;
       }
-      const l = /* @__PURE__ */ new Set(), n = (d, t) => {
-        d.forEach((i) => {
-          var V;
-          if ((V = i.label) != null && V.includes(t)) {
-            let S = x(i.id, s.value);
+      const l = /* @__PURE__ */ new Set(), i = (r, a) => {
+        r.forEach((c) => {
+          var U;
+          if ((U = c[u.value.title]) != null && U.includes(a)) {
+            let S = K(c[u.value.key], v.value);
             for (; S; )
-              l.add(S), S = x(S, s.value);
-            l.add(i.id);
+              l.add(S), S = K(S, v.value);
+            l.add(c[u.value.key]);
           }
-          i.children && i.children.length > 0 && n(i.children, t);
+          c.children && c.children.length > 0 && i(c.children, a);
         });
       };
-      n(s.value, e), m.value = Array.from(l), p.value = e, C.value = !0;
-    }, j = () => a("div", {
-      class: v.e("modal-content-left")
-    }, [a(W, {
+      i(v.value, e), y.value = Array.from(l), p.value = e, N.value = !0;
+    }, G = (e) => {
+      const l = e[u.value.title] || "";
+      if (!p.value)
+        return n("span", null, [l]);
+      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", {
+        style: "color: #f50; font-weight: bold"
+      }, [a]), c]);
+    }, $ = () => n("div", {
+      class: h.e("modal-content-left")
+    }, [n(W, {
       placeholder: "请输入部门名称",
-      onSearch: G,
+      onSearch: z,
       style: {
         marginBottom: "10px"
       },
       allowClear: !0
-    }, null, 8, ["onSearch", "allowClear"]), s.value.length > 0 ? a(X, {
-      expandedKeys: m.value,
-      "onUpdate:expandedKeys": (e) => m.value = e,
-      selectedKeys: h.value,
-      "onUpdate:selectedKeys": (e) => h.value = e,
-      checkedKeys: c.value,
-      "onUpdate:checkedKeys": (e) => c.value = e,
-      checkable: u.type === "checkbox",
-      checkStrictly: g.value,
+    }, null, 8, ["onSearch", "allowClear"]), v.value.length > 0 ? n(X, {
+      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,
+      checkable: t.type === "checkbox",
+      checkStrictly: x.value,
       "show-icon": !0,
-      autoExpandParent: C.value,
+      autoExpandParent: N.value,
       blockNode: !0,
       defaultExpandAll: !0,
-      fieldNames: O.value,
-      "show-line": U.value,
-      "tree-data": s.value,
-      onCheck: T,
-      onSelect: _,
-      class: v.e("modal-content-left-tree")
+      fieldNames: u.value,
+      "show-line": A.value,
+      "tree-data": v.value,
+      onCheck: R,
+      onSelect: O,
+      class: h.e("modal-content-left-tree")
     }, {
-      icon: (e) => P(e),
-      title: (e) => {
-        const l = e.label || "";
-        if (!p.value)
-          return a("span", null, [l]);
-        const n = l.indexOf(p.value);
-        if (n === -1)
-          return a("span", null, [l]);
-        const d = l.substring(0, n), t = l.substring(n, n + p.value.length), i = l.substring(n + p.value.length);
-        return a("span", null, [d, a("span", {
-          style: "color: #f50; font-weight: bold"
-        }, [t]), i]);
-      },
+      icon: (e) => T(e),
+      title: G,
       _: 1
-    }, 8, ["expandedKeys", "onUpdate:expandedKeys", "selectedKeys", "onUpdate:selectedKeys", "checkedKeys", "onUpdate:checkedKeys", "checkable", "checkStrictly", "show-icon", "autoExpandParent", "blockNode", "defaultExpandAll", "fieldNames", "show-line", "tree-data", "onCheck", "onSelect", "class"]) : a(K, {
+    }, 8, ["expandedKeys", "onUpdate:expandedKeys", "selectedKeys", "onUpdate:selectedKeys", "checkedKeys", "onUpdate:checkedKeys", "checkable", "checkStrictly", "show-icon", "autoExpandParent", "blockNode", "defaultExpandAll", "fieldNames", "show-line", "tree-data", "onCheck", "onSelect", "class"]) : n(C, {
       description: "暂无数据",
-      image: K.PRESENTED_IMAGE_SIMPLE
-    }, null, 8, ["image"])], 2), P = (e) => a(I, {
+      image: C.PRESENTED_IMAGE_SIMPLE
+    }, null, 8, ["image"])], 2), T = (e) => n(P, {
       name: e.parentId === "0" ? "qiye" : "bumen",
       size: 16
-    }, null, 8, ["name"]), q = () => a("div", {
-      class: v.e("modal-content-right")
-    }, [o.value.length > 0 ? o.value.map((e) => a("div", {
-      class: v.e("modal-content-right-item")
-    }, [a("div", {
-      class: v.e("modal-content-right-item-label")
-    }, [P(e), a("span", null, [e.label])], 2), a("div", {
-      class: v.e("modal-content-right-item-del"),
-      onClick: () => z(e)
-    }, [a(I, {
+    }, null, 8, ["name"]), j = () => n("div", {
+      class: h.e("modal-content-right")
+    }, [s.value.length > 0 ? s.value.map((e) => n("div", {
+      class: h.e("modal-content-right-item")
+    }, [n("div", {
+      class: h.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: () => L(e)
+    }, [n(P, {
       name: "shanchu",
       size: 16
-    }, null)], 10, ["onClick"])], 2)) : a(K, {
+    }, null)], 10, ["onClick"])], 2)) : n(C, {
       description: "暂无数据",
-      image: K.PRESENTED_IMAGE_SIMPLE
+      image: C.PRESENTED_IMAGE_SIMPLE
     }, null, 8, ["image"])], 2);
     return () => {
       var e;
-      return a("div", {
-        class: v.b()
-      }, [(e = k.default) != null && e.call(k) ? k.default() : a("div", null, [a(Y, {
+      return n("div", {
+        class: h.b()
+      }, [(e = g.default) != null && e.call(g) ? g.default() : n("div", null, [n(Y, {
         style: "width: 100%;",
         readonly: !0,
-        value: E.value,
-        "onUpdate:value": (l) => E.value = l,
-        onClick: () => f("update:visible", !0)
+        value: b.value,
+        "onUpdate:value": (l) => b.value = l,
+        onClick: () => m("update:visible", !0)
       }, {
-        suffix: () => a("div", {
-          onClick: () => f("update:visible", !0)
-        }, [a(I, {
+        suffix: () => n("div", {
+          onClick: () => m("update:visible", !0)
+        }, [n(P, {
           style: {
             cursor: "pointer"
           },
@@ -241,10 +252,10 @@ const v = Q("dept-selector"), de = /* @__PURE__ */ H({
           color: "#606266"
         }, null)], 8, ["onClick"]),
         _: 1
-      }, 8, ["readonly", "value", "onUpdate:value", "onClick"])]), R()], 2);
+      }, 8, ["readonly", "value", "onUpdate:value", "onClick"])]), F()], 2);
     };
   }
 });
 export {
-  de as default
+  oe as default
 };

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

@@ -11,12 +11,41 @@ const t = {
   treeData: {
     type: Array,
     default: () => []
-  }
-}, a = {
+  },
+  fieldNames: {
+    type: Object,
+    default: () => ({
+      title: "label",
+      key: "id",
+      children: "children"
+    })
+  },
+  /**
+   * 是否使用内置请求，内置请求会走用户中心即
+   * ${prefix}security/company/role/page?pageNum=1&pageSize=1000
+   */
+  isBuiltInRequest: {
+    type: Boolean,
+    default: !1
+  },
+  /**
+   * axios 实例
+   */
+  http: {
+    type: [Object, Function],
+    default: () => {
+    }
+  },
+  /**
+   * 请求前缀，如 qy-user-service
+   */
+  prefix: String
+}, l = "/security/dept/company/tree", a = {
   "update:visible": (e) => !0,
   "update:modelValue": (e) => !0
 };
 export {
+  l as GET_DEPT_TREE_URL,
   a as deptSelectorEmits,
   t as deptSelectorProps
 };

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

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