bm-admin-ui 1.2.52-alpha → 1.2.54-alpha

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

@@ -36,6 +36,12 @@ const selectProps = {
             return Promise.resolve([]);
         },
     },
+    lazyload: {
+        type: Function,
+        default: () => {
+            return Promise.resolve([]);
+        },
+    },
     select: {
         type: Array || Object,
         defualt: () => [],
@@ -365,10 +371,17 @@ const _sfc_main$1 = vue.defineComponent({
     selected: {
       type: Array,
       default: () => []
+    },
+    loadData: {
+      type: Function,
+      default: () => {
+        return Promise.resolve([]);
+      }
     }
   },
   emits: ["fetchList", "update:selected"],
   setup(props, { emit }) {
+    const allListData = vue.ref([]);
     const treeRef = vue.ref();
     const state = vue.reactive({
       searchVal: "",
@@ -377,51 +390,126 @@ const _sfc_main$1 = vue.defineComponent({
       emptyPic: antDesignVue.Empty.PRESENTED_IMAGE_SIMPLE,
       isFulfill: false
     });
+    const showTree = vue.ref(true);
+    let treeTimeout = null;
     const methods = {
       search() {
         let data = state.searchVal ? { searchVal: state.searchVal } : { searchVal: "" };
-        emit("fetchList", data);
+        if (!state.searchVal) {
+          showTree.value = false;
+          if (treeTimeout)
+            clearTimeout(treeTimeout);
+          treeTimeout = setTimeout(() => {
+            showTree.value = true;
+          });
+        }
+        emit("fetchList", {
+          ...data,
+          area: "department"
+        });
       }
     };
+    function treeDataToMap(treeData, oldMap, oldSet) {
+      const nodeMap = /* @__PURE__ */ new Map();
+      const nodeSet = /* @__PURE__ */ new Set();
+      function traverseNode(node) {
+        if (typeof node === "object" && node !== null && node["id"] !== void 0) {
+          nodeMap.set(node["id"], node);
+          nodeSet.add(node["id"]);
+        } else {
+          return;
+        }
+        if (Array.isArray(node["children"])) {
+          node["children"].forEach((childNode) => traverseNode(childNode));
+        }
+      }
+      if (Array.isArray(treeData)) {
+        treeData.forEach((rootNode) => traverseNode(rootNode));
+      } else {
+        traverseNode(treeData);
+      }
+      if (oldMap) {
+        nodeMap.forEach((node, id) => {
+          oldMap.set(id, node);
+        });
+      }
+      if (oldSet) {
+        nodeSet.forEach((node, id) => {
+          oldSet.add(id);
+        });
+      }
+      return {
+        nodeMap,
+        nodeSet
+      };
+    }
     function changeTreeCheck(checkedKeys) {
-      let flatMap = selectState.dataMap;
-      let curlistKeys = selectState.curlistKeys;
+      console.log("checkedKeys:", checkedKeys, allListData.value);
+      let flatMap = treeDataToMap(
+        allListData.value,
+        selectState.dataMap,
+        null
+      ).nodeMap;
+      selectState.dataMap.forEach((node, id) => {
+        flatMap.set(id, node);
+      });
+      selectState.dataMap = flatMap;
+      flatMap.forEach((node, id) => {
+        selectState.dataMap.set(id, node);
+      });
+      let curlistKeys = treeDataToMap(
+        allListData.value,
+        null,
+        selectState.curlistKeys
+      ).nodeSet;
       let hadselected = new Set(selectState.multipDepartment);
       let curselect = new Set(checkedKeys);
-      console.log(hadselected, curselect);
       for (let key of hadselected) {
-        if (curlistKeys.has(key) && (!curselect.has(key) || curselect.has(key) && curselect.has(flatMap.get(key)["parent"]))) {
+        if (curlistKeys.has(String(key)) && (!curselect.has(String(key)) || curselect.has(String(key)) && curselect.has(flatMap.get(String(key))["parent"]))) {
           hadselected.delete(key);
         }
       }
       for (let key of curselect) {
-        let obj = flatMap.get(key);
+        let obj = flatMap.get(String(key));
         if (obj && !curselect.has(obj["parent"])) {
-          hadselected.add(key);
+          hadselected.add(String(key));
         }
       }
-      let arr = Array.from(hadselected) || [];
-      if (props.limit && props.limit > 0 && arr.length > props.limit) {
-        antDesignVue.message.error("\u52FE\u9009\u540E\u5C06\u8D85\u8FC7\u4EBA\u5458\u9650\u5236");
-        return;
-      }
       selectState.multipDepartment = Array.from(hadselected) || [];
-      console.log(selectState.multipDepartment);
+      console.log("multipDepartment:", selectState.multipDepartment);
     }
+    const realLoadData = (treeNode) => {
+      if (!props.loadData)
+        return Promise.resolve([]);
+      return props.loadData(treeNode, list);
+    };
+    vue.watch(
+      () => list.value,
+      (newVal) => {
+        if (newVal && newVal.length) {
+          allListData.value = [...allListData.value, ...newVal];
+        }
+      }
+    );
     return {
       changeTreeCheck,
       ...vue.toRefs(state),
       ...vue.toRefs(selectState),
       treeRef,
       list,
-      ...methods
+      ...methods,
+      realLoadData,
+      showTree
     };
   }
 });
 const _hoisted_1$1 = { class: "multiple-selector" };
 const _hoisted_2$1 = { class: "__selector-modal-panel" };
 const _hoisted_3$1 = { class: "__search-panel" };
-const _hoisted_4$1 = { class: "__selector-modal-options" };
+const _hoisted_4$1 = {
+  key: 0,
+  class: "__selector-modal-options"
+};
 const _hoisted_5$1 = { class: "department-option-item" };
 const _hoisted_6$1 = {
   key: 0,
@@ -445,29 +533,30 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           value: _ctx.searchVal,
           "onUpdate:value": _cache[0] || (_cache[0] = ($event) => _ctx.searchVal = $event),
           placeholder: "\u8BF7\u8F93\u5165\u90E8\u95E8\u540D\u79F0",
-          onBlur: _ctx.search
+          onInput: _ctx.search
         }, {
           suffix: vue.withCtx(() => [
             vue.createVNode(_component_search_outlined, { style: { color: "#9393A3" } })
           ]),
           _: 1
-        }, 8, ["value", "onBlur"]),
-        vue.createElementVNode("div", _hoisted_4$1, [
+        }, 8, ["value", "onInput"]),
+        _ctx.showTree ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$1, [
           vue.createVNode(_component_ATree, {
             ref: "treeRef",
             "checked-keys": _ctx.multipDepartment,
             checkable: "",
             "tree-data": _ctx.list,
+            "load-data": _ctx.realLoadData,
             onCheck: _ctx.changeTreeCheck
           }, {
-            title: vue.withCtx(({ title, key, description }) => [
+            title: vue.withCtx(({ title, description }) => [
               vue.createElementVNode("div", _hoisted_5$1, [
-                vue.createElementVNode("span", null, vue.toDisplayString(title) + vue.toDisplayString(key ? `(${key})` : ""), 1),
+                vue.createElementVNode("span", null, vue.toDisplayString(title), 1),
                 description ? (vue.openBlock(), vue.createElementBlock("p", _hoisted_6$1, vue.toDisplayString(description), 1)) : vue.createCommentVNode("v-if", true)
               ])
             ]),
             _: 1
-          }, 8, ["checked-keys", "tree-data", "onCheck"]),
+          }, 8, ["checked-keys", "tree-data", "load-data", "onCheck"]),
           _ctx.list && !_ctx.list.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
             vue.createVNode(_component_Empty, { image: _ctx.emptyPic }, {
               description: vue.withCtx(() => [
@@ -476,7 +565,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               _: 1
             }, 8, ["image"])
           ])) : vue.createCommentVNode("v-if", true)
-        ])
+        ])) : vue.createCommentVNode("v-if", true)
       ])
     ])
   ]);
