@das-fed/ui 7.1.0-dev.27 → 7.1.0-dev.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "7.1.0-dev.27",
+  "version": "7.1.0-dev.29",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -26,7 +26,7 @@
     "@antv/x6-plugin-snapline": "^2.1.7",
     "@antv/x6-plugin-transform": "^2.1.8",
     "@antv/x6-vue-shape": "^2.1.2",
-    "@das-fed/cli": "7.1.0-dev.27",
+    "@das-fed/cli": "7.1.0-dev.29",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.9",
@@ -56,9 +56,9 @@
     "vue-tsc": "^2.0.29"
   },
   "dependencies": {
-    "@das-fed/ui": "7.1.0-dev.27",
-    "@das-fed/utils": "7.1.0-dev.27",
-    "@das-fed/web": "7.1.0-dev.27",
+    "@das-fed/ui": "7.1.0-dev.29",
+    "@das-fed/utils": "7.1.0-dev.29",
+    "@das-fed/web": "7.1.0-dev.29",
     "@types/markdown-it": "^14.1.2",
     "@wangeditor-next/editor": "5.6.31",
     "@wangeditor-next/editor-for-vue": "5.1.14",

package/packages/business-components/change-pwd/index.js

@@ -1,20 +1,57 @@
 import '@das-fed/ui/packages/business-components/change-pwd/style.css';
-import { ref as R, reactive as F, defineComponent as T, createBlock as v, openBlock as y, unref as r, isRef as $, withCtx as g, createElementVNode as z, createVNode as h, createCommentVNode as I, createTextVNode as V, toDisplayString as D } from "vue";
-import { withInstall as B } from "@das-fed/utils/with-install/index";
-import { t as s, i18n as x, setI18nRule as O } from "@das-fed/web/packages/i18n/index";
-import { DasDialog as Z } from "@das-fed/ui/packages/components/dialog/index";
-import { DasFormRef as W, DasForm as G } from "@das-fed/ui/packages/components/form/index";
+import { ref as b, reactive as I, defineComponent as O, createBlock as V, openBlock as A, unref as t, isRef as $, withCtx as C, createElementVNode as S, createVNode as y, createCommentVNode as Z, createTextVNode as x, toDisplayString as E } from "vue";
+import { withInstall as W } from "@das-fed/utils/with-install/index";
+import { t as d, i18n as D, setI18nRule as j } from "@das-fed/web/packages/i18n/index";
+import { DasDialog as G } from "@das-fed/ui/packages/components/dialog/index";
+import { DasFormRef as H, DasForm as X } from "@das-fed/ui/packages/components/form/index";
 import { DasFormItem as q } from "@das-fed/ui/packages/components/form-item/index";
 import { DasButton as U } from "@das-fed/ui/packages/components/button/index";
-import { DasMessage as K } from "@das-fed/ui/packages/components/message/index";
-import { enterpriseright as M, superadminPortal as Y, systemConfiguration as j } from "@das-fed/utils/api-services/modules";
-import { encryption as k } from "@das-fed/utils/atob";
-const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A = M.put("/user/change-pwd", (n) => (n.csrf = !0, n)), H = Y.put("/change-pwd"), J = j.get("/visitor/login/with-default"), Q = (n, f) => {
-  const w = R(!1), m = W(), d = R({
+import { DasMessage as Y } from "@das-fed/ui/packages/components/message/index";
+import { enterpriseright as z, superadminPortal as J, systemConfiguration as Q, justauth as ee } from "@das-fed/utils/api-services/modules";
+import { encryption as v } from "@das-fed/utils/atob";
+const M = z.get("/user/change-pwd", (r) => (r.ignoreErrorMessage = !0, r)), K = z.put("/user/change-pwd", (r) => (r.csrf = !0, r)), re = J.put("/change-pwd"), te = Q.get("/visitor/login/with-default"), ne = "RSA_V1:", ae = async (r) => {
+  const n = window.atob(r), p = new Uint8Array(n.length);
+  for (let a = 0; a < n.length; a++)
+    p[a] = n.charCodeAt(a);
+  return window.crypto.subtle.importKey("spki", p.buffer, { name: "RSA-OAEP", hash: "SHA-256" }, !1, ["encrypt"]);
+}, oe = (r) => {
+  let n = "";
+  const p = new Uint8Array(r);
+  for (let a = 0; a < p.byteLength; a++)
+    n += String.fromCharCode(p[a]);
+  return window.btoa(n);
+}, se = async (r) => {
+  try {
+    const n = await r();
+    if (!n.trim())
+      return async (a) => v(a);
+    const p = await ae(n);
+    return async (a) => {
+      try {
+        const l = await window.crypto.subtle.encrypt(
+          { name: "RSA-OAEP" },
+          p,
+          new TextEncoder().encode(a)
+        );
+        return ne + oe(l);
+      } catch {
+        return v(a);
+      }
+    };
+  } catch {
+    return async (n) => v(n);
+  }
+}, ie = z.get("/visitor/rsa/public-key", (r) => (r.ignoreErrorMessage = !0, r));
+ee.get("/rsa/public-key", (r) => (r.ignoreErrorMessage = !0, r));
+const pe = async () => {
+  const [r, n] = await ie().run();
+  return r || !n ? "" : typeof n.publicKey == "string" ? n.publicKey : "";
+}, de = (r, n) => {
+  const p = b(!1), a = H(), l = b({
     prePwd: "",
     pwd: "",
     confirmPwd: ""
-  }), t = F({
+  }), o = I({
     pwdStrongLimit: !1,
     // 是否开启密码强度校验
     pwdRequireLength: !1,
@@ -29,117 +66,122 @@ const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A =
     // 密码要求包含大写字母
     pwdRequireSpecialCharacter: !1
     // 密码要求特殊字符
-  }), L = async () => {
-    const [o, e] = await J().run();
-    o || (t.pwdStrongLimit = e.pwdStrongLimit, t.pwdRequireLength = e.pwdRequireLength, t.pwdMinLength = e.pwdMinLength, t.pwdRequireNum = e.pwdRequireNum, t.pwdRequireLowercaseLetters = e.pwdRequireLowercaseLetters, t.pwdRequireUppercaseLetters = e.pwdRequireUppercaseLetters, t.pwdRequireSpecialCharacter = e.pwdRequireSpecialCharacter);
-  }, l = (o) => {
+  }), _ = async () => {
+    const [s, e] = await te().run();
+    s || (o.pwdStrongLimit = e.pwdStrongLimit, o.pwdRequireLength = e.pwdRequireLength, o.pwdMinLength = e.pwdMinLength, o.pwdRequireNum = e.pwdRequireNum, o.pwdRequireLowercaseLetters = e.pwdRequireLowercaseLetters, o.pwdRequireUppercaseLetters = e.pwdRequireUppercaseLetters, o.pwdRequireSpecialCharacter = e.pwdRequireSpecialCharacter);
+  }, w = (s) => {
     let e = "";
-    return t.pwdStrongLimit ? e = E(o) : e = u(o), e;
-  }, _ = (o, e, a) => {
-    var i;
-    if (!e) return a(new Error(s("新密码不能为空")));
-    if (n.mainApp === "enterpriseadmin") {
-      const C = l(e);
-      if ((i = m.value) == null || i.validateField("confirmPwd", () => null), C) return a(new Error(C));
+    return o.pwdStrongLimit ? e = F(s) : e = c(s), e;
+  }, L = (s, e, i) => {
+    var m;
+    if (!e) return i(new Error(d("新密码不能为空")));
+    if (r.mainApp === "enterpriseadmin") {
+      const h = w(e);
+      if ((m = a.value) == null || m.validateField("confirmPwd", () => null), h) return i(new Error(h));
     }
-    a();
-  }, N = (o, e, a) => {
-    if (!e) return a(new Error(s("确认密码不能为空")));
-    if (d.value.pwd !== e) return a(new Error(s("与新密码不一致")));
-    if (n.mainApp === "enterpriseadmin") {
-      const i = l(e);
-      if (i) return a(new Error(i));
+    i();
+  }, N = (s, e, i) => {
+    if (!e) return i(new Error(d("确认密码不能为空")));
+    if (l.value.pwd !== e) return i(new Error(d("与新密码不一致")));
+    if (r.mainApp === "enterpriseadmin") {
+      const m = w(e);
+      if (m) return i(new Error(m));
     }
-    a();
-  }, P = R({
+    i();
+  }, R = b({
     prePwd: [
       {
-        required: !n.forceUpdate,
-        message: s("旧密码不能为空"),
+        required: !r.forceUpdate,
+        message: d("旧密码不能为空"),
         trigger: "blur"
       }
     ],
-    pwd: [{ validator: _, trigger: "blur" }],
+    pwd: [{ validator: L, trigger: "blur" }],
     confirmPwd: [{ validator: N, trigger: "blur" }]
-  }), c = R(""), b = (o) => {
-    n.mainApp === "enterpriseadmin" && L(), w.value = !0, c.value = o || "";
-  }, p = (o = !1) => {
+  }), g = b(""), k = (s) => {
+    r.mainApp === "enterpriseadmin" && _(), p.value = !0, g.value = s || "";
+  }, u = (s = !1) => {
     var e;
-    d.value.prePwd = "", d.value.pwd = "", d.value.confirmPwd = "", (e = m.value) == null || e.resetField(), w.value = !1, o || f("onCancel");
-  }, u = (o) => {
-    const e = s("das-ui-business-components-change-pwd-passwordFormatRule");
-    return /^(?=.*[a-zA-Z])(?=.*[\d])(?=.*[\w])[a-zA-Z\d\W_]{8,20}$/.test(o) ? "" : e;
-  }, E = (o) => {
-    let e = "", a = !1;
-    e += s("das-ui-business-components-change-pwd-limit-number", t.pwdMinLength);
-    const i = `\\S{${t.pwdMinLength},}`;
-    return new RegExp(i).test(o) || (a = !0), (t.pwdRequireNum || t.pwdRequireLowercaseLetters || t.pwdRequireUppercaseLetters || t.pwdRequireSpecialCharacter) && (e += s("必须包含")), t.pwdRequireNum && (e += s("数字，"), /\d+/.test(o) || (a = !0)), t.pwdRequireLowercaseLetters && (e += s("小写字母，"), /[a-z]+/.test(o) || (a = !0)), t.pwdRequireUppercaseLetters && (e += s("大写字母，"), /[A-Z]+/.test(o) || (a = !0)), t.pwdRequireSpecialCharacter && (e += s("符号，"), /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~]+/.test(o) || (a = !0)), a ? e.slice(0, -1) : "";
+    l.value.prePwd = "", l.value.pwd = "", l.value.confirmPwd = "", (e = a.value) == null || e.resetField(), p.value = !1, s || n("onCancel");
+  }, c = (s) => {
+    const e = d("das-ui-business-components-change-pwd-passwordFormatRule");
+    return /^(?=.*[a-zA-Z])(?=.*[\d])(?=.*[\w])[a-zA-Z\d\W_]{8,20}$/.test(s) ? "" : e;
+  }, F = (s) => {
+    let e = "", i = !1;
+    e += d("das-ui-business-components-change-pwd-limit-number", o.pwdMinLength);
+    const m = `\\S{${o.pwdMinLength},}`;
+    return new RegExp(m).test(s) || (i = !0), (o.pwdRequireNum || o.pwdRequireLowercaseLetters || o.pwdRequireUppercaseLetters || o.pwdRequireSpecialCharacter) && (e += d("必须包含")), o.pwdRequireNum && (e += d("数字，"), /\d+/.test(s) || (i = !0)), o.pwdRequireLowercaseLetters && (e += d("小写字母，"), /[a-z]+/.test(s) || (i = !0)), o.pwdRequireUppercaseLetters && (e += d("大写字母，"), /[A-Z]+/.test(s) || (i = !0)), o.pwdRequireSpecialCharacter && (e += d("符号，"), /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~]+/.test(s) || (i = !0)), i ? e.slice(0, -1) : "";
   };
   return {
-    visible: w,
-    formData: d,
-    form: m,
-    rules: P,
-    openDialog: b,
-    onCancel: p,
+    visible: p,
+    formData: l,
+    form: a,
+    rules: R,
+    openDialog: k,
+    onCancel: u,
     onConfirm: async () => {
-      var o;
-      (o = m.value) == null || o.validate(async (e) => {
+      var s;
+      (s = a.value) == null || s.validate(async (e) => {
+        const i = await se(pe), [m, h, T] = await Promise.all([
+          i(l.value.pwd),
+          i(l.value.confirmPwd),
+          i(l.value.prePwd)
+        ]);
         if (e) {
-          const a = {
-            pwd: k(d.value.pwd),
-            confirmPwd: k(d.value.confirmPwd)
+          const P = {
+            pwd: m,
+            confirmPwd: h
           };
-          if (n.mainApp === "enterpriseadmin" && n.forceUpdate) {
-            let i = {};
-            c.value && (i = { headers: { Authorization: c.value } }), await S({}, i).run();
-            const [C] = await A({}, i).run(a);
-            if (C) return;
-          } else if (a.prePwd = k(d.value.prePwd), n.mainApp === "enterpriseadmin") {
-            await S().run();
-            const [i] = await A().run(a);
-            if (i) return;
+          if (r.mainApp === "enterpriseadmin" && r.forceUpdate) {
+            let f = {};
+            g.value && (f = { headers: { Authorization: g.value } }), await M({}, f).run();
+            const [B] = await K({}, f).run(P);
+            if (B) return;
+          } else if (P.prePwd = T, r.mainApp === "enterpriseadmin") {
+            await M().run();
+            const [f] = await K().run(P);
+            if (f) return;
           } else {
-            const [i] = await H().run(a);
-            if (i) return;
+            const [f] = await re().run(P);
+            if (f) return;
           }
-          p(!0), K.success(s("修改密码成功！")), f("onConfirm");
+          u(!0), Y.success(d("修改密码成功！")), n("onConfirm");
         }
       });
     }
   };
-}, X = { class: "dialog-content" }, ee = {
+}, le = { class: "dialog-content" }, ue = {
   name: "ChangePwd"
-}, re = /* @__PURE__ */ T({
-  ...ee,
+}, we = /* @__PURE__ */ O({
+  ...ue,
   props: {
     mainApp: { default: "enterpriseadmin" },
     forceUpdate: { type: Boolean }
   },
   emits: ["onCancel", "onConfirm"],
-  setup(n, { expose: f, emit: w }) {
-    const m = n, d = w, { visible: t, form: L, formData: l, rules: _, openDialog: N, onCancel: P, onConfirm: c } = Q(m, d);
-    return f({
+  setup(r, { expose: n, emit: p }) {
+    const a = r, l = p, { visible: o, form: _, formData: w, rules: L, openDialog: N, onCancel: R, onConfirm: g } = de(a, l);
+    return n({
       openDialog: N
-    }), (b, p) => (y(), v(r(Z), {
-      title: r(s)("修改密码"),
+    }), (k, u) => (A(), V(t(G), {
+      title: t(d)("修改密码"),
       width: "460px",
       height: "360px",
       bodyStyle: { padding: 0 },
-      modelValue: r(t),
-      "onUpdate:modelValue": p[3] || (p[3] = (u) => $(t) ? t.value = u : null),
-      "before-close": r(P)
+      modelValue: t(o),
+      "onUpdate:modelValue": u[3] || (u[3] = (c) => $(o) ? o.value = c : null),
+      "before-close": t(R)
     }, {
-      footer: g(() => [
-        z("div", null, [
-          h(r(U), {
+      footer: C(() => [
+        S("div", null, [
+          y(t(U), {
             size: "middle",
             style: { "margin-right": "12px" },
-            onClick: r(P)
+            onClick: t(R)
           }, {
-            default: g(() => [
-              V(
-                D(r(x)("取消").value),
+            default: C(() => [
+              x(
+                E(t(D)("取消").value),
                 1
                 /* TEXT */
               )
@@ -147,14 +189,14 @@ const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A =
             _: 1
             /* STABLE */
           }, 8, ["onClick"]),
-          h(r(U), {
+          y(t(U), {
             btnType: "primary",
             size: "middle",
-            onClick: r(c)
+            onClick: t(g)
           }, {
-            default: g(() => [
-              V(
-                D(r(x)("确定").value),
+            default: C(() => [
+              x(
+                E(t(D)("确定").value),
                 1
                 /* TEXT */
               )
@@ -164,51 +206,51 @@ const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A =
           }, 8, ["onClick"])
         ])
       ]),
-      default: g(() => [
-        z("div", X, [
-          h(r(G), {
+      default: C(() => [
+        S("div", le, [
+          y(t(X), {
             ref_key: "form",
-            ref: L,
-            rules: r(_),
+            ref: _,
+            rules: t(L),
             style: { "overflow-x": "hidden !important" }
           }, {
-            default: g(() => [
-              b.forceUpdate ? I("v-if", !0) : (y(), v(r(q), {
+            default: C(() => [
+              k.forceUpdate ? Z("v-if", !0) : (A(), V(t(q), {
                 key: 0,
                 type: "password",
                 isTitle: !1,
                 autocomplete: "new-password",
                 "show-password": "",
                 prop: "prePwd",
-                label: r(s)("旧密码"),
-                modelValue: r(l).prePwd,
-                "onUpdate:modelValue": p[0] || (p[0] = (u) => r(l).prePwd = u),
+                label: t(d)("旧密码"),
+                modelValue: t(w).prePwd,
+                "onUpdate:modelValue": u[0] || (u[0] = (c) => t(w).prePwd = c),
                 modelModifiers: { trim: !0 },
                 maxlength: 20,
                 required: ""
               }, null, 8, ["label", "modelValue"])),
-              h(r(q), {
+              y(t(q), {
                 type: "password",
                 isTitle: !1,
                 autocomplete: "new-password",
                 "show-password": "",
                 prop: "pwd",
-                label: r(s)("新密码"),
-                modelValue: r(l).pwd,
-                "onUpdate:modelValue": p[1] || (p[1] = (u) => r(l).pwd = u),
+                label: t(d)("新密码"),
+                modelValue: t(w).pwd,
+                "onUpdate:modelValue": u[1] || (u[1] = (c) => t(w).pwd = c),
                 modelModifiers: { trim: !0 },
                 maxlength: 20,
                 required: ""
               }, null, 8, ["label", "modelValue"]),
-              h(r(q), {
+              y(t(q), {
                 type: "password",
                 isTitle: !1,
                 autocomplete: "new-password",
                 "show-password": "",
                 prop: "confirmPwd",
-                label: r(s)("确认新密码"),
-                modelValue: r(l).confirmPwd,
-                "onUpdate:modelValue": p[2] || (p[2] = (u) => r(l).confirmPwd = u),
+                label: t(d)("确认新密码"),
+                modelValue: t(w).confirmPwd,
+                "onUpdate:modelValue": u[2] || (u[2] = (c) => t(w).confirmPwd = c),
                 modelModifiers: { trim: !0 },
                 maxlength: 20,
                 required: ""
@@ -223,12 +265,12 @@ const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A =
       /* STABLE */
     }, 8, ["title", "modelValue", "before-close"]));
   }
-}), te = (n, f) => {
-  const w = n.__vccOpts || n;
-  for (const [m, d] of f)
-    w[m] = d;
-  return w;
-}, oe = /* @__PURE__ */ te(re, [["__scopeId", "data-v-901c1af6"]]), ae = {
+}), ce = (r, n) => {
+  const p = r.__vccOpts || r;
+  for (const [a, l] of n)
+    p[a] = l;
+  return p;
+}, me = /* @__PURE__ */ ce(we, [["__scopeId", "data-v-901c1af6"]]), fe = {
   新密码不能为空: { "zh-CN": "新密码不能为空", en: "New password cannot be empty", _appCode: "framework" },
   确认密码不能为空: { "zh-CN": "确认密码不能为空", en: "Confirm password cannot be empty", _appCode: "framework" },
   与新密码不一致: { "zh-CN": "与新密码不一致", en: "Doesn't match the new password", _appCode: "framework" },
@@ -260,9 +302,9 @@ const S = M.get("/user/change-pwd", (n) => (n.ignoreErrorMessage = !0, n)), A =
     _appCode: "framework"
   }
 };
-O(ae);
-const Ce = B(oe), ge = () => R(null);
+j(fe);
+const qe = W(me), ve = () => b(null);
 export {
-  Ce as DasChangePwd,
-  ge as DasChangePwdRef
+  qe as DasChangePwd,
+  ve as DasChangePwdRef
 };

package/packages/business-components/change-pwd/src/get-public-key.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 获取 EnterpriseRight 服务的 RSA 公钥字符串。
+ * 请求失败时返回空字符串，由调用方兼容旧编码方式。
+ */
+export declare const getEnterpriseRightPublicKey: () => Promise<string>;
+/**
+ * 获取 OAuth 服务的 RSA 公钥字符串。
+ * 请求失败时返回空字符串，由调用方兼容旧编码方式。
+ */
+export declare const getAuthPublicKey: () => Promise<string>;

package/packages/business-components/change-pwd/src/password-encryption.d.ts

@@ -0,0 +1,8 @@
+type GetPublicKey = () => Promise<string>;
+export type SensitiveValueEncryptor = (value: string) => Promise<string>;
+/**
+ * 根据对应服务的公钥创建敏感值加密函数。
+ * 公钥不可用时保留原编码方式，确保兼容尚未启用 RSA 的服务。
+ */
+export declare const createSensitiveValueEncryptor: (getPublicKey: GetPublicKey) => Promise<SensitiveValueEncryptor>;
+export {};