iking-web-ui-pro 0.2.37 → 0.2.38

package/dist/{IkApprovalProcess → IKApprovalProcess}/ik.index.es.js

@@ -1,6 +1,6 @@
-import { inject as ne, computed as U, openBlock as a, createElementBlock as d, createElementVNode as n, defineComponent as oe, resolveComponent as ce, createBlock as B, toDisplayString as P, createCommentVNode as x, ref as E, Fragment as N, unref as O, withCtx as I, createTextVNode as Y, renderList as W, createVNode as w, normalizeClass as se, pushScopeId as he, popScopeId as Ae, useCssVars as nt, watch as K, toRef as it, reactive as Te, nextTick as ke, watchEffect as $e, withModifiers as ie, normalizeStyle as He, withDirectives as ue, vShow as rt, mergeProps as Me } from "vue";
+import { inject as ne, computed as U, openBlock as a, createElementBlock as d, createElementVNode as n, defineComponent as oe, resolveComponent as ue, createBlock as B, toDisplayString as P, createCommentVNode as x, ref as E, Fragment as N, unref as O, withCtx as I, createTextVNode as Y, renderList as W, createVNode as w, normalizeClass as se, pushScopeId as he, popScopeId as Ae, useCssVars as nt, watch as K, toRef as it, reactive as Te, nextTick as ke, watchEffect as $e, withModifiers as ie, normalizeStyle as He, withDirectives as ce, vShow as rt, mergeProps as Me } from "vue";
 import { _ as X, ikStore as fe, ikEvent as pt } from "iking-utils-pro";