@@ -534,26 +623,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       list.value = [];
       selectState.searched = !!params?.searchVal;
       let isDepartTree = props.mode === MODE.DEPARTMENT;
-      if (isDepartTree) {
-        if (!departNative.value.length) {
-          departNative.value = await props.load(params);
-          selectState.dataMap = flatListFunc([...departNative.value]);
-        }
-        if (params.searchVal) {
-          let result = [];
-          let queues = [...departNative.value];
-          while (queues.length) {
-            let node = queues.shift();
-            if (node["title"] && node["title"].includes(params?.searchVal || "")) {
-              result.push({ ...node });
-            }
-            if (node.children)
-              queues.push(...node.children);
-          }
-          list.value = result;
-        } else {
-          list.value = departNative.value;
-        }
+      if (params.area === "department" || isDepartTree) {
+        props.load({
+          departmentName: params.searchVal
+        }).then((data) => {
+          list.value = data;
+          departNative.value = data;
+        });
+        selectState.dataMap = flatListFunc(list.value);
         return;
       }
       if (params.searchVal) {
@@ -640,6 +717,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         index > -1 && selectState.multipDepartment.splice(index, 1);
       }
     }
+    function onLoadData(treeNode, list2) {
+      if (props.lazyload) {
+        return props.lazyload(treeNode, list2);
+      }
+      return Promise.resolve([]);
+    }
     vue.watch(
       () => props.visible,
       (val) => {
@@ -693,6 +776,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               selected: selected.value,
               "onUpdate:selected": _cache[1] || (_cache[1] = ($event) => selected.value = $event),
               limit: _ctx.limit,
+              "load-data": onLoadData,
               onFetchList: fetch
             }, null, 8, ["selected", "limit"])) : (vue.openBlock(), vue.createBlock(multipleCmp, {
               key: 2,

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

@@ -25,6 +25,10 @@ export declare const selectProps: {
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];

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

@@ -7,7 +7,13 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[];
     };
+    loadData: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
 }, {
+    realLoadData: (treeNode: any) => any;
+    showTree: import("vue").Ref<boolean>;
     search(): void;
     treeRef: import("vue").Ref<any>;
     list: any;
@@ -36,10 +42,15 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[];
     };
+    loadData: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
 }>> & {
     "onUpdate:selected"?: ((...args: any[]) => any) | undefined;
     onFetchList?: ((...args: any[]) => any) | undefined;
 }, {
+    loadData: Function;
     selected: unknown[];
     limit: number;
 }>;

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

