@utogether/udp-core 1.0.1-beta.5 → 1.0.1-beta.7

package/dist/{SysUserPanel.vue_vue_type_script_setup_true_lang-B9zUXXwa.js → SysUserPanel.vue_vue_type_script_setup_true_lang-CKZjy0OF.js}

@@ -1,15 +1,16 @@
-import { defineComponent as z, reactive as G, ref as v, inject as H, createVNode as t, Fragment as R, resolveComponent as l, nextTick as Q, onMounted as Y, createElementBlock as U, openBlock as g, withCtx as i, createBlock as k, createCommentVNode as J, renderList as K, unref as O } from "vue";
+import { defineComponent as G, reactive as H, ref as h, inject as Q, createVNode as s, Fragment as U, resolveComponent as l, onMounted as Y, createElementBlock as $, openBlock as v, withCtx as i, createBlock as k, createCommentVNode as J, renderList as K, unref as O } from "vue";
 import { useI18n as W } from "vue-i18n";
-import { q as $, v as X } from "./index-BDE4-ZvN.js";
-import { useRender as Z, warnMessage as ee, errorMessage as te } from "@utogether/utils";
+import { t as L } from "./await-to-js.es5-BtRbN2QH.js";
+import { useRender as X, warnMessage as Z, delay as ee, errorMessage as te } from "@utogether/utils";
 import { VxeUI as se } from "vxe-pc-ui";
 import { isEmpty as ae } from "xe-utils";
