cnhis-design-vue 3.1.8 → 3.1.9-beta.3

package/es/packages/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.mjs

@@ -1,9 +1,9 @@
-import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
+import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, withKeys, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
 import { useMessage, NSpin, NInputGroup, NInput, NButton, NCheckbox, NTree, NIcon, NTooltip } from 'naive-ui';
 import { CloseCircleSharp } from '@vicons/ionicons5';
 import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import './SearchTree2.mjs';
-import { filterTree } from './utils/index2.mjs';
+import './SearchTree.mjs';
+import { filterTree } from './utils/index.mjs';
 import script$1 from './SearchTree.vue_vue_type_script_setup_true_lang.mjs';
 
 const _hoisted_1 = {
@@ -21,6 +21,7 @@ const _hoisted_6 = {
   class: "people-tree-item tags-box"
 };
 var script = /* @__PURE__ */ defineComponent({
+  __name: "SelectPerson",
   props: {
     visible: {
       type: Boolean,
@@ -349,12 +350,13 @@ var script = /* @__PURE__ */ defineComponent({
     const generateDataList = (data, dataList) => {
       for (let i = 0; i < data.length; i++) {
         const node = data[i];
-        dataList.push({
-          parentId: getParentId(node),
-          ...node
-        });
         if (node.children) {
           generateDataList(node.children, dataList);
+        } else {
+          dataList.push({
+            parentId: getParentId(node),
+            ...node
+          });
         }
       }
     };
@@ -503,28 +505,24 @@ var script = /* @__PURE__ */ defineComponent({
       });
     };
     const staticDataSearch = () => {
+      state.expandedKeys = [];
       if (!state.title) {
         state.treeData.main = JSON.parse(JSON.stringify(props.data));
         return;
       }
-      let copyData = JSON.parse(JSON.stringify(state.treeData.main));
-      filterTree({
+      let copyData = JSON.parse(JSON.stringify(props.data));
+      state.treeData.main = filterTree({
         value: state.title,
         data: copyData,
-        prop: "title"
-      });
-      const expandedKeys = [];
-      vexutils.searchTree(copyData, (item) => {
-        var _a;
-        if (item.visible) {
-          expandedKeys.push(item.key);
+        prop: "title",
+        filter: true,
+        callback: (child) => {
+          var _a;
+          child.visible && ((_a = child.children) == null ? void 0 : _a.length) && state.expandedKeys.push(child.key);
         }
-        if ((_a = item.children) == null ? void 0 : _a.length) {
-          item.children = item.children.filter((child) => child.visible);
-        }
-      });
-      state.treeData.main = copyData;
-      state.expandedKeys = expandedKeys;
+      }) || [];
+      state.dataList.main = [];
+      generateDataList(state.treeData.main, state.dataList.main);
     };
     const onExpand = (expandedKeys) => {
       state.expandedKeys = expandedKeys;
@@ -545,10 +543,23 @@ var script = /* @__PURE__ */ defineComponent({
         state.indeterminate = false;
         state.singleChecked = false;
       } else {
-        let keyArr = state.treeData.main.map((item) => item.key);
-        let keyArrTemp = keyArr.filter((item) => checkedKeys.indexOf(item) !== -1);
-        state.indeterminate = !(keyArr.length == keyArrTemp.length);
-        state.singleChecked = keyArr.length == keyArrTemp.length;
+        const getAllKeys = (tree) => {
+          if (!(tree == null ? void 0 : tree.length))
+            return 0;
+          let n = 0;
+          tree.forEach((item) => {
+            var _a;
+            if (!((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length)) {
+              n++;
+            } else {
+              n += getAllKeys(item.children);
+            }
+          });
+          return n;
+        };
+        let keys = getAllKeys(state.treeData.main);
+        state.indeterminate = !(keys == state.checkedKeys.main.length);
+        state.singleChecked = keys == state.checkedKeys.main.length;
       }
     };
     const addCheckedkeysMain = (keys) => {
@@ -589,9 +600,9 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const radioChange = (checked) => {
       if (searchTreeVisable.value) {
-        state.singleChecked = checked;
-      } else {
         state.searchChecked = checked;
+      } else {
+        state.singleChecked = checked;
       }
       checkAll(checked ? 1 : 2);
     };
@@ -600,6 +611,8 @@ var script = /* @__PURE__ */ defineComponent({
         return false;
       if (type == 1) {
         state.expandedKeys = [];
+        state.dataList.main = [];
+        generateDataList(state.treeData.main, state.dataList.main);
         state.checkedKeys.main = dataListMainKeys.value;
       } else if (type == 2) {
         state.checkedKeys.main = [];
@@ -774,8 +787,11 @@ var script = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     watch(() => state.checkedKeys.main, (val) => {
-      isAllCheck(val);
-      isSearchAllCheck();
+      if (!searchTreeVisable.value) {
+        isAllCheck(val);
+      } else {
+        isSearchAllCheck();
+      }
       emit("check", val);
     }, {
       immediate: true,
@@ -791,7 +807,7 @@ var script = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(NSpin), {
-        show: unref(state).spinning
+        show: state.spinning
       }, {
         default: withCtx(() => [createElementVNode("div", _hoisted_2, [createCommentVNode(" \u6811\u4E3B\u4F53\u4E0E\u68C0\u7D22 "), createElementVNode("div", _hoisted_3, [createVNode(unref(NInputGroup), {
           style: {
@@ -803,10 +819,11 @@ var script = /* @__PURE__ */ defineComponent({
               "text-align": "left"
             },
             clearable: "",
-            value: unref(state).title,
-            "onUpdate:value": _cache[0] || (_cache[0] = ($event) => unref(state).title = $event),
-            placeholder: __props.searchPlaceholder
-          }, null, 8, ["value", "placeholder"]), createVNode(unref(NButton), {
+            value: state.title,
+            "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.title = $event),
+            placeholder: __props.searchPlaceholder,
+            onKeyup: withKeys(searchClick, ["enter", "native"])
+          }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
             type: "primary",
             onClick: searchClick
           }, {
@@ -816,53 +833,53 @@ var script = /* @__PURE__ */ defineComponent({
           _: 1
         }), unref(searchTreeVisable) ? (openBlock(), createBlock(unref(NCheckbox), {
           key: 0,
-          checked: unref(state).searchChecked,
-          "onUpdate:checked": [_cache[1] || (_cache[1] = ($event) => unref(state).searchChecked = $event), radioChange],
-          indeterminate: unref(state).searchIndeterminate
+          checked: state.searchChecked,
+          "onUpdate:checked": [_cache[1] || (_cache[1] = ($event) => state.searchChecked = $event), radioChange],
+          indeterminate: state.searchIndeterminate
         }, {
           default: withCtx(() => [_hoisted_4]),
           _: 1
         }, 8, ["checked", "indeterminate"])) : (openBlock(), createBlock(unref(NCheckbox), {
           key: 1,
-          checked: unref(state).singleChecked,
-          "onUpdate:checked": [_cache[2] || (_cache[2] = ($event) => unref(state).singleChecked = $event), radioChange],
-          indeterminate: unref(state).searchIndeterminate
+          checked: state.singleChecked,
+          indeterminate: state.searchIndeterminate,
+          "onUpdate:checked": radioChange
         }, {
           default: withCtx(() => [_hoisted_5]),
           _: 1
-        }, 8, ["checked", "indeterminate"])), createCommentVNode(' <div v-show="state.search.status == 3 || (state.search.status == 0 && state.treeData.main && state.treeData.main.length == 0)" class="no-data-tips">\r\n            \u67E5\u65E0\u7ED3\u679C\r\n          </div> '), createCommentVNode(" main tree "), withDirectives(createVNode(unref(NTree), {
+        }, 8, ["checked", "indeterminate"])), createCommentVNode(' <div v-show="state.search.status == 3 || (state.search.status == 0 && state.treeData.main && state.treeData.main.length == 0)" class="no-data-tips">\n            \u67E5\u65E0\u7ED3\u679C\n          </div> '), createCommentVNode(" main tree "), withDirectives(createVNode(unref(NTree), {
           class: "main-tree-container",
-          "checked-keys": unref(state).checkedKeys.main,
-          "onUpdate:checked-keys": _cache[3] || (_cache[3] = ($event) => unref(state).checkedKeys.main = $event),
-          "expanded-keys": unref(state).expandedKeys,
+          "checked-keys": state.checkedKeys.main,
+          "onUpdate:checked-keys": _cache[2] || (_cache[2] = ($event) => state.checkedKeys.main = $event),
+          "expanded-keys": state.expandedKeys,
           checkable: "",
           cascade: "",
           "allow-checking-not-loaded": "",
           selectable: false,
-          data: unref(state).treeData.main,
+          data: state.treeData.main,
           "check-strategy": __props.queryMainTreeData ? "all" : "child",
           "onUpdate:expandedKeys": onExpand,
           "on-load": onLoadData,
           "render-label": renderLabel
-        }, null, 8, ["checked-keys", "expanded-keys", "data", "check-strategy"]), [[vShow, unref(state).search.status == 0]]), createCommentVNode(" search tree "), createVNode(script$1, mergeProps(_ctx.$attrs, {
+        }, null, 8, ["checked-keys", "expanded-keys", "data", "check-strategy"]), [[vShow, state.search.status == 0]]), createCommentVNode(" search tree "), createVNode(script$1, mergeProps(_ctx.$attrs, {
           ref_key: "searchTree",
           ref: searchTree,
           visible: unref(searchTreeVisable),
-          formatTreeData: unref(state).treeData.search,
-          searchValue: unref(state).searchValue,
-          allCheckedKeys: unref(state).checkedKeys,
-          defaultExpandedKeys: unref(state).search.defaultExpandedKeys,
-          dataListKeys: unref(state).search.dataListKeys,
-          searchNoMore: unref(state).searchNoMore,
-          loadMorenLoadinng: unref(state).loadMorenLoadinng,
+          formatTreeData: state.treeData.search,
+          searchValue: state.searchValue,
+          allCheckedKeys: state.checkedKeys,
+          defaultExpandedKeys: state.search.defaultExpandedKeys,
+          dataListKeys: state.search.dataListKeys,
+          searchNoMore: state.searchNoMore,
+          loadMorenLoadinng: state.loadMorenLoadinng,
           onAddCheckedkeysMain: addCheckedkeysMain,
           onRemoveCheckedkeysMain: removeCheckedkeysMain,
           onAddCheckedkeysOther: addCheckedkeysOther,
           onRemoveCheckedkeysOther: removeCheckedkeysOther,
           onSearchOnloadMore: searchOnloadMore
-        }), null, 16, ["visible", "formatTreeData", "searchValue", "allCheckedKeys", "defaultExpandedKeys", "dataListKeys", "searchNoMore", "loadMorenLoadinng"])]), createCommentVNode(" \u6811\u5DF2\u9009\u7684\u6570\u636E "), createElementVNode("div", _hoisted_6, [unref(state).defaultShowList && unref(state).defaultShowList.length ? renderSlot(_ctx.$slots, "default", {
+        }), null, 16, ["visible", "formatTreeData", "searchValue", "allCheckedKeys", "defaultExpandedKeys", "dataListKeys", "searchNoMore", "loadMorenLoadinng"])]), createCommentVNode(" \u6811\u5DF2\u9009\u7684\u6570\u636E "), createElementVNode("div", _hoisted_6, [state.defaultShowList && state.defaultShowList.length ? renderSlot(_ctx.$slots, "default", {
           key: 0
-        }, () => [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(state).defaultShowList, (tag, i) => {
+        }, () => [(openBlock(true), createElementBlock(Fragment, null, renderList(state.defaultShowList, (tag, i) => {
           return openBlock(), createElementBlock("div", {
             class: "tag-item def-item",
             key: i

package/es/packages/select-person/src/utils/index.d.ts

@@ -1,4 +1,4 @@
-export function filterTree({ value, data, prop, filter, filterXor, children, visible, filterChildren, callback }: {
+export declare const filterTree: ({ value, data, prop, filter, filterXor, children, visible, filterChildren, callback }: {
     value?: string | undefined;
     data?: any[] | undefined;
     prop?: string | undefined;
@@ -7,6 +7,6 @@ export function filterTree({ value, data, prop, filter, filterXor, children, vis
     children?: string | undefined;
     visible?: string | undefined;
     filterChildren?: boolean | undefined;
-    callback?: null | undefined;
-}): any;
-export function deepTraversalFirst(node: any, nodeList?: any[]): any[];
+    callback?: Function | undefined;
+}) => any[] | undefined;
+export declare const deepTraversalFirst: (node: any, nodeList?: any[]) => any[];

package/es/packages/select-person/src/utils/index.mjs

@@ -1 +1,84 @@
-export { deepTraversalFirst, filterTree } from './index2.mjs';
+const filterTree = ({
+  value = "",
+  data = [],
+  prop = "title",
+  filter = false,
+  filterXor = false,
+  children = "children",
+  visible = "visible",
+  filterChildren = true,
+  callback
+}) => {
+  visible = visible || "visible";
+  children = children || "children";
+  prop = prop || "text";
+  const filterNodeMethod = function(value2, data2) {
+    if (!value2) {
+      return true;
+    }
+    let flag = (data2[prop] || "").indexOf(value2) !== -1;
+    return filterXor ? !flag : flag;
+  };
+  const setVisible = (tree, isVisible) => {
+    if (!(tree == null ? void 0 : tree.length))
+      return;
+    tree.forEach((item) => {
+      var _a;
+      item[visible] = isVisible;
+      ((_a = item[children]) == null ? void 0 : _a.length) && setVisible(item[children], isVisible);
+    });
+  };
+  const traverse = function(node) {
+    const childNodes = node[children] || [];
+    childNodes.forEach((child) => {
+      child[visible] = !node.root && !filterChildren && node[visible] || filterNodeMethod.call(child, value, child);
+      traverse(child);
+      callback && callback(child);
+    });
+    if (childNodes.length) {
+      let allHidden = true;
+      allHidden = !childNodes.some((child) => child[visible]);
+      if (!node[visible]) {
+        node[visible] = allHidden === false;
+      } else {
+        setVisible(childNodes, true);
+      }
+    }
+  };
+  let totalData = {
+    root: true
+  };
+  totalData[children] = data;
+  traverse(totalData);
+  if (filter) {
+    let copyData = data.slice();
+    let filterHandle = (filterData) => {
+      return filterData.filter((item, index) => {
+        var _a;
+        if (item[visible]) {
+          if (item[children]) {
+            item[children] = filterHandle(item[children]);
+          }
+          if (!((_a = item[children]) == null ? void 0 : _a.length)) {
+            item[children] = void 0;
+          }
+          return true;
+        }
+        return false;
+      });
+    };
+    return filterHandle(copyData);
+  }
+};
+const deepTraversalFirst = (node, nodeList = []) => {
+  if (node !== null) {
+    nodeList.push(node);
+    if (node.children && node.children.length > 0) {
+      let children = node.children;
+      deepTraversalFirst(children[0], nodeList);
+    }
+  }
+  return nodeList;
+};
+
+export { deepTraversalFirst, filterTree };