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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "7.1.0-dev.28",
+  "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.28",
+    "@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.28",
-    "@das-fed/utils": "7.1.0-dev.28",
-    "@das-fed/web": "7.1.0-dev.28",
+    "@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,31 +1,31 @@
 import '@das-fed/ui/packages/business-components/change-pwd/style.css';
-import { ref as y, reactive as F, defineComponent as T, createBlock as v, openBlock as z, unref as t, isRef as B, withCtx as h, createElementVNode as V, createVNode as C, createCommentVNode as I, createTextVNode as A, toDisplayString as S } from "vue";
-import { withInstall as O } from "@das-fed/utils/with-install/index";
-import { t as d, i18n as x, setI18nRule as $ } 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 j } from "@das-fed/ui/packages/components/form/index";
-import { DasFormItem as N } from "@das-fed/ui/packages/components/form-item/index";
-import { DasButton as E } from "@das-fed/ui/packages/components/button/index";
-import { DasMessage as G } from "@das-fed/ui/packages/components/message/index";
-import { enterpriseright as q, superadminPortal as H, systemConfiguration as X, justauth as Y } from "@das-fed/utils/api-services/modules";
-import { encryption as k } from "@das-fed/utils/atob";
-const D = q.get("/user/change-pwd", (r) => (r.ignoreErrorMessage = !0, r)), U = q.put("/user/change-pwd", (r) => (r.csrf = !0, r)), J = H.put("/change-pwd"), Q = X.get("/visitor/login/with-default"), ee = "RSA_V1:", re = async (r) => {
+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 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"]);
-}, te = (r) => {
+}, 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);
-}, ne = async (r) => {
+}, se = async (r) => {
   try {
     const n = await r();
     if (!n.trim())
-      return async (a) => k(a);
-    const p = await re(n);
+      return async (a) => v(a);
+    const p = await ae(n);
     return async (a) => {
       try {
         const l = await window.crypto.subtle.encrypt(
@@ -33,25 +33,25 @@ const D = q.get("/user/change-pwd", (r) => (r.ignoreErrorMessage = !0, r)), U =
           p,
           new TextEncoder().encode(a)
         );
-        return ee + te(l);
+        return ne + oe(l);
       } catch {
-        return k(a);
+        return v(a);
       }
     };
   } catch {
-    return async (n) => k(n);
+    return async (n) => v(n);
   }
-}, ae = q.get("/visitor/rsa/public-key", (r) => (r.ignoreErrorMessage = !0, r));
-Y.get("/rsa/public-key", (r) => (r.ignoreErrorMessage = !0, r));
-const oe = async () => {
-  const [r, n] = await ae().run();
+}, 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 : "";
-}, se = (r, n) => {
-  const p = y(!1), a = W(), l = y({
+}, de = (r, n) => {
+  const p = b(!1), a = H(), l = b({
     prePwd: "",
     pwd: "",
     confirmPwd: ""
-  }), o = F({
+  }), o = I({
     pwdStrongLimit: !1,
     // 是否开启密码强度校验
     pwdRequireLength: !1,
@@ -66,29 +66,29 @@ const oe = async () => {
     // 密码要求包含大写字母
     pwdRequireSpecialCharacter: !1
     // 密码要求特殊字符
-  }), R = async () => {
-    const [s, e] = await Q().run();
+  }), _ = 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);
-  }, m = (s) => {
+  }, w = (s) => {
     let e = "";
-    return o.pwdStrongLimit ? e = M(s) : e = f(s), e;
-  }, P = (s, e, i) => {
-    var u;
+    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 c = m(e);
-      if ((u = a.value) == null || u.validateField("confirmPwd", () => null), c) return i(new Error(c));
+      const h = w(e);
+      if ((m = a.value) == null || m.validateField("confirmPwd", () => null), h) return i(new Error(h));
     }
     i();
-  }, _ = (s, e, 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 u = m(e);
-      if (u) return i(new Error(u));
+      const m = w(e);
+      if (m) return i(new Error(m));
     }
     i();
