@unicom-cloud/ui 0.8.64 → 0.8.65

package/chunk/{BmO1y0vr.js → DUeHQKtx.js}

@@ -1,11 +1,11 @@
-import { z as V, H as b, G as w } from "./Cqyp4qni.js";
-import c from "lodash/isObject";
-import M from "lodash/isArray";
-import E from "lodash/isEqual";
-import O from "lodash/isBoolean";
-import z from "lodash/isNumber";
-import y from "lodash/isString";
-import S from "lodash/isFunction";
+import { z as V, H as b, G as w } from "./CSC_V_25.js";
+import c from "lodash/isObject.js";
+import M from "lodash/isArray.js";
+import E from "lodash/isEqual.js";
+import O from "lodash/isBoolean.js";
+import z from "lodash/isNumber.js";
+import y from "lodash/isString.js";
+import S from "lodash/isFunction.js";
 var _ = Object.defineProperty, $ = (r, t, e) => t in r ? _(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e, o = (r, t, e) => $(r, typeof t != "symbol" ? t + "" : t, e);
 const d = "#{field} is not a #{type} type", k = {
   required: "#{field} is required",
@@ -128,7 +128,7 @@ class p {
     t == null || t(this.error);
   }
 }
-class A extends p {
+class N extends p {
   constructor(t, e) {
     super(t, {
       ...e,
@@ -187,7 +187,7 @@ class A extends p {
     );
   }
 }
-class N extends p {
+class R extends p {
   constructor(t, e) {
     super(t, {
       ...e,
@@ -210,7 +210,7 @@ class N extends p {
     );
   }
 }
-class R extends p {
+class A extends p {
   constructor(t, e) {
     super(t, {
       ...e,
@@ -398,7 +398,7 @@ class q {
         e.validateMessages
       )
     };
-    this.string = new P(t, s), this.number = new K(t, s), this.array = new A(t, s), this.object = new D(t, s), this.boolean = new N(t, s), this.type = new G(t, s), this.custom = new R(t, s);
+    this.string = new P(t, s), this.number = new K(t, s), this.array = new N(t, s), this.object = new D(t, s), this.boolean = new R(t, s), this.type = new G(t, s), this.custom = new A(t, s);
   }
 }
 class X {

package/chunk/{CZfGDXaB.js → DXZEpA3t.js}

@@ -1,8 +1,8 @@
 import { jsx as $, jsxs as Q, Fragment as Te } from "react/jsx-runtime";
 import { useRef as j, useEffect as X, useCallback as V, createContext as Ce, useContext as ie } from "react";
 import se from "../Button.js";
-import { d as He } from "./B5GDq8NJ.js";
-import { y as ee } from "./BzPkh4Zv.js";
+import { d as He } from "./DlLL5JQo.js";
+import { y as ee } from "./BAWsPQBM.js";
 import { dayjs as g, methods as Y, getDayjsValue as Oe, getNow as re, toLocal as ce } from "../utils/dayjs.js";
 import { padStart as C } from "../utils/pad.js";
 import ge from "lodash/debounce";

package/chunk/{CTF5o0OX.js → DjtWv6Wn.js}

@@ -1,4 +1,4 @@
-import { f as F } from "./B5GDq8NJ.js";
+import { f as F } from "./DlLL5JQo.js";
 const u = 10, g = {
   red: { name: { zh: "浪漫红", en: "Red" }, value: "#F53F3F" },
   orangered: { name: { zh: "晚秋红", en: "Orange Red" }, value: "#FF702E" },

package/chunk/{B5GDq8NJ.js → DlLL5JQo.js}

@@ -1,7 +1,7 @@
 var Ft = Object.defineProperty;
-var qt = (r, e, t) => e in r ? Ft(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var g = (r, e, t) => qt(r, typeof e != "symbol" ? e + "" : e, t);
-import G, { forwardRef as bt, useContext as nt, createContext as Tt, useRef as st, useImperativeHandle as xt, Component as Ot, createRef as jt, useEffect as D, useState as Lt } from "react";
+var Tt = (r, e, t) => e in r ? Ft(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var g = (r, e, t) => Tt(r, typeof e != "symbol" ? e + "" : e, t);
+import G, { forwardRef as bt, useContext as nt, createContext as qt, useRef as st, useImperativeHandle as xt, Component as Ot, createRef as jt, useEffect as D, useState as Lt } from "react";
 import { jsx as d, jsxs as V } from "react/jsx-runtime";
 import _ from "@unicom-cloud/icons/context";
 import Dt from "lodash/isPlainObject";
@@ -16,7 +16,7 @@ import zt from "@unicom-cloud/icons/IconUiExclamationCircleFill";
 import Bt from "@unicom-cloud/icons/IconUiInfoCircleFill";
 import Vt from "@unicom-cloud/icons/IconUiLoading";
 import Gt from "@unicom-cloud/icons/IconUiEmpty";
-import { y as j } from "./BzPkh4Zv.js";
+import { y as j } from "./BAWsPQBM.js";
 import Jt from "../locale/zh-CN.js";
 import wt from "../NotificationBase.js";
 import { render as $t } from "../utils/reactDOM.js";
@@ -62,16 +62,16 @@ function ot(r, e, t) {
   if (n === s)
     o = 0, i = 0;
   else {
-    const h = n - s;
-    switch (o = a > 0.5 ? h / (2 - n - s) : h / (n + s), n) {
+    const f = n - s;
+    switch (o = a > 0.5 ? f / (2 - n - s) : f / (n + s), n) {
       case r:
-        i = (e - t) / h + (e < t ? 6 : 0);
+        i = (e - t) / f + (e < t ? 6 : 0);
         break;
       case e:
-        i = (t - r) / h + 2;
+        i = (t - r) / f + 2;
         break;
       case t:
-        i = (r - e) / h + 4;
+        i = (r - e) / f + 4;
         break;
     }
     i /= 6;
@@ -95,7 +95,7 @@ function X(r, e, t) {
   r = w(r, 255), e = w(e, 255), t = w(t, 255);
   const n = Math.max(r, e, t), s = Math.min(r, e, t);
   let i = 0;
-  const o = n, a = n - s, h = n === 0 ? 0 : a / n;
+  const o = n, a = n - s, f = n === 0 ? 0 : a / n;
   if (n === s)
     i = 0;
   else {
@@ -112,11 +112,11 @@ function X(r, e, t) {
     }
     i /= 6;
   }
-  return { h: i, s: h, v: o };
+  return { h: i, s: f, v: o };
 }
 function ne(r, e, t) {
   r = w(r, 360) * 6, e = w(e, 100), t = w(t, 100);
-  const n = Math.floor(r), s = r - n, i = t * (1 - e), o = t * (1 - s * e), a = t * (1 - (1 - s) * e), h = n % 6, l = [t, o, i, i, a, t][h], c = [a, t, t, o, i, i][h], u = [i, i, a, t, t, o][h];
+  const n = Math.floor(r), s = r - n, i = t * (1 - e), o = t * (1 - s * e), a = t * (1 - (1 - s) * e), f = n % 6, l = [t, o, i, i, a, t][f], c = [a, t, t, o, i, i][f], u = [i, i, a, t, t, o][f];
   return { r: l * 255, g: c * 255, b: u * 255 };
 }
 function at(r, e, t, n) {
@@ -145,8 +145,8 @@ function Ge(r, e, t, n) {
   ].join("");
 }
 function ie(r, e, t, n) {
-  const s = r / 100, i = e / 100, o = t / 100, a = n / 100, h = 255 * (1 - s) * (1 - a), l = 255 * (1 - i) * (1 - a), c = 255 * (1 - o) * (1 - a);
-  return { r: h, g: l, b: c };
+  const s = r / 100, i = e / 100, o = t / 100, a = n / 100, f = 255 * (1 - s) * (1 - a), l = 255 * (1 - i) * (1 - a), c = 255 * (1 - o) * (1 - a);
+  return { r: f, g: l, b: c };
 }
 function ct(r, e, t) {
   let n = 1 - r / 255, s = 1 - e / 255, i = 1 - t / 255, o = Math.min(n, s, i);
@@ -770,14 +770,14 @@ function fe(r, e) {
     getPrefixCls: t,
     locale: n,
     componentConfig: s
-  } = nt(T), i = Ct(
+  } = nt(q), i = Ct(
     r,
     {},
     s == null ? void 0 : s.Empty
-  ), { style: o, className: a, description: h, icon: l, imgSrc: c, ...u } = i, m = t("empty"), b = j(m, a), p = n.Empty.noData, f = typeof h == "string" ? h : "empty";
+  ), { style: o, className: a, description: f, icon: l, imgSrc: c, ...u } = i, m = t("empty"), b = j(m, a), p = n.Empty.noData, h = typeof f == "string" ? f : "empty";
   return /* @__PURE__ */ d("div", { ref: e, className: b, style: o, ...u, children: /* @__PURE__ */ V("div", { className: `${m}-wrapper`, children: [
-    /* @__PURE__ */ d("div", { className: `${m}-image`, children: c ? /* @__PURE__ */ d("img", { alt: f, src: c }) : l || /* @__PURE__ */ d(Gt, {}) }),
-    /* @__PURE__ */ d("div", { className: `${m}-description`, children: h || p })
+    /* @__PURE__ */ d("div", { className: `${m}-image`, children: c ? /* @__PURE__ */ d("img", { alt: h, src: c }) : l || /* @__PURE__ */ d(Gt, {}) }),
+    /* @__PURE__ */ d("div", { className: `${m}-description`, children: f || p })
   ] }) });
 }
 const St = bt(fe);
@@ -795,7 +795,7 @@ const Rt = {
   getPopupContainer: () => document.body,
   size: "default",
   renderEmpty: ue
-}, T = Tt({
+}, q = qt({
   getPrefixCls: (r, e) => `${e || "pqb"}-${r}`,
   ...Rt
 });
@@ -807,7 +807,7 @@ function ge(r, e) {
     prefix: i,
     size: o = "default",
     ...a
-  } = r, { getPrefixCls: h } = nt(T), l = h("icon-hover"), c = st();
+  } = r, { getPrefixCls: f } = nt(q), l = f("icon-hover"), c = st();
   return xt(e, () => ({
     getRootDOMNode: () => c.current
   })), /* @__PURE__ */ d(
@@ -909,14 +909,14 @@ class J extends Ot {
       className: i,
       style: o,
       type: a,
-      btn: h,
+      btn: f,
       icon: l,
       prefixCls: c,
       closable: u,
       noticeType: m,
       iconPrefix: b,
       rtl: p,
-      closeIcon: f,
+      closeIcon: h,
       classPrefixCls: x
     } = this.props, y = j(
       c,
@@ -941,12 +941,12 @@ class J extends Ot {
           children: /* @__PURE__ */ V("div", { className: y, style: o, role: "alert", children: [
             v && this.renderIcon(),
             /* @__PURE__ */ d("span", { className: `${c}-content`, children: n }),
-            $ && (f !== void 0 ? /* @__PURE__ */ d(
+            $ && (h !== void 0 ? /* @__PURE__ */ d(
               "span",
               {
                 onClick: this.onClose,
                 className: `${c}-close-btn`,
-                children: f
+                children: h
               }
             ) : /* @__PURE__ */ d(
               ht,
@@ -972,14 +972,14 @@ class J extends Ot {
             /* @__PURE__ */ V("div", { className: `${c}-right`, children: [
               t && /* @__PURE__ */ d("div", { className: `${c}-title`, children: t }),
               /* @__PURE__ */ d("div", { className: `${c}-content`, children: n }),
-              h && /* @__PURE__ */ d("div", { className: `${c}-btn-wrapper`, children: h })
+              f && /* @__PURE__ */ d("div", { className: `${c}-btn-wrapper`, children: f })
             ] }),
-            $ && (f !== void 0 ? /* @__PURE__ */ d(
+            $ && (h !== void 0 ? /* @__PURE__ */ d(
               "span",
               {
                 onClick: this.onClose,
                 className: `${c}-close-btn`,
-                children: f
+                children: h
               }
             ) : /* @__PURE__ */ d(
               ht,
@@ -1006,11 +1006,11 @@ g(J, "defaultProps", {
   showIcon: !0,
   noticeType: "message",
   duration: 3e3
-}), g(J, "contextType", T);
+}), g(J, "contextType", q);
 function me(r = {}) {
   const { maxCount: e, duration: t = 3e3, prefixCls: n } = r, s = st(), i = /* @__PURE__ */ d(Ht, { ref: s }), o = {};
   let a;
-  function h(c) {
+  function f(c) {
     let u, m;
     if (s.current) {
       const v = s.current.getContextConfig();
@@ -1020,32 +1020,32 @@ function me(r = {}) {
       position: "top",
       duration: t,
       ...c
-    }, { position: f, transitionClassNames: x } = p;
+    }, { position: h, transitionClassNames: x } = p;
     let y;
-    if (o[f]) {
-      const v = o[f].state.notices;
-      v.length >= e ? (y = v[0].id, v.shift(), o[f].add({ ...p, id: y })) : y = o[f].add(p);
+    if (o[h]) {
+      const v = o[h].state.notices;
+      v.length >= e ? (y = v[0].id, v.shift(), o[h].add({ ...p, id: y })) : y = o[h].add(p);
     } else
       a = /* @__PURE__ */ d(
         M,
         {
           transitionClassNames: x,
           ref: (v) => {
-            o[f] = v, o[f] && (y = o[f].add(p));
+            o[h] = v, o[h] && (y = o[h].add(p));
           },
           prefixCls: b,
           rtl: m
         }
       ), s.current.addInstance(a);
     return () => {
-      o[f] && o[f].remove(y);
+      o[h] && o[h].remove(y);
     };
   }
   const l = {};
   return ["info", "success", "warning", "error", "normal"].forEach((c) => {
     l[c] = (u) => {
       const m = Kt(u) ? { content: u } : u;
-      return h({
+      return f({
         ...m,
         type: c
       });
@@ -1126,14 +1126,14 @@ class M extends wt {
       prefixCls: s,
       rtl: i,
       closable: o
-    } = this.props, { notices: a, position: h } = this.state, l = s || ft, c = F(i) ? dt : i, u = F(o) ? ut : o, m = l ? `${l}-message` : "pqb-message", b = {
+    } = this.props, { notices: a, position: f } = this.state, l = s || ft, c = F(i) ? dt : i, u = F(o) ? ut : o, m = l ? `${l}-message` : "pqb-message", b = {
       enter: O(n == null ? void 0 : n.enter) ? n == null ? void 0 : n.enter : 100,
       exit: O(n == null ? void 0 : n.exit) ? n == null ? void 0 : n.exit : 300
     }, p = j(
       `${m}-wrapper`,
-      `${m}-wrapper-${h}`
+      `${m}-wrapper-${f}`
     );
-    return /* @__PURE__ */ d("div", { className: p, children: /* @__PURE__ */ d(yt, { component: null, children: a.map((f) => /* @__PURE__ */ d(
+    return /* @__PURE__ */ d("div", { className: p, children: /* @__PURE__ */ d(yt, { component: null, children: a.map((h) => /* @__PURE__ */ d(
       vt,
       {
         timeout: b,
@@ -1146,12 +1146,12 @@ class M extends wt {
         },
         onExited: (x) => {
           var y;
-          x && (x.style.height = 0, (y = f.onClose) == null || y.call(f));
+          x && (x.style.height = 0, (y = h.onClose) == null || y.call(h));
         },
         children: /* @__PURE__ */ d(
           J,
           {
-            ...f,
+            ...h,
             prefixCls: m,
             classPrefixCls: l,
             iconPrefix: l,
@@ -1162,7 +1162,7 @@ class M extends wt {
           }
         )
       },
-      f.id
+      h.id
     )) }) });
   }
 }
@@ -1208,7 +1208,7 @@ function xe(r = {}) {
     prefixCls: n,
     getContainer: s
   } = r, i = st(), o = /* @__PURE__ */ d(Ht, { ref: i }), a = {};
-  let h;
+  let f;
   function l(u) {
     let m, b;
     if (i.current) {
@@ -1216,29 +1216,29 @@ function xe(r = {}) {
       b = $.rtl, m = $.prefixCls;
     }
     const p = n || m;
-    let f = u.position;
-    F(u.position) && (f = b ? "topLeft" : "topRight");
+    let h = u.position;
+    F(u.position) && (h = b ? "topLeft" : "topRight");
     const x = {
       duration: t,
       ...u
     };
     let y;
-    if (a[f]) {
-      const $ = a[f].state.notices;
-      $.length >= e ? (y = $[0].id, $.shift(), a[f].add({ ...x, id: y })) : y = a[f].add(x);
+    if (a[h]) {
+      const $ = a[h].state.notices;
+      $.length >= e ? (y = $[0].id, $.shift(), a[h].add({ ...x, id: y })) : y = a[h].add(x);
     } else
-      h = /* @__PURE__ */ d(
-        q,
+      f = /* @__PURE__ */ d(
+        T,
         {
           ref: ($) => {
-            a[f] = $, a[f] && (y = a[f].add(x));
+            a[h] = $, a[h] && (y = a[h].add(x));
           },
           prefixCls: p,
           rtl: b,
           getContainer: s
         }
-      ), i.current.addInstance(h);
-    return a[f];
+      ), i.current.addInstance(f);
+    return a[h];
   }
   const c = {};
   return ["info", "success", "warning", "error", "normal"].forEach((u) => {
@@ -1268,7 +1268,7 @@ const N = class N extends wt {
     let o = this.state.position;
     const a = F(s) ? B : s;
     F(o) && (o = a ? "topLeft" : "topRight");
-    const h = n || mt, l = h ? `${h}-notification` : "pqb-notification";
+    const f = n || mt, l = f ? `${f}-notification` : "pqb-notification";
     let c;
     o === "topLeft" || o === "bottomLeft" ? c = "slideNoticeLeft" : c = "slideNoticeRight";
     const u = j(
@@ -1283,15 +1283,15 @@ const N = class N extends wt {
           exit: 300
         },
         classNames: c,
-        onExit: (f) => {
-          f && (f.style.height = `${f.scrollHeight}px`);
+        onExit: (h) => {
+          h && (h.style.height = `${h.scrollHeight}px`);
         },
-        onExiting: (f) => {
-          f && (f.style.height = 0);
+        onExiting: (h) => {
+          h && (h.style.height = 0);
         },
-        onExited: (f) => {
+        onExited: (h) => {
           var x;
-          f && (f.style.height = 0, (x = p.onClose) == null || x.call(p));
+          h && (h.style.height = 0, (x = p.onClose) == null || x.call(p));
         },
         children: /* @__PURE__ */ d(
           J,
@@ -1299,8 +1299,8 @@ const N = class N extends wt {
             ...p,
             onClose: this.remove,
             prefixCls: l,
-            iconPrefix: h,
-            classPrefixCls: h,
+            iconPrefix: f,
+            classPrefixCls: f,
             noticeType: "notification",
             rtl: a
           }
@@ -1332,7 +1332,7 @@ g(N, "useNotification"), g(N, "success"), g(N, "info"), g(N, "warning"), g(N, "e
     ...t
   }, { instance: i, pending: o } = S[n] || {};
   if (i || o) {
-    const h = () => {
+    const f = () => {
       const { instance: l } = S[n] || {}, c = l.state.notices, u = c.find((b) => b.id === t.id), m = {
         ...s,
         update: u
@@ -1342,31 +1342,31 @@ g(N, "useNotification"), g(N, "success"), g(N, "info"), g(N, "warning"), g(N, "e
         id: u.id
       }) : (c.shift(), l.add(m)) : l.add({ ...m }), l;
     };
-    return i ? h() : o != null && o.then && o.then(() => {
-      h(), S[n].pending = null;
+    return i ? f() : o != null && o.then && o.then(() => {
+      f(), S[n].pending = null;
     }), i;
   }
   const a = document.createElement("div");
-  return (Z || document.body).appendChild(a), S[n] = {}, S[n].pending = new Promise((h) => {
+  return (Z || document.body).appendChild(a), S[n] = {}, S[n].pending = new Promise((f) => {
     $t(
       /* @__PURE__ */ d(
         N,
         {
-          ref: (l) => (S[n] || (S[n] = {}), S[n].instance = l, l.add(s), h(null), l)
+          ref: (l) => (S[n] || (S[n] = {}), S[n].instance = l, l.add(s), f(null), l)
         }
       ),
       a
     );
   }), S[n].instance;
 });
-let q = N;
+let T = N;
 Ce.forEach((r) => {
-  q[r] = (e) => q.addInstance({
+  T[r] = (e) => T.addInstance({
     ...e,
     type: r
   });
 });
-q.useNotification = xe;
+T.useNotification = xe;
 const ye = {
   primaryColor: {
     default: "--pqbblue-6",
@@ -1401,31 +1401,34 @@ function K(r) {
     we
   ), {
     theme: t,
-    appearance: n,
+    themeMode: n,
     prefixCls: s,
     children: i,
     locale: o,
     rtl: a,
-    effectGlobalNotice: h = !0,
+    effectGlobalNotice: f = !0,
     effectGlobalModal: l = !0
   } = e, c = window.document.body;
   D(() => {
-    Dt(t) && Object.entries(ye).forEach(([p, f], x, y) => {
-      const $ = t == null ? void 0 : t[p];
-      if ($) {
-        const v = new C($);
-        c.style.setProperty(f.default, v.lighten(0).toRgbArrayString()), t != null && t[`${p}Hover`] || c.style.setProperty(f.hover, v.lighten(10).toRgbArrayString()), t != null && t[`${p}Active`] || c.style.setProperty(f.active, v.lighten(-10).toRgbArrayString());
-      }
+    t && Dt(t) && Object.entries(ye).forEach(([p, h], x, y) => {
+      const $ = t[p];
+      if (!$) return;
+      const v = new C($);
+      c.style.setProperty(h.default, v.lighten(0).toRgbArrayString()), t[`${p}Hover`] || c.style.setProperty(h.hover, v.lighten(10).toRgbArrayString()), t[`${p}Active`] || c.style.setProperty(h.active, v.lighten(-10).toRgbArrayString());
     });
   }, [t]), D(() => {
-    if (n)
-      return n === "dark" ? c.setAttribute("pqb-theme", "dark") : c.removeAttribute("pqb-theme"), () => {
-      };
+    const p = ["pqb-theme"];
+    return n ? p.forEach((h) => {
+      c.setAttribute(h, n);
+    }) : p.forEach((h) => {
+      c.removeAttribute(h);
+    }), () => {
+    };
   }, [n]), D(() => {
-    h && (M.config({ prefixCls: s, rtl: a }), q.config({ prefixCls: s, rtl: a }));
-  }, [s, a, h]);
-  function u(p, f) {
-    return `${f || s}-${p}`;
+    f && (M.config({ prefixCls: s, rtl: a }), T.config({ prefixCls: s, rtl: a }));
+  }, [s, a, f]);
+  function u(p, h) {
+    return `${h || s}-${p}`;
   }
   const m = {
     ...Xt(e, ["children"]),
@@ -1435,19 +1438,19 @@ function K(r) {
     l && be({ locale: o, prefixCls: s, rtl: a });
   }, [o, s, a, l]);
   let b = i;
-  return s && s !== "pqb" && (b = /* @__PURE__ */ d(_.Provider, { value: { prefixCls: s }, children: i })), /* @__PURE__ */ d(T.Provider, { value: m, children: b });
+  return s && s !== "pqb" && (b = /* @__PURE__ */ d(_.Provider, { value: { prefixCls: s }, children: i })), /* @__PURE__ */ d(q.Provider, { value: m, children: b });
 }
-K.ConfigContext = T;
+K.ConfigContext = q;
 K.displayName = "ConfigProvider";
-const Ze = T.Consumer;
+const Ze = q.Consumer;
 function It(r, e) {
-  const t = nt(T), [n, s] = Lt([]);
-  function i(h) {
-    s((l) => [...l, h]);
+  const t = nt(q), [n, s] = Lt([]);
+  function i(f) {
+    s((l) => [...l, f]);
   }
-  function o(h) {
+  function o(f) {
     s(
-      (l) => l.filter((c) => h !== c)
+      (l) => l.filter((c) => f !== c)
     );
   }
   function a() {
@@ -1459,7 +1462,7 @@ function It(r, e) {
     getContextConfig: a
   })), G.Children.map(
     n,
-    (h, l) => G.cloneElement(h, { key: l })
+    (f, l) => G.cloneElement(f, { key: l })
   );
 }
 It.displayName = "ContextHolderElement";
@@ -1482,10 +1485,10 @@ export {
   K as a,
   Ze as b,
   ye as c,
-  T as d,
+  q as d,
   R as e,
   C as f,
-  q as g,
+  T as g,
   xe as h,
   Xe as i,
   Je as j,