@@ -19,6 +19,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -65,6 +69,10 @@ declare const _default: import("vue").DefineComponent<{
             type: FunctionConstructor;
             default: () => Promise<never[]>;
         };
+        lazyload: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
         select: {
             type: ArrayConstructor;
             defualt: () => never[];
@@ -109,6 +117,7 @@ declare const _default: import("vue").DefineComponent<{
     summitSelect: () => void;
     getOptionName: (key: any) => any;
     deleteOptions: (key: any) => void;
+    onLoadData: (treeNode: any, list: any) => any;
     AModal: {
         new (...args: any[]): {
             $: import("vue").ComponentInternalInstance;
@@ -972,7 +981,13 @@ declare const _default: import("vue").DefineComponent<{
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }, {
+        realLoadData: (treeNode: any) => any;
+        showTree: import("vue").Ref<boolean>;
         search(): void;
         treeRef: import("vue").Ref<any>;
         list: any;
@@ -1001,10 +1016,15 @@ declare const _default: import("vue").DefineComponent<{
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }>> & {
         "onUpdate:selected"?: ((...args: any[]) => any) | undefined;
         onFetchList?: ((...args: any[]) => any) | undefined;
     }, {
+        loadData: Function;
         selected: unknown[];
         limit: number;
     }>;
@@ -1030,6 +1050,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -1067,6 +1091,7 @@ declare const _default: import("vue").DefineComponent<{
     unitStr: string;
     limit: number;
     load: Function;
+    lazyload: Function;
     forceStatic: boolean;
     immediateFetch: boolean;
 }>;

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "bm-admin-ui",
-  "version": "1.2.52-alpha",
-  "private": false,
-  "description": "An Admin Component Library for Bm",
-  "license": "UNLICENSED",
-  "repository": {
-    "type": "git",
-    "url": "http://gitlab.admin.bluemoon.com.cn/Frontend-web/bm-admin-ui"
-  },
-  "main": "lib/index.js",
-  "module": "es/index.js",
-  "unpkg": "index.js",
-  "peerDependencies": {
-    "vue": "^3.2.31"
-  },
-  "dependencies": {
-    "@ant-design/icons-vue": "^6.1.0",
-    "@form-create/ant-design-vue": "^3.1.12",
-    "@logicflow/core": "1.1",
-    "@logicflow/extension": "1.1",
-    "ant-design-vue": "^3.2.10",
-    "bm-admin-icons": "^0.2.7",
-    "dayjs": "^1.11.4",
-    "floating-vue": "2.0.0-beta.17",
-    "lodash-es": "^4.17.21",
-    "vuedraggable": "^4.1.0",
-    "vxe-table": "4.2.3",
-    "xe-utils": "3.5.4"
-  },
-  "sideEffects": [
-    "theme-chalk/*.css"
-  ]
-}
+{
+  "name": "bm-admin-ui",
+  "version": "1.2.54-alpha",
+  "private": false,
+  "description": "An Admin Component Library for Bm",
+  "license": "UNLICENSED",
+  "repository": {
+    "type": "git",
+    "url": "http://gitlab.admin.bluemoon.com.cn/Frontend-web/bm-admin-ui"
+  },
+  "main": "lib/index.js",
+  "module": "es/index.js",
+  "unpkg": "index.js",
+  "peerDependencies": {
+    "vue": "^3.2.31"
+  },
+  "dependencies": {
+    "@ant-design/icons-vue": "^6.1.0",
+    "@form-create/ant-design-vue": "^3.1.12",
+    "@logicflow/core": "1.1",
+    "@logicflow/extension": "1.1",
+    "ant-design-vue": "^3.2.10",
+    "bm-admin-icons": "^0.2.7",
+    "dayjs": "^1.11.4",
+    "floating-vue": "2.0.0-beta.17",
+    "lodash-es": "^4.17.21",
+    "vuedraggable": "^4.1.0",
+    "vxe-table": "4.2.3",
+    "xe-utils": "3.5.4"
+  },
+  "sideEffects": [
+    "theme-chalk/*.css"
+  ]
+}

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

@@ -19,6 +19,10 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -65,6 +69,10 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
             type: FunctionConstructor;
             default: () => Promise<never[]>;
         };
+        lazyload: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
         select: {
             type: ArrayConstructor;
             defualt: () => never[];
@@ -109,6 +117,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     summitSelect: () => void;
     getOptionName: (key: any) => any;
     deleteOptions: (key: any) => void;
+    onLoadData: (treeNode: any, list: any) => any;
     AModal: {
         new (...args: any[]): {
             $: import("vue").ComponentInternalInstance;
@@ -972,7 +981,13 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }, {
+        realLoadData: (treeNode: any) => any;
+        showTree: import("vue").Ref<boolean>;
         search(): void;
         treeRef: import("vue").Ref<any>;
         list: any;
@@ -1001,10 +1016,15 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }>> & {
         "onUpdate:selected"?: ((...args: any[]) => any) | undefined;
         onFetchList?: ((...args: any[]) => any) | undefined;
     }, {
+        loadData: Function;
         selected: unknown[];
         limit: number;
     }>;
@@ -1030,6 +1050,10 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -1067,6 +1091,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     unitStr: string;
     limit: number;
     load: Function;
+    lazyload: Function;
     forceStatic: boolean;
     immediateFetch: boolean;
 }>>;

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

@@ -25,6 +25,10 @@ export declare const selectProps: {
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];

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

@@ -7,7 +7,13 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[];
     };
+    loadData: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
 }, {
+    realLoadData: (treeNode: any) => any;
+    showTree: import("vue").Ref<boolean>;
     search(): void;
     treeRef: import("vue").Ref<any>;
     list: any;
@@ -36,10 +42,15 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[];
     };
+    loadData: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
 }>> & {
     "onUpdate:selected"?: ((...args: any[]) => any) | undefined;
     onFetchList?: ((...args: any[]) => any) | undefined;
 }, {
+    loadData: Function;
     selected: unknown[];
     limit: number;
 }>;

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

@@ -19,6 +19,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -65,6 +69,10 @@ declare const _default: import("vue").DefineComponent<{
             type: FunctionConstructor;
             default: () => Promise<never[]>;
         };
+        lazyload: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
         select: {
             type: ArrayConstructor;
             defualt: () => never[];
@@ -109,6 +117,7 @@ declare const _default: import("vue").DefineComponent<{
     summitSelect: () => void;
     getOptionName: (key: any) => any;
     deleteOptions: (key: any) => void;
+    onLoadData: (treeNode: any, list: any) => any;
     AModal: {
         new (...args: any[]): {
             $: import("vue").ComponentInternalInstance;
@@ -972,7 +981,13 @@ declare const _default: import("vue").DefineComponent<{
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }, {
+        realLoadData: (treeNode: any) => any;
+        showTree: import("vue").Ref<boolean>;
         search(): void;
         treeRef: import("vue").Ref<any>;
         list: any;
@@ -1001,10 +1016,15 @@ declare const _default: import("vue").DefineComponent<{
             type: ArrayConstructor;
             default: () => never[];
         };
+        loadData: {
+            type: FunctionConstructor;
+            default: () => Promise<never[]>;
+        };
     }>> & {
         "onUpdate:selected"?: ((...args: any[]) => any) | undefined;
         onFetchList?: ((...args: any[]) => any) | undefined;
     }, {
+        loadData: Function;
         selected: unknown[];
         limit: number;
     }>;
@@ -1030,6 +1050,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    lazyload: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     select: {
         type: ArrayConstructor;
         defualt: () => never[];
@@ -1067,6 +1091,7 @@ declare const _default: import("vue").DefineComponent<{
     unitStr: string;
     limit: number;
     load: Function;
+    lazyload: Function;
     forceStatic: boolean;
     immediateFetch: boolean;
 }>;