cnhis-design-vue 3.1.23-beta.8 → 3.1.23-beta.9

package/es/components/big-table/src/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getMapVal: (row: any, item: any) => any;
 export declare const getageShowType: (row: any, item: any) => any;
 export declare const reScrollFilterWrap: () => void;
 export declare const showFilter: (field: any, columnName: any, event: any, props: any, state: any) => false | undefined;
-export declare const handleGroupColums: (columns: any, props: any) => any;
+export declare const handleGroupColums: (columns: any, props: any) => any[];
 export declare const handlerInitSearchItem: (arr: any) => void;
 export declare const generateEditRender: (fieldItem: any) => {
     name: string;

package/es/components/big-table/src/utils2.js

@@ -1,7 +1,8 @@
-import { nextTick } from 'vue';
+import img from '../../../shared/assets/img/xb_small.js';
 import XEUtils from 'xe-utils';
 import 'moment';
-import img from '../../../shared/assets/img/xb_small.js';
+import { nextTick } from 'vue';
+import { groupTraverser, createRowGroupList } from '../../iho-table/src/plugins/rowGroupSettingPlugin/row-group-utils2.js';
 
 const isJSON = (str) => {
   if (typeof str == "string") {
@@ -166,43 +167,16 @@ const showFilter = (field, columnName, event, props, state) => {
   field.indeterminate = !!len && len !== field.setting.showSetting.length;
   field.searchFilterText = "";
 };
-const handleRowColumns = (rowColumns, columns, key) => {
-  rowColumns.map((item) => {
-    var _a;
-    const children = [];
-    let spliceIndex = -1;
-    const indexArr = [];
-    ((_a = item.list) == null ? void 0 : _a.length) && item.list.forEach((v) => {
-      const matchItem = columns == null ? void 0 : columns.find((column) => column[key] === v);
-      if (matchItem) {
-        const matchIndex = columns.findIndex((column) => column[key] === v);
-        indexArr.push(matchIndex);
-        delete matchItem.fixed;
-        children.push(matchItem);
-        columns.splice(matchIndex, 1);
-      }
-    });
-    const obj = {
-      title: item.title,
-      align: "center",
-      children
-    };
-    spliceIndex = Math.min(...indexArr);
-    spliceIndex > -1 && columns.splice(spliceIndex, 0, obj);
-  });
-};
 const handleGroupColums = (columns, props) => {
   const { rowGroupSetting } = props;
-  if (!rowGroupSetting || !Object.keys(rowGroupSetting).length)
-    return columns;
-  const { firstRowGroup, secondRowGroup } = rowGroupSetting;
-  if (!firstRowGroup || !firstRowGroup.length)
-    return columns;
-  handleRowColumns(firstRowGroup, columns, "columnName");
-  if (!secondRowGroup || !secondRowGroup.length)
-    return columns;
-  handleRowColumns(secondRowGroup, columns, "title");
-  return columns;
+  return groupTraverser(createRowGroupList(rowGroupSetting, columns, (field) => field.columnName || field.type), (fieldName, isBlock) => {
+    if (isBlock)
+      return { field: fieldName, title: fieldName, align: "center" };
+    return fieldSearcher(fieldName, columns);
+  });
+  function fieldSearcher(fieldName, fieldList) {
+    return fieldList.find((field) => (field.columnName || field.type) === fieldName);
+  }
 };
 const handlerInitSearchItem = (arr) => {
   if (!Array.isArray(arr))

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/index2.js

@@ -1,7 +1,6 @@
 import { isObject } from '@vue/shared';
-import { isArray, isString } from 'lodash-es';
 import '../../../index2.js';
-import { IhoTableRowGroupSequence } from '../../constants/index2.js';
+import { groupTraverser, createRowGroupList } from './row-group-utils2.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
 
 function rowGroupSettingPlugin() {
@@ -24,49 +23,5 @@ function rowGroupSettingPlugin() {
 function fieldSearcher(fieldName, fieldList) {
   return fieldList.find((field) => field.field === fieldName);
 }
-function createRowGroupList(rowGroupSetting, fieldList) {
-  const result = fieldList.map((field) => field.field);
-  IhoTableRowGroupSequence.some((sequence) => {
-    const currentLevelGroup = rowGroupSetting[sequence];
-    if (!isArray(currentLevelGroup))
-      return true;
-    currentLevelGroup.forEach((groupSetting) => {
-      if (!isArray(groupSetting.list) || !groupSetting.list.length)
-        return;
-      const children = [];
-      groupSetting.list.forEach((fieldName, idx) => {
-        const groupIdx = groupIndexSearcher(fieldName, result);
-        if (!~groupIdx)
-          return;
-        children.push(result[groupIdx]);
-        if (idx === 0) {
-          result.splice(groupIdx, 1, { fieldName: groupSetting.title, children });
-        } else {
-          result.splice(groupIdx, 1);
-        }
-      });
-    });
-  });
-  return result;
-  function groupIndexSearcher(fieldName, groupList) {
-    return groupList.findIndex((group) => (isObject(group) ? group.fieldName : group) === fieldName);
-  }
-}
-function groupTraverser(groupList, replacer) {
-  return groupList.reduce((result, group) => {
-    if (isString(group)) {
-      const item = replacer(group);
-      item && result.push(item);
-    }
-    if (isObject(group) && group.children) {
-      const item = replacer(group.fieldName, true);
-      if (item) {
-        item.children = groupTraverser(group.children, replacer);
-        result.push(item);
-      }
-    }
-    return result;
-  }, []);
-}
 
 export { rowGroupSettingPlugin };

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/row-group-utils.d.ts

@@ -0,0 +1,11 @@
+import { NotNull, Nullable } from '../../../../../../es/shared/types';
+import { IhoTableConfig, IhoTableFieldItem } from '../../../../../../es/components/iho-table';
+declare type GroupItem = string | {
+    fieldName: string;
+    children?: GroupItem[];
+};
+export declare function createRowGroupList(rowGroupSetting: NotNull<IhoTableConfig['rowGroupSetting']>, fieldList: IhoTableFieldItem[], getKey?: (field: IhoTableFieldItem) => string): GroupItem[];
+export declare function groupTraverser<T extends Nullable<{
+    children?: T[];
+}>>(groupList: GroupItem[], replacer: (fieldName: string, isBlock?: boolean) => T): NotNull<T>[];
+export {};

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/row-group-utils.js

@@ -0,0 +1 @@
+export { createRowGroupList, groupTraverser } from './row-group-utils2.js';

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/row-group-utils2.js

@@ -0,0 +1,50 @@
+import { isObject } from '@vue/shared';
+import { isArray, isString } from 'lodash-es';
+import { IhoTableRowGroupSequence } from '../../constants/index2.js';
+
+function createRowGroupList(rowGroupSetting, fieldList, getKey = (field) => field.field) {
+  const result = fieldList.map((field) => getKey(field));
+  IhoTableRowGroupSequence.some((sequence) => {
+    const currentLevelGroup = rowGroupSetting[sequence];
+    if (!isArray(currentLevelGroup))
+      return true;
+    currentLevelGroup.forEach((groupSetting) => {
+      if (!isArray(groupSetting.list) || !groupSetting.list.length)
+        return;
+      const children = [];
+      groupSetting.list.forEach((fieldName, idx) => {
+        const groupIdx = groupIndexSearcher(fieldName, result);
+        if (!~groupIdx)
+          return;
+        children.push(result[groupIdx]);
+        if (idx === 0) {
+          result.splice(groupIdx, 1, { fieldName: groupSetting.title, children });
+        } else {
+          result.splice(groupIdx, 1);
+        }
+      });
+    });
+  });
+  return result;
+  function groupIndexSearcher(fieldName, groupList) {
+    return groupList.findIndex((group) => (isObject(group) ? group.fieldName : group) === fieldName);
+  }
+}
+function groupTraverser(groupList, replacer) {
+  return groupList.reduce((result, group) => {
+    if (isString(group)) {
+      const item = replacer(group);
+      item && result.push(item);
+    }
+    if (isObject(group) && group.children) {
+      const item = replacer(group.fieldName, true);
+      if (item) {
+        item.children = groupTraverser(group.children, replacer);
+        result.push(item);
+      }
+    }
+    return result;
+  }, []);
+}
+
+export { createRowGroupList, groupTraverser };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.8",
+  "version": "3.1.23-beta.9",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "a54b390e037e36aa1dbf7793ef68a4cbd9a089e0"
+  "gitHead": "ba7a3a8d47692bcd6d27d53c1fa3e5b5db491b1c"
 }