@king-one/antdv 1.2.21 → 2.0.0

package/dist/es/components/pro-selector/src/components/org-tree.mjs

@@ -1,24 +1,28 @@
-import { isVNode as q, defineComponent as V, inject as A, ref as f, watch as F, createVNode as a, Fragment as v, createTextVNode as C, onMounted as G } from "vue";
-import { useNamespace as M } from "../../../../hooks/use-namespace/index.mjs";
+import { isVNode, defineComponent, ref, watch, createVNode, Fragment, createTextVNode, onMounted } from "vue";
+import { useNamespace } from "../../../../hooks/use-namespace/index.mjs";
 import "../../../index.mjs";
-import { Modal as H, Empty as J, Breadcrumb as Q, BreadcrumbItem as W, Skeleton as B } from "ant-design-vue";
-import { uid as I } from "@king-one/utils";
-import { debounce as X, uniqueById as T, formatOrgTree as Y } from "../utils/orgTree.mjs";
-import { selectUserContextKey as Z, GTE_ORGTREE_URL as ee } from "../types.mjs";
-import b from "./user.mjs";
-import { KIcon as L } from "../../../icon/index.mjs";
-function te(s) {
-  return typeof s == "function" || Object.prototype.toString.call(s) === "[object Object]" && !q(s);
+import { Modal, Empty, Breadcrumb, BreadcrumbItem, Skeleton } from "ant-design-vue";
+import { uid } from "@king-one/utils";
+import { debounce, uniqueById, formatOrgTree } from "../utils/orgTree.mjs";
+import User from "./user.mjs";
+import { KIcon } from "../../../icon/index.mjs";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 const {
-  b: u
-} = M("pro-user-selector"), fe = /* @__PURE__ */ V({
+  b
+} = useNamespace("pro-user-selector");
+const OrgTree = /* @__PURE__ */ defineComponent({
   name: "OrgTree",
   props: {
     selectUserList: {
       type: Array,
       default: () => []
     },
+    initUserList: {
+      type: Array,
+      default: () => []
+    },
     keyword: {
       type: String,
       default: ""
@@ -26,203 +30,275 @@ const {
     initData: {
       type: Function,
       default: () => Promise.resolve([])
+    },
+    maxCount: {
+      type: Number,
+      default: 25
     }
   },
   emits: {
-    "update:selectUserList": (s) => s
+    "update:selectUserList": (list) => list
   },
-  setup(s, {
-    emit: N,
-    expose: R
+  setup(props, {
+    emit,
+    expose
   }) {
-    const r = A(Z), i = f([]), g = f({}), o = f([]), U = f({}), h = f([]), p = f(!1), w = X((e) => {
-      const l = [], t = (d) => {
-        for (const n of d) {
-          if (n.members && n.members.length > 0)
-            for (const c of n.members)
-              c.realName.includes(e) && l.push(c);
-          n.children && n.children.length > 0 && t(n.children);
+    const initData = ref([]);
+    const currentViewDept = ref({});
+    const breadCrumbList = ref([]);
+    const currentBreadCrumbItem = ref({});
+    const keywordUserList = ref([]);
+    const isSearching = ref(false);
+    const debouncedHandleKeywordChange = debounce((keyword) => {
+      const list = [];
+      const loop = (data) => {
+        for (const item of data) {
+          if (item.members && item.members.length > 0) {
+            for (const member of item.members) {
+              if (member.realName.includes(keyword)) {
+                list.push(member);
+              }
+            }
+          }
+          if (item.children && item.children.length > 0) {
+            loop(item.children);
+          }
         }
       };
-      t(i.value), h.value = T(l), p.value = e !== "";
+      loop(initData.value);
+      keywordUserList.value = uniqueById(list);
+      isSearching.value = keyword !== "";
     }, 300);
-    F(() => s.keyword, (e, l) => {
-      if (e === "") {
-        w.cancel(), p.value = !1, h.value = [];
+    watch(() => props.keyword, (newVal, oldVal) => {
+      if (newVal === "") {
+        debouncedHandleKeywordChange.cancel();
+        isSearching.value = false;
+        keywordUserList.value = [];
         return;
       }
-      e !== l && w(e);
+      if (newVal !== oldVal) {
+        debouncedHandleKeywordChange(newVal);
+      }
     });
-    const S = (e) => {
-      var l;
-      (l = g.value.members) == null || l.forEach((t) => {
-        t.id === e && (t.checked = !1);
-      }), h.value = h.value.map((t) => (t.id === e && (t.checked = !1), t));
-    }, E = (e, l) => {
-      if (s.selectUserList.length === (r == null ? void 0 : r.maxCount)) {
-        l.checked = !1, H.warning({
+    const deleteDeptUser = (id) => {
+      var _a;
+      (_a = currentViewDept.value.members) == null ? void 0 : _a.forEach((member) => {
+        if (member.id === id) {
+          member.checked = false;
+        }
+      });
+      keywordUserList.value = keywordUserList.value.map((item) => {
+        if (item.id === id) {
+          item.checked = false;
+        }
+        return item;
+      });
+    };
+    const handleChangeCheckedValue = (checked, info) => {
+      if (props.selectUserList.length === props.maxCount) {
+        info.checked = false;
+        Modal.warning({
           title: "温馨提示",
-          content: `最多只能选择${r.maxCount}个用户`
+          content: `最多只能选择${props.maxCount}个用户`
         });
         return;
       }
-      N("update:selectUserList", e ? [...s.selectUserList, l] : s.selectUserList.filter((t) => t.id !== l.id));
-    }, y = (e) => {
-      var l;
-      e.parentId === "root" ? o.value.push({
-        id: I(32),
-        deptName: "组织内联系人",
-        children: i.value[0].children,
-        members: i.value[0].members
-      }) : o.value.push(e), (l = e.members) == null || l.forEach((t) => {
-        t.checked = s.selectUserList.some((d) => d.id === t.id);
-      }), g.value = e, U.value = e;
-    }, _ = (e, l) => {
-      var d;
-      let t = {};
-      if (U.value.id === e.id) {
-        console.log(`当前组织架构树展示的视图已经是《${e.deptName}》部门下面的数据`);
+      emit("update:selectUserList", checked ? [...props.selectUserList, info] : props.selectUserList.filter((item) => item.id !== info.id));
+    };
+    const handleClickOrgItem = (item) => {
+      var _a;
+      if (item.parentId === "root") {
+        breadCrumbList.value.push({
+          id: uid(32),
+          deptName: "组织内联系人",
+          children: initData.value[0].children,
+          members: initData.value[0].members
+        });
+      } else {
+        breadCrumbList.value.push(item);
+      }
+      (_a = item.members) == null ? void 0 : _a.forEach((member) => {
+        member.checked = props.selectUserList.some((val) => val.id === member.id);
+      });
+      currentViewDept.value = item;
+      currentBreadCrumbItem.value = item;
+    };
+    const handleClickBreadCrumbItem = (item, _index) => {
+      var _a;
+      let dept = {};
+      if (currentBreadCrumbItem.value.id === item.id) {
+        console.log(`当前组织架构树展示的视图已经是《${item.deptName}》部门下面的数据`);
         return;
       }
-      if (l === 0)
-        t = {
-          children: i.value
-        }, o.value = [{
-          id: I(32),
+      if (_index === 0) {
+        dept = {
+          children: initData.value
+        };
+        breadCrumbList.value = [{
+          id: uid(32),
           deptName: "联系人",
-          children: i.value
+          children: initData.value
         }];
-      else if (l === 1)
-        t = i.value[0], o.value = o.value.slice(0, 2);
-      else {
-        t = e;
-        const n = o.value.findIndex((c) => c.id === e.id);
-        n !== -1 && (o.value = o.value.slice(0, n + 1));
+      } else if (_index === 1) {
+        dept = initData.value[0];
+        breadCrumbList.value = breadCrumbList.value.slice(0, 2);
+      } else {
+        dept = item;
+        const index = breadCrumbList.value.findIndex((val) => val.id === item.id);
+        if (index !== -1) {
+          breadCrumbList.value = breadCrumbList.value.slice(0, index + 1);
+        }
       }
-      (d = t.members) == null || d.forEach((n) => {
-        n.checked = s.selectUserList.some((c) => c.id === n.id);
-      }), g.value = t;
-    }, O = (e) => a(v, null, [a("div", {
-      class: u("org-tree-item-title")
-    }, [e.parentId === "root" ? a(L, {
-      name: "zuzhijiagou",
-      size: 18,
-      color: "#00d6b9"
-    }, null) : a("div", {
-      class: u("org-tree-dept-icon")
-    }, [a(L, {
-      name: "zuzhijiagou",
-      size: 18,
-      color: "#ffffff"
-    }, null)], 2), a("div", {
-      class: u("org-tree-item-title-text")
-    }, [e.deptName, e.parentId !== "root" && a(v, null, [C("("), e.members && e.members.length > 0 ? e.members.length : 0, C(")")])], 2)], 2), e.parentId === "root" ? a(L, {
-      name: "right",
-      size: 14,
-      color: "#bbbfc4"
-    }, null) : a("a", {
-      style: "width: 50px",
-      href: "javascript:void(0)"
-    }, [C("下级")])]), x = (e) => {
-      var l;
-      return a("div", {
-        class: u("user-list")
-      }, [(l = e.members) == null ? void 0 : l.map((t) => a(b, {
-        userInfo: t,
-        "onChange-checked": E
+      (_a = dept.members) == null ? void 0 : _a.forEach((member) => {
+        member.checked = props.selectUserList.some((val) => val.id === member.id);
+      });
+      currentViewDept.value = dept;
+    };
+    const getOrgTitle = (item) => {
+      return createVNode(Fragment, null, [createVNode("div", {
+        "class": b("org-tree-item-title")
+      }, [item.parentId === "root" ? createVNode(KIcon, {
+        "name": "zuzhijiagou",
+        "size": 18,
+        "color": "#00d6b9"
+      }, null) : createVNode("div", {
+        "class": b("org-tree-dept-icon")
+      }, [createVNode(KIcon, {
+        "name": "zuzhijiagou",
+        "size": 18,
+        "color": "#ffffff"
+      }, null)], 2), createVNode("div", {
+        "class": b("org-tree-item-title-text")
+      }, [item.deptName, item.parentId !== "root" && createVNode(Fragment, null, [createTextVNode("("), item.members && item.members.length > 0 ? item.members.length : 0, createTextVNode(")")])], 2)], 2), item.parentId === "root" ? createVNode(KIcon, {
+        "name": "right",
+        "size": 14,
+        "color": "#bbbfc4"
+      }, null) : createVNode("a", {
+        "style": "width: 50px",
+        "href": "javascript:void(0)"
+      }, [createTextVNode("下级")])]);
+    };
+    const getUserList = (objData) => {
+      var _a;
+      return createVNode("div", {
+        "class": b("user-list")
+      }, [(_a = objData.members) == null ? void 0 : _a.map((member) => createVNode(User, {
+        "userInfo": member,
+        "onChange-checked": handleChangeCheckedValue
       }, null, 8, ["userInfo", "onChange-checked"]))], 2);
-    }, D = (e) => e.parentId === "root" && o.value.length === 1 ? a("div", {
-      class: u("org-tree-item"),
-      onClick: () => y(e)
-    }, [O(e)], 10, ["onClick"]) : a(v, null, [e.children && e.children.length > 0 ? e.children.map((l) => a("div", {
-      class: u("org-tree-item"),
-      onClick: () => y(l)
-    }, [O(l)], 10, ["onClick"])) : null, x(e)]), K = () => a("div", {
-      class: u("user-list")
-    }, [h.value.length > 0 ? h.value.map((e) => a(b, {
-      userInfo: e,
-      "onChange-checked": E
-    }, {
-      name: () => a("div", {
-        style: "font-size: 14px;color: #000;"
-      }, [e != null && e.realName.includes(s.keyword) ? e == null ? void 0 : e.realName.split(s.keyword).map((l, t) => a(v, null, [l, t < (e == null ? void 0 : e.realName.split(s.keyword).length) - 1 && a("span", {
-        style: "color: red;"
-      }, [s.keyword])])) : e == null ? void 0 : e.realName]),
-      _: 1
-    }, 8, ["userInfo", "onChange-checked"])) : a(J, {
-      description: "暂无数据"
-    }, null)], 2), m = f(!1);
-    let z;
-    const P = new Promise((e) => {
-      z = e;
-    }), $ = () => new Promise((e, l) => {
-      if (r != null && r.isBuiltInRequest) {
-        if (!r.http)
-          throw new Error("请传入http实例");
-        r.http.get(`${r.prefix}/${ee}`).then((t) => {
-          t.status === 0 && e(t.data);
-        }).catch((t) => {
-          console.log(t);
-        });
+    };
+    const getOrgElement = (objData) => {
+      if (objData.parentId === "root" && breadCrumbList.value.length === 1) {
+        return createVNode("div", {
+          "class": b("org-tree-item"),
+          "onClick": () => handleClickOrgItem(objData)
+        }, [getOrgTitle(objData)], 10, ["onClick"]);
       }
+      return createVNode(Fragment, null, [objData.children && objData.children.length > 0 ? objData.children.map((item) => createVNode("div", {
+        "class": b("org-tree-item"),
+        "onClick": () => handleClickOrgItem(item)
+      }, [getOrgTitle(item)], 10, ["onClick"])) : null, getUserList(objData)]);
+    };
+    const getKeyordUserList = () => {
+      return createVNode("div", {
+        "class": b("user-list")
+      }, [keywordUserList.value.length > 0 ? keywordUserList.value.map((member) => createVNode(User, {
+        "userInfo": member,
+        "onChange-checked": handleChangeCheckedValue
+      }, {
+        name: () => createVNode("div", {
+          "style": "font-size: 14px;color: #000;"
+        }, [(member == null ? void 0 : member.realName.includes(props.keyword)) ? member == null ? void 0 : member.realName.split(props.keyword).map((part, index) => createVNode(Fragment, null, [part, index < (member == null ? void 0 : member.realName.split(props.keyword).length) - 1 && createVNode("span", {
+          "style": "color: red;"
+        }, [props.keyword])])) : member == null ? void 0 : member.realName]),
+        _: 1
+      }, 8, ["userInfo", "onChange-checked"])) : createVNode(Empty, {
+        "description": "暂无数据"
+      }, null)], 2);
+    };
+    const loading = ref(false);
+    let resolveDataLoaded;
+    const dataLoadPromise = new Promise((resolve) => {
+      resolveDataLoaded = resolve;
     });
-    return G(async () => {
+    onMounted(async () => {
       try {
-        m.value = !0, r != null && r.isBuiltInRequest ? i.value = await $() : r != null && r.initData && (i.value = await r.initData()), Y(i.value), m.value = !1, z(i.value), g.value = {
-          children: i.value
-        }, o.value = [{
-          id: I(32),
+        loading.value = true;
+        initData.value = await props.initData();
+        formatOrgTree(initData.value);
+        loading.value = false;
+        resolveDataLoaded(initData.value);
+        currentViewDept.value = {
+          children: initData.value
+        };
+        breadCrumbList.value = [{
+          id: uid(32),
           deptName: "联系人",
-          children: i.value
-        }], y(i.value[0]);
+          children: initData.value
+        }];
+        handleClickOrgItem(initData.value[0]);
       } finally {
-        m.value = !1;
+        loading.value = false;
       }
-    }), R({
-      deleteDeptUser: S,
-      getInitData: (e, l) => {
-        const t = [], d = (n) => {
-          for (const c of n) {
-            if (c.members && c.members.length > 0)
-              for (const k of c.members)
-                e.some((j) => j.id === k.id) ? (k.checked = !0, t.push(k)) : k.checked = !1;
-            c.children && c.children.length > 0 && d(c.children);
+    });
+    const getInitData = (_initData, orgData) => {
+      const list = [];
+      const loop = (data) => {
+        for (const item of data) {
+          if (item.members && item.members.length > 0) {
+            for (const member of item.members) {
+              if (_initData.some((val) => val.id === member.id)) {
+                member.checked = true;
+                list.push(member);
+              } else {
+                member.checked = false;
+              }
+            }
           }
-        };
-        d(l), N("update:selectUserList", T(t));
-      },
-      dataLoadPromise: P
-    }), () => {
-      let e;
-      return a(v, null, [a("div", {
-        style: "padding:0 16px"
-      }, [o.value.length > 1 && !p.value ? a(Q, {
-        separator: ">",
-        class: u("breadcrumb")
-      }, te(e = o.value.map((l, t) => a(W, {
-        onClick: () => _(l, t)
+          if (item.children && item.children.length > 0) {
+            loop(item.children);
+          }
+        }
+      };
+      loop(orgData);
+      emit("update:selectUserList", uniqueById(list));
+    };
+    expose({
+      deleteDeptUser,
+      getInitData,
+      dataLoadPromise
+    });
+    return () => {
+      let _slot;
+      return createVNode(Fragment, null, [createVNode("div", {
+        "style": "padding:0 16px"
+      }, [breadCrumbList.value.length > 1 && !isSearching.value ? createVNode(Breadcrumb, {
+        "separator": ">",
+        "class": b("breadcrumb")
+      }, _isSlot(_slot = breadCrumbList.value.map((item, index) => createVNode(BreadcrumbItem, {
+        "onClick": () => handleClickBreadCrumbItem(item, index)
       }, {
-        default: () => [t === o.value.length - 1 ? l.deptName : a("a", {
-          href: "javascript:void(0)"
-        }, [l.deptName])]
-      }, 8, ["onClick"]))) ? e : {
-        default: () => [e],
+        default: () => [index === breadCrumbList.value.length - 1 ? item.deptName : createVNode("a", {
+          "href": "javascript:void(0)"
+        }, [item.deptName])]
+      }, 8, ["onClick"]))) ? _slot : {
+        default: () => [_slot],
         _: 1
-      }, 8, ["class"]) : null]), p.value ? a(v, null, [K()]) : a("div", {
-        class: u("org-tree")
-      }, [m.value ? a("div", {
-        class: u("org-tree-item"),
-        style: "height: 200px;display: block;"
-      }, [a(B, {
-        active: !0,
-        avatar: !0
-      }, null, 8, ["active", "avatar"]), a(B, {
-        active: !0,
-        avatar: !0
-      }, null, 8, ["active", "avatar"])], 2) : D(g.value)], 2)]);
+      }, 8, ["class"]) : null]), !isSearching.value ? createVNode("div", {
+        "class": b("org-tree")
+      }, [loading.value ? createVNode("div", {
+        "class": b("org-tree-item"),
+        "style": "height: 200px;display: block;"
+      }, [createVNode(Skeleton, {
+        "active": true,
+        "avatar": true
+      }, null, 8, ["active", "avatar"]), createVNode(Skeleton, {
+        "active": true,
+        "avatar": true
+      }, null, 8, ["active", "avatar"])], 2) : getOrgElement(currentViewDept.value)], 2) : createVNode(Fragment, null, [getKeyordUserList()])]);
     };
   }
 });
 export {
-  fe as default
+  OrgTree as default
 };

package/dist/es/components/pro-selector/src/components/user.mjs

@@ -1,15 +1,16 @@
-import { isVNode as r, defineComponent as d, createVNode as t } from "vue";
-import { useNamespace as u } from "../../../../hooks/use-namespace/index.mjs";
-import { Checkbox as f } from "ant-design-vue";
+import { isVNode, defineComponent, createVNode } from "vue";
+import { useNamespace } from "../../../../hooks/use-namespace/index.mjs";
+import { Checkbox } from "ant-design-vue";
 import "../../../index.mjs";
-import { KUserAvatar as m } from "../../../pro-user-avatar/index.mjs";
-import { KIcon as h } from "../../../icon/index.mjs";
-function k(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !r(e);
+import { KUserAvatar } from "../../../pro-user-avatar/index.mjs";
+import { KIcon } from "../../../icon/index.mjs";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 const {
-  b: a
-} = u("pro-user-selector"), b = /* @__PURE__ */ d({
+  b
+} = useNamespace("pro-user-selector");
+const User = /* @__PURE__ */ defineComponent({
   name: "User",
   props: {
     userInfo: {
@@ -18,73 +19,74 @@ const {
     },
     isChecked: {
       type: Boolean,
-      default: !0
+      default: true
     },
     isDelete: {
       type: Boolean,
-      default: !1
+      default: false
     }
   },
   emits: {
-    "delete-user": (e) => e,
-    "change-checked": (e, o) => e
+    "delete-user": (id) => id,
+    "change-checked": (checked, info) => checked
   },
-  setup(e, {
-    emit: o,
-    slots: c
+  setup(props, {
+    emit,
+    slots
   }) {
-    const s = (n) => {
-      o("change-checked", n.target.checked, e.userInfo);
-    }, i = () => t("div", {
-      class: a("user-item-content")
-    }, [t("div", {
-      style: {
+    const handleChangeChecked = (e) => {
+      emit("change-checked", e.target.checked, props.userInfo);
+    };
+    const getUserInfo = () => createVNode("div", {
+      "class": b("user-item-content")
+    }, [createVNode("div", {
+      "style": {
         width: "100%",
         display: "flex",
         alignItems: "center"
       }
-    }, [t(m, {
-      name: e.userInfo.realName ? e.userInfo.realName : "",
-      avatar: e.userInfo.avatar,
-      size: "default"
-    }, null, 8, ["name", "avatar"]), t("div", null, [t("div", {
-      style: "display: flex;align-items: center;"
-    }, [c.name ? c.name() : t("div", {
-      style: "font-size: 14px;color: #000;"
-    }, [e.userInfo.realName]), e.userInfo.position && t("div", {
-      class: a("user-item-content-tag")
-    }, [e.userInfo.position], 2)]), t("div", {
-      style: {
+    }, [createVNode(KUserAvatar, {
+      "name": props.userInfo.realName ? props.userInfo.realName : "",
+      "avatar": props.userInfo.avatar,
+      "size": "default"
+    }, null, 8, ["name", "avatar"]), createVNode("div", null, [createVNode("div", {
+      "style": "display: flex;align-items: center;"
+    }, [slots.name ? slots.name() : createVNode("div", {
+      "style": "font-size: 14px;color: #000;"
+    }, [props.userInfo.realName]), props.userInfo.position && createVNode("div", {
+      "class": b("user-item-content-tag")
+    }, [props.userInfo.position], 2)]), createVNode("div", {
+      "style": {
         fontSize: "12px",
         color: "#8f959e",
         lineHeight: "20px"
       }
-    }, [e.userInfo.stageName])])]), e.isDelete && t("div", {
-      class: "select-user-item-icon",
-      onClick: () => o("delete-user", e.userInfo.id)
-    }, [t(h, {
-      name: "shanchu",
-      size: 12,
-      color: "#2b2f36"
+    }, [props.userInfo.stageName])])]), props.isDelete && createVNode("div", {
+      "class": "select-user-item-icon",
+      "onClick": () => emit("delete-user", props.userInfo.id)
+    }, [createVNode(KIcon, {
+      "name": "shanchu",
+      "size": 12,
+      "color": "#2b2f36"
     }, null)], 8, ["onClick"])], 2);
     return () => {
-      let n;
-      return t("div", {
-        class: a("user-item")
-      }, [e.isChecked ? t(f, {
-        style: "margin: 0 6px;width: 100%;",
-        checked: e.userInfo.checked,
-        "onUpdate:checked": (l) => e.userInfo.checked = l,
-        onChange: s
-      }, k(n = i()) ? n : {
-        default: () => [n],
+      let _slot;
+      return createVNode("div", {
+        "class": b("user-item")
+      }, [props.isChecked ? createVNode(Checkbox, {
+        "style": "margin: 0 6px;width: 100%;",
+        "checked": props.userInfo.checked,
+        "onUpdate:checked": ($event) => props.userInfo.checked = $event,
+        "onChange": handleChangeChecked
+      }, _isSlot(_slot = getUserInfo()) ? _slot : {
+        default: () => [_slot],
         _: 1
-      }, 8, ["checked", "onUpdate:checked", "onChange"]) : t("div", {
-        style: "width: 100%;"
-      }, [i()])], 2);
+      }, 8, ["checked", "onUpdate:checked", "onChange"]) : createVNode("div", {
+        "style": "width: 100%;"
+      }, [getUserInfo()])], 2);
     };
   }
 });
 export {
-  b as default
+  User as default
 };

package/dist/es/components/pro-selector/src/hooks/index.mjs

@@ -1,4 +1,4 @@
-import { useUserSelector as o } from "./useUserSelector.mjs";
+import { useUserSelector } from "./useUserSelector.mjs";
 export {
-  o as useUserSelector
+  useUserSelector
 };