@indfnd/utils 0.0.40 → 0.1.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.1](http://git.inspur.com/imp-ec/ind-front/ind-utils/compare/v0.1.0...v0.1.1) (2024-04-01)
+
+
+### Features
+
+* package.json脚本修改 ([1e545a2](http://git.inspur.com/imp-ec/ind-front/ind-utils/commit/1e545a2488fc8b914ca19bc00248c07d78b02346))
+* **table:** 支持合计列 ([47505c7](http://git.inspur.com/imp-ec/ind-front/ind-utils/commit/47505c702c743bb89fa4cfb71e2f7545216e2690))
+
+
+### Bug Fixes
+
+* 车牌号校验修改，支持鲁AD1234 ([9e8fc5b](http://git.inspur.com/imp-ec/ind-front/ind-utils/commit/9e8fc5bb1ca10244b65ebcee4b21a1d157e38adf))
+
+## [0.1.0](http://git.inspur.com/imp-ec/ind-front/ind-utils/compare/v0.0.40...v0.1.0) (2024-03-18)
+
+
+### Bug Fixes
+
+* **table:** 修改headerTooltip ([949db39](http://git.inspur.com/imp-ec/ind-front/ind-utils/commit/949db3940c4dd297a2b93cb5109428768ed417c2))
+
 ### [0.0.40](http://git.inspur.com/imp-ec/ind-front/ind-utils/compare/v0.0.39...v0.0.40) (2024-03-13)
 
 

package/dist/ind-utils.es.js

@@ -10633,6 +10633,7 @@ function renderHeaderTooltip({
   return text;
 }
 function renderColumnTree(data, columnGroup, option = {}) {
+  var _b;
   const _a = columnGroup, {
     key,
     keyProp,
@@ -10660,7 +10661,7 @@ function renderColumnTree(data, columnGroup, option = {}) {
   ]);
   const { keyPropName = "key", titlePropName = "title", keyPrefix = "", parents = [] } = option;
   if (keyProp) {
-    let columnUniqData = _.uniqBy(data, columnGroup.keyProp) || [];
+    let columnUniqData = ((_b = _.uniqBy(data, columnGroup.keyProp)) == null ? void 0 : _b.filter((item) => !isNil(item[columnGroup.keyProp]))) || [];
     if (sortProp) {
       const unSortData = columnUniqData.filter((item) => isNil(item[sortProp]));
       const sortData = columnUniqData.filter((item) => !isNil(item[sortProp]));
@@ -10691,7 +10692,13 @@ function renderColumnTree(data, columnGroup, option = {}) {
       const suffix = keyLastSuffix ? `${GROUP_SEP}${keyLastSuffix}` : "";
       return __spreadProps(__spreadValues({}, args), {
         [keyPropName]: `${keyPrefix}${keyProp}${VALUE_SEP}${item[keyProp]}${suffix}`,
-        [titlePropName]: columnTitle
+        [titlePropName]: columnTitle,
+        headerTooltip: renderHeaderTooltip({
+          tooltip: headerTooltip,
+          item,
+          parents,
+          title: columnTitle
+        })
       });
     });
   }
@@ -10746,16 +10753,71 @@ function renderRowData(data, keys) {
   const value = (_a = data == null ? void 0 : data[0]) == null ? void 0 : _a[key];
   return value;
 }
+function getRowKeyValue(item, rowKey) {
+  if (!item)
+    return "";
+  if (isString(rowKey))
+    return item[rowKey] || "";
+  for (const key of rowKey) {
+    if (item[key]) {
+      return item[key];
+    }
+  }
+  return "";
+}
+function renderSumColumn(keys, titles, idx, columns, def) {
+  if (idx >= keys.length)
+    return;
+  const key = keys[idx];
+  let header = _.find(columns, { key });
+  if (!header) {
+    header = { key, title: titles[idx], children: [] };
+    columns.push(header);
+    if (idx === keys.length - 1) {
+      Object.assign(header, def, { title: titles[idx] });
+      return;
+    }
+  }
+  renderSumColumn(keys, titles, idx + 1, header.children, def);
+}
+function renderSumColumns({ sumColumnDefs }) {
+  const columns = [];
+  for (const def of sumColumnDefs) {
+    const { key, title } = def;
+    const keys = key.split(GROUP_SEP);
+    const titles = title.split(GROUP_SEP);
+    renderSumColumn(keys, titles, 0, columns, def);
+  }
+  return columns;
+}
 function row2column(data = [], columnGroups = [], rowKey, option = {}) {
-  const columns = _.flatten(
-    columnGroups.map((group) => renderColumnTree(data, group, option))
-  );
+  var _a;
+  const columns = [];
+  if (option.sumColumnDefs && option.sumColumnDefs.length) {
+    columns.push(...renderSumColumns(option));
+  }
+  const groupColumns = _.flatten(columnGroups.map((group) => renderColumnTree(data, group, option))) || [];
+  columns.push(...groupColumns);
   const leafColumns = getLeafColumns(columns);
-  const rowKeyUniqData = _.uniqBy(data, rowKey);
-  const groupData = _.groupBy(data, rowKey);
+  const rowKeyUniqData = ((_a = _.uniqBy(data, (item) => getRowKeyValue(item, rowKey))) == null ? void 0 : _a.filter(
+    (item) => !isNil(getRowKeyValue(item, rowKey))
+  )) || [];
+  const groupData = _.groupBy(data, (item) => getRowKeyValue(item, rowKey));
   const rltData = rowKeyUniqData.map((item) => {
-    const rowGroupData = groupData[item[rowKey]] || [];
+    const rowKeyValue = getRowKeyValue(item, rowKey);
+    const rowGroupData = groupData[rowKeyValue] || [];
     const newItem = __spreadValues({}, item);
+    if (option.sumColumnDefs && option.sumColumnDefs.length) {
+      option.sumColumnDefs.forEach((def) => {
+        const { key } = def;
+        const keys = key.split(GROUP_SEP) || [];
+        const code = (keys == null ? void 0 : keys[0]) || "";
+        const indexCol = (keys == null ? void 0 : keys[keys.length - 1]) || "";
+        const { sumColKeyProp = "sumColCode" } = option;
+        const itemData = _.find(rowGroupData, { [sumColKeyProp]: code }) || {};
+        newItem[key] = itemData[indexCol];
+      });
+    }
     leafColumns.forEach((column) => {
       const columnKey = column[option.keyPropName || "key"] || "";
       const keys = columnKey.split(GROUP_SEP) || [];
@@ -10935,11 +10997,11 @@ function checkTel(val) {
   }
 }
 function checkVehicleNo(str) {
-  const newReg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z]-(([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/;
+  const newReg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](-)?(([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/;
   if (newReg.test(str)) {
     return true;
   }
-  const reg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z]-[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/;
+  const reg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](-)?[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/;
   return reg.test(str);
 }
 const DICT_KEY = "ind-dict_";