-const le = {
+import { q as le } from "./index-COBMRlmJ.js";
+const re = {
   class: "page"
-}, u = "/uums/user", ce = /* @__PURE__ */ z({
+}, u = "/uums/user", pe = /* @__PURE__ */ G({
   __name: "SysUserPanel",
-  setup(re) {
-    const s = G({
+  setup(oe) {
+    const t = H({
       record: {},
       listQuery: {},
       dataList: [],
@@ -19,7 +20,7 @@ const le = {
       showUserRole: !1,
       showAuth: !1,
       dataStatus: ""
-    }), d = X(), {
+    }), d = le(), {
       t: r
     } = W(), q = {
       userName: [{
@@ -38,13 +39,13 @@ const le = {
         required: !0,
         message: `${r("message.required")}${r("message.userPwd")}`
       }]
-    }, m = Z(), y = v({}), C = H("treeList"), N = v(null), I = [{
+    }, c = X(), w = h({}), C = Q("treeList"), m = h(!1), _ = h(null), I = [{
       field: "name",
       title: "message.userName"
     }, {
       field: "userName",
       title: "message.userCode"
-    }], h = [{
+    }], y = [{
       type: "checkbox",
       width: 40,
       align: "center"
@@ -52,27 +53,27 @@ const le = {
       field: "userName",
       title: "message.userCode",
       required: !0,
-      editRender: m.renderInput()
+      editRender: c.renderInput()
     }, {
       field: "name",
       title: "message.userName",
       required: !0,
-      editRender: m.renderInput()
+      editRender: c.renderInput()
     }, {
       field: "type",
       title: "message.sysType",
       formatter: ["formatDict", "SU.ENABLE"],
-      editRender: m.renderDict("SU.USER.TYPE")
+      editRender: c.renderDict("SU.USER.TYPE")
     }, {
       field: "userPwd",
       required: !0,
       width: 150,
-      editRender: m.renderInput(),
+      editRender: c.renderInput(),
       formatter: () => "*******"
     }, {
       field: "enabled",
       width: 80,
-      cellRender: m.renderEnabled(L)
+      cellRender: c.renderEnabled(P)
     }, {
       field: "operate",
       width: 240,
@@ -80,70 +81,70 @@ const le = {
       slots: {
         default: ({
           row: e
-        }) => [t(R, null, [t(l("ut-button"), {
+        }) => e.id ? [s(U, null, [s(l("ut-button"), {
           icon: "ri-user-fill",
           content: "role",
           onTap: () => S(e)
-        }, null), t(l("ut-button"), {
+        }, null), s(l("ut-button"), {
           icon: "ri-lock-fill",
           content: "auth",
           status: "success",
           onTap: () => E(e)
-        }, null), t(l("ut-button"), {
+        }, null), s(l("ut-button"), {
           icon: "ri-lock-fill",
           content: "passwordReset",
           status: "warning",
           onTap: () => A(e)
-        }, null)])]
+        }, null)])] : null
       }
     }];
-    async function L({
+    async function P({
       row: e
     }) {
-      await $(d.put(u, [e])), N.value.refreshData();
+      await L(d.put(u, [e])), _.value.refreshData();
     }
     const S = async (e) => {
-      var n;
+      var o;
+      t.roleList = [], t.showUserRole = !0, m.value = !0;
       const a = await d.get(u + "/getUserRole", {
         userName: e.userName
       });
-      s.roleList = (n = a[0]) == null ? void 0 : n.sysRoles, Q(() => {
-        s.showUserRole = !0;
-      });
+      m.value = !1, t.roleList = (o = a[0]) == null ? void 0 : o.sysRoles;
     }, A = async (e) => {
       await d.put(u + "/resetPwd", e), await se.modal.alert(r("message.tip.initPassword"));
     }, E = async (e) => {
-      var f;
-      const [a, n] = await $(d.get(u + "/getUserRole", {
+      var g;
+      t.roleList = [], t.showAuth = !0, m.value = !0, t.record = e;
+      const [a, o] = await L(d.get(u + "/getUserRole", {
         userName: e.userName
       }));
-      a || (ae(n) ? ee(r("message.tip.emptyAuth")) : (s.roleList = (f = n[0]) == null ? void 0 : f.sysMenuExts, s.showAuth = !0));
-    }, P = {
+      m.value = !1, a || (ae(o) ? Z(r("message.tip.emptyAuth")) : t.roleList = (g = o[0]) == null ? void 0 : g.sysMenuExts);
+    }, M = {
       editActived({
         row: e
       }) {
-        h[1].editRender.props.disabled = !!e.id, h[4].editRender.props.disabled = !!e.id;
+        y[1].editRender.props.disabled = !!e.id, y[4].editRender.props.disabled = !!e.id;
       }
-    }, b = v(null), M = () => {
-      b.value.validate(async (e) => {
+    }, V = h(null), D = () => {
+      V.value.validate(async (e) => {
         if (!e) {
           const {
             record: a,
-            dataStatus: n
-          } = s;
-          n === "add" ? await d.post(u, a) : await d.put(u, a), x();
+            dataStatus: o
+          } = t;
+          o === "add" ? await d.post(u, a) : await d.put(u, a), R();
         }
       });
-    }, x = () => {
-      s.showModelView = !1;
+    }, R = () => {
+      t.showModelView = !1;
     }, T = () => {
       d.get("/uums/unit", {
         pageSize: 10
-      }).then((e) => {
-        y.value = {
+      }).then(async (e) => {
+        w.value = {
           unitId: e[0].id,
           enabled: "1"
-        };
+        }, await ee(100), _.value.refreshData();
       }).catch(() => {
         te("获取租户失败,刷新后重试");
       });
@@ -151,40 +152,42 @@ const le = {
     return Y(() => {
       T();
     }), (e, a) => {
-      const n = l("ut-grid"), f = l("vxe-option"), D = l("vxe-select"), c = l("vxe-form-item"), V = l("ut-button"), B = l("vxe-form"), w = l("vxe-modal"), _ = l("vxe-column"), F = l("vxe-table"), j = l("el-tree-v2");
-      return g(), U("div", le, [t(n, {
+      const o = l("ut-grid"), g = l("vxe-option"), B = l("vxe-select"), f = l("vxe-form-item"), x = l("ut-button"), F = l("vxe-form"), N = l("vxe-modal"), b = l("vxe-column"), j = l("vxe-table"), z = l("el-tree-v2");
+      return v(), $("div", re, [s(o, {
         ref_key: "xgrid",
-        ref: N,
-        columns: h,
+        ref: _,
+        columns: y,
         items: I,
         url: u,
-        "default-params": y.value,
-        events: P
-      }, null, 8, ["default-params"]), t(w, {
-        modelValue: s.showModelView,
-        "onUpdate:modelValue": a[0] || (a[0] = (o) => s.showModelView = o),
+        "auto-load": !1,
+        "default-params": w.value,
+        "default-value": w.value,
+        events: M
+      }, null, 8, ["default-params", "default-value"]), s(N, {
+        modelValue: t.showModelView,
+        "onUpdate:modelValue": a[0] || (a[0] = (n) => t.showModelView = n),
         title: "用户信息",
         width: "300"
       }, {
-        default: i(() => [t(B, {
+        default: i(() => [s(F, {
           ref_key: "xForm",
-          ref: b,
-          data: s.record,
+          ref: V,
+          data: t.record,
           rules: q,
           "title-align": "right"
         }, {
-          default: i(() => [t(c, {
+          default: i(() => [s(f, {
             title: e.$t("message.unitName"),
             field: "unitId",
             span: "24"
           }, {
             default: i(({
-              data: o
-            }) => [t(D, {
-              modelValue: o.unitId,
-              "onUpdate:modelValue": (p) => o.unitId = p
+              data: n
+            }) => [s(B, {
+              modelValue: n.unitId,
+              "onUpdate:modelValue": (p) => n.unitId = p
             }, {
-              default: i(() => [(g(!0), U(R, null, K(O(C), (p) => (g(), k(f, {
+              default: i(() => [(v(!0), $(U, null, K(O(C), (p) => (v(), k(g, {
                 key: p.id,
                 value: p.id,
                 label: p.unitName
@@ -192,24 +195,24 @@ const le = {
               _: 2
             }, 1032, ["modelValue", "onUpdate:modelValue"])]),
             _: 1
-          }, 8, ["title"]), t(c, {
+          }, 8, ["title"]), s(f, {
             title: e.$t("message.userCode"),
             "item-render": {
               name: "input",
               attrs: {
-                disabled: s.dataStatus === "update"
+                disabled: t.dataStatus === "update"
               }
             },
             field: "userName",
             span: "24"
-          }, null, 8, ["title", "item-render"]), t(c, {
+          }, null, 8, ["title", "item-render"]), s(f, {
             title: e.$t("message.userName"),
             field: "name",
             span: "24",
             "item-render": {
               name: "input"
             }
-          }, null, 8, ["title"]), s.dataStatus === "add" ? (g(), k(c, {
+          }, null, 8, ["title"]), t.dataStatus === "add" ? (v(), k(f, {
             key: 0,
             title: e.$t("message.userPwd"),
             "item-render": {
@@ -217,71 +220,75 @@ const le = {
             },
             field: "userPwd",
             span: "24"
-          }, null, 8, ["title"])) : J("", !0), t(c, {
+          }, null, 8, ["title"])) : J("", !0), s(f, {
             align: "right",
             span: "24"
           }, {
-            default: i(() => [t(V, {
+            default: i(() => [s(x, {
               content: "cancel",
               icon: "ri-close-fill",
-              onClick: x
-            }), t(V, {
+              onClick: R
+            }), s(x, {
               content: "confirm",
               icon: "ri-save-3-fill",
               status: "u-cyan",
-              onClick: M
+              onClick: D
             })]),
             _: 1
           })]),
           _: 1
         }, 8, ["data"])]),
         _: 1
-      }, 8, ["modelValue"]), t(w, {
-        modelValue: s.showUserRole,
-        "onUpdate:modelValue": a[1] || (a[1] = (o) => s.showUserRole = o),
+      }, 8, ["modelValue"]), s(N, {
+        modelValue: t.showUserRole,
+        "onUpdate:modelValue": a[1] || (a[1] = (n) => t.showUserRole = n),
+        loading: m.value,
         title: e.$t("message.title.roleInfo"),
         width: "600"
       }, {
-        default: i(() => [t(F, {
+        default: i(() => [s(j, {
           height: "300",
-          data: s.roleList,
+          data: t.roleList,
           border: ""
         }, {
-          default: i(() => [t(_, {
+          default: i(() => [s(b, {
             type: "seq",
             width: "60"
-          }), t(_, {
+          }), s(b, {
             field: "roleName",
             title: e.$t("message.udp.roleName")
-          }, null, 8, ["title"]), t(_, {
+          }, null, 8, ["title"]), s(b, {
             field: "roleDesc",
             title: e.$t("message.udp.roleDesc")
           }, null, 8, ["title"])]),
           _: 1
         }, 8, ["data"])]),
         _: 1
-      }, 8, ["modelValue", "title"]), t(w, {
-        modelValue: s.showAuth,
-        "onUpdate:modelValue": a[2] || (a[2] = (o) => s.showAuth = o),
-        title: e.$t("message.title.authority"),
-        height: "300",
-        width: "360"
+      }, 8, ["modelValue", "loading", "title"]), s(N, {
+        modelValue: t.showAuth,
+        "onUpdate:modelValue": a[2] || (a[2] = (n) => t.showAuth = n),
+        loading: m.value,
+        title: e.$t("message.title.authority", {
+          role: t.record.name || "88888"
+        }),
+        height: "620",
+        width: "560"
       }, {
-        default: i(() => [t(j, {
+        default: i(() => [s(z, {
           ref: "xTree",
-          data: s.roleList,
+          data: t.roleList,
           props: {
             children: "children",
             label: "menuName"
           },
-          height: 420,
+          height: 560,
           "node-key": "id"
         }, null, 8, ["data"])]),
         _: 1
-      }, 8, ["modelValue", "title"])]);
+      }, 8, ["modelValue", "loading", "title"])]);
     };
   }
 });
 export {
-  ce as _
+  pe as _
 };

package/dist/{SystemMenu-5TK9ZA11.js → SystemMenu-ChFrMzRg.js}

@@ -1,16 +1,17 @@
 import { defineComponent as S, reactive as k, ref as v, createVNode as o, resolveComponent as r, Fragment as m, createElementBlock as D, openBlock as A } from "vue";
 import { useI18n as E } from "vue-i18n";
-import { _ as I } from "./menuInfo.vue_vue_type_style_index_0_lang-BXMrNMUs.js";
+import { _ as I } from "./menuInfo.vue_vue_type_style_index_0_lang-DgG0aHRy.js";
 import { _ as N } from "./AuthorityPanel.vue_vue_type_style_index_0_lang-CIYmnP9-.js";
-import { clone as h } from "xe-utils";
-import { v as M, q as R } from "./index-BDE4-ZvN.js";
-import { VxeUI as U } from "vxe-pc-ui";
-import { useRender as B } from "@utogether/utils";
+import { clone as p } from "xe-utils";
+import { t as M } from "./await-to-js.es5-BtRbN2QH.js";
+import { VxeUI as R } from "vxe-pc-ui";
+import { useRender as U } from "@utogether/utils";
+import { q as B } from "./index-COBMRlmJ.js";
 const P = {
   class: "page-content"
 }, z = {
   name: "SystemMenu"
-}, Y = /* @__PURE__ */ S({
+}, j = /* @__PURE__ */ S({
   ...z,
   setup(F) {
     const t = k({
@@ -25,8 +26,8 @@ const P = {
         pageNum: 1
       }
     }), {
-      t: p
-    } = E(), f = B(), d = M(), s = v(null), i = "/uums/menu";
+      t: h
+    } = E(), f = U(), d = B(), s = v(null), i = "/uums/menu";
     let l;
     const C = [{
       type: "checkbox",
@@ -99,7 +100,7 @@ const P = {
     }, u = (e) => {
       t.showDrawer = !0, t.dataStatus = "add", t.record.dispalyCode = e == null ? void 0 : e.permissionCode, t.record.permissionCode = e == null ? void 0 : e.permissionCode, t.record.menuType = "0", t.record.menuCategory = e ? "" : "0", t.record.parentId = e == null ? void 0 : e.id, t.record.hasChildren = e == null ? void 0 : e.hasChildren, t.record.children = t.record.children || [], l = e;
     }, w = (e) => {
-      t.showDrawer = !0, t.dataStatus = "update", t.record = h(e, !0), t.record.menuType = t.record.menuType.toString(), t.record.dispalyCode = e.permissionCode;
+      t.showDrawer = !0, t.dataStatus = "update", t.record = p(e, !0), t.record.menuType = t.record.menuType.toString(), t.record.dispalyCode = e.permissionCode;
     };
     async function _({
       row: e
@@ -107,12 +108,12 @@ const P = {
       await d.put(i, [e]), s.value.refreshData();
     }
     const T = async () => {
-      const e = await U.modal.confirm(p("message.delRecord")), n = s.value.getInstance().getCheckboxRecords();
+      const e = await R.modal.confirm(h("message.delRecord")), n = s.value.getInstance().getCheckboxRecords();
       if (e === "confirm") {
-        const [a] = await R(d.delete(i, n));
+        const [a] = await M(d.delete(i, n));
       }
     }, b = (e) => {
-      t.showAuthority = !0, t.dataStatus = "update", t.record = h(e, !0), t.record.menuType = t.record.menuType.toString(), t.record.dispalyCode = e.permissionCode;
+      t.showAuthority = !0, t.dataStatus = "update", t.record = p(e, !0), t.record.menuType = t.record.menuType.toString(), t.record.dispalyCode = e.permissionCode;
     }, c = (e, n) => {
       e === "submit" && (l || n) && s.value.getInstance().reloadTreeExpand(l || n), t.record = {}, t.showDrawer = !1, t.showAuthority = !1;
     };
@@ -148,5 +149,5 @@ const P = {
   }
 });
 export {
-  Y as default
+  j as default
 };

package/dist/{UserInfo-Bx3zQqHa.js → UserInfo-I36LAXVj.js}

@@ -1,4 +1,4 @@
-import { _ as f } from "./UserInfo.vue_vue_type_style_index_0_lang-C2sqUQdg.js";
+import { _ as f } from "./UserInfo.vue_vue_type_style_index_0_lang-BGY-LYeL.js";
 export {
   f as default
 };

package/dist/{UserInfo.vue_vue_type_style_index_0_lang-C2sqUQdg.js → UserInfo.vue_vue_type_style_index_0_lang-BGY-LYeL.js}

@@ -1,6 +1,7 @@
-import { defineComponent as x, ref as i, reactive as R, onBeforeMount as B, resolveComponent as d, createElementBlock as U, openBlock as u, createVNode as c, withCtx as $, createBlock as j, createCommentVNode as q, mergeProps as A, toHandlers as E } from "vue";
-import { v as P, q as S } from "./index-BDE4-ZvN.js";
-const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ x({
+import { defineComponent as R, ref as i, reactive as x, onBeforeMount as B, resolveComponent as d, createElementBlock as U, openBlock as u, createVNode as c, withCtx as $, createBlock as j, createCommentVNode as q, mergeProps as A, toHandlers as E } from "vue";
+import { t as P } from "./await-to-js.es5-BtRbN2QH.js";
+import { q as S } from "./index-COBMRlmJ.js";
+const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ R({
   __name: "UserInfo",
   props: {
     record: { default: () => ({}) },
@@ -9,7 +10,7 @@ const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ x({
   },
   emits: ["onClose"],
   setup(f, { emit: p }) {
-    const r = f, g = i(!1), s = i(!1), a = P(), h = p, b = [
+    const r = f, g = i(!1), o = i(!1), a = S(), h = p, b = [
       {
         field: "userName",
         title: "message.userCode",
@@ -67,15 +68,15 @@ const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ x({
       { code: "add", name: "message.btn.add", status: "u-cyan", icon: "ri-add-line" },
       { code: "delete", name: "message.btn.del", status: "danger", icon: "ri-delete-bin-5-fill" }
     ], y = [
-      { field: "userName", title: "message.userCode" },
-      { field: "name", title: "message.userName" }
-    ], _ = [
+      { field: "userName", title: "message.userCode", span: 9 },
+      { field: "name", title: "message.userName", span: 9 }
+    ], w = [
       { type: "checkbox", width: 40 },
       { field: "userName", title: "message.userCode" },
       { field: "name", title: "message.userName" },
       { field: "enabled", width: 70, formatter: ["formatDict", "SU.ENABLE"] }
-    ], m = i({}), n = R({
-      height: 560,
+    ], m = i({}), n = x({
+      height: "auto",
       border: !0,
       pagerConfig: {},
       toolbarConfig: { buttons: C, perfect: !0 },
@@ -87,37 +88,37 @@ const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ x({
         // 查询是需要启用表单代理
         ajax: {
           // 接收 Promise
-          query: ({ page: e, form: o }) => {
-            const t = Object.assign({}, o);
+          query: ({ page: e, form: s }) => {
+            const t = Object.assign({}, s);
             return t.id = r.record.id, t.pageNum = e.currentPage, t.pageSize = e.pageSize, a.get("/uums/user/listRoleUsers", t);
           },
           // body 对象： { removeRecords }
           delete: ({ body: { removeRecords: e } }) => {
-            const o = {
+            const s = {
               roleId: r.record.id,
               userIds: e.map((t) => t.id).join()
             };
-            return a.delete("/uums/role/deleteRoleUsers", o);
+            return a.delete("/uums/role/deleteRoleUsers", s);
           }
         }
       },
       columns: v
-    }), w = {
+    }), _ = {
       toolbarButtonClick({ code: e }) {
-        e === "add" && (s.value = !0);
+        e === "add" && (o.value = !0);
       }
     }, N = async (e) => {
-      const o = { userIds: "", roleId: r.record.id };
-      o.userIds = e.map((l) => l.id).join(","), n.loading = !0;
-      const [t] = await S(a.post("/uums/role/addUserRole", o));
-      n.loading = !1, t || (m.value.commitProxy("query"), s.value = !1);
+      const s = { userIds: "", roleId: r.record.id };
+      s.userIds = e.map((l) => l.id).join(","), n.loading = !0;
+      const [t] = await P(a.post("/uums/role/addUserRole", s));
+      n.loading = !1, t || (m.value.commitProxy("query"), o.value = !1);
     };
     function I() {
       h("onClose");
     }
     return B(() => {
       g.value = !0;
-    }), (e, o) => {
+    }), (e, s) => {
       const t = d("vxe-grid"), l = d("ut-modal-grid"), k = d("el-drawer");
       return u(), U("div", V, [
         c(k, {
@@ -132,19 +133,21 @@ const V = { class: "u-dict-config_wrapper" }, D = /* @__PURE__ */ x({
             c(t, A({
               ref_key: "xgrid",
               ref: m
-            }, n, E(w)), null, 16),
-            s.value ? (u(), j(l, {
+            }, n, E(_)), null, 16),
+            o.value ? (u(), j(l, {
               key: 0,
               url: "/uums/user/listUserToRole",
               "default-params": { roleId: e.record.id },
               items: y,
-              columns: _,
+              columns: w,
               "show-footer": !0,
               editable: !1,
+              title: e.$t("message.udp.userList"),
               width: "60%",
-              onClose: o[0] || (o[0] = (z) => s.value = !1),
+              height: "75%",
+              onClose: s[0] || (s[0] = (z) => o.value = !1),
               onConfirm: N
-            }, null, 8, ["default-params"])) : q("", !0)
+            }, null, 8, ["default-params", "title"])) : q("", !0)
           ]),
           _: 1
         }, 8, ["model-value", "title"])

package/dist/await-to-js.es5-BtRbN2QH.js

@@ -0,0 +1,10 @@
+function e(t, r) {
+  return t.then(function(n) {
+    return [null, n];
+  }).catch(function(n) {
+    return [n, void 0];
+  });
+}
+export {
+  e as t
+};

package/dist/{childView-BSUWnii7.js → childView-CYpuOzRx.js}

@@ -1,4 +1,4 @@
-import { _ as f } from "./childView.vue_vue_type_style_index_0_lang-EcT-Dux7.js";
+import { _ as f } from "./childView.vue_vue_type_style_index_0_lang-DNVlDM_a.js";
 export {
   f as default
 };

package/dist/{childView-CFC3gA_U.js → childView-Csnlaqfs.js}

@@ -1,4 +1,4 @@
-import { _ as f } from "./childView.vue_vue_type_style_index_0_lang-WQVLSJR8.js";
+import { _ as f } from "./childView.vue_vue_type_style_index_0_lang-B8EnA03l.js";
 export {
   f as default
 };