@witlink/usercenter 1.2.75 → 1.2.76

package/dist/usercenter.es.js

@@ -307,12 +307,12 @@ const useUserStore = defineStore(`${TOKEN_PREFIX}user`, {
       });
     },
     setUserInfo(result) {
-      var _a;
+      var _a, _b;
       const curButtonPermission = {};
-      if (result.role && ((_a = result.role.permissions) == null ? void 0 : _a.length) > 0) {
+      if (result.role) {
         const role = result.role;
         const otherRoles = result.otherRoles;
-        role.permissions.map((per) => {
+        (_a = role.permissions) == null ? void 0 : _a.forEach((per) => {
           var _a2;
           if (per.actionEntitySet != null && ((_a2 = per.actionEntitySet) == null ? void 0 : _a2.length) > 0) {
             const action = per.actionEntitySet.map((action2) => {
@@ -322,9 +322,9 @@ const useUserStore = defineStore(`${TOKEN_PREFIX}user`, {
             curButtonPermission[per.permissionId] = action;
           }
         });
-        role.permissionList = role.permissions.map((permission2) => {
+        role.permissionList = ((_b = role.permissions) == null ? void 0 : _b.map((permission2) => {
           return permission2.permissionId;
-        });
+        })) || [];
         const mainWarehouseManager = role.roleTypeId === "0";
         const othersWarehouseManager = otherRoles ? otherRoles.some((item) => item.roleTypeId === "0") : false;
         const isWarehouseManager = mainWarehouseManager || othersWarehouseManager;
@@ -346,8 +346,6 @@ const useUserStore = defineStore(`${TOKEN_PREFIX}user`, {
         this.isWarehouseManager = isWarehouseManager;
         this.avatar = "usercenter/" + result.avatar;
         this.passwordSecurityLevel = result.passwordSecurityLevel;
-      } else {
-        storage.remove(ACCESS_TOKEN);
       }
     },
     setIsLock(val) {
@@ -13047,11 +13045,14 @@ const usePasswordStrength = () => {
   };
 };
 const _hoisted_1$k = { class: "pwd-strength-tip" };
+const FORCE_RESET_PWD_SYNC_KEY$1 = "forceResetPwdSync";
 const _sfc_main$J = /* @__PURE__ */ defineComponent({
   __name: "ForceResetPwdModal",
-  setup(__props, { expose: __expose }) {
+  emits: ["success"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const { t: t2 } = useI18n();
     const { passwordStrengthTip, validate } = usePasswordStrength();
+    const emit = __emit;
     const formRef = ref();
     const form = reactive({
       oldPwd: "",
@@ -13108,13 +13109,16 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
       resetCallback = callback || null;
       visible.value = true;
     };
-    const onReset = () => {
+    const resetForm = () => {
       Object.assign(form, {
         oldPwd: "",
         newPwd: "",
         userPwd1: ""
       });
     };
+    const onReset = () => {
+      resetForm();
+    };
     const onSubmit = () => {
       formRef.value && formRef.value.validate().then(async () => {
         loading.value = true;
@@ -13124,20 +13128,17 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
         };
         try {
           const res = await updatePassword(paramsData);
-          if (res.code === 0) {
+          if (res.code == 0) {
             visible.value = false;
-            Object.assign(form, {
-              oldPwd: "",
-              newPwd: "",
-              userPwd1: ""
-            });
+            resetForm();
             message.success({
               content: t2("uc_user.resetPwdSucc")
             });
+            storage.set(FORCE_RESET_PWD_SYNC_KEY$1, Date.now());
+            emit("success");
             if (resetCallback) {
               resetCallback();
             }
-            window.dispatchEvent(new CustomEvent("forceResetPwdSuccess"));
           }
         } finally {
           loading.value = false;
@@ -38818,7 +38819,6 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_a_textarea, {
                       placeholder: _ctx.$t("uc_organ.parentBranch"),
-                      maxLength: 256,
                       disabled: "",
                       value: form.parentBranch,
                       "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.parentBranch = $event),
@@ -38834,7 +38834,6 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_a_textarea, {
                       placeholder: _ctx.$t("uc_organ.superiorRegion"),
-                      maxLength: 256,
                       disabled: "",
                       value: form.parentRegion,
                       "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.parentRegion = $event),
@@ -39126,7 +39125,6 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_a_input, {
                       placeholder: _ctx.$t("uc_organ.parentBranch"),
-                      maxLength: 20,
                       disabled: "",
                       value: form.parentBranch,
                       "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.parentBranch = $event)
@@ -39777,7 +39775,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
             addOrDeleRefresh(activeEditRow.value);
           } else {
             activeEditRow.value.hasChild = true;
-            activeEditRow.value.status = 0;
+            activeEditRow.value.deletable = 0;
             tableRef.value.updateStatus(activeEditRow.value);
           }
         }
@@ -40117,7 +40115,10 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
                                         _: 2
                                       }, 1024)
                                     ], 512), [
-                                      [vShow, row.type == "1" && addShow.value]
+                                      [
+                                        vShow,
+                                        row.type == "1" && row.hasChild == false && addShow.value
+                                      ]
                                     ]),
                                     withDirectives(createElementVNode("div", null, [
                                       createVNode(_component_a_menu_item, { key: "2" }, {
@@ -41834,15 +41835,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         name: [
           {
             required: true,
-            trigger: ["change", "blur"],
-            message: t2("uc_user.user_name_msg1"),
-            validator: (rule, value) => {
-              if (!value || /^\s+$/.test(value)) {
-                return Promise.reject(t2("uc_user.user_name_msg1"));
-              } else {
-                return Promise.resolve();
-              }
-            }
+            message: t2("uc_user.user_name_msg1")
           }
         ],
         branchId: [
@@ -42062,7 +42055,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           value: form.value.code,
                           "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.value.code = $event),
-                          maxlength: 64,
+                          maxlength: 50,
                           autocomplete: "off"
                         }, null, 8, ["placeholder", "value"])
                       ]),
@@ -42080,14 +42073,14 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_a_form_item, {
                       label: _ctx.$t("uc_user.userName"),
-                      name: "userName"
+                      name: "name"
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_a_input, {
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           value: form.value.name,
                           "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.value.name = $event),
-                          maxlength: 64,
+                          maxlength: 100,
                           autocomplete: "off"
                         }, null, 8, ["placeholder", "value"])
                       ]),
@@ -42234,7 +42227,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                           "onUpdate:value": _cache[7] || (_cache[7] = ($event) => form.value.email = $event),
                           disabled: props.params.opType == "2",
                           autocomplete: "off",
-                          maxlength: 100
+                          maxlength: 32
                         }, null, 8, ["placeholder", "value", "disabled"])
                       ]),
                       _: 1
@@ -42894,13 +42887,13 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
             }, {
               default: withCtx(() => [
                 createVNode(_component_a_form_item, {
-                  label: _ctx.$t("uc_user.userName"),
-                  name: "name"
+                  label: _ctx.$t("uc_user.userCode"),
+                  name: "code"
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_a_input, {
-                      value: queryParam.value.name,
-                      "onUpdate:value": _cache[0] || (_cache[0] = ($event) => queryParam.value.name = $event),
+                      value: queryParam.value.code,
+                      "onUpdate:value": _cache[0] || (_cache[0] = ($event) => queryParam.value.code = $event),
                       placeholder: _ctx.$t("uc_common.plsEnter"),
                       autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
@@ -42908,13 +42901,13 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                   _: 1
                 }, 8, ["label"]),
                 createVNode(_component_a_form_item, {
-                  label: _ctx.$t("uc_user.userCode"),
-                  name: "code"
+                  label: _ctx.$t("uc_user.userName"),
+                  name: "name"
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_a_input, {
-                      value: queryParam.value.code,
-                      "onUpdate:value": _cache[1] || (_cache[1] = ($event) => queryParam.value.code = $event),
+                      value: queryParam.value.name,
+                      "onUpdate:value": _cache[1] || (_cache[1] = ($event) => queryParam.value.name = $event),
                       placeholder: _ctx.$t("uc_common.plsEnter"),
                       autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
@@ -43169,7 +43162,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
                     value: formState.userName,
                     "onUpdate:value": _cache[0] || (_cache[0] = ($event) => formState.userName = $event),
                     placeholder: _ctx.$t("uc_common.plsEnter"),
-                    maxlength: 64,
+                    maxlength: 100,
                     "show-count": "",
                     autocomplete: "off"
                   }, null, 8, ["value", "placeholder"])
@@ -43304,7 +43297,6 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
                     value: formState.pwd,
                     "onUpdate:value": _cache[0] || (_cache[0] = ($event) => formState.pwd = $event),
                     placeholder: _ctx.$t("uc_common.plsEnter"),
-                    maxlength: 20,
                     autocomplete: "new-password"
                   }, null, 8, ["value", "placeholder"])
                 ]),
@@ -43517,7 +43509,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
                     value: formState.email,
                     "onUpdate:value": _cache[1] || (_cache[1] = ($event) => formState.email = $event),
                     placeholder: _ctx.$t("uc_common.plsEnter"),
-                    maxlength: 100
+                    maxlength: 32
                   }, null, 8, ["value", "placeholder"])
                 ]),
                 _: 1
@@ -46177,7 +46169,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           value: form.userEmail,
                           "onUpdate:value": _cache[11] || (_cache[11] = ($event) => form.userEmail = $event),
-                          maxlength: 100
+                          maxlength: 32
                         }, null, 8, ["disabled", "placeholder", "value"])
                       ]),
                       _: 1
@@ -48183,6 +48175,7 @@ const inhe = {
     Vue.component("uc-pick-label", PickLabel);
   }
 };
+const FORCE_RESET_PWD_SYNC_KEY = "forceResetPwdSync";
 let forceResetPwdModalInstance = null;
 function changeTheme(options) {
   changeTheme$1(options);
@@ -48194,6 +48187,20 @@ function openResetPassword(callback) {
   }
   const container = document.createElement("div");
   let compRef = null;
+  function handleForceResetPwdStorage(event) {
+    if (event.key === `${TOKEN_PREFIX}${FORCE_RESET_PWD_SYNC_KEY}` && event.newValue) {
+      forceResetPwdModalInstance == null ? void 0 : forceResetPwdModalInstance.close();
+    }
+  }
+  function closeModal() {
+    if (!forceResetPwdModalInstance) {
+      return;
+    }
+    app.unmount();
+    container.remove();
+    forceResetPwdModalInstance = null;
+    window.removeEventListener("storage", handleForceResetPwdStorage);
+  }
   const app = createApp({
     setup() {
       compRef = ref();
@@ -48208,7 +48215,12 @@ function openResetPassword(callback) {
             height: "100%"
           }
         },
-        [h(ForceResetPwdModal, { ref: compRef })]
+        [
+          h(ForceResetPwdModal, {
+            ref: compRef,
+            onSuccess: closeModal
+          })
+        ]
       );
     }
   });
@@ -48224,19 +48236,13 @@ function openResetPassword(callback) {
       });
     },
     destroy: () => {
-      app.unmount();
-      container.remove();
-      forceResetPwdModalInstance = null;
+      closeModal();
     },
     close: () => {
-      app.unmount();
-      container.remove();
-      forceResetPwdModalInstance = null;
+      closeModal();
     }
   };
-  window.addEventListener("forceResetPwdSuccess", () => {
-    forceResetPwdModalInstance == null ? void 0 : forceResetPwdModalInstance.close();
-  });
+  window.addEventListener("storage", handleForceResetPwdStorage);
   forceResetPwdModalInstance.showModal(callback);
 }
 function setToken(token) {