-import { ElCheckbox as ae, ElCheckboxGroup as Le, ElRadioGroup as be, ElRadio as Ce, ElDialog as dt, ElButton as Oe, ElInput as ut, ElBreadcrumb as ct, ElBreadcrumbItem as ft, vLoading as Pe } from "element-plus";
+import { ElCheckbox as ae, ElCheckboxGroup as Le, ElRadioGroup as be, ElRadio as Ce, ElDialog as dt, ElButton as Oe, ElInput as ct, ElBreadcrumb as ut, ElBreadcrumbItem as ft, vLoading as Pe } from "element-plus";
 import ht from "axios";
 const Ge = (o, v) => {
   if (o.install = (e) => {
@@ -190,7 +190,7 @@ const Ge = (o, v) => {
     cUserInfo: V,
     cOnlyofficePreviewType: D
   };
-}, mt = {}, gt = {
+}, gt = {}, mt = {
   t: "1672194715727",
   class: "icon",
   viewBox: "0 0 1024 1024",
@@ -221,9 +221,9 @@ const Ge = (o, v) => {
   _t
 ];
 function Pt(o, v) {
-  return a(), d("svg", gt, Ot);
+  return a(), d("svg", mt, Ot);
 }
-const Tt = /* @__PURE__ */ G(mt, [["render", Pt]]), kt = {}, Lt = {
+const Tt = /* @__PURE__ */ G(gt, [["render", Pt]]), kt = {}, Lt = {
   t: "1710907270798",
   class: "icon",
   viewBox: "0 0 1024 1024",
@@ -399,7 +399,7 @@ const Yt = /* @__PURE__ */ G(zt, [["render", Kt]]), Jt = { class: "avatar" }, el
   setup(o) {
     const v = o, { cLoadUrl: e } = ze(v), l = (k) => At(e.value, k);
     return (k, _) => {
-      const b = ce("el-avatar");
+      const b = ue("el-avatar");
       return a(), d("div", Jt, [
         v.fixTypeOpt.group === o.element[v.fixPropOpt.type] ? (a(), B(Yt, { key: 0 })) : v.fixTypeOpt.role === o.element[v.fixPropOpt.type] ? (a(), B(Dt, { key: 1 })) : v.fixTypeOpt.post === o.element[v.fixPropOpt.type] ? (a(), B(Gt, { key: 2 })) : v.fixTypeOpt.user === o.element[v.fixPropOpt.type] ? (a(), d("div", el, [
           o.element[o.fixPropOpt.avatar] ? (a(), B(b, {
@@ -485,16 +485,16 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
 }, dl = {
   key: 1,
   class: "checkText"
-}, ul = /* @__PURE__ */ Be(() => /* @__PURE__ */ n(
+}, cl = /* @__PURE__ */ Be(() => /* @__PURE__ */ n(
   "div",
   { class: "side" },
   null,
   -1
   /* HOISTED */
-)), cl = { class: "iconBox" }, fl = { class: "name_number" }, hl = { class: "title" }, Al = {
+)), ul = { class: "iconBox" }, fl = { class: "name_number" }, hl = { class: "title" }, Al = {
   key: 0,
   class: "userCount"
-}, vl = ["onClick"], yl = { class: "checkText" }, ml = { class: "iconBox" }, gl = { class: "name_number" }, xl = { class: "title" }, _l = {
+}, vl = ["onClick"], yl = { class: "checkText" }, gl = { class: "iconBox" }, ml = { class: "name_number" }, xl = { class: "title" }, _l = {
   key: 0,
   class: "userCount"
 }, Ol = {
@@ -531,9 +531,9 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
       var A, t;
       return ((A = e.handList) == null ? void 0 : A.length) === ((t = e.list) == null ? void 0 : t.length);
     }), k = U(() => {
-      var r, h, u, S;
+      var r, h, c, S;
       const A = (r = e.handList) == null ? void 0 : r.length, t = (h = e.list) == null ? void 0 : h.length;
-      return e.multiple ? _.value = e.handList.map((c) => c[e.fixPropOpt.id]) : b.value = (S = (u = e.handList) == null ? void 0 : u[0]) == null ? void 0 : S[e.fixPropOpt.id], A > 0 && A < t;
+      return e.multiple ? _.value = e.handList.map((u) => u[e.fixPropOpt.id]) : b.value = (S = (c = e.handList) == null ? void 0 : c[0]) == null ? void 0 : S[e.fixPropOpt.id], A > 0 && A < t;
     }), _ = E(
       e.handList.map((A) => A[e.fixPropOpt.id])
     ), b = E((i = (y = e.handList) == null ? void 0 : y[0]) == null ? void 0 : i[e.fixPropOpt.id]), C = v, p = (A) => {
@@ -622,8 +622,8 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
                         _: 2
                         /* DYNAMIC */
                       }, 1032, ["label", "disabled"])) : (a(), d("div", dl, [
-                        ul,
-                        n("div", cl, [
+                        cl,
+                        n("div", ul, [
                           w($, {
                             fixTypeOpt: e.fixTypeOpt,
                             fixPropOpt: e.fixPropOpt,
@@ -652,14 +652,14 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
                         key: 2,
                         class: se(["nextLevel", {
                           "is-disabled": (h = _.value) == null ? void 0 : h.find(
-                            (u) => u === r[e.fixPropOpt.id]
+                            (c) => c === r[e.fixPropOpt.id]
                           )
                         }]),
-                        onClick: (u) => {
+                        onClick: (c) => {
                           var S;
                           return D(
                             r,
-                            (S = _.value) == null ? void 0 : S.find((c) => c === r[e.fixPropOpt.id])
+                            (S = _.value) == null ? void 0 : S.find((u) => u === r[e.fixPropOpt.id])
                           );
                         }
                       }, " 下级", 10, vl)) : x("v-if", !0)
@@ -694,7 +694,7 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
                       }, {
                         default: I(() => [
                           n("div", yl, [
-                            n("div", ml, [
+                            n("div", gl, [
                               w($, {
                                 fixTypeOpt: e.fixTypeOpt,
                                 fixPropOpt: e.fixPropOpt,
@@ -702,7 +702,7 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
                                 imageBaseUrl: e.imageBaseUrl
                               }, null, 8, ["fixTypeOpt", "fixPropOpt", "element", "imageBaseUrl"])
                             ]),
-                            n("div", gl, [
+                            n("div", ml, [
                               n(
                                 "div",
                                 xl,
@@ -753,14 +753,14 @@ const $ = /* @__PURE__ */ G(ll, [["__scopeId", "data-v-8031ce9b"]]), Se = "data:
                         key: 2,
                         class: se(["nextLevel", {
                           "is-disabled": (h = _.value) == null ? void 0 : h.find(
-                            (u) => u === r[e.fixPropOpt.id]
+                            (c) => c === r[e.fixPropOpt.id]
                           )
                         }]),
-                        onClick: (u) => {
+                        onClick: (c) => {
                           var S;
                           return D(
                             r,
-                            (S = _.value) == null ? void 0 : S.find((c) => c === r[e.fixPropOpt.id])
+                            (S = _.value) == null ? void 0 : S.find((u) => u === r[e.fixPropOpt.id])
                           );
                         }
                       }, " 下级", 10, Cl)) : x("v-if", !0)
@@ -833,9 +833,9 @@ const wl = /* @__PURE__ */ G(Bl, [["__scopeId", "data-v-8c34a55d"]]), we = (o) =
       var i, A;
       return ((i = e.handList) == null ? void 0 : i.length) === ((A = e.list) == null ? void 0 : A.length);
     }), k = U(() => {
-      var t, r, h, u;
+      var t, r, h, c;
       const i = (t = e.handList) == null ? void 0 : t.length, A = (r = e.list) == null ? void 0 : r.length;
-      return e.multiple ? _.value = e.handList.map((S) => S[e.fixPropOpt.id]) : b.value = (u = (h = e.handList) == null ? void 0 : h[0]) == null ? void 0 : u[e.fixPropOpt.id], i > 0 && i < A;
+      return e.multiple ? _.value = e.handList.map((S) => S[e.fixPropOpt.id]) : b.value = (c = (h = e.handList) == null ? void 0 : h[0]) == null ? void 0 : c[e.fixPropOpt.id], i > 0 && i < A;
     }), _ = E(
       e.handList.map((i) => i[e.fixPropOpt.id])
     ), b = E((y = (D = e.handList) == null ? void 0 : D[0]) == null ? void 0 : y[e.fixPropOpt.id]), C = v, p = (i) => {
@@ -1031,10 +1031,10 @@ const ql = /* @__PURE__ */ G(Xl, [["__scopeId", "data-v-e03f0d36"]]), Ie = (o) =
   null,
   -1
   /* HOISTED */
-)), ps = { class: "iconBox" }, ds = ["title"], us = {
+)), ps = { class: "iconBox" }, ds = ["title"], cs = {
   key: 2,
   class: "empty"
-}, cs = /* @__PURE__ */ Ie(() => /* @__PURE__ */ n(
+}, us = /* @__PURE__ */ Ie(() => /* @__PURE__ */ n(
   "img",
   {
     src: Se,
@@ -1053,9 +1053,9 @@ const ql = /* @__PURE__ */ G(Xl, [["__scopeId", "data-v-e03f0d36"]]), Ie = (o) =
       var i, A;
       return ((i = e.handList) == null ? void 0 : i.length) === ((A = e.list) == null ? void 0 : A.length);
     }), k = U(() => {
-      var t, r, h, u;
+      var t, r, h, c;
       const i = (t = e.handList) == null ? void 0 : t.length, A = (r = e.list) == null ? void 0 : r.length;
-      return e.multiple ? _.value = e.handList.map((S) => S[e.fixPropOpt.id]) : b.value = (u = (h = e.handList) == null ? void 0 : h[0]) == null ? void 0 : u[e.fixPropOpt.id], i > 0 && i < A;
+      return e.multiple ? _.value = e.handList.map((S) => S[e.fixPropOpt.id]) : b.value = (c = (h = e.handList) == null ? void 0 : h[0]) == null ? void 0 : c[e.fixPropOpt.id], i > 0 && i < A;
     }), _ = E(
       e.handList.map((i) => i[e.fixPropOpt.id])
     ), b = E((y = (D = e.handList) == null ? void 0 : D[0]) == null ? void 0 : y[e.fixPropOpt.id]), C = v, p = (i) => {
@@ -1203,8 +1203,8 @@ const ql = /* @__PURE__ */ G(Xl, [["__scopeId", "data-v-e03f0d36"]]), Ie = (o) =
               _: 1
               /* STABLE */
             }, 8, ["indeterminate", "modelValue"]))
-          ])) : (a(), d("div", us, [
-            cs,
+          ])) : (a(), d("div", cs, [
+            us,
             n(
               "div",
               null,
@@ -1408,7 +1408,7 @@ const As = {
   } else
     vs(o);
   (e = fe.local.getItem("tenant")) == null || e.code;
-}, ms = (o, v) => {
+}, gs = (o, v) => {
   const e = E([]), l = async (_, b) => {
     var Z, L;
     const { url: C, methods: p, headers: F, param: V } = o.value || {}, D = {
@@ -1440,11 +1440,11 @@ const As = {
     const {
       departments: r,
       roles: h,
-      posts: u,
+      posts: c,
       users: S,
-      rootOrganization: c,
+      rootOrganization: u,
       rootDepartment: M
-    } = t, q = c || M;
+    } = t, q = u || M;
     return e.value.length === 0 && (e.value[0] = v.org ? {
       ...v.org,
       id: v.elementId,
@@ -1455,9 +1455,9 @@ const As = {
     }), {
       groupList: X.cloneDeep(r),
       roleList: X.cloneDeep(h),
-      postList: X.cloneDeep(u),
+      postList: X.cloneDeep(c),
       userList: X.cloneDeep(S),
-      rootOrganization: c,
+      rootOrganization: u,
       rootDepartment: M
     };
   };
@@ -1468,7 +1468,7 @@ const As = {
     },
     bannerList: e
   };
-}, gs = {
+}, ms = {
   shadow: "hover",
   class: "sel-list"
 }, xs = { key: 0 }, _s = /* @__PURE__ */ n(
@@ -1489,9 +1489,9 @@ const As = {
   emits: ["handChild", "update:show", "update:modelValue", "ok", "search"],
   setup(o, { expose: v, emit: e }) {
     nt((s) => ({
-      "775d0d08": De.value
+      "843ec862": De.value
     }));
-    const l = o, k = E(""), _ = E(""), b = E([]), C = E([]), p = E([]), F = E([]), V = E(!1), D = U(() => j.value.includes("user") ? C.value.concat(b.value) : C.value);
+    const l = o, k = E(""), _ = E(""), b = E([]), C = E([]), p = E([]), F = E([]), V = E(!1), D = U(() => H.value.includes("user") ? C.value.concat(b.value) : C.value);
     K(
       () => l.api,
       () => {
@@ -1510,18 +1510,18 @@ const As = {
       post: "POST",
       group: "DEPT",
       ...l.typeOption
-    })), A = E([]), t = ms(it(l, "api"), l), r = t.handData, h = t.bannerList;
+    })), A = E([]), t = gs(it(l, "api"), l), r = t.handData, h = t.bannerList;
     l.immediate && r(_.value, k.value);
-    const u = (s) => (s.forEach((f) => {
-      var m, g;
-      f.disabled = ((g = (m = l.modelValue) == null ? void 0 : m.find(
+    const c = (s) => (s.forEach((f) => {
+      var g, m;
+      f.disabled = ((m = (g = l.modelValue) == null ? void 0 : g.find(
         (T) => T[y.value.id] === f[y.value.id]
-      )) == null ? void 0 : g.disabled) || !1;
+      )) == null ? void 0 : m.disabled) || !1;
     }), s), S = async () => {
-      var s, f, m, g, T, z, _e, Re;
+      var s, f, g, m, T, z, _e, Re;
       V.value = !0;
       try {
-        if ((s = l.groupList) != null && s.length || (f = l.userList) != null && f.length || (m = l.roleList) != null && m.length || (g = l.postList) != null && g.length) {
+        if ((s = l.groupList) != null && s.length || (f = l.userList) != null && f.length || (g = l.roleList) != null && g.length || (m = l.postList) != null && m.length) {
           b.value = (T = l.userList) == null ? void 0 : T.filter(
             (Q) => Q[y.value.name].includes(k.value)
           ), C.value = (z = l.groupList) == null ? void 0 : z.filter(
@@ -1535,7 +1535,7 @@ const As = {
         }
         const R = await r(_.value, k.value);
         try {
-          b.value = u((R == null ? void 0 : R.userList) || []), C.value = u((R == null ? void 0 : R.groupList) || []), p.value = u((R == null ? void 0 : R.roleList) || []), F.value = u((R == null ? void 0 : R.postList) || []);
+          b.value = c((R == null ? void 0 : R.userList) || []), C.value = c((R == null ? void 0 : R.groupList) || []), p.value = c((R == null ? void 0 : R.roleList) || []), F.value = c((R == null ? void 0 : R.postList) || []);
         } catch (Q) {
           V.value = !1, console.info("error: ", Q);
         }
@@ -1543,7 +1543,7 @@ const As = {
       } catch {
         V.value = !1;
       }
-    }, c = Te({
+    }, u = Te({
       //组织架构
       group: /* @__PURE__ */ new Map(),
       // 用户
@@ -1559,38 +1559,38 @@ const As = {
     }), M = Te({
       indeterminate: !1,
       checkAll: 0
-    }), q = (s) => c.group.has(s) || c.user.has(s) || c.role.has(s) || c.post.has(s), Z = pt.debounce(S, 300), L = U(() => {
-      const s = Array.from(c.group.values()), f = Array.from(c.role.values()), m = Array.from(c.user.values()), g = Array.from(c.post.values());
-      return A.value = [...f, ...g, ...m, ...s], {
-        list: [...f, ...m, ...g, ...s],
+    }), q = (s) => u.group.has(s) || u.user.has(s) || u.role.has(s) || u.post.has(s), Z = pt.debounce(S, 300), L = U(() => {
+      const s = Array.from(u.group.values()), f = Array.from(u.role.values()), g = Array.from(u.user.values()), m = Array.from(u.post.values());
+      return A.value = [...f, ...m, ...g, ...s], {
+        list: [...f, ...g, ...m, ...s],
         role: {
           list: f,
           len: f.length
         },
         user: {
-          list: m,
-          len: m.length
-        },
-        post: {
           list: g,
           len: g.length
         },
+        post: {
+          list: m,
+          len: m.length
+        },
         groups: {
           list: s,
           len: s.length
         }
       };
-    }), j = U(() => {
-      const s = l.chooseType.map((m) => m.toLocaleLowerCase());
+    }), H = U(() => {
+      const s = l.chooseType.map((g) => g.toLocaleLowerCase());
       let f = [...s];
       return s.includes("dep") && (f = [...f, "dept"]), s.includes("dep_user") && (f = [...f, "user"]), f;
-    }), H = E([]), Ee = (s) => {
-      H.value = s, H.value.forEach((f) => {
+    }), j = E([]), Ee = (s) => {
+      j.value = s, j.value.forEach((f) => {
         f.readonly = f == null ? void 0 : f.disabled;
       });
     }, pe = e, ve = E(!1), ye = (s = !1) => {
-      var m;
-      const f = (m = l == null ? void 0 : l.userList) != null && m.length ? X.cloneDeep([...l == null ? void 0 : l.userList, ...l == null ? void 0 : l.groupList]) : [...C.value, ...b.value];
+      var g;
+      const f = (g = l == null ? void 0 : l.userList) != null && g.length ? X.cloneDeep([...l == null ? void 0 : l.userList, ...l == null ? void 0 : l.groupList]) : [...C.value, ...b.value];
       return !s && Ee(f), f;
     };
     K(
@@ -1598,15 +1598,15 @@ const As = {
       async (s) => {
         var f;
         if (ve.value = s, s) {
-          _.value = ((f = l.org) == null ? void 0 : f.elementId) || l.orgPid, !l.userList.length && !l.groupList.length && !l.roleList.length && !l.postList.length ? await S() : (b.value = l.userList, C.value = l.groupList, p.value = l.roleList, F.value = l.postList), c.trans = [], M.checkAll = 0, M.indeterminate = !1;
-          const m = ye(!0);
-          for (const T of m)
-            q(T[y.value.id]) && c.trans.push(T[y.value.id]);
-          const g = m.length === c.trans.length;
-          M.indeterminate = !!(m.length && !g), M.checkAll = Number(m.length && g), ke(() => {
+          _.value = ((f = l.org) == null ? void 0 : f.elementId) || l.orgPid, !l.userList.length && !l.groupList.length && !l.roleList.length && !l.postList.length ? await S() : (b.value = l.userList, C.value = l.groupList, p.value = l.roleList, F.value = l.postList), u.trans = [], M.checkAll = 0, M.indeterminate = !1;
+          const g = ye(!0);
+          for (const T of g)
+            q(T[y.value.id]) && u.trans.push(T[y.value.id]);
+          const m = g.length === u.trans.length;
+          M.indeterminate = !!(g.length && !m), M.checkAll = Number(g.length && m), ke(() => {
             var T;
             (T = l.modelValue) != null && T.length ? l.modelValue.forEach((z) => {
-              J(z), l.multiple ? c.trans.push(z[y.value.id]) : c.single = z[y.value.id];
+              J(z), l.multiple ? u.trans.push(z[y.value.id]) : u.single = z[y.value.id];
             }) : te();
           });
         } else
@@ -1614,41 +1614,41 @@ const As = {
       }
     ), $e(() => {
       let s;
-      s = H.value.length;
-      const f = c.trans.length;
-      M.indeterminate = c.trans.length ? f !== s : !1, M.checkAll = +(s !== 0 && f === s);
+      s = j.value.length;
+      const f = u.trans.length;
+      M.indeterminate = u.trans.length ? f !== s : !1, M.checkAll = +(s !== 0 && f === s);
     }), K(
       () => l.modelValue,
       (s) => {
         s != null && s.length ? s.forEach((f) => {
-          J(f), l.multiple ? c.trans.push(f[y.value.id]) : c.single = f[y.value.id];
+          J(f), l.multiple ? u.trans.push(f[y.value.id]) : u.single = f[y.value.id];
         }) : te();
       }
     );
     const le = (s) => {
       var f;
       if (s) {
-        if (c.single = "", s[y.value.id]) {
-          const m = (f = c.trans) == null ? void 0 : f.findIndex(
-            (g) => g === s[y.value.id]
+        if (u.single = "", s[y.value.id]) {
+          const g = (f = u.trans) == null ? void 0 : f.findIndex(
+            (m) => m === s[y.value.id]
           );
-          m !== -1 && c.trans.splice(m, 1);
+          g !== -1 && u.trans.splice(g, 1);
         }
         switch (s[y.value.type]) {
           case i.value.user:
-            return c.user.delete(s[y.value.id]);
+            return u.user.delete(s[y.value.id]);
           case i.value.role:
-            return c.role.delete(s[y.value.id]);
+            return u.role.delete(s[y.value.id]);
           case i.value.post:
-            return c.post.delete(s[y.value.id]);
+            return u.post.delete(s[y.value.id]);
           case i.value.group:
-            return c.group.delete(s[y.value.id]);
+            return u.group.delete(s[y.value.id]);
           default:
             return;
         }
       }
     }, Ve = (s) => {
-      le(s);
+      console.log("---6666--", val), le(s);
     }, J = (s) => {
       if (!q(s[y.value.id])) {
         const f = {
@@ -1657,13 +1657,13 @@ const As = {
         };
         switch (s[y.value.type]) {
           case i.value.user:
-            return c.user.set(s[y.value.id], f);
+            return u.user.set(s[y.value.id], f);
           case i.value.role:
-            return c.role.set(s[y.value.id], f);
+            return u.role.set(s[y.value.id], f);
           case i.value.post:
-            return c.post.set(s[y.value.id], f);
+            return u.post.set(s[y.value.id], f);
           case i.value.group:
-            return c.group.set(s[y.value.id], f);
+            return u.group.set(s[y.value.id], f);
           default:
             return;
         }
@@ -1672,34 +1672,35 @@ const As = {
       s[y.value.type]
     ) ? s == null ? void 0 : s.hasOwnProperty("disabled") : !1;
     K(
-      () => c.trans,
+      () => u.trans,
       (s) => {
-        if (!s.length)
-          H.value.forEach((f) => {
+        if (console.log("-----", s, j.value), !s.length)
+          j.value.forEach((f) => {
             f.disabled = !1;
           });
         else {
-          const f = H.value.filter(
-            (g) => !s.includes(g[y.value.id])
+          console.log("---11111--", s);
+          const f = j.value.filter(
+            (m) => !s.includes(m[y.value.id])
           );
-          for (const g of f)
-            g.disabled = !1, l.multiple && le(g);
-          const m = H.value.filter(
-            (g) => s.includes(g[y.value.id])
+          for (const m of f)
+            m.disabled = !1, console.log("--9999---", s), l.multiple && le(m);
+          const g = j.value.filter(
+            (m) => s.includes(m[y.value.id])
           );
-          for (const g of m)
-            g.disabled = Xe(g), J(g);
+          for (const m of g)
+            m.disabled = Xe(m), J(m);
         }
       },
       { deep: !0 }
     ), K(
-      () => c.single,
+      () => u.single,
       (s) => {
         var f;
         if (s) {
-          const m = (f = H.value) == null ? void 0 : f.find((g) => g[y.value.id] === s);
-          m && (c.user.clear(), c.role.clear(), c.post.clear(), c.group.clear(), c.trans = [], ke(() => {
-            J(m);
+          const g = (f = j.value) == null ? void 0 : f.find((m) => m[y.value.id] === s);
+          g && (u.user.clear(), u.role.clear(), u.post.clear(), u.group.clear(), u.trans = [], ke(() => {
+            J(g);
           }));
         }
       }
@@ -1715,7 +1716,7 @@ const As = {
     ), de = E(l.tabs[0]), ee = E(l.tabs[0]);
     $e(() => (ee.value = Ke.value ? l.tabs[1] : Ye.value ? l.tabs[2] : de.value, ee.value));
     const te = () => {
-      c.user.clear(), c.role.clear(), c.post.clear(), c.group.clear(), c.trans = [], ge.value = [], xe.value = [], de.value = l.tabs[0], ee.value = l.tabs[0], k.value = "", _.value = l.orgPid, h.value.splice(1, h.value.length), c.single = "", A.value = [];
+      u.user.clear(), u.role.clear(), u.post.clear(), u.group.clear(), u.trans = [], me.value = [], xe.value = [], de.value = l.tabs[0], ee.value = l.tabs[0], k.value = "", _.value = l.orgPid, h.value.splice(1, h.value.length), u.single = "", A.value = [];
     }, Je = () => {
       var s;
       pe(
@@ -1732,7 +1733,7 @@ const As = {
     };
     v({ handClear: te, handRomeve: Ve, handDelete: le });
     const et = U(() => {
-      const s = j.value;
+      const s = H.value;
       return !!((s.includes("post") || s.includes("role")) && s.length > 1);
     }), tt = U(() => [
       { name: "group", label: "组织架构" },
@@ -1740,44 +1741,44 @@ const As = {
       { name: "post", label: "岗位列表" }
     ].filter((s) => l.tabs.includes(s.name))), De = U(
       () => `${typeof l.height == "string" ? Number.parseInt(l.height) : l.height}px`
-    ), me = () => {
-      l.multiple || (c.post.clear(), c.role.clear(), c.user.clear(), c.group.clear(), c.single = "");
+    ), ge = () => {
+      l.multiple || (u.post.clear(), u.role.clear(), u.user.clear(), u.group.clear(), u.single = "");
     }, lt = U(() => L.value.groups.list.concat(L.value.user.list)), st = (s, f) => {
-      l.multiple || (c.single = "");
-      const m = l.multiple ? s : [s];
-      if (!m.length) {
-        c.group.clear(), c.user.clear();
+      l.multiple || (u.single = "");
+      const g = l.multiple ? s : [s];
+      if (!g.length) {
+        u.group.clear(), u.user.clear();
         return;
       }
-      me(), f.forEach((g) => {
-        m != null && m.includes(g[y.value.id]) ? J(g) : le(g);
+      ge(), f.forEach((m) => {
+        g != null && g.includes(m[y.value.id]) ? J(m) : (console.log("--2222---", g), le(m));
       });
-    }, ge = E([]), at = (s, f) => {
-      l.multiple || (c.single = "");
-      const m = l.multiple ? s : [s];
-      if (!m.length) {
-        c.role.clear();
+    }, me = E([]), at = (s, f) => {
+      l.multiple || (u.single = "");
+      const g = l.multiple ? s : [s];
+      if (!g.length) {
+        u.role.clear();
         return;
       }
-      me(), f.forEach((g) => {
-        m != null && m.includes(g[y.value.id]) ? J(g) : le(g);
+      ge(), f.forEach((m) => {
+        g != null && g.includes(m[y.value.id]) ? J(m) : (console.log("--4444---", g), le(m));
       });
     };
     K(
       () => L.value.role.len,
       (s) => {
-        ge.value = X.cloneDeep(L.value.role.list);
+        me.value = X.cloneDeep(L.value.role.list);
       }
     );
     const xe = E([]), ot = (s, f) => {
-      l.multiple || (c.single = "");
-      const m = l.multiple ? s : [s];
-      if (!m.length) {
-        c.post.clear();
+      l.multiple || (u.single = "");
+      const g = l.multiple ? s : [s];
+      if (!g.length) {
+        u.post.clear();
         return;
       }
-      me(), f.forEach((g) => {
-        m != null && m.includes(g[y.value.id]) ? J(g) : le(g);
+      ge(), f.forEach((m) => {
+        g != null && g.includes(m[y.value.id]) ? J(m) : (console.log("--5555---", g), le(m));
       });
     };
     return K(
@@ -1791,7 +1792,7 @@ const As = {
         Z("");
       }
     ), (s, f) => {
-      const m = ce("el-tab-pane"), g = ce("el-tabs");
+      const g = ue("el-tab-pane"), m = ue("el-tabs");
       return a(), B(O(dt), {
         modelValue: ve.value,
         "onUpdate:modelValue": f[2] || (f[2] = (T) => ve.value = T),
@@ -1838,16 +1839,16 @@ const As = {
               style: He({ height: De.value })
             },
             [
-              n("div", gs, [
+              n("div", ms, [
                 n("div", null, [
-                  w(O(ut), {
+                  w(O(ct), {
                     modelValue: k.value,
                     "onUpdate:modelValue": f[0] || (f[0] = (T) => k.value = T),
                     clearable: "",
                     placeholder: s.placeholder,
                     "suffix-icon": Tt
                   }, null, 8, ["modelValue", "placeholder"]),
-                  et.value ? (a(), B(g, {
+                  et.value ? (a(), B(m, {
                     key: 0,
                     modelValue: de.value,
                     "onUpdate:modelValue": f[1] || (f[1] = (T) => de.value = T),
@@ -1857,7 +1858,7 @@ const As = {
                       (a(!0), d(
                         N,
                         null,
-                        W(tt.value, (T) => (a(), B(m, {
+                        W(tt.value, (T) => (a(), B(g, {
                           label: T.label,
                           name: T.name,
                           key: T.label
@@ -1877,7 +1878,7 @@ const As = {
                   [
                     Ne.value ? (a(), d("div", xs, [
                       x(" 面包屑 全选 "),
-                      w(O(ct), {
+                      w(O(ut), {
                         separator: ">",
                         class: se(["banner", { "top-unlink": !s.topLink }])
                       }, {
@@ -1913,7 +1914,7 @@ const As = {
                 )) : x("v-if", !0),
                 x(" 左侧列表 "),
                 x(" 组织架构 "),
-                ee.value === O(re).group ? ue((a(), B(wl, {
+                ee.value === O(re).group ? ce((a(), B(wl, {
                   key: 1,
                   fixPropOpt: y.value,
                   fixTypeOpt: i.value,
@@ -1924,7 +1925,7 @@ const As = {
                   imageBaseUrl: l.imageBaseUrl,
                   emptyText: l.emptyText,
                   children: l.children,
-                  "choose-type": j.value,
+                  "choose-type": H.value,
                   onHandChild: qe,
                   onChange: st
                 }, null, 8, ["fixPropOpt", "fixTypeOpt", "list", "max", "multiple", "hand-list", "imageBaseUrl", "emptyText", "children", "choose-type"])), [
@@ -1934,16 +1935,16 @@ const As = {
                   { key: 2 },
                   [
                     x(" 角色 "),
-                    ue(w(hs, {
+                    ce(w(hs, {
                       fixPropOpt: y.value,
                       fixTypeOpt: i.value,
                       list: p.value,
                       max: s.max,
                       multiple: s.multiple,
-                      "hand-list": ge.value,
+                      "hand-list": me.value,
                       imageBaseUrl: l.imageBaseUrl,
                       emptyText: l.emptyText,
-                      "choose-type": j.value,
+                      "choose-type": H.value,
                       onChange: at
                     }, null, 8, ["fixPropOpt", "fixTypeOpt", "list", "max", "multiple", "hand-list", "imageBaseUrl", "emptyText", "choose-type"]), [
                       [O(Pe), V.value]
@@ -1956,7 +1957,7 @@ const As = {
                   { key: 3 },
                   [
                     x(" 岗位 "),
-                    ue(w(ql, {
+                    ce(w(ql, {
                       fixPropOpt: y.value,
                       fixTypeOpt: i.value,
                       list: F.value,
@@ -1965,7 +1966,7 @@ const As = {
                       "hand-list": xe.value,
                       imageBaseUrl: l.imageBaseUrl,
                       emptyText: l.emptyText,
-                      "choose-type": j.value,
+                      "choose-type": H.value,
                       onChange: ot
                     }, null, 8, ["fixPropOpt", "fixTypeOpt", "list", "max", "multiple", "hand-list", "imageBaseUrl", "emptyText", "choose-type"]), [
                       [O(Pe), V.value]
@@ -2015,7 +2016,7 @@ const As = {
                           /* TEXT */
                         )
                       ]),
-                      ue(w(Bt, {
+                      ce(w(Bt, {
                         class: "close",
                         onClick: ie((z) => Ve(T), ["stop"])
                       }, null, 8, ["onClick"]), [
@@ -2038,7 +2039,7 @@ const As = {
     };
   }
 });
-const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
+const Bs = Ge(Us), Qe = (o) => (he("data-v-45d32b3a"), o = o(), Ae(), o), ws = {
   class: "approveProcess",
   id: "approveProcess"
 }, Is = { class: "node" }, Es = { class: "nodeBg" }, Vs = {
@@ -2144,13 +2145,13 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
       return t.includes("http") || t.includes("https") ? r = t : r = l.value ? `${t.includes(l.value) ? "" : l.value}${t}` : `${location.origin + location.pathname}server/oss/download?fileUrl=${t}`, r;
     }, D = (t, r) => {
       e.dataList[r].handList = t.list;
-      let u = (e.dataList[r][p.defaultFile.approvePersonList] || []).filter((c) => !c.canDele), S = t.list.map((c) => ({
-        ...c,
-        userName: c.elementName,
-        userAvatar: c.avatar,
+      let c = (e.dataList[r][p.defaultFile.approvePersonList] || []).filter((u) => !u.canDele), S = t.list.map((u) => ({
+        ...u,
+        userName: u.elementName,
+        userAvatar: u.avatar,
         canDele: !0
       }));
-      e.dataList[r][p.defaultFile.approvePersonList] = u.concat(S);
+      e.dataList[r][p.defaultFile.approvePersonList] = c.concat(S);
     }, y = (t, r) => {
       e.dataList[t][p.defaultFile.approvePersonList].splice(r, 1), e.dataList[t].handList = e.dataList[t][p.defaultFile.approvePersonList];
     }, i = () => {
@@ -2183,16 +2184,16 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
       }
     }));
     return v({ requiredVerification: i }), (t, r) => {
-      const h = ce("IkApprovalProcess");
+      const h = ue("IkApprovalProcess");
       return a(), d("div", ws, [
         (a(!0), d(
           N,
           null,
-          W(e.dataList, (u, S) => {
-            var c, M, q, Z;
+          W(e.dataList, (c, S) => {
+            var u, M, q, Z;
             return a(), d("div", {
               class: "content",
-              key: u.id
+              key: c.id
             }, [
               x(" 审批节点类型 "),
               n("div", Is, [
@@ -2200,7 +2201,7 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                   n(
                     "i",
                     {
-                      class: se(O(yt)(p, u[p.defaultFile.nodeType]))
+                      class: se(O(yt)(p, c[p.defaultFile.nodeType]))
                     },
                     null,
                     2
@@ -2218,26 +2219,26 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                   /* STYLE */
                 )
               ]),
-              u[p.defaultFile.nodeType] !== p.nodeType.并行分支 ? (a(), d("div", Vs, [
+              c[p.defaultFile.nodeType] !== p.nodeType.并行分支 ? (a(), d("div", Vs, [
                 n("div", null, [
                   n(
                     "div",
                     null,
-                    P(u[p.defaultFile.nodeTypeName]),
+                    P(c[p.defaultFile.nodeTypeName]),
                     1
                     /* TEXT */
                   ),
                   n("div", Ns, [
                     x(" 抄送节点 "),
-                    u[p.defaultFile.nodeType] == p.nodeType.抄送节点 ? (a(), d("span", Fs, [
-                      u[p.defaultFile.approvePersonList].length ? (a(), d(
+                    c[p.defaultFile.nodeType] == p.nodeType.抄送节点 ? (a(), d("span", Fs, [
+                      c[p.defaultFile.approvePersonList].length ? (a(), d(
                         "span",
                         Ds,
-                        P(`抄送${u[p.defaultFile.approvePersonList].length}人`),
+                        P(`抄送${c[p.defaultFile.approvePersonList].length}人`),
                         1
                         /* TEXT */
                       )) : x("v-if", !0),
-                      u[p.defaultFile.isShowAdd] ? (a(), d("span", Rs, ",可添加抄送人")) : x("v-if", !0)
+                      c[p.defaultFile.isShowAdd] ? (a(), d("span", Rs, ",可添加抄送人")) : x("v-if", !0)
                     ])) : (a(), d(
                       N,
                       { key: 1 },
@@ -2245,19 +2246,19 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                         x(" 审批节点 "),
                         n("span", null, [
                           x(" 存在审批人时 "),
-                          (c = u[p.defaultFile.approvePersonList]) != null && c.length ? (a(), d(
+                          (u = c[p.defaultFile.approvePersonList]) != null && u.length ? (a(), d(
                             "span",
                             $s,
-                            P(((M = u[p.defaultFile.approvePersonList]) == null ? void 0 : M.length) == 1 ? "1人审批" : `${(q = u[p.defaultFile.approvePersonList]) == null ? void 0 : q.length}人${u[p.defaultFile.multiExecutorTypeName]}`),
+                            P(((M = c[p.defaultFile.approvePersonList]) == null ? void 0 : M.length) == 1 ? "1人审批" : `${(q = c[p.defaultFile.approvePersonList]) == null ? void 0 : q.length}人${c[p.defaultFile.multiExecutorTypeName]}`),
                             1
                             /* TEXT */
-                          )) : [p.statusWithoutApprover.自动通过, p.statusWithoutApprover.自动拒绝].includes(u[p.defaultFile.approveType]) ? (a(), d(
+                          )) : [p.statusWithoutApprover.自动通过, p.statusWithoutApprover.自动拒绝].includes(c[p.defaultFile.approveType]) ? (a(), d(
                             "span",
                             Ms,
-                            P(u[p.defaultFile.approveTypeName]),
+                            P(c[p.defaultFile.approveTypeName]),
                             1
                             /* TEXT */
-                          )) : u[p.defaultFile.executorEmptyStrategy] && u[p.defaultFile.executorEmpty] ? (a(), d(
+                          )) : c[p.defaultFile.executorEmptyStrategy] && c[p.defaultFile.executorEmpty] ? (a(), d(
                             N,
                             { key: 2 },
                             [
@@ -2267,7 +2268,7 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                                 n(
                                   "span",
                                   null,
-                                  P(u[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.自动通过 ? "将自动通过" : u[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.自动转交管理员 ? "自动转交给管理员" : u[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.指定人员审批 ? `将自动转给指定成员${u[p.defaultFile.reserveExecutorUsers] && u[p.defaultFile.reserveExecutorUsers][0].userName}` : ""),
+                                  P(c[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.自动通过 ? "将自动通过" : c[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.自动转交管理员 ? "自动转交给管理员" : c[p.defaultFile.executorEmptyStrategy] == p.statusWithoutApprover.指定人员审批 ? `将自动转给指定成员${c[p.defaultFile.reserveExecutorUsers] && c[p.defaultFile.reserveExecutorUsers][0].userName}` : ""),
                                   1
                                   /* TEXT */
                                 )
@@ -2275,13 +2276,13 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                             ],
                             2112
                             /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-                          )) : [p.nodeType.并行分支, p.nodeType.子流程].includes(u[p.defaultFile.nodeType]) ? x("v-if", !0) : (a(), d(
+                          )) : [p.nodeType.并行分支, p.nodeType.子流程].includes(c[p.defaultFile.nodeType]) ? x("v-if", !0) : (a(), d(
                             "span",
                             {
                               key: 3,
-                              class: se(u.required ? "warn" : "")
+                              class: se(c.required ? "warn" : "")
                             },
-                            " 请选择" + P(u[p.defaultFile.nodeType] === p.nodeType.办理节点 ? "办理人" : "审批人"),
+                            " 请选择" + P(c[p.defaultFile.nodeType] === p.nodeType.办理节点 ? "办理人" : "审批人"),
                             3
                             /* TEXT, CLASS */
                           ))
@@ -2296,8 +2297,8 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                   (a(!0), d(
                     N,
                     null,
-                    W(u[p.defaultFile.approvePersonList], (L, j) => {
-                      var H;
+                    W(c[p.defaultFile.approvePersonList], (L, H) => {
+                      var j;
                       return a(), d("div", {
                         class: "list",
                         key: L.userId
@@ -2319,7 +2320,7 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                             ])),
                             L.canDele ? (a(), d("i", {
                               key: 2,
-                              onClick: (Ee) => y(S, j),
+                              onClick: (Ee) => y(S, H),
                               class: "ikapprove ikapprove-shanchu1"
                             }, null, 8, Qs)) : x("v-if", !0)
                           ]),
@@ -2329,9 +2330,9 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                           }, P(L.userName), 9, Xs)
                         ]),
                         x(" 显示添加人按钮,不是单选且已选中一个人的情况，显示图标 "),
-                        u[p.defaultFile.isShowAdd] && !(u[p.defaultFile.singleApproval] && ((H = u[p.defaultFile.approvePersonList]) == null ? void 0 : H.length) == 1) ? (a(), d("span", qs, [
+                        c[p.defaultFile.isShowAdd] && !(c[p.defaultFile.singleApproval] && ((j = c[p.defaultFile.approvePersonList]) == null ? void 0 : j.length) == 1) ? (a(), d("span", qs, [
                           x(" 抄送默认 "),
-                          u[p.defaultFile.nodeType] == p.nodeType.抄送节点 ? (a(), d("span", Zs, "+")) : (a(), d(
+                          c[p.defaultFile.nodeType] == p.nodeType.抄送节点 ? (a(), d("span", Zs, "+")) : (a(), d(
                             N,
                             { key: 1 },
                             [
@@ -2339,7 +2340,7 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                               n(
                                 "span",
                                 null,
-                                P(u[p.defaultFile.multiExecutorType] == "ANY" ? "/" : u[p.defaultFile.multiExecutorType] == "ALL" ? "+" : ">"),
+                                P(c[p.defaultFile.multiExecutorType] == "ANY" ? "/" : c[p.defaultFile.multiExecutorType] == "ALL" ? "+" : ">"),
                                 1
                                 /* TEXT */
                               )
@@ -2354,28 +2355,28 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                     /* KEYED_FRAGMENT */
                   )),
                   x(" 显示添加人按钮,不是单选且已选中一个人的情况，显示按钮 (item[state.defaultFile.isShowAdd] && "),
-                  u[p.defaultFile.isShowAdd] && !(u[p.defaultFile.singleApproval] && ((Z = u[p.defaultFile.approvePersonList]) == null ? void 0 : Z.length) == 1) || u[p.defaultFile.isShowAddCopy] ? (a(), d("span", {
+                  c[p.defaultFile.isShowAdd] && !(c[p.defaultFile.singleApproval] && ((Z = c[p.defaultFile.approvePersonList]) == null ? void 0 : Z.length) == 1) || c[p.defaultFile.isShowAddCopy] ? (a(), d("span", {
                     key: 0,
                     class: "addBg",
-                    onClick: (L) => F(u)
+                    onClick: (L) => F(c)
                   }, [
-                    u[p.defaultFile.nodeType] == p.nodeType.审批节点 ? (a(), d("span", Ys)) : x("v-if", !0),
+                    c[p.defaultFile.nodeType] == p.nodeType.审批节点 ? (a(), d("span", Ys)) : x("v-if", !0),
                     Js
                   ], 8, Ks)) : x("v-if", !0),
                   x(" 添加人组件 "),
                   w(O(Bs), Me({
-                    modelValue: u.handList,
-                    "onUpdate:modelValue": (L) => u.handList = L,
-                    show: u.isShow,
-                    "onUpdate:show": (L) => u.isShow = L,
+                    modelValue: c.handList,
+                    "onUpdate:modelValue": (L) => c.handList = L,
+                    show: c.isShow,
+                    "onUpdate:show": (L) => c.isShow = L,
                     onOk: (L) => D(L, S),
-                    multiple: u.multiple,
-                    "dep-list": u.depList,
-                    "user-list": u.userList,
-                    "organization-list": u.organizationList,
+                    multiple: c.multiple,
+                    "dep-list": c.depList,
+                    "user-list": c.userList,
+                    "organization-list": c.organizationList,
                     ref_for: !0
                   }, A.value, {
-                    chooseType: u.chooseType
+                    chooseType: c.chooseType
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "show", "onUpdate:show", "onOk", "multiple", "dep-list", "user-list", "organization-list", "chooseType"])
                 ])
               ])) : (a(), d("div", ea, [
@@ -2384,11 +2385,11 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
                   (a(!0), d(
                     N,
                     null,
-                    W(u.parallelInstances, (L, j) => (a(), d(
+                    W(c.parallelInstances, (L, H) => (a(), d(
                       "div",
                       {
-                        key: j,
-                        class: se(`branch branch-${j}`)
+                        key: H,
+                        class: se(`branch branch-${H}`)
                       },
                       [
                         n(
@@ -2420,8 +2421,8 @@ const Bs = Ge(Us), Qe = (o) => (he("data-v-0f9a3920"), o = o(), Ae(), o), ws = {
     };
   }
 });
-const na = /* @__PURE__ */ G(oa, [["__scopeId", "data-v-0f9a3920"]]), ua = Ge(na);
+const na = /* @__PURE__ */ G(oa, [["__scopeId", "data-v-45d32b3a"]]), ca = Ge(na);
 export {
-  ua as IKApprovalProcess,
-  ua as default
+  ca as IKApprovalProcess,
+  ca as default
 };