@king-one/antdv 2.6.0 → 2.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @king-one/antdv
 
+## 2.6.2
+
+### Patch Changes
+
+- 解决角色选择器回显问题,根据 value 去匹配对应的 label
+
+## 2.6.1
+
+### Patch Changes
+
+- 动态 tag 组件增加 size 属性
+
 ## 2.6.0
 
 ### Minor Changes

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

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

package/dist/es/components/pro-dynamic-tags/src/index.vue.mjs

@@ -1,7 +1,7 @@
 import o from "./index.vue2.mjs";
 import "./index.vue3.mjs";
-import r from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const p = /* @__PURE__ */ r(o, [["__scopeId", "data-v-60156660"]]);
+import c from "../../../_virtual/_plugin-vue_export-helper.mjs";
+const m = /* @__PURE__ */ c(o, [["__scopeId", "data-v-c1cc89fd"]]);
 export {
-  p as default
+  m as default
 };