cnhis-design-vue 3.1.8-beta.4 → 3.1.8-beta.5

package/es/packages/big-table/index.d.ts

@@ -702,10 +702,11 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     handlerClickRow: (data: any) => false | undefined;
     addCheckedRows: (rows: any) => false | undefined;
     treeTableSelectionChange: (records: any) => boolean;
-    selectionChange: ({ checked, row, records }: {
+    selectionChange: ({ checked, row, records, $rowIndex }: {
         checked: any;
         row: any;
         records: any;
+        $rowIndex: any;
     }) => void;
     selectionChangeAll: ({ checked, records }: {
         checked: any;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -701,10 +701,11 @@ declare const _default: import("vue").DefineComponent<{
     handlerClickRow: (data: any) => false | undefined;
     addCheckedRows: (rows: any) => false | undefined;
     treeTableSelectionChange: (records: any) => boolean;
-    selectionChange: ({ checked, row, records }: {
+    selectionChange: ({ checked, row, records, $rowIndex }: {
         checked: any;
         row: any;
         records: any;
+        $rowIndex: any;
     }) => void;
     selectionChangeAll: ({ checked, records }: {
         checked: any;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.mjs

@@ -1283,12 +1283,18 @@ var script = /* @__PURE__ */ defineComponent({
       let forbiddenBatchSelect = !checkMethod(data);
       if (state.selectType == "checkbox" && forbiddenBatchSelect) {
         table == null ? void 0 : table.setAllCheckboxRow(false);
-        const value = getRowClassName()({
+        const checked2 = getRowClassName()({
           row
-        }) == "single--checked" ? [] : [row];
+        }) == "single--checked";
+        const value = !checked2 ? [] : [row];
         state.checkedRows = value;
         pubCheckChange(value);
         emit("handlerClickRow", row, $rowIndex);
+        emit("checkboxChange", {
+          checked: checked2,
+          row,
+          index: $rowIndex
+        });
         return;
       }
       state.visibleCheckAllWrap = false;
@@ -1357,6 +1363,11 @@ var script = /* @__PURE__ */ defineComponent({
         state.selectType != "radio" && table.setCheckboxRow([row], setChecked);
       }
       if (state.isTree != 0) {
+        emit("checkboxChange", {
+          checked: setChecked,
+          row,
+          index: $rowIndex
+        });
         setChecked && emit("handlerClickRow", row, $rowIndex);
         return;
       }
@@ -1369,6 +1380,11 @@ var script = /* @__PURE__ */ defineComponent({
       }
       setCurrentCheckedLength();
       state.lastPageIndex = props.pageVO.pageIndex;
+      emit("checkboxChange", {
+        checked: setChecked,
+        row,
+        index: $rowIndex
+      });
       setChecked && emit("handlerClickRow", row, $rowIndex);
     };
     const addCheckedRows = (rows) => {
@@ -1399,7 +1415,8 @@ var script = /* @__PURE__ */ defineComponent({
     const selectionChange = ({
       checked,
       row,
-      records
+      records,
+      $rowIndex
     }) => {
       let table = xGrid.value;
       table.clearCurrentRow();
@@ -1407,6 +1424,11 @@ var script = /* @__PURE__ */ defineComponent({
       setTimeout(() => {
         state.isTriggerSelectionChange = false;
       }, 0);
+      emit("checkboxChange", {
+        checked,
+        row,
+        index: $rowIndex
+      });
       if (treeTableSelectionChange(records))
         return;
       if (checked) {

package/es/packages/big-table/src/bigTableEmits2.mjs

@@ -43,7 +43,8 @@ const bigTableEmits = [
   "asyncTableChange",
   "formChange",
   "scroll",
-  "keyboard"
+  "keyboard",
+  "checkboxChange"
 ];
 
 export { bigTableEmits as default };

package/es/packages/select-person/src/SelectPerson.vue.d.ts

@@ -306,7 +306,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderPressed: string;
             borderFocus: string;
-            borderDisabled: string;
+            borderDisabled: string; /** 提交映射 */
             rippleColor: string;
             colorPrimary: string;
             colorHoverPrimary: string;
@@ -2149,9 +2149,7 @@ declare const _default: import("vue").DefineComponent<{
             '--n-icon-color-pressed': string;
             '--n-icon-color-disabled': string;
             '--n-suffix-text-color': string;
-        }> | undefined; /**
-         * 拼接key
-         */
+        }> | undefined;
         themeClass: import("vue").Ref<string> | undefined;
         onRender: (() => void) | undefined;
         isCompositing: import("vue").Ref<boolean>;

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

@@ -508,24 +508,17 @@ var script = /* @__PURE__ */ defineComponent({
         state.treeData.main = JSON.parse(JSON.stringify(props.data));
         return;
       }
-      let copyData = JSON.parse(JSON.stringify(state.treeData.main));
-      filterTree({
+      state.expandedKeys = [];
+      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);
-        }
-        if ((_a = item.children) == null ? void 0 : _a.length) {
-          item.children = item.children.filter((child) => child.visible);
+        prop: "title",
+        filter: true,
+        callback: (child) => {
+          child.visible && state.expandedKeys.push(child.key);
         }
-      });
-      state.treeData.main = copyData;
-      state.expandedKeys = expandedKeys;
+      }) || [];
     };
     const onExpand = (expandedKeys) => {
       state.expandedKeys = expandedKeys;

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/index2.mjs

@@ -1,4 +1,14 @@
-const filterTree = ({ value = "", data = [], prop = "title", filter = false, filterXor = false, children = "children", visible = "visible", filterChildren = true, callback = null }) => {
+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";
@@ -12,9 +22,9 @@ const filterTree = ({ value = "", data = [], prop = "title", filter = false, fil
   const traverse = function(node) {
     const childNodes = node[children] || [];
     childNodes.forEach((child) => {
-      callback && callback(child);
-      child[visible] = !node.root && !filterChildren && node[visible] || filterNodeMethod.call(child, value, child, prop);
+      child[visible] = !node.root && !filterChildren && node[visible] || filterNodeMethod.call(child, value, child);
       traverse(child);
+      callback && callback(child);
     });
     if (!node[visible] && childNodes.length) {
       let allHidden = true;
@@ -31,10 +41,14 @@ const filterTree = ({ value = "", data = [], prop = "title", filter = false, fil
     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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.8-beta.4",
+  "version": "3.1.8-beta.5",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",