@pubinfo/module-rbac 2.0.0-beta.10 → 2.0.0-beta.12

package/dist/{useAppAndResource-D_b19V4t.js → useAppAndResource-BQ6GznA5.js}

@@ -1,5 +1,5 @@
-import "./request-DQLgc7lT.js";
-import { e as M, f as b } from "./ziyuanjiekou-DhrAbneq.js";
+import "./index-BX1CIagK.js";
+import { e as M, f as b } from "./ziyuanjiekou-DMJynAKN.js";
 import { R as D } from "./enum-CTUzwCYG.js";
 import { ref as u, computed as g } from "vue";
 function P(p) {

package/dist/{xitongpeizhifuwu-C1Vm-W1B.js → xitongpeizhifuwu-DtEPa1iK.js}

@@ -1,4 +1,4 @@
-import { b as o } from "./request-DQLgc7lT.js";
+import { i as o } from "./index-BX1CIagK.js";
 function s(t, i) {
   return o.Post("/sysconfig/addOrEidtSysThemeStyleConfig", t, {
     headers: {

package/dist/{zidianfuwu-yCWHhOfO.js → zidianfuwu-BUtPqzzu.js}

@@ -1,4 +1,4 @@
-import { b as e } from "./request-DQLgc7lT.js";
+import { i as e } from "./index-BX1CIagK.js";
 function s(t, i) {
   const { id: n, ...o } = t;
   return e.Delete(

package/dist/{ziyuanjiekou-DhrAbneq.js → ziyuanjiekou-DMJynAKN.js}

@@ -1,4 +1,4 @@
-import { b as r } from "./request-DQLgc7lT.js";
+import { i as r } from "./index-BX1CIagK.js";
 function t(e, o) {
   return r.Post("/rbac/resource/addResource", e, {
     headers: {

package/dist/{zuzhijiaosebiaokongzhiqi-B1g74RqL.js → zuzhijiaosebiaokongzhiqi-Bf05-XJX.js}

@@ -1,4 +1,4 @@
-import { b as r } from "./request-DQLgc7lT.js";
+import { i as r } from "./index-BX1CIagK.js";
 function t(o, e) {
   return r.Get("/rbac/orgRole/getByOrgId", {
     params: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-rbac",
   "type": "module",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.12",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -18,13 +18,13 @@
   ],
   "peerDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/headlessui": "^1.5.1",
     "@pubinfo/pro-components": "^1.7.0",
     "alova": "^3.2.9",
     "ant-design-vue": "^4.2.6",
-    "pubinfo": "2.0.0-beta.10"
+    "pubinfo": "2.0.0-beta.12"
   },
   "dependencies": {
+    "@pubinfo/headlessui": "^1.5.1",
     "@vueuse/core": "^12.7.0",
     "dayjs": "^1.11.13",
     "lodash-es": "^4.17.21",
@@ -33,7 +33,6 @@
   },
   "devDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/headlessui": "^1.5.1",
     "@pubinfo/openapi": "^0.8.4",
     "@pubinfo/preset-openapi": "^0.8.4",
     "@pubinfo/pro-components": "^1.7.0",
@@ -42,7 +41,7 @@
     "ant-design-vue": "^4.2.6",
     "type-fest": "^4.36.0",
     "vite-plugin-dts": "^4.5.3",
-    "pubinfo": "2.0.0-beta.10"
+    "pubinfo": "2.0.0-beta.12"
   },
   "scripts": {
     "dev": "pubinfo build -w",

package/src/components/OrgUserSelector/index.ts

@@ -14,6 +14,11 @@ export function selectUser(props: UserSelectorProps & { modelValue?: UserModelVa
   createAppElement(UserSelector, props);
 }
 
+export {
+  OrgSelector,
+  UserSelector,
+};
+
 function createAppElement(
   component: typeof OrgSelector | typeof UserSelector,
   props: Parameters<typeof selectUser | typeof selectOrg>[0],

package/src/index.ts

@@ -27,5 +27,6 @@ export function rbac(options: RbacOptions = {}): ModuleOptions {
   };
 }
 
+export * from './components/OrgUserSelector';
 export * from './interface';
 export default rbac;

package/dist/OrgSelector.vue_vue_type_script_setup_true_lang-BcL0IFuA.js

@@ -1,567 +0,0 @@
-import { defineComponent as B, mergeModels as V, useAttrs as M, useModel as N, ref as k, watch as $, createElementBlock as C, openBlock as w, createCommentVNode as q, createVNode as P, renderSlot as A, unref as y, mergeProps as z, withCtx as O, isRef as x } from "vue";
-import { OrgProvider as E, ContentSelector as W } from "@pubinfo/headlessui";
-import { message as R, Form as X, Modal as H } from "ant-design-vue";
-import { b as p } from "./request-DQLgc7lT.js";
-import { e as J, f as K, b as Q, h as Y } from "./zuzhijiekou-PeZuFtCO.js";
-import "@pubinfo/headlessui/style.css";
-import { u as Z } from "./index-Dm4sOX43.js";
-function ie(e, n) {
-  return p.Post("/rbac/user/grantUserRoleAndDatPermission", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-function de(e, n) {
-  return p.Get("/rbac/user/info", {
-    params: {
-      ...e
-    }
-  });
-}
-function ce(e, n) {
-  return p.Post("/rbac/user/pubUserAdd", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-function pe(e, n) {
-  return p.Put(
-    "/rbac/user/resetPassword",
-    {},
-    {
-      params: {
-        ...e
-      }
-    }
-  );
-}
-function _(e, n) {
-  return p.Post("/rbac/user/userAndOrgList", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function me(e, n) {
-  return p.Get("/rbac/user/userDelete", {
-    params: {
-      ...e
-    }
-  });
-}
-function ee(e, n) {
-  return p.Post("/rbac/user/userForMultiOrgPage", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function fe(e, n) {
-  return p.Post("/rbac/user/userPage", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-function ge(e, n) {
-  return p.Post("/rbac/user/userUpdate-v2", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-function T(e, n) {
-  return p.Post("/rbac/collect/add", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function h(e, n) {
-  return p.Post("/rbac/collect/findPage", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function j(e, n) {
-  return p.Post("/rbac/collect/removeCollect", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function S(e, n) {
-  return p.Post("/rbac/used/addBatch", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function D(e, n) {
-  return p.Post("/rbac/used/findPage", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function be(e, n) {
-  const { id: t, ...s } = e;
-  return p.Delete(
-    `/group/delete/${t}`,
-    {},
-    {
-      params: { ...s }
-    }
-  );
-}
-function F(e, n) {
-  const { id: t, ...s } = e;
-  return p.Get(`/group/detail/${t}`, {
-    params: {
-      ...s
-    },
-    ...n || {}
-  });
-}
-function G(e, n) {
-  return p.Post("/group/findPage", e, {
-    headers: {
-      "Content-Type": "application/json"
-    },
-    ...n || {}
-  });
-}
-function ye(e, n) {
-  return p.Post("/group/list", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-function ve(e, n) {
-  return p.Post("/group/saveOrUpdate", e, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-const i = {
-  value: "orgId",
-  label: "orgName",
-  favorite: "collect",
-  info: "fullName"
-}, c = {
-  value: "orgUserId",
-  label: "userName",
-  favorite: "collect",
-  info: "fullName"
-};
-function I(e = "", n = "") {
-  return `${e}_${n}`;
-}
-function U(e) {
-  const [n, t] = e == null ? void 0 : e.split("_");
-  return {
-    orgId: n,
-    userId: t
-  };
-}
-function m(e) {
-  return e ? {
-    headers: { "X-ResourceMark": e }
-  } : {};
-}
-function ae({ auth: e, filter: n }) {
-  return {
-    // 回显选中项
-    async getSelectedData(t) {
-      var r;
-      const s = await Y(
-        t.map((a) => a[i.value]),
-        m(e)
-      );
-      return ((r = s == null ? void 0 : s.data) == null ? void 0 : r.map((a) => ({
-        ...a,
-        [i.value]: a.id,
-        [i.label]: a.name,
-        [i.info]: a.fullName
-      }))) ?? [];
-    },
-    // 添加到最近常用
-    async addRecentlyUsed(t) {
-      await S(t.map((s) => ({
-        type: "1",
-        orgId: s[i.value],
-        orgName: s[i.label]
-      })), m(e));
-    },
-    // 最近常用
-    async recentlyUsed({ search: t, current: s }) {
-      var a, o;
-      return {
-        total: 20,
-        data: ((o = (a = (await D({
-          type: "1",
-          orgName: t,
-          currentPage: s,
-          pageSize: 20,
-          showIsCollect: !0
-        }, m(e))).data) == null ? void 0 : a.records) == null ? void 0 : o.map((l) => ({
-          ...l,
-          [i.value]: l.orgId,
-          [i.label]: l.orgName,
-          [i.info]: l.fullOrgName
-        }))) ?? []
-      };
-    },
-    // 收藏
-    async favorites({ search: t, current: s, pageSize: r }) {
-      var o, l, d;
-      const a = await h({
-        type: "1",
-        orgName: t,
-        currentPage: s,
-        pageSize: r
-      }, m(e));
-      return {
-        total: ((o = a.data) == null ? void 0 : o.total) ?? 0,
-        data: ((d = (l = a.data) == null ? void 0 : l.records) == null ? void 0 : d.map((u) => ({
-          ...u,
-          [i.value]: u.orgId,
-          [i.label]: u.orgName,
-          [i.info]: u.fullOrgName
-        }))) ?? []
-      };
-    },
-    // 添加取消收藏
-    async favoriteToggle({ favorite: t, record: s }) {
-      (await (t ? T : j)({ type: "1", orgId: s == null ? void 0 : s[i.value] }, m(e))).success && R.success(t ? "收藏成功" : "取消收藏成功");
-    },
-    // 群组列表
-    async groups({ search: t, current: s, pageSize: r }) {
-      var o, l, d;
-      const a = await G({
-        type: "1",
-        name: t,
-        currentPage: s,
-        pageSize: r
-      });
-      return {
-        total: ((o = a.data) == null ? void 0 : o.total) ?? 0,
-        data: ((d = (l = a.data) == null ? void 0 : l.records) == null ? void 0 : d.map((u) => ({
-          ...u,
-          [i.value]: u.id,
-          [i.label]: u.name
-        }))) ?? []
-      };
-    },
-    // 群组数据
-    async groupData({ node: t }) {
-      var r, a;
-      return ((a = (r = (await F({ id: t == null ? void 0 : t.id, showIsCollect: !0 }, m(e))).data) == null ? void 0 : r.pubGroupMemberList) == null ? void 0 : a.map((o) => ({
-        ...o,
-        [i.value]: o.orgId,
-        [i.label]: o.orgName,
-        [i.info]: o.fullOrgName,
-        isLeaf: !0
-      })).filter(n)) ?? [];
-    },
-    // 组织树
-    async orgTree({ node: t }) {
-      var r;
-      return ((r = (await Q({
-        parentId: t == null ? void 0 : t.orgId,
-        enable: !0,
-        showFullName: !0,
-        showIsCollect: !0
-      }, m(e))).data) == null ? void 0 : r.map((a) => ({
-        ...a,
-        [i.value]: a.id,
-        [i.label]: a.name,
-        [i.info]: a.fullName,
-        isLeaf: a.leaf
-      })).filter(n)) ?? [];
-    },
-    // 组织的所有子节点
-    async orgChildren({ node: t }) {
-      var r;
-      return ((r = (await K({ parentId: t == null ? void 0 : t.orgId }, m(e))).data) == null ? void 0 : r.map((a) => ({
-        ...a,
-        [i.value]: a.id,
-        [i.label]: a.name,
-        [i.info]: a.fullName,
-        isLeaf: a.leaf
-      })).filter(n)) ?? [];
-    },
-    // 组织列表
-    async orgList({ search: t, current: s, pageSize: r }) {
-      var o, l, d;
-      const a = await J({
-        keyWord: t,
-        currentPage: s,
-        pageSize: r,
-        showIsCollect: !0
-      }, m(e));
-      return {
-        total: ((o = a.data) == null ? void 0 : o.total) ?? 0,
-        data: ((d = (l = a.data) == null ? void 0 : l.records) == null ? void 0 : d.map((u) => ({
-          ...u,
-          [i.value]: u.id,
-          [i.label]: u.simpleName,
-          [i.info]: u.fullName
-        })).filter(n)) ?? []
-      };
-    }
-  };
-}
-function Ie({ auth: e, filter: n }) {
-  return {
-    // 回显选中项
-    async getSelectedData(t) {
-      var r;
-      const s = await _(t.map((a) => ({
-        orgId: a.orgId,
-        userId: a.userId
-      })), m(e));
-      return ((r = s == null ? void 0 : s.data) == null ? void 0 : r.map((a) => ({
-        ...a,
-        [c.value]: I(a == null ? void 0 : a.orgId, a.id),
-        [c.label]: a.realName,
-        [c.info]: a.fullOrgName
-      }))) ?? [];
-    },
-    // 添加到最近常用
-    async addRecentlyUsed(t) {
-      await S(t.map((s) => {
-        const r = U(s[c.value]);
-        return {
-          type: "2",
-          orgId: r.orgId,
-          userId: r.userId,
-          userName: s[c.label]
-        };
-      }), m(e));
-    },
-    // 最近常用
-    async recentlyUsed({ search: t, current: s }) {
-      var a, o;
-      return {
-        total: 20,
-        data: ((o = (a = (await D({
-          type: "2",
-          userName: t,
-          currentPage: s,
-          pageSize: 20,
-          showIsCollect: !0
-        }, m(e))).data) == null ? void 0 : a.records) == null ? void 0 : o.map((l) => ({
-          ...l,
-          [c.value]: I(l.orgId, l.userId),
-          [c.label]: l.userName,
-          [c.info]: l.fullOrgName
-        }))) ?? []
-      };
-    },
-    // 收藏
-    async favorites({ search: t, current: s, pageSize: r }) {
-      var o, l, d;
-      const a = await h({
-        type: "2",
-        userName: t,
-        currentPage: s,
-        pageSize: r
-      }, m(e));
-      return {
-        total: ((o = a.data) == null ? void 0 : o.total) ?? 0,
-        data: ((d = (l = a.data) == null ? void 0 : l.records) == null ? void 0 : d.map((u) => ({
-          ...u,
-          [c.value]: I(u.orgId, u.userId),
-          [c.label]: u.userName,
-          [c.info]: u.fullOrgName
-        }))) ?? []
-      };
-    },
-    // 添加取消收藏
-    async favoriteToggle({ favorite: t, record: s }) {
-      const r = t ? T : j, a = U(s == null ? void 0 : s[c.value]);
-      (await r({
-        type: "2",
-        orgId: a.orgId,
-        userId: a.userId
-      }, m(e))).success && R.success(t ? "收藏成功" : "取消收藏成功");
-    },
-    // 群组列表
-    async groups({ search: t, current: s, pageSize: r }) {
-      var o, l, d;
-      const a = await G({
-        type: "2",
-        name: t,
-        currentPage: s,
-        pageSize: r
-      }, m(e));
-      return {
-        total: ((o = a.data) == null ? void 0 : o.total) ?? 0,
-        data: ((d = (l = a.data) == null ? void 0 : l.records) == null ? void 0 : d.map((u) => ({
-          ...u,
-          [c.value]: u.id,
-          [c.label]: u.name
-        }))) ?? []
-      };
-    },
-    // 群组数据
-    async groupData({ node: t }) {
-      var r, a;
-      return ((a = (r = (await F({ id: t == null ? void 0 : t.id, showIsCollect: !0 }, m(e))).data) == null ? void 0 : r.pubGroupMemberList) == null ? void 0 : a.map((o) => ({
-        ...o,
-        [c.value]: I(o.orgId, o.userId),
-        [c.label]: o.userName,
-        [c.info]: o.fullOrgName,
-        isLeaf: !0
-      })).filter(n)) ?? [];
-    },
-    // 用户列表
-    async userList({ orgId: t, search: s, current: r, pageSize: a }) {
-      var l, d, u;
-      const o = await ee({
-        orgId: t,
-        realName: s,
-        currentPage: r,
-        pageSize: a,
-        enable: !0,
-        showIsCollect: !0
-      }, m(e));
-      return {
-        total: ((l = o.data) == null ? void 0 : l.total) ?? 0,
-        data: ((u = (d = o.data) == null ? void 0 : d.records) == null ? void 0 : u.map((b) => ({
-          ...b,
-          [c.value]: I(b.orgId, b.userId),
-          [c.label]: b.userName,
-          [c.info]: b.fullOrgName
-        })).filter(n)) ?? []
-      };
-    }
-  };
-}
-const Pe = /* @__PURE__ */ B({
-  name: "OrgSelector",
-  __name: "OrgSelector",
-  props: /* @__PURE__ */ V({
-    title: { default: "选择组织" },
-    multiple: { type: Boolean, default: !1 },
-    auth: {},
-    apis: { default: () => ({}) },
-    tabs: { default: () => [
-      { value: "RecentlyUsed", label: "最近常用" },
-      { value: "Favorites", label: "收藏" },
-      { value: "OrgTree", label: "全部" },
-      { value: "Groups", label: "群组" }
-    ] },
-    disabledData: { type: Function, default: () => !1 },
-    filter: { type: Function, default: () => !0 },
-    onSubmit: {}
-  }, {
-    open: { type: Boolean },
-    openModifiers: {},
-    modelValue: { default: [] },
-    modelModifiers: {}
-  }),
-  emits: ["update:open", "update:modelValue"],
-  setup(e, { expose: n }) {
-    const t = e, s = M(), r = {
-      ...ae({ auth: t.auth, filter: t.filter }),
-      ...t.apis
-    }, a = N(e, "open"), o = N(e, "modelValue"), l = k([]), d = Z(a), { onFieldChange: u } = X.useInjectFormItemContext();
-    function b() {
-      d(!0);
-    }
-    $(a, async (g) => {
-      var f;
-      if (g) {
-        if (!o.value.length) {
-          l.value = [];
-          return;
-        }
-        try {
-          l.value = await ((f = r == null ? void 0 : r.getSelectedData) == null ? void 0 : f.call(r, o.value)) ?? o.value;
-        } catch {
-          l.value = o.value;
-        }
-      }
-    }, { immediate: !0 });
-    function L() {
-      var g, f;
-      o.value = l.value, (g = t.onSubmit) == null || g.call(t, l.value), u(), d(!1), (f = r == null ? void 0 : r.addRecentlyUsed) == null || f.call(r, l.value);
-    }
-    return n({
-      open: b
-    }), (g, f) => (w(), C("div", null, [
-      g.$slots.trigger ? (w(), C("span", {
-        key: 0,
-        onClick: f[0] || (f[0] = (v) => b())
-      }, [
-        A(g.$slots, "trigger")
-      ])) : q("v-if", !0),
-      P(y(H), z(y(s), {
-        open: a.value,
-        "onUpdate:open": f[2] || (f[2] = (v) => a.value = v),
-        title: g.title,
-        width: 760,
-        "z-index": 1001,
-        "ok-text": "确认",
-        "cancel-text": "取消",
-        onOk: f[3] || (f[3] = (v) => L())
-      }), {
-        default: O(() => [
-          P(y(E), {
-            apis: r,
-            "field-names": y(i)
-          }, {
-            default: O(() => [
-              P(y(W), {
-                modelValue: y(l),
-                "onUpdate:modelValue": f[1] || (f[1] = (v) => x(l) ? l.value = v : null),
-                "default-tab": "OrgTree",
-                tabs: g.tabs,
-                multiple: g.multiple,
-                "disabled-data": g.disabledData
-              }, null, 8, ["modelValue", "tabs", "multiple", "disabled-data"])
-            ]),
-            _: 1
-            /* STABLE */
-          }, 8, ["field-names"])
-        ]),
-        _: 1
-        /* STABLE */
-      }, 16, ["open", "title"])
-    ]));
-  }
-});
-export {
-  Pe as _,
-  ie as a,
-  ce as b,
-  ge as c,
-  fe as d,
-  me as e,
-  pe as f,
-  de as g,
-  Ie as h,
-  c as i,
-  F as j,
-  ve as k,
-  G as l,
-  be as m,
-  i as o,
-  ye as p,
-  U as r,
-  ae as u
-};