jmash-core 0.1.14 → 0.1.15

package/dist/{types-CIxV5TtA.mjs → types-3onZoSqF.mjs}

@@ -1,12 +1,12 @@
-import { createElementBlock as I, openBlock as y, createElementVNode as u, defineComponent as B, ref as V, reactive as f, resolveComponent as i, Fragment as D, createVNode as t, withCtx as l, createTextVNode as _, toDisplayString as v } from "vue";
-import { t as E, b as w, v as N, w as q, x as R } from "./index-CVxxMlrU.mjs";
-const S = {
+import { createElementBlock as y, openBlock as k, createElementVNode as u, defineComponent as M, ref as I, reactive as f, resolveComponent as i, Fragment as $, createVNode as t, withCtx as l, createTextVNode as _, toDisplayString as C } from "vue";
+import { t as z, v, b as w, w as A, x as B } from "./index-Bd-9PguH.mjs";
+const N = {
   viewBox: "0 0 1024 1024",
   width: "1.2em",
   height: "1.2em"
 };
-function A(k, c) {
-  return y(), I("svg", S, c[0] || (c[0] = [
+function T(x, c) {
+  return k(), y("svg", N, c[0] || (c[0] = [
     u("path", {
       fill: "currentColor",
       d: "M160 160v704h704V160zm-32-64h768a32 32 0 0 1 32 32v768a32 32 0 0 1-32 32H128a32 32 0 0 1-32-32V128a32 32 0 0 1 32-32"
@@ -17,10 +17,10 @@ function A(k, c) {
     }, null, -1)
   ]));
 }
-const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { class: "image-slot" }, j = { class: "dialog-footer" }, J = /* @__PURE__ */ B({
+const q = { name: "ep-picture", render: T }, S = { class: "h-[40px]" }, L = { class: "image-slot" }, O = { class: "dialog-footer" }, Y = /* @__PURE__ */ M({
   __name: "types",
-  setup(k) {
-    const c = V(), m = f({
+  setup(x) {
+    const c = I(), m = f({
       title: "",
       visible: !1
     }), n = f({
@@ -32,22 +32,22 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
       captchaId: "",
       captchaCode: "",
       validCode: ""
-    }), g = V(), C = f({
+    }), g = I(), h = f({
       captchaCode: [{ required: !0, message: "请输入验证码", trigger: "blur" }],
       name: [{ required: !0, message: "请输入邮箱或手机号", trigger: "blur" }]
       // validCode: [
       //   { required: true, message: "请输入6位数字的验证码", trigger: "blur" },
       // ],
     });
-    function h() {
-      E().then(({ data: a }) => {
+    function b() {
+      z().then(({ data: a }) => {
         o.captchaId = a.captchaId, c.value = a.base64Image, m.visible = !0, o.captchaCode = "";
       });
     }
-    function x() {
-      h();
+    function D() {
+      b();
     }
-    const F = async () => {
+    const P = async () => {
       var a;
       await ((a = g.value) == null ? void 0 : a.validate((e) => {
         if (e) {
@@ -56,9 +56,12 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
             tenant: w().user.tenant,
             name: o.name,
             captchaId: o.captchaId,
-            captchaCode: o.captchaCode
+            captchaCode: o.captchaCode,
+            sendValidCode: !0,
+            directoryId: v.APP_DIRECTORY_ID,
+            product: v.APP_PRODUCT
           };
-          N(p).then(({ data: r }) => {
+          A(p).then(({ data: r }) => {
             console.log(r);
             const s = window.setInterval(() => {
               n.content = n.timers + "s后重新发送", n.timers--, n.disabled = !0, n.timers < 0 && (n.timers = 60, n.disabled = !1, n.content = "重新发送验证码", window.clearInterval(s));
@@ -67,28 +70,28 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
         }
       }));
     };
-    function M() {
+    function R() {
       const a = {
         tenant: w().user.tenant,
         directoryId: "jmash",
         name: o.name,
         validCode: o.validCode,
-        clientId: q.APP_CLIENT_ID,
+        clientId: v.APP_CLIENT_ID,
         scope: ""
       };
-      R(a).then((e) => {
+      B(a).then((e) => {
         console.log(e);
       });
     }
     return (a, e) => {
-      const p = i("el-input"), r = i("el-form-item"), s = i("el-button"), b = i("el-form"), U = L, $ = i("el-image"), z = i("el-dialog");
-      return y(), I(D, null, [
-        t(b, {
+      const p = i("el-input"), r = i("el-form-item"), s = i("el-button"), V = i("el-form"), U = q, E = i("el-image"), F = i("el-dialog");
+      return k(), y($, null, [
+        t(V, {
           ref_key: "ruleFormRef",
           ref: g,
           size: "large",
           model: o,
-          rules: C
+          rules: h
         }, {
           default: l(() => [
             t(r, { prop: "name" }, {
@@ -113,10 +116,10 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
                   append: l(() => [
                     t(s, {
                       disabled: n.disabled,
-                      onClick: x
+                      onClick: D
                     }, {
                       default: l(() => [
-                        _(v(n.content), 1)
+                        _(C(n.content), 1)
                       ]),
                       _: 1
                     }, 8, ["disabled"])
@@ -131,7 +134,7 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
                 t(s, {
                   type: "primary",
                   class: "w-full",
-                  onClick: M
+                  onClick: R
                 }, {
                   default: l(() => e[5] || (e[5] = [
                     _(" 登录 ")
@@ -145,39 +148,39 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
           ]),
           _: 1
         }, 8, ["model", "rules"]),
-        t(z, {
+        t(F, {
           title: "提示",
           modelValue: m.visible,
           "onUpdate:modelValue": e[4] || (e[4] = (d) => m.visible = d),
           width: "500px"
         }, {
           footer: l(() => [
-            u("div", j, [
+            u("div", O, [
               t(s, {
                 onClick: e[3] || (e[3] = (d) => m.visible = !1)
               }, {
                 default: l(() => [
-                  _(v(a.$t("common.cancel")), 1)
+                  _(C(a.$t("common.cancel")), 1)
                 ]),
                 _: 1
               }),
               t(s, {
                 type: "primary",
-                onClick: F
+                onClick: P
               }, {
                 default: l(() => [
-                  _(v(a.$t("common.confirm")), 1)
+                  _(C(a.$t("common.confirm")), 1)
                 ]),
                 _: 1
               })
             ])
           ]),
           default: l(() => [
-            t(b, {
+            t(V, {
               ref: "pwdFormRef",
               size: "large",
               model: o,
-              rules: C
+              rules: h
             }, {
               default: l(() => [
                 t(r, { prop: "captchaCode" }, {
@@ -189,14 +192,14 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
                       placeholder: a.$t("login.captchaCode"),
                       class: "w-[60%]"
                     }, null, 8, ["modelValue", "placeholder"]),
-                    u("div", P, [
-                      t($, {
+                    u("div", S, [
+                      t(E, {
                         src: c.value,
-                        onClick: h,
+                        onClick: b,
                         class: "w-[130px] h-[40px] cursor-pointer"
                       }, {
                         error: l(() => [
-                          u("div", T, [
+                          u("div", L, [
                             t(U)
                           ])
                         ]),
@@ -217,5 +220,5 @@ const L = { name: "ep-picture", render: A }, P = { class: "h-[40px]" }, T = { cl
   }
 });
 export {
-  J as default
+  Y as default
 };

package/dist/{updatePwd-DdNcURoD.mjs → updatePwd-Bje9j_CP.mjs}

@@ -1,4 +1,4 @@
-import { _ as f } from "./updatePwd.vue_vue_type_script_setup_true_lang-BiODj6l4.mjs";
+import { _ as f } from "./updatePwd.vue_vue_type_script_setup_true_lang-Z21pA8yn.mjs";
 export {
   f as default
 };

package/dist/{updatePwd.vue_vue_type_script_setup_true_lang-BiODj6l4.mjs → updatePwd.vue_vue_type_script_setup_true_lang-Z21pA8yn.mjs}

@@ -1,6 +1,6 @@
 import { defineComponent as q, ref as v, toRefs as E, reactive as V, resolveComponent as i, createBlock as O, openBlock as A, unref as t, isRef as D, withCtx as n, createVNode as r, createElementVNode as U, createTextVNode as g, toDisplayString as _ } from "vue";
 import { ElMessage as B } from "element-plus";
-import { y as b, aD as I } from "./index-CVxxMlrU.mjs";
+import { y as b, aD as I } from "./index-Bd-9PguH.mjs";
 import { useI18n as S } from "vue-i18n";
 const z = { class: "dialog-footer" }, G = /* @__PURE__ */ q({
   __name: "updatePwd",

package/dts/src/api/auth/index.d.ts

@@ -1,5 +1,5 @@
 import type { AxiosPromise } from "axios";
-import type { CaptchaResult, LoginData, LoginResult, UserInfo, RolesPerms, LoginQrcodeResp, LoginQrcodeReq, MyOrganList } from "./types";
+import type { CaptchaResult, LoginData, LoginResult, UserInfo, RolesPerms, LoginQrcodeResp, LoginQrcodeReq, MyOrganList, RegisterForm, SendValidCodeReq } from "./types";
 /**
  * 登录API
  *
@@ -7,6 +7,12 @@ import type { CaptchaResult, LoginData, LoginResult, UserInfo, RolesPerms, Login
  * @returns
  */
 export declare function loginApi(data: LoginData): AxiosPromise<LoginResult>;
+/**
+ * 手机号邮箱注册登录
+ * @param token
+ * @returns
+ */
+export declare function registerApi(data: RegisterForm): AxiosPromise<LoginResult>;
 /**
  * 刷新Token
  */
@@ -22,7 +28,7 @@ export declare function getCaptchaApi(): AxiosPromise<CaptchaResult>;
 /**
  * 获取手机号验证码
  */
-export declare function sendcode(data: any): AxiosPromise<CaptchaResult>;
+export declare function sendcode(data: SendValidCodeReq): AxiosPromise<CaptchaResult>;
 /**
  * 通过验证码登录
  */

package/dts/src/api/auth/types.d.ts

@@ -252,4 +252,30 @@ export interface MyOrganModel {
     appName: string;
     appQrcodeUrl: string;
 }
+export interface RegisterForm {
+    captchaCode?: string;
+    captchaId?: string;
+    tenant?: string;
+    requestId: string;
+    directoryId?: string;
+    clientId?: string;
+    name: string;
+    validCode: string;
+    realName?: string;
+    nickName: string;
+    avatar?: string;
+    birthDate?: string;
+    gender?: string;
+    pwd: string;
+    repeatPwd: string;
+}
+export interface SendValidCodeReq {
+    tenant: string;
+    directoryId: string;
+    name: string;
+    captchaId: string;
+    captchaCode: string;
+    product: string;
+    sendValidCode: boolean;
+}
 export {};

package/dts/src/components/JmashMultiImageUpload/index.vue.d.ts

@@ -59,7 +59,7 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
     width: number;
     pictureUrl: unknown[];
     height: number;
-    listType: "text" | "picture" | "picture-card";
+    listType: "picture" | "text" | "picture-card";
     limit: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dts/src/components/RegisterForm/index.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/dts/src/index.d.ts

@@ -27,12 +27,14 @@ import routerRef from "./router";
 export { routerRef };
 import directive from "./directive";
 export { directive };
-export { Layout, LoginPage, MultiFactorLoginPage, ProfilePage, Error401Page, Error404Page, DashboardPage, RedirectPage, ChangeOrgan, } from "./router";
+export { Layout, LoginPage, MultiFactorLoginPage, ProfilePage, Error401Page, Error404Page, DashboardPage, RedirectPage, ChangeOrgan, RegisterPage, } from "./router";
 import i18n from "./lang/index";
 export { i18n };
 import "element-plus/theme-chalk/dark/css-vars.css";
 import "./styles/index.scss";
 import "uno.css";
+import RegisterForm from "./components/RegisterForm/index.vue";
+export { RegisterForm };
 import type { IToolbarConfig, IEditorConfig, IDomEditor } from "@wangeditor-next/editor";
 export type { IToolbarConfig, IEditorConfig, IDomEditor };
 import "element-plus/theme-chalk/index.css";

package/dts/src/lang/package/zh-cn.d.ts

@@ -154,5 +154,32 @@ declare const _default: {
         imageLtRequired: string;
         fileLtRequired: string;
     };
+    register: {
+        register: string;
+        getValidCode: string;
+        name: string;
+        nemeMobileError: string;
+        nameRequired: string;
+        captchaCode: string;
+        captchaCodeRequired: string;
+        validCode: string;
+        validCodeRequired: string;
+        validCodeTime: string;
+        realName: string;
+        realNameRequired: string;
+        nickName: string;
+        nickNameRequired: string;
+        avatar: string;
+        birthDate: string;
+        birthDateRequired: string;
+        gender: string;
+        genderRequired: string;
+        pwd: string;
+        pwdRequired: string;
+        repeatPwd: string;
+        repeatPwdRequired: string;
+        pwdRules: string;
+        comparePwd: string;
+    };
 };
 export default _default;

package/dts/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue.d.ts

@@ -25,8 +25,8 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         default: string;
     };
 }>> & Readonly<{}>, {
+    name: string;
     title: string;
     icon: string;
-    name: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dts/src/router/index.d.ts

@@ -2,6 +2,7 @@ import { type Ref } from "vue";
 import type { RouteRecordRaw, Router } from "vue-router";
 export declare const Layout: () => Promise<typeof import("@/layout/index.vue")>;
 export declare const LoginPage: () => Promise<typeof import("@/views/login/index.vue")>;
+export declare const RegisterPage: () => Promise<typeof import("@/views/register/index.vue")>;
 export declare const MultiFactorLoginPage: () => Promise<typeof import("@/views/login/components/types.vue")>;
 export declare const ProfilePage: () => Promise<typeof import("@/views/my/profile.vue")>;
 export declare const Error401Page: () => Promise<typeof import("@/views/error-page/401.vue")>;

package/dts/src/types/index.d.ts

@@ -24,6 +24,7 @@ export interface VueMetaEnv {
     APP_REDIRECT?: string;
     /** 二维码登录超时时间 */
     APP_TIMEOUT?: number;
+    APP_PRODUCT?: string;
 }
 export interface TableColumn {
     label: string;

package/dts/src/views/dashboard/components/BarChart.vue.d.ts

@@ -37,8 +37,8 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         required: true;
     };
 }>> & Readonly<{}>, {
-    id: string;
     width: string;
+    id: string;
     height: string;
     className: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dts/src/views/dashboard/components/FunnelChart.vue.d.ts

@@ -37,8 +37,8 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         required: true;
     };
 }>> & Readonly<{}>, {
-    id: string;
     width: string;
+    id: string;
     height: string;
     className: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dts/src/views/dashboard/components/PieChart.vue.d.ts

@@ -37,8 +37,8 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         required: true;
     };
 }>> & Readonly<{}>, {
-    id: string;
     width: string;
+    id: string;
     height: string;
     className: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dts/src/views/dashboard/components/RadarChart.vue.d.ts

@@ -37,8 +37,8 @@ declare const _default: import("vue").DefineComponent<globalThis.ExtractPropType
         required: true;
     };
 }>> & Readonly<{}>, {
-    id: string;
     width: string;
+    id: string;
     height: string;
     className: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dts/src/views/register/index.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/src/index.d.ts",