bm-admin-ui 1.2.55-alpha → 1.2.57-alpha

package/es/components/staffs-selector/index.d.ts

@@ -116,6 +116,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {

package/es/components/staffs-selector/index.js

@@ -556,7 +556,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _ctx.list && !_ctx.list.length ? (openBlock(), createElementBlock("div", _hoisted_7, [
             createVNode(_component_Empty, { image: _ctx.emptyPic }, {
               description: withCtx(() => [
-                createElementVNode("span", _hoisted_8, toDisplayString(!!_ctx.searched ? "\u6682\u65E0\u6570\u636E" : "\u8BF7\u5148\u641C\u7D22\u4EBA\u5458\u5173\u952E\u5B57"), 1)
+                createElementVNode("span", _hoisted_8, toDisplayString(!!_ctx.searched ? "\u6682\u65E0\u6570\u636E" : "\u8BF7\u5148\u641C\u7D22\u90E8\u95E8\u5173\u952E\u8BCD"), 1)
               ]),
               _: 1
             }, 8, ["image"])
@@ -693,13 +693,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getOptionName(key) {
       let data = selectState.dataMap.get(String(key));
       if (data && data.title)
-        return `${data.title}`;
+        return `${data.title}${data.key ? `(${data.key})` : ""}${data.description ? `-(${data.description})` : ""}`;
       let arr = props.select;
       arr = arr.length ? arr : [];
       let had = arr.find(
         (item) => String(item) === String(key) || String(item?.key) === String(key)
       );
-      return had?.title ? `${had.title}` : had;
+      return had?.title ? `${had.title}${had.key ? `(${had.key})` : ""}${had.description ? `-(${had.description})` : ""}` : had;
+    }
+    function findParentNode(tree, targetId, parent = null) {
+      for (const node of tree) {
+        if (node.id === targetId) {
+          return parent;
+        }
+        if (node.children && Array.isArray(node.children)) {
+          const found = findParentNode(node.children, targetId, node);
+          if (found !== null) {
+            return found;
+          }
+        }
+      }
+      return null;
     }
     function deleteOptions(key) {
       if (props.mode === MODE.MULTIPLE) {
@@ -707,10 +721,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           selectState.multipleChecked[String(key)] = false;
         }
       } else if (props.mode === MODE.DEPARTMENT) {
-        let index = selectState.multipDepartment.findIndex(
-          (item) => String(item) === String(key)
+        const keyStr = String(key);
+        const parentNode = findParentNode(list.value, key);
+        const parentKeyStr = parentNode ? String(parentNode.id) : null;
+        selectState.multipDepartment = selectState.multipDepartment.filter(
+          (item) => {
+            const itemStr = String(item);
+            return itemStr !== keyStr && itemStr !== parentKeyStr;
+          }
         );
-        index > -1 && selectState.multipDepartment.splice(index, 1);
       }
     }
     function onLoadData(treeNode, list2) {

package/es/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -116,6 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {

package/lib/components/staffs-selector/index.d.ts

@@ -116,6 +116,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {

package/lib/components/staffs-selector/index.js

@@ -560,7 +560,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _ctx.list && !_ctx.list.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
             vue.createVNode(_component_Empty, { image: _ctx.emptyPic }, {
               description: vue.withCtx(() => [
-                vue.createElementVNode("span", _hoisted_8, vue.toDisplayString(!!_ctx.searched ? "\u6682\u65E0\u6570\u636E" : "\u8BF7\u5148\u641C\u7D22\u4EBA\u5458\u5173\u952E\u5B57"), 1)
+                vue.createElementVNode("span", _hoisted_8, vue.toDisplayString(!!_ctx.searched ? "\u6682\u65E0\u6570\u636E" : "\u8BF7\u5148\u641C\u7D22\u90E8\u95E8\u5173\u952E\u8BCD"), 1)
               ]),
               _: 1
             }, 8, ["image"])
@@ -697,13 +697,27 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function getOptionName(key) {
       let data = selectState.dataMap.get(String(key));
       if (data && data.title)
-        return `${data.title}`;
+        return `${data.title}${data.key ? `(${data.key})` : ""}${data.description ? `-(${data.description})` : ""}`;
       let arr = props.select;
       arr = arr.length ? arr : [];
       let had = arr.find(
         (item) => String(item) === String(key) || String(item?.key) === String(key)
       );
-      return had?.title ? `${had.title}` : had;
+      return had?.title ? `${had.title}${had.key ? `(${had.key})` : ""}${had.description ? `-(${had.description})` : ""}` : had;
+    }
+    function findParentNode(tree, targetId, parent = null) {
+      for (const node of tree) {
+        if (node.id === targetId) {
+          return parent;
+        }
+        if (node.children && Array.isArray(node.children)) {
+          const found = findParentNode(node.children, targetId, node);
+          if (found !== null) {
+            return found;
+          }
+        }
+      }
+      return null;
     }
     function deleteOptions(key) {
       if (props.mode === MODE.MULTIPLE) {
@@ -711,10 +725,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           selectState.multipleChecked[String(key)] = false;
         }
       } else if (props.mode === MODE.DEPARTMENT) {
-        let index = selectState.multipDepartment.findIndex(
-          (item) => String(item) === String(key)
+        const keyStr = String(key);
+        const parentNode = findParentNode(list.value, key);
+        const parentKeyStr = parentNode ? String(parentNode.id) : null;
+        selectState.multipDepartment = selectState.multipDepartment.filter(
+          (item) => {
+            const itemStr = String(item);
+            return itemStr !== keyStr && itemStr !== parentKeyStr;
+          }
         );
-        index > -1 && selectState.multipDepartment.splice(index, 1);
       }
     }
     function onLoadData(treeNode, list2) {

package/lib/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -116,6 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.2.55-alpha",
+  "version": "1.2.57-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",

package/types/components/staffs-selector/index.d.ts

@@ -116,6 +116,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {

package/types/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -116,6 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     findDataByKey: (key: string) => any;
     summitSelect: () => void;
     getOptionName: (key: any) => any;
+    findParentNode: (tree: any, targetId: any, parent?: null) => any;
     deleteOptions: (key: any) => void;
     onLoadData: (treeNode: any, list: any) => any;
     AModal: {