@arim-aisdc/public-components 2.3.12 → 2.3.13

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | Element | JSX.Element;
+    text: string | JSX.Element | Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/TableMax/TableBody/Row.js

@@ -20,6 +20,7 @@ import { getEmptyImage } from 'react-dnd-html5-backend';
 import { getPinningStyle } from "../TableHeader/utils";
 import { EditableCell } from "../components/ColumnEdit";
 import "./index.less";
+import dayjs from 'dayjs';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -324,9 +325,36 @@ var Row = function Row(_ref) {
           accessorKey = _cell$column$columnDe.accessorKey,
           header = _cell$column$columnDe.header,
           columnClassName = _cell$column$columnDe.columnClassName,
-          id = _cell$column$columnDe.id;
+          id = _cell$column$columnDe.id,
+          filterType = _cell$column$columnDe.filterType;
         // 当前列是否编辑中
         var columnEditing = rowEditing && columnEditable;
+        // const cellValue = cell.getValue();
+
+        // const cellRenderer = cell.column.columnDef.cell;
+        // const formattedValue = isDateColumn(cell.column.columnDef)
+        //   ? formatDate(cellValue, cell.column.columnDef?.meta?.dateFormat)
+        //   : cellValue;
+
+        var originalContext = cell.getContext();
+        var rawValue = originalContext.getValue();
+
+        // 创建增强上下文
+        var enhancedContext = _objectSpread(_objectSpread({}, originalContext), {}, {
+          // 原始值获取
+          getValue: function getValue() {
+            return rawValue;
+          },
+          // 格式化值获取
+          getFormattedValue: function getFormattedValue() {
+            var _cell$column$columnDe2;
+            return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, (_cell$column$columnDe2 = cell.column.columnDef) === null || _cell$column$columnDe2 === void 0 || (_cell$column$columnDe2 = _cell$column$columnDe2.meta) === null || _cell$column$columnDe2 === void 0 ? void 0 : _cell$column$columnDe2.dateFormat) : rawValue;
+          },
+          // 默认渲染使用格式化值
+          renderValue: function renderValue() {
+            return enhancedContext.getFormattedValue();
+          }
+        });
         return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
           className: "".concat(columnEditing ? 'tbody-tr-td-editting' : '', " ").concat(id === leftLastColumnId ? 'tbody-tr-td-cell-fix-left-last' : '', " ").concat(id === rightFirstColumnId ? 'tbody-tr-td-cell-fix-right-first' : '', " ").concat(columnClassName ? columnClassName.join(' ') : '', " ").concat((cellClassName === null || cellClassName === void 0 ? void 0 : cellClassName(cell).map(function (item) {
             return "".concat(item, "-").concat(theme);
@@ -344,7 +372,7 @@ var Row = function Row(_ref) {
             dataIndex: accessorKey,
             title: header,
             onEditValueChange: onEditValueChange,
-            children: flexRender(cell.column.columnDef.cell, cell.getContext())
+            children: flexRender(cell.column.columnDef.cell, enhancedContext)
           }))
         }), cell.id);
       })
@@ -382,4 +410,16 @@ var Row = function Row(_ref) {
     })]
   });
 };
-export default Row;
+export default Row;
+function formatDate(dateValue) {
+  var pattern = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "YYYY-MM-DD HH:mm";
+  if (!dateValue) return '';
+  var date = dayjs(dateValue);
+  if (!date.isValid()) return 'Invalid Date';
+  console.log(date.format(pattern), pattern, 'pattern');
+  return date.format(pattern);
+}
+function isDateColumn(column) {
+  var _column$meta;
+  return (column === null || column === void 0 || (_column$meta = column.meta) === null || _column$meta === void 0 ? void 0 : _column$meta.isDate) || false;
+}

package/dist/components/TableMax/TableMax.js

@@ -437,6 +437,7 @@ var TableMax = function TableMax(_ref) {
     onExpandedChange: setExpanded,
     sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
   });
+  console.log(tableColumns, 'table.columns');
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {

package/dist/components/TableMax/components/ColumnFilterV2/Filter.js

@@ -30,7 +30,6 @@ var Filter = function Filter(_ref) {
     getFilterOptionsFn = columnDef.getFilterOptionsFn,
     _columnDef$isFilterOp = columnDef.isFilterOptionsFrontSearch,
     isFilterOptionsFrontSearch = _columnDef$isFilterOp === void 0 ? false : _columnDef$isFilterOp;
-
   // 获取最新的筛选值
   var _useState = useState(column.getFilterValue()),
     _useState2 = _slicedToArray(_useState, 2),

package/dist/components/TableMax/components/ColumnFilterV2/index.js

@@ -41,6 +41,16 @@ var FILTER_FN_ENUM = (_FILTER_FN_ENUM = {}, _defineProperty(_defineProperty(_def
 // 给columns配置填充默认的过滤函数
 export function setDefaultFilterFn(columns) {
   columns.forEach(function (column) {
+    if (column.filterType === FilterType.DateRange || column.filterType === FilterType.SingleDate) {
+      if (!column.meta) {
+        column.meta = {};
+        column.meta.isDate = true;
+        column.meta.dateFormat = 'YYYY-MM-DD HH:mm';
+      } else {
+        column.meta.isDate = column.meta.isDate || true;
+        column.meta.dateFormat = column.meta.dateFormat || 'YYYY-MM-DD HH:mm';
+      }
+    }
     if (column.filterType && !column.filterFn && FILTER_FN_ENUM[column.filterType]) {
       // 当前列指定了过滤组件，但是没有指定过滤函数，在这里自动补上
       column.filterFn = FILTER_FN_ENUM[column.filterType];

package/dist/components/TableMax/type.d.ts

@@ -388,6 +388,12 @@ export interface TableMaxColumnType {
     required?: boolean;
     /**是否可调整列宽大小 */
     enableResizing?: boolean;
+    meta?: {
+        /**是否为日期, 配置filterType后也可以判断是否为日期 */
+        isDate?: boolean;
+        /**日期展示格式 */
+        dateFormat?: string;
+    };
 }
 export type FormatFilterType = {
     field: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.12",
+  "version": "2.3.13",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",