bm-admin-ui 1.2.52-alpha → 1.2.53-alpha

package/es/components/cascader/index.js

@@ -10,71 +10,71 @@ var _export_sfc = (sfc, props) => {
   return target;
 };
 
-const _sfc_main = defineComponent({
-  name: 'BmCascader',
-  components: { DownOutlined },
-  props: {
-    tipType: {
-      type: String,
-      default: () => {
-        return 'none'
-      },
-    },
-    width: {
-      type: Number,
-      default: () => {
-        return 200
-      },
-    },
-  },
-  setup(props, { emit, attrs }) {
-    const nameArr = (arr) => {
-      return arr.reduce(
-        (acc, cur) => acc.concat(Array.isArray(cur) ? nameArr(cur) : cur),
-        []
-      )
-    };
-    const state = reactive({
-      labelNameList: '',
-      visible: false,
-    });
-    const methods = {
-      onmouseover() {
-        state.labelNameList.length && (state.visible = true);
-      },
-      onmouseout() {
-        state.labelNameList.length && (state.visible = false);
-      },
-      onchange(value, selectedOptions) {
-        if (attrs.multiple === '' || attrs.multiple) {
-          let res = selectedOptions.map((v, k) => {
-            return v.map((e, i) => {
-              return e.label
-            })
-          });
-          state.labelNameList = nameArr(res).join(',');
-        }
-      },
-    };
-    watch(
-      () => state.labelNameList.length,
-      (val) => {
-        if (!val) {
-          state.visible = false;
-        }
-      },
-      { deep: true }
-    );
-    onMounted(() => {
-      attrs.value?.length &&
-        (state.labelNameList = nameArr(attrs.value).join(','));
-    });
-    return {
-      ...toRefs(state),
-      ...methods,
-    }
-  },
-});
+const _sfc_main = defineComponent({
+  name: 'BmCascader',
+  components: { DownOutlined },
+  props: {
+    tipType: {
+      type: String,
+      default: () => {
+        return 'none'
+      },
+    },
+    width: {
+      type: Number,
+      default: () => {
+        return 200
+      },
+    },
+  },
+  setup(props, { emit, attrs }) {
+    const nameArr = (arr) => {
+      return arr.reduce(
+        (acc, cur) => acc.concat(Array.isArray(cur) ? nameArr(cur) : cur),
+        []
+      )
+    };
+    const state = reactive({
+      labelNameList: '',
+      visible: false,
+    });
+    const methods = {
+      onmouseover() {
+        state.labelNameList.length && (state.visible = true);
+      },
+      onmouseout() {
+        state.labelNameList.length && (state.visible = false);
+      },
+      onchange(value, selectedOptions) {
+        if (attrs.multiple === '' || attrs.multiple) {
+          let res = selectedOptions.map((v, k) => {
+            return v.map((e, i) => {
+              return e.label
+            })
+          });
+          state.labelNameList = nameArr(res).join(',');
+        }
+      },
+    };
+    watch(
+      () => state.labelNameList.length,
+      (val) => {
+        if (!val) {
+          state.visible = false;
+        }
+      },
+      { deep: true }
+    );
+    onMounted(() => {
+      attrs.value?.length &&
+        (state.labelNameList = nameArr(attrs.value).join(','));
+    });
+    return {
+      ...toRefs(state),
+      ...methods,
+    }
+  },
+});
 
 const _hoisted_1 = {
   ref: "BmCascader",
@@ -95,18 +95,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ? (openBlock(), createBlock(_component_a_popover, {
           key: 0,
           visible: _ctx.visible,
-          "get-popup-container": 
-        (triggerNode) => {
-          return triggerNode.parentNode
-        }
+          "get-popup-container": 
+        (triggerNode) => {
+          return triggerNode.parentNode
+        }
       
         }, createSlots({
           default: withCtx(() => [
             createVNode(_component_a_cascader, mergeProps(_ctx.$attrs, {
-              style: {
-          width:
-            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
-          minWidth: _ctx.width + 'px',
+              style: {
+          width:
+            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
+          minWidth: _ctx.width + 'px',
         },
               "show-arrow": true,
               onMouseover: _ctx.onmouseover,
@@ -159,10 +159,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, createSlots({
             default: withCtx(() => [
               createVNode(_component_a_cascader, mergeProps(_ctx.$attrs, {
-                style: {
-          width:
-            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
-          minWidth: _ctx.width + 'px',
+                style: {
+          width:
+            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
+          minWidth: _ctx.width + 'px',
         },
                 "show-arrow": true,
                 onMouseover: _ctx.onmouseover,

package/es/components/edit-form/index.js

@@ -1070,7 +1070,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     createVNode(unref(BmOverTooltips), {
                                       title: unref(getShowValue)(item) || tmpForm.value[item.prop]
                                     }, null, 8, ["title"]),
-                                    createCommentVNode(' <AutoTooltip\n                        :tooltip="getShowValue(item) || tmpForm[item.prop]"\n                      /> ')
+                                    createCommentVNode(' <AutoTooltip\r\n                        :tooltip="getShowValue(item) || tmpForm[item.prop]"\r\n                      /> ')
                                   ], 6)) : createCommentVNode("v-if", true),
                                   item.type === "multiText" ? (openBlock(), createElementBlock("div", {
                                     key: 15,

package/es/components/flow-designer/index.js

@@ -276,7 +276,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             createElementVNode("span", {
               class: normalizeClass(["opeator", { active: __props.isCustom }])
             }, [
-              createCommentVNode(' <CopyOutlined\n            @click.stop="\n              () => {\n                copyCallback()\n              }\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
+              createCommentVNode(' <CopyOutlined\r\n            @click.stop="\r\n              () => {\r\n                copyCallback()\r\n              }\r\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
               createVNode(unref(CloseOutlined), {
                 onClick: _cache[0] || (_cache[0] = withModifiers(
                   () => {

package/es/components/form-create/index.js

@@ -878,6 +878,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     "placeholder",
     "defaultSelected",
     "load",
+    "lazyload",
     "disabled",
     "fieldNames",
     "immediateFetch",
@@ -928,11 +929,12 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
           title: __props.title,
           mode: __props.mode,
           load: __props.load,
+          lazyload: __props.lazyload,
           limit: __props.limit,
           "immediate-fetch": __props.immediateFetch,
           centered: _ctx.$props.centered,
           "onUpdate:select": selectedChange
-        }, null, 8, ["visible", "select", "title", "mode", "load", "limit", "immediate-fetch", "centered"])
+        }, null, 8, ["visible", "select", "title", "mode", "load", "lazyload", "limit", "immediate-fetch", "centered"])
       ]);
     };
   }
@@ -18776,7 +18778,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     debounceFetch("");
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
-        createCommentVNode(' <Input\n    v-model:value="inputValue"\n    placeholder="\u8BF7\u8F93\u5165"\n    :disabled="disabled"\n    @change="debounceFn($event.target.value)"\n  ></Input> '),
+        createCommentVNode(' <Input\r\n    v-model:value="inputValue"\r\n    placeholder="\u8BF7\u8F93\u5165"\r\n    :disabled="disabled"\r\n    @change="debounceFn($event.target.value)"\r\n  ></Input> '),
         createVNode(unref(Select), {
           value: __props.value,
           placeholder: "\u8BF7\u9009\u62E9",
@@ -29436,9 +29438,14 @@ var department = {
                 unitStr: '个',
                 defaultSelected: data.value,
                 centered: true,
-                load() {
+                lazyload(_, params, list) {
                     return __awaiter(this, void 0, void 0, function* () {
-                        return yield extraConfig.department.fetch();
+                        return yield extraConfig.department.lazyload(params, list);
+                    });
+                },
+                load(_, params) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        return yield extraConfig.department.fetch(params);
                     });
                 },
                 fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
@@ -29485,9 +29492,14 @@ var department = {
                 unitStr: '个',
                 defaultSelected: data.value,
                 centered: true,
-                load() {
+                lazyload(_, params, list) {
                     return __awaiter(this, void 0, void 0, function* () {
-                        return yield extraConfig.department.fetch();
+                        return yield extraConfig.department.lazyload(params, list);
+                    });
+                },
+                load(_, params) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        return yield extraConfig.department.fetch(params);
                     });
                 },
                 fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
@@ -29539,6 +29551,11 @@ var department = {
                             row[field] = value;
                         },
                         defaultSelected: row[field],
+                        lazyload(params, list) {
+                            return __awaiter(this, void 0, void 0, function* () {
+                                return yield extraConfig.department.lazyload(params, list);
+                            });
+                        },
                         load(params) {
                             return __awaiter(this, void 0, void 0, function* () {
                                 return yield extraConfig.department.fetch(params);

package/es/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,12 @@ 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;
         search(): void;
         treeRef: import("vue").Ref<any>;
         list: any;
@@ -1001,10 +1015,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 +1049,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 +1090,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/es/components/staffs-selector/index.js

@@ -1,6 +1,6 @@
 import { withInstall } from 'bm-admin-ui/es/utils/with-install';
 import { readonly, ref, reactive, defineComponent, watch, toRefs, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, withDirectives, createTextVNode, vShow, Fragment, renderList, toDisplayString, createCommentVNode, computed, createBlock, unref, withModifiers } from 'vue';
-import { Checkbox, Empty, Radio, Input, RadioGroup, Tree, message, Modal } from 'ant-design-vue';
+import { Checkbox, Empty, Radio, Input, RadioGroup, Tree, Modal } from 'ant-design-vue';
 import { SearchOutlined, CloseCircleFilled } from '@ant-design/icons-vue';
 
 const MODE = {
@@ -32,6 +32,12 @@ const selectProps = {
             return Promise.resolve([]);
         },
     },
+    lazyload: {
+        type: Function,
+        default: () => {
+            return Promise.resolve([]);
+        },
+    },
     select: {
         type: Array || Object,
         defualt: () => [],
@@ -361,10 +367,17 @@ const _sfc_main$1 = defineComponent({
     selected: {
       type: Array,
       default: () => []
+    },
+    loadData: {
+      type: Function,
+      default: () => {
+        return Promise.resolve([]);
+      }
     }
   },
   emits: ["fetchList", "update:selected"],
   setup(props, { emit }) {
+    const allListData = ref([]);
     const treeRef = ref();
     const state = reactive({
       searchVal: "",
@@ -376,41 +389,102 @@ const _sfc_main$1 = defineComponent({
     const methods = {
       search() {
         let data = state.searchVal ? { searchVal: state.searchVal } : { searchVal: "" };
-        emit("fetchList", data);
+        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) {
-        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);
+    };
+    watch(
+      () => list.value,
+      (newVal) => {
+        if (newVal && newVal.length) {
+          allListData.value = [...allListData.value, ...newVal];
+        }
+      }
+    );
     return {
       changeTreeCheck,
       ...toRefs(state),
       ...toRefs(selectState),
       treeRef,
       list,
-      ...methods
+      ...methods,
+      realLoadData
     };
   }
 });
@@ -441,19 +515,20 @@ 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: withCtx(() => [
             createVNode(_component_search_outlined, { style: { color: "#9393A3" } })
           ]),
           _: 1
-        }, 8, ["value", "onBlur"]),
+        }, 8, ["value", "onInput"]),
         createElementVNode("div", _hoisted_4$1, [
           createVNode(_component_ATree, {
             ref: "treeRef",
             "checked-keys": _ctx.multipDepartment,
             checkable: "",
             "tree-data": _ctx.list,
+            "load-data": _ctx.realLoadData,
             onCheck: _ctx.changeTreeCheck
           }, {
             title: withCtx(({ title, key, description }) => [
@@ -463,7 +538,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             ]),
             _: 1
-          }, 8, ["checked-keys", "tree-data", "onCheck"]),
+          }, 8, ["checked-keys", "tree-data", "load-data", "onCheck"]),
           _ctx.list && !_ctx.list.length ? (openBlock(), createElementBlock("div", _hoisted_7, [
             createVNode(_component_Empty, { image: _ctx.emptyPic }, {
               description: withCtx(() => [
@@ -530,26 +605,20 @@ const _sfc_main = /* @__PURE__ */ 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?.map((x) => ({
+            ...x,
+            title: x.name,
+            isLeaf: !x.isExistChild,
+            key: x.id,
+            parent: { key: x.id + Date.now() }
+          }));
+          departNative.value = data;
+        });
+        selectState.dataMap = flatListFunc(list.value);
         return;
       }
       if (params.searchVal) {
@@ -636,6 +705,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         index > -1 && selectState.multipDepartment.splice(index, 1);
       }
     }
+    function onLoadData(treeNode, list2) {
+      if (props.lazyload) {
+        return props.lazyload(treeNode, list2);
+      }
+      return Promise.resolve([]);
+    }
     watch(
       () => props.visible,
       (val) => {
@@ -689,6 +764,7 @@ const _sfc_main = /* @__PURE__ */ 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"])) : (openBlock(), createBlock(multipleCmp, {
               key: 2,

package/es/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/es/components/staffs-selector/src/departmentCmp.vue.d.ts

@@ -7,7 +7,12 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[];
     };
+    loadData: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
 }, {
+    realLoadData: (treeNode: any) => any;
     search(): void;
     treeRef: import("vue").Ref<any>;
     list: any;
@@ -36,10 +41,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;
 }>;