-  }, b = y({
+  }, R = b({
     prePwd: [
       {
         required: !r.forceUpdate,
@@ -96,88 +96,92 @@ const oe = async () => {
         trigger: "blur"
       }
     ],
-    pwd: [{ validator: P, trigger: "blur" }],
-    confirmPwd: [{ validator: _, trigger: "blur" }]
-  }), g = y(""), L = (s) => {
-    r.mainApp === "enterpriseadmin" && R(), p.value = !0, g.value = s || "";
-  }, w = (s = !1) => {
+    pwd: [{ validator: L, trigger: "blur" }],
+    confirmPwd: [{ validator: N, trigger: "blur" }]
+  }), g = b(""), k = (s) => {
+    r.mainApp === "enterpriseadmin" && _(), p.value = !0, g.value = s || "";
+  }, u = (s = !1) => {
     var e;
     l.value.prePwd = "", l.value.pwd = "", l.value.confirmPwd = "", (e = a.value) == null || e.resetField(), p.value = !1, s || n("onCancel");
-  }, f = (s) => {
+  }, 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;
-  }, M = (s) => {
+  }, F = (s) => {
     let e = "", i = !1;
     e += d("das-ui-business-components-change-pwd-limit-number", o.pwdMinLength);
-    const u = `\\S{${o.pwdMinLength},}`;
-    return new RegExp(u).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) : "";
+    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: p,
     formData: l,
     form: a,
-    rules: b,
-    openDialog: L,
-    onCancel: w,
+    rules: R,
+    openDialog: k,
+    onCancel: u,
     onConfirm: async () => {
       var s;
       (s = a.value) == null || s.validate(async (e) => {
-        const i = await ne(oe);
+        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 u = {
-            pwd: i(l.value.pwd),
-            confirmPwd: i(l.value.confirmPwd)
+          const P = {
+            pwd: m,
+            confirmPwd: h
           };
           if (r.mainApp === "enterpriseadmin" && r.forceUpdate) {
-            let c = {};
-            g.value && (c = { headers: { Authorization: g.value } }), await D({}, c).run();
-            const [K] = await U({}, c).run(u);
-            if (K) return;
-          } else if (u.prePwd = i(l.value.prePwd), r.mainApp === "enterpriseadmin") {
-            await D().run();
-            const [c] = await U().run(u);
-            if (c) return;
+            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 [c] = await J().run(u);
-            if (c) return;
+            const [f] = await re().run(P);
+            if (f) return;
           }
-          w(!0), G.success(d("修改密码成功！")), n("onConfirm");
+          u(!0), Y.success(d("修改密码成功！")), n("onConfirm");
         }
       });
     }
   };
-}, ie = { class: "dialog-content" }, pe = {
+}, le = { class: "dialog-content" }, ue = {
   name: "ChangePwd"
-}, de = /* @__PURE__ */ T({
-  ...pe,
+}, we = /* @__PURE__ */ O({
+  ...ue,
   props: {
     mainApp: { default: "enterpriseadmin" },
     forceUpdate: { type: Boolean }
   },
   emits: ["onCancel", "onConfirm"],
   setup(r, { expose: n, emit: p }) {
-    const a = r, l = p, { visible: o, form: R, formData: m, rules: P, openDialog: _, onCancel: b, onConfirm: g } = se(a, l);
+    const a = r, l = p, { visible: o, form: _, formData: w, rules: L, openDialog: N, onCancel: R, onConfirm: g } = de(a, l);
     return n({
-      openDialog: _
-    }), (L, w) => (z(), v(t(Z), {
+      openDialog: N
+    }), (k, u) => (A(), V(t(G), {
       title: t(d)("修改密码"),
       width: "460px",
       height: "360px",
       bodyStyle: { padding: 0 },
       modelValue: t(o),
-      "onUpdate:modelValue": w[3] || (w[3] = (f) => B(o) ? o.value = f : null),
-      "before-close": t(b)
+      "onUpdate:modelValue": u[3] || (u[3] = (c) => $(o) ? o.value = c : null),
+      "before-close": t(R)
     }, {
-      footer: h(() => [
-        V("div", null, [
-          C(t(E), {
+      footer: C(() => [
+        S("div", null, [
+          y(t(U), {
             size: "middle",
             style: { "margin-right": "12px" },
-            onClick: t(b)
+            onClick: t(R)
           }, {
-            default: h(() => [
-              A(
-                S(t(x)("取消").value),
+            default: C(() => [
+              x(
+                E(t(D)("取消").value),
                 1
                 /* TEXT */
               )
@@ -185,14 +189,14 @@ const oe = async () => {
             _: 1
             /* STABLE */
           }, 8, ["onClick"]),
-          C(t(E), {
+          y(t(U), {
             btnType: "primary",
             size: "middle",
             onClick: t(g)
           }, {
-            default: h(() => [
-              A(
-                S(t(x)("确定").value),
+            default: C(() => [
+              x(
+                E(t(D)("确定").value),
                 1
                 /* TEXT */
               )
@@ -202,16 +206,16 @@ const oe = async () => {
           }, 8, ["onClick"])
         ])
       ]),
-      default: h(() => [
-        V("div", ie, [
-          C(t(j), {
+      default: C(() => [
+        S("div", le, [
+          y(t(X), {
             ref_key: "form",
-            ref: R,
-            rules: t(P),
+            ref: _,
+            rules: t(L),
             style: { "overflow-x": "hidden !important" }
           }, {
-            default: h(() => [
-              L.forceUpdate ? I("v-if", !0) : (z(), v(t(N), {
+            default: C(() => [
+              k.forceUpdate ? Z("v-if", !0) : (A(), V(t(q), {
                 key: 0,
                 type: "password",
                 isTitle: !1,
@@ -219,34 +223,34 @@ const oe = async () => {
                 "show-password": "",
                 prop: "prePwd",
                 label: t(d)("旧密码"),
-                modelValue: t(m).prePwd,
-                "onUpdate:modelValue": w[0] || (w[0] = (f) => t(m).prePwd = f),
+                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"])),
-              C(t(N), {
+              y(t(q), {
                 type: "password",
                 isTitle: !1,
                 autocomplete: "new-password",
                 "show-password": "",
                 prop: "pwd",
                 label: t(d)("新密码"),
-                modelValue: t(m).pwd,
-                "onUpdate:modelValue": w[1] || (w[1] = (f) => t(m).pwd = f),
+                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"]),
-              C(t(N), {
+              y(t(q), {
                 type: "password",
                 isTitle: !1,
                 autocomplete: "new-password",
                 "show-password": "",
                 prop: "confirmPwd",
                 label: t(d)("确认新密码"),
-                modelValue: t(m).confirmPwd,
-                "onUpdate:modelValue": w[2] || (w[2] = (f) => t(m).confirmPwd = f),
+                modelValue: t(w).confirmPwd,
+                "onUpdate:modelValue": u[2] || (u[2] = (c) => t(w).confirmPwd = c),
                 modelModifiers: { trim: !0 },
                 maxlength: 20,
                 required: ""
@@ -261,12 +265,12 @@ const oe = async () => {
       /* STABLE */
     }, 8, ["title", "modelValue", "before-close"]));
   }
-}), le = (r, n) => {
+}), ce = (r, n) => {
   const p = r.__vccOpts || r;
   for (const [a, l] of n)
     p[a] = l;
   return p;
-}, ue = /* @__PURE__ */ le(de, [["__scopeId", "data-v-901c1af6"]]), we = {
+}, 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" },
@@ -298,9 +302,9 @@ const oe = async () => {
     _appCode: "framework"
   }
 };
-$(we);
-const Le = O(ue), Ne = () => y(null);
+j(fe);
+const qe = W(me), ve = () => b(null);
 export {
-  Le as DasChangePwd,
-  Ne as DasChangePwdRef
+  qe as DasChangePwd,
+  ve as DasChangePwdRef
 };